Merge branch 'dev' into fix-issue-917

LlGC-jop · Oct 31, 2024 · 20097f8 · 20097f8
2 parents 271bd31 + b98b70d
commit 20097f8
Show file tree

Hide file tree

Showing 23 changed files with 20,056 additions and 11,892 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -90,10 +90,10 @@
     "@google/model-viewer": "^1.9.2",
     "@iiif/base-component": "2.0.1",
     "@iiif/iiif-av-component": "1.2.4",
-    "@iiif/iiif-gallery-component": "^1.1.21",
+    "@iiif/iiif-gallery-component": "^1.1.22",
     "@iiif/iiif-metadata-component": "^1.1.19",
     "@iiif/iiif-tree-component": "2.0.6",
-    "@iiif/manifold": "2.0.31",
+    "@iiif/manifold": "2.1.0",
     "@iiif/presentation-3": "^1.0.5",
     "@iiif/vocabulary": "^1.0.23",
     "@openseadragon-imaging/openseadragon-viewerinputhook": "^2.2.1",
@@ -109,7 +109,7 @@
     "jquery": "3.5.0",
     "jsviews": "1.0.15",
     "less-plugin-clean-css": "^1.5.1",
-    "manifesto.js": "4.2.17",
+    "manifesto.js": "4.2.20",
     "mediaelement": "4.2.15",
     "mediaelement-plugins": "2.5.1",
     "openseadragon": "4.1.1",

