fix(antd/next): remove RecordScope (#3726)

alibaba · Feb 17, 2023 · 29c347a · 29c347a
1 parent 75d36d2
commit 29c347a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 32 deletions.
diff --git a/packages/antd/src/form/index.tsx b/packages/antd/src/form/index.tsx
@@ -31,23 +31,21 @@ export const Form: React.FC<React.PropsWithChildren<FormProps>> = ({
 }) => {
   const top = useParentForm()
   const renderContent = (form: FormType | ObjectField) => (
-    <RecordScope getRecord={() => (isForm(form) ? form.values : form.value)}>
-      <PreviewText.Placeholder value={previewTextPlaceholder}>
-        <FormLayout {...props}>
-          {React.createElement(
-            component,
-            {
-              onSubmit(e: React.FormEvent) {
-                e?.stopPropagation?.()
-                e?.preventDefault?.()
-                form.submit(onAutoSubmit).catch(onAutoSubmitFailed)
-              },
+    <PreviewText.Placeholder value={previewTextPlaceholder}>
+      <FormLayout {...props}>
+        {React.createElement(
+          component,
+          {
+            onSubmit(e: React.FormEvent) {
+              e?.stopPropagation?.()
+              e?.preventDefault?.()
+              form.submit(onAutoSubmit).catch(onAutoSubmitFailed)
             },
-            props.children
-          )}
-        </FormLayout>
-      </PreviewText.Placeholder>
-    </RecordScope>
+          },
+          props.children
+        )}
+      </FormLayout>
+    </PreviewText.Placeholder>
   )
   if (form)
     return <FormProvider form={form}>{renderContent(form)}</FormProvider>

diff --git a/packages/next/src/form/index.tsx b/packages/next/src/form/index.tsx
@@ -41,23 +41,21 @@ export const Form: React.FC<React.PropsWithChildren<FormProps>> = ({
   }, [lang])
 
   const renderContent = (form: FormType | ObjectField) => (
-    <RecordScope getRecord={() => (isForm(form) ? form.values : form.value)}>
-      <PreviewText.Placeholder value={previewTextPlaceholder}>
-        <FormLayout {...props}>
-          {React.createElement(
-            component,
-            {
-              onSubmit(e: React.FormEvent) {
-                e?.stopPropagation?.()
-                e?.preventDefault?.()
-                form.submit(onAutoSubmit).catch(onAutoSubmitFailed)
-              },
+    <PreviewText.Placeholder value={previewTextPlaceholder}>
+      <FormLayout {...props}>
+        {React.createElement(
+          component,
+          {
+            onSubmit(e: React.FormEvent) {
+              e?.stopPropagation?.()
+              e?.preventDefault?.()
+              form.submit(onAutoSubmit).catch(onAutoSubmitFailed)
             },
-            props.children
-          )}
-        </FormLayout>
-      </PreviewText.Placeholder>
-    </RecordScope>
+          },
+          props.children
+        )}
+      </FormLayout>
+    </PreviewText.Placeholder>
   )
 
   if (form)