@linzjs/windows 1.5.0 → 1.5.2

package/dist/modal/Modal.tsx

@@ -34,6 +34,10 @@ export const Modal = ({ className, children }: PropsWithChildren<ModalProps>): R
       className={clsx("linzjs-windows-dialog", className)}
       ref={dialogRef}
       onClick={(e) => e.target === e.currentTarget && close()}
+      onCancel={(e) => {
+        e.preventDefault();
+        close();
+      }}
     >
       {children}
     </dialog>

package/dist/modal/ModalContextProvider.tsx

@@ -6,7 +6,7 @@ import { ModalInstanceContext } from "./ModalInstanceContext";
 import React, { Fragment, ReactNode } from "react";
 import { MutableRefObject, ReactElement, useCallback, useState } from "react";
 import { createPortal } from "react-dom";
-import { v4 as uuid } from "uuid";
+import { v4 as makeUuid } from "uuid";
 
 export interface ModalInstance {
   uuid: string;
@@ -72,14 +72,14 @@ export const ModalContextProvider = ({ children }: { children?: ReactNode | unde
    */
   const showModal = useCallback(
     async (ownerRef: MutableRefObject<HTMLElement | null>, Component: ComponentType, args: any): Promise<any> => {
-      let componentInstance: ReactElement | undefined;
+      const uuid = makeUuid();
       const promise = new Promise((resolve) => {
         try {
           // If there are any exceptions the modal won't show
-          setModals([
+          setModals((modals) => [
             ...modals,
             {
-              uuid: uuid(),
+              uuid,
               ownerElement: ownerRef.current ?? document.body,
               componentInstance: <Component {...args} resolve={resolve} close={() => resolve(undefined)} />,
               resolve,
@@ -95,11 +95,11 @@ export const ModalContextProvider = ({ children }: { children?: ReactNode | unde
       const result = await promise;
 
       // Close modal
-      setModals(modals.filter((e) => e.componentInstance !== componentInstance));
+      setModals((modals) => modals.filter((e) => e.uuid !== uuid));
 
       return result;
     },
-    [modals],
+    [],
   );
 
   const modalHasView = useCallback(

package/package.json

@@ -13,7 +13,7 @@
     "popout"
   ],
   "main": "./dist/index.ts",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "peerDependencies": {
     "@linzjs/lui": "^17",
     "lodash-es": ">=4",