From 4dd977523f5d9ef9f5f487795f116a2caba8a1fb Mon Sep 17 00:00:00 2001 From: Nate Wang Date: Tue, 2 Jul 2024 15:42:04 +0800 Subject: [PATCH 1/8] Fix initial value --- packages/nice-form-react/src/adapters/antdAdapter.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nice-form-react/src/adapters/antdAdapter.tsx b/packages/nice-form-react/src/adapters/antdAdapter.tsx index 12ad15c..c039e73 100644 --- a/packages/nice-form-react/src/adapters/antdAdapter.tsx +++ b/packages/nice-form-react/src/adapters/antdAdapter.tsx @@ -249,7 +249,7 @@ const antdAdapter: NiceFormAdapter = { return newMeta; }, - // Todo: why do we need this method? seems can use form.getFieldValue directly? + // This ensures you can always get form value before form is connected/renderred getFieldValue: (fieldName: NamePath, meta: NiceFormMeta, form: FormInstance) => { const isFormConnected = Object.keys(form.getFieldsValue(true)).length > 0; if (isFormConnected) return form.getFieldValue(fieldName); @@ -325,7 +325,7 @@ const antdAdapter: NiceFormAdapter = { className: field.className || '', style: field.style || ({} as CSSProperties), // NOTE: use valuePropName at view mode so that UI is updated if initialValues changed at view mode. - valuePropName: field.valuePropName || viewMode ? 'initialValue' : 'value', + valuePropName: field.valuePropName || (viewMode ? 'initialValue' : 'value'), }; // These std keys are passed to Form.Item directly From 2cac3222b287e65b727d58d773eef6ee51c7521d Mon Sep 17 00:00:00 2001 From: Nate Wang Date: Tue, 2 Jul 2024 15:45:44 +0800 Subject: [PATCH 2/8] Up ver --- packages/nice-form-react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nice-form-react/package.json b/packages/nice-form-react/package.json index af64c0c..aefa8eb 100644 --- a/packages/nice-form-react/package.json +++ b/packages/nice-form-react/package.json @@ -1,7 +1,7 @@ { "name": "@ebay/nice-form-react", "private": false, - "version": "2.0.1", + "version": "2.0.2", "license": "MIT", "repository": "https://github.com/eBay/nice-form-react", "main": "./lib/cjs/index.js", From 7fc8479a23b5a48b99b5c63d8c40a680971ddee6 Mon Sep 17 00:00:00 2001 From: Nate Wang Date: Tue, 2 Jul 2024 15:54:32 +0800 Subject: [PATCH 3/8] Update Basic.tsx --- packages/examples-antd/src/examples/Basic.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/examples-antd/src/examples/Basic.tsx b/packages/examples-antd/src/examples/Basic.tsx index 298e186..e273187 100644 --- a/packages/examples-antd/src/examples/Basic.tsx +++ b/packages/examples-antd/src/examples/Basic.tsx @@ -8,7 +8,7 @@ const Basic = () => { const options = ['Apple', 'Orange', 'Banana']; const meta: AntdNiceFormMeta = { columns: 1, - initialValues: { obj: { input: 12 } }, + // initialValues: { obj: { input: 12 } }, layout: 'horizontal', wrapperProps: { labelCol: { @@ -34,7 +34,7 @@ const Basic = () => { key: 'rating', label: 'Rating', widget: Rate, - initialValue: 2, + initialValue: 3, condition: () => { return NiceForm.getFieldValue('checkbox', meta, form); }, @@ -45,12 +45,14 @@ const Basic = () => { label: 'Select', widget: 'select', required: true, + initialValue: 'Apple', options, }, { key: 'checkbox-group', label: 'Checkbox Group', widget: 'checkbox-group', + initialValue: 'Apple', options, }, { @@ -58,11 +60,14 @@ const Basic = () => { label: 'Radio Group', widget: 'radio-group', options, + initialValue: 'Orange', }, { key: 'radio-button-group', label: 'Radio Button Group', widget: 'radio-group', + initialValue: 'Orange', + widgetProps: { optionType: 'button', buttonStyle: 'solid', From c47e9fd9596acb085db00221dca00423ecf8a428 Mon Sep 17 00:00:00 2001 From: Nate Wang Date: Tue, 2 Jul 2024 16:37:50 +0800 Subject: [PATCH 4/8] Update example --- packages/examples-antd/src/examples/Basic.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/examples-antd/src/examples/Basic.tsx b/packages/examples-antd/src/examples/Basic.tsx index e273187..41bd585 100644 --- a/packages/examples-antd/src/examples/Basic.tsx +++ b/packages/examples-antd/src/examples/Basic.tsx @@ -8,7 +8,7 @@ const Basic = () => { const options = ['Apple', 'Orange', 'Banana']; const meta: AntdNiceFormMeta = { columns: 1, - // initialValues: { obj: { input: 12 } }, + initialValues: { obj: { input: 'Nate' } }, layout: 'horizontal', wrapperProps: { labelCol: { From 720f1e2c23ffaa835b83e38cc7e2fb8a699457df Mon Sep 17 00:00:00 2001 From: Lin Gao Date: Wed, 11 Sep 2024 14:13:57 +0800 Subject: [PATCH 5/8] :bug: Fixing disabled prop not working on field level. --- packages/nice-form-react/src/FormField.tsx | 2 +- packages/nice-form-react/src/NiceForm.tsx | 2 +- packages/nice-form-react/src/adapters/antdAdapter.tsx | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/nice-form-react/src/FormField.tsx b/packages/nice-form-react/src/FormField.tsx index 7fb8555..755bb18 100644 --- a/packages/nice-form-react/src/FormField.tsx +++ b/packages/nice-form-react/src/FormField.tsx @@ -31,7 +31,7 @@ const FormField = ({ const FormWidget = field.widget; const ViewWidget = field.viewWidget; - const widgetProps = { ...field.widgetProps, disabled: field.disabled || meta.disabled }; + const widgetProps = { ...field.widgetProps }; const { renderField, renderFieldWithoutLabel } = config; const content = renderField ? ( diff --git a/packages/nice-form-react/src/NiceForm.tsx b/packages/nice-form-react/src/NiceForm.tsx index debb8d3..1791cc6 100644 --- a/packages/nice-form-react/src/NiceForm.tsx +++ b/packages/nice-form-react/src/NiceForm.tsx @@ -34,7 +34,7 @@ const NiceForm = ({ meta }: { meta: NiceFormMeta }): ReactElement | null => { }); // disabled property are on both widgetProps and field - widgetProps.disabled = meta.disabled || field.disabled; + widgetProps.disabled = typeof field.disabled === 'boolean' ? field.disabled : meta.disabled delete convertedField.disabled; convertedField.widgetProps = widgetProps; diff --git a/packages/nice-form-react/src/adapters/antdAdapter.tsx b/packages/nice-form-react/src/adapters/antdAdapter.tsx index c039e73..5a08319 100644 --- a/packages/nice-form-react/src/adapters/antdAdapter.tsx +++ b/packages/nice-form-react/src/adapters/antdAdapter.tsx @@ -290,7 +290,6 @@ const antdAdapter: NiceFormAdapter = { const viewMode = meta.viewMode || field.viewMode; const widgetProps: NiceFormWidgetProps = { ...field.widgetProps, - disabled: field.disabled || meta.disabled, }; // Handle full width From e2ebb91c8ca0e8d7ad8b5b94205a71bf65139b1d Mon Sep 17 00:00:00 2001 From: Nate Wang Date: Mon, 16 Sep 2024 10:23:55 +0800 Subject: [PATCH 6/8] Update package.json --- packages/nice-form-react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nice-form-react/package.json b/packages/nice-form-react/package.json index aefa8eb..3406560 100644 --- a/packages/nice-form-react/package.json +++ b/packages/nice-form-react/package.json @@ -1,7 +1,7 @@ { "name": "@ebay/nice-form-react", "private": false, - "version": "2.0.2", + "version": "2.0.3", "license": "MIT", "repository": "https://github.com/eBay/nice-form-react", "main": "./lib/cjs/index.js", From 292b9ca2c3fef62f3e4959f2dea047fb0ee3e605 Mon Sep 17 00:00:00 2001 From: Nate Wang Date: Fri, 22 Nov 2024 14:55:04 +0800 Subject: [PATCH 7/8] Fix view edit example --- .actrc | 2 ++ packages/examples-antd/src/examples/ViewEdit.tsx | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .actrc diff --git a/.actrc b/.actrc new file mode 100644 index 0000000..167609a --- /dev/null +++ b/.actrc @@ -0,0 +1,2 @@ +--container-architecture=linux/amd64 +--pull=false \ No newline at end of file diff --git a/packages/examples-antd/src/examples/ViewEdit.tsx b/packages/examples-antd/src/examples/ViewEdit.tsx index 1166bd5..f5f553c 100644 --- a/packages/examples-antd/src/examples/ViewEdit.tsx +++ b/packages/examples-antd/src/examples/ViewEdit.tsx @@ -32,9 +32,11 @@ export default () => { const getMeta = () => { const meta: AntdNiceFormMeta = { columns: 2, + viewMode, + initialValues: personalInfo, fields: [ - { key: 'firstName', label: ' Name', required: true }, - { key: 'lastName', label: 'Last Name', required: true }, + { key: 'name.first', label: 'First Name', required: true }, + { key: 'name.last', label: 'Last Name', required: true }, { key: 'gender', label: 'Gender', From 5419df26d31f6446c3c7cf3bbb8a66fb1a554972 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 23:17:37 +0000 Subject: [PATCH 8/8] Bump prismjs from 1.29.0 to 1.30.0 in /packages/examples-formik Bumps [prismjs](https://github.com/PrismJS/prism) from 1.29.0 to 1.30.0. - [Release notes](https://github.com/PrismJS/prism/releases) - [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md) - [Commits](https://github.com/PrismJS/prism/compare/v1.29.0...v1.30.0) --- updated-dependencies: - dependency-name: prismjs dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- packages/examples-formik/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/examples-formik/package.json b/packages/examples-formik/package.json index 08deb79..351d685 100644 --- a/packages/examples-formik/package.json +++ b/packages/examples-formik/package.json @@ -19,7 +19,7 @@ "formik": "^2.4.5", "formik-mui-x-date-pickers": "^0.0.1", "notistack": "^3.0.1", - "prismjs": "1.29.0", + "prismjs": "1.30.0", "react": "^18.2.0", "react-dom": "^18.2.0" },