rsuite 5.53.1 → 5.53.2

package/esm/CheckTreePicker/CheckTreePicker.js

@@ -130,7 +130,7 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useClassNames = useClassNames(classPrefix),
     prefix = _useClassNames.prefix,
     merge = _useClassNames.merge;
-  var _useClassNames2 = useClassNames('check-tree'),
+  var _useClassNames2 = useClassNames(inline && classPrefix !== 'picker' ? classPrefix : 'check-tree'),
     checkTreePrefix = _useClassNames2.prefix,
     withCheckTreeClassPrefix = _useClassNames2.withClassPrefix;
   var _useControlled = useControlled(controlledValue, defaultValue),
@@ -602,8 +602,11 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }, nodeProps));
   };
   var renderCheckTree = function renderCheckTree() {
-    var _withCheckTreeClassPr, _merge2;
-    var classes = withCheckTreeClassPrefix((_withCheckTreeClassPr = {}, _withCheckTreeClassPr[className !== null && className !== void 0 ? className : ''] = inline, _withCheckTreeClassPr['without-children'] = !isSomeNodeHasChildren(data, childrenKey), _withCheckTreeClassPr.virtualized = virtualized, _withCheckTreeClassPr));
+    var _merge2, _merge3;
+    var classes = merge(withCheckTreeClassPrefix({
+      'without-children': !isSomeNodeHasChildren(data, childrenKey),
+      virtualized: virtualized
+    }), (_merge2 = {}, _merge2[className !== null && className !== void 0 ? className : ''] = inline, _merge2));
     var formattedNodes = getFormattedNodes(renderNode);
     if (!formattedNodes.some(function (v) {
       return v !== null;
@@ -612,18 +615,25 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
         className: prefix('none')
       }, locale.noResultsText);
     }
-    var treeNodesClass = merge(checkTreePrefix('root'), (_merge2 = {}, _merge2[checkTreePrefix('all-uncheckable')] = isEveryFirstLevelNodeUncheckable(flattenNodes, uncheckableItemValues, valueKey), _merge2));
-    return /*#__PURE__*/React.createElement(TreeView, {
-      ref: inline ? root : treeView,
+    var treeNodesClass = merge(checkTreePrefix('root'), (_merge3 = {}, _merge3[checkTreePrefix('all-uncheckable')] = isEveryFirstLevelNodeUncheckable(flattenNodes, uncheckableItemValues, valueKey), _merge3));
+    var treeViewProps = {
+      ref: treeView
+    };
+    if (inline) {
+      treeViewProps = _extends({
+        ref: root,
+        style: _extends({
+          height: height
+        }, style)
+      }, rest);
+    }
+    return /*#__PURE__*/React.createElement(TreeView, _extends({}, treeViewProps, {
       multiselectable: true,
       treeRootClassName: treeNodesClass,
       className: classes,
-      style: inline ? _extends({
-        height: height
-      }, style) : {},
       onScroll: onScroll,
       onKeyDown: inline ? handleTreeKeydown : undefined
-    }, virtualized ? /*#__PURE__*/React.createElement(AutoSizer, {
+    }), virtualized ? /*#__PURE__*/React.createElement(AutoSizer, {
       defaultHeight: inline ? height : menuMaxHeight,
       style: {
         width: 'auto',

package/esm/TreePicker/TreePicker.js

@@ -157,7 +157,7 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useClassNames = useClassNames(classPrefix),
     prefix = _useClassNames.prefix,
     merge = _useClassNames.merge;
-  var _useClassNames2 = useClassNames('tree'),
+  var _useClassNames2 = useClassNames(inline && classPrefix !== 'picker' ? classPrefix : 'tree'),
     treePrefix = _useClassNames2.prefix,
     withTreeClassPrefix = _useClassNames2.withClassPrefix;
   var _useTreeSearch = useTreeSearch({
@@ -584,18 +584,27 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }, nodeProps));
   };
   var renderTree = function renderTree() {
-    var _withTreeClassPrefix;
-    var classes = withTreeClassPrefix((_withTreeClassPrefix = {}, _withTreeClassPrefix[className !== null && className !== void 0 ? className : ''] = inline, _withTreeClassPrefix.virtualized = virtualized, _withTreeClassPrefix));
+    var _merge2;
+    var classes = merge(withTreeClassPrefix({
+      virtualized: virtualized
+    }), (_merge2 = {}, _merge2[className !== null && className !== void 0 ? className : ''] = inline, _merge2));
     var formattedNodes = getFormattedNodes(renderNode);
-    return /*#__PURE__*/React.createElement(TreeView, {
+    var treeViewProps = {
+      ref: treeView
+    };
+    if (inline) {
+      treeViewProps = _extends({
+        ref: root,
+        style: _extends({
+          height: height
+        }, style),
+        onKeyDown: handleTreeKeyDown
+      }, rest);
+    }
+    return /*#__PURE__*/React.createElement(TreeView, _extends({}, treeViewProps, {
       treeRootClassName: treePrefix('root'),
-      ref: inline ? root : treeView,
-      className: classes,
-      style: inline ? _extends({
-        height: height
-      }, style) : {},
-      onKeyDown: inline ? handleTreeKeyDown : undefined
-    }, virtualized ? /*#__PURE__*/React.createElement(AutoSizer, {
+      className: classes
+    }), virtualized ? /*#__PURE__*/React.createElement(AutoSizer, {
       defaultHeight: inline ? height : menuMaxHeight,
       style: {
         width: 'auto',

package/esm/internals/Picker/ListCheckItem.js

@@ -65,7 +65,6 @@ var ListCheckItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onClick: handleSelectItem,
     onCheckboxClick: handleCheck
   };
-  console.log(className, 'className');
   return /*#__PURE__*/React.createElement(Component, _extends({
     role: "option",
     "aria-selected": active,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "5.53.1",
+  "version": "5.53.2",
   "description": "A suite of react components",
   "main": "cjs/index.js",
   "module": "esm/index.js",