grep-components 2.3.0-GREPF-2280.1 → 2.3.0-GREPF-2280.2

package/dist/build/components/NavGuard/stories/NavGuard.stories.d.ts

@@ -1,10 +1,29 @@
-import React from 'react';
+import * as React from 'react';
+export declare const v0colors: {
+    primary: string;
+    secondary: string;
+    body: string;
+    headerBackgroundColor: string;
+    borderColor: string;
+    primaryFade: string;
+    greyText: string;
+    placeholderText: string;
+    textColor: string;
+    textColorFade: string;
+    textColorMoreFade: string;
+    white: string;
+    lightGrey: string;
+};
 declare const _default: {
     title: string;
-    render: () => React.JSX.Element;
+    excludeStories: string[];
 };
 export default _default;
 export declare const Default: {
     (): React.JSX.Element;
     storyName: string;
 };
+export declare const WithAppBar: {
+    (): React.JSX.Element;
+    storyName: string;
+};

package/dist/index.js

@@ -19574,36 +19574,26 @@ const AppBar = ({ username, currentPath, isProd, appTitle, userMenuItems, menuIt
 
 const NavGuard = ({ when, title, txt, txtSave, txtCancel, txtDiscard, onSave, onCancel, onDiscard, }) => {
     const [open, setOpen] = React.useState(false);
-    const [leave, setLeave] = React.useState(false);
-    const [lastLocation, setLastLocation] = React.useState();
-    const navigate = useNavigate();
     const handleCancel = () => {
-        setLeave(false);
         setOpen(false);
         onCancel && onCancel();
     };
     const handleDiscard = () => {
-        setLeave(true);
         setOpen(false);
         onDiscard && onDiscard();
-        lastLocation && window.requestAnimationFrame(() => navigate(lastLocation));
+        blocker.proceed ? blocker.proceed() : null;
     };
     const handleSave = () => {
         onSave && onSave();
-        setLeave(true);
         setOpen(false);
-        lastLocation && window.requestAnimationFrame(() => navigate(lastLocation));
-    };
-    const handleLeave = (location) => {
-        setLastLocation(location);
-        setOpen(!leave);
-        return !!leave;
+        blocker.proceed ? blocker.proceed() : null;
     };
-    const blocker = useBlocker(({ currentLocation, nextLocation }) => {
-        if (when && currentLocation.pathname !== nextLocation.pathname)
-            handleLeave(nextLocation);
-        return currentLocation.pathname !== nextLocation.pathname;
-    });
+    const blocker = useBlocker(({ currentLocation, nextLocation }) => when && currentLocation.pathname !== nextLocation.pathname);
+    React.useEffect(() => {
+        if (blocker.state === 'blocked') {
+            setOpen(true);
+        }
+    }, [blocker]);
     return (React.createElement(React.Fragment, null, blocker.state === 'blocked' ? (React.createElement(Dialog, { open: open, "aria-labelledby": "alert-dialog-title", "aria-describedby": "alert-dialog-description" },
         React.createElement(DialogTitle, { id: "alert-dialog-title" }, title),
         React.createElement(DialogContent, null,