Skip to content
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.

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

feat: update pagination@2.3.0 support onChange called when pageSize change #24964

Merged
merged 5 commits into from Jun 13, 2020

Conversation

fireairforce
Copy link
Member

@fireairforce fireairforce commented Jun 12, 2020

[中文版模板 / Chinese template]

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / documentation update
  • Demo update
  • Component style update
  • TypeScript definition update
  • Bundle size optimization
  • Perfermance optimization
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

#24913

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English upgrade rc-pagination@2.3.0, support onChange called when pageSize change
🇨🇳 Chinese 更新了rc-pagination@2.3.0,支持当pageSize改变时,onChange的调用

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

View rendered components/table/index.en-US.md
View rendered components/table/index.zh-CN.md

@fireairforce
Copy link
Member Author

@fireairforce fireairforce commented Jun 12, 2020

@yoyo837
image

The props pagination in Transfer Component only support {pageSize: number} and boolean. So I don‘t make more changes or add test cases in this Component.

@fireairforce
Copy link
Member Author

@fireairforce fireairforce commented Jun 12, 2020

@yoyo837 Welcome review~

@ant-design-bot
Copy link
Contributor

@ant-design-bot ant-design-bot commented Jun 12, 2020

@ant-design-bot
Copy link
Contributor

@ant-design-bot ant-design-bot commented Jun 12, 2020

package.json Outdated Show resolved Hide resolved
@yoyo837 yoyo837 changed the title feat: update pagination@2.5.0 support onChange called when pageSize change feat: update pagination@2.3.0 support onChange called when pageSize change Jun 12, 2020
@codesandbox-ci
Copy link

@codesandbox-ci codesandbox-ci bot commented Jun 12, 2020

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 09ea572753df6250da8a08268c2bde4b6cf973a8:

Sandbox Source
antd reproduction template Configuration

@@ -180,6 +180,27 @@ describe('Table.pagination', () => {
);
});

// https://github.com/ant-design/ant-design/issues/24913
Copy link
Contributor

@yoyo837 yoyo837 Jun 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

应该为components/pagination添加onShowSizeChange触发onChange的测试用例,其他引用pagination的再根据必要性调整或者补充用例。

Copy link
Member Author

@fireairforce fireairforce Jun 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

奥,忘记给Paginatio组件加了😅
这里添加的两个组件是 ListTable 都有用户在 issue 里面反馈过了,所以就加了~

Copy link
Member Author

@fireairforce fireairforce Jun 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

但是 pagination 这个组件的测试用例,已经在 rc-pagination 那边加过了,这边也还要加吗?

Copy link
Member

@afc163 afc163 Jun 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

三个组件都可以分别加测试,不知道以后哪里会搞挂一个。

Copy link
Member Author

@fireairforce fireairforce Jun 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的,那这边的Pagination也加个~

Copy link
Contributor

@yoyo837 yoyo837 Jun 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

个人认为应该加,这里的CI 又不会跑那边的用例。并且本身这边用例也是针对rc-*有大量重叠。另外有一些人不用antd直接用rc-*做小功能的,用那边的用例。

Copy link
Member Author

@fireairforce fireairforce Jun 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的,已经加了~

@codesandbox-ci
Copy link

@codesandbox-ci codesandbox-ci bot commented Jun 12, 2020

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 1a2fd041ee768772248e70775caa4cd9891c1505:

Sandbox Source
antd reproduction template Configuration

@codesandbox-ci
Copy link

@codesandbox-ci codesandbox-ci bot commented Jun 12, 2020

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit f828a33:

Sandbox Source
antd reproduction template Configuration

