Merge branch 'master' into dependabot/npm_and_yarn/gh-pages-5.0.0

.dumirc.ts

@@ -0,0 +1,24 @@
+// more config: https://d.umijs.org/config
+import { defineConfig } from 'dumi';
+
+export default defineConfig({
+  themeConfig: {
+    name: 'rc-menu',
+    logo: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4',
+    nav: [
+      { title: 'Demo', link: '/demo/antd'}
+    ],
+  },
+  favicons:
+    ['https://avatars0.githubusercontent.com/u/9441414?s=200&v=4'],
+  outputPath: '.doc',
+  exportStatic: {},
+  mfsu: {},
+  styles: [
+    `
+      .markdown table {
+        width: auto !important;
+      }
+    `,
+  ]
+});

.github/workflows/codeql.yml

@@ -0,0 +1,41 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: "12 22 * * 6"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ javascript ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"

.github/workflows/main.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, next ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, next ]
 
 jobs:
   setup:
@@ -43,7 +43,7 @@ jobs:
       - name: install
         if: steps.node_modules_cache_id.outputs.cache-hit != 'true'
         run: npm ci
-  
+
   lint:
     runs-on: ubuntu-latest
     steps:
@@ -66,7 +66,7 @@ jobs:
         run: npm run lint
 
     needs: setup
-  
+
   compile:
     runs-on: ubuntu-latest
     steps:
@@ -89,7 +89,7 @@ jobs:
         run: npm run compile
 
     needs: setup
-  
+
   coverage:
     runs-on: ubuntu-latest
     steps:
