@linzjs/windows 7.3.0 → 8.1.0

package/dist/panel/OpenPanelButton.tsx

@@ -9,11 +9,11 @@ interface OpenPanelButtonProps extends OpenPanelOptions {
 }
 
 export const OpenPanelButton = ({ buttonText, uniqueId = buttonText, ...openPanelOptions }: OpenPanelButtonProps) => {
-  const { openPanel, openPanels } = useContext(PanelsContext);
+  const { openPanel, hasOpenPanel } = useContext(PanelsContext);
 
   return (
     <button onClick={() => openPanel({ uniqueId, ...openPanelOptions })}>
-      Show {buttonText} {openPanels.has(buttonText) ? '(Open)' : ''}
+      Show {buttonText} {hasOpenPanel(buttonText) ? '(Open)' : ''}
     </button>
   );
 };

package/dist/panel/PanelInstanceContextProvider.tsx

@@ -37,25 +37,27 @@ export const PanelInstanceContextProvider = ({
 
   const undock = useCallback(() => setDockId(undefined), []);
 
+  const uniqueId = panelInstance.uniqueId;
+
   return (
     <PanelInstanceContext.Provider
       value={{
         title,
         setTitle,
-        uniqueId: panelInstance.uniqueId,
+        uniqueId,
         bounds,
-        panelName: panelInstance.uniqueId,
+        panelName: uniqueId,
         panelClose: () => {
           panelInstance.window?.close();
           panelInstance.window = null;
-          closePanel(panelInstance.uniqueId);
+          closePanel(uniqueId);
         },
         panelTogglePopout: togglePopOut,
         panelPoppedOut: poppedOut,
         setPanelWindow: (w: Window) => {
           panelInstance.window = w;
         },
-        bringPanelToFront: () => bringPanelToFront(panelInstance),
+        bringPanelToFront: () => bringPanelToFront(uniqueId),
         zIndex: panelInstance.zIndex,
         docked: !poppedOut && !!dockId && !!dockElements[dockId],
         dockId,

package/dist/panel/PanelsContext.tsx

@@ -21,10 +21,11 @@ export interface OpenPanelOptions {
 
 export interface PanelsContextType {
   openPanels: Set<string>;
+  hasOpenPanel: (panelId: string) => boolean;
   // returns unique id of panel that was created/or arleady found, otherwise null on error.
   openPanel: (args: OpenPanelOptions) => string | null;
   closePanel: (uniqueId: string) => void;
-  bringPanelToFront: (panelInstance: PanelInstance) => void;
+  bringPanelToFront: (panelUniqueId: string) => void;
   nextStackPosition: () => PanelPosition;
   dockElements: Record<string, HTMLDivElement>;
   setDockElement: (id: string, element: HTMLDivElement) => void;
@@ -38,6 +39,7 @@ const NoContext = <T,>(): T => {
 
 export const PanelsContext = createContext<PanelsContextType>({
   openPanels: new Set(),
+  hasOpenPanel: () => false,
   openPanel: NoContext,
   closePanel: NoContext,
   bringPanelToFront: NoContext,

package/dist/panel/PanelsContextProvider.tsx

@@ -50,7 +50,12 @@ export const PanelsContextProvider = ({
   );
 
   const bringPanelToFront = useCallback(
-    (panelInstance: PanelInstance) => {
+    (panelUniqueId: string) => {
+      const panelInstance = panelInstances.find((panelInstance) => panelInstance.uniqueId === panelUniqueId);
+      if (!panelInstance) {
+        console.warn(`bringPanelToFront cannot find panel with uniqueId: ${panelUniqueId}`);
+        return;
+      }
       if (panelInstance.window) {
         panelInstance.window.focus();
       } else {
@@ -74,7 +79,7 @@ export const PanelsContextProvider = ({
           if (existingPanelInstance.window) {
             existingPanelInstance.window?.focus();
           } else {
-            bringPanelToFront(existingPanelInstance);
+            bringPanelToFront(uniqueId);
           }
           return existingPanelInstance.uniqueId;
         }
@@ -100,9 +105,9 @@ export const PanelsContextProvider = ({
     [baseZIndex, bringPanelToFront, panelInstances],
   );
 
-  const closePanel = useCallback(
-    (closePanelUniqueIds: string | string[]) => {
-      const panelNames = castArray(closePanelUniqueIds);
+  const closePanel = useCallback((closePanelUniqueIds: string | string[]) => {
+    const panelNames = castArray(closePanelUniqueIds);
+    setPanelInstances((panelInstances) => {
       const [closedPanelInstances, stillOpenPanelInstances] = partition(panelInstances, (pi) =>
         panelNames.includes(pi.uniqueId),
       );
@@ -110,11 +115,11 @@ export const PanelsContextProvider = ({
         closedPanelInstances.forEach(({ onClose }) => {
           onClose?.();
         });
-        setPanelInstances(stillOpenPanelInstances);
+        return stillOpenPanelInstances;
       }
-    },
-    [panelInstances],
-  );
+      return panelInstances;
+    });
+  }, []);
 
   /**
    * It's not easy to tell the difference between a window closing and a window popping in via events,
@@ -139,10 +144,13 @@ export const PanelsContextProvider = ({
 
   const openPanels = useMemo(() => new Set(panelInstances.map((pi) => pi.uniqueId)), [panelInstances]);
 
+  const hasOpenPanel = useCallback((panelId: string): boolean => openPanels.has(panelId), [openPanels]);
+
   return (
     <PanelsContext.Provider
       value={{
         openPanels,
+        hasOpenPanel,
         openPanel,
         closePanel,
         bringPanelToFront,

package/package.json

@@ -13,7 +13,7 @@
     "popout"
   ],
   "main": "./dist/index.ts",
-  "version": "7.3.0",
+  "version": "8.1.0",
   "peerDependencies": {
     "@linzjs/lui": ">=21",
     "lodash-es": ">=4",