Skip to content

fix: Should always merge #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 23, 2022
Merged

fix: Should always merge #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93ba6f6
add should alway use option value
chenshuai2144 Jun 23, 2022
6725d6e
fix: merge logic
zombieJ Jun 23, 2022
f8c0305
chore: use fun
zombieJ Jun 23, 2022
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
14 changes: 9 additions & 5 deletions src/hooks/useMergedState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ const useUpdateEffect: typeof React.useEffect = (callback, deps) => {
}, []);
};

/** We only think `undefined` is empty */
function hasValue(value: any) {
return value !== undefined;
}

/**
* Similar to `useState` but will use props value if provided.
* Note that internal use rc-util `useState` hook.
Expand All @@ -50,10 +55,10 @@ export default function useMergedState<T, R = T>(
let finalValue: T = undefined;
let source: Source;

if (value !== undefined) {
if (hasValue(value)) {
finalValue = value;
source = Source.PROP;
} else if (defaultValue !== undefined) {
} else if (hasValue(defaultValue)) {
finalValue =
typeof defaultValue === 'function'
? (defaultValue as any)()
Expand All @@ -70,9 +75,8 @@ export default function useMergedState<T, R = T>(
return [finalValue, source, finalValue];
});

const postMergedValue = postState
? postState(mergedValue[0])
: mergedValue[0];
const chosenValue = hasValue(value) ? value : mergedValue[0];
const postMergedValue = postState ? postState(chosenValue) : chosenValue;

// ======================= Sync =======================
useUpdateEffect(() => {
Expand Down
30 changes: 30 additions & 0 deletions tests/hooks.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,9 @@ describe('hooks', () => {
setMergedValue(v => v + 1);
setMergedValue(v => v + 1);
}}
onMouseEnter={() => {
setMergedValue(1);
}}
>
{mergedValue}
</span>
Expand All @@ -217,6 +220,8 @@ describe('hooks', () => {
expect(onChange).not.toHaveBeenCalled();

// Click update
rerender(<Demo value={undefined} />);
fireEvent.mouseEnter(container.querySelector('span'));
fireEvent.click(container.querySelector('span'));
expect(container.textContent).toEqual('3');
expect(onChange).toHaveBeenCalledWith(3, 1);
Expand Down Expand Up @@ -251,6 +256,31 @@ describe('hooks', () => {
fireEvent.mouseEnter(container.querySelector('span'));
expect(onChange).toHaveBeenCalledWith(2, 1);
});

it('should alway use option value', () => {
const onChange = jest.fn();

const Test = ({ value }) => {
const [mergedValue, setMergedValue] = useMergedState(undefined, {
value,
onChange,
});
return (
<span
onClick={() => {
setMergedValue(12);
}}
>
{mergedValue}
</span>
);
};

const { container } = render(<Test value={1} />);
fireEvent.click(container.querySelector('span'));

expect(container.textContent).toBe('1');
});
});

describe('useLayoutEffect', () => {
Expand Down