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

Typography support collapse #47264

Merged
merged 42 commits into from Mar 20, 2024
Merged

Typography support collapse #47264

merged 42 commits into from Mar 20, 2024

Conversation

crazyair
Copy link
Member

@crazyair crazyair commented Jan 31, 2024

[中文版模板 / 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
  • Workflow
  • Other (about what?)

🔗 Related issue link

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English Typography ellipsis supports expand and collapse
🇨🇳 Chinese 文本省略支持展开和收起

☑️ Self-Check before Merge

⚠️ Please check all items below before requesting a reviewing. ⚠️

  • 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

Copy link

stackblitz bot commented Jan 31, 2024

Review PR in StackBlitz Codeflow Run & review this pull request in StackBlitz Codeflow.

Copy link
Contributor

github-actions bot commented Jan 31, 2024

size-limit report 📦

Path Size
./dist/antd.min.js 334.79 KB (+61 B 🔺)
./dist/antd-with-locales.min.js 381.71 KB (+265 B 🔺)

Copy link

codesandbox-ci bot commented Jan 31, 2024

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.

@MadCcc MadCcc changed the base branch from master to feature January 31, 2024 11:32
Copy link

codecov bot commented Jan 31, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 100.00%. Comparing base (1bd8fbc) to head (d5066c2).

Additional details and impacted files
@@            Coverage Diff            @@
##           feature    #47264   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          739       739           
  Lines        12675     12679    +4     
  Branches      3328      3333    +5     
=========================================
+ Hits         12675     12679    +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@afc163
Copy link
Member

afc163 commented Feb 2, 2024

混入了别的 commits

@crazyair
Copy link
Member Author

crazyair commented Feb 2, 2024

混入了别的 commits

同步 master。我恢复下

@@ -141,7 +141,7 @@ coverDark: https://mdn.alipayobjects.com/huamei_7uahnr/afts/img/A*LT2jR41Uj2EAAA
rows: number,
expandable: boolean,
suffix: string,
symbol: ReactNode,
Copy link
Member Author

Choose a reason for hiding this comment

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

正想说呢,现在都是 ts 了,还有必要加 console 提示吗?一个还用 js 的话项目,会在乎你控制台吗

@zombieJ
Copy link
Member

zombieJ commented Feb 4, 2024

感觉 @crazyair 之前给的建议可以结合一下:

--  expandable?: boolean;
++ expandable?: boolean | 'collapsible';
-- symbol?: React.ReactNode;
++ symbol?: React.ReactNode | { expand?: React.ReactNode, collapse?: React.ReactNode };

@crazyair
Copy link
Member Author

crazyair commented Feb 4, 2024

symbol 是 ReactNode 类型,ReactNode 没有方法,好改。但是改成对象,这个不好改吧

@ant-design ant-design deleted a comment from github-actions bot Mar 16, 2024
@ant-design ant-design deleted a comment from github-actions bot Mar 16, 2024
@crazyair crazyair requested review from zombieJ and afc163 March 16, 2024 07:22
Copy link
Contributor

github-actions bot commented Mar 16, 2024

👁 Visual Regression Report for PR #47264 Passed ✅

🎯 Target branch: feature (1bd8fbc)
📖 View Full Report ↗︎

🎊 Congrats! No visual-regression diff found.

Copy link
Contributor

github-actions bot commented Mar 16, 2024

Preview failed

@yoyo837
Copy link
Contributor

yoyo837 commented Mar 20, 2024

preview 不会自己好?

@crazyair
Copy link
Member Author

preview 不会自己好?

我记得我还是删过一次评论,让他重新生成。。

@zombieJ zombieJ merged commit 47bd5ec into feature Mar 20, 2024
105 checks passed
@zombieJ zombieJ deleted the add-collapse branch March 20, 2024 03:39
Copy link
Contributor

🎉 Thank you for your contribution! If you have not yet joined our DingTalk community group, please feel free to join us (when joining, please provide the link to this PR).

🎉 感谢您的贡献!如果您还没有加入钉钉社区群,请扫描下方二维码加入我们(加群时请提供此 PR 链接)。

CooperHash pushed a commit to CooperHash/ant-design that referenced this pull request Mar 23, 2024
* feat: typograohy support collapse

* feat: snap

* feat: test

* feat: 单测不符合预期

* feat: test

* feat: 恢复

* feat: test

* feat: test

* feat: 修改命名

* feat: 代码优化

* feat: 添加控制台提示

* feat: snap

* feat: symbol support function

* feat: snap

* fix: text

* feat: snap

* feat: api 修改

* feat: key 修改

* feat: 去掉参数

* feat: lint

* feat: snap

* feat: test

* feat: use 2

* feat: review

* feat: test

* chore: part of it

* chore: fix auto collapse logic

* feat: 修改 doc 单测

* feat: doc

* test: update testcase

* docs: add more

---------

Co-authored-by: 二货机器人 <smith3816@gmail.com>
CooperHash pushed a commit to CooperHash/ant-design that referenced this pull request Mar 23, 2024
* feat: typograohy support collapse

* feat: snap

* feat: test

* feat: 单测不符合预期

* feat: test

* feat: 恢复

* feat: test

* feat: test

* feat: 修改命名

* feat: 代码优化

* feat: 添加控制台提示

* feat: snap

* feat: symbol support function

* feat: snap

* fix: text

* feat: snap

* feat: api 修改

* feat: key 修改

* feat: 去掉参数

* feat: lint

* feat: snap

* feat: test

* feat: use 2

* feat: review

* feat: test

* chore: part of it

* chore: fix auto collapse logic

* feat: 修改 doc 单测

* feat: doc

* test: update testcase

* docs: add more

---------

Co-authored-by: 二货机器人 <smith3816@gmail.com>
MadCcc added a commit that referenced this pull request Mar 31, 2024
* fix: consistent with the tag component, the processing state uses colorInfo token. (#47695)

Signed-off-by: pfdgithub <pfdgithub@users.noreply.github.com>

* feat: Notification support aria-* in closable (#47710)

* feat: Notification support aria-* in closable

* feat: optimize code

* Cascader support option render (#47727)

* feat: done

* feat: doc

* feat: improve Transfer `key` type (#47879)

* feat: add Transfer's key type

* docs: update prop

* fix: key type

* fix: cycle dependency

* chore: update size limit (#47903)

Signed-off-by: Amumu <yoyo837@hotmail.com>

* chore: update size limit (#47904)

* feat: add Uzbek(latn) locale (#47899)

* feat: add Uzbek(latn) locale

* size-limit

* Update docs/react/i18n.zh-CN.md

Co-authored-by: afc163 <afc163@gmail.com>
Signed-off-by: Amumu <yoyo837@hotmail.com>

---------

Signed-off-by: Amumu <yoyo837@hotmail.com>
Co-authored-by: afc163 <afc163@gmail.com>
Co-authored-by: lijianan <574980606@qq.com>

* feat: support `showSorterTooltip.target` for Table sorters (#47409)

* Added `sorterTooltipTarget` prop for table sorters

* demo updated

* updated snapshot

* updated snapshot

* moved table tooltip target to `showSorterTooltip`

* fix

* updated docs

* empty commit

* updated version in docs

---------

Co-authored-by: Alina Andrieieva <Alina_Andrieieva@epam.com>

* feat: CP support FloatButton.Group closeIcon (#47953)

* Typography support collapse (#47264)

* feat: typograohy support collapse

* feat: snap

* feat: test

* feat: 单测不符合预期

* feat: test

* feat: 恢复

* feat: test

* feat: test

* feat: 修改命名

* feat: 代码优化

* feat: 添加控制台提示

* feat: snap

* feat: symbol support function

* feat: snap

* fix: text

* feat: snap

* feat: api 修改

* feat: key 修改

* feat: 去掉参数

* feat: lint

* feat: snap

* feat: test

* feat: use 2

* feat: review

* feat: test

* chore: part of it

* chore: fix auto collapse logic

* feat: 修改 doc 单测

* feat: doc

* test: update testcase

* docs: add more

---------

Co-authored-by: 二货机器人 <smith3816@gmail.com>

* feat: Table support onScroll event (#47986)

* feat: Popover can be closed by ESC when trigger is focus or click (#47928)

* feat:Add keydown event to handle escape

* fix

* fix:use exact same logic with popconfirm

* fix:move same logic from popconfirm to popover

* fix

* fix

* add test

* fix

* fix

* fix

* test size-limit

* fix

* fix popconfirm test

* fix

* fix

---------

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

* chore: update size-limit (#48014)

* feat: steps support for circular progress bar (#47940)

* feat: steps support for circular progress bar

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

Co-authored-by: afc163 <afc163@gmail.com>
Signed-off-by: lijianan <574980606@qq.com>

* Update components/progress/index.en-US.md

Signed-off-by: lijianan <574980606@qq.com>

* Update components/progress/index.en-US.md

Signed-off-by: lijianan <574980606@qq.com>

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

Signed-off-by: lijianan <574980606@qq.com>

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

Signed-off-by: lijianan <574980606@qq.com>

* Update components/progress/index.en-US.md

Signed-off-by: lijianan <574980606@qq.com>

* Update components/progress/progress.tsx

Signed-off-by: lijianan <574980606@qq.com>

* Update components/progress/__tests__/index.test.tsx

Signed-off-by: lijianan <574980606@qq.com>

* Update components/progress/demo/circle-steps.tsx

Signed-off-by: lijianan <574980606@qq.com>

* Update components/progress/index.en-US.md

Signed-off-by: lijianan <574980606@qq.com>

* Update components/progress/index.en-US.md

Signed-off-by: lijianan <574980606@qq.com>

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

Signed-off-by: lijianan <574980606@qq.com>

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

Signed-off-by: lijianan <574980606@qq.com>

* Update circle-steps.tsx

* Update components/progress/progress.tsx

Signed-off-by: lijianan <574980606@qq.com>

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

Signed-off-by: lijianan <574980606@qq.com>

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

Signed-off-by: lijianan <574980606@qq.com>

* Update components/progress/index.en-US.md

Signed-off-by: lijianan <574980606@qq.com>

* Update components/progress/index.en-US.md

Signed-off-by: lijianan <574980606@qq.com>

* Update package.json

* Update components/progress/demo/circle-steps.md

Co-authored-by: afc163 <afc163@gmail.com>
Signed-off-by: lijianan <574980606@qq.com>

---------

Signed-off-by: lijianan <574980606@qq.com>
Co-authored-by: lijianan <574980606@qq.com>
Co-authored-by: afc163 <afc163@gmail.com>

* demo: update Progress demo (#48052)

* demo: update Progress demo

* fix: fix

* fix: fix

* fix: fix

* fix: update snap

* chore: update size-limit (#48098)

* feat: add Scrollbar css token (#48109)

* feat: add Scrollbar css token

* docs: update docs

* feat: upgrade react-slick (#48093)

* feat: upgrade react-slick

* test: update snapshots

* test: update snapshots

---------

Co-authored-by: lijianan <574980606@qq.com>

* Revert "feat: add Scrollbar css token (#48109)" (#48115)

This reverts commit d0cc93b.

* feat: Input.OTP component support (#48076)

* chore: basic control

* chore: input instad

* docs: update demo

* chore: adjust operation interactive

* chore: lock selection

* chore: fix patch logic

* chore: merge logic

* chore: patch autoFocus

* test: update snapshot

* test: add test case

* test: coverage

* chore: update size limit

* docs: update docs

* test: fix test case

* chore: update comment

* refactor: change to length

* chore: blur all

* chore: size limit

* fix: Upload remove margin using flex display (#48091)

* fix: remove upload margin with flex

* fix

* use support not

* fix

* feat: copy support async (#48123)

* feat: copy support async

* feat: add test

* feat: doc

* feat: snap

* feat: add loading

* feat: 恢复 try

* feat: 判断是否是 Error

* feat: throw error

* feat: 为了醋包了饺子

* feat: remove code

* feat: add loading test

* fix: test

* fix: icon import way

* chore: improve test case code

* chore: improve test case code

---------

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

* feat: Table add `rowHoverable` to disable hover interaction (#48112)

* feat: Tag support aria-* in closable (#47678)

* feat: Tag support aria-* in closable

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* feat: optimize code

* refactor: useClosable

* chore: modal

* fix: check logic

* chore: clean up

* feat: optimize code

* feat: optimize code

---------

Signed-off-by: kiner-tang <1127031143@qq.com>
Co-authored-by: 二货机器人 <smith3816@gmail.com>

---------

Signed-off-by: pfdgithub <pfdgithub@users.noreply.github.com>
Signed-off-by: Amumu <yoyo837@hotmail.com>
Signed-off-by: lijianan <574980606@qq.com>
Signed-off-by: kiner-tang <1127031143@qq.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: pfdgithub <pfdgithub@users.noreply.github.com>
Co-authored-by: kiner-tang <1127031143@qq.com>
Co-authored-by: 叶枫 <7971419+crazyair@users.noreply.github.com>
Co-authored-by: lijianan <574980606@qq.com>
Co-authored-by: 章鱼怪 <hi.madocto@gmail.com>
Co-authored-by: Amumu <yoyo837@hotmail.com>
Co-authored-by: afc163 <afc163@gmail.com>
Co-authored-by: Alina Andrieieva <emilialina@list.ru>
Co-authored-by: Alina Andrieieva <Alina_Andrieieva@epam.com>
Co-authored-by: 二货机器人 <smith3816@gmail.com>
Co-authored-by: Cooper <73218815+CooperHash@users.noreply.github.com>
Co-authored-by: yykoypj <601924094@qq.com>
@MadCcc MadCcc mentioned this pull request Mar 31, 2024
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

8 participants