@bigbinary/neeto-folders-frontend 2.0.49-beta1 → 2.0.49

package/dist/cjs/utils.js

@@ -2,7 +2,7 @@
 
 require('ramda');
 var internal = require('../internal-DAkDv0P1.js');
-var utils = require('../index-BuO0HoGs.js');
+var utils = require('../index-DCIRHXw_.js');
 require('@bigbinary/neeto-atoms');
 require('react-router-dom');
 require('@babel/runtime/helpers/defineProperty');

package/dist/cjs/v2/components.js

@@ -12,7 +12,7 @@ var reactRouterDom = require('react-router-dom');
 var useFolderActions = require('../../useFolderActions-DImaQ3gr.js');
 var injectCss = require('../../inject-css-D3Ee0dJK.js');
 var constants = require('../constants.js');
-var utils = require('../../index-BuO0HoGs.js');
+var utils = require('../../index-DCIRHXw_.js');
 var internal = require('../../internal-DAkDv0P1.js');
 var jsxRuntime = require('react/jsx-runtime');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
@@ -24,8 +24,8 @@ var i18next = require('i18next');
 var yup = require('yup');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var primitives = require('@bigbinary/neeto-atoms/primitives');
-var useHotkeys = require('@bigbinary/neeto-hotkeys');
 var neetoCist = require('@bigbinary/neeto-cist');
+var useHotkeys = require('@bigbinary/neeto-hotkeys');
 var ramda = require('ramda');
 var classNames = require('classnames');
 var core = require('@dnd-kit/core');
