@geekron/strapi 0.2.4 → 0.2.6

package/dist/admin/index.js

@@ -46738,7 +46738,7 @@ function getMinDepth(nextItem) {
   }
   return 0;
 }
-function getProjection(items, activeId, overId, dragOffset, indentationWidth) {
+function getProjection(items, activeId, overId, dragOffset, indentationWidth, configMaxDepth) {
   const overItemIndex = items.findIndex(({ id }) => id === overId);
   const activeItemIndex = items.findIndex(({ id }) => id === activeId);
   const activeItem = items[activeItemIndex];
@@ -46750,8 +46750,11 @@ function getProjection(items, activeId, overId, dragOffset, indentationWidth) {
   const nextItem = newItems[overItemIndex + 1];
   const dragDepth = getDragDepth(dragOffset, indentationWidth);
   const projectedDepth = activeItem.depth + dragDepth;
-  const maxDepth = getMaxDepth(previousItem);
+  let maxDepth = getMaxDepth(previousItem);
   const minDepth = getMinDepth(nextItem);
+  if (configMaxDepth !== undefined && maxDepth >= configMaxDepth) {
+    maxDepth = configMaxDepth - 1;
+  }
   let depth = projectedDepth;
   if (projectedDepth >= maxDepth) {
     depth = maxDepth;
@@ -46826,29 +46829,32 @@ function findItemDeep(items, itemId) {
   return;
 }
 function removeItem(items, id) {
-  const newItems = [];
-  for (const item of items) {
-    if (item.id === id) {
-      continue;
-    }
+  return items.filter((item) => item.id !== id).map((item) => {
     if (item.children.length) {
-      item.children = removeItem(item.children, id);
+      return {
+        ...item,
+        children: removeItem(item.children, id)
+      };
     }
-    newItems.push(item);
-  }
-  return newItems;
+    return item;
+  });
 }
 function setProperty(items, id, property, setter) {
-  for (const item of items) {
+  return items.map((item) => {
     if (item.id === id) {
-      item[property] = setter(item[property]);
-      continue;
+      return {
+        ...item,
+        [property]: setter(item[property])
+      };
     }
     if (item.children.length) {
-      item.children = setProperty(item.children, id, property, setter);
+      return {
+        ...item,
+        children: setProperty(item.children, id, property, setter)
+      };
     }
-  }
-  return [...items];
+    return item;
+  });
 }
 function countChildren(items, count = 0) {
   return items.reduce((acc, { children }) => {
@@ -47214,7 +47220,7 @@ var adjustTranslate = ({ transform }) => {
 };
 // admin/src/fields/DataNested/hooks/useTreeItems.ts
 var import_react7 = require("react");
-function useTreeItems(defaultItems) {
+function useTreeItems(defaultItems, maxDepth) {
   const [items, setItems] = import_react7.useState(() => defaultItems);
   const [modalState, setModalState] = import_react7.useState({
     isOpen: false,
@@ -47245,6 +47251,12 @@ function useTreeItems(defaultItems) {
     });
   };
   const handleAddChild = (id) => {
+    if (maxDepth !== undefined) {
+      const itemDepth = getItemDepth(items, id);
+      if (itemDepth >= maxDepth - 1) {
+        return;
+      }
+    }
     setModalState({
       isOpen: true,
       mode: "add",
@@ -47327,6 +47339,21 @@ function findItemDeep2(items, itemId) {
   }
   return;
 }
+function getItemDepth(items, itemId, depth = 0) {
+  for (const item of items) {
+    const { id, children } = item;
+    if (id === itemId) {
+      return depth;
+    }
+    if (children.length) {
+      const childDepth = getItemDepth(children, itemId, depth + 1);
+      if (childDepth !== -1) {
+        return childDepth;
+      }
+    }
+  }
+  return -1;
+}
 // admin/src/fields/DataNested/keyboardCoordinates.ts
 var import_core = __toESM(require_dist3(), 1);
 
@@ -47499,6 +47526,7 @@ function SortableTree({
   indicator = false,
   indentationWidth = DEFAULT_INDENTATION_WIDTH,
   removable,
+  maxDepth,
   onChange
 }) {
   const {
@@ -47514,7 +47542,7 @@ function SortableTree({
     handleModalClose,
     handleModalSubmit,
     getInitialData
-  } = useTreeItems(defaultItems);
+  } = useTreeItems(defaultItems, maxDepth);
   const [activeId, setActiveId] = import_react8.useState(null);
   const flattenedItems = import_react8.useMemo(() => {
     const flattenedTree = flattenTree(items);
@@ -47534,7 +47562,7 @@ function SortableTree({
     handleDragOver,
     handleDragCancel
   } = useDragState(flattenedItems, setActiveId);
-  const projected = activeId && overId ? getProjection(flattenedItems, activeId, overId, offsetLeft, indentationWidth) : null;
+  const projected = activeId && overId ? getProjection(flattenedItems, activeId, overId, offsetLeft, indentationWidth, maxDepth) : null;
   const sensorContext = import_react8.useRef({
     items: flattenedItems,
     offset: offsetLeft
@@ -47614,7 +47642,7 @@ function SortableTree({
             collapsed: Boolean(collapsed && children.length),
             onCollapse: collapsible && children.length ? () => handleCollapse(id) : undefined,
             onAddSibling: () => handleAddSibling(id),
-            onAddChild: () => handleAddChild(id),
+            onAddChild: maxDepth !== undefined && depth >= maxDepth - 1 ? undefined : () => handleAddChild(id),
             onEdit: () => handleEdit(id),
             onRemove: removable ? () => handleRemove(id) : undefined
           }, id, false, undefined, this)),
@@ -47650,7 +47678,8 @@ var DataNested = ({
   name,
   label,
   hint,
-  required
+  required,
+  attribute
 }) => {
   const field = import_admin3.useField(name);
   const handleChange = (value) => {
@@ -47671,6 +47700,7 @@ var DataNested = ({
         indicator: true,
         removable: true,
         defaultItems: field.value || [],
+        maxDepth: attribute.options?.depth,
         onChange: handleChange
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime23.jsxDEV(import_design_system5.Field.Hint, {}, undefined, false, undefined, this),
@@ -47708,6 +47738,18 @@ var registerDataNested = (app) => {
             id: "form.attribute.item.requiredField.description",
             defaultMessage: "Cannot create entry if empty"
           }
+        },
+        {
+          name: "options.depth",
+          type: "number",
+          intlLabel: {
+            id: `${pluginId}.fields.dataNested.options.depthField.label`,
+            defaultMessage: "Nested max depth"
+          },
+          description: {
+            id: `${pluginId}.fields.dataNested.options.depthField.description`,
+            defaultMessage: "Maximum depth of nested items"
+          }
         }
       ]
     }

package/dist/admin/index.mjs

@@ -46783,7 +46783,7 @@ function getMinDepth(nextItem) {
   }
   return 0;
 }
-function getProjection(items, activeId, overId, dragOffset, indentationWidth) {
+function getProjection(items, activeId, overId, dragOffset, indentationWidth, configMaxDepth) {
   const overItemIndex = items.findIndex(({ id }) => id === overId);
   const activeItemIndex = items.findIndex(({ id }) => id === activeId);
   const activeItem = items[activeItemIndex];
@@ -46795,8 +46795,11 @@ function getProjection(items, activeId, overId, dragOffset, indentationWidth) {
   const nextItem = newItems[overItemIndex + 1];
   const dragDepth = getDragDepth(dragOffset, indentationWidth);
   const projectedDepth = activeItem.depth + dragDepth;
-  const maxDepth = getMaxDepth(previousItem);
+  let maxDepth = getMaxDepth(previousItem);
   const minDepth = getMinDepth(nextItem);
+  if (configMaxDepth !== undefined && maxDepth >= configMaxDepth) {
+    maxDepth = configMaxDepth - 1;
+  }
   let depth = projectedDepth;
   if (projectedDepth >= maxDepth) {
     depth = maxDepth;
@@ -46871,29 +46874,32 @@ function findItemDeep(items, itemId) {
   return;
 }
 function removeItem(items, id) {
-  const newItems = [];
-  for (const item of items) {
-    if (item.id === id) {
-      continue;
-    }
+  return items.filter((item) => item.id !== id).map((item) => {
     if (item.children.length) {
-      item.children = removeItem(item.children, id);
+      return {
+        ...item,
+        children: removeItem(item.children, id)
+      };
     }
-    newItems.push(item);
-  }
-  return newItems;
+    return item;
+  });
 }
 function setProperty(items, id, property, setter) {
-  for (const item of items) {
+  return items.map((item) => {
     if (item.id === id) {
-      item[property] = setter(item[property]);
-      continue;
+      return {
+        ...item,
+        [property]: setter(item[property])
+      };
     }
     if (item.children.length) {
-      item.children = setProperty(item.children, id, property, setter);
+      return {
+        ...item,
+        children: setProperty(item.children, id, property, setter)
+      };
     }
-  }
-  return [...items];
+    return item;
+  });
 }
 function countChildren(items, count = 0) {
   return items.reduce((acc, { children }) => {
@@ -47259,7 +47265,7 @@ var adjustTranslate = ({ transform }) => {
 };
 // admin/src/fields/DataNested/hooks/useTreeItems.ts
 import { useState as useState6 } from "react";
-function useTreeItems(defaultItems) {
+function useTreeItems(defaultItems, maxDepth) {
   const [items, setItems] = useState6(() => defaultItems);
   const [modalState, setModalState] = useState6({
     isOpen: false,
@@ -47290,6 +47296,12 @@ function useTreeItems(defaultItems) {
     });
   };
   const handleAddChild = (id) => {
+    if (maxDepth !== undefined) {
+      const itemDepth = getItemDepth(items, id);
+      if (itemDepth >= maxDepth - 1) {
+        return;
+      }
+    }
     setModalState({
       isOpen: true,
       mode: "add",
@@ -47372,6 +47384,21 @@ function findItemDeep2(items, itemId) {
   }
   return;
 }
+function getItemDepth(items, itemId, depth = 0) {
+  for (const item of items) {
+    const { id, children } = item;
+    if (id === itemId) {
+      return depth;
+    }
+    if (children.length) {
+      const childDepth = getItemDepth(children, itemId, depth + 1);
+      if (childDepth !== -1) {
+        return childDepth;
+      }
+    }
+  }
+  return -1;
+}
 // admin/src/fields/DataNested/keyboardCoordinates.ts
 var import_core = __toESM(require_dist3(), 1);
 
@@ -47544,6 +47571,7 @@ function SortableTree({
   indicator = false,
   indentationWidth = DEFAULT_INDENTATION_WIDTH,
   removable,
+  maxDepth,
   onChange
 }) {
   const {
@@ -47559,7 +47587,7 @@ function SortableTree({
     handleModalClose,
     handleModalSubmit,
     getInitialData
-  } = useTreeItems(defaultItems);
+  } = useTreeItems(defaultItems, maxDepth);
   const [activeId, setActiveId] = useState7(null);
   const flattenedItems = useMemo3(() => {
     const flattenedTree = flattenTree(items);
@@ -47579,7 +47607,7 @@ function SortableTree({
     handleDragOver,
     handleDragCancel
   } = useDragState(flattenedItems, setActiveId);
-  const projected = activeId && overId ? getProjection(flattenedItems, activeId, overId, offsetLeft, indentationWidth) : null;
+  const projected = activeId && overId ? getProjection(flattenedItems, activeId, overId, offsetLeft, indentationWidth, maxDepth) : null;
   const sensorContext = useRef2({
     items: flattenedItems,
     offset: offsetLeft
@@ -47659,7 +47687,7 @@ function SortableTree({
             collapsed: Boolean(collapsed && children.length),
             onCollapse: collapsible && children.length ? () => handleCollapse(id) : undefined,
             onAddSibling: () => handleAddSibling(id),
-            onAddChild: () => handleAddChild(id),
+            onAddChild: maxDepth !== undefined && depth >= maxDepth - 1 ? undefined : () => handleAddChild(id),
             onEdit: () => handleEdit(id),
             onRemove: removable ? () => handleRemove(id) : undefined
           }, id, false, undefined, this)),
@@ -47695,7 +47723,8 @@ var DataNested = ({
   name,
   label,
   hint,
-  required
+  required,
+  attribute
 }) => {
   const field = useField2(name);
   const handleChange = (value) => {
@@ -47716,6 +47745,7 @@ var DataNested = ({
         indicator: true,
         removable: true,
         defaultItems: field.value || [],
+        maxDepth: attribute.options?.depth,
         onChange: handleChange
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsxDEV23(Field2.Hint, {}, undefined, false, undefined, this),
@@ -47753,6 +47783,18 @@ var registerDataNested = (app) => {
             id: "form.attribute.item.requiredField.description",
             defaultMessage: "Cannot create entry if empty"
           }
+        },
+        {
+          name: "options.depth",
+          type: "number",
+          intlLabel: {
+            id: `${pluginId}.fields.dataNested.options.depthField.label`,
+            defaultMessage: "Nested max depth"
+          },
+          description: {
+            id: `${pluginId}.fields.dataNested.options.depthField.description`,
+            defaultMessage: "Maximum depth of nested items"
+          }
         }
       ]
     }

package/dist/server/index.js

@@ -86,6 +86,29 @@ var schema_default = {
           localized: true
         }
       }
+    },
+    socials: {
+      type: "component",
+      pluginOptions: {
+        i18n: {
+          localized: true
+        }
+      },
+      component: "site.social",
+      repeatable: true
+    },
+    footLinks: {
+      type: "customField",
+      pluginOptions: {
+        i18n: {
+          localized: true
+        }
+      },
+      customField: "plugin::website.dataNested",
+      required: false,
+      options: {
+        depth: 2
+      }
     }
   }
 };

package/dist/server/index.mjs

@@ -51,6 +51,29 @@ var schema_default = {
           localized: true
         }
       }
+    },
+    socials: {
+      type: "component",
+      pluginOptions: {
+        i18n: {
+          localized: true
+        }
+      },
+      component: "site.social",
+      repeatable: true
+    },
+    footLinks: {
+      type: "customField",
+      pluginOptions: {
+        i18n: {
+          localized: true
+        }
+      },
+      customField: "plugin::website.dataNested",
+      required: false,
+      options: {
+        depth: 2
+      }
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekron/strapi",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "极客领航网站管理插件",
   "type": "commonjs",
   "author": "Geekron",