chore: auto merge branches (#39295)

chore: feature merge master
This commit is contained in:
github-actions[bot] 2022-12-06 08:55:00 +00:00 committed by GitHub
commit cd8840bf56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 45 deletions

View File

@ -26,4 +26,3 @@ jobs:
- uses: andresz1/size-limit-action@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
script: npx size-limit --json --why

View File

@ -80,7 +80,7 @@ const initFloatButtonGroupMotion = (token: FloatButtonToken) => {
// ============================== Group ==============================
const floatButtonGroupStyle: GenerateStyle<FloatButtonToken, CSSObject> = (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<FloatButtonToken, CSSObject> = (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<FloatButtonToken, CSSObject> = (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<FloatButtonToken, CSSObject> = (token
},
[`${groupPrefixCls}-wrap`]: {
display: 'block',
borderRadius,
borderRadius: borderRadiusLG,
boxShadow: token.boxShadowSecondary,
overflow: 'hidden',
[`${componentCls}-square`]: {
@ -146,12 +146,12 @@ const floatButtonGroupStyle: GenerateStyle<FloatButtonToken, CSSObject> = (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<FloatButtonToken, CSSObject> = (token
// ============================== Shared ==============================
const sharedFloatButtonStyle: GenerateStyle<FloatButtonToken, CSSObject> = (token) => {
const { componentCls, floatButtonIconSize, floatButtonSize } = token;
const { componentCls, floatButtonIconSize, floatButtonSize, borderRadiusLG } = token;
return {
[componentCls]: {
...resetComponent(token),
@ -212,8 +212,8 @@ const sharedFloatButtonStyle: GenerateStyle<FloatButtonToken, CSSObject> = (toke
},
[`${componentCls}-body`]: {
width: floatButtonSize,
height: floatButtonSize,
width: '100%',
height: '100%',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
@ -247,7 +247,7 @@ const sharedFloatButtonStyle: GenerateStyle<FloatButtonToken, CSSObject> = (toke
[`${componentCls}-square`]: {
height: 'auto',
minHeight: floatButtonSize,
borderRadius: token.borderRadius,
borderRadius: borderRadiusLG,
[`${componentCls}-body`]: {
height: 'auto',
borderRadius: token.borderRadiusSM,

View File

@ -1,9 +1,9 @@
import React, { useState } from 'react';
import { Col, Row, Slider } from 'antd';
const gutters: Record<string, number> = {};
const vgutters: Record<string, number> = {};
const colCounts: Record<string, number> = {};
const gutters: Record<PropertyKey, number> = {};
const vgutters: Record<PropertyKey, number> = {};
const colCounts: Record<PropertyKey, number> = {};
[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] }}
/>
</div>
<span>Vertical Gutter (px): </span>
@ -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] }}
/>
</div>
<span>Column Count:</span>
@ -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] }}
/>
</div>
<Row gutter={[gutters[gutterKey], vgutters[vgutterKey]]}>

View File

@ -326871,7 +326871,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
type="button"
>
<span>
Huỷ
Hủy
</span>
</button>
<button
@ -326879,7 +326879,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
type="button"
>
<span>
OK
Đồng ý
</span>
</button>
</div>
@ -328444,7 +328444,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
type="button"
>
<span>
Huỷ
Hủy
</span>
</button>
<button
@ -328452,7 +328452,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
type="button"
>
<span>
OK
Đồng ý
</span>
</button>
</div>

View File

@ -25,9 +25,9 @@ const localeValues: Locale = {
selectionAll: 'בחר את כל הנתונים',
sortTitle: 'מיון',
expand: 'הרחב שורה',
collapse: 'צמצם שורהw',
triggerDesc: 'לחץ על מיון לפי סדר יורד',
triggerAsc: 'לחץ על מיון לפי סדר עולה',
collapse: 'צמצם שורה',
triggerDesc: 'לחץ למיון לפי סדר יורד',
triggerAsc: 'לחץ למיון לפי סדר עולה',
cancelSort: 'לחץ כדי לבטל את המיון',
},
Modal: {

View File

@ -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: {

View File

@ -167,8 +167,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",
@ -286,18 +286,15 @@
"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",
"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",
"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",