Skip to content

refactor: Upgrade utils and replace useMergedState #657

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
Sep 16, 2025
Merged

refactor: Upgrade utils and replace useMergedState #657

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f3ffdc
refactor: Upgrade utils and replace useMergedState
Sep 12, 2025
bdf24bb
Update src/Pagination.tsx
EmilyyyLiu Sep 12, 2025
1df56cc
Update src/Pagination.tsx
EmilyyyLiu Sep 12, 2025
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"prepare": "husky"
},
"dependencies": {
"@rc-component/util": "^1.2.0",
"@rc-component/util": "^1.3.0",
"classnames": "^2.3.2"
},
"devDependencies": {
Expand Down
25 changes: 14 additions & 11 deletions src/Pagination.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classNames from 'classnames';
import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
import useControlledState from '@rc-component/util/lib/hooks/useControlledState';
import KeyCode from '@rc-component/util/lib/KeyCode';
import pickAttrs from '@rc-component/util/lib/pickAttrs';
import warning from '@rc-component/util/lib/warning';
Expand Down Expand Up @@ -75,17 +75,20 @@ const Pagination: React.FC<PaginationProps> = (props) => {

const paginationRef = React.useRef<HTMLUListElement>(null);

const [pageSize, setPageSize] = useMergedState<number>(10, {
value: pageSizeProp,
defaultValue: defaultPageSize,
});
const [pageSize, setPageSize] = useControlledState<number>(
defaultPageSize || 10,
pageSizeProp,
);

const [current, setCurrent] = useMergedState<number>(1, {
value: currentProp,
defaultValue: defaultCurrent,
postState: (c) =>
Math.max(1, Math.min(c, calculatePage(undefined, pageSize, total))),
});
const [internalCurrent, setCurrent] = useControlledState<number>(
defaultCurrent || 1,
currentProp,
);

const current = Math.max(
1,
Math.min(internalCurrent, calculatePage(undefined, pageSize, total)),
);

const [internalInputVal, setInternalInputVal] = React.useState(current);

Expand Down