Skip to content

Commit 2dbe8fe

Browse files
authored
Reincorporate iiif gallery component back into main application (#1472)
1 parent 5f06234 commit 2dbe8fe

File tree

10 files changed

+1071
-37
lines changed

10 files changed

+1071
-37
lines changed

β€Ž__tests__/test.jsβ€Ž

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,49 @@ describe("Universal Viewer", () => {
6767
expect(labelOverflowAfterToggle).toBe("visible");
6868
});
6969

70+
it("can toggle gallery view", async () => {
71+
// gallery view is not default view
72+
const galleryViewBeforeToggle = await page.evaluate(() => {
73+
const galleryViewOverlay = document.querySelector(
74+
".iiif-gallery-component .header"
75+
);
76+
return getComputedStyle(galleryViewOverlay).overflowX;
77+
});
78+
expect(galleryViewBeforeToggle).toBe("hidden");
79+
80+
// gallery toggle icon is visible
81+
await page.waitForSelector(".uv-icon-gallery");
82+
const galleryViewToggle = await page.evaluate(() => {
83+
const toggle = document.querySelector(".uv-icon-gallery");
84+
return getComputedStyle(toggle).overflowX;
85+
});
86+
expect(galleryViewToggle).toBe("visible");
87+
88+
// gallery view can be toggled on
89+
await page.evaluate(() => {
90+
document.querySelector(".uv-icon-gallery").click();
91+
});
92+
const galleryViewAfterToggle = await page.evaluate(() => {
93+
const galleryViewOverlay = document.querySelector(
94+
".iiif-gallery-component"
95+
);
96+
return getComputedStyle(galleryViewOverlay).overflowX;
97+
});
98+
expect(galleryViewAfterToggle).toBe("visible");
99+
100+
// gallery view can be toggled off
101+
await page.evaluate(() => {
102+
document.querySelector(".uv-icon-two-up").click();
103+
});
104+
const galleryViewAfterTwoUpToggle = await page.evaluate(() => {
105+
const galleryViewOverlay = document.querySelector(
106+
".iiif-gallery-component .header"
107+
);
108+
return getComputedStyle(galleryViewOverlay).overflowX;
109+
});
110+
expect(galleryViewAfterTwoUpToggle).toBe("hidden");
111+
});
112+
70113
it("settings button is visible", async () => {
71114
await page.waitForSelector(".btn.imageBtn.settings");
72115

β€Žpackage-lock.jsonβ€Ž

Lines changed: 5 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žpackage.jsonβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@
9898
},
9999
"dependencies": {
100100
"@edsilv/http-status-codes": "1.0.3",
101+
"@edsilv/jquery-plugins": "^1.0.9",
101102
"@edsilv/key-codes": "1.0.0",
102103
"@edsilv/utils": "^1.0.2",
103104
"@google/model-viewer": "^4.0.0",
104105
"@iiif/base-component": "2.0.1",
105106
"@iiif/iiif-av-component": "1.2.4",
106-
"@iiif/iiif-gallery-component": "^1.1.23",
107107
"@iiif/manifold": "^2.1.1",
108108
"@iiif/presentation-3": "^1.0.5",
109109
"@iiif/vocabulary": "^1.0.23",

β€Žsrc/content-handlers/iiif/modules/uv-contentleftpanel-module/GalleryView.tsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { IIIFEvents } from "../../IIIFEvents";
22
import { ContentLeftPanel } from "../../extensions/config/ContentLeftPanel";
33
import { BaseView } from "../uv-shared-module/BaseView";
4-
import { GalleryComponent } from "@iiif/iiif-gallery-component";
4+
import { GalleryComponent } from "../uv-shared-module/GalleryComponent";
55
import $ from "jquery";
66

77
export class GalleryView extends BaseView<ContentLeftPanel> {

β€Žsrc/content-handlers/iiif/modules/uv-contentleftpanel-module/css/styles.lessβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "@iiif/iiif-gallery-component/dist-css/styles.less";
1+
@import "../../uv-shared-module/css/iiif-gallery-component.less";
22
@import "../../uv-shared-module/css/iiif-tree-component.less";
33
@import "../../uv-shared-module/css/thumbs-view.less";
44

β€Žsrc/content-handlers/iiif/modules/uv-multiselectdialogue-module/MultiSelectDialogue.tsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Dialogue } from "../uv-shared-module/Dialogue";
44
import OpenSeadragonExtension from "../../extensions/uv-openseadragon-extension/Extension";
55
import { Mode } from "../../extensions/uv-openseadragon-extension/Mode";
66
import { Bools } from "@edsilv/utils";
7-
import { GalleryComponent } from "@iiif/iiif-gallery-component";
7+
import { GalleryComponent } from "../uv-shared-module/GalleryComponent";
88
// import { GalleryComponent } from "../../GalleryComponent";
99
import { MultiSelectState } from "@iiif/manifold";
1010
import { Config } from "../../extensions/uv-openseadragon-extension/config/Config";

0 commit comments

Comments
Β (0)