pcm-shared-components 0.0.86 → 0.0.89

package/dist/components/Dialogs/GenericAppBar/index.js

@@ -2,6 +2,7 @@ import React, { Fragment, useState, useEffect } from "react";
 import { Typography, Button, Tooltip, IconButton, Toolbar, MenuItem, Menu, AppBar, Badge } from "@mui/material";
 import { makeStyles } from '@mui/styles';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
+import Divider from '@mui/material/Divider';
 import { ThemeProvider } from '@mui/system';
 import { createTheme, useTheme } from '@mui/material/styles';
 import MoreIcon from "@mui/icons-material/MoreVert";
@@ -98,7 +99,7 @@ export const GenericAppBar = props => {
       borderLeft: "0.1em solid #aeaeae",
       padding: "0.5em",
       margin: "10px 10px 10px 10px",
-      height: 30
+      height: 5
     },
     mobile_divider: {
       borderBottom: "0.1em solid #aeaeae",
@@ -221,7 +222,7 @@ export const GenericAppBar = props => {
   }, /*#__PURE__*/React.createElement("div", {
     className: "flex flex-row",
     key: `main_sub_items_${new Date()}`
-  }, /*#__PURE__*/React.createElement(Tooltip, {
+  }, "                            ", /*#__PURE__*/React.createElement(Tooltip, {
     title: menu.name
   }, menu.isButton ? /*#__PURE__*/React.createElement(Button // className={classes.menuButton}
   , {
@@ -238,8 +239,17 @@ export const GenericAppBar = props => {
     onClick: () => {
       menu.onClick();
     }
-  }, menu.icon)), menu.display_divider ? menu_divider : /*#__PURE__*/React.createElement("div", {
-    className: "mr-12"
+  }, menu.icon)), menu.display_divider ? /*#__PURE__*/React.createElement(Divider, {
+    style: {
+      marginRight: 24,
+      marginLeft: 6
+    },
+    orientation: "vertical",
+    flexItem: true
+  }) : /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginRight: 24
+    }
   })))); //? ------------------------------------------------
   //! Mobile menu
   //? ------------------------------------------------
@@ -270,10 +280,7 @@ export const GenericAppBar = props => {
   //? ------------------------------------------------
 
   const MainItems = () => {
-    return /*#__PURE__*/React.createElement("div", {
-      className: "flex flex-row",
-      key: `main_items_${new Date()}`
-    }, (appBarMenu.mainMenu || []).filter(mn => !(mn.hideMenu && mn.hideMenu === true)).map((menu, idx) => /*#__PURE__*/React.createElement(DesktopItemMenu, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, (appBarMenu.mainMenu || []).filter(mn => !(mn.hideMenu && mn.hideMenu === true)).map((menu, idx) => /*#__PURE__*/React.createElement(DesktopItemMenu, {
       key: `desktop_item_menu_${idx}`,
       menu: menu,
       idx: idx

package/dist/components/Dialogs/GenericDialogWindow/index.js

@@ -60,6 +60,25 @@ export const GenericDialogWindow = props => {
     } catch (error) {}
 
     return return_value;
+  }; //?-------------------------------------------------------
+  //? Children on click callback override, updates the onclick for a given menu
+  //?-------------------------------------------------------
+
+
+  const updateObjectByID = (obj, id, onClick) => {
+    if (!obj) return;
+
+    if (obj.id && obj.id === id) {
+      obj.onClick = onClick;
+    } else if (typeof obj === 'object' && Array.isArray(obj)) {
+      for (var i = 0; i < obj.length; i++) {
+        updateObjectByID(obj[i], id, onClick);
+      }
+    } else if (obj.subMenu) {
+      updateObjectByID(obj.subMenu, id, onClick);
+    }
+
+    return obj;
   };
 
   const setMenuOnClickCallback = useCallback((id, onClick) => {
@@ -75,7 +94,7 @@ export const GenericDialogWindow = props => {
         }];
       });
     }
-  }, []);
+  }, [appBarMenu]);
 
   const setOverrides = () => {
     try {
@@ -83,15 +102,7 @@ export const GenericDialogWindow = props => {
       onClickOverride.forEach(item => {
         setManagedAppBarMenu(previousState => {
           return { ...previousState,
-            mainMenu: [...previousState.mainMenu.map(mm => {
-              if (mm.id.toLowerCase() === item.id.toLowerCase()) {
-                return { ...mm,
-                  onClick: item.onClick
-                };
-              } else {
-                return mm;
-              }
-            })]
+            mainMenu: updateObjectByID(previousState.mainMenu, item.id, item.onClick)
           };
         });
       });
@@ -106,7 +117,6 @@ export const GenericDialogWindow = props => {
   }, [onClickOverride]);
   useEffect(() => {
     if (appBarMenu && appBarMenu.mainMenu) {
-      // If we have a mainMenu item with the id='save' then override the onClick event to use the onSave function which reaches into the child ref
       setManagedAppBarMenu({ ...appBarMenu,
         mainMenu: [...appBarMenu.mainMenu.map(mm => {
           if (mm.id === 'save') {
@@ -119,7 +129,8 @@ export const GenericDialogWindow = props => {
             return mm;
           }
         })]
-      }); //Need to re-apply any onClick override to ensure they are still properly set by what was overridden from the child component.
+      }); // If we have a mainMenu item with the id='save' then override the onClick event to use the onSave function which reaches into the child ref
+      //Need to re-apply any onClick override to ensure they are still properly set by what was overridden from the child component.
 
       setOverrides();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pcm-shared-components",
-  "version": "0.0.86",
+  "version": "0.0.89",
   "private": false,
   "main": "dist/index.js",
   "babel": {