Merge pull request #8910 from WiXSL/fix-eh-exec-order

Fix custom input's onChange handlers should have access to updated context value

Author: djhi

packages/ra-core/src/form/useInput.spec.tsx

@@ -17,6 +17,26 @@ const Input: FunctionComponent<
     return children(inputProps);
 };
 
+const InputWithCustomOnChange: FunctionComponent<
+    {
+        children: (props: ReturnType<typeof useInput>) => ReactElement;
+    } & InputProps & { setContextValue?: (value: string) => void }
+> = ({ children, setContextValue, ...props }) => {
+    const { getValues } = useFormContext();
+
+    return (
+        <Input
+            {...props}
+            onChange={e => {
+                props.onChange(e);
+                setContextValue(getValues()[props.source]);
+            }}
+        >
+            {children}
+        </Input>
+    );
+};
+
 describe('useInput', () => {
     it('returns the props needed for an input', () => {
         let inputProps;
@@ -106,6 +126,46 @@ describe('useInput', () => {
         expect(handleBlur).toHaveBeenCalled();
     });
 
+    it('custom onChange handler should have access to updated context input value', () => {
+        let targetValue, contextValue;
+        const handleChange = e => {
+            targetValue = e.target.value;
+        };
+        const setContextValue = value => {
+            contextValue = value;
+        };
+
+        render(
+            <CoreAdminContext dataProvider={testDataProvider()}>
+                <Form onSubmit={jest.fn()}>
+                    <InputWithCustomOnChange
+                        source="title"
+                        resource="posts"
+                        onChange={handleChange}
+                        setContextValue={setContextValue}
+                        defaultValue=""
+                    >
+                        {({ id, field }) => (
+                            <input
+                                type="text"
+                                id={id}
+                                aria-label="Title"
+                                {...field}
+                            />
+                        )}
+                    </InputWithCustomOnChange>
+                </Form>
+            </CoreAdminContext>
+        );
+        const input = screen.getByLabelText('Title');
+
+        fireEvent.change(input, {
+            target: { value: 'Changed title' },
+        });
+        expect(targetValue).toBe('Changed title');
+        expect(contextValue).toBe('Changed title');
+    });
+
     describe('defaultValue', () => {
         it('applies the defaultValue when input does not have a value', () => {
             const onSubmit = jest.fn();

packages/ra-core/src/form/useInput.ts

@@ -87,21 +87,21 @@ export const useInput = <ValueType = any>(
     useApplyInputDefaultValues(props);
 
     const onBlur = useEvent((...event: any[]) => {
+        controllerField.onBlur();
         if (initialOnBlur) {
             initialOnBlur(...event);
         }
-        controllerField.onBlur();
     });
 
     const onChange = useEvent((...event: any[]) => {
-        if (initialOnChange) {
-            initialOnChange(...event);
-        }
         const eventOrValue = (props.type === 'checkbox' &&
         event[0]?.target?.value === 'on'
             ? event[0].target.checked
             : event[0]?.target?.value ?? event[0]) as any;
         controllerField.onChange(parse ? parse(eventOrValue) : eventOrValue);
+        if (initialOnChange) {
+            initialOnChange(...event);
+        }
     });
 
     const field = {