fix(abstractquickedit): get new state in closure

nick-ChenZe · Aug 1, 2022 · c3a59e9 · c3a59e9
1 parent 275207e
commit c3a59e9
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/AbstractQuickEdit.tsx b/src/AbstractQuickEdit.tsx
@@ -8,6 +8,7 @@ import React, {
     useMemo,
     createContext,
     useContext,
+    useEffect,
 } from 'react';
 import c from 'classnames';
 import {useDerivedState} from '@huse/derived-state';
@@ -78,6 +79,8 @@ const register = <P extends {onChange?: (...args: any[]) => any, value?: unknown
     }) => {
         const [editValue, setEditValue] = useDerivedState(value);
         const containerRef = useRef(null);
+        const intervalRef = useRef<any>(null);
+
         const [shouldRenderEditComponent, switchShouldRenderEditComponent] = useDerivedState(editing);
 
         const {defaultEditComponentProps, disableEnterKey} = options;
@@ -177,7 +180,7 @@ const register = <P extends {onChange?: (...args: any[]) => any, value?: unknown
                     handleOnChangeWhenValueChanged(updator(editValue));
                 }
                 else {
-                    handleOnChangeWhenValueChanged(updator);
+                    handleOnChangeWhenValueChanged(editValue);
                 }
                 switchEditStatus(false);
             },
@@ -189,11 +192,18 @@ const register = <P extends {onChange?: (...args: any[]) => any, value?: unknown
             [onChangeValueByEffect]
         );
 
+        useEffect(
+            () => {
+                intervalRef.current = onChangeValueByEffect;
+            },
+            [onChangeValueByEffect]
+        );
+
         useClickOutside(containerRef, () => {
             setTimeout(
                 () => {
                     if (shouldRenderEditComponent) {
-                        onChangeValueByEffect(editValue);
+                        intervalRef.current();
                     }
                 },
                 0
@@ -225,7 +235,7 @@ const register = <P extends {onChange?: (...args: any[]) => any, value?: unknown
                             {...defaultEditComponentProps}
                             disabled={disabled}
                             onChange={handleChange}
-                            value={editValue}
+                            value={value}
                         />
                     ) : (
                         displayComponent