From 09031f75555ecb86b0684f73d015d24d157fc699 Mon Sep 17 00:00:00 2001 From: zhanglei66 <38252062+zhanglei66@users.noreply.github.com> Date: Thu, 7 Jul 2022 18:33:05 +0800 Subject: [PATCH] Zl/style modify (#78) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: replace `git.io` link with the original URL (#35261) * fix: Table columns sorter a11y experience (#35269) * Make table sortable columns focusable and keyboard accessible. * Fix typo. * Change focus style for sortable table column header from broken outline to color text. * Update snapshots. * Change order to fix lint error. * Add unit test to test sorting with keypress. * Update components/table/hooks/useSorter.tsx * chore: improve code style * style: use focus-visible * fix: test case * test: update snapshot Co-authored-by: Katsiaryna Pustakhod * feat: support icon only in segmented (#35256) * feat: support icon only with segmented * fix: lint issue * chore: update * test: fix * test: update snapshot * feat: dropdown auto-focus (#35307) * feat: dropdown auto-focus * chore: update rc-tabs * docs: update space demos * fix: Space duplicated key warning (#35311) close #35305 * Added pending filter translations Table locale/es_ES (#35309) Co-authored-by: Jesús Gallego Irles * chore: Add code file owner * chore: more owner files * docs: fix form instance type error (#35320) * feat: set proper height for Segmented (#35281) * style: tweak BreadCrumb link hover color (#35324) * chore: Aligning the CI description and its behavior (#35325) * test: Rewrite mountTest with testing lib (#35326) * feat: Form disabled (#35210) * feat: add form disabled * feat: add form disabled * feat: add radio disabled * feat: update snap * feat: add test case * docs: add instruction about tokenSeparators (#35329) * test: replace Empty part test with test lib (#35289) * test: replace Empty part test with test lib * test: update snapshot case * fix: Switch disabled color in dark theme (#35332) * Revert "feat: dropdown auto-focus (#35307)" (#35337) This reverts commit 1ff58d23f08d8d7f487c123f21eaf5d3a79f95e9. * docs: update Tabs component onEdit prop describe (#35271) * docs: update Tabs component onEdit prop describe * docs: update Tabs component onEdit prop describe * Apply suggestions from code review Co-authored-by: afc163 * docs: changelog for 4.20.2 (#35338) * docs: add changelog for #35336 * style: fix Select tag remove icon position (#35336) The icon is pushed down a bit * test: update test case * test: transfer part of tooltip test case to testing library (#35362) * test: refactor test cases of Space (#35372) * test: migrate part of anchor tests (#35371) * test: migrate part of checkbox tests (#35354) * fix: Carousel compatible with vertical property (#35349) * chore: fix npm start error in Gitpod close #33444 * Revert "chore: fix npm start error in Gitpod" This reverts commit 978226fb13a7ec2c4ee07bb8eeba6bb18188a622. * fix: table column filter reset is not working (#35226) (#35386) * fix: Respect user provided space item key (#35344) * Resolve Ant Design Notification component TypeScript error via adding maxCount as an ArgsProps property (#35369) * fix: use less variables for Segmented (#35387) * docs: reverse React 18 demo * feat: Dropdown support autoFocus (#35391) * feat: Dropdown support autoFocus * chore: add bundle size * test: replace textarea some test case with testing lib (#35398) * test: replace textarea some test case with testing lib * test: full process * test: mv input test to input scope * test: fix lint * refactor: Progress rebuild as function component (#35393) * refactor: Progress rebuild as function component * refactor: Progress rebuild as function component * refactor: Progress rebuild as function component * refactor: Progress rebuild as function component * refactor: Progress rebuild as function component * refactor: Progress rebuild as function component * refactor: Progress rebuild as function component * chore: rm useless console * chore: rm CODEOWNER since this block github action * test: transfer tooltip test case to testing library * ci: trigger the pr check * test: try to fix the pr check * test: remove some test case * test: foreach all placement * feat: focus menu item automaticly when focusing menu (#35407) * feat: focus menu item automaticly when focusing menu * chore: update mentions * test: fix test case * chore: decrease bundle size * chore: increase bundle size * fix(): wipe out unnecessary prop (#35409) * fix: wipe out unnecessary prop * wipe out unnecessary prop(`row-gap: 0px`) on * add test case * chore: remove unnecessary import * chore: add prop to Row and Col * chore: update snapshot (Form/Grid/Card) * chore: update snapshot * chore: move location * docs: explain Avatar fallback strategy (#35415) The original description was unclear, incomplete, and confusing, requiring a look at the code to understand it, so I revised it to a more understandable version. * fix: arrow style (#35401) * fix: arrow style * fix: raise arrow z-index * fix: fix defualt arrow color * fix: mix shadow * chore: code clean * chore: code clean * fix: use fadeout instead * test: fix style lint * test: replace some slepp with jest.runAllTimers * chore: update snapshot * Revert "test: replace some slepp with jest.runAllTimers" This reverts commit ad886d1f65d83a92bc9810d6d74c71a3dc1cc608. * fix: List.Item ref (#35321) * fix: list item ref * add test * improve * fix: List.Item typescript (#35418) * chore: eslint add consistent-type-imports (#35419) * chore: eslint add consistent-type-imports * fix avatar * Update Item.tsx * chore: change menu icon in site * docs: update mirror link (#35424) * docs: update mirror link * feat: add modal * feat: add icon * chore: code clean * feat: text * fix: cancel btn * chore: split chunks (#35222) * chore: split chunks * chore: update bisheng version * chore: split @ant-design/icon * chore: code clean * chore: test * chore: split moment * chore: code clean * fix: add missing localizations (#35430) * Add missing localizations * Update snapshot * refactor: Progress type="circle" for some issues (#35433) * refactor: Progress type="circle" for some issues close #17706 close #35009 close #35352 * test: update progress snapshot * docs: update linecap.md * Update components/progress/demo/linecap.md * test: update progress snapshot * fix: rc-progress@~3.3.1 * fix: rc-progress@~3.3.2 * docs: add 4.20.3 changelog (#35435) * docs: add 4.20.3 changelog * Update CHANGELOG.zh-CN.md Co-authored-by: afc163 * fix typo * Update CHANGELOG.zh-CN.md Co-authored-by: afc163 * Update CHANGELOG.en-US.md Co-authored-by: afc163 * Update CHANGELOG.zh-CN.md Co-authored-by: afc163 * fix typo * fix typo * fix typo * fix typo Co-authored-by: afc163 * feat: edit date-picker to hook (#35425) * docs: update demo template (#35440) * docs: fix typo (#35439) * chore: fixed typo * chore: fixed typo+1 * chore(deps-dev): bump husky from 7.0.4 to 8.0.1 (#35451) Bumps [husky](https://github.com/typicode/husky) from 7.0.4 to 8.0.1. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v7.0.4...v8.0.1) --- updated-dependencies: - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * test: update snapshot (#35452) * chore: optimze LGTM (#35443) * chore: optimze LGTM * chore: type * fix: dev broken (#35453) * chore(deps-dev): upgrade to jest 28 (#35334) https://jestjs.io/zh-Hans/docs/upgrading-to-jest28 * fix: bad List.Item type (#35454) (#35455) Co-authored-by: Ron Smeral * docs: replace class component with hooks (#35461) * docs(badge): replace class component with hooks * docs(button): replace class component with hooks * docs(calendar): replace class component with hooks * docs(card): replace class component with hooks * docs(button): replace class component with hooks * chore(deps): remove webpack devDependencies * refactor: remove cascader displayRender warning (#35417) * refactor: remove useless warning (#35291) * refactor: remove useless test case * docs: remove cascader tagRender * perf: refactor devWarning for production code size (#35411) * pref: better code style for production * refactor `devWarning` * don't use `useEffect` only wrap `devWarning` * chore: add 'noop' to coverage * chore: add test cases for devWarning * chore: add test case * chore: update test cases for devWarning * chore: restore test script command * fix: remove 'throw new Error' * should not use `throw` for browser * chore: update test case for AutoComplete * perf: add prefix for `devWarning` * update RegExp for UMD * add prefix for ES and CJS * chore: better code style * perf: * upgrade antd-tools * remove `injectWarningCondition` * rename `devWarning` to `warning` * chore: better code style * chore: better code style * chore: restore hasValidName * docs: replace class component with hooks (#35472) * docs(badge): replace class component with hooks * docs(button): replace class component with hooks * docs(calendar): replace class component with hooks * docs(card): replace class component with hooks * docs(button): replace class component with hooks * chore(deps): remove webpack devDependencies * docs(cascader): replace class component with hooks * docs(checkbox): replace class component with hooks * docs(collapse): replace class component with hooks * docs(comment): replace class component with hooks * docs(descriptions): replace class component with hooks * chore: fix LGTM * docs: indicate that menu items require `key`s (#35474) * docs: remove editable in table documentation close https://github.com/ant-design/ant-design/pull/35471#issuecomment-1123239879 * fix: tree checkbox margin in rtl mode (#35491) * docs: Table QA about rowSelection renderCell (#35494) * Update index.zh-CN.md 之前需要在 可选列的勾选框 中增加 Tooltip，没有在文档中找到相关的文档，通过搜索 issue，以为暂时不支持，看了源码才发现已经支持了。 所以想要完善一下文档，可以方便其他用户找到此内容。 * docs: Table QA about rowSelection renderCell update US doc * docs: changelog 4.20.4 (#35495) * docs: changelog 4.20.4 * chore: emoji * docs: replace class component with hooks (#35500) * docs(badge): replace class component with hooks * docs(button): replace class component with hooks * docs(calendar): replace class component with hooks * docs(card): replace class component with hooks * docs(button): replace class component with hooks * chore(deps): remove webpack devDependencies * docs(cascader): replace class component with hooks * docs(checkbox): replace class component with hooks * docs(collapse): replace class component with hooks * docs(comment): replace class component with hooks * docs(descriptions): replace class component with hooks * docs(config-provider): replace class component with hooks * docs(date-picker): replace class component with hooks * test: update snapshot * fix(statistic): ignore the decimal part when the precision is negative (#35520) * test: Update snapshot * test: Update snapshot (#35529) * refactor: Card loading (#35525) * feat: card loading with skeleton * test: update snapshot * test: add style deps * chore: import * docs: update work with us part * refactor: modal confirm button style (#35530) * fix: modal rtl style * fix: cannot use logic css * chore: change css writing order * feat: update changelog * test: moving to testing-library in `Segmented` (#35538) * test(Segmented): moving to testing-library * chore: cleanup * fix: test * test: use click instead of change to fire event * Update index.test.tsx * fix: Picker focus & blur not working (#35552) * docs: replace class component with hooks (#35519) * docs(badge): replace class component with hooks * docs(button): replace class component with hooks * docs(calendar): replace class component with hooks * docs(card): replace class component with hooks * docs(button): replace class component with hooks * chore(deps): remove webpack devDependencies * docs(cascader): replace class component with hooks * docs(checkbox): replace class component with hooks * docs(collapse): replace class component with hooks * docs(comment): replace class component with hooks * docs(descriptions): replace class component with hooks * docs(config-provider): replace class component with hooks * docs(date-picker): replace class component with hooks * docs(drawer): replace class component with hooks * docs(dropdown): replace class component with hooks * docs(dropdown): replace class component with hooks * docs(empty): replace class component with hooks * docs(grid): replace class component with hooks * docs(input): replace class component with hooks * docs(input-number): replace class component with hooks * docs(demo): fix lint error * chore: deprecated rowSelection.onSelectNone and onSelectMultiple (#35545) * chore: del unused package && downgrade some packages which related webpack@5 (#35551) * docs: changelog 4.20.5 (#35560) * chore: Update github action release helper release title * fix: drawer close speed (#35339) * fix: drawer close speed * chroe: snap * chroe: test * chroe: test * feat: remove file * feat: 重新整理 * feat: forceRender * feat: snap * chroe: test * chroe: test * chroe: test * feat: create event * feat: diff code * feat: forceRender * chore: test (#35364) * Update components/drawer/index.tsx Co-authored-by: afc163 * feat: remove load state * feat: test * fix: destroyOnClose * feat: add load * fix: update snap * fix: update snap * feat: reset test * feat: docs * feat: test * feat: test Co-authored-by: afc163 * docs: fix 4.20.5 changelog typo (#35567) * refactor: reduce empty cycling deps (#35570) * chore: rm in root * chore: fix ts * test: Update snapshot * chore: ignore part * chore: delete extra spaces (#35582) Co-authored-by: hezhaoshun * docs: replace class component with hooks (#35580) * docs(badge): replace class component with hooks * docs(button): replace class component with hooks * docs(calendar): replace class component with hooks * docs(card): replace class component with hooks * docs(button): replace class component with hooks * chore(deps): remove webpack devDependencies * docs(cascader): replace class component with hooks * docs(checkbox): replace class component with hooks * docs(collapse): replace class component with hooks * docs(comment): replace class component with hooks * docs(descriptions): replace class component with hooks * docs(config-provider): replace class component with hooks * docs(date-picker): replace class component with hooks * docs(drawer): replace class component with hooks * docs(dropdown): replace class component with hooks * docs(dropdown): replace class component with hooks * docs(empty): replace class component with hooks * docs(grid): replace class component with hooks * docs(input): replace class component with hooks * docs(input-number): replace class component with hooks * docs(demo): fix lint error * docs(layout): replace class component with hooks * docs(list): replace class component with hooks * docs(mentions): replace class component with hooks * docs: fix code review issue * chore: bump tools version (#35594) * style: fix Table header border when has rowSpan (#35591) close #35577 * docs: Update CHANGELOG.zh-CN.md (#35604) * feat: add a new locale tk_TK (#35605) * feat: add a new locale tk_TK * fix: fix moment locale * feat: table rowSelection.onChange support type (#35598) * feat: table rowSelection onChange support method * docs: update * chore: rename param * test: update * test: update * Update rebase.yml * docs: Fix DatePicker throw demo * style: anchor text is overwritten (#35612) Co-authored-by: hezhaoshun * docs: replace class component with hooks (#35613) * docs(badge): replace class component with hooks * docs(button): replace class component with hooks * docs(calendar): replace class component with hooks * docs(card): replace class component with hooks * docs(button): replace class component with hooks * chore(deps): remove webpack devDependencies * docs(cascader): replace class component with hooks * docs(checkbox): replace class component with hooks * docs(collapse): replace class component with hooks * docs(comment): replace class component with hooks * docs(descriptions): replace class component with hooks * docs(config-provider): replace class component with hooks * docs(date-picker): replace class component with hooks * docs(drawer): replace class component with hooks * docs(dropdown): replace class component with hooks * docs(dropdown): replace class component with hooks * docs(empty): replace class component with hooks * docs(grid): replace class component with hooks * docs(input): replace class component with hooks * docs(input-number): replace class component with hooks * docs(demo): fix lint error * docs(layout): replace class component with hooks * docs(list): replace class component with hooks * docs(mentions): replace class component with hooks * docs: fix code review issue * docs(modal): replace class component with hooks * docs: feat components TS demo (#34742) * docs: add general components TS demo * docs: add layout components TS demo * docs: add navigation components TS demo * docs: add data entry components TS demo * chore(deps): add types for qs * docs: add data display TS demo * docs: add feedback components TS demo * docs: add other components TS demo * chore(deps): add types * docs: unified demo code style * docs: fix lint error * docs: add demo TS type * docs: fix demo TS type * test: update snapshot * docs: fix TS demo * feat: update Rate character type * docs: fix lint error * feat: update Rate character type * feat: update Rate character type * fix: Remove Grid row and cell aria roles (#35616) close https://github.com/ant-design/ant-design/issues/35549 * test: move test cases to `@testing/library` for Result (#35621) * fix: incorrect position of picker popup (#35620) Co-authored-by: yangpj17 close #35590 * feat: add-testing-lib (#35626) * docs: Convert part demo to ts version (#35641) * docs(badge): replace class component with hooks * docs(button): replace class component with hooks * docs(calendar): replace class component with hooks * docs(card): replace class component with hooks * docs(button): replace class component with hooks * chore(deps): remove webpack devDependencies * docs(cascader): replace class component with hooks * docs(checkbox): replace class component with hooks * docs(collapse): replace class component with hooks * docs(comment): replace class component with hooks * docs(descriptions): replace class component with hooks * docs(config-provider): replace class component with hooks * docs(date-picker): replace class component with hooks * docs(drawer): replace class component with hooks * docs(dropdown): replace class component with hooks * docs(dropdown): replace class component with hooks * docs(empty): replace class component with hooks * docs(grid): replace class component with hooks * docs(input): replace class component with hooks * docs(input-number): replace class component with hooks * docs(demo): fix lint error * docs(layout): replace class component with hooks * docs(list): replace class component with hooks * docs(mentions): replace class component with hooks * docs: fix code review issue * docs(modal): replace class component with hooks * docs(pagination): replace class component with hooks * docs(popconfirm): replace class component with hooks * docs(popover): replace class component with hooks * docs(progress): replace class component with hooks * docs(rate): replace class component with hooks * docs(radio): replace class component with hooks * docs: jsx to TS demo * test: improve Select test case (#35633) * docs(mentions): fix debounce demo bug (#35653) * chore(deps-dev): bump @types/react-resizable from 1.7.4 to 3.0.0 (#35658) Bumps [@types/react-resizable](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-resizable) from 1.7.4 to 3.0.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-resizable) --- updated-dependencies: - dependency-name: "@types/react-resizable" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * test: refactor test cases of Timeline with testing library (#35654) * test: refactor test cases of TimeLine * fix: lint errors * chore(deps-dev): bump react-intl from 5.25.1 to 6.0.1 (#35659) Bumps [react-intl](https://github.com/formatjs/formatjs) from 5.25.1 to 6.0.1. - [Release notes](https://github.com/formatjs/formatjs/releases) - [Commits](https://github.com/formatjs/formatjs/compare/react-intl@5.25.1...react-intl@6.0.1) --- updated-dependencies: - dependency-name: react-intl dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: fix cheerio for enzyme fix (#35666) * docs: 4.20.6 changelog (#35671) * docs: 4.20.6 changelog * docs: fix build * test: Update snapshot * refactor: align with popover (#35676) * chore: short auto merge time * chore: update issue check mirror (#35680) * fix: division in less for Segmented (#35701) * fix: division in less for Segmented * fix: update * chore: increase bundle size (#35709) * docs: fix mistype (#35714) * docs: update demo code (#35695) * docs: update demo code * chore: increase bundle size * Revert "chore: increase bundle size" This reverts commit 1c75e5ab5a85259f4d610e33009072e3e9c9acd4. * fix: drawer can not ref form instance when open (#35706) * fix: drawer can not ref form instance when open * fix: test * feat: div ref * feat: test * feat: test * feat: test * feat: test * chore: lock stylelint (#35725) * fix: Popover arrow style (#35717) * feat: config provider support componentDisabled (#35718) * feat: config provider support componentDisable * test: update snapshot * docs: update * chore: code * docs: componentDisabled version (#35730) * test: Replace alert part test with testing lib (#35736) Co-authored-by: chenkan1 * chore(deps-dev): bump typescript from 4.6.4 to 4.7.2 (#35737) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.6.4 to 4.7.2. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.6.4...v4.7.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * docs(select): fix type (#35726) * fix: demo ts type * mend * Update select-users.md * chore: move `@types/qs` from deps to devDeps (#35747) * feat: Config provider pagination showSizeChanger (#35750) * feat: support showSizeChanger * test: test case * fix: the ts wrong of card inteface (#35753) * fix: the ts wrong of card inteface * fix: add export cardproprs * feat: add card type test * docs(👍): update recommendation (#35758) * docs: update recommendation * Update recommendation.en-US.md * docs: fix skeleton demo (#35760) * refactor: Collapse replace expandIconPosition with logical position (#35770) * refactor: change collapse to logic position * test: Update snapshot * chore: force trigger CI * ci: use jest shard (#35622) * refactor: bump rc-collapse to stable dom (#35781) * chore: bump rc-collapse to stable dom * chore: clean up * test: Replace card component test with testing lib (#35751) * test: Replace card component test with testing lib * test: update the snapshot * docs: add note to custom BackTop demo (#35625) * docs: add note to custom BackTop demo * Apply suggestions from code review Co-authored-by: afc163 * test: lock eslint-plugin-jest version for false positive https://github.com/jest-community/eslint-plugin-jest/issues/1128 * test: move test cases to @testing/library for Tabs (#35796) * chore(deps): update dependency eslint-plugin-jest to ~26.4.0 (#35801) * chore(deps): update dependency eslint-plugin-jest to ~26.4.0 * Update package.json Co-authored-by: Renovate Bot Co-authored-by: afc163 * feat: change the changelog of 4.20.6 version * test: move test cases to @testing/library for Image (#35806) * docs: changelog for 4.20.7 (#35804) * docs: changelog for 4.20.7 * chore: bump version to 4.20.7 * docs: update changelog * refactor: Fix Dropdown nesting menu injection logic (#35810) * refactor: Dependency Inversion * test: update snapshot * test: Update snapshot * test: more * fix: table dropdown logic * fix: menu lint * chore: upgrade to jest-image-snapshot 5.x (#35818) * test: move test cases to @testing/library for Modal (#35785) * test: move test cases to @testing/library for Modal * update * fix: test * test: add test case for mouse position * chore: revert * fix: Progress type="line" strokeLinecap (#35822) * docs: fix typo of Menu items code example (#35832) * test: move test cases to @testing/library for Drawer (#35839) * perf: active skeleton animated with transform (#35836) * active skeleton animated with transform * properties order fixed * properties order fixed * properties order fixed Co-authored-by: afc163 * style: tweak Skeleton margin top style (#35848) * docs: update FAQ titles * test: move test cases to @testing/library for List (#35850) * chore: bump rc-dialog & update snapshot * fix: set jest shard to 2 (#35831) * fix: drawer close twice children is undefined (#35853) * fix: drawer close twice children is undefined * fix: drawer close twice children is undefined * chore: code * fix: test * test: update snapshot * fix: remove extraneous space from rc-segmented version (#35863) The extra spaces confuses third-party tooling * feat: Progress steps support custom strokeColor for each step (#35855) * feat: could accept string[] as strokeColor close #35852 close #26858 * fix: tsx demo * docs: add version column * chore: stlye patch of statistic (#35874) * chore: stlye patch of statistic * test: Udpate snapshot * test: replace Input part test with test lib (#35754) * test: replace Input part test with test lib * test: test input case * test: update textarea case Co-authored-by: z1399 Co-authored-by: afc163 * refactor: pagination mini className (#35881) * refactor: pagination mini cls * test: update snapshot * test: update snapshot * chore: code clean * chore: code clean * test: update snapshot * test: update snapshot * refactor: Wave in React 18 StrictMode (#35889) * feat: tabs support popupClassName (#35892) * feat: tabs support popupClassName * docs: update * fix:border-style for inputNumber addon when rtl (#35876) * chore(deps): update dependency @types/jest to v28 (#35907) Co-authored-by: Renovate Bot * ci: fix typo * fix: 类型“FormListFieldData”上不存在属性“fieldKey”。(#35883) (#35884) * fix: 类型“FormListFieldData”上不存在属性“fieldKey”。(#35883) * add deprecated tag to fieldKey * add changelog * Revert "add changelog" This reverts commit 2cc174f6338dbf073aa38133042f3d594a40b7b6. * chore: update changelog script (#35916) * docs: add typography format version * fix: remove important in radio style (#35920) * fix: remove important in radio style * chore: code clean * docs: correct types (#35919) * docs: correct types * ++ Co-authored-by: afc163 * test: migrate part of Button tests (#35869) * test: migrate part of Affix tests (#35860) * docs: add changelog 4.21.0 (#35915) * docs: add changelog 4.21.0 * Update CHANGELOG.en-US.md Co-authored-by: Amumu * Update CHANGELOG.zh-CN.md Co-authored-by: Amumu * docs: add * Update CHANGELOG.en-US.md * docs: fix * docs: add * docs: update * docs: fix * docs: remove 35407 Co-authored-by: Amumu * Feat: support 'treeExpandAction' prop for TreeSelect (#35618) * Feat: support 'treeExpandAction' prop for TreeSelect * chore: bump rc-tree * chore: fix lint * fix: fix directory tree duplicate expandAction * fix: fix directory tree duplicate expandAction * fix: fix directory tree duplicate expandAction * chore: add docs Co-authored-by: zombiej Co-authored-by: afc163 * chore: bump bundle size of babel runtime * docs: Update 4.21.0 changelog * docs: fix tree demo (#35927) * fix: Form.Item noStyle should not be affected by parent Form.Item (#35849) * fix: Form.Item noStyle should not be affected by parent Form.Item * test: update snapshot * fix: status * chore: code clean * fix: modal and drawer * test: fix lint * chore: code clean * refactor: noFormStyle * chore: code clean * revert: revert change in Form.Item * chore: code clean * test: replace test case with test library (#35925) * test: replace test case with test library * test: replace test case with test library * test: update snapshots * docs: clean up useless space * test: refactor tree with testing lib (#35937) * test: tree test * test: clean up * chore: bump rc-tree * test: Update snapshot * test: Update for react 18 * test: move test cases to testing lib (#35909) * test: move test cases to testing lib (#35900) * fix: menu items typings (#35790) * Fix menu items typings * add test case for menu item type checking * fix: cubic-bezier should be animation-timing-function (#35943) * fix: modify 'antd' to 'infrad' in loop-banner.md of alert * fix: modify line-height value to @line-height-base of descriptions component * fix: remove the last tr's border-bottom of table component * style: modify some styles of table component * fix: modify style of table component * fix: modify all icon of table title to 14px size * style: modify some style of table component and rollback tooltip component * style: modify some style of table component and rollback tooltip component * fix: Fix the style problem in the small state of the progress component * fix: Fix the style problem in the small state of the progress component * fix: use variables to set size or padding * feat: update changelog to version 4.21.4 Co-authored-by: Sukka Co-authored-by: afc163 Co-authored-by: Katsiaryna Pustakhod Co-authored-by: vagusX Co-authored-by: MadCcc <1075746765@qq.com> Co-authored-by: agarciaguillo Co-authored-by: Jesús Gallego Irles Co-authored-by: zombiej Co-authored-by: Dunqing <1247748612@qq.com> Co-authored-by: Amumu Co-authored-by: Zack Chang <73225408+jrr997@users.noreply.github.com> Co-authored-by: 黑雨 Co-authored-by: lalalazero Co-authored-by: Dreamcreative Co-authored-by: Walid Cherhane <56094829+walidcherhane@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: PCCCCCCC Co-authored-by: linqiqi077 <865530219@qq.com> Co-authored-by: TrickyPi <33021497+TrickyPi@users.noreply.github.com> Co-authored-by: haipeng Co-authored-by: Yanlin Jiang Co-authored-by: Cooper Veysey Co-authored-by: shuaijiumei <63175611+shuaijiumei@users.noreply.github.com> Co-authored-by: Karott Schu Co-authored-by: parabolazz Co-authored-by: Tom Xu Co-authored-by: zhang lay Co-authored-by: Mykyta Velykanov Co-authored-by: 陈帅 Co-authored-by: Yanming Deng Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ron Šmeral Co-authored-by: Ron Smeral Co-authored-by: dingkang Co-authored-by: Tony Wu <93302820+tonywu6@users.noreply.github.com> Co-authored-by: miracles1919 <516571350@qq.com> Co-authored-by: limingxin <906529775@qq.com> Co-authored-by: ty888 <1506125048@qq.com> Co-authored-by: Yuki Zhang Co-authored-by: 叶枫 <7971419+crazyair@users.noreply.github.com> Co-authored-by: joson <373693643@qq.com> Co-authored-by: hezhaoshun Co-authored-by: 周晨阳 <59002875+ZZZCNY@users.noreply.github.com> Co-authored-by: 章鱼 Co-authored-by: Bart Piotrowski <31428082+bartpio@users.noreply.github.com> Co-authored-by: yykoypj <601924094@qq.com> Co-authored-by: Niyaz Akhmetov Co-authored-by: 社长长 Co-authored-by: chenkan1 Co-authored-by: zhao-huo-long Co-authored-by: Cong Zhang Co-authored-by: Long Hao (龙濠) <45565100+LongHaoo@users.noreply.github.com> Co-authored-by: Gabriel Haruki Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renovate Bot Co-authored-by: Peach Co-authored-by: MrHadEnough Co-authored-by: slotDumpling <67586451+slotDumpling@users.noreply.github.com> Co-authored-by: Mehdi Salem Naraghi Co-authored-by: 郑国庆 Co-authored-by: z1399 Co-authored-by: Luobo Zhang Co-authored-by: xrkffgg Co-authored-by: chenxiang <597219320@qq.com> Co-authored-by: 元凛 Co-authored-by: kalykun <984757534@qq.com> Co-authored-by: Shang Song <14830727+zggmd@users.noreply.github.com> Co-authored-by: Heaven <18418010+NE-SmallTown@users.noreply.github.com> Co-authored-by: MasaoBlue <16271994+MasaoBlue@users.noreply.github.com> --- CHANGELOG.en-US.md | 2 +- CHANGELOG.zh-CN.md | 2 +- .../__snapshots__/components.test.js.snap | 14 +- .../__snapshots__/index.test.js.snap | 132 +++++++++--------- components/progress/style/index.less | 5 +- components/style/themes/default.less | 4 + components/style/themes/variable.less | 4 + .../__snapshots__/Table.filter.test.js.snap | 2 +- .../__snapshots__/demo-extend.test.ts.snap | 22 +-- .../__tests__/__snapshots__/demo.test.js.snap | 22 +-- .../table/hooks/useFilter/FilterDropdown.tsx | 4 +- components/table/style/index.less | 34 +++-- components/table/style/size.less | 13 +- components/tooltip/style/index.less | 4 +- package.json | 2 +- 15 files changed, 146 insertions(+), 120 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index bda46a395ce3..2c81ebbc729e 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -9,7 +9,7 @@ timeline: true | infrad version | antd version | update content | time | | --- | --- | --- | --- | -| 4.21.3 | 4.21.4 | Synchronize the update of antd 4.21.4 version | 2022-07-04 | +| 4.21.4 | 4.21.4 | 1.Synchronize the update of antd 4.21.4 version
2.Modified some styles of the table component
3.The tooltip component has been rolled back to keep it consistent with antd
4.Fix the style problem in the small state of the progress component | 2022-07-04 | | 4.21.1 | 4.21.2 | 1.Synchronize the update of antd 4.20.2 version
2.Temporarily removed QuickPicker | 2022-06-16 | | 4.21.0 | 4.21.0 | Synchronize the update of antd 4.21.0 version | 2022-06-09 | | 4.20.4 | 4.20.4 | Synchronize the update of antd 4.20.4 version | 2022-05-13 | diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 4f76c76519c7..a6ad63aceb8c 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -9,7 +9,7 @@ timeline: true | infrad 版本号 | 对应 antd 版本号 | 更新内容 | 时间 | | --- | --- | --- | --- | -| 4.21.3 | 4.21.4 | 同步 antd 4.21.4 版本的更新 | 2022-07-04 | +| 4.21.4 | 4.21.4 | 1.同步 antd 4.21.4 版本的更新
2.修改了 table 组件的部分样式
3.回退 tooltip 组件保持与 Antd 一致
4.修复 progress 组件在 small 状态下的样式问题 | 2022-07-04 | | 4.21.1 | 4.21.2 | 1.同步 antd 4.21.2 版本的更新
2.暂时移除了 QuickPicker 组件 | 2022-06-16 | | 4.21.0 | 4.21.0 | 同步 antd 4.21.0 版本的更新 | 2022-06-09 | | 4.20.6 | 4.20.6 | 同步 antd 4.20.6 版本的更新 | 2022-05-30 | diff --git a/components/config-provider/__tests__/__snapshots__/components.test.js.snap b/components/config-provider/__tests__/__snapshots__/components.test.js.snap index 97085915b88e..d247beeb6ee2 100644 --- a/components/config-provider/__tests__/__snapshots__/components.test.js.snap +++ b/components/config-provider/__tests__/__snapshots__/components.test.js.snap @@ -26793,7 +26793,7 @@ exports[`ConfigProvider components Table configProvider 1`] = ` width="1em" > @@ -27094,7 +27094,7 @@ exports[`ConfigProvider components Table configProvider componentDisabled 1`] = width="1em" > @@ -27396,7 +27396,7 @@ exports[`ConfigProvider components Table configProvider componentSize large 1`] width="1em" > @@ -27697,7 +27697,7 @@ exports[`ConfigProvider components Table configProvider componentSize middle 1`] width="1em" > @@ -27998,7 +27998,7 @@ exports[`ConfigProvider components Table configProvider virtual and dropdownMatc width="1em" > @@ -28299,7 +28299,7 @@ exports[`ConfigProvider components Table normal 1`] = ` width="1em" > @@ -28600,7 +28600,7 @@ exports[`ConfigProvider components Table prefixCls 1`] = ` width="1em" > diff --git a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap index 4a6cb186bbeb..62f620ea4559 100644 --- a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap +++ b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap @@ -6806,7 +6806,7 @@ exports[`Locale Provider should display the text as ar 1`] = ` width="1em" > @@ -11929,7 +11929,7 @@ exports[`Locale Provider should display the text as az 1`] = ` width="1em" > @@ -17052,7 +17052,7 @@ exports[`Locale Provider should display the text as bg 1`] = ` width="1em" > @@ -22175,7 +22175,7 @@ exports[`Locale Provider should display the text as bn-bd 1`] = ` width="1em" > @@ -27298,7 +27298,7 @@ exports[`Locale Provider should display the text as by 1`] = ` width="1em" > @@ -32421,7 +32421,7 @@ exports[`Locale Provider should display the text as ca 1`] = ` width="1em" > @@ -37544,7 +37544,7 @@ exports[`Locale Provider should display the text as cs 1`] = ` width="1em" > @@ -42667,7 +42667,7 @@ exports[`Locale Provider should display the text as da 1`] = ` width="1em" > @@ -47790,7 +47790,7 @@ exports[`Locale Provider should display the text as de 1`] = ` width="1em" > @@ -52913,7 +52913,7 @@ exports[`Locale Provider should display the text as el 1`] = ` width="1em" > @@ -58036,7 +58036,7 @@ exports[`Locale Provider should display the text as en 1`] = ` width="1em" > @@ -63159,7 +63159,7 @@ exports[`Locale Provider should display the text as en-gb 1`] = ` width="1em" > @@ -68282,7 +68282,7 @@ exports[`Locale Provider should display the text as es 1`] = ` width="1em" > @@ -73405,7 +73405,7 @@ exports[`Locale Provider should display the text as et 1`] = ` width="1em" > @@ -78528,7 +78528,7 @@ exports[`Locale Provider should display the text as fa 1`] = ` width="1em" > @@ -83651,7 +83651,7 @@ exports[`Locale Provider should display the text as fi 1`] = ` width="1em" > @@ -88774,7 +88774,7 @@ exports[`Locale Provider should display the text as fr 1`] = ` width="1em" > @@ -93897,7 +93897,7 @@ exports[`Locale Provider should display the text as fr 2`] = ` width="1em" > @@ -99020,7 +99020,7 @@ exports[`Locale Provider should display the text as fr 3`] = ` width="1em" > @@ -104143,7 +104143,7 @@ exports[`Locale Provider should display the text as ga 1`] = ` width="1em" > @@ -109266,7 +109266,7 @@ exports[`Locale Provider should display the text as gl 1`] = ` width="1em" > @@ -114389,7 +114389,7 @@ exports[`Locale Provider should display the text as he 1`] = ` width="1em" > @@ -119512,7 +119512,7 @@ exports[`Locale Provider should display the text as hi 1`] = ` width="1em" > @@ -124635,7 +124635,7 @@ exports[`Locale Provider should display the text as hr 1`] = ` width="1em" > @@ -129758,7 +129758,7 @@ exports[`Locale Provider should display the text as hu 1`] = ` width="1em" > @@ -134881,7 +134881,7 @@ exports[`Locale Provider should display the text as hy-am 1`] = ` width="1em" > @@ -140004,7 +140004,7 @@ exports[`Locale Provider should display the text as id 1`] = ` width="1em" > @@ -145127,7 +145127,7 @@ exports[`Locale Provider should display the text as is 1`] = ` width="1em" > @@ -150250,7 +150250,7 @@ exports[`Locale Provider should display the text as it 1`] = ` width="1em" > @@ -155373,7 +155373,7 @@ exports[`Locale Provider should display the text as ja 1`] = ` width="1em" > @@ -160496,7 +160496,7 @@ exports[`Locale Provider should display the text as ka 1`] = ` width="1em" > @@ -165619,7 +165619,7 @@ exports[`Locale Provider should display the text as kk 1`] = ` width="1em" > @@ -170742,7 +170742,7 @@ exports[`Locale Provider should display the text as km 1`] = ` width="1em" > @@ -175865,7 +175865,7 @@ exports[`Locale Provider should display the text as kn 1`] = ` width="1em" > @@ -180988,7 +180988,7 @@ exports[`Locale Provider should display the text as ko 1`] = ` width="1em" > @@ -186111,7 +186111,7 @@ exports[`Locale Provider should display the text as ku 1`] = ` width="1em" > @@ -191234,7 +191234,7 @@ exports[`Locale Provider should display the text as ku-iq 1`] = ` width="1em" > @@ -196357,7 +196357,7 @@ exports[`Locale Provider should display the text as lt 1`] = ` width="1em" > @@ -201480,7 +201480,7 @@ exports[`Locale Provider should display the text as lv 1`] = ` width="1em" > @@ -206603,7 +206603,7 @@ exports[`Locale Provider should display the text as mk 1`] = ` width="1em" > @@ -211726,7 +211726,7 @@ exports[`Locale Provider should display the text as ml 1`] = ` width="1em" > @@ -216849,7 +216849,7 @@ exports[`Locale Provider should display the text as mn-mn 1`] = ` width="1em" > @@ -221972,7 +221972,7 @@ exports[`Locale Provider should display the text as ms-my 1`] = ` width="1em" > @@ -227095,7 +227095,7 @@ exports[`Locale Provider should display the text as nb 1`] = ` width="1em" > @@ -232218,7 +232218,7 @@ exports[`Locale Provider should display the text as ne-np 1`] = ` width="1em" > @@ -237341,7 +237341,7 @@ exports[`Locale Provider should display the text as nl 1`] = ` width="1em" > @@ -242464,7 +242464,7 @@ exports[`Locale Provider should display the text as nl-be 1`] = ` width="1em" > @@ -247587,7 +247587,7 @@ exports[`Locale Provider should display the text as pl 1`] = ` width="1em" > @@ -252710,7 +252710,7 @@ exports[`Locale Provider should display the text as pt 1`] = ` width="1em" > @@ -257833,7 +257833,7 @@ exports[`Locale Provider should display the text as pt-br 1`] = ` width="1em" > @@ -262956,7 +262956,7 @@ exports[`Locale Provider should display the text as ro 1`] = ` width="1em" > @@ -268079,7 +268079,7 @@ exports[`Locale Provider should display the text as ru 1`] = ` width="1em" > @@ -273202,7 +273202,7 @@ exports[`Locale Provider should display the text as sk 1`] = ` width="1em" > @@ -278325,7 +278325,7 @@ exports[`Locale Provider should display the text as sl 1`] = ` width="1em" > @@ -283448,7 +283448,7 @@ exports[`Locale Provider should display the text as sr 1`] = ` width="1em" > @@ -288571,7 +288571,7 @@ exports[`Locale Provider should display the text as sv 1`] = ` width="1em" > @@ -293694,7 +293694,7 @@ exports[`Locale Provider should display the text as ta 1`] = ` width="1em" > @@ -298817,7 +298817,7 @@ exports[`Locale Provider should display the text as th 1`] = ` width="1em" > @@ -303940,7 +303940,7 @@ exports[`Locale Provider should display the text as tk 1`] = ` width="1em" > @@ -309063,7 +309063,7 @@ exports[`Locale Provider should display the text as tr 1`] = ` width="1em" > @@ -314186,7 +314186,7 @@ exports[`Locale Provider should display the text as uk 1`] = ` width="1em" > @@ -319309,7 +319309,7 @@ exports[`Locale Provider should display the text as ur 1`] = ` width="1em" > @@ -324432,7 +324432,7 @@ exports[`Locale Provider should display the text as vi 1`] = ` width="1em" > @@ -329555,7 +329555,7 @@ exports[`Locale Provider should display the text as zh-cn 1`] = ` width="1em" > @@ -334678,7 +334678,7 @@ exports[`Locale Provider should display the text as zh-hk 1`] = ` width="1em" > @@ -339801,7 +339801,7 @@ exports[`Locale Provider should display the text as zh-tw 1`] = ` width="1em" > diff --git a/components/progress/style/index.less b/components/progress/style/index.less index 9f325ab1fac0..f7ed52ff7311 100644 --- a/components/progress/style/index.less +++ b/components/progress/style/index.less @@ -36,7 +36,10 @@ } } - &-small&-line, + &-small&-line { + font-size: @font-size-base; + } + &-small&-line &-text .@{iconfont-css-prefix} { font-size: @font-size-sm; } diff --git a/components/style/themes/default.less b/components/style/themes/default.less index d45eb5e880fb..652c6ac3f633 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -654,6 +654,8 @@ @table-header-bg: @background-color-light; @table-header-color: fade(@black, 45%); @table-header-sort-bg: @background-color-base; +@table-header-font-weight: 400; +@table-header-font-size: @font-size-base - 2px; @table-body-sort-bg: #fafafa; @table-row-hover-bg: @background-color-light; @table-selected-row-color: inherit; @@ -667,6 +669,8 @@ @table-padding-horizontal-md: (@table-padding-horizontal / 2); @table-padding-vertical-sm: (@table-padding-vertical / 2); @table-padding-horizontal-sm: (@table-padding-horizontal / 2); +@table-padding-md: (@table-padding-vertical * 3 / 4); +@table-padding-sm: (@table-padding-vertical / 2); @table-border-color: @border-color-split; @table-border-radius-base: @border-radius-base; @table-footer-bg: @background-color-light; diff --git a/components/style/themes/variable.less b/components/style/themes/variable.less index 142a8c31b5de..5a2999defafb 100644 --- a/components/style/themes/variable.less +++ b/components/style/themes/variable.less @@ -710,6 +710,8 @@ @table-header-bg: @background-color-light; @table-header-color: fade(@black, 45%); @table-header-sort-bg: @background-color-base; +@table-header-font-weight: 400; +@table-header-font-size: @font-size-base - 2px; @table-body-sort-bg: #fafafa; @table-row-hover-bg: @background-color-light; @table-selected-row-color: inherit; @@ -723,6 +725,8 @@ @table-padding-horizontal-md: (@table-padding-horizontal / 2); @table-padding-vertical-sm: (@table-padding-vertical / 2); @table-padding-horizontal-sm: (@table-padding-horizontal / 2); +@table-padding-md: (@table-padding-vertical * 3 / 4); +@table-padding-sm: (@table-padding-vertical / 2); @table-border-color: @border-color-split; @table-border-radius-base: @border-radius-base; @table-footer-bg: @background-color-light; diff --git a/components/table/__tests__/__snapshots__/Table.filter.test.js.snap b/components/table/__tests__/__snapshots__/Table.filter.test.js.snap index 52417d5f30cc..da0d0b15cb20 100644 --- a/components/table/__tests__/__snapshots__/Table.filter.test.js.snap +++ b/components/table/__tests__/__snapshots__/Table.filter.test.js.snap @@ -490,7 +490,7 @@ exports[`Table.filter renders filter correctly 1`] = ` width="1em" > diff --git a/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap index 5e6e9f635817..aff55e4a9013 100644 --- a/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap +++ b/components/table/__tests__/__snapshots__/demo-extend.test.ts.snap @@ -149,7 +149,7 @@ exports[`renders ./components/table/demo/ajax.md extend context correctly 1`] = width="1em" > @@ -3320,7 +3320,7 @@ Array [ width="1em" > @@ -7049,7 +7049,7 @@ exports[`renders ./components/table/demo/filter-in-tree.md extend context correc width="1em" > @@ -7571,7 +7571,7 @@ exports[`renders ./components/table/demo/filter-in-tree.md extend context correc width="1em" > @@ -8045,7 +8045,7 @@ exports[`renders ./components/table/demo/filter-search.md extend context correct width="1em" > @@ -8391,7 +8391,7 @@ exports[`renders ./components/table/demo/filter-search.md extend context correct width="1em" > @@ -11932,7 +11932,7 @@ exports[`renders ./components/table/demo/grouping-columns.md extend context corr width="1em" > @@ -13346,7 +13346,7 @@ exports[`renders ./components/table/demo/head.md extend context correctly 1`] = width="1em" > @@ -13854,7 +13854,7 @@ exports[`renders ./components/table/demo/head.md extend context correctly 1`] = width="1em" > @@ -20371,7 +20371,7 @@ Array [ width="1em" > @@ -20760,7 +20760,7 @@ Array [ width="1em" > diff --git a/components/table/__tests__/__snapshots__/demo.test.js.snap b/components/table/__tests__/__snapshots__/demo.test.js.snap index ed72fe4c2740..fe9b6a07eaa6 100644 --- a/components/table/__tests__/__snapshots__/demo.test.js.snap +++ b/components/table/__tests__/__snapshots__/demo.test.js.snap @@ -125,7 +125,7 @@ exports[`renders ./components/table/demo/ajax.md correctly 1`] = ` width="1em" > @@ -2805,7 +2805,7 @@ Array [ width="1em" > @@ -5768,7 +5768,7 @@ exports[`renders ./components/table/demo/filter-in-tree.md correctly 1`] = ` width="1em" > @@ -5866,7 +5866,7 @@ exports[`renders ./components/table/demo/filter-in-tree.md correctly 1`] = ` width="1em" > @@ -6114,7 +6114,7 @@ exports[`renders ./components/table/demo/filter-search.md correctly 1`] = ` width="1em" > @@ -6212,7 +6212,7 @@ exports[`renders ./components/table/demo/filter-search.md correctly 1`] = ` width="1em" > @@ -9291,7 +9291,7 @@ exports[`renders ./components/table/demo/grouping-columns.md correctly 1`] = ` width="1em" > @@ -10353,7 +10353,7 @@ exports[`renders ./components/table/demo/head.md correctly 1`] = ` width="1em" > @@ -10452,7 +10452,7 @@ exports[`renders ./components/table/demo/head.md correctly 1`] = ` width="1em" > @@ -15408,7 +15408,7 @@ Array [ width="1em" > @@ -15561,7 +15561,7 @@ Array [ width="1em" > diff --git a/components/table/hooks/useFilter/FilterDropdown.tsx b/components/table/hooks/useFilter/FilterDropdown.tsx index 8caa037f429c..486805ab35cb 100644 --- a/components/table/hooks/useFilter/FilterDropdown.tsx +++ b/components/table/hooks/useFilter/FilterDropdown.tsx @@ -1,5 +1,5 @@ import classNames from 'classnames'; -import { FilterFilled } from 'infra-design-icons'; +import { FilterOutlined } from 'infra-design-icons'; import isEqual from 'lodash/isEqual'; import type { FieldDataNode } from 'rc-tree'; import * as React from 'react'; @@ -447,7 +447,7 @@ function FilterDropdown(props: FilterDropdownProps) { } else if (column.filterIcon) { filterIcon = column.filterIcon; } else { - filterIcon = ; + filterIcon = ; } const { direction } = React.useContext(ConfigContext); diff --git a/components/table/style/index.less b/components/table/style/index.less index cc274d2268c9..cbe7bd52a493 100644 --- a/components/table/style/index.less +++ b/components/table/style/index.less @@ -31,7 +31,7 @@ table { width: 100%; text-align: left; - border-radius: @table-border-radius-base @table-border-radius-base 0 0; + border-radius: @table-border-radius-base; border-collapse: separate; border-spacing: 0; } @@ -42,7 +42,7 @@ tfoot > tr > th, tfoot > tr > td { position: relative; - padding: @table-padding-vertical @table-padding-horizontal; + padding: @table-padding-vertical-sm @table-padding-horizontal; overflow-wrap: break-word; } @@ -89,7 +89,8 @@ > th { position: relative; color: @table-header-color; - font-weight: 500; + font-weight: @table-header-font-weight; + font-size: @table-header-font-size; text-align: left; background: @table-header-bg; border-bottom: @border-width-base @border-style-base @table-border-color; @@ -124,6 +125,7 @@ &-tbody { > tr { > td { + padding: @table-padding-horizontal; border-bottom: @border-width-base @border-style-base @table-border-color; transition: background 0.3s; @@ -255,14 +257,12 @@ &-column-title { position: relative; z-index: 1; - flex: 1; } &-column-sorters { display: flex; flex: auto; align-items: center; - justify-content: space-between; &::after { position: absolute; @@ -277,20 +277,30 @@ } &-column-sorter { + display: flex; + align-items: center; + width: 14px; + height: 14px; margin-left: 4px; color: @table-header-icon-color; - font-size: 0; + font-size: @table-font-size; transition: color 0.3s; &-inner { display: inline-flex; flex-direction: column; align-items: center; + width: 14px; + height: 14px; + } + + &-up { + margin-top: -2px; } &-up, &-down { - font-size: 11px; + font-size: 10px; &.active { color: @primary-color; @@ -298,7 +308,7 @@ } &-up + &-down { - margin-top: -0.3em; + margin-top: -2px; } } @@ -309,17 +319,19 @@ // ============================ Filter ============================ &-filter-column { display: flex; - justify-content: space-between; + align-items: center; } &-filter-trigger { position: relative; display: flex; align-items: center; + width: 14px; + height: 14px; margin: -4px (-@table-padding-horizontal / 2) -4px 4px; - padding: 0 4px; + // padding: 0 4px; color: @table-header-icon-color; - font-size: @font-size-sm; + font-size: @font-size-base; border-radius: @border-radius-base; cursor: pointer; transition: all 0.3s; diff --git a/components/table/style/size.less b/components/table/style/size.less index 4fa18dcb339e..b3266839a0da 100644 --- a/components/table/style/size.less +++ b/components/table/style/size.less @@ -2,17 +2,20 @@ @table-prefix-cls: ~'@{ant-prefix}-table'; -.table-size(@size, @padding-vertical, @padding-horizontal, @font-size) { +.table-size(@size, @padding-vertical, @padding-horizontal, @font-size, @body-padding) { .@{table-prefix-cls}.@{table-prefix-cls}-@{size} { font-size: @font-size; .@{table-prefix-cls}-title, .@{table-prefix-cls}-footer, .@{table-prefix-cls}-thead > tr > th, - .@{table-prefix-cls}-tbody > tr > td, tfoot > tr > th, tfoot > tr > td { - padding: @padding-vertical @padding-horizontal; + padding: @padding-horizontal @padding-vertical; + } + + .@{table-prefix-cls}-tbody > tr > td { + padding: @body-padding; } .@{table-prefix-cls}-filter-trigger { @@ -43,9 +46,9 @@ // ================================================================ // = Middle = // ================================================================ -.table-size(~'middle', @table-padding-vertical-md, @table-padding-horizontal-md, @table-font-size-md); +.table-size(~'middle', @table-padding-vertical-md, @table-padding-horizontal-md, @table-font-size-md, @table-padding-md); // ================================================================ // = Small = // ================================================================ -.table-size(~'small', @table-padding-vertical-sm, @table-padding-horizontal-sm, @table-font-size-sm); +.table-size(~'small', @table-padding-vertical-sm, @table-padding-horizontal-sm, @table-font-size-sm, @table-padding-sm); diff --git a/components/tooltip/style/index.less b/components/tooltip/style/index.less index 5eb67cdc5968..d2ad5e126378 100644 --- a/components/tooltip/style/index.less +++ b/components/tooltip/style/index.less @@ -59,12 +59,12 @@ &-inner { min-width: 30px; min-height: 32px; - padding: 4px 2px; + padding: 6px 8px; color: @tooltip-color; text-align: left; text-decoration: none; word-wrap: break-word; - background-color: rgba(0, 0, 0, 0.8); + background-color: @tooltip-bg; border-radius: @border-radius-base; box-shadow: @box-shadow-base; } diff --git a/package.json b/package.json index 45e3b073a6f2..cd7fec3bdfb2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "infrad", - "version": "4.21.3", + "version": "4.21.4", "description": "based on AntD", "title": "Infra Design", "keywords": [