From 9165cc1efcf7791f78b61b2c51a9de651b1b09aa Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 2 Jul 2021 22:53:16 +0200
Subject: viewer: types normalization - gallery.d.ts

GitHub: closes #301
---
 viewer/src/components/LdBreadcrumb.vue             |   7 +-
 viewer/src/components/LdCommand.vue                |   5 +-
 viewer/src/components/LdCommandSort.vue            |   2 +-
 viewer/src/components/LdGallery.vue                |   6 +-
 viewer/src/components/LdInformation.vue            |   5 +-
 viewer/src/components/LdKeyPress.vue               |   2 +-
 viewer/src/components/LdProposition.vue            |   9 +-
 viewer/src/components/LdTagInput.vue               |   4 +-
 viewer/src/components/LdThumbnail.vue              |   5 +-
 viewer/src/components/LdTitle.vue                  |   5 +-
 .../src/components/item_handlers/LdAudioViewer.vue |   5 +-
 .../src/components/item_handlers/LdDirectory.vue   |  42 -------
 .../components/item_handlers/LdDirectoryViewer.vue |  43 +++++++
 viewer/src/components/item_handlers/LdDownload.vue |  57 ---------
 .../components/item_handlers/LdDownloadViewer.vue  |  58 ++++++++++
 .../src/components/item_handlers/LdPdfViewer.vue   |   3 +-
 viewer/src/components/item_handlers/LdPicture.vue  | 127 --------------------
 .../components/item_handlers/LdPictureViewer.vue   | 128 +++++++++++++++++++++
 .../components/item_handlers/LdPlainTextViewer.vue |   3 +-
 .../src/components/item_handlers/LdVideoViewer.vue |   3 +-
 20 files changed, 265 insertions(+), 254 deletions(-)
 delete mode 100644 viewer/src/components/item_handlers/LdDirectory.vue
 create mode 100644 viewer/src/components/item_handlers/LdDirectoryViewer.vue
 delete mode 100644 viewer/src/components/item_handlers/LdDownload.vue
 create mode 100644 viewer/src/components/item_handlers/LdDownloadViewer.vue
 delete mode 100644 viewer/src/components/item_handlers/LdPicture.vue
 create mode 100644 viewer/src/components/item_handlers/LdPictureViewer.vue

(limited to 'viewer/src/components')

diff --git a/viewer/src/components/LdBreadcrumb.vue b/viewer/src/components/LdBreadcrumb.vue
index 618b15a..2c17554 100644
--- a/viewer/src/components/LdBreadcrumb.vue
+++ b/viewer/src/components/LdBreadcrumb.vue
@@ -47,13 +47,14 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Ref, Watch, Prop } from "vue-property-decorator";
+import { Item } from "@/@types/gallery";
 import DragScrollClickFix from "@/services/dragscrollclickfix";
 import Navigation from "@/services/navigation";
+import { Component, Prop, Ref, Vue, Watch } from "vue-property-decorator";
 
 @Component
 export default class LdBreadcrumb extends Vue {
-  @Prop({ type: Array, required: true }) readonly currentItemPath!: Gallery.Item[];
+  @Prop({ type: Array, required: true }) readonly currentItemPath!: Item[];
   @Prop(Boolean) readonly searchMode!: boolean;
   @Ref() readonly breadcrumb!: HTMLUListElement;
 
@@ -82,7 +83,7 @@ export default class LdBreadcrumb extends Vue {
     });
   }
 
-  getIcon(item: Gallery.Item) {
+  getIcon(item: Item) {
     return Navigation.getIcon(item);
   }
 }
