From 25d9ee096bfce654911ea0e8b3c868109b3a9d77 Mon Sep 17 00:00:00 2001 From: PisecesPeng Date: Tue, 6 Dec 2022 00:23:29 +0800 Subject: [PATCH 1/6] docs: fix Grid demo slider tooltip (#39275) * docs: fix Grid demo slider tooltip * docs: fix Grid demo slider tooltip * docs: fix Grid demo slider tooltip --- components/grid/demo/playground.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/grid/demo/playground.tsx b/components/grid/demo/playground.tsx index 17d91ff1c0..adbf269960 100644 --- a/components/grid/demo/playground.tsx +++ b/components/grid/demo/playground.tsx @@ -1,9 +1,9 @@ import React, { useState } from 'react'; import { Col, Row, Slider } from 'antd'; -const gutters: Record = {}; -const vgutters: Record = {}; -const colCounts: Record = {}; +const gutters: Record = {}; +const vgutters: Record = {}; +const colCounts: Record = {}; [8, 16, 24, 32, 40, 48].forEach((value, i) => { gutters[i] = value; @@ -43,7 +43,7 @@ const App: React.FC = () => { onChange={setGutterKey} marks={gutters} step={null} - tooltip={{ formatter: (value) => value && gutters[value] }} + tooltip={{ formatter: (value: number) => gutters[value] }} /> Vertical Gutter (px): @@ -55,7 +55,7 @@ const App: React.FC = () => { onChange={setVgutterKey} marks={vgutters} step={null} - tooltip={{ formatter: (value) => value && vgutters[value] }} + tooltip={{ formatter: (value: number) => vgutters[value] }} /> Column Count: @@ -67,7 +67,7 @@ const App: React.FC = () => { onChange={setColCountKey} marks={colCounts} step={null} - tooltip={{ formatter: (value) => value && colCounts[value] }} + tooltip={{ formatter: (value: number) => colCounts[value] }} /> From cfc3aae4524e3dc253113fd5781718dc804ffbc3 Mon Sep 17 00:00:00 2001 From: Ran Sagy <77805401+Ran-Sagy@users.noreply.github.com> Date: Tue, 6 Dec 2022 04:20:27 +0200 Subject: [PATCH 2/6] fixed he-il mistakes (#39280) --- components/locale/he_IL.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/locale/he_IL.tsx b/components/locale/he_IL.tsx index c0fc9a6f87..739dbb716a 100644 --- a/components/locale/he_IL.tsx +++ b/components/locale/he_IL.tsx @@ -25,9 +25,9 @@ const localeValues: Locale = { selectionAll: 'בחר את כל הנתונים', sortTitle: 'מיון', expand: 'הרחב שורה', - collapse: 'צמצם שורהw', - triggerDesc: 'לחץ על מיון לפי סדר יורד', - triggerAsc: 'לחץ על מיון לפי סדר עולה', + collapse: 'צמצם שורה', + triggerDesc: 'לחץ למיון לפי סדר יורד', + triggerAsc: 'לחץ למיון לפי סדר עולה', cancelSort: 'לחץ כדי לבטל את המיון', }, Modal: { From 5ef11772707210fa6985aef2334a64326b673882 Mon Sep 17 00:00:00 2001 From: lijianan <574980606@qq.com> Date: Tue, 6 Dec 2022 10:25:26 +0800 Subject: [PATCH 3/6] chore: remove useless node_modules (#39278) * chore: remove useless node_modules * Update package.json --- package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package.json b/package.json index ce93caa2bf..58757673fe 100644 --- a/package.json +++ b/package.json @@ -285,8 +285,6 @@ "remark-cli": "^11.0.0", "remark-lint": "^9.0.0", "remark-preset-lint-recommended": "^6.0.0", - "remove-files-webpack-plugin": "1.5.0", - "rimraf": "^3.0.0", "rome": "^10.0.1", "semver": "^7.3.5", "simple-git": "^3.0.0", @@ -296,7 +294,6 @@ "stylelint-config-rational-order": "^0.1.2", "stylelint-config-standard": "^29.0.0", "stylelint-declaration-block-no-ignored-properties": "^2.1.0", - "stylelint-order": "^5.0.0", "sylvanas": "^0.6.1", "ts-node": "^10.8.2", "typedoc": "^0.23.21", From ac0139c2c7f4fe6c5ab308188f24f07f8dbb79b1 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 6 Dec 2022 14:54:34 +0800 Subject: [PATCH 4/6] chore: simpify size-limit output (#39285) --- .github/workflows/size-limit.yml | 1 - package.json | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/size-limit.yml b/.github/workflows/size-limit.yml index fede7e0b87..c03b16a832 100644 --- a/.github/workflows/size-limit.yml +++ b/.github/workflows/size-limit.yml @@ -26,4 +26,3 @@ jobs: - uses: andresz1/size-limit-action@v1 with: github_token: ${{ secrets.GITHUB_TOKEN }} - script: npx size-limit --json --why diff --git a/package.json b/package.json index 58757673fe..48f590ecba 100644 --- a/package.json +++ b/package.json @@ -166,8 +166,8 @@ "@emotion/react": "^11.10.4", "@emotion/server": "^11.4.0", "@qixian.cs/github-contributors-list": "^1.0.3", - "@size-limit/file": "^8.0.0", - "@size-limit/preset-big-lib": "^8.1.0", + "@size-limit/file": "^8.1.0", + "@size-limit/webpack-why": "^8.1.0", "@stackblitz/sdk": "^1.3.0", "@testing-library/dom": "^8.17.1", "@testing-library/jest-dom": "^5.16.3", @@ -288,7 +288,7 @@ "rome": "^10.0.1", "semver": "^7.3.5", "simple-git": "^3.0.0", - "size-limit": "^8.0.0", + "size-limit": "^8.1.0", "stylelint": "^14.9.0", "stylelint-config-prettier": "^9.0.2", "stylelint-config-rational-order": "^0.1.2", From d17d98f81abd0a1f353efc4f9933b71887b316ba Mon Sep 17 00:00:00 2001 From: lijianan <574980606@qq.com> Date: Tue, 6 Dec 2022 15:17:34 +0800 Subject: [PATCH 5/6] fix: fix style error (#39282) * fix: fix style error * fix --- components/float-button/style/index.tsx | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/components/float-button/style/index.tsx b/components/float-button/style/index.tsx index ce82dfdf7b..05d391d846 100644 --- a/components/float-button/style/index.tsx +++ b/components/float-button/style/index.tsx @@ -80,7 +80,7 @@ const initFloatButtonGroupMotion = (token: FloatButtonToken) => { // ============================== Group ============================== const floatButtonGroupStyle: GenerateStyle = (token) => { - const { componentCls, floatButtonSize, margin, borderRadius } = token; + const { componentCls, floatButtonSize, margin, borderRadiusLG } = token; const groupPrefixCls = `${componentCls}-group`; return { [groupPrefixCls]: { @@ -95,7 +95,7 @@ const floatButtonGroupStyle: GenerateStyle = (token minHeight: floatButtonSize, insetInlineEnd: token.floatButtonInsetInlineEnd, insetBlockEnd: token.floatButtonInsetBlockEnd, - borderRadius: token.borderRadius, + borderRadius: borderRadiusLG, [`${groupPrefixCls}-wrap`]: { zIndex: -1, @@ -124,12 +124,12 @@ const floatButtonGroupStyle: GenerateStyle = (token borderRadius: 0, padding: 0, '&:first-child': { - borderStartStartRadius: borderRadius, - borderStartEndRadius: borderRadius, + borderStartStartRadius: borderRadiusLG, + borderStartEndRadius: borderRadiusLG, }, '&:last-child': { - borderEndStartRadius: borderRadius, - borderEndEndRadius: borderRadius, + borderEndStartRadius: borderRadiusLG, + borderEndEndRadius: borderRadiusLG, }, '&:not(:last-child)': { borderBottom: `${token.lineWidth}px ${token.lineType} ${token.colorSplit}`, @@ -137,7 +137,7 @@ const floatButtonGroupStyle: GenerateStyle = (token }, [`${groupPrefixCls}-wrap`]: { display: 'block', - borderRadius, + borderRadius: borderRadiusLG, boxShadow: token.boxShadowSecondary, overflow: 'hidden', [`${componentCls}-square`]: { @@ -146,12 +146,12 @@ const floatButtonGroupStyle: GenerateStyle = (token borderRadius: 0, padding: token.paddingXXS, '&:first-child': { - borderStartStartRadius: borderRadius, - borderStartEndRadius: borderRadius, + borderStartStartRadius: borderRadiusLG, + borderStartEndRadius: borderRadiusLG, }, '&:last-child': { - borderEndStartRadius: borderRadius, - borderEndEndRadius: borderRadius, + borderEndStartRadius: borderRadiusLG, + borderEndEndRadius: borderRadiusLG, }, '&:not(:last-child)': { borderBottom: `${token.lineWidth}px ${token.lineType} ${token.colorSplit}`, @@ -183,7 +183,7 @@ const floatButtonGroupStyle: GenerateStyle = (token // ============================== Shared ============================== const sharedFloatButtonStyle: GenerateStyle = (token) => { - const { componentCls, floatButtonIconSize, floatButtonSize } = token; + const { componentCls, floatButtonIconSize, floatButtonSize, borderRadiusLG } = token; return { [componentCls]: { ...resetComponent(token), @@ -212,8 +212,8 @@ const sharedFloatButtonStyle: GenerateStyle = (toke }, [`${componentCls}-body`]: { - width: floatButtonSize, - height: floatButtonSize, + width: '100%', + height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', @@ -247,7 +247,7 @@ const sharedFloatButtonStyle: GenerateStyle = (toke [`${componentCls}-square`]: { height: 'auto', minHeight: floatButtonSize, - borderRadius: token.borderRadius, + borderRadius: borderRadiusLG, [`${componentCls}-body`]: { height: 'auto', borderRadius: token.borderRadiusSM, From cadab499e1a4901a103f2df0c257ebf9b2147593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nghi=E1=BB=87p?= Date: Tue, 6 Dec 2022 14:32:20 +0700 Subject: [PATCH 6/6] chore: fix vietnamese typos (#39279) * chore: fix vietnamese typos * Update snapshots --- .../__snapshots__/index.test.tsx.snap | 8 ++++---- components/locale/vi_VN.tsx | 20 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/components/locale-provider/__tests__/__snapshots__/index.test.tsx.snap b/components/locale-provider/__tests__/__snapshots__/index.test.tsx.snap index 0b4cd8b095..6873c55feb 100644 --- a/components/locale-provider/__tests__/__snapshots__/index.test.tsx.snap +++ b/components/locale-provider/__tests__/__snapshots__/index.test.tsx.snap @@ -326871,7 +326871,7 @@ exports[`Locale Provider should display the text as vi 1`] = ` type="button" > - Huỷ + Hủy @@ -328444,7 +328444,7 @@ exports[`Locale Provider should display the text as vi 1`] = ` type="button" > - Huỷ + Hủy diff --git a/components/locale/vi_VN.tsx b/components/locale/vi_VN.tsx index 369686728a..c7669b4447 100644 --- a/components/locale/vi_VN.tsx +++ b/components/locale/vi_VN.tsx @@ -11,20 +11,20 @@ const localeValues: Locale = { TimePicker, Calendar, Table: { - filterTitle: 'Bộ ', - filterConfirm: 'OK', - filterReset: 'Tạo Lại', - selectAll: 'Chọn Tất Cả', - selectInvert: 'Chọn Ngược Lại', + filterTitle: 'Bộ lọc', + filterConfirm: 'Đồng ý', + filterReset: 'Bỏ lọc', + selectAll: 'Chọn tất cả', + selectInvert: 'Chọn ngược lại', }, Modal: { - okText: 'OK', - cancelText: 'Huỷ', + okText: 'Đồng ý', + cancelText: 'Hủy', justOkText: 'OK', }, Popconfirm: { - okText: 'OK', - cancelText: 'Huỷ', + okText: 'Đồng ý', + cancelText: 'Hủy', }, Transfer: { titles: ['', ''], @@ -36,7 +36,7 @@ const localeValues: Locale = { uploading: 'Đang tải lên...', removeFile: 'Gỡ bỏ tập tin', uploadError: 'Lỗi tải lên', - previewFile: 'Xem thử tập tin', + previewFile: 'Xem trước tập tin', downloadFile: 'Tải tập tin', }, Empty: {