@@ -217,6 +217,7 @@ var AddEditPane = function AddEditPane(_ref) {
     var response = error.response;
     if (response && response.data && response.data.errors) {
       setStatus(response.data.errors);
+      if (response.data.errors.base) neetoAtoms.Toastr.error(response.data.errors.base[0]);
     }
   };
   var onSubmitForm = /*#__PURE__*/function () {
@@ -320,6 +321,7 @@ var AddEditPane = function AddEditPane(_ref) {
                   config: config,
                   allowClear: true,
                   showSearch: true,
+                  excludedFolderId: isEditing ? item.id : null,
                   initialValue: folderSid,
                   label: t("createFolder.parentTitle"),
                   name: "parentId"
@@ -411,7 +413,7 @@ var Node$1 = function Node(_ref, ref) {
 };
 var Node$2 = /*#__PURE__*/React.forwardRef(Node$1);
 
-var _excluded$5 = ["folder", "item", "depth", "maxDepth", "disabled", "config"];
+var _excluded$5 = ["folder", "movedIds", "depth", "maxDepth", "disabled", "config"];
 function ownKeys$g(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$g(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$g(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$g(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var toRadioValue = function toRadioValue(id) {
@@ -420,7 +422,8 @@ var toRadioValue = function toRadioValue(id) {
 var _SelectableNode = function SelectableNode(_ref) {
   var _folder$children$leng, _folder$children;
   var folder = _ref.folder,
-    item = _ref.item,
+    _ref$movedIds = _ref.movedIds,
+    movedIds = _ref$movedIds === void 0 ? [] : _ref$movedIds,
     _ref$depth = _ref.depth,
     depth = _ref$depth === void 0 ? 0 : _ref$depth,
     maxDepth = _ref.maxDepth,
@@ -431,7 +434,11 @@ var _SelectableNode = function SelectableNode(_ref) {
     var onSelect = rest.onSelect;
   var _useTranslation = injectCss.useTranslation(config),
     t = _useTranslation.t;
-  var isDisabled = disabled || (item === null || item === void 0 ? void 0 : item.id) === folder.id || depth >= maxDepth;
+  var isDepthExceeded = depth >= maxDepth;
+  var isDisabled = disabled || movedIds.includes(folder.id) || isDepthExceeded;
+  var disabledTitle = isDepthExceeded ? t("moveToFolder.depthExceeded", {
+    maxDepth: config.maxDepth
+  }) : t("moveToFolder.notAllowed");
   var itemLabel = config.labels[folder.itemCount > 1 ? "items" : "item"];
   var folderLabel = config.labels[((_folder$children$leng = (_folder$children = folder.children) === null || _folder$children === void 0 ? void 0 : _folder$children.length) !== null && _folder$children$leng !== void 0 ? _folder$children$leng : 0) > 1 ? "folders" : "folder"];
   var renderChildren = function renderChildren() {
@@ -439,8 +446,8 @@ var _SelectableNode = function SelectableNode(_ref) {
     return folder.children.map(function (child) {
       return /*#__PURE__*/React.createElement(_SelectableNode, _objectSpread$g(_objectSpread$g({}, _objectSpread$g(_objectSpread$g({}, rest), {}, {
         config: config,
-        item: item,
-        maxDepth: maxDepth
+        maxDepth: maxDepth,
+        movedIds: movedIds
       })), {}, {
         depth: depth + 1,
         disabled: isDisabled,
@@ -451,7 +458,7 @@ var _SelectableNode = function SelectableNode(_ref) {
   };
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     "aria-disabled": isDisabled,
-    title: isDisabled ? t("moveToFolder.notAllowed") : undefined,
+    title: isDisabled ? disabledTitle : undefined,
     className: classNames("flex flex-col w-full min-w-0", {
       "opacity-60": isDisabled
     }),
@@ -486,6 +493,7 @@ var PaneBody = function PaneBody(_ref) {
   var _ref$isRootEnabled = _ref.isRootEnabled,
     isRootEnabled = _ref$isRootEnabled === void 0 ? true : _ref$isRootEnabled,
     item = _ref.item,
+    items = _ref.items,
     config = _ref.config,
     submitButtonProps = _ref.submitButtonProps,
     cancelButtonProps = _ref.cancelButtonProps,
@@ -521,15 +529,28 @@ var PaneBody = function PaneBody(_ref) {
   var tree = React.useMemo(function () {
     return createTree(folders, isRootEnabled);
   }, [folders, isRootEnabled]);
+  var movedItems = items !== null && items !== void 0 ? items : item ? [item] : [];
+  var movedIds = ramda.pluck("id", movedItems);
   var maxDepth = Number.POSITIVE_INFINITY;
-  if (item) {
-    // If item is a folder, measure the current depth from current folder to longest leaf.
+  var nestingWarning = null;
+  if (neetoCist.isNotEmpty(movedItems)) {
+    // For moved folders, measure the depth from the tallest folder to its longest leaf.
     var foldersMap = utils.treeToMap(folders);
-    var folder = foldersMap[item.id];
-    if (folder) {
-      var folderDepth = utils.measureDepth(folder) + 1; // +1 for own depth;
-      maxDepth = config.maxDepth - folderDepth;
+    var movedFolders = movedIds.map(function (id) {
+      return foldersMap[id];
+    }).filter(Boolean);
+    if (neetoCist.isNotEmpty(movedFolders)) {
+      var subtreeHeight = Math.max.apply(Math, _toConsumableArray(movedFolders.map(utils.measureDepth)));
+      maxDepth = config.maxDepth - (subtreeHeight + 1); // +1 for own depth;
       if (isRootEnabled) maxDepth += 1; // +1 for root folder.
+
+      if (subtreeHeight > 0) {
+        nestingWarning = t("moveToFolder.nestingRestricted", {
+          count: movedFolders.length,
+          name: movedFolders[0].name,
+          maxDepth: config.maxDepth
+        });
+      }
     }
   }
   var onAddFolder = function onAddFolder() {
@@ -579,26 +600,29 @@ var PaneBody = function PaneBody(_ref) {
         variant: "outline",
         onClick: onAddFolder
       })]
-    }), /*#__PURE__*/jsxRuntime.jsx(neetoAtoms.Sheet.Body, {
+    }), /*#__PURE__*/jsxRuntime.jsxs(neetoAtoms.Sheet.Body, {
       className: "pb-6",
-      children: /*#__PURE__*/jsxRuntime.jsx(primitives.RadioGroup, {
+      children: [nestingWarning && /*#__PURE__*/jsxRuntime.jsx(neetoAtoms.Callout, {
+        className: "mb-4",
+        variant: "warning",
+        children: nestingWarning
+      }), /*#__PURE__*/jsxRuntime.jsx(primitives.RadioGroup, {
         className: "contents",
         value: toRadioValue(selection),
         children: tree.map(function (folder) {
           return /*#__PURE__*/React.createElement(_SelectableNode, {
             config: config,
             folder: folder,
-            item: item,
             maxDepth: maxDepth,
+            movedIds: movedIds,
             selection: selection,
-            disabled: (item === null || item === void 0 ? void 0 : item.id) === folder.id || maxDepth <= 0,
             key: folder.id,
             onSelect: function onSelect(folder) {
               return setSelection(folder.id);
             }
           });
         })
-      })
+      })]
     }), /*#__PURE__*/jsxRuntime.jsxs(neetoAtoms.Sheet.Footer, {
       className: "space-x-2",
       children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -675,7 +699,7 @@ var MoveFolderPane = function MoveFolderPane(_ref) {
   });
 };
 
-var _excluded$4 = ["folder", "depth", "config", "folderLabel", "itemLabel"];
+var _excluded$4 = ["folder", "depth", "config", "folderLabel", "itemLabel", "isAncestorDragging"];
 function ownKeys$e(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$e(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$e(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$e(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var _DraggableNode$1 = function DraggableNode(_ref) {
@@ -685,6 +709,8 @@ var _DraggableNode$1 = function DraggableNode(_ref) {
     config = _ref.config,
     folderLabel = _ref.folderLabel,
     itemLabel = _ref.itemLabel,
+    _ref$isAncestorDraggi = _ref.isAncestorDragging,
+    isAncestorDragging = _ref$isAncestorDraggi === void 0 ? false : _ref$isAncestorDraggi,
     rest = _objectWithoutProperties(_ref, _excluded$4);
   var _useDraggable = core.useDraggable({
       id: "draggable-item--".concat(folder.id),
@@ -695,15 +721,18 @@ var _DraggableNode$1 = function DraggableNode(_ref) {
     attributes = _useDraggable.attributes,
     listeners = _useDraggable.listeners,
     setDraggableRef = _useDraggable.setNodeRef;
+  var isInDraggedSubtree = isDragging || isAncestorDragging;
   var _useDroppable = core.useDroppable({
       id: "droppable-item--".concat(folder.id),
       data: folder,
-      disabled: isDragging
+      disabled: isInDraggedSubtree
     }),
     isOver = _useDroppable.isOver,
     setDroppableRef = _useDroppable.setNodeRef;
+
+  // Children stay rendered while dragging so the list height, and its scroll, don't shift under the drag overlay.
   var renderChildren = function renderChildren() {
-    if (neetoCist.isNotPresent(folder.children) || isDragging) return null;
+    if (neetoCist.isNotPresent(folder.children)) return null;
     return folder.children.map(function (child) {
       var _child$children$lengt, _child$children;
       return /*#__PURE__*/React.createElement(_DraggableNode$1, _objectSpread$e(_objectSpread$e({}, _objectSpread$e(_objectSpread$e({}, rest), {}, {
@@ -711,6 +740,7 @@ var _DraggableNode$1 = function DraggableNode(_ref) {
       })), {}, {
         depth: depth + 1,
         folder: child,
+        isAncestorDragging: isInDraggedSubtree,
         itemLabel: config.labels[(child === null || child === void 0 ? void 0 : child.itemCount) > 1 ? "items" : "item"],
         key: child.id,
         folderLabel: config.labels[((_child$children$lengt = child === null || child === void 0 || (_child$children = child.children) === null || _child$children === void 0 ? void 0 : _child$children.length) !== null && _child$children$lengt !== void 0 ? _child$children$lengt : 0) > 1 ? "folders" : "folder"]
@@ -721,7 +751,7 @@ var _DraggableNode$1 = function DraggableNode(_ref) {
     children: [/*#__PURE__*/jsxRuntime.jsx(Node$2, _objectSpread$e(_objectSpread$e(_objectSpread$e({}, rest), {}, {
       className: classNames({
         "rounded-lg hover:bg-muted w-full min-w-0 cursor-move transition-colors": true,
-        "bg-muted opacity-50": isDragging,
+        "bg-muted opacity-50": isInDraggedSubtree,
         "border-primary border": isOver,
         "border border-transparent": !isOver
       })
@@ -792,10 +822,11 @@ var RearrangeFoldersPane = function RearrangeFoldersPane(_ref) {
     if (((_activeFolder$meta$pa = activeFolder.meta.parent) === null || _activeFolder$meta$pa === void 0 ? void 0 : _activeFolder$meta$pa.id) === overFolder.id) return;
 
     // Check moving to a folder with depth greater than the allowed limit.
-    // maxDepth + 1 due to extra root node added for the tree
+    // The extra root node puts top-level folders at depth 1, so the deepest moved
+    // folder lands at level (target depth + subtree height + 1).
     var activeDepth = utils.measureDepth(activeFolder);
     var overDepth = overFolder.meta.depth;
-    if (activeDepth + overDepth >= config.maxDepth + 1) {
+    if (activeDepth + overDepth >= config.maxDepth) {
       neetoAtoms.Toastr.error(t("moveToFolder.depthExceeded", {
         maxDepth: config.maxDepth
       }));
@@ -884,7 +915,9 @@ var RearrangeFoldersPane = function RearrangeFoldersPane(_ref) {
 
 var PlaceholderNode = function PlaceholderNode(_ref) {
   var folder = _ref.folder,
-    dragState = _ref.dragState;
+    dragState = _ref.dragState,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled;
   var overItem = dragState.overItem;
   var id = React.useId();
   var isOver = id === (overItem === null || overItem === void 0 ? void 0 : overItem.id);
@@ -899,7 +932,8 @@ var PlaceholderNode = function PlaceholderNode(_ref) {
       data: {
         id: id,
         meta: meta
-      }
+      },
+      disabled: disabled
     }),
     setDroppableRef = _useDroppable.setNodeRef;
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
@@ -918,7 +952,7 @@ var PlaceholderNode = function PlaceholderNode(_ref) {
   });
 };
 
-var _excluded$3 = ["folder", "config", "dragState", "folderLabel", "itemLabel"];
+var _excluded$3 = ["folder", "config", "dragState", "folderLabel", "itemLabel", "isAncestorDragging"];
 function ownKeys$c(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$c(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$c(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$c(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var _DraggableNode = function DraggableNode(_ref) {
@@ -928,6 +962,8 @@ var _DraggableNode = function DraggableNode(_ref) {
     dragState = _ref.dragState,
     folderLabel = _ref.folderLabel,
     itemLabel = _ref.itemLabel,
+    _ref$isAncestorDraggi = _ref.isAncestorDragging,
+    isAncestorDragging = _ref$isAncestorDraggi === void 0 ? false : _ref$isAncestorDraggi,
     rest = _objectWithoutProperties(_ref, _excluded$3);
   var overItem = dragState.overItem;
   var isOverItem = folder.id === (overItem === null || overItem === void 0 ? void 0 : overItem.id);
@@ -942,18 +978,21 @@ var _DraggableNode = function DraggableNode(_ref) {
     attributes = _useDraggable.attributes,
     listeners = _useDraggable.listeners,
     setDraggableRef = _useDraggable.setNodeRef;
+  var isInDraggedSubtree = isDragging || isAncestorDragging;
   var _useDroppable = core.useDroppable({
       id: "droppable-item--".concat(folder.id),
       data: folder,
-      disabled: isRoot || isDragging
+      disabled: isRoot || isInDraggedSubtree
     }),
     setDroppableRef = _useDroppable.setNodeRef;
+
+  // Children stay rendered while dragging so the list height, and its scroll, don't shift under the drag overlay.
   var renderChildren = function renderChildren() {
-    if (isDragging) return null;
     return /*#__PURE__*/jsxRuntime.jsxs(React.Fragment, {
       children: [/*#__PURE__*/jsxRuntime.jsx(PlaceholderNode, {
         dragState: dragState,
-        folder: folder
+        folder: folder,
+        disabled: isInDraggedSubtree
       }), internal.isArray(folder.children) && folder.children.map(function (child) {
         var _child$children$lengt, _child$children;
         return /*#__PURE__*/React.createElement(_DraggableNode, _objectSpread$c(_objectSpread$c({}, _objectSpread$c(_objectSpread$c({}, rest), {}, {
@@ -962,6 +1001,7 @@ var _DraggableNode = function DraggableNode(_ref) {
         })), {}, {
           depth: child.meta.depth,
           folder: child,
+          isAncestorDragging: isInDraggedSubtree,
           itemLabel: config.labels[(child === null || child === void 0 ? void 0 : child.itemCount) > 1 ? "items" : "item"],
           key: child.id,
           folderLabel: config.labels[((_child$children$lengt = child === null || child === void 0 || (_child$children = child.children) === null || _child$children === void 0 ? void 0 : _child$children.length) !== null && _child$children$lengt !== void 0 ? _child$children$lengt : 0) > 1 ? "folders" : "folder"]
@@ -980,7 +1020,7 @@ var _DraggableNode = function DraggableNode(_ref) {
     })), {}, {
       className: classNames({
         "hover:bg-muted w-full cursor-move transition-colors": true,
-        "bg-muted opacity-50": isDragging,
+        "bg-muted opacity-50": isInDraggedSubtree,
         "bg-accent": isOverParent,
         "border-primary border-b-2": isOverItem
       }),
@@ -1069,10 +1109,11 @@ var ReorderFoldersPane = function ReorderFoldersPane(_ref) {
     }
 
     // Check moving to a folder with depth greater than the allowed limit.
-    // maxDepth + 1 due to extra root node added for the tree
+    // The extra root node puts top-level folders at depth 1, so the deepest moved
+    // folder lands at level (target depth + subtree height + 1).
     var srcDepth = utils.measureDepth(activeFolder);
     var dstDepth = targetFolder.meta.depth;
-    if (srcDepth + dstDepth >= config.maxDepth + 1) {
+    if (srcDepth + dstDepth >= config.maxDepth) {
       neetoAtoms.Toastr.error(t("moveToFolder.depthExceeded", {
         maxDepth: config.maxDepth
       }));
@@ -1806,19 +1847,21 @@ var FoldersTree = function FoldersTree(_ref) {
 
 function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+
 // neeto-atoms TreeSelect expects nested treeData ({ key, title, children }) and
 // has no `treeDataSimpleMode`, unlike neetoui's antd TreeSelect which consumed a
 // flat list keyed by pId. Build the nested shape directly from the folders tree,
-// pruning folders at/below maxDepth (and their subtrees).
+// pruning folders at/below maxDepth and the excluded folder (and their subtrees).
 //
 // Depth is derived structurally from the recursion level (roots = 0), matching
 // treeToMap/walkTree — the raw `folders` from the API don't carry a computed
 // `meta.depth`; v1 only had it because it passed the treeToMap'd map.
-var _createFolderOptions = function createFolderOptions(folders, config) {
-  var depth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-  if (depth >= config.maxDepth) return [];
-  return (folders !== null && folders !== void 0 ? folders : []).map(function (folder) {
-    var children = _createFolderOptions(folder.children, config, depth + 1);
+var _createFolderOptions = function createFolderOptions(folders, maxDepth) {
+  var excludedFolderId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  var depth = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+  if (depth >= maxDepth) return [];
+  return neetoCist.removeById(excludedFolderId, folders !== null && folders !== void 0 ? folders : []).map(function (folder) {
+    var children = _createFolderOptions(folder.children, maxDepth, excludedFolderId, depth + 1);
     return _objectSpread$1({
       key: folder.id,
       title: folder.name
@@ -1828,7 +1871,7 @@ var _createFolderOptions = function createFolderOptions(folders, config) {
   });
 };
 
-var _excluded = ["label", "name", "placeholder", "disabled", "required", "showSearch", "allowClear", "config", "initialValue"];
+var _excluded = ["label", "name", "placeholder", "disabled", "required", "showSearch", "allowClear", "config", "initialValue", "excludedFolderId"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), true).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TreeSelect = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
@@ -1847,6 +1890,8 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     allowClear = _ref$allowClear === void 0 ? false : _ref$allowClear,
     config = _ref.config,
     initialValue = _ref.initialValue,
+    _ref$excludedFolderId = _ref.excludedFolderId,
+    excludedFolderId = _ref$excludedFolderId === void 0 ? null : _ref$excludedFolderId,
     otherProps = _objectWithoutProperties(_ref, _excluded);
   var _useFetchFolders = useFolderActions.useFetchFolders(config),
     folders = _useFetchFolders.data;
@@ -1865,8 +1910,8 @@ var TreeSelect = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     setFieldValue(name, parentId);
   }, [parentId, name]);
   var folderOptions = React.useMemo(function () {
-    return _createFolderOptions(folders !== null && folders !== void 0 ? folders : [], config);
-  }, [folders]);
+    return _createFolderOptions(folders !== null && folders !== void 0 ? folders : [], config.maxDepth, excludedFolderId);
+  }, [folders, config.maxDepth, excludedFolderId]);
   return /*#__PURE__*/jsxRuntime.jsx(formik.TreeSelect, _objectSpread({
     isClearable: allowClear,
     isDisabled: disabled,