chore: auto merge branches (#51314)

chore: merge master into feature
This commit is contained in:
github-actions[bot] 2024-10-20 02:37:59 +00:00 committed by GitHub
commit 02c6c1a3b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
28 changed files with 104 additions and 71 deletions

View File

@ -16,5 +16,5 @@
html {
scrollbar-width: thin;
scrollbar-color: unset;
scrollbar-color: #eaeaea transparent;
}

View File

@ -1,6 +1,6 @@
import React, { cloneElement, isValidElement } from 'react';
import { BugOutlined } from '@ant-design/icons';
import { Drawer, Flex, Grid, Popover, Tag, Timeline, Typography, Button } from 'antd';
import { Button, Drawer, Flex, Grid, Popover, Tag, Timeline, Typography } from 'antd';
import type { TimelineItemProps } from 'antd';
import { createStyles } from 'antd-style';
import semver from 'semver';
@ -76,7 +76,7 @@ const useStyle = createStyles(({ token, css }) => ({
position: 'relative',
[`> ${token.antCls}-drawer-body`]: {
scrollbarWidth: 'thin',
scrollbarColor: 'unset',
scrollbarGutter: 'stable',
},
},
versionWrap: css`

View File

@ -15,7 +15,7 @@ const useStyle = createStyles(({ token, css }) => {
background: ${colorBgContainer};
&-scroll-container {
scrollbar-width: thin;
scrollbar-color: unset;
scrollbar-gutter: stable;
}
}
.dumi-default-source-code > pre,

View File

@ -169,7 +169,7 @@ const GlobalStyle: React.FC = () => {
border-radius: ${token.borderRadius}px;
> pre.prism-code {
scrollbar-width: thin;
scrollbar-color: unset;
scrollbar-gutter: stable;
padding: ${token.paddingSM}px ${token.paddingMD}px;
font-size: ${token.fontSize}px;
line-height: 2;
@ -272,7 +272,7 @@ const GlobalStyle: React.FC = () => {
.markdown .dumi-default-table {
&-content {
scrollbar-width: thin;
scrollbar-color: unset;
scrollbar-gutter: stable;
}
table {
margin: 0;

View File

@ -10,7 +10,7 @@ export const useStyle = createStyles(({ token, css }) => {
return {
anchorToc: css`
scrollbar-width: thin;
scrollbar-color: unset;
scrollbar-gutter: stable;
${antCls}-anchor {
${antCls}-anchor-link-title {
font-size: ${token.fontSizeSM}px;

View File

@ -99,7 +99,7 @@ const useStyle = createStyles(({ token, css }) => {
}
& > section {
scrollbar-width: thin;
scrollbar-color: unset;
scrollbar-gutter: stable;
}
}
}
@ -142,7 +142,7 @@ const useStyle = createStyles(({ token, css }) => {
.rc-virtual-list {
.rc-virtual-list-holder {
scrollbar-width: thin;
scrollbar-color: unset;
scrollbar-gutter: stable;
}
}
`,

View File

@ -91,18 +91,17 @@ const useStyle = createStyles(({ token, css }) => {
`,
mainMenu: css`
z-index: 1;
position: sticky;
top: ${token.headerHeight + token.contentMarginTop}px;
width: 100%;
height: 100%;
max-height: calc(100vh - ${token.headerHeight + token.contentMarginTop}px);
overflow: hidden;
scrollbar-width: thin;
scrollbar-color: unset;
.ant-menu {
padding: 0 4px;
}
position: sticky;
top: ${token.headerHeight + token.contentMarginTop}px;
width: 100%;
height: 100%;
max-height: calc(100vh - ${token.headerHeight + token.contentMarginTop}px);
overflow: hidden;
scrollbar-width: thin;
scrollbar-gutter: stable;
.ant-menu {
padding: 0 4px;
}
&:hover {
overflow-y: auto;

View File

@ -69,7 +69,7 @@ jobs:
const actionTitle = process.env.actionTitle + `(${issueList.length})`;
const markdownList = `<h2>${actionTitle}</h2>\n\n`
const markdownList = `## ${actionTitle}\n\n`
+ issueList.map(issue => `- [${issue.title}](${issue.html_url}) ${fromNow(issue.created_at)}`).join('\n')
+ `\n\n > 🫵🏻 快去帮忙处理吧,社区需要你的帮助!`;

View File

@ -84,7 +84,7 @@ exports[`renders components/affix/demo/on-change.tsx correctly 1`] = `
exports[`renders components/affix/demo/target.tsx correctly 1`] = `
<div
style="width:100%;height:100px;overflow:auto;box-shadow:0 0 0 1px #1677ff;scrollbar-width:thin;scrollbar-color:unset"
style="width:100%;height:100px;overflow:auto;box-shadow:0 0 0 1px #1677ff;scrollbar-width:thin;scrollbar-gutter:stable"
>
<div
style="width:100%;height:1000px"

View File

@ -7,7 +7,7 @@ const containerStyle: React.CSSProperties = {
overflow: 'auto',
boxShadow: '0 0 0 1px #1677ff',
scrollbarWidth: 'thin',
scrollbarColor: 'unset',
scrollbarGutter: 'stable',
};
const style: React.CSSProperties = {

View File

@ -377,7 +377,7 @@ export const prepareToken: (token: Parameters<GenStyleFn<'Badge'>>[0]) => BadgeT
const badgeFontHeight = fontHeight;
const badgeShadowSize = lineWidth;
const badgeTextColor = token.colorBgContainer;
const badgeTextColor = token.colorTextLightSolid;
const badgeColor = token.colorError;
const badgeColorHover = token.colorErrorHover;

View File

@ -34,7 +34,7 @@ const genRibbonStyle: GenerateStyle<BadgeToken> = (token) => {
backgroundColor: token.colorPrimary,
borderRadius: token.borderRadiusSM,
[`${ribbonPrefixCls}-text`]: {
color: token.colorTextLightSolid,
color: token.badgeTextColor,
},
[`${ribbonPrefixCls}-corner`]: {
position: 'absolute',

View File

@ -136,21 +136,49 @@ const floatButtonGroupStyle: GenerateStyle<FloatButtonToken, CSSObject> = (token
flexDirection: 'column',
top: 'auto',
bottom: calc(floatButtonSize).add(margin).equal(),
'&::after': {
content: '""',
position: 'absolute',
width: '100%',
height: margin,
bottom: calc(margin).mul(-1).equal(),
},
},
[`${groupPrefixCls}-bottom > ${groupPrefixCls}-wrap`]: {
flexDirection: 'column',
top: calc(floatButtonSize).add(margin).equal(),
bottom: 'auto',
'&::after': {
content: '""',
position: 'absolute',
width: '100%',
height: margin,
top: calc(margin).mul(-1).equal(),
},
},
[`${groupPrefixCls}-right > ${groupPrefixCls}-wrap`]: {
flexDirection: 'row',
left: { _skip_check_: true, value: calc(floatButtonSize).add(margin).equal() },
right: { _skip_check_: true, value: 'auto' },
'&::after': {
content: '""',
position: 'absolute',
width: margin,
height: '100%',
left: { _skip_check_: true, value: calc(margin).mul(-1).equal() },
},
},
[`${groupPrefixCls}-left > ${groupPrefixCls}-wrap`]: {
flexDirection: 'row',
left: { _skip_check_: true, value: 'auto' },
right: { _skip_check_: true, value: calc(floatButtonSize).add(margin).equal() },
'&::after': {
content: '""',
position: 'absolute',
width: margin,
height: '100%',
right: { _skip_check_: true, value: calc(margin).mul(-1).equal() },
},
},
[`${groupPrefixCls}-circle`]: {
gap: margin,

View File

@ -755,7 +755,7 @@ exports[`renders components/layout/demo/fixed-sider.tsx correctly 1`] = `
>
<aside
class="ant-layout-sider ant-layout-sider-dark"
style="overflow:auto;height:100vh;position:fixed;inset-inline-start:0;top:0;bottom:0;scrollbar-width:thin;scrollbar-color:unset;flex:0 0 200px;max-width:200px;min-width:200px;width:200px"
style="overflow:auto;height:100vh;position:fixed;inset-inline-start:0;top:0;bottom:0;scrollbar-width:thin;scrollbar-gutter:stable;flex:0 0 200px;max-width:200px;min-width:200px;width:200px"
>
<div
class="ant-layout-sider-children"

View File

@ -22,7 +22,7 @@ const siderStyle: React.CSSProperties = {
top: 0,
bottom: 0,
scrollbarWidth: 'thin',
scrollbarColor: 'unset',
scrollbarGutter: 'stable',
};
const items: MenuProps['items'] = [

View File

@ -74,7 +74,7 @@ const genSiderStyle: GenerateStyle<LayoutToken, CSSObject> = (token) => {
overflow: 'hidden',
},
[`${componentCls}-trigger`]: {
'&-trigger': {
position: 'absolute',
top: headerHeight,
insetInlineEnd: token.calc(zeroTriggerWidth).mul(-1).equal(),

View File

@ -11857,7 +11857,7 @@ exports[`renders components/table/demo/filter-search.tsx extend context correctl
exports[`renders components/table/demo/fixed-header.tsx extend context correctly 1`] = `
<div
class="ant-table-wrapper acss-6kbv1r"
class="ant-table-wrapper acss-10ugdpo"
>
<div
class="ant-spin-nested-loading"
@ -13226,7 +13226,7 @@ exports[`renders components/table/demo/fixed-header.tsx extend context correctly
exports[`renders components/table/demo/grouping-columns.tsx extend context correctly 1`] = `
<div
class="ant-table-wrapper acss-6kbv1r"
class="ant-table-wrapper acss-10ugdpo"
>
<div
class="ant-spin-nested-loading"

View File

@ -9494,7 +9494,7 @@ exports[`renders components/table/demo/filter-search.tsx correctly 1`] = `
exports[`renders components/table/demo/fixed-columns.tsx correctly 1`] = `
<div
class="ant-table-wrapper acss-6kbv1r"
class="ant-table-wrapper acss-10ugdpo"
>
<div
class="ant-spin-nested-loading"
@ -10205,7 +10205,7 @@ exports[`renders components/table/demo/fixed-columns.tsx correctly 1`] = `
exports[`renders components/table/demo/fixed-columns-header.tsx correctly 1`] = `
<div
class="ant-table-wrapper acss-6kbv1r"
class="ant-table-wrapper acss-10ugdpo"
>
<div
class="ant-spin-nested-loading"
@ -12121,7 +12121,7 @@ exports[`renders components/table/demo/fixed-columns-header.tsx correctly 1`] =
exports[`renders components/table/demo/fixed-gapped-columns.tsx correctly 1`] = `
<div
class="ant-table-wrapper acss-6kbv1r"
class="ant-table-wrapper acss-10ugdpo"
>
<div
class="ant-spin-nested-loading"
@ -12840,7 +12840,7 @@ exports[`renders components/table/demo/fixed-gapped-columns.tsx correctly 1`] =
exports[`renders components/table/demo/fixed-header.tsx correctly 1`] = `
<div
class="ant-table-wrapper acss-6kbv1r"
class="ant-table-wrapper acss-10ugdpo"
>
<div
class="ant-spin-nested-loading"
@ -14104,7 +14104,7 @@ exports[`renders components/table/demo/fixed-header.tsx correctly 1`] = `
exports[`renders components/table/demo/grouping-columns.tsx correctly 1`] = `
<div
class="ant-table-wrapper acss-6kbv1r"
class="ant-table-wrapper acss-10ugdpo"
>
<div
class="ant-spin-nested-loading"
@ -27873,7 +27873,7 @@ exports[`renders components/table/demo/summary.tsx correctly 1`] = `
class="ant-flex ant-flex-align-stretch ant-flex-gap-small ant-flex-vertical"
>
<div
class="ant-table-wrapper acss-6kbv1r"
class="ant-table-wrapper acss-10ugdpo"
>
<div
class="ant-spin-nested-loading"
@ -28056,7 +28056,7 @@ exports[`renders components/table/demo/summary.tsx correctly 1`] = `
</div>
</div>
<div
class="ant-table-wrapper acss-6kbv1r"
class="ant-table-wrapper acss-10ugdpo"
>
<div
class="ant-spin-nested-loading"

View File

@ -12,7 +12,8 @@ const useStyle = createStyles(({ css, token }) => {
${antCls}-table-body,
${antCls}-table-content {
scrollbar-width: thin;
scrollbar-color: unset;
scrollbar-color: #eaeaea transparent;
scrollbar-gutter: stable;
}
}
}

View File

@ -12,7 +12,8 @@ const useStyle = createStyles(({ css, token }) => {
${antCls}-table-body,
${antCls}-table-content {
scrollbar-width: thin;
scrollbar-color: unset;
scrollbar-color: #eaeaea transparent;
scrollbar-gutter: stable;
}
}
}

View File

@ -12,7 +12,8 @@ const useStyle = createStyles(({ css, token }) => {
${antCls}-table-body,
${antCls}-table-content {
scrollbar-width: thin;
scrollbar-color: unset;
scrollbar-color: #eaeaea transparent;
scrollbar-gutter: stable;
}
}
}

View File

@ -12,7 +12,8 @@ const useStyle = createStyles(({ css, token }) => {
${antCls}-table-body,
${antCls}-table-content {
scrollbar-width: thin;
scrollbar-color: unset;
scrollbar-color: #eaeaea transparent;
scrollbar-gutter: stable;
}
}
}

View File

@ -12,7 +12,8 @@ const useStyle = createStyles(({ css, token }) => {
${antCls}-table-body,
${antCls}-table-content {
scrollbar-width: thin;
scrollbar-color: unset;
scrollbar-color: #eaeaea transparent;
scrollbar-gutter: stable;
}
}
}

View File

@ -12,7 +12,8 @@ const useStyle = createStyles(({ css, token }) => {
${antCls}-table-body,
${antCls}-table-content {
scrollbar-width: thin;
scrollbar-color: unset;
scrollbar-color: #eaeaea transparent;
scrollbar-gutter: stable;
}
}
}

View File

@ -120,7 +120,7 @@ Do it step by step:
```
2. Add the language support for [rc-picker](https://github.com/react-component/picker), for example [this](https://github.com/react-component/picker/blob/master/src/locale/en_US.ts).
3. Add the language support for [rc-pagination](https://github.com/react-component/pagination), for example [this](https://github.com/react-component/pagination/blob/master/src/locale/en_US.js).
3. Add the language support for [rc-pagination](https://github.com/react-component/pagination), for example [this](https://github.com/react-component/pagination/blob/master/src/locale/en_US.ts).
4. Wait for `rc-picker` and `rc-pagination` to release the new version containing the above.
5. Update the `rc-picker` and `rc-pagination` versions in `antd` and add the remaining other necessary content for the language. for example [Azerbaijani PR](https://github.com/ant-design/ant-design/pull/21387).
6. Add a test case for the language in [index.test.tsx](https://github.com/ant-design/ant-design/blob/master/components/locale/__tests__/index.test.tsx).

View File

@ -119,7 +119,7 @@ return (
```
2. 为 [rc-picker](https://github.com/react-component/picker) 添加对应语言,参考 [这个](https://github.com/react-component/picker/blob/master/src/locale/en_US.ts)。
3. 为 [rc-pagination](https://github.com/react-component/pagination) 添加对应语言,参考 [这个](https://github.com/react-component/pagination/blob/master/src/locale/en_US.js)。
3. 为 [rc-pagination](https://github.com/react-component/pagination) 添加对应语言,参考 [这个](https://github.com/react-component/pagination/blob/master/src/locale/en_US.ts)。
4. 等待 `rc-picker``rc-pagination` 发布含上述内容的最低版本。
5. 参考 [阿塞拜疆语的 PR](https://github.com/ant-design/ant-design/pull/21387) 向 `antd` 发起 PR完善对应语言的其他内容和更新 `rc-picker``rc-pagination` 版本。
6. 在 [index.test.tsx](https://github.com/ant-design/ant-design/blob/master/components/locale/__tests__/index.test.tsx) 添加该语言的测试用例。

View File

@ -110,7 +110,7 @@
"@ant-design/cssinjs-utils": "^1.1.1",
"@ant-design/icons": "^5.5.1",
"@ant-design/react-slick": "~1.1.2",
"@babel/runtime": "^7.25.6",
"@babel/runtime": "^7.25.7",
"@ctrl/tinycolor": "^3.6.1",
"@rc-component/color-picker": "~2.0.1",
"@rc-component/mutate-observer": "^1.1.0",
@ -144,7 +144,7 @@
"rc-slider": "~11.1.7",
"rc-steps": "~6.0.1",
"rc-switch": "~4.1.0",
"rc-table": "~7.48.0",
"rc-table": "~7.48.1",
"rc-tabs": "~15.3.0",
"rc-textarea": "~1.8.2",
"rc-tooltip": "~6.2.1",
@ -159,10 +159,10 @@
"@ant-design/compatible": "^5.1.3",
"@ant-design/happy-work-theme": "^1.0.0",
"@ant-design/tools": "^18.0.2",
"@antfu/eslint-config": "^3.7.3",
"@antfu/eslint-config": "^3.8.0",
"@antv/g6": "^4.8.24",
"@biomejs/biome": "^1.9.3",
"@codecov/webpack-plugin": "^1.2.0",
"@biomejs/biome": "^1.9.4",
"@codecov/webpack-plugin": "^1.2.1",
"@codesandbox/sandpack-react": "^2.19.9",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/modifiers": "^7.0.0",
@ -171,18 +171,18 @@
"@emotion/css": "^11.13.4",
"@emotion/react": "^11.13.3",
"@emotion/server": "^11.11.0",
"@eslint-react/eslint-plugin": "^1.14.3",
"@eslint-react/eslint-plugin": "^1.15.0",
"@ianvs/prettier-plugin-sort-imports": "^4.3.1",
"@inquirer/prompts": "^7.0.0",
"@madccc/duplicate-package-checker-webpack-plugin": "^1.0.0",
"@microflash/rehype-figure": "^2.1.1",
"@npmcli/run-script": "^9.0.0",
"@npmcli/run-script": "^9.0.1",
"@octokit/rest": "^21.0.2",
"@qixian.cs/github-contributors-list": "^2.0.2",
"@size-limit/file": "^11.1.6",
"@stackblitz/sdk": "^1.11.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/jest-dom": "^6.6.2",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"@types/adm-zip": "^0.5.5",
@ -198,18 +198,18 @@
"@types/jest-image-snapshot": "^6.4.0",
"@types/jquery": "^3.5.31",
"@types/jsdom": "^21.1.7",
"@types/lodash": "^4.17.9",
"@types/lodash": "^4.17.12",
"@types/minimist": "^1.2.5",
"@types/node": "^22.7.4",
"@types/node": "^22.7.7",
"@types/nprogress": "^0.2.3",
"@types/pixelmatch": "^5.2.6",
"@types/pngjs": "^6.0.5",
"@types/prismjs": "^1.26.4",
"@types/progress": "^2.0.7",
"@types/qs": "^6.9.16",
"@types/react": "^18.3.10",
"@types/react": "^18.3.11",
"@types/react-copy-to-clipboard": "^5.0.7",
"@types/react-dom": "^18.3.0",
"@types/react-dom": "^18.3.1",
"@types/react-highlight-words": "^0.20.0",
"@types/react-resizable": "^3.0.8",
"@types/semver": "^7.5.8",
@ -231,18 +231,18 @@
"cross-fetch": "^4.0.0",
"dekko": "^0.2.1",
"dotenv": "^16.4.5",
"dumi": "~2.4.12",
"dumi": "~2.4.13",
"dumi-plugin-color-chunk": "^1.1.2",
"eslint": "^9.11.1",
"eslint": "^9.13.0",
"eslint-plugin-compat": "^6.0.1",
"eslint-plugin-jest": "^28.8.3",
"eslint-plugin-jsx-a11y": "^6.10.0",
"eslint-plugin-react-hooks": "^5.1.0-beta-26f2496093-20240514",
"eslint-plugin-react-refresh": "^0.4.12",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.13",
"fast-glob": "^3.3.2",
"fetch-jsonp": "^1.3.0",
"fs-extra": "^11.2.0",
"gh-pages": "^6.1.1",
"gh-pages": "^6.2.0",
"glob": "^11.0.0",
"html2sketch": "^1.0.2",
"http-server": "^14.1.1",
@ -257,7 +257,7 @@
"jest-environment-jsdom": "^29.7.0",
"jest-environment-node": "^29.7.0",
"jest-image-snapshot": "^6.4.0",
"jest-puppeteer": "^10.1.1",
"jest-puppeteer": "^10.1.2",
"jquery": "^3.7.1",
"jsdom": "^25.0.1",
"jsonml-to-react-element": "^1.1.11",
@ -279,7 +279,7 @@
"prettier": "^3.3.3",
"pretty-format": "^29.7.0",
"prismjs": "^1.29.0",
"puppeteer": "^23.4.1",
"puppeteer": "^23.6.0",
"qs": "^6.13.0",
"rc-footer": "^0.6.8",
"rc-tween-one": "^3.0.6",
@ -294,7 +294,7 @@
"react-infinite-scroll-component": "^6.1.0",
"react-intersection-observer": "^9.13.1",
"react-resizable": "^3.0.5",
"react-router-dom": "^6.26.2",
"react-router-dom": "^6.27.0",
"react-sticky-box": "^2.0.5",
"regenerator-runtime": "^0.14.1",
"rehype-stringify": "^10.0.1",
@ -315,11 +315,11 @@
"sylvanas": "^0.6.1",
"tar": "^7.4.3",
"tar-fs": "^3.0.6",
"terser": "^5.34.1",
"terser": "^5.36.0",
"tsx": "4.11.2",
"typedoc": "^0.26.7",
"typescript": "~5.6.2",
"vanilla-jsoneditor": "^1.0.6",
"typedoc": "^0.26.10",
"typescript": "~5.6.3",
"vanilla-jsoneditor": "^1.0.8",
"vanilla-tilt": "^1.8.1",
"webpack": "^5.95.0",
"webpack-bundle-analyzer": "^4.10.2",

View File

@ -25,7 +25,7 @@ export const generateCssinjs = ({ key, beforeRender, render }: GenCssinjsOptions
Promise.all(
styleFiles.map(async (file) => {
const absPath = url.pathToFileURL(file).href;
const pathArr = file.split('/');
const pathArr = file.split(path.sep);
const styleIndex = pathArr.lastIndexOf('style');
const componentName = pathArr[styleIndex - 1];
let useStyle: StyleFn = () => {};