pds-dev-kit-web 1.5.5 → 1.5.7

package/dist/src/desktop/components/DynamicDesktopNavBar/DynamicDesktopNavBar.js

@@ -35,6 +35,7 @@ var hooks_1 = require("../../../common/hooks");
 var blocks_1 = require("./blocks");
 var reducer_1 = __importStar(require("./reducer"));
 var templates_1 = require("./templates");
+var utils_1 = require("./utils");
 exports.BasePathContext = (0, react_1.createContext)({
     basePath: '',
     activeMode: 'BY_URL',
@@ -50,14 +51,15 @@ function DynamicDesktopNavBar(_a) {
     var location = (0, react_router_dom_1.useLocation)();
     var prevLocation = (0, hooks_1.usePrevious)(location.pathname + location.search);
     (0, react_1.useEffect)(function () {
-        var currentLocation = location.pathname + location.search;
+        var currentSearch = (0, utils_1.getSearchExceptGivenName)(location.search, 'from');
+        var currentLocation = location.pathname + currentSearch;
         if (currentLocation === state.clickedURL) {
             return;
         }
         if (currentLocation !== prevLocation) {
             dispatch({ type: 'URL_CHANGED' });
         }
-    }, [location.pathname, location.search]);
+    }, [location.pathname, location.search, prevLocation]);
     var slicedPrimaryMenus = (0, react_1.useMemo)(function () { return primaryMenus === null || primaryMenus === void 0 ? void 0 : primaryMenus.slice(0, primaryMenuOptions.maxLength); }, [primaryMenus, primaryMenuOptions]);
     var slicedSecondaryMenus = (0, react_1.useMemo)(function () { var _a; return (_a = secondaryMenus === null || secondaryMenus === void 0 ? void 0 : secondaryMenus.slice(0, secondaryMenuOptions.maxLength)) !== null && _a !== void 0 ? _a : []; }, [secondaryMenus, secondaryMenuOptions]);
     function handleClickInternalMenuItemNav(url) {

package/dist/src/desktop/components/DynamicDesktopNavBar/components/MenuItemNav/components/InternalLinkMenuItemNav.js

@@ -26,6 +26,7 @@ var react_1 = __importStar(require("react"));
 var react_router_dom_1 = require("react-router-dom");
 var Navigations_1 = require("../../../../../../common/components/Navigations");
 var DynamicDesktopNavBar_1 = require("../../../DynamicDesktopNavBar");
+var utils_1 = require("../../../utils");
 var IconNav_1 = __importDefault(require("../../IconNav"));
 var ImageIconNav_1 = __importDefault(require("../../ImageIconNav"));
 function InternalLinkMenuItemNav(_a) {
@@ -38,7 +39,7 @@ function InternalLinkMenuItemNav(_a) {
             return false;
         }
         // NOTE: 'from' keyword를 예외로 삭제하고 비교합니다.
-        var locationSearch = getSearchExceptGivenName(location.search, 'from');
+        var locationSearch = (0, utils_1.getSearchExceptGivenName)(location.search, 'from');
         if (pathname + search === location.pathname + locationSearch) {
             return true;
         }
@@ -64,18 +65,4 @@ function getInternalLink(basePath, url) {
     var pAppCode = splitPath === null || splitPath === void 0 ? void 0 : splitPath.split('/')[PAPP_CODE_INDEX];
     return { internalPath: basePath + splitPath + search, pAppCode: pAppCode, pathname: pathname, search: search };
 }
-function getSearchExceptGivenName(search, name) {
-    if (!search) {
-        return '';
-    }
-    try {
-        var params = new URLSearchParams(search);
-        params.delete(name);
-        return "?" + params.toString();
-    }
-    catch (err) {
-        console.error(err);
-        return '';
-    }
-}
 exports.default = InternalLinkMenuItemNav;

package/dist/src/desktop/components/DynamicDesktopNavBar/utils.d.ts

@@ -0,0 +1 @@
+export declare function getSearchExceptGivenName(search: string, name: string): string;

package/dist/src/desktop/components/DynamicDesktopNavBar/utils.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSearchExceptGivenName = void 0;
+function getSearchExceptGivenName(search, name) {
+    if (!search) {
+        return '';
+    }
+    try {
+        var params = new URLSearchParams(search);
+        params.delete(name);
+        var paramsInString = params.toString();
+        return paramsInString ? "?" + paramsInString : '';
+    }
+    catch (err) {
+        console.error(err);
+        return '';
+    }
+}
+exports.getSearchExceptGivenName = getSearchExceptGivenName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pds-dev-kit-web",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "license": "MIT",
   "private": false,
   "main": "dist/index.js",

package/release-note.md

@@ -1,7 +1,6 @@
 # PDS-DEV-KIT-WEB Release Notes
-## [v1.5.5]
+## [v1.5.7]
 
 ### Component
 * DynamicDesktopNavBar
-  * 내부링크 유형을 사용할때 urlSearchParams가 없는경우 대응
-    * urlSearchParams의 에러핸들링 (에러의 경우 console.error 및 search를 ''(빈 스트링)으로 판단
+  * URLSearchParams로 from이 붙은 경우에는 url 변경으로 인식하지 않도록 예외처리