@cakemail-org/ui-components-v2 2.2.127 → 2.2.129

package/dist/cjs/index.js

@@ -20146,14 +20146,54 @@ function SideMenuItem(_a) {
             variant === "subSection" && React.createElement(Typography, { variant: "body2S", className: "uppercase" }, item.text)));
 }
 
+function normalizePath(path) {
+    var normalized = path.replace(/^#/, "").replace(/\/$/, "");
+    return normalized || "/";
+}
+function pathMatches(currentPath, targetPath) {
+    return currentPath === targetPath || currentPath.startsWith("".concat(targetPath, "/"));
+}
+function collectMenuPaths(menuItems) {
+    var paths = [];
+    menuItems.forEach(function (item) {
+        var _a;
+        if ("divider" in item) {
+            return;
+        }
+        if (item.path) {
+            paths.push(normalizePath(item.path));
+        }
+        (_a = item.subItems) === null || _a === void 0 ? void 0 : _a.forEach(function (subItem) {
+            if (subItem.path) {
+                paths.push(normalizePath(subItem.path));
+            }
+        });
+    });
+    return paths;
+}
+function getLongestMatchingPath(currentPath, menuPaths) {
+    var longestMatch = null;
+    menuPaths.forEach(function (targetPath) {
+        if (!pathMatches(currentPath, targetPath)) {
+            return;
+        }
+        if (!longestMatch || targetPath.length > longestMatch.length) {
+            longestMatch = targetPath;
+        }
+    });
+    return longestMatch;
+}
 function SideMenuContainer(_a) {
     var menuItems = _a.menuItems, menuItemClick = _a.menuItemClick, forcedLocationPath = _a.forcedLocationPath, className = _a.className;
     var location = reactRouterDom.useLocation();
     var _b = React.useState([]), openedItems = _b[0], setOpenedItems = _b[1];
+    var currentPath = normalizePath(forcedLocationPath !== null && forcedLocationPath !== void 0 ? forcedLocationPath : (location.hash || location.pathname));
+    var longestMatchingPath = React.useMemo(function () { return getLongestMatchingPath(currentPath, collectMenuPaths(menuItems)); }, [currentPath, menuItems]);
     function isSelected(value) {
-        if (!value)
+        if (!value || !longestMatchingPath) {
             return false;
-        return (forcedLocationPath === null || forcedLocationPath === void 0 ? void 0 : forcedLocationPath.endsWith(value)) || location.hash.endsWith(value.replace("#", "")) || location.pathname.endsWith(value.replace("#", ""));
+        }
+        return normalizePath(value) === longestMatchingPath;
     }
     function handleMenuItemClick(event) {
         menuItemClick && menuItemClick(event);

package/dist/cjs/models/contentCatalog/types.d.ts

@@ -75,6 +75,10 @@ export interface TBeeTemplateListFacets {
     designers: TBeeDesignerFacet[];
     tags: TBeeTagFacet[];
 }
+export interface TBeeFreeListParams {
+    page?: number;
+    pagesize?: number;
+}
 export interface TBeeFreeList<T> {
     count: number;
     next: string | null;

package/dist/cjs/services/contentCatalog/types.d.ts

@@ -1,14 +1,13 @@
-export interface TTemplateListParams {
+import { TBeeFreeListParams } from "../../models/contentCatalog/types";
+export interface TTemplateListParams extends TBeeFreeListParams {
     search?: string;
     category?: string;
     collection?: string;
     designer?: string;
     tag?: string;
     template_type?: string;
-    pagesize?: number;
     published_after?: string;
     published_before?: string;
 }
-export interface TPageSizeParam {
-    pagesize?: number;
+export interface TPageSizeParam extends TBeeFreeListParams {
 }

package/dist/esm/index.js

@@ -20126,14 +20126,54 @@ function SideMenuItem(_a) {
             variant === "subSection" && React__default.createElement(Typography, { variant: "body2S", className: "uppercase" }, item.text)));
 }
 
+function normalizePath(path) {
+    var normalized = path.replace(/^#/, "").replace(/\/$/, "");
+    return normalized || "/";
+}
+function pathMatches(currentPath, targetPath) {
+    return currentPath === targetPath || currentPath.startsWith("".concat(targetPath, "/"));
+}
+function collectMenuPaths(menuItems) {
+    var paths = [];
+    menuItems.forEach(function (item) {
+        var _a;
+        if ("divider" in item) {
+            return;
+        }
+        if (item.path) {
+            paths.push(normalizePath(item.path));
+        }
+        (_a = item.subItems) === null || _a === void 0 ? void 0 : _a.forEach(function (subItem) {
+            if (subItem.path) {
+                paths.push(normalizePath(subItem.path));
+            }
+        });
+    });
+    return paths;
+}
+function getLongestMatchingPath(currentPath, menuPaths) {
+    var longestMatch = null;
+    menuPaths.forEach(function (targetPath) {
+        if (!pathMatches(currentPath, targetPath)) {
+            return;
+        }
+        if (!longestMatch || targetPath.length > longestMatch.length) {
+            longestMatch = targetPath;
+        }
+    });
+    return longestMatch;
+}
 function SideMenuContainer(_a) {
     var menuItems = _a.menuItems, menuItemClick = _a.menuItemClick, forcedLocationPath = _a.forcedLocationPath, className = _a.className;
     var location = useLocation();
     var _b = useState([]), openedItems = _b[0], setOpenedItems = _b[1];
+    var currentPath = normalizePath(forcedLocationPath !== null && forcedLocationPath !== void 0 ? forcedLocationPath : (location.hash || location.pathname));
+    var longestMatchingPath = useMemo(function () { return getLongestMatchingPath(currentPath, collectMenuPaths(menuItems)); }, [currentPath, menuItems]);
     function isSelected(value) {
-        if (!value)
+        if (!value || !longestMatchingPath) {
             return false;
-        return (forcedLocationPath === null || forcedLocationPath === void 0 ? void 0 : forcedLocationPath.endsWith(value)) || location.hash.endsWith(value.replace("#", "")) || location.pathname.endsWith(value.replace("#", ""));
+        }
+        return normalizePath(value) === longestMatchingPath;
     }
     function handleMenuItemClick(event) {
         menuItemClick && menuItemClick(event);

package/dist/esm/models/contentCatalog/types.d.ts

@@ -75,6 +75,10 @@ export interface TBeeTemplateListFacets {
     designers: TBeeDesignerFacet[];
     tags: TBeeTagFacet[];
 }
+export interface TBeeFreeListParams {
+    page?: number;
+    pagesize?: number;
+}
 export interface TBeeFreeList<T> {
     count: number;
     next: string | null;

package/dist/esm/services/contentCatalog/types.d.ts

@@ -1,14 +1,13 @@
-export interface TTemplateListParams {
+import { TBeeFreeListParams } from "../../models/contentCatalog/types";
+export interface TTemplateListParams extends TBeeFreeListParams {
     search?: string;
     category?: string;
     collection?: string;
     designer?: string;
     tag?: string;
     template_type?: string;
-    pagesize?: number;
     published_after?: string;
     published_before?: string;
 }
-export interface TPageSizeParam {
-    pagesize?: number;
+export interface TPageSizeParam extends TBeeFreeListParams {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cakemail-org/ui-components-v2",
-    "version": "2.2.127",
+    "version": "2.2.129",
     "publishConfig": {
         "access": "public"
     },