fix: bugs on pageSize change in List #24514

fireairforce · 2020-05-27T15:44:36Z

🤔 This is a ...

🔗 Related issue link

📝 Changelog

Language	Changelog
🇺🇸 English	None
🇨🇳 Chinese	无

⚠️ 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

ant-design-bot · 2020-05-27T15:49:23Z

ant-design-bot · 2020-05-27T15:49:25Z

fireairforce · 2020-05-27T15:52:57Z

感觉这个 LIst 组件原本的测试样例挂的有点多啊...

hengkx · 2020-05-27T16:16:56Z

yarn test -u

yoyo837 · 2020-05-28T02:29:41Z

好像不能单纯这么改，props的pagination变化的时候呢？

xrkffgg · 2020-05-28T02:34:08Z

PR 里的 changelog 要填写，不要删。

fireairforce · 2020-05-28T06:02:15Z

PR 里的 changelog 要填写，不要删。

好的

fireairforce · 2020-05-28T06:14:52Z

好像不能单纯这么改，props的pagination变化的时候呢？

这个地方按照以前那个逻辑，如果在props里面的pagination 按照 issue 那样写死了 current 参数，点页码切换的时候也只会停在写死的那个页码那里。这个地方本身的逻辑就有些问题。

fireairforce · 2020-05-28T06:16:11Z

好像不能单纯这么改，props的pagination变化的时候呢？

https://codesandbox.io/s/antd-reproduction-template-52sep?file=/index.js:0-760 具体可以参考这个逻辑

yoyo837 · 2020-05-28T06:20:02Z

ref: #10357

fireairforce · 2020-05-28T06:38:04Z

好像不能单纯这么改，props的pagination变化的时候呢？

@yoyo837 看了您提供的pr，这个地方觉得还是因为这个问题？我觉得修改这里之后 props中pagination并不会对其他地方造成影响，因为下面的 total，current,pageSize都会保持更新，pagination其他参数的更新也会正常更新。= =

yoyo837 · 2020-05-28T06:41:36Z

我的意思是，看能不能处理下pagination的更新，顺手改掉这个问题。

fireairforce · 2020-05-28T08:41:39Z

我的意思是，看能不能处理下pagination的更新，顺手改掉这个问题。

好的，这里我晚上回家研究一下~

yoyo837 · 2020-05-28T10:47:13Z

PR 里的 changelog 要填写，不要删。

好的

changelog 要面向用户写而非面向开发人员，虽然我也经常不由自主这样干 😂

fireairforce · 2020-05-28T11:05:35Z

PR 里的 changelog 要填写，不要删。

好的

changelog 要面向用户写而非面向开发人员，虽然我也经常不由自主这样干 😂

哈哈哈，好的，谢谢提醒

fireairforce · 2020-05-28T14:31:55Z

@yoyo837 那看看这样可行吗？ QUQ

codecov · 2020-05-28T15:01:00Z

Codecov Report

Merging #24514 into master will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master   #24514   +/-   ##
=======================================
  Coverage   99.21%   99.21%           
=======================================
  Files         365      365           
  Lines        7287     7290    +3     
  Branches     2035     2037    +2     
=======================================
+ Hits         7230     7233    +3     
  Misses         57       57

