Merge branch 'alibaba-fusion:master' into master

Author: ykshao

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log 
 
+## [1.27.33](https://github.com/alibaba-fusion/next/compare/1.27.30...1.27.33) (2025-12-01)
+
+
+### Bug Fixes
+
+* **Drawer:** ensure correct padding-right is applied to body when Drawer is opened with scroll ([ae24d96](https://github.com/alibaba-fusion/next/commit/ae24d96f861c64ecd8bf7cf711a72e949626759a))
+* fix the type inference error on the consumer side ([#5030](https://github.com/alibaba-fusion/next/issues/5030)) ([86b98cf](https://github.com/alibaba-fusion/next/commit/86b98cfca3e3b67ad2c6dedd8c8c6eb1f3af7c50))
+* **TreeSelect:** fix expandedKeys bug when search by searchValue is empty and treeDefaultExpandAll is true ([872eaf1](https://github.com/alibaba-fusion/next/commit/872eaf1c428bc609ba71e69cd1fd55e7e1ba7113))
+
+
 ## [1.27.32](https://github.com/alibaba-fusion/next/compare/1.27.30...1.27.32) (2025-03-10)
 
 

LATESTLOG.md

@@ -1,11 +1,11 @@
 # Latest Log 
 
-## [1.27.32](https://github.com/alibaba-fusion/next/compare/1.27.30...1.27.32) (2025-03-10)
+## [1.27.33](https://github.com/alibaba-fusion/next/compare/1.27.30...1.27.33) (2025-12-01)
 
 
 ### Bug Fixes
 
-* **Field:** fix use setError on uninitialized field caused incorrect values configuration ([3f402b6](https://github.com/alibaba-fusion/next/commit/3f402b63540e2091fe6efaab9414272334641266))
-* **Nav:** the icon is not centered when the width of Nav in iconOnly mode is less than the default width ([bb46a4d](https://github.com/alibaba-fusion/next/commit/bb46a4d9d939b0b67d5dbee9722fb54fe16adfe7))
-* **TimePicker2:**  support set locale by ConfigProvider ([a5e1284](https://github.com/alibaba-fusion/next/commit/a5e1284c30410d372a2fe71d02f857e8dc9027e7))
+* **Drawer:** ensure correct padding-right is applied to body when Drawer is opened with scroll ([ae24d96](https://github.com/alibaba-fusion/next/commit/ae24d96f861c64ecd8bf7cf711a72e949626759a))
+* fix the type inference error on the consumer side ([#5030](https://github.com/alibaba-fusion/next/issues/5030)) ([86b98cf](https://github.com/alibaba-fusion/next/commit/86b98cfca3e3b67ad2c6dedd8c8c6eb1f3af7c50))
+* **TreeSelect:** fix expandedKeys bug when search by searchValue is empty and treeDefaultExpandAll is true ([872eaf1](https://github.com/alibaba-fusion/next/commit/872eaf1c428bc609ba71e69cd1fd55e7e1ba7113))
 

components/drawer/__tests__/index-v2-spec.tsx

@@ -105,4 +105,46 @@ describe('Drawer v2', () => {
             hide();
         });
     });
+    it('should add paddingRight to body when body is scroll on open Drawer', () => {
+        let tallDiv: HTMLDivElement;
+
+        // 创建一个高元素使 body 产生滚动条
+        cy.document().then(doc => {
+            tallDiv = doc.createElement('div');
+            tallDiv.style.height = '110vh';
+            tallDiv.setAttribute('data-test-element', 'scroll-trigger'); // 添加标识方便查找
+            doc.body.appendChild(tallDiv);
+        });
+
+        // 设置初始 padding-right
+        cy.get('body').invoke('css', 'padding-right', '10px');
+        cy.get('body').invoke('css', 'overflow', 'auto');
+
+        cy.mount(
+            <Drawer v2 visible title="test" closeMode={[]}>
+                body
+            </Drawer>
+        );
+
+        cy.then(() => {
+            const scrollDiv = document.createElement('div');
+            scrollDiv.className = 'just-to-get-scrollbar-size';
+            scrollDiv.style.width = '100px';
+            scrollDiv.style.height = '100px';
+            scrollDiv.style.overflow = 'scroll';
+            scrollDiv.style.position = 'absolute';
+            scrollDiv.style.top = '-9999px';
+            document.body.appendChild(scrollDiv);
+            const scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth;
+            document.body.removeChild(scrollDiv);
+            cy.get('body').should('have.css', 'padding-right', `${10 + scrollbarWidth}px`);
+        });
+
+        // 清理添加的元素
+        cy.then(() => {
+            if (tallDiv && tallDiv.parentNode) {
+                tallDiv.parentNode.removeChild(tallDiv);
+            }
+        });
+    });
 });

components/drawer/drawer-v2.tsx

@@ -145,7 +145,7 @@ const Drawer = (props: DrawerV2Props) => {
                 const scrollWidth = dom.scrollbar().width;
                 if (scrollWidth) {
                     style.paddingRight = `${
-                        dom.getStyle(document.body, 'paddingRight').toString() +
+                        (dom.getStyle(document.body, 'paddingRight') as number) +
                         dom.scrollbar().width
                     }px`;
                 }

components/tree-select/__tests__/index-spec.tsx

@@ -929,6 +929,28 @@ describe('TreeSelect', () => {
         cy.contains('.next-select-values', '服装/男装');
     });
 
+    it('should expandedAll when search by searchValue is empty and treeDefaultExpandAll is true', () => {
+        const searchedValue = '外套';
+        const handleSearch = cy.spy();
+
+        cy.mount(
+            <TreeSelect
+                defaultVisible
+                treeDefaultExpandAll
+                dataSource={dataSource}
+                showSearch
+                onSearch={debounce(handleSearch, 20)} // Debounce for simulate Cypress action type below
+            />
+        );
+        cy.get('.next-select-trigger-search input').type(searchedValue);
+        cy.get('.next-tree-node').then($el => {
+            const list = $el.filter('[style!="display: none;"]');
+            cy.wrap(list).should('have.length', 3);
+        });
+        cy.get('.next-select-trigger-search input').clear();
+        cy.get('.next-tree-node').should('have.length', 6);
+    });
+
     describe('should support useDetailValue', () => {
         it('Support dataSource mode', () => {
             const handleChange = cy.spy();

components/tree-select/tree-select.tsx

@@ -774,6 +774,12 @@ class TreeSelect extends Component<TreeSelectProps, TreeSelectState> {
                 notFound = true;
             }
         } else {
+            // 如过 filterLocal 并且 showSearch 但是没有 searchedValue 的时候，也需要设置 expandedKeys
+            if (filterLocal && showSearch) {
+                treeProps.expandedKeys = expandedKeys;
+                treeProps.autoExpandParent = autoExpandParent;
+                treeProps.onExpand = this.handleExpand;
+            }
             // eslint-disable-next-line
             if (dataSource) {
                 if (dataSource.length) {

index.js

@@ -1,5 +1,5 @@
 var next = require('./lib/index.js');
 
-next.version = '1.27.32';
+next.version = '1.27.33';
 
 module.exports = next;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alifd/next",
-  "version": "1.27.32",
+  "version": "1.27.33",
   "description": "A configurable component library for web built on React.",
   "keywords": [
     "fusion",