migrate(zustand): work through the type consequences of setting Store…

…Api to null.
UniversalViewer · Jan 14, 2025 · 0e8cd8e · 0e8cd8e
1 parent 7122963
commit 0e8cd8e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/src/content-handlers/iiif/extensions/uv-openseadragon-extension/Extension.ts b/src/content-handlers/iiif/extensions/uv-openseadragon-extension/Extension.ts
@@ -488,20 +488,23 @@ export default class OpenSeadragonExtension extends BaseExtension<Config> {
     this.extensionHost.subscribe(
       IIIFEvents.SHOW_DOWNLOAD_DIALOGUE,
       (triggerButton) => {
-        this.store.getState().openDownloadDialogue(triggerButton[0]);
+        const state = this.store.getState();
+        if (state !== null) {
+          state.openDownloadDialogue(triggerButton[0]);
+        }
       }
     );
 
     this.extensionHost.subscribe(IIIFEvents.HIDE_DOWNLOAD_DIALOGUE, () => {
-      this.store.getState().closeDialogue();
+      this.closeActiveDialogue();
     });
 
     this.extensionHost.subscribe(IIIFEvents.CLOSE_ACTIVE_DIALOGUE, () => {
-      this.store.getState().closeDialogue();
+      this.closeActiveDialogue();
     });
 
     this.extensionHost.subscribe(IIIFEvents.ESCAPE, () => {
-      this.store.getState().closeDialogue();
+      this.closeActiveDialogue();
     });
 
     // this.component.subscribe(Events.VIEW_PAGE, (e: any, index: number) => {
@@ -696,24 +699,31 @@ export default class OpenSeadragonExtension extends BaseExtension<Config> {
           );
         },
         onClose: () => {
-          this.store.getState().closeDialogue();
+          this.closeActiveDialogue();
         },
         onDownloadCurrentView: (canvas: Canvas) => {
           const viewer: any = this.getViewer();
           window.open(<string>this.getCroppedImageUri(canvas, viewer));
         },
         onDownloadSelection: () => {
-          this.store.getState().closeDialogue();
+          this.closeActiveDialogue();
           this.extensionHost.publish(IIIFEvents.SHOW_MULTISELECT_DIALOGUE);
         },
         onShowTermsOfUse: () => {
-          this.store.getState().closeDialogue();
+          this.closeActiveDialogue();
           this.extensionHost.publish(IIIFEvents.SHOW_TERMS_OF_USE);
         },
       })
     );
   }
 
+  closeActiveDialogue(): void {
+    const state = this.store.getState();
+    if (state !== null) {
+      state.closeDialogue();
+    }
+  }
+
   checkForTarget(): void {
     if (this.data.target) {
       // Split target into canvas id and selector

diff --git a/src/content-handlers/iiif/modules/uv-shared-module/BaseExtension.ts b/src/content-handlers/iiif/modules/uv-shared-module/BaseExtension.ts
@@ -75,7 +75,7 @@ export class BaseExtension<T extends BaseConfig> implements IExtension {
   restrictedDialogue: RestrictedDialogue;
   shell: Shell;
   shifted: boolean = false;
-  store: StoreApi<ExtensionState>;
+  store: StoreApi<ExtensionState | null>; // null for dispose()
   tabbing: boolean = false;
   browserDetect: BrowserDetect;
   locales = {};