@banch0u/core-project-test-repository 1.11.7 → 1.12.0

package/dist/layout/Sidebar/index.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useEffect, useState, useCallback } from "react";
+import React, { useEffect, useState, useCallback, useMemo } from "react";
 import { Link, useLocation } from "react-router-dom";
 import Cookies from "js-cookie";
 import style from "./index.module.scss";
@@ -13,7 +13,6 @@ import { getCompanyInfo } from "../../store/slices/companyInfo";
 import api from "../../utils/axios";
 var Sider = Layout.Sider;
 var Sidebar = function Sidebar(_ref) {
-  var _items$flatMap$find;
   var _ref$items = _ref.items,
     items = _ref$items === void 0 ? [] : _ref$items;
   var location = useLocation();
@@ -110,11 +109,44 @@ var Sidebar = function Sidebar(_ref) {
       window.removeEventListener("themeChange", handleThemeChange);
     };
   }, []);
-  var selectedKey = (_items$flatMap$find = items.flatMap(function (item) {
-    return item.children ? item.children : item;
-  }).find(function (item) {
-    return location.pathname.includes(item.key);
-  })) === null || _items$flatMap$find === void 0 ? void 0 : _items$flatMap$find.key;
+
+  // --- FIX: compute selectedKey by exact segment match OR full-path prefix match, prefer the longest match
+  var flatItems = useMemo(function () {
+    var _flatten = function flatten(arr) {
+      return arr.flatMap(function (it) {
+        var _it$children;
+        return it !== null && it !== void 0 && (_it$children = it.children) !== null && _it$children !== void 0 && _it$children.length ? _flatten(it.children) : [it];
+      });
+    };
+    return _flatten(items || []);
+  }, [items]);
+  var selectedKey = useMemo(function () {
+    var rawPath = location.pathname || "/";
+    var path = rawPath.replace(/\/+$/, ""); // trim trailing slash
+    var segments = path.split("/").filter(Boolean);
+    var normalize = function normalize(s) {
+      return typeof s === "string" ? s.trim() : "";
+    };
+    var candidates = flatItems.map(function (it) {
+      return normalize(it === null || it === void 0 ? void 0 : it.key);
+    }).filter(Boolean);
+    var isMatch = function isMatch(key) {
+      // Case A: key looks like a full path
+      if (key.startsWith("/")) {
+        var nk = key.replace(/\/+$/, "");
+        return path === nk || path.startsWith(nk + "/");
+      }
+      // Case B: key is a segment/token (e.g., "chlorine" or "chlorine-percentage")
+      // Match only exact segment equality, not substring
+      return segments.includes(key);
+    };
+
+    // gather all matches, then prefer the most specific (longest key string)
+    var matches = candidates.filter(isMatch).sort(function (a, b) {
+      return b.length - a.length;
+    });
+    return matches[0]; // undefined if none
+  }, [location.pathname, flatItems]);
   return /*#__PURE__*/React.createElement(Sider, {
     width: 287,
     collapsible: true,
@@ -127,7 +159,7 @@ var Sidebar = function Sidebar(_ref) {
   }, /*#__PURE__*/React.createElement(Menu, {
     mode: "inline",
     items: items,
-    selectedKeys: [selectedKey],
+    selectedKeys: selectedKey ? [selectedKey] : [],
     className: style.menu
   })), /*#__PURE__*/React.createElement(Link, {
     to: PLATFORM_PATH,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@banch0u/core-project-test-repository",
-  "version": "1.11.7",
+  "version": "1.12.0",
   "description": "Shared core features for all projects",
   "main": "dist/index.js",
   "files": [