strapi-plugin-navigation 3.0.4 → 3.0.6

package/README.md

@@ -113,7 +113,7 @@ Complete installation requirements are exact same as for Strapi itself and can b
 
 **Supported Strapi versions**:
 
-- Strapi v5.6.0 (recently tested)
+- Strapi v5.8.1 (recently tested)
 - Strapi v5.x
 
 > This plugin is designed for **Strapi v5** and is not working with v4.x. To get version for **Strapi v4** install version [v4.x](https://github.com/VirtusLab-Open-Source/strapi-plugin-navigation/tree/strapi-v4).

package/dist/admin/index.js

@@ -48,10 +48,10 @@ const NavigationIconSvg = styled__default.default.svg`
     fill: ${({ theme: theme2 }) => theme2.colors.neutral500};
   }
 `;
-const NavigationIcon = ({ width = 24, height = 24 }) => /* @__PURE__ */ jsxRuntime.jsx(
+const NavigationIcon = ({ width = 20, height = 20 }) => /* @__PURE__ */ jsxRuntime.jsx(
   NavigationIconSvg,
   {
-    viewBox: `0px 0px ${width}px ${height}px`,
+    viewBox: `0 0 ${width} ${height}`,
     xmlns: "http://www.w3.org/2000/svg",
     height,
     width,
@@ -2519,7 +2519,7 @@ function isTopLayer(element) {
 function isContainingBlock(elementOrCss) {
   const webkit2 = isWebKit();
   const css = isElement(elementOrCss) ? getComputedStyle$1(elementOrCss) : elementOrCss;
-  return css.transform !== "none" || css.perspective !== "none" || (css.containerType ? css.containerType !== "normal" : false) || !webkit2 && (css.backdropFilter ? css.backdropFilter !== "none" : false) || !webkit2 && (css.filter ? css.filter !== "none" : false) || ["transform", "perspective", "filter"].some((value) => (css.willChange || "").includes(value)) || ["paint", "layout", "strict", "content"].some((value) => (css.contain || "").includes(value));
+  return ["transform", "translate", "scale", "rotate", "perspective"].some((value) => css[value] ? css[value] !== "none" : false) || (css.containerType ? css.containerType !== "normal" : false) || !webkit2 && (css.backdropFilter ? css.backdropFilter !== "none" : false) || !webkit2 && (css.filter ? css.filter !== "none" : false) || ["transform", "translate", "scale", "rotate", "perspective", "filter"].some((value) => (css.willChange || "").includes(value)) || ["paint", "layout", "strict", "content"].some((value) => (css.contain || "").includes(value));
 }
 function getContainingBlock(element) {
   let currentNode = getParentNode(element);
@@ -3025,6 +3025,9 @@ const platform = {
   isElement,
   isRTL
 };
+function rectsAreEqual(a, b) {
+  return a.x === b.x && a.y === b.y && a.width === b.width && a.height === b.height;
+}
 function observeMove(element, onMove) {
   let io = null;
   let timeoutId;
@@ -3043,12 +3046,13 @@ function observeMove(element, onMove) {
       threshold = 1;
     }
     cleanup();
+    const elementRectForRootMargin = element.getBoundingClientRect();
     const {
       left,
       top: top2,
       width,
       height
-    } = element.getBoundingClientRect();
+    } = elementRectForRootMargin;
     if (!skip) {
       onMove();
     }
@@ -3079,6 +3083,9 @@ function observeMove(element, onMove) {
           refresh(false, ratio);
         }
       }
+      if (ratio === 1 && !rectsAreEqual(elementRectForRootMargin, element.getBoundingClientRect())) {
+        refresh();
+      }
       isFirstUpdate = false;
     }
     try {
@@ -3142,7 +3149,7 @@ function autoUpdate(reference, floating, update, options) {
   }
   function frameLoop() {
     const nextRefRect = getBoundingClientRect(reference);
-    if (prevRefRect && (nextRefRect.x !== prevRefRect.x || nextRefRect.y !== prevRefRect.y || nextRefRect.width !== prevRefRect.width || nextRefRect.height !== prevRefRect.height)) {
+    if (prevRefRect && !rectsAreEqual(prevRefRect, nextRefRect)) {
       update();
     }
     prevRefRect = nextRefRect;
@@ -20173,7 +20180,7 @@ function findMinIndex(value, array) {
 }
 function countColumn(string2, tabSize, to = string2.length) {
   let n = 0;
-  for (let i = 0; i < to; ) {
+  for (let i = 0; i < to && i < string2.length; ) {
     if (string2.charCodeAt(i) == 9) {
       n += tabSize - n % tabSize;
       i++;
@@ -24021,16 +24028,16 @@ function applyDOMChange(view, domChange) {
     return false;
   if (!change && domChange.typeOver && !sel.empty && newSel && newSel.main.empty) {
     change = { from: sel.from, to: sel.to, insert: view.state.doc.slice(sel.from, sel.to) };
+  } else if ((browser.mac || browser.android) && change && change.from == change.to && change.from == sel.head - 1 && /^\. ?$/.test(change.insert.toString()) && view.contentDOM.getAttribute("autocorrect") == "off") {
+    if (newSel && change.insert.length == 2)
+      newSel = EditorSelection.single(newSel.main.anchor - 1, newSel.main.head - 1);
+    change = { from: change.from, to: change.to, insert: Text.of([change.insert.toString().replace(".", " ")]) };
   } else if (change && change.from >= sel.from && change.to <= sel.to && (change.from != sel.from || change.to != sel.to) && sel.to - sel.from - (change.to - change.from) <= 4) {
     change = {
       from: sel.from,
       to: sel.to,
       insert: view.state.doc.slice(sel.from, change.from).append(change.insert).append(view.state.doc.slice(change.to, sel.to))
     };
-  } else if ((browser.mac || browser.android) && change && change.from == change.to && change.from == sel.head - 1 && /^\. ?$/.test(change.insert.toString()) && view.contentDOM.getAttribute("autocorrect") == "off") {
-    if (newSel && change.insert.length == 2)
-      newSel = EditorSelection.single(newSel.main.anchor - 1, newSel.main.head - 1);
-    change = { from: sel.from, to: sel.to, insert: Text.of([" "]) };
   } else if (browser.chrome && change && change.from == change.to && change.from == sel.head && change.insert.toString() == "\n " && view.lineWrapping) {
     if (newSel)
       newSel = EditorSelection.single(newSel.main.anchor - 1, newSel.main.head - 1);
@@ -25666,6 +25673,10 @@ function visiblePixelRange(dom, paddingTop) {
     bottom: Math.max(top2, bottom) - (rect.top + paddingTop)
   };
 }
+function inWindow(elt) {
+  let rect = elt.getBoundingClientRect(), win = elt.ownerDocument.defaultView || window;
+  return rect.left < win.innerWidth && rect.right > 0 && rect.top < win.innerHeight && rect.bottom > 0;
+}
 function fullPixelRange(dom, paddingTop) {
   let rect = dom.getBoundingClientRect();
   return {
@@ -25866,7 +25877,7 @@ class ViewState {
       if (inView)
         measureContent = true;
     }
-    if (!this.inView && !this.scrollTarget)
+    if (!this.inView && !this.scrollTarget && !inWindow(view.dom))
       return 0;
     let contentWidth = domRect.width;
     if (this.contentDOMWidth != contentWidth || this.editorHeight != view.scrollDOM.clientHeight) {
@@ -26983,7 +26994,7 @@ class EditContextManager {
       selectionEnd: this.toContextPos(view.state.selection.main.head)
     });
     this.handlers.textupdate = (e) => {
-      let { anchor } = view.state.selection.main;
+      let main = view.state.selection.main, { anchor, head } = main;
       let from = this.toEditorPos(e.updateRangeStart), to = this.toEditorPos(e.updateRangeEnd);
       if (view.inputState.composing >= 0 && !this.composing)
         this.composing = { contextBase: e.updateRangeStart, editorBase: from, drifted: false };
@@ -26992,8 +27003,14 @@ class EditContextManager {
         change.from = anchor;
       else if (change.to == this.to && anchor > this.to)
         change.to = anchor;
-      if (change.from == change.to && !change.insert.length)
+      if (change.from == change.to && !change.insert.length) {
+        let newSel = EditorSelection.single(this.toEditorPos(e.selectionStart), this.toEditorPos(e.selectionEnd));
+        if (!newSel.main.eq(main))
+          view.dispatch({ selection: newSel, userEvent: "select" });
         return;
+      }
+      if ((browser.mac || browser.android) && change.from == head - 1 && /^\. ?$/.test(e.text) && view.contentDOM.getAttribute("autocorrect") == "off")
+        change = { from, to, insert: Text.of([e.text.replace(".", " ")]) };
       this.pendingContextChange = change;
       if (!view.state.readOnly) {
         let newLen = this.to - this.from + (change.to - change.from + change.insert.length);
@@ -51178,6 +51195,26 @@ const useContentTypes$1 = () => {
     staleTime: 1e3 * 60 * 3
   });
 };
+const useResetNavigations = () => {
+  const fetch2 = admin.getFetchClient();
+  const apiClient = getApiClient(fetch2);
+  const queryClient2 = reactQuery.useQueryClient();
+  return () => {
+    queryClient2.resetQueries({
+      queryKey: apiClient.readAllIndex()
+    });
+  };
+};
+const useResetContentTypes = () => {
+  const fetch2 = admin.getFetchClient();
+  const apiClient = getApiClient(fetch2);
+  const queryClient2 = reactQuery.useQueryClient();
+  return () => {
+    queryClient2.resetQueries({
+      queryKey: apiClient.readContentTypeIndex()
+    });
+  };
+};
 const useNavigations = () => {
   const fetch2 = admin.getFetchClient();
   const apiClient = getApiClient(fetch2);
@@ -51270,7 +51307,9 @@ const usePurgeNavigation = () => {
       if (!documentIds?.length) {
         return apiClient.purge({});
       }
-      return Promise.all(documentIds.map((documentId) => apiClient.purge({ documentId, withLangVersions: true })));
+      return Promise.all(
+        documentIds.map((documentId) => apiClient.purge({ documentId, withLangVersions: true }))
+      );
     }
   });
 };
@@ -53492,12 +53531,8 @@ const NavigationItemForm = ({
       );
     }
   };
-  const renderError = (error) => {
-    const errorOccurence = lodash$1.get(formError, error);
-    if (errorOccurence) {
-      return formatMessage(getTrad(error));
-    }
-    return void 0;
+  const renderError = (field, messageKey) => {
+    return lodash$1.get(formError, field) ? formatMessage(getTrad(messageKey ?? field)) : void 0;
   };
   const initialRelatedTypeSelected = current.type === "INTERNAL" ? current.relatedType : void 0;
   const {
@@ -53839,7 +53874,7 @@ const NavigationItemForm = ({
             label: formatMessage(
               getTrad(`popup.item.form.${pathSourceName}.label`, "Path")
             ),
-            error: renderError(pathSourceName),
+            error: renderError(pathSourceName, `popup.item.form.${pathSourceName}.validation.type`),
             hint: [
               formatMessage(
                 getTrad(`popup.item.form.${pathSourceName}.placeholder`, "e.g. Blog")
@@ -54279,6 +54314,8 @@ const Inner$1 = () => {
     () => (localeQuery.data ? [localeQuery.data.defaultLocale, ...localeQuery.data.restLocale] : []).filter((locale) => locale !== currentLocale),
     [localeQuery.data, currentLocale]
   );
+  const resetContentTypes = useResetContentTypes();
+  const resetNavigations = useResetNavigations();
   const {
     i18nCopyItemsModal,
     i18nCopySourceLocale,
@@ -54301,7 +54338,12 @@ const Inner$1 = () => {
               {
                 onSuccess(res) {
                   copyNavigationI18nMutation.reset();
-                  setCurrentNavigation(res.data);
+                  setCurrentNavigation({
+                    ...res.data,
+                    items: res.data.items.map(appendViewId)
+                  });
+                  resetContentTypes();
+                  resetNavigations();
                 }
               }
             );
@@ -54603,10 +54645,10 @@ const TextArrayInput = ({ onChange, initialValue, ...props }) => {
   const [value, setValue] = React.useState(
     lodash$1.isArray(initialValue) ? initialValue.reduce((acc, cur2) => `${acc}${cur2}; `, "") : ""
   );
-  const handleOnChange = (value2) => {
-    const newValue = value2;
-    const valuesArray = newValue.split(";").map((v) => v.trim()).filter((v) => !!v.length);
-    setValue(value2);
+  const handleOnChange = (event) => {
+    const newValue = event?.target.value ?? "";
+    const valuesArray = newValue.split(";").map((value2) => value2.trim()).filter((value2) => !!value2.length);
+    setValue(newValue ?? "");
     onChange(valuesArray);
   };
   return /* @__PURE__ */ jsxRuntime.jsx(TextInput, { ...props, onChange: handleOnChange, value });
@@ -55739,7 +55781,7 @@ const Inner = () => {
                   ) })
                 ] })
               ] }) }),
-              /* @__PURE__ */ jsxRuntime.jsxs(Box, { ...BOX_DEFAULT_PROPS, width: "100%", gap: 2, direction: "column", alignItems: "flex-start", children: [
+              /* @__PURE__ */ jsxRuntime.jsxs(Box, { ...BOX_DEFAULT_PROPS, width: "100%", children: [
                 /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "delta", as: "h2", children: formatMessage(getTrad("pages.settings.customFields.title")) }),
                 /* @__PURE__ */ jsxRuntime.jsx(Box, { padding: 1 }),
                 /* @__PURE__ */ jsxRuntime.jsx(

package/dist/admin/index.mjs

@@ -28,10 +28,10 @@ const NavigationIconSvg = styled.svg`
     fill: ${({ theme: theme2 }) => theme2.colors.neutral500};
   }
 `;
-const NavigationIcon = ({ width = 24, height = 24 }) => /* @__PURE__ */ jsx(
+const NavigationIcon = ({ width = 20, height = 20 }) => /* @__PURE__ */ jsx(
   NavigationIconSvg,
   {
-    viewBox: `0px 0px ${width}px ${height}px`,
+    viewBox: `0 0 ${width} ${height}`,
     xmlns: "http://www.w3.org/2000/svg",
     height,
     width,
@@ -2499,7 +2499,7 @@ function isTopLayer(element) {
 function isContainingBlock(elementOrCss) {
   const webkit2 = isWebKit();
   const css2 = isElement(elementOrCss) ? getComputedStyle$1(elementOrCss) : elementOrCss;
-  return css2.transform !== "none" || css2.perspective !== "none" || (css2.containerType ? css2.containerType !== "normal" : false) || !webkit2 && (css2.backdropFilter ? css2.backdropFilter !== "none" : false) || !webkit2 && (css2.filter ? css2.filter !== "none" : false) || ["transform", "perspective", "filter"].some((value) => (css2.willChange || "").includes(value)) || ["paint", "layout", "strict", "content"].some((value) => (css2.contain || "").includes(value));
+  return ["transform", "translate", "scale", "rotate", "perspective"].some((value) => css2[value] ? css2[value] !== "none" : false) || (css2.containerType ? css2.containerType !== "normal" : false) || !webkit2 && (css2.backdropFilter ? css2.backdropFilter !== "none" : false) || !webkit2 && (css2.filter ? css2.filter !== "none" : false) || ["transform", "translate", "scale", "rotate", "perspective", "filter"].some((value) => (css2.willChange || "").includes(value)) || ["paint", "layout", "strict", "content"].some((value) => (css2.contain || "").includes(value));
 }
 function getContainingBlock(element) {
   let currentNode = getParentNode(element);
@@ -3005,6 +3005,9 @@ const platform = {
   isElement,
   isRTL
 };
+function rectsAreEqual(a, b) {
+  return a.x === b.x && a.y === b.y && a.width === b.width && a.height === b.height;
+}
 function observeMove(element, onMove) {
   let io = null;
   let timeoutId;
@@ -3023,12 +3026,13 @@ function observeMove(element, onMove) {
       threshold = 1;
     }
     cleanup();
+    const elementRectForRootMargin = element.getBoundingClientRect();
     const {
       left,
       top: top2,
       width,
       height
-    } = element.getBoundingClientRect();
+    } = elementRectForRootMargin;
     if (!skip) {
       onMove();
     }
@@ -3059,6 +3063,9 @@ function observeMove(element, onMove) {
           refresh(false, ratio);
         }
       }
+      if (ratio === 1 && !rectsAreEqual(elementRectForRootMargin, element.getBoundingClientRect())) {
+        refresh();
+      }
       isFirstUpdate = false;
     }
     try {
@@ -3122,7 +3129,7 @@ function autoUpdate(reference, floating, update, options) {
   }
   function frameLoop() {
     const nextRefRect = getBoundingClientRect(reference);
-    if (prevRefRect && (nextRefRect.x !== prevRefRect.x || nextRefRect.y !== prevRefRect.y || nextRefRect.width !== prevRefRect.width || nextRefRect.height !== prevRefRect.height)) {
+    if (prevRefRect && !rectsAreEqual(prevRefRect, nextRefRect)) {
       update();
     }
     prevRefRect = nextRefRect;
@@ -20153,7 +20160,7 @@ function findMinIndex(value, array) {
 }
 function countColumn(string2, tabSize, to = string2.length) {
   let n = 0;
-  for (let i = 0; i < to; ) {
+  for (let i = 0; i < to && i < string2.length; ) {
     if (string2.charCodeAt(i) == 9) {
       n += tabSize - n % tabSize;
       i++;
@@ -24001,16 +24008,16 @@ function applyDOMChange(view, domChange) {
     return false;
   if (!change && domChange.typeOver && !sel.empty && newSel && newSel.main.empty) {
     change = { from: sel.from, to: sel.to, insert: view.state.doc.slice(sel.from, sel.to) };
+  } else if ((browser.mac || browser.android) && change && change.from == change.to && change.from == sel.head - 1 && /^\. ?$/.test(change.insert.toString()) && view.contentDOM.getAttribute("autocorrect") == "off") {
+    if (newSel && change.insert.length == 2)
+      newSel = EditorSelection.single(newSel.main.anchor - 1, newSel.main.head - 1);
+    change = { from: change.from, to: change.to, insert: Text.of([change.insert.toString().replace(".", " ")]) };
   } else if (change && change.from >= sel.from && change.to <= sel.to && (change.from != sel.from || change.to != sel.to) && sel.to - sel.from - (change.to - change.from) <= 4) {
     change = {
       from: sel.from,
       to: sel.to,
       insert: view.state.doc.slice(sel.from, change.from).append(change.insert).append(view.state.doc.slice(change.to, sel.to))
     };
-  } else if ((browser.mac || browser.android) && change && change.from == change.to && change.from == sel.head - 1 && /^\. ?$/.test(change.insert.toString()) && view.contentDOM.getAttribute("autocorrect") == "off") {
-    if (newSel && change.insert.length == 2)
-      newSel = EditorSelection.single(newSel.main.anchor - 1, newSel.main.head - 1);
-    change = { from: sel.from, to: sel.to, insert: Text.of([" "]) };
   } else if (browser.chrome && change && change.from == change.to && change.from == sel.head && change.insert.toString() == "\n " && view.lineWrapping) {
     if (newSel)
       newSel = EditorSelection.single(newSel.main.anchor - 1, newSel.main.head - 1);
@@ -25646,6 +25653,10 @@ function visiblePixelRange(dom, paddingTop) {
     bottom: Math.max(top2, bottom) - (rect.top + paddingTop)
   };
 }
+function inWindow(elt) {
+  let rect = elt.getBoundingClientRect(), win = elt.ownerDocument.defaultView || window;
+  return rect.left < win.innerWidth && rect.right > 0 && rect.top < win.innerHeight && rect.bottom > 0;
+}
 function fullPixelRange(dom, paddingTop) {
   let rect = dom.getBoundingClientRect();
   return {
@@ -25846,7 +25857,7 @@ class ViewState {
       if (inView)
         measureContent = true;
     }
-    if (!this.inView && !this.scrollTarget)
+    if (!this.inView && !this.scrollTarget && !inWindow(view.dom))
       return 0;
     let contentWidth = domRect.width;
     if (this.contentDOMWidth != contentWidth || this.editorHeight != view.scrollDOM.clientHeight) {
@@ -26963,7 +26974,7 @@ class EditContextManager {
       selectionEnd: this.toContextPos(view.state.selection.main.head)
     });
     this.handlers.textupdate = (e) => {
-      let { anchor } = view.state.selection.main;
+      let main = view.state.selection.main, { anchor, head } = main;
       let from = this.toEditorPos(e.updateRangeStart), to = this.toEditorPos(e.updateRangeEnd);
       if (view.inputState.composing >= 0 && !this.composing)
         this.composing = { contextBase: e.updateRangeStart, editorBase: from, drifted: false };
@@ -26972,8 +26983,14 @@ class EditContextManager {
         change.from = anchor;
       else if (change.to == this.to && anchor > this.to)
         change.to = anchor;
-      if (change.from == change.to && !change.insert.length)
+      if (change.from == change.to && !change.insert.length) {
+        let newSel = EditorSelection.single(this.toEditorPos(e.selectionStart), this.toEditorPos(e.selectionEnd));
+        if (!newSel.main.eq(main))
+          view.dispatch({ selection: newSel, userEvent: "select" });
         return;
+      }
+      if ((browser.mac || browser.android) && change.from == head - 1 && /^\. ?$/.test(e.text) && view.contentDOM.getAttribute("autocorrect") == "off")
+        change = { from, to, insert: Text.of([e.text.replace(".", " ")]) };
       this.pendingContextChange = change;
       if (!view.state.readOnly) {
         let newLen = this.to - this.from + (change.to - change.from + change.insert.length);
@@ -51158,6 +51175,26 @@ const useContentTypes$1 = () => {
     staleTime: 1e3 * 60 * 3
   });
 };
+const useResetNavigations = () => {
+  const fetch2 = getFetchClient();
+  const apiClient = getApiClient(fetch2);
+  const queryClient2 = useQueryClient();
+  return () => {
+    queryClient2.resetQueries({
+      queryKey: apiClient.readAllIndex()
+    });
+  };
+};
+const useResetContentTypes = () => {
+  const fetch2 = getFetchClient();
+  const apiClient = getApiClient(fetch2);
+  const queryClient2 = useQueryClient();
+  return () => {
+    queryClient2.resetQueries({
+      queryKey: apiClient.readContentTypeIndex()
+    });
+  };
+};
 const useNavigations = () => {
   const fetch2 = getFetchClient();
   const apiClient = getApiClient(fetch2);
@@ -51250,7 +51287,9 @@ const usePurgeNavigation = () => {
       if (!documentIds?.length) {
         return apiClient.purge({});
       }
-      return Promise.all(documentIds.map((documentId) => apiClient.purge({ documentId, withLangVersions: true })));
+      return Promise.all(
+        documentIds.map((documentId) => apiClient.purge({ documentId, withLangVersions: true }))
+      );
     }
   });
 };
@@ -53472,12 +53511,8 @@ const NavigationItemForm = ({
       );
     }
   };
-  const renderError = (error) => {
-    const errorOccurence = get(formError, error);
-    if (errorOccurence) {
-      return formatMessage(getTrad(error));
-    }
-    return void 0;
+  const renderError = (field, messageKey) => {
+    return get(formError, field) ? formatMessage(getTrad(messageKey ?? field)) : void 0;
   };
   const initialRelatedTypeSelected = current.type === "INTERNAL" ? current.relatedType : void 0;
   const {
@@ -53819,7 +53854,7 @@ const NavigationItemForm = ({
             label: formatMessage(
               getTrad(`popup.item.form.${pathSourceName}.label`, "Path")
             ),
-            error: renderError(pathSourceName),
+            error: renderError(pathSourceName, `popup.item.form.${pathSourceName}.validation.type`),
             hint: [
               formatMessage(
                 getTrad(`popup.item.form.${pathSourceName}.placeholder`, "e.g. Blog")
@@ -54259,6 +54294,8 @@ const Inner$1 = () => {
     () => (localeQuery.data ? [localeQuery.data.defaultLocale, ...localeQuery.data.restLocale] : []).filter((locale) => locale !== currentLocale),
     [localeQuery.data, currentLocale]
   );
+  const resetContentTypes = useResetContentTypes();
+  const resetNavigations = useResetNavigations();
   const {
     i18nCopyItemsModal,
     i18nCopySourceLocale,
@@ -54281,7 +54318,12 @@ const Inner$1 = () => {
               {
                 onSuccess(res) {
                   copyNavigationI18nMutation.reset();
-                  setCurrentNavigation(res.data);
+                  setCurrentNavigation({
+                    ...res.data,
+                    items: res.data.items.map(appendViewId)
+                  });
+                  resetContentTypes();
+                  resetNavigations();
                 }
               }
             );
@@ -54583,10 +54625,10 @@ const TextArrayInput = ({ onChange, initialValue, ...props }) => {
   const [value, setValue] = useState(
     isArray(initialValue) ? initialValue.reduce((acc, cur2) => `${acc}${cur2}; `, "") : ""
   );
-  const handleOnChange = (value2) => {
-    const newValue = value2;
-    const valuesArray = newValue.split(";").map((v) => v.trim()).filter((v) => !!v.length);
-    setValue(value2);
+  const handleOnChange = (event) => {
+    const newValue = event?.target.value ?? "";
+    const valuesArray = newValue.split(";").map((value2) => value2.trim()).filter((value2) => !!value2.length);
+    setValue(newValue ?? "");
     onChange(valuesArray);
   };
   return /* @__PURE__ */ jsx(TextInput, { ...props, onChange: handleOnChange, value });
@@ -55719,7 +55761,7 @@ const Inner = () => {
                   ) })
                 ] })
               ] }) }),
-              /* @__PURE__ */ jsxs(Box, { ...BOX_DEFAULT_PROPS, width: "100%", gap: 2, direction: "column", alignItems: "flex-start", children: [
+              /* @__PURE__ */ jsxs(Box, { ...BOX_DEFAULT_PROPS, width: "100%", children: [
                 /* @__PURE__ */ jsx(Typography, { variant: "delta", as: "h2", children: formatMessage(getTrad("pages.settings.customFields.title")) }),
                 /* @__PURE__ */ jsx(Box, { padding: 1 }),
                 /* @__PURE__ */ jsx(

package/dist/admin/src/pages/HomePage/hooks/index.d.ts

@@ -29,6 +29,8 @@ export declare const useContentTypes: () => import("@tanstack/react-query").UseQ
     isDisplayed: boolean;
     apiID: string;
 }[], Error>;
+export declare const useResetNavigations: () => () => void;
+export declare const useResetContentTypes: () => () => void;
 export declare const useNavigations: () => import("@tanstack/react-query").UseQueryResult<{
     id: number;
     name: string;
@@ -145,3 +147,4 @@ export declare const useI18nCopyNavigationItemsModal: (onConfirm: ConfirmEffect)
     i18nCopyItemsModal: import("react/jsx-runtime").JSX.Element | null;
     i18nCopySourceLocale: string | undefined;
 };
+export declare const appendViewId: (item: NavigationItemSchema) => NavigationItemSchema;

package/dist/server/index.js

@@ -14903,7 +14903,8 @@ const processItems = (context) => async (item) => {
     items: item.items ? await Promise.all(item.items.map(processItems(context))) : [],
     master: context.master,
     parent: void 0,
-    related: item.related
+    related: item.related,
+    additionalFields: item.additionalFields
   };
 };
 const intercalate = (glue, arr) => arr.slice(1).reduce((acc, element) => acc.concat([glue, element]), arr.slice(0, 1));
@@ -15108,7 +15109,7 @@ const adminService = (context) => ({
       ).sort((a, b) => a.order - b.order)
     }));
   },
-  async getById({ documentId, locale: locale2 }) {
+  async getById({ documentId, locale: locale2, populate: populate2 = [] }) {
     const commonService2 = getPluginService(context, "common");
     const { defaultLocale } = await commonService2.readLocale();
     const filters2 = {
@@ -15123,7 +15124,7 @@ const adminService = (context) => ({
       locale: locale2 || defaultLocale,
       limit: Number.MAX_SAFE_INTEGER,
       order: [{ order: "asc" }],
-      populate: ["parent", "audience"]
+      populate: ["parent", "audience", ...populate2]
     });
     return {
       ...navigation2,
@@ -15263,9 +15264,7 @@ const adminService = (context) => ({
       filters: { documentId: navigation2.documentId },
       populate: "*"
     });
-    await cleanNavigationItems(
-      allNavigations.map(({ id }) => id)
-    );
+    await cleanNavigationItems(allNavigations.map(({ id }) => id));
     await navigationRepository.remove({ documentId: navigation2.documentId });
     sendAuditLog(auditLog, "onNavigationDeletion", {
       entity: navigationAsDTO,
@@ -15313,9 +15312,9 @@ const adminService = (context) => ({
   }) {
     const targetEntity = await this.getById({ documentId, locale: target });
     return await this.i18nNavigationContentsCopy({
-      source: await this.getById({ documentId, locale: source }),
+      source: await this.getById({ documentId, locale: source, populate: ["related"] }),
       target: targetEntity
-    }).then(() => this.getById({ documentId, locale: target })).then((newEntity) => {
+    }).then(() => this.getById({ documentId, locale: target, populate: ["related"] })).then((newEntity) => {
       sendAuditLog(auditLog, "onChangeNavigation", {
         actionType: "UPDATE",
         oldEntity: targetEntity,
@@ -15521,11 +15520,12 @@ const clientService = (context) => ({
     return navigations;
   },
   renderRFRNavigationItem({ item }) {
-    const { uiRouterKey, title, path: path2, type: type2, audience: audience2 } = item;
+    const { uiRouterKey, title, path: path2, type: type2, audience: audience2, additionalFields } = item;
     const itemCommon = {
       label: title,
       type: type2,
-      audience: audience2?.map(({ key }) => key)
+      audience: audience2?.map(({ key }) => key),
+      additionalFields
     };
     if (type2 === "WRAPPER") {
       return { ...itemCommon };
@@ -15554,7 +15554,21 @@ const clientService = (context) => ({
     throw new NavigationError("Unknown item type", item);
   },
   renderRFRPage({ item, parent, enabledCustomFieldsNames }) {
-    const { documentId, uiRouterKey, title, path: path2, related, type: type2, audience: audience2, menuAttached } = item;
+    const {
+      documentId,
+      uiRouterKey,
+      title,
+      path: path2,
+      related,
+      type: type2,
+      audience: audience2,
+      menuAttached,
+      additionalFields
+    } = item;
+    const additionalFieldsRendered = enabledCustomFieldsNames.reduce(
+      (acc, field) => ({ ...acc, [field]: additionalFields?.[field] }),
+      {}
+    );
     return {
       id: uiRouterKey,
       documentId,
@@ -15567,10 +15581,7 @@ const clientService = (context) => ({
       parent,
       audience: audience2,
       menuAttached,
-      ...enabledCustomFieldsNames.reduce(
-        (acc, field) => ({ ...acc, [field]: ___default.get(item, field) }),
-        {}
-      )
+      additionalFields: additionalFieldsRendered
     };
   },
   renderRFR({
@@ -15725,9 +15736,10 @@ const clientService = (context) => ({
         populate: ["audience", "parent", "related"]
       });
       const mappedItems = await commonService2.mapToNavigationItemDTO({
+        locale: locale2,
+        master: navigation2,
         navigationItems,
-        populate: populate2,
-        master: navigation2
+        populate: populate2
       });
       const { contentTypes: contentTypes2, contentTypesNameFields: contentTypesNameFields2, additionalFields } = await adminService2.config({
         viaSettingsPage: false
@@ -15746,7 +15758,7 @@ const clientService = (context) => ({
       );
       const additionalFieldsMapper = (item) => (acc, field) => {
         const fieldDefinition = customFieldsDefinitions.find(({ name }) => name === field);
-        let content = ___default.get(item, `additionalFields.${field}`);
+        let content = item.additionalFields?.[field];
         if (content) {
           switch (fieldDefinition?.type) {
             case "media":
@@ -15827,22 +15839,18 @@ const clientService = (context) => ({
             cache.set(documentId, nestedOrders);
             return nestedOrders;
           };
-          return result.map(({ additionalFields: additionalFields2, ...item }) => {
-            const customFields = enabledCustomFieldsNames.reduce(
+          return result.map((item) => {
+            const additionalFieldsMapped = enabledCustomFieldsNames.reduce(
               additionalFieldsMapper(item),
               {}
             );
             return {
               ...item,
               audience: item.audience?.map((_) => _.key),
-              title: composeItemTitle(
-                { ...item, additionalFields: additionalFields2 },
-                contentTypesNameFields2,
-                contentTypes2
-              ) || "",
+              title: composeItemTitle(item, contentTypesNameFields2, contentTypes2) || "",
               related: wrapContentType(item.related),
               items: null,
-              ...customFields
+              additionalFields: additionalFieldsMapped
             };
           }).sort(
             (a, b) => compareArraysOfNumbers(getNestedOrders(a.documentId), getNestedOrders(b.documentId))
@@ -15932,13 +15940,46 @@ const commonService = (context) => ({
     return await strapi.store({ type: "plugin", name: "navigation" });
   },
   async mapToNavigationItemDTO({
-    navigationItems,
-    populate: populate2,
+    locale: locale2,
     master,
-    parent
+    navigationItems,
+    parent,
+    populate: populate2
   }) {
     const result = [];
-    for (const navigationItem2 of navigationItems) {
+    const pluginStore = await this.getPluginStore();
+    const config2 = await pluginStore.get({
+      key: "config"
+    }).then(configSchema.parse);
+    const extendedNavigationItems = await Promise.all(
+      navigationItems.map(async (item) => {
+        if (!item.related?.__type || !item.related.documentId) {
+          return item;
+        }
+        const fieldsToPopulate = config2.contentTypesPopulate[item.related.__type];
+        if (!fieldsToPopulate?.length) {
+          return item;
+        }
+        const repository = getGenericRepository({ strapi }, item.related.__type);
+        const related = await repository.findById(
+          item.related.documentId,
+          fieldsToPopulate,
+          "published",
+          {
+            locale: locale2
+          }
+        );
+        return {
+          ...item,
+          related: {
+            ...related,
+            __type: item.related.__type,
+            documentId: item.related.documentId
+          }
+        };
+      })
+    );
+    for (const navigationItem2 of extendedNavigationItems) {
       const { items = [], ...base } = navigationItem2;
       result.push({
         ...base,
@@ -15947,7 +15988,8 @@ const commonService = (context) => ({
           navigationItems: items,
           populate: populate2,
           master,
-          parent: base
+          parent: base,
+          locale: locale2
         })
       });
     }

package/dist/server/index.mjs

@@ -14865,7 +14865,8 @@ const processItems = (context) => async (item) => {
     items: item.items ? await Promise.all(item.items.map(processItems(context))) : [],
     master: context.master,
     parent: void 0,
-    related: item.related
+    related: item.related,
+    additionalFields: item.additionalFields
   };
 };
 const intercalate = (glue, arr) => arr.slice(1).reduce((acc, element) => acc.concat([glue, element]), arr.slice(0, 1));
@@ -15070,7 +15071,7 @@ const adminService = (context) => ({
       ).sort((a, b) => a.order - b.order)
     }));
   },
-  async getById({ documentId, locale: locale2 }) {
+  async getById({ documentId, locale: locale2, populate: populate2 = [] }) {
     const commonService2 = getPluginService(context, "common");
     const { defaultLocale } = await commonService2.readLocale();
     const filters2 = {
@@ -15085,7 +15086,7 @@ const adminService = (context) => ({
       locale: locale2 || defaultLocale,
       limit: Number.MAX_SAFE_INTEGER,
       order: [{ order: "asc" }],
-      populate: ["parent", "audience"]
+      populate: ["parent", "audience", ...populate2]
     });
     return {
       ...navigation2,
@@ -15225,9 +15226,7 @@ const adminService = (context) => ({
       filters: { documentId: navigation2.documentId },
       populate: "*"
     });
-    await cleanNavigationItems(
-      allNavigations.map(({ id }) => id)
-    );
+    await cleanNavigationItems(allNavigations.map(({ id }) => id));
     await navigationRepository.remove({ documentId: navigation2.documentId });
     sendAuditLog(auditLog, "onNavigationDeletion", {
       entity: navigationAsDTO,
@@ -15275,9 +15274,9 @@ const adminService = (context) => ({
   }) {
     const targetEntity = await this.getById({ documentId, locale: target });
     return await this.i18nNavigationContentsCopy({
-      source: await this.getById({ documentId, locale: source }),
+      source: await this.getById({ documentId, locale: source, populate: ["related"] }),
       target: targetEntity
-    }).then(() => this.getById({ documentId, locale: target })).then((newEntity) => {
+    }).then(() => this.getById({ documentId, locale: target, populate: ["related"] })).then((newEntity) => {
       sendAuditLog(auditLog, "onChangeNavigation", {
         actionType: "UPDATE",
         oldEntity: targetEntity,
@@ -15483,11 +15482,12 @@ const clientService = (context) => ({
     return navigations;
   },
   renderRFRNavigationItem({ item }) {
-    const { uiRouterKey, title, path: path2, type: type2, audience: audience2 } = item;
+    const { uiRouterKey, title, path: path2, type: type2, audience: audience2, additionalFields } = item;
     const itemCommon = {
       label: title,
       type: type2,
-      audience: audience2?.map(({ key }) => key)
+      audience: audience2?.map(({ key }) => key),
+      additionalFields
     };
     if (type2 === "WRAPPER") {
       return { ...itemCommon };
@@ -15516,7 +15516,21 @@ const clientService = (context) => ({
     throw new NavigationError("Unknown item type", item);
   },
   renderRFRPage({ item, parent, enabledCustomFieldsNames }) {
-    const { documentId, uiRouterKey, title, path: path2, related, type: type2, audience: audience2, menuAttached } = item;
+    const {
+      documentId,
+      uiRouterKey,
+      title,
+      path: path2,
+      related,
+      type: type2,
+      audience: audience2,
+      menuAttached,
+      additionalFields
+    } = item;
+    const additionalFieldsRendered = enabledCustomFieldsNames.reduce(
+      (acc, field) => ({ ...acc, [field]: additionalFields?.[field] }),
+      {}
+    );
     return {
       id: uiRouterKey,
       documentId,
@@ -15529,10 +15543,7 @@ const clientService = (context) => ({
       parent,
       audience: audience2,
       menuAttached,
-      ...enabledCustomFieldsNames.reduce(
-        (acc, field) => ({ ...acc, [field]: get$1(item, field) }),
-        {}
-      )
+      additionalFields: additionalFieldsRendered
     };
   },
   renderRFR({
@@ -15687,9 +15698,10 @@ const clientService = (context) => ({
         populate: ["audience", "parent", "related"]
       });
       const mappedItems = await commonService2.mapToNavigationItemDTO({
+        locale: locale2,
+        master: navigation2,
         navigationItems,
-        populate: populate2,
-        master: navigation2
+        populate: populate2
       });
       const { contentTypes: contentTypes2, contentTypesNameFields: contentTypesNameFields2, additionalFields } = await adminService2.config({
         viaSettingsPage: false
@@ -15708,7 +15720,7 @@ const clientService = (context) => ({
       );
       const additionalFieldsMapper = (item) => (acc, field) => {
         const fieldDefinition = customFieldsDefinitions.find(({ name }) => name === field);
-        let content = get$1(item, `additionalFields.${field}`);
+        let content = item.additionalFields?.[field];
         if (content) {
           switch (fieldDefinition?.type) {
             case "media":
@@ -15789,22 +15801,18 @@ const clientService = (context) => ({
             cache.set(documentId, nestedOrders);
             return nestedOrders;
           };
-          return result.map(({ additionalFields: additionalFields2, ...item }) => {
-            const customFields = enabledCustomFieldsNames.reduce(
+          return result.map((item) => {
+            const additionalFieldsMapped = enabledCustomFieldsNames.reduce(
               additionalFieldsMapper(item),
               {}
             );
             return {
               ...item,
               audience: item.audience?.map((_) => _.key),
-              title: composeItemTitle(
-                { ...item, additionalFields: additionalFields2 },
-                contentTypesNameFields2,
-                contentTypes2
-              ) || "",
+              title: composeItemTitle(item, contentTypesNameFields2, contentTypes2) || "",
               related: wrapContentType(item.related),
               items: null,
-              ...customFields
+              additionalFields: additionalFieldsMapped
             };
           }).sort(
             (a, b) => compareArraysOfNumbers(getNestedOrders(a.documentId), getNestedOrders(b.documentId))
@@ -15894,13 +15902,46 @@ const commonService = (context) => ({
     return await strapi.store({ type: "plugin", name: "navigation" });
   },
   async mapToNavigationItemDTO({
-    navigationItems,
-    populate: populate2,
+    locale: locale2,
     master,
-    parent
+    navigationItems,
+    parent,
+    populate: populate2
   }) {
     const result = [];
-    for (const navigationItem2 of navigationItems) {
+    const pluginStore = await this.getPluginStore();
+    const config2 = await pluginStore.get({
+      key: "config"
+    }).then(configSchema.parse);
+    const extendedNavigationItems = await Promise.all(
+      navigationItems.map(async (item) => {
+        if (!item.related?.__type || !item.related.documentId) {
+          return item;
+        }
+        const fieldsToPopulate = config2.contentTypesPopulate[item.related.__type];
+        if (!fieldsToPopulate?.length) {
+          return item;
+        }
+        const repository = getGenericRepository({ strapi }, item.related.__type);
+        const related = await repository.findById(
+          item.related.documentId,
+          fieldsToPopulate,
+          "published",
+          {
+            locale: locale2
+          }
+        );
+        return {
+          ...item,
+          related: {
+            ...related,
+            __type: item.related.__type,
+            documentId: item.related.documentId
+          }
+        };
+      })
+    );
+    for (const navigationItem2 of extendedNavigationItems) {
       const { items = [], ...base } = navigationItem2;
       result.push({
         ...base,
@@ -15909,7 +15950,8 @@ const commonService = (context) => ({
           navigationItems: items,
           populate: populate2,
           master,
-          parent: base
+          parent: base,
+          locale: locale2
         })
       });
     }

package/dist/server/src/controllers/admin.d.ts

@@ -20,7 +20,7 @@ export default function adminController(context: {
             visible: boolean;
             items?: import("../schemas").NavigationItemDBSchema[] | undefined;
         }[]>;
-        getById({ documentId, locale }: import("../services/admin/types").GetByIdInput): Promise<{
+        getById({ documentId, locale, populate }: import("../services/admin/types").GetByIdInput): Promise<{
             name: string;
             id: number;
             documentId: string;
@@ -96,7 +96,7 @@ export default function adminController(context: {
                 tag?: string | undefined;
             }> | undefined): Promise<void>;
         }>;
-        mapToNavigationItemDTO({ navigationItems, populate, master, parent, }: import("../services/common/types").MapToNavigationItemDTOInput): Promise<import("../dtos").NavigationItemDTO[]>;
+        mapToNavigationItemDTO({ locale, master, navigationItems, parent, populate, }: import("../services/common/types").MapToNavigationItemDTOInput): Promise<import("../dtos").NavigationItemDTO[]>;
         setDefaultConfig(): Promise<{
             additionalFields: ("audience" | {
                 type: "string" | "boolean";

package/dist/server/src/controllers/client.d.ts

@@ -77,6 +77,7 @@ export default function clientController(context: {
             title: string;
             related: any;
             items: null;
+            additionalFields: {};
             path?: string | null | undefined;
             type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
             id: number;
@@ -99,6 +100,7 @@ export default function clientController(context: {
             title: string;
             related: any;
             items: null;
+            additionalFields: {};
             path?: string | null | undefined;
             type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
             id: number;
@@ -121,6 +123,7 @@ export default function clientController(context: {
             title: string;
             related: any;
             items: null;
+            additionalFields: {};
             path?: string | null | undefined;
             type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
             id: number;
@@ -153,6 +156,7 @@ export default function clientController(context: {
         title: string;
         related: any;
         items: null;
+        additionalFields: {};
         path?: string | null | undefined;
         type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
         id: number;
@@ -175,6 +179,7 @@ export default function clientController(context: {
         title: string;
         related: any;
         items: null;
+        additionalFields: {};
         path?: string | null | undefined;
         type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
         id: number;

package/dist/server/src/graphql/queries/render-navigation-child.d.ts

@@ -14,6 +14,7 @@ export declare const renderNavigationChild: ({ strapi, nexus }: any) => {
         title: string;
         related: any;
         items: null;
+        additionalFields: {};
         path?: string | null | undefined;
         type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
         id: number;

package/dist/server/src/graphql/queries/render-navigation.d.ts

@@ -15,6 +15,7 @@ export declare const renderNavigation: ({ strapi, nexus }: any) => {
         title: string;
         related: any;
         items: null;
+        additionalFields: {};
         path?: string | null | undefined;
         type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
         id: number;

package/dist/server/src/index.d.ts

@@ -274,7 +274,7 @@ declare const _default: {
                 visible: boolean;
                 items?: import("./schemas").NavigationItemDBSchema[] | undefined;
             }[]>;
-            getById({ documentId, locale }: import("./services/admin/types").GetByIdInput): Promise<{
+            getById({ documentId, locale, populate }: import("./services/admin/types").GetByIdInput): Promise<{
                 name: string;
                 id: number;
                 documentId: string;
@@ -354,7 +354,7 @@ declare const _default: {
                     tag?: string | undefined;
                 }> | undefined): Promise<void>;
             }>;
-            mapToNavigationItemDTO({ navigationItems, populate, master, parent, }: import("./services/common/types").MapToNavigationItemDTOInput): Promise<import("./dtos").NavigationItemDTO[]>;
+            mapToNavigationItemDTO({ locale, master, navigationItems, parent, populate, }: import("./services/common/types").MapToNavigationItemDTOInput): Promise<import("./dtos").NavigationItemDTO[]>;
             setDefaultConfig(): Promise<{
                 additionalFields: ("audience" | {
                     type: "string" | "boolean";
@@ -511,6 +511,7 @@ declare const _default: {
                 title: string;
                 related: any;
                 items: null;
+                additionalFields: {};
                 path?: string | null | undefined;
                 type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
                 id: number;
@@ -533,6 +534,7 @@ declare const _default: {
                 title: string;
                 related: any;
                 items: null;
+                additionalFields: {};
                 path?: string | null | undefined;
                 type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
                 id: number;
@@ -555,6 +557,7 @@ declare const _default: {
                 title: string;
                 related: any;
                 items: null;
+                additionalFields: {};
                 path?: string | null | undefined;
                 type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
                 id: number;

package/dist/server/src/services/admin/admin.d.ts

@@ -9,7 +9,7 @@ declare const adminService: (context: {
     config({ viaSettingsPage }: ConfigInput): Promise<NavigationPluginConfigDTO>;
     configContentTypes({ viaSettingsPage, }: ConfigInput): Promise<ConfigContentTypeDTO[]>;
     get({ ids, locale }: GetInput): Promise<NavigationDBSchema[]>;
-    getById({ documentId, locale }: GetByIdInput): Promise<NavigationDBSchema>;
+    getById({ documentId, locale, populate }: GetByIdInput): Promise<NavigationDBSchema>;
     post({ auditLog, payload }: PostInput): Promise<NavigationDTO>;
     put({ auditLog, payload }: PutInput): Promise<NavigationDBSchema>;
     delete({ auditLog, documentId }: DeleteInput): Promise<void>;

package/dist/server/src/services/admin/types.d.ts

@@ -10,6 +10,7 @@ export interface GetInput {
 export interface GetByIdInput {
     documentId: string;
     locale?: string;
+    populate?: Array<string>;
 }
 export interface PostInput {
     payload: CreateNavigationSchema;

package/dist/server/src/services/client/client.d.ts

@@ -31,6 +31,7 @@ declare const clientService: (context: {
         title: string;
         related: any;
         items: null;
+        additionalFields: {};
         path?: string | null | undefined;
         type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
         id: number;
@@ -53,6 +54,7 @@ declare const clientService: (context: {
         title: string;
         related: any;
         items: null;
+        additionalFields: {};
         path?: string | null | undefined;
         type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
         id: number;
@@ -75,6 +77,7 @@ declare const clientService: (context: {
         title: string;
         related: any;
         items: null;
+        additionalFields: {};
         path?: string | null | undefined;
         type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
         id: number;

package/dist/server/src/services/client/types.d.ts

@@ -24,7 +24,7 @@ export interface RenderRFRInput {
     enabledCustomFieldsNames: string[];
 }
 export interface RenderRFRNavInput {
-    item: Pick<NavigationItemDTO, 'uiRouterKey' | 'title' | 'path' | 'type' | 'audience'>;
+    item: Pick<NavigationItemDTO, 'uiRouterKey' | 'title' | 'path' | 'type' | 'audience' | 'additionalFields'>;
 }
 export interface RenderRFRPageInput {
     item: Omit<NavigationItemDTO, 'items' | 'parent' | 'master'>;

package/dist/server/src/services/common/common.d.ts

@@ -8,7 +8,7 @@ declare const commonService: (context: {
     strapi: Core.Strapi;
 }) => {
     getPluginStore(): Promise<ReturnType<typeof strapi.store>>;
-    mapToNavigationItemDTO({ navigationItems, populate, master, parent, }: MapToNavigationItemDTOInput): Promise<NavigationItemDTO[]>;
+    mapToNavigationItemDTO({ locale, master, navigationItems, parent, populate, }: MapToNavigationItemDTOInput): Promise<NavigationItemDTO[]>;
     setDefaultConfig(): Promise<NavigationPluginConfigDBSchema>;
     getBranchName({ item }: GetBranchNameInput): NavigationActionsCategories | void;
     analyzeBranch({ masterEntity, navigationItems, parentItem, prevAction, }: AnalyzeBranchInput): Promise<NavigationAction[]>;

package/dist/server/src/services/common/types.d.ts

@@ -18,6 +18,7 @@ export interface MapToNavigationItemDTOInput {
     populate: unknown;
     master?: Omit<NavigationDTO, 'items'>;
     parent?: NavigationItemDTO;
+    locale?: string;
 }
 export interface CreateBranchInput {
     navigationItems: CreateBranchNavigationItemDTO[];

package/dist/server/src/services/index.d.ts

@@ -17,7 +17,7 @@ declare const _default: {
             visible: boolean;
             items?: import("../schemas").NavigationItemDBSchema[] | undefined;
         }[]>;
-        getById({ documentId, locale }: import("./admin/types").GetByIdInput): Promise<{
+        getById({ documentId, locale, populate }: import("./admin/types").GetByIdInput): Promise<{
             name: string;
             id: number;
             documentId: string;
@@ -95,7 +95,7 @@ declare const _default: {
                 tag?: string | undefined;
             }> | undefined): Promise<void>;
         }>;
-        mapToNavigationItemDTO({ navigationItems, populate, master, parent, }: import("./common/types").MapToNavigationItemDTOInput): Promise<import("../dtos").NavigationItemDTO[]>;
+        mapToNavigationItemDTO({ locale, master, navigationItems, parent, populate, }: import("./common/types").MapToNavigationItemDTOInput): Promise<import("../dtos").NavigationItemDTO[]>;
         setDefaultConfig(): Promise<{
             additionalFields: ("audience" | {
                 type: "string" | "boolean";
@@ -252,6 +252,7 @@ declare const _default: {
             title: string;
             related: any;
             items: null;
+            additionalFields: {};
             path?: string | null | undefined;
             type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
             id: number;
@@ -274,6 +275,7 @@ declare const _default: {
             title: string;
             related: any;
             items: null;
+            additionalFields: {};
             path?: string | null | undefined;
             type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
             id: number;
@@ -296,6 +298,7 @@ declare const _default: {
             title: string;
             related: any;
             items: null;
+            additionalFields: {};
             path?: string | null | undefined;
             type: "INTERNAL" | "EXTERNAL" | "WRAPPER";
             id: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-navigation",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "Strapi - Navigation plugin",
   "strapi": {
     "name": "navigation",
@@ -48,7 +48,7 @@
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.2.0",
-    "react-intl": "6.6.8",
+    "react-intl": "6.6.2",
     "react-router-dom": "^6.22.3",
     "uuid": "^10.0.0",
     "zod": "^3.22.5"
@@ -60,11 +60,11 @@
     "@sensinum/strapi-utils": "^1.0.4",
     "@strapi/design-system": "2.0.0-rc.14",
     "@strapi/icons": "2.0.0-rc.14",
-    "@strapi/plugin-graphql": "^5.6.0",
-    "@strapi/sdk-plugin": "^5.2.8",
-    "@strapi/strapi": "^5.6.0",
-    "@strapi/types": "^5.6.0",
-    "@strapi/typescript-utils": "^5.6.0",
+    "@strapi/plugin-graphql": "^5.8.1",
+    "@strapi/sdk-plugin": "^5.3.0",
+    "@strapi/strapi": "^5.8.1",
+    "@strapi/types": "^5.8.1",
+    "@strapi/typescript-utils": "^5.8.1",
     "@types/jest": "^29.5.12",
     "@types/koa": "^2.15.0",
     "@types/koa-bodyparser": "^4.3.12",
@@ -90,9 +90,9 @@
     "prettier": "^3.3.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-intl": "^6.6.8",
+    "react-intl": "^6.6.2",
     "react-query": "3.39.3",
-    "react-router-dom": "^6.26.2",
+    "react-router-dom": "^6.22.3",
     "strapi-plugin-rest-cache": "^4.2.9",
     "styled-components": "^6.1.13",
     "ts-jest": "^29.1.4",
@@ -100,11 +100,11 @@
     "typescript": "^5.6.2"
   },
   "peerDependencies": {
-    "@strapi/sdk-plugin": "^5.2.8",
-    "@strapi/strapi": "^5.6.0",
+    "@strapi/sdk-plugin": "^5.3.0",
+    "@strapi/strapi": "^5.8.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.26.2",
+    "react-router-dom": "^6.22.3",
     "styled-components": "^6.1.13"
   },
   "husky": {