pds-dev-kit-web 1.4.15 → 1.4.18

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

@@ -17,8 +17,7 @@ function DisplayOnlyMenuItemNav(_a) {
     if (showMenuAsIcon) {
         if (menu.iconSrc) {
             return (react_1.default.createElement(DeactivateLinkBox, null,
-                react_1.default.createElement(ImageIconNav_1.default, { to: menu.conversionLinkSrc, iconSrc: menu.iconSrc, openNewTab: false }),
-                ";"));
+                react_1.default.createElement(ImageIconNav_1.default, { to: menu.conversionLinkSrc, iconSrc: menu.iconSrc, openNewTab: false })));
         }
         if (menu.iconName) {
             return (react_1.default.createElement(DeactivateLinkBox, null,

package/dist/src/desktop/components/DynamicDesktopNavBar/components/MenuItemNav/components/InternalLinkMenuItemNav.d.ts

@@ -8,5 +8,5 @@ declare type Props = {
     showMenuAsIcon?: boolean;
     isContextMenu?: boolean;
 };
-declare function WebMenuItemNav({ menu, showMenuAsIcon, isContextMenu }: Props): JSX.Element;
-export default WebMenuItemNav;
+declare function InternalLinkMenuItemNav({ menu, showMenuAsIcon, isContextMenu }: Props): JSX.Element;
+export default InternalLinkMenuItemNav;

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

@@ -1,22 +1,57 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var react_1 = __importDefault(require("react"));
+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 IconNav_1 = __importDefault(require("../../IconNav"));
 var ImageIconNav_1 = __importDefault(require("../../ImageIconNav"));
-function WebMenuItemNav(_a) {
+function InternalLinkMenuItemNav(_a) {
     var menu = _a.menu, showMenuAsIcon = _a.showMenuAsIcon, isContextMenu = _a.isContextMenu;
+    var basePath = (0, react_1.useContext)(DynamicDesktopNavBar_1.BasePathContext).basePath;
+    var match = (0, react_router_dom_1.useRouteMatch)("" + basePath);
+    var activeMatch = (0, react_router_dom_1.useRouteMatch)(basePath + "/:activeKey");
+    var _b = getInternalLink(basePath, menu.conversionLinkSrc), internalPath = _b.internalPath, pAppCode = _b.pAppCode;
+    var isActive = (0, react_1.useMemo)(function () {
+        return (activeMatch === null || activeMatch === void 0 ? void 0 : activeMatch.params.activeKey) === pAppCode;
+    }, [match, activeMatch, pAppCode]);
     if (showMenuAsIcon) {
         if (menu.iconSrc) {
-            return react_1.default.createElement(ImageIconNav_1.default, { to: menu.conversionLinkSrc, iconSrc: menu.iconSrc, openNewTab: false });
+            return react_1.default.createElement(ImageIconNav_1.default, { to: internalPath, iconSrc: menu.iconSrc, openNewTab: false });
         }
         if (menu.iconName) {
-            return react_1.default.createElement(IconNav_1.default, { to: menu.conversionLinkSrc, iconName: menu.iconName, openNewTab: false });
+            return react_1.default.createElement(IconNav_1.default, { to: internalPath, iconName: menu.iconName, openNewTab: false });
         }
     }
-    return isContextMenu ? (react_1.default.createElement(Navigations_1.ContextTextLabelNav, { preventLineChange: true, openNewTab: false, to: menu.conversionLinkSrc, text: menu.name })) : (react_1.default.createElement(Navigations_1.TextLabelNav, { preventLineChange: true, openNewTab: false, to: menu.conversionLinkSrc, text: menu.name }));
+    return isContextMenu ? (react_1.default.createElement(Navigations_1.ContextTextLabelNav, { isActive: isActive, preventLineChange: true, openNewTab: false, to: internalPath, text: menu.name })) : (react_1.default.createElement(Navigations_1.TextLabelNav, { isActive: isActive, preventLineChange: true, openNewTab: false, to: internalPath, text: menu.name }));
+}
+function getInternalLink(basePath, url) {
+    var pathname = new URL(url).pathname;
+    var splitPath = pathname.split(basePath).pop();
+    var PAPP_CODE_INDEX = 1;
+    var pAppCode = splitPath === null || splitPath === void 0 ? void 0 : splitPath.split('/')[PAPP_CODE_INDEX];
+    return { internalPath: basePath + splitPath, pAppCode: pAppCode };
 }
-exports.default = WebMenuItemNav;
+exports.default = InternalLinkMenuItemNav;

package/package.json

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

package/release-note.md

@@ -1,8 +1,6 @@
 # PDS-DEV-KIT-WEB Release Notes
-## [v1.4.15]
+## [v1.4.18]
 
 ### Component
-* EditApplyTextField
-  * error message를 표시하는 부분의 useTranslation 삭제
-* TextField
-  * error message를 표시하는 부분의 useTranslation 삭제
+* DynamicDesktopNavbar
+  * 'DISPLAY_ONLY'유형 디자인 수정