diff --git a/viewer/src/components/LdCommand.vue b/viewer/src/components/LdCommand.vue
index 5ba8266..7ffa670 100644
--- a/viewer/src/components/LdCommand.vue
+++ b/viewer/src/components/LdCommand.vue
@@ -40,12 +40,13 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
+import { Item } from "@/@types/gallery";
+import { Component, Prop, Vue } from "vue-property-decorator";
 import { RawLocation } from "vue-router";
 
 @Component
 export default class LdCommand extends Vue {
-  @Prop({ type: Array, required: true }) readonly currentItemPath!: Gallery.Item[];
+  @Prop({ type: Array, required: true }) readonly currentItemPath!: Item[];
 
   get commandToggleSearchPanelIcon(): string {
     return this.$uiStore.fullWidth ? "search" : "angle-double-left";
diff --git a/viewer/src/components/LdCommandSort.vue b/viewer/src/components/LdCommandSort.vue
index 4c246e6..c8a822e 100644
--- a/viewer/src/components/LdCommandSort.vue
+++ b/viewer/src/components/LdCommandSort.vue
@@ -32,8 +32,8 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
 import ItemComparators, { ItemSort } from "@/services/itemComparators";
+import { Component, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdCommandSort extends Vue {
diff --git a/viewer/src/components/LdGallery.vue b/viewer/src/components/LdGallery.vue
index edd479c..1443927 100644
--- a/viewer/src/components/LdGallery.vue
+++ b/viewer/src/components/LdGallery.vue
@@ -27,12 +27,12 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, Model } from "vue-property-decorator";
-import DragScrollClickFix from "@/services/dragscrollclickfix";
+import { Item } from "@/@types/gallery";
+import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdPicture extends Vue {
-  @Prop({ type: Array, required: true }) readonly items!: Gallery.Item[];
+  @Prop({ type: Array, required: true }) readonly items!: Item[];
   @Prop(String) readonly noresult?: string;
 
   get sortedItems() {
diff --git a/viewer/src/components/LdInformation.vue b/viewer/src/components/LdInformation.vue
index 66ccc80..b161485 100644
--- a/viewer/src/components/LdInformation.vue
+++ b/viewer/src/components/LdInformation.vue
@@ -26,12 +26,13 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
+import { Item } from "@/@types/gallery";
 import marked from "marked";
+import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdInformation extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Item;
+  @Prop({ required: true }) readonly item!: Item;
 
   get formatDate() {
     const date = this.item.datetime.substr(0, 10);
diff --git a/viewer/src/components/LdKeyPress.vue b/viewer/src/components/LdKeyPress.vue
index c507b33..151d6c6 100644
--- a/viewer/src/components/LdKeyPress.vue
+++ b/viewer/src/components/LdKeyPress.vue
@@ -18,7 +18,7 @@
 -->
 
 <script lang="ts">
-import { Component, Vue, Prop, Emit } from "vue-property-decorator";
+import { Component, Emit, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdKeyPress extends Vue {
diff --git a/viewer/src/components/LdProposition.vue b/viewer/src/components/LdProposition.vue
index aa44943..2396d1f 100644
--- a/viewer/src/components/LdProposition.vue
+++ b/viewer/src/components/LdProposition.vue
@@ -54,8 +54,9 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, PropSync, Watch } from "vue-property-decorator";
+import { Item, RawTag } from "@/@types/gallery";
 import { Operation } from "@/@types/Operation";
+import { Component, Prop, PropSync, Vue, Watch } from "vue-property-decorator";
 
 @Component
 export default class LdProposition extends Vue {
@@ -118,16 +119,16 @@ export default class LdProposition extends Vue {
     return this.category?.tag ?? this.$t("panelLeft.propositions.other");
   }
 
-  extractDistinctItems(currentTags: Tag.Search[]): Gallery.Item[] {
+  extractDistinctItems(currentTags: Tag.Search[]): Item[] {
     return [...new Set(currentTags.flatMap(tag => tag.items))];
   }
 
-  rightmost(tag: Gallery.RawTag): Gallery.RawTag {
+  rightmost(tag: RawTag): RawTag {
     const dot = tag.lastIndexOf(":");
     return dot <= 0 ? tag : tag.substr(dot + 1);
   }
 
-  add(operation: Operation, rawTag: Gallery.RawTag) {
+  add(operation: Operation, rawTag: RawTag) {
     const node = this.tagsIndex[rawTag];
     const display = this.category ? `${operation}${this.category.tag}:${node.tag}` : `${operation}${node.tag}`;
     this.model.push({ ...node, parent: this.category, operation, display });
diff --git a/viewer/src/components/LdTagInput.vue b/viewer/src/components/LdTagInput.vue
index ce83ba8..ef585f0 100644
--- a/viewer/src/components/LdTagInput.vue
+++ b/viewer/src/components/LdTagInput.vue
@@ -40,10 +40,8 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, PropSync, Emit } from "vue-property-decorator";
-import { Operation } from "@/@types/Operation";
-import Navigation from "@/services/navigation";
 import IndexFactory from "@/services/indexfactory";
+import { Component, Emit, Prop, PropSync, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdTagInput extends Vue {
diff --git a/viewer/src/components/LdThumbnail.vue b/viewer/src/components/LdThumbnail.vue
index 5b1bc82..3f67a43 100644
--- a/viewer/src/components/LdThumbnail.vue
+++ b/viewer/src/components/LdThumbnail.vue
@@ -37,12 +37,13 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
+import { Item } from "@/@types/gallery";
 import Navigation from "@/services/navigation";
+import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdThumbnail extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Item;
+  @Prop({ required: true }) readonly item!: Item;
 
   loading: boolean = false;
 
diff --git a/viewer/src/components/LdTitle.vue b/viewer/src/components/LdTitle.vue
index 074008d..e1d47d1 100644
--- a/viewer/src/components/LdTitle.vue
+++ b/viewer/src/components/LdTitle.vue
@@ -18,12 +18,13 @@
 -->
 
 <script lang="ts">
-import { Component, Vue, Watch, Prop } from "vue-property-decorator";
+import { Item } from "@/@types/gallery";
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 
 @Component
 export default class LdTitle extends Vue {
   @Prop({ required: true }) readonly galleryTitle!: string;
-  @Prop() readonly currentItem?: Gallery.Item;
+  @Prop() readonly currentItem?: Item;
 
   render() {
     return null;
diff --git a/viewer/src/components/item_handlers/LdAudioViewer.vue b/viewer/src/components/item_handlers/LdAudioViewer.vue
index 2e0f8dc..559b10a 100644
--- a/viewer/src/components/item_handlers/LdAudioViewer.vue
+++ b/viewer/src/components/item_handlers/LdAudioViewer.vue
@@ -28,12 +28,13 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from "vue-property-decorator";
+import { AudioItem } from "@/@types/gallery";
 import Navigation from "@/services/navigation";
+import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdAudioViewer extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Audio;
+  @Prop({ required: true }) readonly item!: AudioItem;
 
   get itemResourceUrl(): string {
     return this.$galleryStore.resourceRoot + this.item.properties.resource;
diff --git a/viewer/src/components/item_handlers/LdDirectory.vue b/viewer/src/components/item_handlers/LdDirectory.vue
deleted file mode 100644
index eec8011..0000000
--- a/viewer/src/components/item_handlers/LdDirectory.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- ldgallery - A static generator which turns a collection of tagged
---             pictures into a searchable web gallery.
---
--- Copyright (C) 2019-2020  Guillaume FOUET
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<template>
-  <ld-gallery :items="orderedItems" :noresult="$t('directory.no-results')" />
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
-import Navigation from "@/services/navigation";
-
-@Component
-export default class LdDirectory extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Directory;
-
-  mounted() {
-    this.$uiStore.toggleFullscreen(false);
-  }
-
-  get orderedItems() {
-    return Navigation.directoriesFirst(this.item.properties.items);
-  }
-}
-</script>
-
-<style lang="scss"></style>
diff --git a/viewer/src/components/item_handlers/LdDirectoryViewer.vue b/viewer/src/components/item_handlers/LdDirectoryViewer.vue
new file mode 100644
index 0000000..7440f54
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdDirectoryViewer.vue
@@ -0,0 +1,43 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2020  Guillaume FOUET
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <ld-gallery :items="orderedItems" :noresult="$t('directory.no-results')" />
+</template>
+
+<script lang="ts">
+import { DirectoryItem } from "@/@types/gallery";
+import Navigation from "@/services/navigation";
+import { Component, Prop, Vue } from "vue-property-decorator";
+
+@Component
+export default class LdDirectoryViewer extends Vue {
+  @Prop({ required: true }) readonly item!: DirectoryItem;
+
+  mounted() {
+    this.$uiStore.toggleFullscreen(false);
+  }
+
+  get orderedItems() {
+    return Navigation.directoriesFirst(this.item.properties.items);
+  }
+}
+</script>
+
+<style lang="scss"></style>
diff --git a/viewer/src/components/item_handlers/LdDownload.vue b/viewer/src/components/item_handlers/LdDownload.vue
deleted file mode 100644
index 7b09dab..0000000
--- a/viewer/src/components/item_handlers/LdDownload.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--
--- ldgallery - A static generator which turns a collection of tagged
---             pictures into a searchable web gallery.
---
--- Copyright (C) 2020  Pacien TRAN-GIRARD
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<template>
-  <div class="container-vh-centering">
-    <a :class="$style.content" :download="itemFileName" :href="itemDownloadUrl">
-      <!-- TODO: show thumbnail instead of this generic file download icon? -->
-      <fa-icon :class="$style.icon" icon="file-download" size="6x" />
-      <div>{{ $t("download.download-file-fmt", [itemFileName]) }}</div>
-    </a>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue } from "vue-property-decorator";
-import Navigation from "@/services/navigation";
-
-@Component
-export default class LdDownload extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Other;
-
-  get itemFileName(): string {
-    return Navigation.getFileName(this.item);
-  }
-
-  get itemDownloadUrl(): string {
-    return this.$galleryStore.resourceRoot + this.item.properties.resource;
-  }
-}
-</script>
-
-<style lang="scss" module>
-.content {
-  text-align: center;
-}
-
-.icon {
-  margin-bottom: 0.15em;
-}
-</style>
diff --git a/viewer/src/components/item_handlers/LdDownloadViewer.vue b/viewer/src/components/item_handlers/LdDownloadViewer.vue
new file mode 100644
index 0000000..60c7c49
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdDownloadViewer.vue
@@ -0,0 +1,58 @@
+<!--
+-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2020  Pacien TRAN-GIRARD
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <div class="container-vh-centering">
+    <a :class="$style.content" :download="itemFileName" :href="itemDownloadUrl">
+      <!-- TODO: show thumbnail instead of this generic file download icon? -->
+      <fa-icon :class="$style.icon" icon="file-download" size="6x" />
+      <div>{{ $t("download.download-file-fmt", [itemFileName]) }}</div>
+    </a>
+  </div>
+</template>
+
+<script lang="ts">
+import { OtherItem } from "@/@types/gallery";
+import Navigation from "@/services/navigation";
+import { Component, Prop, Vue } from "vue-property-decorator";
+
+@Component
+export default class LdDownloadViewer extends Vue {
+  @Prop({ required: true }) readonly item!: OtherItem;
+
+  get itemFileName(): string {
+    return Navigation.getFileName(this.item);
+  }
+
+  get itemDownloadUrl(): string {
+    return this.$galleryStore.resourceRoot + this.item.properties.resource;
+  }
+}
+</script>
+
+<style lang="scss" module>
+.content {
+  text-align: center;
+}
+
+.icon {
+  margin-bottom: 0.15em;
+}
+</style>
diff --git a/viewer/src/components/item_handlers/LdPdfViewer.vue b/viewer/src/components/item_handlers/LdPdfViewer.vue
index 462c463..e55989a 100644
--- a/viewer/src/components/item_handlers/LdPdfViewer.vue
+++ b/viewer/src/components/item_handlers/LdPdfViewer.vue
@@ -30,11 +30,12 @@
 </template>
 
 <script lang="ts">
+import { PDFItem } from "@/@types/gallery";
 import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdPdfViewer extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.PDF;
+  @Prop({ required: true }) readonly item!: PDFItem;
 
   get itemResourceUrl(): string {
     return this.$galleryStore.resourceRoot + this.item.properties.resource;
diff --git a/viewer/src/components/item_handlers/LdPicture.vue b/viewer/src/components/item_handlers/LdPicture.vue
deleted file mode 100644
index e652afc..0000000
--- a/viewer/src/components/item_handlers/LdPicture.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-<!-- ldgallery - A static generator which turns a collection of tagged
---             pictures into a searchable web gallery.
---
--- Copyright (C) 2019-2020  Guillaume FOUET
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<template>
-  <!-- FIXME: v-dragscroll interferes with pinch-to-zoom -->
-  <div
-    ref="containerElement"
-    v-dragscroll
-    class="scrollbar ld-picture-container"
-    @click.capture="e => dragScrollClickFix.onClickCapture(e)"
-    @dblclick="$uiStore.toggleFullscreen()"
-    @dragstart.prevent
-    @dragscrollstart="dragScrollClickFix.onDragScrollStart()"
-    @dragscrollend="dragScrollClickFix.onDragScrollEnd()"
-  >
-    <v-lazy-image
-      ref="imageElement"
-      :src="pictureSrc(item.properties.resource)"
-      class="ld-picture-element"
-      :class="{ 'slow-loading': Boolean(slowLoadingStyle) }"
-      :style="slowLoadingStyle"
-      @load="clearSlowLoading"
-    />
-    <b-loading :active="loader" :is-full-page="false" class="ld-picture-loader" />
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop, Ref } from "vue-property-decorator";
-import LdZoom from "@/services/ldzoom";
-import DragScrollClickFix from "@/services/dragscrollclickfix";
-
-@Component
-export default class LdPicture extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Picture;
-  @Ref() readonly containerElement!: HTMLDivElement;
-  @Ref() readonly imageElement!: Vue;
-
-  readonly SLOW_LOADING_TIMEOUT_MS: number = 1500;
-  readonly dragScrollClickFix = new DragScrollClickFix();
-
-  slowLoadingStyle: string | null = null;
-  loader: boolean = false;
-  timer: NodeJS.Timeout | null = null;
-
-  mounted() {
-    this.timer = setTimeout(this.generateSlowLoadingStyle, this.SLOW_LOADING_TIMEOUT_MS);
-    new LdZoom(
-      this.containerElement,
-      this.imageElement.$el as HTMLImageElement,
-      this.item.properties,
-      10,
-      1 / 5
-    ).install();
-  }
-
-  destroyed() {
-    this.clearSlowLoading();
-  }
-
-  clearSlowLoading() {
-    if (this.timer) clearTimeout(this.timer);
-    this.timer = null;
-    this.slowLoadingStyle = null;
-    this.loader = false;
-  }
-
-  pictureSrc(resource: string) {
-    return this.$galleryStore.resourceRoot + resource;
-  }
-
-  generateSlowLoadingStyle() {
-    this.clearSlowLoading();
-    this.loader = true;
-    if (this.item.thumbnail) {
-      const url = this.pictureSrc(this.item.thumbnail.resource);
-      this.slowLoadingStyle = `background-image: url('${url}');`;
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-@import "~@/assets/scss/theme.scss";
-
-.ld-picture-container {
-  height: 100%;
-}
-
-.ld-picture-element {
-  max-width: unset;
-  max-height: unset;
-  cursor: grab;
-}
-
-.slow-loading {
-  background-repeat: no-repeat;
-  background-position: center;
-  background-size: contain;
-  background-color: $content-bgcolor;
-  background-blend-mode: soft-light;
-  opacity: 1 !important;
-}
-
-.ld-picture-loader {
-  position: relative;
-  & .loading-background {
-    background: none !important;
-  }
-}
-</style>
diff --git a/viewer/src/components/item_handlers/LdPictureViewer.vue b/viewer/src/components/item_handlers/LdPictureViewer.vue
new file mode 100644
index 0000000..003ffe9
--- /dev/null
+++ b/viewer/src/components/item_handlers/LdPictureViewer.vue
@@ -0,0 +1,128 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2020  Guillaume FOUET
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <!-- FIXME: v-dragscroll interferes with pinch-to-zoom -->
+  <div
+    ref="containerElement"
+    v-dragscroll
+    class="scrollbar ld-picture-container"
+    @click.capture="e => dragScrollClickFix.onClickCapture(e)"
+    @dblclick="$uiStore.toggleFullscreen()"
+    @dragstart.prevent
+    @dragscrollstart="dragScrollClickFix.onDragScrollStart()"
+    @dragscrollend="dragScrollClickFix.onDragScrollEnd()"
+  >
+    <v-lazy-image
+      ref="imageElement"
+      :src="pictureSrc(item.properties.resource)"
+      class="ld-picture-element"
+      :class="{ 'slow-loading': Boolean(slowLoadingStyle) }"
+      :style="slowLoadingStyle"
+      @load="clearSlowLoading"
+    />
+    <b-loading :active="loader" :is-full-page="false" class="ld-picture-loader" />
+  </div>
+</template>
+
+<script lang="ts">
+import { PictureItem } from "@/@types/gallery";
+import DragScrollClickFix from "@/services/dragscrollclickfix";
+import LdZoom from "@/services/ldzoom";
+import { Component, Prop, Ref, Vue } from "vue-property-decorator";
+
+@Component
+export default class LdPictureViewer extends Vue {
+  @Prop({ required: true }) readonly item!: PictureItem;
+  @Ref() readonly containerElement!: HTMLDivElement;
+  @Ref() readonly imageElement!: Vue;
+
+  readonly SLOW_LOADING_TIMEOUT_MS: number = 1500;
+  readonly dragScrollClickFix = new DragScrollClickFix();
+
+  slowLoadingStyle: string | null = null;
+  loader: boolean = false;
+  timer: NodeJS.Timeout | null = null;
+
+  mounted() {
+    this.timer = setTimeout(this.generateSlowLoadingStyle, this.SLOW_LOADING_TIMEOUT_MS);
+    new LdZoom(
+      this.containerElement,
+      this.imageElement.$el as HTMLImageElement,
+      this.item.properties,
+      10,
+      1 / 5
+    ).install();
+  }
+
+  destroyed() {
+    this.clearSlowLoading();
+  }
+
+  clearSlowLoading() {
+    if (this.timer) clearTimeout(this.timer);
+    this.timer = null;
+    this.slowLoadingStyle = null;
+    this.loader = false;
+  }
+
+  pictureSrc(resource: string) {
+    return this.$galleryStore.resourceRoot + resource;
+  }
+
+  generateSlowLoadingStyle() {
+    this.clearSlowLoading();
+    this.loader = true;
+    if (this.item.thumbnail) {
+      const url = this.pictureSrc(this.item.thumbnail.resource);
+      this.slowLoadingStyle = `background-image: url('${url}');`;
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import "~@/assets/scss/theme.scss";
+
+.ld-picture-container {
+  height: 100%;
+}
+
+.ld-picture-element {
+  max-width: unset;
+  max-height: unset;
+  cursor: grab;
+}
+
+.slow-loading {
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: contain;
+  background-color: $content-bgcolor;
+  background-blend-mode: soft-light;
+  opacity: 1 !important;
+}
+
+.ld-picture-loader {
+  position: relative;
+  & .loading-background {
+    background: none !important;
+  }
+}
+</style>
diff --git a/viewer/src/components/item_handlers/LdPlainTextViewer.vue b/viewer/src/components/item_handlers/LdPlainTextViewer.vue
index cd26d9d..79465d5 100644
--- a/viewer/src/components/item_handlers/LdPlainTextViewer.vue
+++ b/viewer/src/components/item_handlers/LdPlainTextViewer.vue
@@ -27,11 +27,12 @@
 </template>
 
 <script lang="ts">
+import { PlainTextItem } from "@/@types/gallery";
 import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdPlainTextViewer extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.PlainText;
+  @Prop({ required: true }) readonly item!: PlainTextItem;
 
   get itemResourceUrl(): string {
     return this.$galleryStore.resourceRoot + this.item.properties.resource;
diff --git a/viewer/src/components/item_handlers/LdVideoViewer.vue b/viewer/src/components/item_handlers/LdVideoViewer.vue
index 2e3a43c..a203b13 100644
--- a/viewer/src/components/item_handlers/LdVideoViewer.vue
+++ b/viewer/src/components/item_handlers/LdVideoViewer.vue
@@ -28,11 +28,12 @@
 </template>
 
 <script lang="ts">
+import { VideoItem } from "@/@types/gallery";
 import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdVideoViewer extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Video;
+  @Prop({ required: true }) readonly item!: VideoItem;
 
   get itemResourceUrl(): string {
     return this.$galleryStore.resourceRoot + this.item.properties.resource;
-- 
cgit v1.2.3