diff --git a/src/content-handlers/iiif/BaseConfig.ts b/src/content-handlers/iiif/BaseConfig.ts
@@ -157,6 +157,7 @@ export type CenterPanelOptions = {
 export type CenterPanelContent = {
   attribution: string;
   close: string;
+  closeAttribution: string;
 };
 
 type CenterPanel = ModuleConfig & {

diff --git a/src/content-handlers/iiif/extensions/uv-aleph-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-aleph-extension/config/config.json
@@ -200,7 +200,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "alephCenterPanel": {
@@ -213,7 +214,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "settingsDialogue": {

diff --git a/src/content-handlers/iiif/extensions/uv-av-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-av-extension/config/config.json
@@ -227,7 +227,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "avCenterPanel": {
@@ -250,6 +251,7 @@
       "content": {
         "attribution": "$attribution",
         "close": "$close",
+        "closeAttribution": "$closeAttribution",
         "currentTime": "$currentTime",
         "delimiter": " - ",
         "duration": "$duration",

diff --git a/src/content-handlers/iiif/extensions/uv-default-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-default-extension/config/config.json
@@ -94,7 +94,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "fileLinkCenterPanel": {
@@ -106,7 +107,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "footerPanel": {

diff --git a/src/content-handlers/iiif/extensions/uv-ebook-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-ebook-extension/config/config.json
@@ -196,7 +196,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "ebookCenterPanel": {
@@ -208,7 +209,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "settingsDialogue": {

diff --git a/src/content-handlers/iiif/extensions/uv-mediaelement-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-mediaelement-extension/config/config.json
@@ -154,7 +154,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "mediaelementCenterPanel": {
@@ -169,7 +170,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "restrictedDialogue": {

diff --git a/src/content-handlers/iiif/extensions/uv-model-viewer-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-model-viewer-extension/config/config.json
@@ -245,7 +245,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "modelViewerCenterPanel": {
@@ -262,6 +263,7 @@
       "content": {
         "attribution": "$attribution",
         "close": "$close",
+        "closeAttribution": "$closeAttribution",
         "zoomIn": "$zoomIn",
         "zoomOut": "$zoomOut",
         "vr": "$vr"

diff --git a/src/content-handlers/iiif/extensions/uv-openseadragon-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-openseadragon-extension/config/config.json
@@ -334,7 +334,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "openSeadragonCenterPanel": {
@@ -365,6 +366,7 @@
       "content": {
         "attribution": "$attribution",
         "close": "$close",
+        "closeAttribution": "$closeAttribution",
         "goHome": "$goHome",
         "imageUnavailable": "$imageUnavailable",
         "next": "$next",

diff --git a/src/content-handlers/iiif/extensions/uv-pdf-extension/config/config.json b/src/content-handlers/iiif/extensions/uv-pdf-extension/config/config.json
@@ -186,7 +186,8 @@
       },
       "content": {
         "attribution": "$attribution",
-        "close": "$close"
+        "close": "$close",
+        "closeAttribution": "$closeAttribution"
       }
     },
     "pdfCenterPanel": {
@@ -200,6 +201,7 @@
       "content": {
         "attribution": "$attribution",
         "close": "$close",
+        "closeAttribution": "$closeAttribution",
         "next": "$next",     
         "previous": "$previous"
       }

diff --git a/src/content-handlers/iiif/modules/uv-dialogues-module/MoreInfoDialogue.ts b/src/content-handlers/iiif/modules/uv-dialogues-module/MoreInfoDialogue.ts
@@ -49,7 +49,7 @@ export class MoreInfoDialogue extends Dialogue<
     );
     this.$content.append(this.$title);
 
-    this.$metadata = $('<div class="iiif-metadata-component"></div>');
+    this.$metadata = $('<article class="iiif-metadata-component"></article>');
     this.$content.append(this.$metadata);
 
     this.metadataComponent = new MetadataComponent({
@@ -98,5 +98,18 @@ export class MoreInfoDialogue extends Dialogue<
 
   resize(): void {
     this.setDockedPosition();
+
+    // always put tabindex on, so the metadata is focusable, 
+    // just in case there's something wrong with the height
+    // comparison below
+    this.$metadata.attr('tabindex', 0);
+    this.$metadata.attr('aria-label', this.config.content.title);
+
+    // if metadata's first group's height is lte than metadata (200px fixed I think), 
+    // there's no scroll happening, so no focus needed, and no aria label either
+    if(this.$metadata.find('.groups').first().height() <= this.$metadata.height()) {
+      this.$metadata.removeAttr('tabindex');
+      this.$metadata.removeAttr('aria-label');
+    }
   }
 }
diff --git a/src/content-handlers/iiif/modules/uv-moreinforightpanel-module/MoreInfoRightPanel.ts b/src/content-handlers/iiif/modules/uv-moreinforightpanel-module/MoreInfoRightPanel.ts
@@ -33,7 +33,7 @@ export class MoreInfoRightPanel extends RightPanel<MoreInfoRightPanelConfig> {
 
     this.setTitle(this.config.content.title);
 
-    this.$metadata = $('<div class="iiif-metadata-component"></div>');
+    this.$metadata = $('<article class="iiif-metadata-component"></article>');
     this.$main.append(this.$metadata);
 
     this.metadataComponent = new MetadataComponent({
@@ -141,5 +141,18 @@ export class MoreInfoRightPanel extends RightPanel<MoreInfoRightPanelConfig> {
     this.$main.height(
       this.$element.height() - this.$top.height() - this.$main.verticalMargins()
     );
+
+    // always put tabindex on, so the main is focusable, 
+    // just in case there's something wrong with the height
+    // comparison below
+    this.$main.attr('tabindex', 0);
+    this.$main.attr('aria-label', this.config.content.title);
+
+    // if metadata's height lte main's, no scroll, so no focus needed
+    // and no aria label either
+    if(this.$metadata.height() <= this.$main.height()) {
+      this.$main.removeAttr('tabindex');
+      this.$main.removeAttr('aria-label');
+    }
   }
 }
diff --git a/...tent-handlers/iiif/modules/uv-openseadragoncenterpanel-module/OpenSeadragonCenterPanel.ts b/...tent-handlers/iiif/modules/uv-openseadragoncenterpanel-module/OpenSeadragonCenterPanel.ts
@@ -198,7 +198,7 @@ export class OpenSeadragonCenterPanel extends CenterPanel<
 
   updateResponsiveView(): void {
     this.setNavigatorVisible();
-    this.viewer.autoHideControls = true;
+    this.viewer.autoHideControls = this.extension.isDesktopMetric();
 
     const enableAutoHide = (event: JQuery.FocusOutEvent) => {
       this.viewer.autoHideControls = true;
@@ -360,40 +360,52 @@ export class OpenSeadragonCenterPanel extends CenterPanel<
       ],
     });
 
-    this.$zoomInButton = this.$viewer.find('div[title="Zoom in"]');
+    let $oldZoomIn = this.$viewer.find('div[title="Zoom in"]');
+    this.$zoomInButton = $("<button />").append($oldZoomIn.contents());
+    this.$zoomInButton.insertAfter($oldZoomIn);
+    $oldZoomIn.remove();
     this.$zoomInButton.attr("tabindex", 0);
-    this.$zoomInButton.prop("title", this.content.zoomIn);
-    this.$zoomInButton.prop("aria-label", this.content.zoomIn);
+    this.$zoomInButton.attr("title", this.content.zoomIn);
+    this.$zoomInButton.attr("aria-label", this.content.zoomIn);
     this.$zoomInButton.addClass("zoomIn viewportNavButton");
 
     this.onAccessibleClick(this.$zoomInButton, () => {
       this.zoomIn();
     });
 
-    this.$zoomOutButton = this.$viewer.find('div[title="Zoom out"]');
+    let $oldZoomOut = this.$viewer.find('div[title="Zoom out"]');
+    this.$zoomOutButton = $("<button />").append($oldZoomOut.contents());
+    this.$zoomOutButton.insertAfter($oldZoomOut);
+    $oldZoomIn.remove();
     this.$zoomOutButton.attr("tabindex", 0);
-    this.$zoomOutButton.prop("title", this.content.zoomOut);
-    this.$zoomOutButton.prop("aria-label", this.content.zoomOut);
+    this.$zoomOutButton.attr("title", this.content.zoomOut);
+    this.$zoomOutButton.attr("aria-label", this.content.zoomOut);
     this.$zoomOutButton.addClass("zoomOut viewportNavButton");
 
     this.onAccessibleClick(this.$zoomOutButton, () => {
       this.zoomOut();
     });
 
-    this.$goHomeButton = this.$viewer.find('div[title="Go home"]');
+    let $oldGoHome = this.$viewer.find('div[title="Go home"]');
+    this.$goHomeButton = $("<button />").append($oldGoHome.contents());
+    this.$goHomeButton.insertAfter($oldGoHome);
+    $oldGoHome.remove();
     this.$goHomeButton.attr("tabindex", 0);
-    this.$goHomeButton.prop("title", this.content.goHome);
-    this.$goHomeButton.prop("aria-label", this.content.goHome);
+    this.$goHomeButton.attr("title", this.content.goHome);
+    this.$goHomeButton.attr("aria-label", this.content.goHome);
     this.$goHomeButton.addClass("goHome viewportNavButton");
 
     this.onAccessibleClick(this.$goHomeButton, () => {
       this.goHome();
     });
 
-    this.$rotateButton = this.$viewer.find('div[title="Rotate right"]');
+    let $oldRotate = this.$viewer.find('div[title="Rotate right"]');
+    this.$rotateButton = $("<button />").append($oldRotate.contents());
+    this.$rotateButton.insertAfter($oldRotate);
+    $oldRotate.remove();
     this.$rotateButton.attr("tabindex", 0);
-    this.$rotateButton.prop("title", this.content.rotateRight);
-    this.$rotateButton.prop("aria-label", this.content.rotateRight);
+    this.$rotateButton.attr("title", this.content.rotateRight);
+    this.$rotateButton.attr("aria-label", this.content.rotateRight);
     this.$rotateButton.addClass("rotate viewportNavButton");
 
     this.onAccessibleClick(this.$rotateButton, () => {
@@ -402,8 +414,10 @@ export class OpenSeadragonCenterPanel extends CenterPanel<
 
     if (this.showAdjustImageButton) {
       this.$adjustImageButton = this.$rotateButton.clone();
-      this.$adjustImageButton.prop('title', this.content.adjustImage);
+      this.$adjustImageButton.attr('title', this.content.adjustImage);
+      this.$adjustImageButton.attr('aria-label', this.content.adjustImage);
       this.$adjustImageButton.switchClass('rotate', 'adjustImage');
+      this.$adjustImageButton.attr('tabindex', 0);
       this.$adjustImageButton.onPressed(() => {
         this.extensionHost.publish(IIIFEvents.SHOW_ADJUSTIMAGE_DIALOGUE);
       });
@@ -414,6 +428,22 @@ export class OpenSeadragonCenterPanel extends CenterPanel<
       });
     }
 
+    this.$zoomInButton
+      .add(this.$zoomOutButton)
+      .add(this.$goHomeButton)
+      .add(this.$rotateButton)
+      .add(this.$adjustImageButton).on('focus', () => {
+        if (this.controlsVisible) return;
+        this.controlsVisible = true;
+        this.viewer.setControlsEnabled(true);
+      });
+
+    this.$zoomInButton.add(this.$adjustImageButton).on('blur', () => {
+      if (!this.controlsVisible) return;
+      this.controlsVisible = false;
+      this.viewer.setControlsEnabled(false);
+    });
+
     this.$viewportNavButtonsContainer = this.$viewer.find(
       ".openseadragon-container > div:not(.openseadragon-canvas):first"
     );
@@ -622,16 +652,16 @@ export class OpenSeadragonCenterPanel extends CenterPanel<
     });
 
     // When Prev/Next buttons are focused, make sure the controls are enabled
-    this.$prevButton.on("focus", () => {
+    this.$prevButton.add(this.$nextButton).on("focus", () => {
       if (this.controlsVisible) return;
       this.controlsVisible = true;
       this.viewer.setControlsEnabled(true);
     });
 
-    this.$nextButton.on("focus", () => {
-      if (this.controlsVisible) return;
-      this.controlsVisible = true;
-      this.viewer.setControlsEnabled(true);
+    this.$prevButton.add(this.$nextButton).on("blur", () => {
+      if (!this.controlsVisible) return;
+      this.controlsVisible = false;
+      this.viewer.setControlsEnabled(false);
     });
   }
 

diff --git a/src/content-handlers/iiif/modules/uv-shared-module/CenterPanel.ts b/src/content-handlers/iiif/modules/uv-shared-module/CenterPanel.ts
@@ -73,7 +73,7 @@ export class CenterPanel<
     this.closeAttribution();
 
     this.$closeAttributionButton = this.$attribution.find(".header .close");
-    this.$closeAttributionButton.attr("aria-label", this.content.close);
+    this.$closeAttributionButton.attr("aria-label", this.content.closeAttribution);
     this.$closeAttributionButton.on("click", (e) => {
       e.preventDefault();
       this.closeAttribution();