Skip to content

Commit 125df9e

Browse files
authored
Merge branch 'master' into Fix/typography
2 parents c6cec87 + 69bda58 commit 125df9e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/verify-files-modify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99

1010
jobs:
1111
verify:
12-
if: github.event.pull_request.user.login != 'renovate[bot]'
12+
if: github.event.pull_request.user.login != 'renovate[bot]' && github.event.pull_request.user.login != 'Copilot'
1313
permissions:
1414
pull-requests: write # for actions-cool/verify-files-modify to update status of PRs
1515
runs-on: ubuntu-latest

components/dropdown/dropdown.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import RcDropdown from 'rc-dropdown';
77
import useEvent from 'rc-util/lib/hooks/useEvent';
88
import useMergedState from 'rc-util/lib/hooks/useMergedState';
99
import omit from 'rc-util/lib/omit';
10+
import type { MenuProps as RcMenuProps } from 'rc-menu';
1011

1112
import { useZIndex } from '../_util/hooks/useZIndex';
1213
import isPrimitive from '../_util/isPrimitive';
@@ -45,7 +46,7 @@ export type DropdownArrowOptions = {
4546
};
4647

4748
export interface DropdownProps {
48-
menu?: MenuProps;
49+
menu?: MenuProps & { activeKey?: RcMenuProps['activeKey'] };
4950
autoFocus?: boolean;
5051
arrow?: boolean | DropdownArrowOptions;
5152
trigger?: ('click' | 'hover' | 'contextMenu')[];

0 commit comments

Comments
 (0)