Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/hooks/useMergedState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,12 @@ export default function useControlledState<T, R = T>(
}
}

// Effect of reset value to `undefined`
React.useEffect(() => {
if (value === undefined) {
setInnerValue(value);
}
}, [value]);

return [(mergedValue as unknown) as R, triggerChange];
}
25 changes: 25 additions & 0 deletions tests/hooks.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as React from 'react';
import { mount } from 'enzyme';
import useMemo from '../src/hooks/useMemo';
import useMergedState from '../src/hooks/useMergedState';

describe('hooks', () => {
it('useMemo', () => {
Expand All @@ -25,4 +26,28 @@ describe('hooks', () => {
wrapper.setProps({ data: 'repeat', open: true });
expect(wrapper.find('div').props().memoData).toEqual('repeat');
});

describe('useMergedState', () => {
const FC = ({ value }) => {
const [val, setVal] = useMergedState(null, { value });
return (
<input
value={val}
onChange={e => {
setVal(e.target.value);
}}
/>
);
};

it('still control of to undefined', () => {
const wrapper = mount(<FC value="test" />);

expect(wrapper.find('input').props().value).toEqual('test');

wrapper.setProps({ value: undefined });
wrapper.update();
expect(wrapper.find('input').props().value).toEqual(undefined);
});
});
});