chore: auto merge branches (#46293)

chore: feature merge master
ant-design · Dec 6, 2023 · 43e7fed · 43e7fed
2 parents 734bc88 + d0cc408
commit 43e7fed
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 9 deletions.
diff --git a/.dumi/theme/builtins/DemoWrapper/index.tsx b/.dumi/theme/builtins/DemoWrapper/index.tsx
@@ -110,7 +110,7 @@ const DemoWrapper: typeof DumiDemoGrid = ({ items }) => {
           )}
         </Tooltip>
       </span>
-      <ConfigProvider theme={{ cssVar: enableCssVar, hashed: !enableCssVar }}>
+      <ConfigProvider theme={{ cssVar: enableCssVar }}>
         <DumiDemoGrid items={demos} />
       </ConfigProvider>
     </div>

diff --git a/.dumi/theme/layouts/GlobalLayout.tsx b/.dumi/theme/layouts/GlobalLayout.tsx
@@ -178,7 +178,6 @@ const GlobalLayout: React.FC = () => {
                 motion: !theme.includes('motion-off'),
               },
               cssVar: true,
-              hashed: false,
             }}
           >
             <HappyProvider disabled={!theme.includes('happy-work')}>{content}</HappyProvider>

diff --git a/.github/workflows/discussion-open-check.yml b/.github/workflows/discussion-open-check.yml
@@ -19,7 +19,7 @@ jobs:
           DING_TALK_TOKEN: |
             ${{ secrets.DINGDING_BOT_TOKEN }}
             ${{ secrets.DINGDING_BOT_COLLABORATOR_TOKEN }}
-          notify_title: '🔥 @${{ github.event.discussion.user.login }} 创建了讨论：${{ github.event.discussion.title }} #${{ github.event.discussion.number }}'
+          notify_title: '🔥 @${{ github.event.discussion.user.login }} 创建了讨论：${{ github.event.discussion.title }} ${{ github.event.discussion.html_url }}'
           notify_body: '### 🔥 @${{ github.event.discussion.user.login }} 创建了讨论：[${{ github.event.discussion.title }}](${{ github.event.discussion.html_url }}) <hr />'
           notify_footer: '> 💬 欢迎前往 GitHub 进行讨论，社区可能需要你的帮助。'
           at_all: false # whether to ding everybody
diff --git a/.github/workflows/issue-open-check.yml b/.github/workflows/issue-open-check.yml
@@ -99,7 +99,7 @@ jobs:
           DING_TALK_TOKEN: |
             ${{ secrets.DINGDING_BOT_TOKEN }}
             ${{ secrets.DINGDING_BOT_COLLABORATOR_TOKEN }}
-          notify_title: '🔥 @${{ github.event.issue.user.login }} 创建了 issue：${{ github.event.issue.title }} #${{ github.event.issue.number }}'
+          notify_title: '🔥 @${{ github.event.issue.user.login }} 创建了 issue：${{ github.event.issue.title }} ${{ github.event.issue.html_url }}'
           notify_body: '### 🔥 @${{ github.event.issue.user.login }} 创建了 issue：[${{ github.event.issue.title }}](${{ github.event.issue.html_url }}) <hr />'
           notify_footer: '> 💬 欢迎前往 GitHub 进行讨论，社区可能需要你的帮助。'
           at_all: false # whether to ding everybody
diff --git a/components/auto-complete/index.zh-CN.md b/components/auto-complete/index.zh-CN.md
@@ -54,6 +54,7 @@ demo:
 | defaultOpen | 是否默认展开下拉菜单 | boolean | - |  |
 | defaultValue | 指定默认选中的条目 | string | - |  |
 | disabled | 是否禁用 | boolean | false |  |
+| dropdownRender | 自定义下拉框内容 | (menus: ReactNode) => ReactNode | - | 4.24.0 |
 | popupClassName | 下拉菜单的 className 属性 | string | - | 4.23.0 |
 | dropdownMatchSelectWidth | 下拉菜单和选择器同宽。默认将设置 `min-width`，当值小于选择框宽度时会被忽略。false 时会关闭虚拟滚动 | boolean \| number | true |  |
 | filterOption | 是否根据输入项进行筛选。当其为一个函数时，会接收 `inputValue` `option` 两个参数，当 `option` 符合筛选条件时，应返回 true，反之则返回 false | boolean \| function(inputValue, option) | true |  |

diff --git a/components/config-provider/hooks/useThemeKey.ts b/components/config-provider/hooks/useThemeKey.ts
@@ -1,4 +1,9 @@
-import { useId } from 'react';
+import * as React from 'react';
+
+const fullClone = {
+  ...React,
+};
+const { useId } = fullClone;
 
 const useEmptyId = () => '';
 

diff --git a/components/modal/index.en-US.md b/components/modal/index.en-US.md
@@ -14,7 +14,7 @@ Modal dialogs.
 
 When requiring users to interact with the application, but without jumping to a new page and interrupting the user's workflow, you can use `Modal` to create a new floating layer over the current page to get user feedback or display information.
 
-Additionally, if you need show a simple confirmation dialog, you can use [`App.useApp`](/components/app/) hooks.
+Additionally, if you need to show a simple confirmation dialog, you can use [`App.useApp`](/components/app/) hooks.
 
 ## Examples
 

diff --git a/components/tour/__tests__/__snapshots__/index.test.tsx.snap b/components/tour/__tests__/__snapshots__/index.test.tsx.snap
@@ -308,7 +308,7 @@ exports[`Tour controlled current 1`] = `
   <div>
     <div
       class="ant-tour-mask"
-      style="position: fixed; left: 0px; right: 0px; top: 0px; bottom: 0px; z-index: 1001; pointer-events: none;"
+      style="position: fixed; left: 0px; right: 0px; top: 0px; bottom: 0px; z-index: 1001; pointer-events: auto;"
     >
       <svg
         style="width: 100%; height: 100%;"

diff --git a/package.json b/package.json
@@ -119,7 +119,7 @@
     "@ctrl/tinycolor": "^3.6.1",
     "@rc-component/color-picker": "~1.4.1",
     "@rc-component/mutate-observer": "^1.1.0",
-    "@rc-component/tour": "~1.11.0",
+    "@rc-component/tour": "~1.11.1",
     "@rc-component/trigger": "^1.18.2",
     "classnames": "^2.3.2",
     "copy-to-clipboard": "^3.3.3",
@@ -136,7 +136,7 @@
     "rc-input": "~1.3.6",
     "rc-input-number": "~8.4.0",
     "rc-mentions": "~2.9.1",
-    "rc-menu": "~9.12.2",
+    "rc-menu": "~9.12.4",
     "rc-motion": "^2.9.0",
     "rc-notification": "~5.3.0",
     "rc-pagination": "~4.0.1",