Merge pull request #49659 from ant-design/master

merge master to feature

.github/workflows/pkg.pr.new.yml

@@ -0,0 +1,23 @@
+name: Publish Any Commit
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - run: corepack enable
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Build
+        run: npm run build
+
+      - run: npx pkg-pr-new publish

components/divider/__tests__/index.test.tsx

@@ -26,4 +26,15 @@ describe('Divider', () => {
       marginRight: 10,
     });
   });
+
+  it('support bool dashed', () => {
+    const { container } = render(
+      <Divider dashed>
+        test test test
+      </Divider>,
+    );
+    expect(container?.querySelector<HTMLSpanElement>('.ant-divider-dashed')).toHaveStyle({
+      borderStyle: 'dashed',
+    });
+  });
 });

components/dropdown/__tests__/index.test.tsx

@@ -324,4 +324,31 @@ describe('Dropdown', () => {
     expect(container.querySelector('.ant-dropdown-hidden')).toBeFalsy();
     jest.useRealTimers();
   });
+
+  it('should respect trigger disabled prop', () => {
+    const { container: container1 } = render(
+      <Dropdown menu={{ items }} disabled>
+        <button type="button">button</button>
+      </Dropdown>,
+    );
+    expect(container1.querySelector('button')).toHaveAttribute('disabled');
+
+    const { container: container2 } = render(
+      <Dropdown menu={{ items }}>
+        <button type="button" disabled>
+          button
+        </button>
+      </Dropdown>,
+    );
+    expect(container2.querySelector('button')).toHaveAttribute('disabled');
+
+    const { container: container3 } = render(
+      <Dropdown menu={{ items }} disabled>
+        <button type="button" disabled={false}>
+          button
+        </button>
+      </Dropdown>,
+    );
+    expect(container3.querySelector('button')).not.toHaveAttribute('disabled');
+  });
 });

components/dropdown/dropdown.tsx

@@ -185,9 +185,8 @@ const Dropdown: CompoundedComponent = (props) => {
       },
       child.props.className,
     ),
-    disabled,
+    disabled: child.props.disabled ?? disabled,
   });
-
   const triggerActions = disabled ? [] : trigger;
   const alignPoint = !!triggerActions?.includes('contextMenu');
 

components/dropdown/style/index.ts

@@ -61,8 +61,6 @@ const genBaseStyle: GenerateStyle<DropdownToken> = (token) => {
   return [
     {
       [componentCls]: {
-        ...resetComponent(token),
-
         position: 'absolute',
         top: -9999,
         left: {
@@ -185,6 +183,8 @@ const genBaseStyle: GenerateStyle<DropdownToken> = (token) => {
       },
 
       [`${componentCls}, ${componentCls}-menu-submenu`]: {
+        ...resetComponent(token),
+
         [menuCls]: {
           padding: dropdownEdgeChildPadding,
           listStyleType: 'none',

components/input-number/__tests__/index.test.tsx

@@ -98,12 +98,18 @@ describe('InputNumber', () => {
     ).toBe(true);
   });
 
-  it('deprecate bordered', () => {
+  it('Deprecation and usage tips', () => {
     const errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
-    const { container } = render(<InputNumber bordered={false} />);
-    expect(errorSpy).toHaveBeenCalledWith(
+    const { container } = render(<InputNumber bordered={false} type="number" changeOnWheel />);
+    expect(errorSpy).toHaveBeenNthCalledWith(
+      1,
       'Warning: [antd: InputNumber] `bordered` is deprecated. Please use `variant` instead.',
     );
+    expect(errorSpy).toHaveBeenNthCalledWith(
+      2,
+      'Warning: [antd: InputNumber] When `type=number` is used together with `changeOnWheel`, changeOnWheel may not work properly. Please delete `type=number` if it is not necessary.',
+    );
+
     expect(container.querySelector('.ant-input-number-borderless')).toBeTruthy();
     errorSpy.mockRestore();
   });

components/input-number/index.tsx

@@ -42,8 +42,13 @@ export interface InputNumberProps<T extends ValueType = ValueType>
 
 const InputNumber = React.forwardRef<HTMLInputElement, InputNumberProps>((props, ref) => {
   if (process.env.NODE_ENV !== 'production') {
-    const { deprecated } = devUseWarning('InputNumber');
-    deprecated(!('bordered' in props), 'bordered', 'variant');
+    const typeWarning = devUseWarning('InputNumber');
+    typeWarning.deprecated(!('bordered' in props), 'bordered', 'variant');
+    typeWarning(
+      !(props.type === 'number' && props.changeOnWheel),
+      'usage',
+      'When `type=number` is used together with `changeOnWheel`, changeOnWheel may not work properly. Please delete `type=number` if it is not necessary.',
+    );
   }
 
   const { getPrefixCls, direction } = React.useContext(ConfigContext);

package.json

@@ -192,7 +192,6 @@
     "@types/minimist": "^1.2.5",
     "@types/node": "^20.14.2",
     "@types/nprogress": "^0.2.3",
-    "@types/ora": "^3.2.0",
     "@types/pixelmatch": "^5.2.6",
     "@types/pngjs": "^6.0.5",
     "@types/prismjs": "^1.26.4",
@@ -275,7 +274,7 @@
     "nprogress": "^0.2.0",
     "open": "^10.1.0",
     "ora": "^8.0.1",
-    "pixelmatch": "^5.3.0",
+    "pixelmatch": "^6.0.0",
     "pngjs": "^7.0.0",
     "prettier": "^3.3.2",
     "prettier-plugin-jsdoc": "^1.3.0",