pure-react-ui 1.5.3 → 1.5.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +505 -505
- package/lib/components/Form/AdvancedSelect.d.ts +30 -0
- package/lib/components/Form/AdvancedSelect.d.ts.map +1 -0
- package/lib/components/Form/AdvancedSelect.js +147 -0
- package/lib/components/Form/AdvancedSelect.js.map +1 -0
- package/lib/components/Form/Form.css +1065 -733
- package/lib/components/Form/Form.d.ts +1 -0
- package/lib/components/Form/Form.d.ts.map +1 -1
- package/lib/components/Form/Form.js +6 -3
- package/lib/components/Form/Form.js.map +1 -1
- package/lib/components/Form/FormContext.d.ts +1 -0
- package/lib/components/Form/FormContext.d.ts.map +1 -1
- package/lib/components/Form/FormContext.js +8 -1
- package/lib/components/Form/FormContext.js.map +1 -1
- package/lib/components/Form/FormItem.d.ts.map +1 -1
- package/lib/components/Form/FormItem.js +47 -9
- package/lib/components/Form/FormItem.js.map +1 -1
- package/lib/components/Form/Select.d.ts +17 -2
- package/lib/components/Form/Select.d.ts.map +1 -1
- package/lib/components/Form/Select.js +135 -8
- package/lib/components/Form/Select.js.map +1 -1
- package/lib/components/Modal/Modal.css +509 -509
- package/lib/components/Text/Text.css +1 -0
- package/lib/index.d.ts +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -1
- package/lib/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,6 +5,7 @@ export interface FormProps extends Omit<React.FormHTMLAttributes<HTMLFormElement
|
|
|
5
5
|
layout?: 'vertical' | 'horizontal' | 'inline';
|
|
6
6
|
size?: 'small' | 'medium' | 'large';
|
|
7
7
|
form?: FormInstance;
|
|
8
|
+
initialValues?: Record<string, any>;
|
|
8
9
|
onFinish?: (values: Record<string, any>) => void;
|
|
9
10
|
onFinishFailed?: (errors: Record<string, string>) => void;
|
|
10
11
|
children: React.ReactNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["../../../src/components/Form/Form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAgB,YAAY,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,YAAY,CAAC;AAEpB,MAAM,WAAW,SAAU,SAAQ,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE,UAAU,CAAC;IAC5F,MAAM,CAAC,EAAE,UAAU,GAAG,YAAY,GAAG,QAAQ,CAAC;IAC9C,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACjD,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAC1D,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,eAAO,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["../../../src/components/Form/Form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAgB,YAAY,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,YAAY,CAAC;AAEpB,MAAM,WAAW,SAAU,SAAQ,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE,UAAU,CAAC;IAC5F,MAAM,CAAC,EAAE,UAAU,GAAG,YAAY,GAAG,QAAQ,CAAC;IAC9C,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACjD,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAC1D,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,eAAO,MAAM,IAAI,gFAgEf,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React, { useRef, forwardRef, useImperativeHandle } from 'react';
|
|
2
2
|
import { FormProvider } from './FormContext';
|
|
3
3
|
import './Form.css';
|
|
4
|
-
export const Form = forwardRef(({ layout = 'vertical', size = 'medium', form: externalForm, onFinish, onFinishFailed, className = '', children, ...props }, ref) => {
|
|
4
|
+
export const Form = forwardRef(({ layout = 'vertical', size = 'medium', form: externalForm, initialValues, onFinish, onFinishFailed, className = '', children, ...props }, ref) => {
|
|
5
5
|
const baseClass = 'pure-form';
|
|
6
6
|
const layoutClass = `pure-form--${layout}`;
|
|
7
7
|
const sizeClass = `pure-form--${size}`;
|
|
@@ -21,7 +21,10 @@ export const Form = forwardRef(({ layout = 'vertical', size = 'medium', form: ex
|
|
|
21
21
|
const formInstance = externalForm || internalFormRef.current;
|
|
22
22
|
if (formInstance) {
|
|
23
23
|
const values = formInstance.getFieldsValue();
|
|
24
|
-
|
|
24
|
+
// Include initial values that haven't been changed
|
|
25
|
+
const allValues = initialValues ? { ...initialValues, ...values } : values;
|
|
26
|
+
console.log('Form Values (including initial):', allValues);
|
|
27
|
+
console.log('Form Values (current):', values);
|
|
25
28
|
onFinish?.(values);
|
|
26
29
|
}
|
|
27
30
|
};
|
|
@@ -29,7 +32,7 @@ export const Form = forwardRef(({ layout = 'vertical', size = 'medium', form: ex
|
|
|
29
32
|
if (instance && !internalFormRef.current) {
|
|
30
33
|
internalFormRef.current = instance;
|
|
31
34
|
}
|
|
32
|
-
}, form: externalForm, onSubmit: onFinish, onFinishFailed: onFinishFailed },
|
|
35
|
+
}, form: externalForm, initialValues: initialValues, onSubmit: onFinish, onFinishFailed: onFinishFailed },
|
|
33
36
|
React.createElement("form", { className: combinedClassName, onSubmit: handleSubmit, ...props }, children)));
|
|
34
37
|
});
|
|
35
38
|
Form.displayName = 'Form';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Form.js","sourceRoot":"","sources":["../../../src/components/Form/Form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,YAAY,EAAgB,MAAM,eAAe,CAAC;AAC3D,OAAO,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"Form.js","sourceRoot":"","sources":["../../../src/components/Form/Form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,YAAY,EAAgB,MAAM,eAAe,CAAC;AAC3D,OAAO,YAAY,CAAC;AAYpB,MAAM,CAAC,MAAM,IAAI,GAAG,UAAU,CAA0B,CAAC,EACvD,MAAM,GAAG,UAAU,EACnB,IAAI,GAAG,QAAQ,EACf,IAAI,EAAE,YAAY,EAClB,aAAa,EACb,QAAQ,EACR,cAAc,EACd,SAAS,GAAG,EAAE,EACd,QAAQ,EACR,GAAG,KAAK,EACT,EAAE,GAAG,EAAE,EAAE;IACR,MAAM,SAAS,GAAG,WAAW,CAAC;IAC9B,MAAM,WAAW,GAAG,cAAc,MAAM,EAAE,CAAC;IAC3C,MAAM,SAAS,GAAG,cAAc,IAAI,EAAE,CAAC;IAEvC,MAAM,iBAAiB,GAAG;QACxB,SAAS;QACT,WAAW;QACX,SAAS;QACT,SAAS;KACV,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE5B,MAAM,eAAe,GAAG,MAAM,CAAsB,IAAI,CAAC,CAAC;IAE1D,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE;QAC5B,OAAO,YAAY,IAAI,eAAe,CAAC,OAAQ,CAAC;IAClD,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,MAAM,YAAY,GAAG,CAAC,CAAmC,EAAE,EAAE;QAC3D,CAAC,CAAC,cAAc,EAAE,CAAC;QACnB,CAAC,CAAC,eAAe,EAAE,CAAC;QAEpB,MAAM,YAAY,GAAG,YAAY,IAAI,eAAe,CAAC,OAAO,CAAC;QAC7D,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,MAAM,GAAG,YAAY,CAAC,cAAc,EAAE,CAAC;YAC7C,mDAAmD;YACnD,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YAC3E,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE,SAAS,CAAC,CAAC;YAC3D,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;YAC9C,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC;QACrB,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,YAAY,IACX,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE;YAChB,IAAI,QAAQ,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;gBACzC,eAAe,CAAC,OAAO,GAAG,QAAQ,CAAC;YACrC,CAAC;QACH,CAAC,EACD,IAAI,EAAE,YAAY,EAClB,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,cAAc;QAE9B,8BACE,SAAS,EAAE,iBAAiB,EAC5B,QAAQ,EAAE,YAAY,KAClB,KAAK,IAER,QAAQ,CACJ,CACM,CAChB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC"}
|
|
@@ -16,6 +16,7 @@ interface FormContextValue {
|
|
|
16
16
|
export declare const useFormContext: () => FormContextValue;
|
|
17
17
|
export interface FormProviderProps {
|
|
18
18
|
form?: FormInstance;
|
|
19
|
+
initialValues?: Record<string, any>;
|
|
19
20
|
onSubmit?: (values: Record<string, any>) => void;
|
|
20
21
|
onFinishFailed?: (errors: Record<string, string>) => void;
|
|
21
22
|
children: React.ReactNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormContext.d.ts","sourceRoot":"","sources":["../../../src/components/Form/FormContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6E,MAAM,OAAO,CAAC;AAElG,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1C,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC;IACrC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACtD,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAClD,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACnD,MAAM,EAAE,MAAM,IAAI,CAAC;CACpB;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,YAAY,CAAC;IACnB,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,KAAK,IAAI,CAAC;IAC3F,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAID,eAAO,MAAM,cAAc,wBAM1B,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACjD,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAC1D,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,eAAO,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"FormContext.d.ts","sourceRoot":"","sources":["../../../src/components/Form/FormContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6E,MAAM,OAAO,CAAC;AAElG,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1C,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC;IACrC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACtD,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAClD,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACnD,MAAM,EAAE,MAAM,IAAI,CAAC;CACpB;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,YAAY,CAAC;IACnB,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,KAAK,IAAI,CAAC;IAC3F,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAID,eAAO,MAAM,cAAc,wBAM1B,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACjD,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAC1D,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,eAAO,MAAM,YAAY,wFAiFvB,CAAC"}
|
|
@@ -7,7 +7,7 @@ export const useFormContext = () => {
|
|
|
7
7
|
}
|
|
8
8
|
return context;
|
|
9
9
|
};
|
|
10
|
-
export const FormProvider = forwardRef(({ form: externalForm, onSubmit, onFinishFailed, children }, ref) => {
|
|
10
|
+
export const FormProvider = forwardRef(({ form: externalForm, initialValues, onSubmit, onFinishFailed, children }, ref) => {
|
|
11
11
|
const fieldsRef = useRef(new Map());
|
|
12
12
|
const formRef = useRef(null);
|
|
13
13
|
const formInstance = externalForm || {
|
|
@@ -60,6 +60,13 @@ export const FormProvider = forwardRef(({ form: externalForm, onSubmit, onFinish
|
|
|
60
60
|
useImperativeHandle(ref, () => formInstance, []);
|
|
61
61
|
const registerField = (name, getValue, setValue) => {
|
|
62
62
|
fieldsRef.current.set(name, { getValue, setValue });
|
|
63
|
+
// Set initial value if provided (only if field doesn't already have a value)
|
|
64
|
+
if (initialValues && initialValues[name] !== undefined) {
|
|
65
|
+
const currentValue = getValue();
|
|
66
|
+
if (currentValue === undefined || currentValue === null || currentValue === '') {
|
|
67
|
+
setValue(initialValues[name]);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
63
70
|
};
|
|
64
71
|
const unregisterField = (name) => {
|
|
65
72
|
fieldsRef.current.delete(name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormContext.js","sourceRoot":"","sources":["../../../src/components/Form/FormContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAkBlG,MAAM,WAAW,GAAG,aAAa,CAA0B,IAAI,CAAC,CAAC;AAEjE,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,MAAM,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACxC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"FormContext.js","sourceRoot":"","sources":["../../../src/components/Form/FormContext.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormItem.d.ts","sourceRoot":"","sources":["../../../src/components/Form/FormItem.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAEjD,OAAO,YAAY,CAAC;AAEpB,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,KAAK,CAAC;QACZ,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,GAAG,MAAM,CAAC;QAC7C,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC,CAAC;IACH,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;CAC9B;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"FormItem.d.ts","sourceRoot":"","sources":["../../../src/components/Form/FormItem.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAEjD,OAAO,YAAY,CAAC;AAEpB,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,KAAK,CAAC;QACZ,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,GAAG,MAAM,CAAC;QAC7C,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC,CAAC;IACH,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;CAC9B;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CA8I5C,CAAC"}
|
|
@@ -22,6 +22,10 @@ export const FormItem = ({ name, label, rules = [], initialValue, className = ''
|
|
|
22
22
|
forceUpdate();
|
|
23
23
|
};
|
|
24
24
|
registerField(name, getValue, setValue);
|
|
25
|
+
// Also check form's initialValues if available
|
|
26
|
+
if (form && 'getFieldsValue' in form) {
|
|
27
|
+
// This will be handled by registerField
|
|
28
|
+
}
|
|
25
29
|
return () => {
|
|
26
30
|
unregisterField(name);
|
|
27
31
|
};
|
|
@@ -56,6 +60,10 @@ export const FormItem = ({ name, label, rules = [], initialValue, className = ''
|
|
|
56
60
|
setError(errorMsg);
|
|
57
61
|
};
|
|
58
62
|
const getValueFromEvent = (e) => {
|
|
63
|
+
// Handle Select (react-select) - it passes value directly (string, number, or array)
|
|
64
|
+
if (e !== null && e !== undefined && !e.target && (typeof e === 'string' || typeof e === 'number' || Array.isArray(e))) {
|
|
65
|
+
return e;
|
|
66
|
+
}
|
|
59
67
|
if (e?.target) {
|
|
60
68
|
if (e.target.type === 'checkbox') {
|
|
61
69
|
return e.target.checked;
|
|
@@ -67,18 +75,48 @@ export const FormItem = ({ name, label, rules = [], initialValue, className = ''
|
|
|
67
75
|
}
|
|
68
76
|
return e;
|
|
69
77
|
};
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
children.props.onChange?.(e);
|
|
77
|
-
},
|
|
78
|
+
// Handle radio buttons specially - they need the name and value props
|
|
79
|
+
const componentDisplayName = children.type?.displayName;
|
|
80
|
+
const componentName = children.type?.name;
|
|
81
|
+
const isRadio = componentDisplayName === 'Radio' || componentName === 'Radio' || children.props.type === 'radio';
|
|
82
|
+
const isCheckbox = componentDisplayName === 'Checkbox' || componentName === 'Checkbox' || children.props.type === 'checkbox';
|
|
83
|
+
const childProps = {
|
|
78
84
|
error: error || children.props.error,
|
|
79
85
|
label: label || children.props.label,
|
|
80
86
|
...children.props
|
|
81
|
-
}
|
|
87
|
+
};
|
|
88
|
+
// Check if it's Select (now using react-select, handles value directly)
|
|
89
|
+
const isSelect = children.type?.displayName === 'Select' || children.type?.name === 'Select';
|
|
90
|
+
if (isRadio) {
|
|
91
|
+
// For radio, checked is based on whether form value matches radio value
|
|
92
|
+
childProps.checked = valueRef.current === children.props.value;
|
|
93
|
+
childProps.value = children.props.value;
|
|
94
|
+
childProps.name = name || children.props.name;
|
|
95
|
+
}
|
|
96
|
+
else if (isCheckbox) {
|
|
97
|
+
// For checkbox, checked is boolean
|
|
98
|
+
childProps.checked = valueRef.current === true;
|
|
99
|
+
}
|
|
100
|
+
else if (isSelect) {
|
|
101
|
+
// For Select (react-select), pass value directly (string, number, or array)
|
|
102
|
+
childProps.value = valueRef.current !== undefined ? valueRef.current : (children.props.value ?? (children.props.multiple || children.props.isMulti ? [] : ''));
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
// For other inputs, use value
|
|
106
|
+
childProps.value = valueRef.current !== undefined && valueRef.current !== null ? valueRef.current : (children.props.value ?? '');
|
|
107
|
+
}
|
|
108
|
+
childProps.onChange = (e) => {
|
|
109
|
+
const newValue = getValueFromEvent(e);
|
|
110
|
+
handleChange(newValue);
|
|
111
|
+
// For Select (react-select), onChange receives value directly, not event
|
|
112
|
+
if (isSelect) {
|
|
113
|
+
children.props.onChange?.(newValue);
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
children.props.onChange?.(e);
|
|
117
|
+
}
|
|
118
|
+
};
|
|
119
|
+
const child = React.cloneElement(children, childProps);
|
|
82
120
|
return (React.createElement("div", { className: `pure-form-item ${className}` }, child));
|
|
83
121
|
};
|
|
84
122
|
//# sourceMappingURL=FormItem.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormItem.js","sourceRoot":"","sources":["../../../src/components/Form/FormItem.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FormItem.js","sourceRoot":"","sources":["../../../src/components/Form/FormItem.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,15 +4,30 @@ export interface SelectOption {
|
|
|
4
4
|
value: string | number;
|
|
5
5
|
label: string;
|
|
6
6
|
disabled?: boolean;
|
|
7
|
+
icon?: React.ReactNode;
|
|
7
8
|
}
|
|
8
|
-
export interface SelectProps
|
|
9
|
+
export interface SelectProps {
|
|
9
10
|
label?: string;
|
|
10
11
|
error?: string;
|
|
11
12
|
helpText?: string;
|
|
12
13
|
options: SelectOption[];
|
|
13
14
|
placeholder?: string;
|
|
15
|
+
searchable?: boolean;
|
|
16
|
+
isSearchable?: boolean;
|
|
17
|
+
multiple?: boolean;
|
|
18
|
+
isMulti?: boolean;
|
|
19
|
+
value?: string | number | (string | number)[];
|
|
20
|
+
defaultValue?: string | number | (string | number)[];
|
|
21
|
+
disabled?: boolean;
|
|
14
22
|
fullWidth?: boolean;
|
|
15
23
|
size?: 'small' | 'medium' | 'large';
|
|
24
|
+
allowClear?: boolean;
|
|
25
|
+
isClearable?: boolean;
|
|
26
|
+
className?: string;
|
|
27
|
+
onChange?: (value: string | number | (string | number)[]) => void;
|
|
28
|
+
onSearch?: (searchText: string) => void;
|
|
29
|
+
name?: string;
|
|
30
|
+
id?: string;
|
|
16
31
|
}
|
|
17
|
-
export declare const Select: React.ForwardRefExoticComponent<SelectProps & React.RefAttributes<
|
|
32
|
+
export declare const Select: React.ForwardRefExoticComponent<SelectProps & React.RefAttributes<any>>;
|
|
18
33
|
//# sourceMappingURL=Select.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Select.d.ts","sourceRoot":"","sources":["../../../src/components/Form/Select.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Select.d.ts","sourceRoot":"","sources":["../../../src/components/Form/Select.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAE1C,OAAO,YAAY,CAAC;AAEpB,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACxB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC9C,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACrD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IACpC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC;IAClE,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,eAAO,MAAM,MAAM,yEAkNjB,CAAC"}
|
|
@@ -1,23 +1,150 @@
|
|
|
1
1
|
import React, { forwardRef } from 'react';
|
|
2
|
+
import SelectComponent from 'react-select';
|
|
2
3
|
import './Form.css';
|
|
3
|
-
export const Select = forwardRef(({ label, error, helpText, options, placeholder, fullWidth = false, size = 'medium', className = '',
|
|
4
|
+
export const Select = forwardRef(({ label, error, helpText, options, placeholder = 'Select...', searchable = false, isSearchable, multiple = false, isMulti, value: controlledValue, defaultValue, disabled = false, fullWidth = false, size = 'medium', allowClear = false, isClearable, className = '', onChange, onSearch, name, id }, ref) => {
|
|
4
5
|
const selectId = id || `select-${Math.random().toString(36).substr(2, 9)}`;
|
|
5
|
-
|
|
6
|
-
const
|
|
7
|
-
const
|
|
8
|
-
const
|
|
6
|
+
// Support both prop names for compatibility
|
|
7
|
+
const isMultiSelect = isMulti !== undefined ? isMulti : multiple;
|
|
8
|
+
const isSearchEnabled = isSearchable !== undefined ? isSearchable : searchable;
|
|
9
|
+
const isClearEnabled = isClearable !== undefined ? isClearable : allowClear;
|
|
10
|
+
// Convert options to react-select format
|
|
11
|
+
const reactSelectOptions = options.map(option => ({
|
|
12
|
+
value: option.value,
|
|
13
|
+
label: option.label,
|
|
14
|
+
isDisabled: option.disabled,
|
|
15
|
+
icon: option.icon
|
|
16
|
+
}));
|
|
17
|
+
// Convert value to react-select format
|
|
18
|
+
const getReactSelectValue = () => {
|
|
19
|
+
if (controlledValue === undefined && defaultValue === undefined) {
|
|
20
|
+
return isMultiSelect ? [] : null;
|
|
21
|
+
}
|
|
22
|
+
const currentValue = controlledValue !== undefined ? controlledValue : defaultValue;
|
|
23
|
+
if (isMultiSelect) {
|
|
24
|
+
const values = Array.isArray(currentValue) ? currentValue : [];
|
|
25
|
+
return reactSelectOptions.filter(opt => values.includes(opt.value));
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
const selectedOption = reactSelectOptions.find(opt => opt.value === currentValue);
|
|
29
|
+
return selectedOption || null;
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
const handleChange = (selectedOption) => {
|
|
33
|
+
if (!onChange)
|
|
34
|
+
return;
|
|
35
|
+
if (isMultiSelect) {
|
|
36
|
+
const values = selectedOption ? selectedOption.map((opt) => opt.value) : [];
|
|
37
|
+
onChange(values);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
const value = selectedOption ? selectedOption.value : (isClearEnabled ? '' : undefined);
|
|
41
|
+
onChange(value);
|
|
42
|
+
}
|
|
43
|
+
};
|
|
44
|
+
const handleInputChange = (inputValue) => {
|
|
45
|
+
onSearch?.(inputValue);
|
|
46
|
+
};
|
|
47
|
+
// Custom styles for react-select
|
|
48
|
+
const customStyles = {
|
|
49
|
+
control: (base, state) => ({
|
|
50
|
+
...base,
|
|
51
|
+
minHeight: size === 'small' ? '32px' : size === 'large' ? '48px' : '40px',
|
|
52
|
+
fontSize: size === 'small' ? '0.875rem' : size === 'large' ? '1.125rem' : '1rem',
|
|
53
|
+
padding: size === 'small' ? '0 0.5rem' : size === 'large' ? '0 1rem' : '0 0.75rem',
|
|
54
|
+
borderColor: error ? '#dc3545' : state.isFocused ? '#007bff' : '#ced4da',
|
|
55
|
+
boxShadow: error
|
|
56
|
+
? (state.isFocused ? '0 0 0 3px rgba(220, 53, 69, 0.25)' : 'none')
|
|
57
|
+
: (state.isFocused ? '0 0 0 3px rgba(0, 123, 255, 0.25)' : 'none'),
|
|
58
|
+
'&:hover': {
|
|
59
|
+
borderColor: error ? '#dc3545' : '#007bff',
|
|
60
|
+
},
|
|
61
|
+
backgroundColor: disabled ? '#e9ecef' : '#ffffff',
|
|
62
|
+
cursor: disabled ? 'not-allowed' : 'pointer',
|
|
63
|
+
opacity: disabled ? 0.65 : 1,
|
|
64
|
+
}),
|
|
65
|
+
placeholder: (base) => ({
|
|
66
|
+
...base,
|
|
67
|
+
color: '#6c757d',
|
|
68
|
+
}),
|
|
69
|
+
singleValue: (base) => ({
|
|
70
|
+
...base,
|
|
71
|
+
color: '#212529',
|
|
72
|
+
}),
|
|
73
|
+
multiValue: (base) => ({
|
|
74
|
+
...base,
|
|
75
|
+
backgroundColor: '#e7f3ff',
|
|
76
|
+
}),
|
|
77
|
+
multiValueLabel: (base) => ({
|
|
78
|
+
...base,
|
|
79
|
+
color: '#212529',
|
|
80
|
+
}),
|
|
81
|
+
multiValueRemove: (base) => ({
|
|
82
|
+
...base,
|
|
83
|
+
color: '#212529',
|
|
84
|
+
'&:hover': {
|
|
85
|
+
backgroundColor: '#b3d9ff',
|
|
86
|
+
color: '#212529',
|
|
87
|
+
},
|
|
88
|
+
}),
|
|
89
|
+
menu: (base) => ({
|
|
90
|
+
...base,
|
|
91
|
+
zIndex: 9999,
|
|
92
|
+
borderRadius: '0.375rem',
|
|
93
|
+
boxShadow: '0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06)',
|
|
94
|
+
}),
|
|
95
|
+
option: (base, state) => ({
|
|
96
|
+
...base,
|
|
97
|
+
backgroundColor: state.isSelected
|
|
98
|
+
? '#007bff'
|
|
99
|
+
: state.isFocused
|
|
100
|
+
? '#e7f3ff'
|
|
101
|
+
: '#ffffff',
|
|
102
|
+
color: state.isSelected ? '#ffffff' : '#212529',
|
|
103
|
+
cursor: state.isDisabled ? 'not-allowed' : 'pointer',
|
|
104
|
+
'&:active': {
|
|
105
|
+
backgroundColor: state.isSelected ? '#007bff' : '#b3d9ff',
|
|
106
|
+
},
|
|
107
|
+
}),
|
|
108
|
+
indicatorsContainer: (base) => ({
|
|
109
|
+
...base,
|
|
110
|
+
paddingRight: '0.5rem',
|
|
111
|
+
}),
|
|
112
|
+
clearIndicator: (base) => ({
|
|
113
|
+
...base,
|
|
114
|
+
color: '#6c757d',
|
|
115
|
+
'&:hover': {
|
|
116
|
+
color: '#212529',
|
|
117
|
+
},
|
|
118
|
+
}),
|
|
119
|
+
dropdownIndicator: (base) => ({
|
|
120
|
+
...base,
|
|
121
|
+
color: '#6c757d',
|
|
122
|
+
'&:hover': {
|
|
123
|
+
color: '#212529',
|
|
124
|
+
},
|
|
125
|
+
}),
|
|
126
|
+
};
|
|
127
|
+
const baseClass = 'pure-select-react-select';
|
|
128
|
+
const sizeClass = `pure-select-react-select--${size}`;
|
|
129
|
+
const errorClass = error ? 'pure-select-react-select--error' : '';
|
|
130
|
+
const fullWidthClass = fullWidth ? 'pure-select-react-select--full-width' : '';
|
|
131
|
+
const disabledClass = disabled ? 'pure-select-react-select--disabled' : '';
|
|
9
132
|
const combinedClassName = [
|
|
10
133
|
baseClass,
|
|
11
134
|
sizeClass,
|
|
12
135
|
errorClass,
|
|
13
136
|
fullWidthClass,
|
|
137
|
+
disabledClass,
|
|
14
138
|
className
|
|
15
139
|
].filter(Boolean).join(' ');
|
|
140
|
+
// Custom option component to support icons
|
|
141
|
+
const formatOptionLabel = ({ label: optionLabel, icon }) => (React.createElement("div", { style: { display: 'flex', alignItems: 'center', gap: '0.5rem' } },
|
|
142
|
+
icon && React.createElement("span", null, icon),
|
|
143
|
+
React.createElement("span", null, optionLabel)));
|
|
16
144
|
return (React.createElement("div", { className: `pure-select-wrapper ${fullWidth ? 'pure-select-wrapper--full-width' : ''}` },
|
|
17
145
|
label && (React.createElement("label", { htmlFor: selectId, className: "pure-select-label" }, label)),
|
|
18
|
-
React.createElement("
|
|
19
|
-
|
|
20
|
-
options.map((option) => (React.createElement("option", { key: option.value, value: option.value, disabled: option.disabled }, option.label)))),
|
|
146
|
+
React.createElement("div", { className: combinedClassName },
|
|
147
|
+
React.createElement(SelectComponent, { ref: ref, inputId: selectId, name: name, options: reactSelectOptions, value: getReactSelectValue(), onChange: handleChange, onInputChange: isSearchEnabled ? handleInputChange : undefined, placeholder: placeholder, isMulti: isMultiSelect, isSearchable: isSearchEnabled, isDisabled: disabled, isClearable: isClearEnabled, styles: customStyles, formatOptionLabel: formatOptionLabel, classNamePrefix: "pure-react-select" })),
|
|
21
148
|
error && (React.createElement("span", { className: "pure-select-error" }, error)),
|
|
22
149
|
helpText && !error && (React.createElement("span", { className: "pure-select-help" }, helpText))));
|
|
23
150
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/components/Form/Select.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/components/Form/Select.tsx"],"names":[],"mappings":"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"}
|