fix: do not forward disabled to trigger

Author: zombieJ

package.json

@@ -44,8 +44,8 @@
     ]
   },
   "dependencies": {
-    "@rc-component/trigger": "^3.0.0",
-    "@rc-component/util": "^1.2.1",
+    "@rc-component/trigger": "^3.9.1",
+    "@rc-component/util": "^1.11.1",
     "classnames": "^2.2.6"
   },
   "devDependencies": {

src/Dropdown.tsx

@@ -1,29 +1,30 @@
-import type { TriggerProps } from '@rc-component/trigger';
-import Trigger from '@rc-component/trigger';
 import type {
   ActionType,
   AlignType,
-  AnimationType,
   BuildInPlacements,
-} from '@rc-component/trigger/lib/interface';
-import { composeRef, getNodeRef, supportRef } from '@rc-component/util/lib/ref';
+  TriggerProps,
+} from '@rc-component/trigger';
+import Trigger from '@rc-component/trigger';
+import { composeRef, getNodeRef, omit, supportRef } from '@rc-component/util';
 import classNames from 'classnames';
 import React from 'react';
 import useAccessibility from './hooks/useAccessibility';
 import Overlay from './Overlay';
 import Placements from './placements';
 
+type AnimationType = string;
+
 export interface DropdownProps
   extends Pick<
     TriggerProps,
     | 'getPopupContainer'
-    | 'children'
     | 'mouseEnterDelay'
     | 'mouseLeaveDelay'
     | 'onPopupAlign'
     | 'builtinPlacements'
     | 'autoDestroy'
   > {
+  children: React.ReactElement;
   minOverlayWidthMatchTrigger?: boolean;
   arrow?: boolean;
   onVisibleChange?: (visible: boolean) => void;
@@ -153,7 +154,9 @@ function Dropdown(props: DropdownProps, ref) {
   return (
     <Trigger
       builtinPlacements={placements}
-      {...otherProps}
+      {...omit(otherProps as typeof otherProps & { disabled?: boolean }, [
+        'disabled',
+      ])}
       prefixCls={prefixCls}
       ref={triggerRef}
       popupClassName={classNames(overlayClassName, {

src/Overlay.tsx

@@ -1,4 +1,4 @@
-import { composeRef, getNodeRef, supportRef } from '@rc-component/util/lib/ref';
+import { composeRef, getNodeRef, supportRef } from '@rc-component/util';
 import React, { forwardRef, useMemo } from 'react';
 import type { DropdownProps } from './Dropdown';
 

src/hooks/useAccessibility.ts

@@ -1,5 +1,4 @@
-import KeyCode from '@rc-component/util/lib/KeyCode';
-import raf from '@rc-component/util/lib/raf';
+import { KeyCode, raf } from '@rc-component/util';
 import * as React from 'react';
 
 const { ESC, TAB } = KeyCode;

tests/props.test.tsx

@@ -0,0 +1,33 @@
+import { render } from '@testing-library/react';
+import * as React from 'react';
+import Dropdown from '../src';
+
+const mockTriggerRender = jest.fn();
+
+jest.mock('@rc-component/trigger', () => {
+  const ReactModule: typeof React = jest.requireActual('react');
+
+  return {
+    __esModule: true,
+    default: ReactModule.forwardRef<HTMLElement, Record<string, unknown>>(
+      (props, ref) => {
+        mockTriggerRender(props);
+        return ReactModule.createElement('div', { ref });
+      },
+    ),
+  };
+});
+
+it('does not forward disabled to Trigger', () => {
+  const runtimeProps = { disabled: true };
+
+  render(
+    <Dropdown {...runtimeProps} visible overlay={<div />}>
+      <button type="button">open</button>
+    </Dropdown>,
+  );
+
+  const triggerProps = mockTriggerRender.mock.calls[0][0];
+  expect(triggerProps).not.toHaveProperty('disabled');
+  expect(triggerProps).toHaveProperty('popupVisible', true);
+});