@@ -100,7 +100,7 @@ describe('Table.pagination', () => {

wrapper.find('.ant-select-selector').simulate('mousedown');
wrapper.find('.ant-select-item').last().simulate('click');
expect(scrollTo).toHaveBeenCalledTimes(2);
expect(scrollTo).toHaveBeenCalledTimes(3);
Copy link
Member Author

@fireairforce fireairforce Jun 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里因为这次调整这里的触发次数就会是3了,因为pageSize的修改会触发onShowSizeChange 以及 onChange的调用。

Copy link
Member Author

@fireairforce fireairforce Jun 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Copy link
Member

@afc163 afc163 Jun 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为啥 onShowSizeChange 和 onChange 会触发 scrollTo。

Copy link
Contributor

@yoyo837 yoyo837 Jun 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好像是翻页默认滚到第一条

Copy link
Member Author

@fireairforce fireairforce Jun 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里我看了下逻辑以及自己实验了下,感觉是这样的,应该是pageSize和page改变的时候会触发这里的scroll,这里触发pageSize改变的时候,page被先被onChange那边更新一次,然后onShowSizeChange那边会更新一次 pageSize,这里就出现了scrollTo被调用两次的情况而不是像之前这里只被调用一次😅

Copy link
Member

@afc163 afc163 Jun 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

scrollTo 加个 debounce 就能避免短时间调用多次了。

Copy link
Member Author

@fireairforce fireairforce Jun 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里要怎么加这个debounce呢?= =不会对上面的调用频次产生影响吗?

Copy link
Member

@kerm1it kerm1it Jun 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

可以利用 requestAnimateFrame 做延迟调用,就是为了减少短时间内的实际调用次数

Copy link
Member Author

@fireairforce fireairforce Jun 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

其实这个scrollTo函数本身就是个raf...

Copy link
Member

@kerm1it kerm1it Jun 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

那就没问题了🆗

@codecov
Copy link

@codecov codecov bot commented Jun 12, 2020

Codecov Report

Merging #24964 into feature will decrease coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           feature   #24964      +/-   ##
===========================================
- Coverage    99.33%   99.33%   -0.01%     
===========================================
  Files          370      370              
  Lines         7376     7373       -3     
  Branches      2052     2010      -42     
===========================================
- Hits          7327     7324       -3     
  Misses          49       49              
Impacted Files Coverage Δ
components/list/index.tsx 100.00% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e5348e7...f828a33. Read the comment docs.

afc163
afc163 approved these changes Jun 13, 2020
chenshuai2144 added a commit that referenced this issue Jun 28, 2020
* feat: add successColor for Progress (#24655)

* feat: add successColor for Progress

* feat: update

* fix: update test

* remove snap

* feat: add test case

* refactor success

* feat: adjust styyle

* feat: add DevWarning

* feat: Support rowSelection.dirty (#24718)

* feat: Support rowSelection.dirty

* rename to reserveKeys

* preserveKeys will keep record also

* to preserveSelectedRowKeys

* feat: add ghost prop for collapse (#24734)

* feat: add ghost prop for collapse

* doc: version of collapse's ghost prop

* refactor: make ghost collapse's less code to a nested style

* chore: remove redundant codes in ghost collapse's less & doc

* doc: add a background wrapper for ghost collapse demo

* doc: dark-theme wrapper bg-color for ghost collapse demo

* test: update snapshot of ghost collapse

* doc: use softer bg-color on ghost collapse demo

* doc: remove disabled panel in ghost collapse demo

* feat: form instance support getFieldInstance (#24711)

* support getFieldInstance

* update doc

* fix lint

* move func

* move into hooks

* update ref logic

* fix lint

* rm only

* fix docs

* feat: dropdown support arrow (#23869)

* feat: dropdown support arrow prop

close #22758

* test: update snapshot

* fix: fix dropdown cls names

* test: update snapshot

* test: update snapshot

* doc: update demo

* test: update demo snapshot

* demo

* fix: snapshot

* chore: change the style of ghost collapse & demo modified (#24762)

* refactor: reduce content padding in ghost collapse

* doc: remove the wrapper outside ghost collapse

Designer want the demo differs from other demos

* refactor: remove redundant .less code in collapse

* feat: cascader dropdown-render prop (#24812)

* feat: cascader dropdown-render prop

* fix: update Cascader dropdownRender type annotation

* fix: set rc-cascader semver from ^ to ~

* docs: fix coding style in cascader/custom-dropdown

* feat: 🆕 support Drawer closeIcon (#24842)

* feat: 🆕 support Drawer closeIcon

close #19283
close #19153

* add test case

* update docs

* feat: 🆕 Cascader expandIcon (#24865)

* feat: cascader expandIcon

* fix: snap

* refactor: reduce CSS size (#24846)

* refactor: reduce button css size

* refactor: remove redundant button .less code

* feat: add Table onChange an action param (#24697)

* Working on tests

* created TableAction type

* changed TableActions to tuple

* removed chinese documentation line

* refactor TableActions

* fix documentation

* Moved action into extra param

* minor doc change

* feat: add closeIcon customize tag close (#24885)

* feat: add closeIcon customize tag close

* docs fix

* update snap

* fix: css name

* update snapshot

* snapshot

* feat: add radio `optionType` api to set radio option type (#24809)

* feat: radio component

* docs: update md

* fix: snap

* test components

* fix: use optionType

* fix name

* add warning

* fix

* feat: expand rate character (#24903)

* feat: expand rate character

* fix: demo

* fix: snap

* Update components/rate/index.zh-CN.md

Co-authored-by: 偏右 <afc163@gmail.com>

* fix

Co-authored-by: 偏右 <afc163@gmail.com>

* Refactor demo code box actions (#24887)

* refactor: refine the styling of actions part of demo code-box

* fix: lint style

* refactor: move Result children to end (#24945)

* feat: remove content max-width on dot-step (#24907)

* feat: add Skeleton-Image (#24805)

* feat: add Skeleton-Image

* feat: add docs

* fix: adjust skeleton

* feat: adjust Image Component

* feat: rebase

* feat: adjust style

* fix: lint

* feat: remove size

* feat: delete md

* feat: fix style

*  feat: Mentions support autoSize (#24961)

close #17746

* chore: replace textarea with rc-textarea (#24966)

* feat: update pagination@2.3.0 support onChange called when pageSize change (#24964)

* feat: update pagination@2.5.0 and add test case to relative component

* fix: lint

* delete

* feat: add test case for pagination

* adjust test case

* feat: Implement centered prop in Tabs (#24958)

* Implement centered in Tabs along with its tests and docs

* Fix build error

* Add Chinese translations and remove test case

Co-authored-by: Ashkan Pourghasem <ashkan.pourghasem@gmail.com>

* feat: Add modal style parameter (#24773)

* add some paramters in default.less

* Update components/style/themes/default.less

Co-authored-by: Amumu <yoyo837@hotmail.com>

* change parameter in compact.less

Co-authored-by: Crystal Gao <jinggao@ebay.com>
Co-authored-by: Amumu <yoyo837@hotmail.com>

* feat: export Tabs addIcon (#25006)

* feat: export Tabs addIcon

* update snapshot

* feat: showNow on timepicker and datetimepicker (#25032)

* feat: update rc-picker@1.7.1 and fix icons of month and quarter picker in DatePicker Component (#25035)

* feat: update rc-picker@1.7.1

* delete

* add

* feat: expand rate support props (#24993)

* docs: 📝 Add Form.Item hidden in doc (#25108)

close #25101

* fix: ⌨️ Improve Pagination accessibility issue (#25119)

* ⌨️ Improve Pagination a11y by fixing a W3C error

react-component/pagination#280

* update snapshot

* 🆙 rc-pagination to 2.4.1

* feat: support triggerSubMenuAction for <Menu /> (#25127)

* feat(menu): add triggerSubMenuAction for Menu

* feat(menu): test cases

* chore: Adjust picker logic (#25135)

* chore: update rc-picker 1.10.0 (#25174)

* feat: table row check strictly (#24931)

* feat: add checkStrictly on Table.rowSelection

* fix: LGTM warnings

* test: table rowSelection.checkStrictly

* test: add cov [wip]

* refactor: tree.rowSelection.checkStrictly [wip]

* test: table.rowSelection.checkStrictly basic case

* feat: support rowKey on checkStrictly table

* feat: Table checkStrictly support getCheckboxProps

* docs: Table checkStrictly

* chore: typo

* chore: remove useless comment

* chore: update snapshot

* chore: update snapshot

* fix: fire selectAll on selection dropdown menu & changeRows incorrect in selectAll callback

* docs: typo

* chore

* chore

* fix: expand buttons of leaf rows in tree data are not hidden

* feat: Table warning about rowKey index parameter

* perf: only generate keyEntities when not checkStrictly

* refactor: remove useless parseCheckedKeys

* refactor: get derived selected & half selected keys from selectedRowKeys

* chore: remove env condition stmt

* chore: revert index usage & code formatting

* chore: rerun ci

* docs: table tree-data checkstrictly

* test: update snapshots

* refactor: use useMergedState hook

* chore: rerun ci

* chore: rerun ci 2

* chore: revert selection select all behavior

* refactor: refactor code based on feature

* chore: revert table code format

* chore: revert table code format

* fix: useMemo deps

* fix: useMemo deps

* fix: useMemo deps

* feat: support preserve (#25186)

* docs: add responsibly order for Col (#25139)

* feat: add type

* feat: add responsibly order cols

* feat: add docs

* feat: add test case

* fix test

Co-authored-by: 二货机器人 <smith3816@gmail.com>
Co-authored-by: 偏右 <afc163@gmail.com>
Co-authored-by: zoomdong <1344492820@qq.com>
Co-authored-by: 07akioni <07akioni2@gmail.com>
Co-authored-by: wendellhu <wendellhu95@gmail.com>
Co-authored-by: xrkffgg <xrkffgg@gmail.com>
Co-authored-by: Neto Braghetto <netow93@gmail.com>
Co-authored-by: Kermit Xuan <kermitlx@outlook.com>
Co-authored-by: Ashkan Pourghasem <64011067+ashkan-pm@users.noreply.github.com>
Co-authored-by: Ashkan Pourghasem <ashkan.pourghasem@gmail.com>
Co-authored-by: hicrystal <295247343@qq.com>
Co-authored-by: Crystal Gao <jinggao@ebay.com>
Co-authored-by: Amumu <yoyo837@hotmail.com>
Co-authored-by: Li Ming <armyiljfe@gmail.com>
@chenshuai2144 chenshuai2144 mentioned this pull request Jun 29, 2020
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants