Skip to content

Make 'value' property of 'MenuOptionObject' generic #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aniruddha-mithya wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make 'value' property of 'MenuOptionObject' generic #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/index.es.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions dist/lib/ml-form-builder/Utils.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
import * as React from 'react';
import { FormikValues } from 'formik';
export declare type MenuOptionObject<T = unknown> = {
export declare type MenuOptionObject<T = unknown, ValueType = string> = {
name: string | React.ReactNode;
value: string;
value: ValueType;
} & T;
export declare type MenuOptions<T> = Array<string> | Array<MenuOptionObject<T>>;
export declare type MenuOptions<T, V = string> = Array<string> | Array<MenuOptionObject<T, V>>;
export declare type ReadAsType = keyof Pick<FileReader, 'readAsBinaryString' | 'readAsDataURL' | 'readAsArrayBuffer' | 'readAsText'>;
export declare const getMenuOptions: <T extends any>(options: MenuOptions<T>) => (number | MenuOptionObject<T> | ((...items: string[]) => number) | ((...items: MenuOptionObject<T>[]) => number) | {
export declare const getMenuOptions: <T extends any, V extends any>(options: MenuOptions<T, V>) => (number | MenuOptionObject<T, V> | ((...items: string[]) => number) | ((...items: MenuOptionObject<T, V>[]) => number) | {
(...items: ConcatArray<string>[]): string[];
(...items: (string | ConcatArray<string>)[]): string[];
} | {
(...items: ConcatArray<MenuOptionObject<T>>[]): MenuOptionObject<T>[];
(...items: (MenuOptionObject<T> | ConcatArray<MenuOptionObject<T>>)[]): MenuOptionObject<T>[];
} | ((separator?: string | undefined) => string) | ((compareFn?: ((a: string, b: string) => number) | undefined) => string[]) | ((compareFn?: ((a: MenuOptionObject<T>, b: MenuOptionObject<T>) => number) | undefined) => MenuOptionObject<T>[]) | ((searchElement: string, fromIndex?: number | undefined) => number) | ((searchElement: MenuOptionObject<T>, fromIndex?: number | undefined) => number) | ((callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any) => void) | ((callbackfn: (value: MenuOptionObject<T>, index: number, array: MenuOptionObject<T>[]) => void, thisArg?: any) => void) | {
(...items: ConcatArray<MenuOptionObject<T, V>>[]): MenuOptionObject<T, V>[];
(...items: (MenuOptionObject<T, V> | ConcatArray<MenuOptionObject<T, V>>)[]): MenuOptionObject<T, V>[];
} | ((separator?: string | undefined) => string) | ((compareFn?: ((a: string, b: string) => number) | undefined) => string[]) | ((compareFn?: ((a: MenuOptionObject<T, V>, b: MenuOptionObject<T, V>) => number) | undefined) => MenuOptionObject<T, V>[]) | ((searchElement: string, fromIndex?: number | undefined) => number) | ((searchElement: MenuOptionObject<T, V>, fromIndex?: number | undefined) => number) | ((callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any) => void) | ((callbackfn: (value: MenuOptionObject<T, V>, index: number, array: MenuOptionObject<T, V>[]) => void, thisArg?: any) => void) | {
(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string;
(callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string;
<U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: string[]) => U, initialValue: U): U;
} | {
(callbackfn: (previousValue: MenuOptionObject<T>, currentValue: MenuOptionObject<T>, currentIndex: number, array: MenuOptionObject<T>[]) => MenuOptionObject<T>): MenuOptionObject<T>;
(callbackfn: (previousValue: MenuOptionObject<T>, currentValue: MenuOptionObject<T>, currentIndex: number, array: MenuOptionObject<T>[]) => MenuOptionObject<T>, initialValue: MenuOptionObject<T>): MenuOptionObject<T>;
<U_1>(callbackfn: (previousValue: U_1, currentValue: MenuOptionObject<T>, currentIndex: number, array: MenuOptionObject<T>[]) => U_1, initialValue: U_1): U_1;
} | ((value: string, start?: number | undefined, end?: number | undefined) => string[]) | ((value: MenuOptionObject<T>, start?: number | undefined, end?: number | undefined) => MenuOptionObject<T>[]) | ((target: number, start: number, end?: number | undefined) => string[]) | ((target: number, start: number, end?: number | undefined) => MenuOptionObject<T>[]) | ((searchElement: string, fromIndex?: number | undefined) => boolean) | ((searchElement: MenuOptionObject<T>, fromIndex?: number | undefined) => boolean) | {
(callbackfn: (previousValue: MenuOptionObject<T, V>, currentValue: MenuOptionObject<T, V>, currentIndex: number, array: MenuOptionObject<T, V>[]) => MenuOptionObject<T, V>): MenuOptionObject<T, V>;
(callbackfn: (previousValue: MenuOptionObject<T, V>, currentValue: MenuOptionObject<T, V>, currentIndex: number, array: MenuOptionObject<T, V>[]) => MenuOptionObject<T, V>, initialValue: MenuOptionObject<T, V>): MenuOptionObject<T, V>;
<U_1>(callbackfn: (previousValue: U_1, currentValue: MenuOptionObject<T, V>, currentIndex: number, array: MenuOptionObject<T, V>[]) => U_1, initialValue: U_1): U_1;
} | ((value: string, start?: number | undefined, end?: number | undefined) => string[]) | ((value: MenuOptionObject<T, V>, start?: number | undefined, end?: number | undefined) => MenuOptionObject<T, V>[]) | ((target: number, start: number, end?: number | undefined) => string[]) | ((target: number, start: number, end?: number | undefined) => MenuOptionObject<T, V>[]) | ((searchElement: string, fromIndex?: number | undefined) => boolean) | ((searchElement: MenuOptionObject<T, V>, fromIndex?: number | undefined) => boolean) | {
name: string;
value: string;
})[];
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-forms",
"version": "1.0.3",
"version": "1.0.4",
"description": "Creating declarative dynamic forms",
"main": "dist/index.js",
"module": "dist/index.es.js",
Expand Down
90 changes: 41 additions & 49 deletions src/lib/ml-form-builder/Utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,58 +3,50 @@ import { map, isString, get } from 'lodash';
import { FormikValues } from 'formik';
import { TFile } from './lib/MUIFileInput';



export type MenuOptionObject<T = unknown> = { name: string | React.ReactNode, value: string } & T;
export type MenuOptions<T> = Array<string> | Array<MenuOptionObject<T>>;
export type ReadAsType = keyof Pick<FileReader, 'readAsBinaryString' | 'readAsDataURL' | 'readAsArrayBuffer' | 'readAsText'>
export const getMenuOptions = <T extends any>(options: MenuOptions<T>) => {
return map(options, (item) => {
if (isString(item))
return { name: item, value: item };
return item;
});
}
export type MenuOptionObject<T = unknown, ValueType = string> = { name: string | React.ReactNode; value: ValueType } & T;
export type MenuOptions<T, V = string> = Array<string> | Array<MenuOptionObject<T, V>>;
export type ReadAsType = keyof Pick<FileReader, 'readAsBinaryString' | 'readAsDataURL' | 'readAsArrayBuffer' | 'readAsText'>;
export const getMenuOptions = <T extends any, V extends any>(options: MenuOptions<T, V>) => {
return map(options, (item) => {
if (isString(item)) return { name: item, value: item };
return item;
});
};

export const getFieldError = (fieldName: string, formikProps: FormikValues) => {
const fieldError = get(formikProps, `errors.${fieldName}`);
const isTouched = get(formikProps, `touched.${fieldName}`);
if (!isTouched && formikProps.submitCount < 1)
return '';
return fieldError;
}



const fieldError = get(formikProps, `errors.${fieldName}`);
const isTouched = get(formikProps, `touched.${fieldName}`);
if (!isTouched && formikProps.submitCount < 1) return '';
return fieldError;
};

export const processFilesWithCallback = (files: FileList | File[], callback: Function, readAs?: ReadAsType, encoding?: string) => {
let imgFiles: Array<TFile> = [];
let remFiles: any[] = [];
Array.from(files).forEach(file => {
let reader = new FileReader();
reader.onload = () => {
let fileInfo: TFile = {
name: file.name,
type: file.type,
size: Math.round(file.size / 1024) + ' kB',
base64: file.type.includes('image') ? reader.result : null,
file: file,
};
if (file.type.includes('image')) {
imgFiles.push(fileInfo);
} else {
remFiles.push(file);
}
if (imgFiles.length + remFiles.length === files.length) {
callback({ imgs: imgFiles, rem: remFiles })
}
};
reader[readAs || 'readAsDataURL'](file, encoding);
// This works but remember only readAsText can take encoding as a parameter. Might want to mention this in the documentation.

});
}
let imgFiles: Array<TFile> = [];
let remFiles: any[] = [];
Array.from(files).forEach((file) => {
let reader = new FileReader();
reader.onload = () => {
let fileInfo: TFile = {
name: file.name,
type: file.type,
size: Math.round(file.size / 1024) + ' kB',
base64: file.type.includes('image') ? reader.result : null,
file: file,
};
if (file.type.includes('image')) {
imgFiles.push(fileInfo);
} else {
remFiles.push(file);
}
if (imgFiles.length + remFiles.length === files.length) {
callback({ imgs: imgFiles, rem: remFiles });
}
};
reader[readAs || 'readAsDataURL'](file, encoding);
// This works but remember only readAsText can take encoding as a parameter. Might want to mention this in the documentation.
});
};

export const setValue = (value: any, formikProps: FormikValues, fieldProps: any) => {
formikProps.setFieldValue(get(fieldProps, 'name'), value)
}
formikProps.setFieldValue(get(fieldProps, 'name'), value);
};