diff --git a/.dumi/global.css b/.dumi/global.css index 6c32b20c42..41fc9ed943 100644 --- a/.dumi/global.css +++ b/.dumi/global.css @@ -16,5 +16,5 @@ html { scrollbar-width: thin; - scrollbar-color: unset; + scrollbar-color: #eaeaea transparent; } diff --git a/.dumi/theme/common/ComponentChangelog/ComponentChangelog.tsx b/.dumi/theme/common/ComponentChangelog/ComponentChangelog.tsx index dd57ac12d8..d4d3af05ba 100644 --- a/.dumi/theme/common/ComponentChangelog/ComponentChangelog.tsx +++ b/.dumi/theme/common/ComponentChangelog/ComponentChangelog.tsx @@ -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` diff --git a/.dumi/theme/common/LiveCode.tsx b/.dumi/theme/common/LiveCode.tsx index 2d9e8b6989..fea183755a 100644 --- a/.dumi/theme/common/LiveCode.tsx +++ b/.dumi/theme/common/LiveCode.tsx @@ -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, diff --git a/.dumi/theme/common/styles/Markdown.tsx b/.dumi/theme/common/styles/Markdown.tsx index 25ae81eb43..8f4fd0f724 100644 --- a/.dumi/theme/common/styles/Markdown.tsx +++ b/.dumi/theme/common/styles/Markdown.tsx @@ -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; diff --git a/.dumi/theme/slots/Content/DocAnchor.tsx b/.dumi/theme/slots/Content/DocAnchor.tsx index ffdd7080fb..223c2abd74 100644 --- a/.dumi/theme/slots/Content/DocAnchor.tsx +++ b/.dumi/theme/slots/Content/DocAnchor.tsx @@ -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; diff --git a/.dumi/theme/slots/Header/index.tsx b/.dumi/theme/slots/Header/index.tsx index a30eda5e4d..7029f17bd6 100644 --- a/.dumi/theme/slots/Header/index.tsx +++ b/.dumi/theme/slots/Header/index.tsx @@ -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; } } `, diff --git a/.dumi/theme/slots/Sidebar/index.tsx b/.dumi/theme/slots/Sidebar/index.tsx index ac1f25d224..13699a855d 100644 --- a/.dumi/theme/slots/Sidebar/index.tsx +++ b/.dumi/theme/slots/Sidebar/index.tsx @@ -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; diff --git a/.github/workflows/issue-schedule.yml b/.github/workflows/issue-schedule.yml index de90e31cf0..af7af19c9d 100644 --- a/.github/workflows/issue-schedule.yml +++ b/.github/workflows/issue-schedule.yml @@ -69,7 +69,7 @@ jobs: const actionTitle = process.env.actionTitle + `(${issueList.length})`; - const markdownList = `

${actionTitle}

\n\n` + const markdownList = `## ${actionTitle}\n\n` + issueList.map(issue => `- [${issue.title}](${issue.html_url}) ${fromNow(issue.created_at)}`).join('\n') + `\n\n > 🫵🏻 快去帮忙处理吧，社区需要你的帮助！`; diff --git a/components/affix/__tests__/__snapshots__/demo.test.tsx.snap b/components/affix/__tests__/__snapshots__/demo.test.tsx.snap index c200a15f08..d0c4eb4d39 100644 --- a/components/affix/__tests__/__snapshots__/demo.test.tsx.snap +++ b/components/affix/__tests__/__snapshots__/demo.test.tsx.snap @@ -84,7 +84,7 @@ exports[`renders components/affix/demo/on-change.tsx correctly 1`] = ` exports[`renders components/affix/demo/target.tsx correctly 1`] = `
>[0]) => BadgeT const badgeFontHeight = fontHeight; const badgeShadowSize = lineWidth; - const badgeTextColor = token.colorBgContainer; + const badgeTextColor = token.colorTextLightSolid; const badgeColor = token.colorError; const badgeColorHover = token.colorErrorHover; diff --git a/components/badge/style/ribbon.ts b/components/badge/style/ribbon.ts index 7675066a1d..e456659dc9 100644 --- a/components/badge/style/ribbon.ts +++ b/components/badge/style/ribbon.ts @@ -34,7 +34,7 @@ const genRibbonStyle: GenerateStyle = (token) => { backgroundColor: token.colorPrimary, borderRadius: token.borderRadiusSM, [`${ribbonPrefixCls}-text`]: { - color: token.colorTextLightSolid, + color: token.badgeTextColor, }, [`${ribbonPrefixCls}-corner`]: { position: 'absolute', diff --git a/components/float-button/style/index.ts b/components/float-button/style/index.ts index 1e10a28c63..9a570f095e 100644 --- a/components/float-button/style/index.ts +++ b/components/float-button/style/index.ts @@ -136,21 +136,49 @@ const floatButtonGroupStyle: GenerateStyle = (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, diff --git a/components/layout/__tests__/__snapshots__/demo.test.ts.snap b/components/layout/__tests__/__snapshots__/demo.test.ts.snap index eab8689c15..51efa5a0a3 100644 --- a/components/layout/__tests__/__snapshots__/demo.test.ts.snap +++ b/components/layout/__tests__/__snapshots__/demo.test.ts.snap @@ -755,7 +755,7 @@ exports[`renders components/layout/demo/fixed-sider.tsx correctly 1`] = ` >