Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ updates:
time: '21:00'
timezone: Asia/Shanghai
open-pull-requests-limit: 10
groups:
npm-dependencies:
patterns:
- '*'

- package-ecosystem: github-actions
directory: '/'
Expand All @@ -17,3 +21,7 @@ updates:
time: '21:00'
timezone: Asia/Shanghai
open-pull-requests-limit: 10
groups:
github-actions:
patterns:
- '*'
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="center">
<h1>@rc-component/menu</h1>
<p><sub><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /> Part of the Ant Design ecosystem.</sub></p>
<p><sub><a href="https://ant.design"><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /></a> Part of the Ant Design ecosystem.</sub></p>
<p>🧭 Accessible React menu primitives for navigation, command surfaces, and nested item trees.</p>

<p>
Expand Down Expand Up @@ -70,7 +70,7 @@ export default () => (
Run the local dumi site:

```bash
npm install
ut install
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
npm start
```

Expand Down Expand Up @@ -161,7 +161,7 @@ type ItemType =
## Development

```bash
npm install
ut install
npm start
npm test
npm run tsc
Expand Down
6 changes: 3 additions & 3 deletions README.zh-CN.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="center">
<h1>@rc-component/menu</h1>
<p><sub><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /> Ant Design 生态的一部分。</sub></p>
<p><sub><a href="https://ant.design"><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /></a> Ant Design 生态的一部分。</sub></p>
<p>🧭 React 菜单组件,支持水平、垂直、内联、分组和子菜单。</p>

<p>
Expand Down Expand Up @@ -70,7 +70,7 @@ export default () => (
运行本地 dumi 站点:

```bash
npm install
ut install
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
npm start
```

Expand Down Expand Up @@ -161,7 +161,7 @@ type ItemType =
## 本地开发

```bash
npm install
ut install
npm start
npm test
npm run tsc
Expand Down
8 changes: 4 additions & 4 deletions docs/examples/customPopupRender.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ const NavigationDemo = () => {
],
},
];
const popupRender = (node: ReactElement) => (
const popupRender = (node: ReactElement<any>) => (
<div className="navigation-popup">
<div className="navigation-grid">
{React.Children.map(node.props.children.props.children, child => (
{React.Children.map(node.props.children.props.children, (child: ReactElement<any>) => (
<div className="navigation-item">
{React.cloneElement(child, {
className: `${child.props.className || ''} navigation-menu-item`,
Expand All @@ -85,13 +85,13 @@ const NavigationDemo = () => {
};

const MixedPanelDemo = () => {
const totalPopupRender = (node: ReactElement, info: { item: any; keys: string[] }) => {
const totalPopupRender = (node: ReactElement<any>, info: { item: any; keys: string[] }) => {
const isSecondLevel = info.keys.length == 2;
if (isSecondLevel) {
return (
<div className="navigation-popup">
<div className="navigation-grid">
{React.Children.map(node.props.children.props.children, child => (
{React.Children.map(node.props.children.props.children, (child: ReactElement<any>) => (
<div className="navigation-item">
{React.cloneElement(child, {
className: `${child.props.className || ''} navigation-menu-item`,
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/debug.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default () => {
const [inlineCollapsed, setInlineCollapsed] = React.useState(false);
const [forceRender, setForceRender] = React.useState(false);
const [openKeys, setOpenKeys] = React.useState<string[]>([]);
const menuRef = useRef<MenuRef>();
const menuRef = useRef<MenuRef>(null);

const onRootClick = (info: MenuInfo) => {
console.log('Root Menu Item Click:', info);
Expand Down
14 changes: 7 additions & 7 deletions docs/examples/items-ref.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import '../../assets/index.less';
import Menu from '../../src';

export default () => {
const ref1 = useRef();
const ref2 = useRef();
const ref3 = useRef();
const ref4 = useRef();
const ref5 = useRef();
const ref6 = useRef();
const ref7 = useRef();
const ref1 = useRef<HTMLLIElement>(null);
const ref2 = useRef<HTMLLIElement>(null);
const ref3 = useRef<HTMLLIElement>(null);
const ref4 = useRef<HTMLLIElement>(null);
const ref5 = useRef<HTMLLIElement>(null);
const ref6 = useRef<HTMLLIElement>(null);
const ref7 = useRef<HTMLLIElement>(null);

return (
<>
Expand Down
100 changes: 100 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
import { FlatCompat } from '@eslint/eslintrc';
import js from '@eslint/js';
import tsEslintPlugin from '@typescript-eslint/eslint-plugin';
import { createRequire } from 'node:module';
import path from 'node:path';
import { fileURLToPath } from 'node:url';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const require = createRequire(import.meta.url);

const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

const legacyConfig = require('./.eslintrc.js');
const recommendedTsRulesConfig = tsEslintPlugin.configs.recommended;
const recommendedTsRulesObject = Array.isArray(recommendedTsRulesConfig)
? recommendedTsRulesConfig.reduce((rules, config) => ({ ...rules, ...(config.rules || {}) }), {})
: recommendedTsRulesConfig?.rules || {};
const recommendedTsRules = new Set(Object.keys(recommendedTsRulesObject));

function hasCurrentTsRule(ruleName) {
const tsRuleName = ruleName.replace('@typescript-eslint/', '');
return Boolean(tsEslintPlugin.rules[tsRuleName]);
}
const localTsRules = new Set(
Object.keys(legacyConfig.rules || {}).filter(
ruleName => ruleName.startsWith('@typescript-eslint/') && hasCurrentTsRule(ruleName),
),
);

const noopRule = {
meta: { type: 'problem', docs: {}, schema: [] },
create: () => ({}),
};

function normalizeConfig(config) {
const next = { ...config };

if (next.plugins?.['@typescript-eslint']) {
next.plugins = { ...next.plugins };
delete next.plugins['@typescript-eslint'];
}

if (next.rules) {
next.rules = Object.fromEntries(
Object.entries(next.rules).filter(([ruleName]) => {
if (ruleName.startsWith('@babel/')) {
return false;
}
if (!ruleName.startsWith('@typescript-eslint/')) {
return true;
}
return recommendedTsRules.has(ruleName) || localTsRules.has(ruleName);
}),
);
}

return next;
}

export default [
{
ignores: [
'node_modules/',
'coverage/',
'es/',
'lib/',
'dist/',
'docs-dist/',
'.dumi/',
'.doc/',
'.vercel/',
'.eslintrc.js',
'src/index.d.ts',
],
},
{
plugins: {
'@typescript-eslint': {
...tsEslintPlugin,
rules: {
...tsEslintPlugin.rules,
'consistent-type-exports': noopRule,
},
},
},
},
...compat.config(legacyConfig).map(normalizeConfig),
{
rules: {
'@typescript-eslint/no-empty-object-type': 'off',
'@typescript-eslint/no-unsafe-function-type': 'off',
'@typescript-eslint/no-unused-vars': 'off',
},
},
];
49 changes: 49 additions & 0 deletions global.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/// <reference types="jest" />
/// <reference types="node" />
/// <reference types="react" />
/// <reference types="react-dom" />
/// <reference types="@testing-library/jest-dom" />

declare module '*.css';
declare module '*.less';
declare module 'jsonp';

declare namespace JSX {
type Element = React.JSX.Element;
interface ElementClass extends React.JSX.ElementClass {}
interface ElementAttributesProperty extends React.JSX.ElementAttributesProperty {}
interface ElementChildrenAttribute extends React.JSX.ElementChildrenAttribute {}
type LibraryManagedAttributes<C, P> = React.JSX.LibraryManagedAttributes<C, P>;
interface IntrinsicAttributes extends React.JSX.IntrinsicAttributes {}
interface IntrinsicClassAttributes<T> extends React.JSX.IntrinsicClassAttributes<T> {}
interface IntrinsicElements extends React.JSX.IntrinsicElements {}
}

declare namespace jest {
interface Matchers<R> {
lastCalledWith(...expected: unknown[]): R;
nthCalledWith(nthCall: number, ...expected: unknown[]): R;
toBeCalled(): R;
toBeCalledTimes(expected: number): R;
toBeCalledWith(...expected: unknown[]): R;
}
}

declare const vi: {
fn: <T extends (...args: any[]) => any = (...args: any[]) => any>(
implementation?: T,
) => jest.MockedFunction<T>;
mock: (moduleName: string, factory?: (importOriginal: <T>() => Promise<T>) => unknown) => void;
spyOn: typeof jest.spyOn;
useFakeTimers: () => void;
useRealTimers: () => void;
advanceTimersByTime: (msToRun: number) => void;
clearAllTimers: () => void;
runAllTimers: () => void;
importActual: <T>(moduleName: string) => Promise<T>;
clearAllMocks: () => void;
resetAllMocks: () => void;
restoreAllMocks: () => void;
};

declare module 'moment/locale/zh-cn';
40 changes: 26 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,33 +53,45 @@
"clsx": "^2.1.1"
},
"devDependencies": {
"@babel/eslint-parser": "^7.29.7",
"@babel/eslint-plugin": "^7.29.7",
"@eslint/eslintrc": "^3.3.5",
"@eslint/js": "^9.39.4",
"@rc-component/father-plugin": "^2.2.0",
"@rc-component/np": "^1.0.4",
"@testing-library/dom": "^10.4.1",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^15.0.7",
"@types/jest": "^29.5.14",
"@testing-library/react": "^16.3.2",
"@types/jest": "^30.0.0",
"@types/node": "^26.0.1",
"@types/react": "^18.3.31",
"@types/react-dom": "^18.3.7",
"@types/react": "^19.2.17",
"@types/react-dom": "^19.2.3",
"@types/warning": "^3.0.4",
"@typescript-eslint/eslint-plugin": "^8.62.1",
"@typescript-eslint/parser": "^8.62.1",
"@umijs/fabric": "^4.0.1",
"cross-env": "^10.1.0",
"dumi": "^2.4.35",
"eslint": "^8.57.1",
"father": "^4.6.23",
"dumi": "^2.4.38",
"eslint": "^9.39.4",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-jest": "^29.15.4",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.1.1",
"eslint-plugin-unicorn": "^65.0.1",
"father": "^4.6.24",
"gh-pages": "^6.3.0",
"husky": "^9.1.7",
"less": "^4.6.7",
"lint-staged": "^16.4.0",
"prettier": "^3.9.0",
"lint-staged": "^17.0.8",
"prettier": "^3.9.4",
"rc-test": "^7.1.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.9.3"
"react": "^19.2.7",
"react-dom": "^19.2.7",
"typescript": "^6.0.3"
},
"peerDependencies": {
"react": ">=16.9.0",
"react-dom": ">=16.9.0"
"react": "^19.2.7",
"react-dom": "^19.2.7"
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
},
"lint-staged": {
"*": "prettier --write --ignore-unknown"
Expand Down
4 changes: 2 additions & 2 deletions src/Menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {

const [mounted, setMounted] = React.useState(false);

const containerRef = React.useRef<HTMLUListElement>();
const containerRef = React.useRef<HTMLUListElement>(null);

const uuid = useId(id ? `rc-menu-uuid-${id}` : 'rc-menu-uuid');

Expand Down Expand Up @@ -400,7 +400,7 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
} else {
shouldFocusKey = focusableElements[0]
? element2key.get(focusableElements[0])
: childList.find(node => !node.props.disabled)?.key;
: childList.find((node: React.ReactElement<any>) => !node.props.disabled)?.key;
}
const elementToFocus = key2element.get(shouldFocusKey);

Expand Down
4 changes: 2 additions & 2 deletions src/MenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ const InternalMenuItem = React.forwardRef((props: MenuItemProps, ref: React.Ref<

const itemCls = `${prefixCls}-item`;

const legacyMenuItemRef = React.useRef<any>();
const elementRef = React.useRef<HTMLLIElement>();
const legacyMenuItemRef = React.useRef<any>(null);
const elementRef = React.useRef<HTMLLIElement>(null);
const mergedDisabled = contextDisabled || disabled;

const mergedEleRef = useComposeRef(ref, elementRef);
Expand Down
2 changes: 1 addition & 1 deletion src/SubMenu/PopupTrigger.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export default function PopupTrigger({
};

// Delay to change visible
const visibleRef = React.useRef<number>();
const visibleRef = React.useRef<number | undefined>(undefined);
React.useEffect(() => {
visibleRef.current = raf(() => {
setInnerVisible(visible);
Expand Down
4 changes: 2 additions & 2 deletions src/SubMenu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ const InternalSubMenu = React.forwardRef<HTMLLIElement, SubMenuProps>((props, re

const subMenuPrefixCls = `${prefixCls}-submenu`;
const mergedDisabled = contextDisabled || disabled;
const elementRef = React.useRef<HTMLDivElement>();
const popupRef = React.useRef<HTMLUListElement>();
const elementRef = React.useRef<HTMLDivElement>(null);
const popupRef = React.useRef<HTMLUListElement>(null);

// ================================ Warn ================================
if (process.env.NODE_ENV !== 'production' && warnKey) {
Expand Down
Loading
Loading