Impacted Files	Coverage Δ
components/list/index.tsx	`100.00% <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 dda650c...b9904ae. Read the comment docs.

fireairforce · 2020-05-28T15:45:40Z

我补一下测试~

fireairforce · 2020-05-28T16:52:03Z

PTAL

fireairforce · 2020-05-29T02:55:14Z

貌似感觉修错了bug。。。用户反馈的是改变 pageSize 时候 onChange 函数没有被调用，pageSize 改变时的调用 api 是 onShowSizeChange?

yoyo837 · 2020-05-29T03:00:52Z

你的意思是用户需要自行通过 onShowSizeChange 的监听修改传入的分页信息来达到切换size的效果？

yoyo837 · 2020-05-29T03:01:23Z

那这样思考的话，就不是bug了。当前就是对的

afc163 · 2020-05-29T03:02:31Z

改变 pageSize 也应该触发 onChange，因为 current page 基本上会变。

yoyo837 · 2020-05-29T03:12:41Z

改变 pageSize 也应该触发 onChange，因为 current page 基本上会变。

最终的size 任然由用户通过onChange修改传入值吗？

@fireairforce 那就往 onShowSizeChange 没触发 onChange 的方向改。

fireairforce · 2020-05-29T03:15:33Z

好的，不好意思，我刚开始可能思考方向想错了，谢谢~

afc163 · 2020-05-29T03:16:49Z

可以参考 Table 的处理。

yoyo837 · 2020-05-29T03:29:14Z

但是<Pagination /> 组件本身使用时onShowSizeChange只是个独立的回调，不需要根据值重新处理再传入给组件

fireairforce · 2020-05-29T03:42:19Z

改变 pageSize 也应该触发 onChange，因为 current page 基本上会变。

最终的size 任然由用户通过onChange修改传入值吗？

@fireairforce 那就往 onShowSizeChange 没触发 onChange 的方向改。

这里的pageSize应该是

通过这里切换？

fireairforce · 2020-06-03T10:37:23Z

done~

yoyo837 · 2020-06-03T10:47:53Z

补一下用例呗，onSizeChange搭配onChange的

fireairforce · 2020-06-03T10:50:36Z

好，下班晚上回去补~

fireairforce · 2020-06-03T15:01:52Z

每次用git rebase upstream/xxx 与主库同步之后，推上来就得-f，捂脸.jpg

fireairforce · 2020-06-03T15:02:02Z

done了~

fireairforce · 2020-06-04T03:30:48Z

PTAL

fireairforce · 2020-06-05T10:02:14Z

rebase了

afc163 · 2020-06-05T10:05:30Z

components/list/__tests__/pagination.test.js

+
+    wrapper.find('.ant-select-selector').simulate('mousedown');
+    wrapper.find('.ant-select-item-option').at(1).simulate('click');
+    expect(handlePaginationChange).toBeCalled();


toHaveBeenCalledWidth，把参数也写出来。

afc163 · 2020-06-05T10:05:48Z

components/list/index.tsx

@@ -106,6 +106,11 @@ function List<T>({
    return (page: number, pageSize: number) => {
      setPaginationCurrent(page);
      setPaginationSize(pageSize);
+      if (eventName === 'onShowSizeChange') {
+        if (pagination) {


这一行不需要。

类型还有false，不能少

https://www.typescriptlang.org/play/#code/MYewdgzgLgBAHnGBeGBvAvjAhhNNwDCAFlmAOYCmA-AFwwAUAlMgHwwBuIAlgCYyYAfGACMQIADYVSAbgBQCKgDpCJchSbSgA

果然推断不出来。

fireairforce · 2020-06-05T10:29:32Z

Done~

pr-triage bot added the PR: unreviewed label May 27, 2020

fireairforce force-pushed the master branch from 5a283c6 to 46c3ba2 Compare May 28, 2020 14:28

fireairforce force-pushed the master branch from 05705e0 to 8a516ae Compare June 3, 2020 14:58

fireairforce added 13 commits June 5, 2020 18:00

fix: bugs on pageSize change in List

8c3b9e4

fix: update pagination props

6c28ae8

fix: delete console

ef0760e

fix: lint

7f6ab6e

feat: add test case

681286f

feat: test case

d37de59

feat: add test case

1d2dc63

fix: update

bd8cd20

adjust

254468c

fix: lint

1623ff1

feat: adjust code

955a84f

fix: lint

60d7081

feat: add test case

17986fd

fireairforce force-pushed the master branch from 8a516ae to 17986fd Compare June 5, 2020 10:01

afc163 reviewed Jun 5, 2020

View reviewed changes

feat: complete test case

b9904ae

afc163 merged commit e508ee7 into ant-design:master Jun 6, 2020

pr-triage bot added PR: merged and removed PR: unreviewed labels Jun 6, 2020

afc163 mentioned this pull request Jun 6, 2020

docs: 4.3.2 changelog #24765

Merged

fix: bugs on pageSize change in List #24514

fix: bugs on pageSize change in List #24514

Conversation

fireairforce commented May 27, 2020 • edited

🤔 This is a ...

🔗 Related issue link

📝 Changelog

ant-design-bot commented May 27, 2020 • edited

ant-design-bot commented May 27, 2020 • edited

fireairforce commented May 27, 2020 • edited

hengkx commented May 27, 2020

yoyo837 commented May 28, 2020

xrkffgg commented May 28, 2020

fireairforce commented May 28, 2020

fireairforce commented May 28, 2020 • edited

fireairforce commented May 28, 2020

yoyo837 commented May 28, 2020

fireairforce commented May 28, 2020 • edited

yoyo837 commented May 28, 2020

fireairforce commented May 28, 2020

yoyo837 commented May 28, 2020

fireairforce commented May 28, 2020

fireairforce commented May 28, 2020

codecov bot commented May 28, 2020 • edited

Codecov Report

fireairforce commented May 28, 2020

fireairforce commented May 28, 2020

fireairforce commented May 29, 2020 • edited

yoyo837 commented May 29, 2020

yoyo837 commented May 29, 2020

afc163 commented May 29, 2020

yoyo837 commented May 29, 2020

fireairforce commented May 29, 2020

afc163 commented May 29, 2020

yoyo837 commented May 29, 2020

fireairforce commented May 29, 2020

fireairforce commented Jun 3, 2020

yoyo837 commented Jun 3, 2020

fireairforce commented Jun 3, 2020

fireairforce commented Jun 3, 2020

fireairforce commented Jun 3, 2020

fireairforce commented Jun 4, 2020

fireairforce commented Jun 5, 2020

afc163 Jun 5, 2020 • edited

Choose a reason for hiding this comment

fireairforce Jun 5, 2020

Choose a reason for hiding this comment

afc163 Jun 5, 2020

Choose a reason for hiding this comment

yoyo837 Jun 5, 2020

Choose a reason for hiding this comment

afc163 Jun 5, 2020

Choose a reason for hiding this comment

fireairforce commented Jun 5, 2020

fireairforce commented May 27, 2020 •

edited

ant-design-bot commented May 27, 2020 •

edited

ant-design-bot commented May 27, 2020 •

edited

fireairforce commented May 27, 2020 •

edited

fireairforce commented May 28, 2020 •

edited

fireairforce commented May 28, 2020 •

edited

codecov bot commented May 28, 2020 •

edited

fireairforce commented May 29, 2020 •

edited

afc163 Jun 5, 2020 •

edited