pcm-shared-components 0.0.85 → 0.0.88

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",
@@ -217,10 +218,7 @@ export const GenericAppBar = props => {
   }), menu.display_divider ? menu_divider : /*#__PURE__*/React.createElement("div", {
     className: "mr-12"
   })) : /*#__PURE__*/React.createElement("div", {
-    key: `main_menu_item_${idx}`
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "flex flex-row",
-    key: `main_sub_items_${new Date()}`
+    className: "flex flex-row "
   }, /*#__PURE__*/React.createElement(Tooltip, {
     title: menu.name
   }, menu.isButton ? /*#__PURE__*/React.createElement(Button // className={classes.menuButton}
@@ -238,9 +236,18 @@ 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 +277,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

@@ -27,6 +27,7 @@ export const GenericDialogWindow = props => {
   const [is_loading, setIsLoading] = useState(false);
   const [managedAppBarMenu, setManagedAppBarMenu] = useState(undefined);
   const [save_button_label, setSaveButtonLabel] = useState(undefined);
+  const [onClickOverride, setOnClickOverride] = useState([]);
   const childRef = useRef();
 
   const onSave = () => {
@@ -47,7 +48,7 @@ export const GenericDialogWindow = props => {
   };
 
   const getSaveButtonLabel = () => {
-    let return_value = 'Save--'; //returns the save label for the save button in the bottom right of the dialog.
+    let return_value = 'Save'; //returns the save label for the save button in the bottom right of the dialog.
     // The save label is taken from the mainMenu name item having an id='save'
 
     try {
@@ -59,11 +60,63 @@ 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) => {
+    //Used to set the onClick callback on a specific menu matching the id provided.
+    //Example: Used by the children component to set the onClick of a menu.
+    // A menu must have a unique id object matching the id on which we are searching for and a callback function must be provided
+    if (!onClickOverride.find(oco => oco.id.toLowerCase() === id.toLowerCase())) {
+      //Nice this override doesn't exist. Add it
+      setOnClickOverride(previousState => {
+        return [...previousState, {
+          id: id,
+          onClick: onClick
+        }];
+      });
+    }
+  }, [appBarMenu]);
+
+  const setOverrides = () => {
+    try {
+      //Loop over all our on click overrides and apply the onClick callback for each id found in the onClickOverride state
+      onClickOverride.forEach(item => {
+        setManagedAppBarMenu(previousState => {
+          return { ...previousState,
+            mainMenu: updateObjectByID(previousState.mainMenu, item.id, item.onClick)
+          };
+        });
+      });
+    } catch (error) {
+      console.error('Error in setMenuOnClickCallback: ', error);
+    }
   };
 
+  useEffect(() => {
+    //Wait for the state to be updated then loop over the overrides to ensure they are properly applied
+    setOverrides();
+  }, [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') {
@@ -76,7 +129,10 @@ export const GenericDialogWindow = props => {
             return mm;
           }
         })]
-      });
+      }); // 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();
     }
   }, [appBarMenu, can_save, showSaveButton, save_button_label]); // -----------------------------------------
   // Note make sure to include disableEnforceFocus or else I'll have infinite error/warnings on Uncaught RangeError.
@@ -109,7 +165,8 @@ export const GenericDialogWindow = props => {
       setIsLoading,
       setSaveButtonLabel,
       closeDialog,
-      data: data
+      data: data,
+      setMenuOnClickCallback
     },
     ref: childRef
   }) : /*#__PURE__*/React.createElement(React.Fragment, null)))), /*#__PURE__*/React.createElement(DialogActions, {

package/package.json

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