@hitachivantara/app-shell-ui 2.2.0 → 2.2.1

package/dist/components/layout/AppShellLayout.js

@@ -34,7 +34,12 @@ const { useClasses } = createClasses("HvAppShellLayout", {
     overflowY: "auto"
   }
 });
-function HvAppShellLayout({ children }) {
+function HvAppShellLayout({
+  children,
+  style,
+  className,
+  ...others
+}) {
   const { classes, cx } = useClasses();
   const { activeTheme } = useTheme();
   const {
@@ -49,15 +54,16 @@ function HvAppShellLayout({ children }) {
   return /* @__PURE__ */ jsxs(
     "div",
     {
-      className: cx(classes.root, {
+      className: cx(classes.root, className, {
         // order (priority) of these classes is very important
         [classes.pentaho]: isPentahoTheme,
         [classes.compact]: isCompactMode || !showVerticalNavigation
       }),
-      style: mergeStyles(void 0, {
+      style: mergeStyles(style, {
         "--vNavWidth": `${verticalNavigationWidth}px`,
         "--headerHeight": showHeaderSubMenu && !isCompactMode ? `calc(${theme.header.height} + ${theme.header.secondLevelHeight})` : theme.header.height
       }),
+      ...others,
       children: [
         /* @__PURE__ */ jsx(Header, {}),
         showVerticalNavigation && /* @__PURE__ */ jsx(VerticalNavigation, {}),

package/dist/components/layout/HeaderActions/AppSwitcherToggle/AppSwitcherToggle.js

@@ -1,5 +1,5 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import { useState, useId } from "react";
+import { useState, useId, useMemo } from "react";
 import { createPortal } from "react-dom";
 import { useTranslation } from "react-i18next";
 import ClickAwayListener from "@mui/material/ClickAwayListener";
@@ -19,36 +19,25 @@ const AppSwitcherToggle = ({
   const [isPanelOpen, setIsPanelOpen] = useState(false);
   const appSwitcherPanelId = useId();
   const { logo } = useHvAppShellModel();
-  const createAppsList = () => {
-    return apps ? apps.map((app) => ({
+  const appsList = useMemo(() => {
+    if (!apps) return [];
+    return apps.map((app) => ({
       name: tConfig(app.label),
       description: app.description ? tConfig(app.description).toString() : void 0,
-      url: app.url.includes(":") ? app.url : tConfig(app.url).toString(),
+      url: app.url?.includes(":") ? app.url : tConfig(app.url).toString(),
       target: app.target === "NEW" ? "_blank" : "_top",
       iconElement: app.icon && /* @__PURE__ */ jsx(IconUiKit, { name: app.icon.name })
-    })) : [];
-  };
-  const closeAppSwitcherPanel = () => {
-    setIsPanelOpen(false);
-  };
-  const handleAppSwitcherPanelItemClicked = () => {
-    closeAppSwitcherPanel();
-  };
-  const handleAppSwitcherButtonClick = () => {
-    setIsPanelOpen(!isPanelOpen);
-  };
-  if (!apps || apps.length === 0) {
-    return null;
-  }
+    }));
+  }, [apps, tConfig]);
+  if (!apps || apps.length === 0) return null;
   const finalTitle = title ? tConfig(title) : t("title");
-  return /* @__PURE__ */ jsx(ClickAwayListener, { onClickAway: closeAppSwitcherPanel, children: /* @__PURE__ */ jsxs("div", { style: { display: "flex", margin: 0 }, children: [
+  return /* @__PURE__ */ jsx(ClickAwayListener, { onClickAway: () => setIsPanelOpen(false), children: /* @__PURE__ */ jsxs("div", { style: { display: "flex", margin: 0 }, children: [
     /* @__PURE__ */ jsxs(
       HvIconButton,
       {
         title: finalTitle,
-        "aria-label": finalTitle,
         "aria-expanded": isPanelOpen,
-        onClick: handleAppSwitcherButtonClick,
+        onClick: () => setIsPanelOpen(!isPanelOpen),
         ...isPanelOpen && { "aria-controls": appSwitcherPanelId },
         children: [
           /* @__PURE__ */ jsx(IconUiKit, { name: "AppSwitcher" }),
@@ -66,8 +55,8 @@ const AppSwitcherToggle = ({
           children: /* @__PURE__ */ jsx(
             HvAppSwitcher,
             {
-              applications: createAppsList(),
-              onActionClickedCallback: handleAppSwitcherPanelItemClicked,
+              applications: appsList,
+              onActionClickedCallback: () => setIsPanelOpen(false),
               header: /* @__PURE__ */ jsx(HvTypography, { variant: "label", children: finalTitle })
             }
           )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hitachivantara/app-shell-ui",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "type": "module",
   "private": false,
   "author": "Hitachi Vantara UI Kit Team",
@@ -19,10 +19,10 @@
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
     "@hitachivantara/app-shell-events": "^2.0.2",
-    "@hitachivantara/app-shell-navigation": "^2.1.5",
+    "@hitachivantara/app-shell-navigation": "^2.1.6",
     "@hitachivantara/app-shell-services": "^2.0.2",
-    "@hitachivantara/app-shell-shared": "^2.2.0",
-    "@hitachivantara/uikit-react-core": "^6.4.2",
+    "@hitachivantara/app-shell-shared": "^2.2.1",
+    "@hitachivantara/uikit-react-core": "^6.4.3",
     "@hitachivantara/uikit-react-icons": "^6.0.2",
     "@mui/material": "^7.0.2",
     "i18next": "^24.2.2",
@@ -44,7 +44,7 @@
     "access": "public",
     "directory": "package"
   },
-  "gitHead": "3f10053759d187946255aede1c25203f4fea7940",
+  "gitHead": "fe1e806628c08552c969d2b99d3d2e977be12b21",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",