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

fix: use well typed PaginationLocale from rc-pagination #32128

Merged
merged 1 commit into from
Sep 11, 2021
Merged

fix: use well typed PaginationLocale from rc-pagination #32128

merged 1 commit into from
Sep 11, 2021

Conversation

JounQin
Copy link
Contributor

@JounQin JounQin commented Sep 11, 2021

[中文版模板 / Chinese template]

🤔 This is a ...

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

🔗 Related issue link

N/A

💡 Background and solution

PaginationLocale is currently any, and can be improved

📝 Changelog

Language Changelog
🇺🇸 English fix: use well typed PaginationLocale from rc-pagination
🇨🇳 Chinese 修复: 使用 rc-pagination 中完好定义的 PaginationLocale

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

@github-actions
Copy link
Contributor

Prepare preview

@codecov
Copy link

codecov bot commented Sep 11, 2021

Codecov Report

Merging #32128 (97b5805) into master (9f2560f) will not change coverage.
The diff coverage is n/a.

❗ Current head 97b5805 differs from pull request most recent head 2d076e8. Consider uploading reports for the commit 2d076e8 to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##           master   #32128   +/-   ##
=======================================
  Coverage   99.96%   99.96%           
=======================================
  Files         414      414           
  Lines        7566     7566           
  Branches     2114     2114           
=======================================
  Hits         7563     7563           
  Misses          3        3           
Impacted Files Coverage Δ
components/pagination/Pagination.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 a9951d8...2d076e8. Read the comment docs.

@afc163
Copy link
Member

afc163 commented Sep 11, 2021

/rebase

@afc163 afc163 merged commit c4f74c0 into ant-design:master Sep 11, 2021
@JounQin JounQin deleted the fix/PaginationLocale branch September 11, 2021 13:49
afc163 pushed a commit that referenced this pull request Sep 13, 2021
* feat: inherit rc-pagination props, more customizable

close #32128, #32129

* chore: CustomSelect.Option is required by rc-pagination

* fix: LocaleReceivier types issue

* fix: lint issue, pageSize must be presented
Rain120 pushed a commit to Rain120/ant-design that referenced this pull request Sep 14, 2021
Rain120 pushed a commit to Rain120/ant-design that referenced this pull request Sep 14, 2021
* feat: inherit rc-pagination props, more customizable

close ant-design#32128, ant-design#32129

* chore: CustomSelect.Option is required by rc-pagination

* fix: LocaleReceivier types issue

* fix: lint issue, pageSize must be presented
afc163 added a commit that referenced this pull request Sep 14, 2021
* feat: doc of week format in date-picker

* feat: doc of week format in date-picker

* fix: set the tree-switcher-leaf-line position (#32075)

* fix(image): small size hide preview text (#29900)

* fix(image): small size hide preview text

* fix: image preview text ellipsis

* fix: reset test

* chore: improve icon search experience (#32098)

* chore: improve icon search experience

close #32097

* chore: search result empty data

* feat: Georgian translation (#32106)

* parent 18cd401
author Primlx <primulax@live.com> 1628778277 +0400
committer primulax <primulax@live.com> 1631181358 +0400

Add files via upload

add georgian translation

Create ka_GE.tsx

Create ka_GE

Rename ka_GE to ka_GE.tsx

Create ka_GE.tsx

Update ka_GE.tsx

Update ka_GE.tsx

Create ka_GE.tsx

update rc-picker version

Create ka_GE.tsx

Create ka_GE

Rename ka_GE to ka_GE.tsx

Update ka_GE.tsx

Update ka_GE.tsx

Create ka_GE.tsx

update rc-picker version

* Update package.json

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

* test case

* add language option in markdown

* test

* Update components/calendar/locale/ka_GE.tsx

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

* Update components/calendar/locale/ka_GE.tsx

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

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

* docs: Update research-message-and-feedback.zh-CN.md (#32112)

* fix: Use latest rc-picker version with defaultPickerValue/showTime fix (#32107)

* update rc-picker dependency to 2.5.17

* add test: DatePicker.RangePicker with defaultPickerValue and showTime

* fix: missing `default.css` (#32116)

* chore: Add CI for compile

* chore: Add missing compile file

* docs: fix typo (#32121)

* fix: preserve table pagination className (#32131)

close #32130

* fix: use well typed PaginationLocale from rc-pagination (#32128)

* docs: fix typo

* fix: useMessage() should use getPopupContainer from <ConfigProvider />… (#31939)

* fix:useMessage() should use getPopupContainer from <ConfigProvider /> #31841

* fix: useMessage() should use getPopupContainer from <ConfigProvider /> #31841

* add test case for useMessage hook

* restore some changes

* try to restore files agains

* restore and keep the same as upstream master

* restore files

* restore some definition

* feat: inherit rc-pagination props, more customizable (#32132)

* feat: inherit rc-pagination props, more customizable

close #32128, #32129

* chore: CustomSelect.Option is required by rc-pagination

* fix: LocaleReceivier types issue

* fix: lint issue, pageSize must be presented

* chore: add Button.shape 'default'  definition (#32004)

* feat: add Button.shape 'default'

* fix: ignore shape when falsy value

* fix: generate className only when shape match

* fix: remove necessary .ant-btn-default and update snapshot

* fix: Cascader missing props (#32143)

* fix: Cascader deps

* docs: Update using new API

* test: Test case cover

* chore: compressed skip dup check

* chore: remove redundant space after `should` (#32141)

* chore(deps-dev): bump eslint-plugin-unicorn from 35.0.0 to 36.0.0 (#32149)

Bumps [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn) from 35.0.0 to 36.0.0.
- [Release notes](https://github.com/sindresorhus/eslint-plugin-unicorn/releases)
- [Commits](sindresorhus/eslint-plugin-unicorn@v35.0.0...v36.0.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-unicorn
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: fix modal demo in small screen

* refactor(dropdown): add dropdownButtonType export and refactor defaultProps (#31957)

Co-authored-by: btea <2356281422@qq.com>
Co-authored-by: drizzlesconsin <69514654+drizzlesconsin@users.noreply.github.com>
Co-authored-by: afc163 <afc163@gmail.com>
Co-authored-by: Primlx <primulax@live.com>
Co-authored-by: Amumu <yoyo837@hotmail.com>
Co-authored-by: in_vane <52909860+in-vane@users.noreply.github.com>
Co-authored-by: Thomas Zipner <thomas.zipner@gmail.com>
Co-authored-by: 二货机器人 <smith3816@gmail.com>
Co-authored-by: MD. Ariful Alam <swazan.arif@gmail.com>
Co-authored-by: JounQin <admin@1stg.me>
Co-authored-by: James <daoxingyue@live.cn>
Co-authored-by: 绯一 <jaredleechn@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Zuobin Wang <49583235+Dreamerryao@users.noreply.github.com>
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.

2 participants