@@ -111,4 +111,4 @@ jobs:
       - name: coverage
         run: npm run coverage && bash <(curl -s https://codecov.io/bash)
 
-    needs: setup
+    needs: setup

.gitignore

@@ -32,7 +32,7 @@ package-lock.json
 .vscode
 
 # umi
-.umi
-.umi-production
-.umi-test
-.env.local 
+.dumi/tmp
+.dumi/tmp-test
+.dumi/tmp-production
+.env.local

README.md

@@ -4,14 +4,21 @@
 
 React Menu Component. port from https://github.com/kissyteam/menu
 
-[![NPM version][npm-image]][npm-url] [![dumi](https://img.shields.io/badge/docs%20by-dumi-blue?style=flat-square)](https://github.com/umijs/dumi) [![build status][github-actions-image]][github-actions-url] [![Test coverage][coveralls-image]][coveralls-url] [![Dependencies][david-image]][david-url] [![DevDependencies][david-dev-image]][david-dev-url] [![npm download][download-image]][download-url] [![bundle size][bundlephobia-image]][bundlephobia-url]
+[![NPM version][npm-image]][npm-url]
+[![npm download][download-image]][download-url]
+[![build status][github-actions-image]][github-actions-url]
+[![Codecov][codecov-image]][codecov-url]
+[![bundle size][bundlephobia-image]][bundlephobia-url]
+[![dumi][dumi-image]][dumi-url]
 
 [npm-image]: http://img.shields.io/npm/v/rc-menu.svg?style=flat-square
 [npm-url]: http://npmjs.org/package/rc-menu
 [github-actions-image]: https://github.com/react-component/menu/workflows/CI/badge.svg
 [github-actions-url]: https://github.com/react-component/menu/actions
 [circleci-image]: https://img.shields.io/circleci/react-component/menu/master?style=flat-square
 [circleci-url]: https://circleci.com/gh/react-component/menu
+[codecov-image]: https://img.shields.io/codecov/c/github/react-component/footer/master.svg?style=flat-square
+[codecov-url]: https://codecov.io/gh/react-component/footer/branch/master
 [coveralls-image]: https://img.shields.io/coveralls/react-component/menu.svg?style=flat-square
 [coveralls-url]: https://coveralls.io/r/react-component/menu?branch=master
 [david-url]: https://david-dm.org/react-component/menu
@@ -22,6 +29,8 @@ React Menu Component. port from https://github.com/kissyteam/menu
 [download-url]: https://npmjs.org/package/rc-menu
 [bundlephobia-url]: https://bundlephobia.com/result?p=rc-menu
 [bundlephobia-image]: https://badgen.net/bundlephobia/minzip/rc-menu
+[dumi-url]: https://github.com/umijs/dumi
+[dumi-image]: https://img.shields.io/badge/docs%20by-dumi-blue?style=flat-square
 
 ## Install
 
@@ -291,6 +300,12 @@ ReactDOM.render(
           <td></td>
           <td>additional css class of root dom node</td>
         </tr>
+        <tr>
+          <td>popupStyle</td>
+          <td>CSSProperties</td>
+          <td></td>
+          <td>additional css style of root dom node</td>
+        </tr>
         <tr>
           <td>title</td>
           <td>String/ReactElement</td>

docs/demo/antd-switch.md

@@ -1,3 +1,3 @@
 ## antd-switch
 
-<code src="../examples/antd-switch.tsx">
+<code src="../examples/antd-switch.tsx"></code>

docs/demo/antd.md

@@ -1,3 +1,3 @@
 ## antd
 
-<code src="../examples/antd.tsx">
+<code src="../examples/antd.tsx"></code>

docs/demo/custom-icon.md

@@ -1,3 +1,3 @@
 ## custom-icon
 
-<code src="../examples/custom-icon.tsx">
+<code src="../examples/custom-icon.tsx"></code>

docs/demo/debug.md

@@ -1,3 +1,3 @@
 ## debug
 
-<code src="../examples/debug.tsx">
+<code src="../examples/debug.tsx"></code>

docs/demo/fragment.md

@@ -1,3 +1,3 @@
 ## fragment
 
-<code src="../examples/fragment.tsx">
+<code src="../examples/fragment.tsx"></code>

docs/demo/inlineCollapsed.md

@@ -1,3 +1,3 @@
 ## inlineCollapsed
 
-<code src="../examples/inlineCollapsed.tsx">
+<code src="../examples/inlineCollapsed.tsx"></code>

docs/demo/items.md

@@ -1,3 +1,3 @@
 ## items
 
-<code src="../examples/items.tsx">
+<code src="../examples/items.tsx"></code>

docs/demo/keyPath.md

@@ -1,3 +1,3 @@
 ## keyPath
 
-<code src="../examples/keyPath.tsx">
+<code src="../examples/keyPath.tsx"></code>

docs/demo/menuItemGroup.md

@@ -1,3 +1,3 @@
 ## menuItemGroup
 
-<code src="../examples/menuItemGroup.tsx">
+<code src="../examples/menuItemGroup.tsx"></code>

docs/demo/multiple.md

@@ -1,3 +1,3 @@
 ## multiple
 
-<code src="../examples/multiple.tsx">
+<code src="../examples/multiple.tsx"></code>

docs/demo/openKeys.md

@@ -1,3 +1,3 @@
 ## openKeys
 
-<code src="../examples/openKeys.tsx">
+<code src="../examples/openKeys.tsx"></code>

docs/demo/rtl-antd.md

@@ -1,3 +1,3 @@
 ## rtl-antd
 
-<code src="../examples/rtl-antd.tsx">
+<code src="../examples/rtl-antd.tsx"></code>

docs/demo/scrollable.md

@@ -1,3 +1,3 @@
 ## scrollable
 
-<code src="../examples/scrollable.tsx">
+<code src="../examples/scrollable.tsx"></code>

docs/demo/selectedKeys.md

@@ -1,3 +1,3 @@
 ## selectedKeys
 
-<code src="../examples/selectedKeys.tsx">
+<code src="../examples/selectedKeys.tsx"></code>

docs/demo/single.md

@@ -1,3 +1,3 @@
 ## single
 
-<code src="../examples/single.tsx">
+<code src="../examples/single.tsx"></code>

docs/examples/inlineCollapsed.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import Menu, { SubMenu, Item } from 'rc-menu';
+import Menu from 'rc-menu';
 import './inlineCollapsed.less';
 
 const App = () => {
@@ -15,13 +15,25 @@ const App = () => {
         inlineCollapsed={collapsed}
         style={{ width: 600 }}
         className={collapsed ? 'collapsed' : ''}
-      >
-        <Item key="1">item 1</Item>
-        <SubMenu key="2" title={`inlineCollapsed: ${collapsed.toString()}`}>
-          <Item key="3">item 2</Item>
-          <Item key="4">item 3</Item>
-        </SubMenu>
-      </Menu>
+        items={[
+          { key: '1', label: 'item 1' },
+          {
+            key: '2',
+            label: `inlineCollapsed: ${collapsed.toString()}`,
+            children: [
+              { key: '3', label: 'item 2' },
+              { key: '4', label: 'item 3' },
+              {
+                key: '5', label: 'SubMenu', children: [
+                  { key: '6', label: 'item 4' },
+                  { key: '7', label: 'item 5' },
+                  { key: '8', label: 'item 6' },
+                ]
+              }
+            ],
+          },
+        ]}
+      />
     </>
   );
 }

jest.config.js

@@ -1,4 +1,4 @@
 module.exports = {
   setupFiles: ['<rootDir>/tests/setup.js'],
   setupFilesAfterEnv: ['<rootDir>/tests/setupFilesAfterEnv.ts']
-};
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-menu",
-  "version": "9.8.2",
+  "version": "9.12.2",
   "description": "menu ui component for react",
   "keywords": [
     "react",
@@ -44,32 +44,32 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.10.1",
+    "@rc-component/trigger": "^1.17.0",
     "classnames": "2.x",
     "rc-motion": "^2.4.3",
-    "rc-overflow": "^1.2.8",
-    "rc-trigger": "^5.1.2",
+    "rc-overflow": "^1.3.1",
     "rc-util": "^5.27.0"
   },
   "devDependencies": {
     "@rc-component/father-plugin": "^1.0.0",
     "@testing-library/jest-dom": "^5.16.4",
-    "@testing-library/react": "^13.0.0",
+    "@testing-library/react": "^14.0.0",
     "@types/jest": "^26.0.23",
-    "@types/react": "^16.8.19",
-    "@types/react-dom": "^16.8.4",
+    "@types/react-dom": "^18.2.6",
+    "@types/react": "^18.2.14",
     "@types/warning": "^3.0.0",
     "cross-env": "^7.0.0",
-    "dumi": "^1.1.0",
+    "dumi": "^2.1.17",
     "eslint": "^7.0.0",
     "father": "^4.0.0",
     "gh-pages": "^5.0.0",
-    "less": "^3.10.3",
+    "less": "^4.1.3",
     "np": "^6.0.0",
     "rc-test": "^7.0.14",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "regenerator-runtime": "^0.13.7",
-    "typescript": "^4.0.5"
+    "typescript": "^5.1.6"
   },
   "peerDependencies": {
     "react": ">=16.9.0",

src/Divider.tsx

@@ -16,6 +16,7 @@ export default function Divider({ className, style }: DividerProps) {
 
   return (
     <li
+      role="separator"
       className={classNames(`${prefixCls}-item-divider`, className)}
       style={style}
     />