fix(antd/next): fix editable closing being blocked by other controller

alibaba · Apr 18, 2021 · edd7a67 · edd7a67
1 parent 9cd615b
commit edd7a67
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/packages/antd/src/editable/index.tsx b/packages/antd/src/editable/index.tsx
@@ -11,7 +11,7 @@ import cls from 'classnames'
  * 默认Inline展示
  */
 
-interface IPopoverProps extends PopoverProps {}
+type IPopoverProps = PopoverProps
 
 type ComposedEditable = React.FC<IFormItemProps> & {
   Popover?: React.FC<IPopoverProps & { title?: React.ReactNode }>
@@ -138,13 +138,16 @@ Editable.Popover = observer((props) => {
   const [visible, setVisible] = useState(false)
   const prefixCls = usePrefixCls('formily-editable')
   const closePopover = async () => {
-    await field.form.validate(`${field.address}.*`)
-    const errors = field.form.queryFeedbacks({
-      type: 'error',
-      address: `${field.address}.*`,
-    })
-    if (errors?.length) return
-    setVisible(false)
+    try {
+      await field.form.validate(`${field.address}.*`)
+    } finally {
+      const errors = field.form.queryFeedbacks({
+        type: 'error',
+        address: `${field.address}.*`,
+      })
+      if (errors?.length) return
+      setVisible(false)
+    }
   }
   const openPopover = () => {
     setVisible(true)

diff --git a/packages/next/src/editable/index.tsx b/packages/next/src/editable/index.tsx
@@ -12,7 +12,7 @@ import cls from 'classnames'
  * 默认Inline展示
  */
 
-interface IPopoverProps extends PopoverProps {}
+type IPopoverProps = PopoverProps
 
 type ComposedEditable = React.FC<IFormItemProps> & {
   Popover?: React.FC<IPopoverProps & { title?: React.ReactNode }>
@@ -137,13 +137,16 @@ Editable.Popover = observer(({ ...props }) => {
   const [visible, setVisible] = useState(false)
   const prefixCls = usePrefixCls('formily-editable')
   const closePopover = async () => {
-    await field.form.validate(`${field.address}.*`)
-    const errors = field.form.queryFeedbacks({
-      type: 'error',
-      address: `${field.address}.*`,
-    })
-    if (errors?.length) return
-    setVisible(false)
+    try {
+      await field.form.validate(`${field.address}.*`)
+    } finally {
+      const errors = field.form.queryFeedbacks({
+        type: 'error',
+        address: `${field.address}.*`,
+      })
+      if (errors?.length) return
+      setVisible(false)
+    }
   }
   const openPopover = () => {
     setVisible(true)