From 00510820a2794efcadbc83f7f8b54318fe198ecb Mon Sep 17 00:00:00 2001
From: Zéro~Informatique
Date: Tue, 26 Jul 2022 08:44:34 +0200
Subject: viewer: migrate to vue 3, general refactoring and cleanup

Non-exhaustive list of fixes and improvements done at the same time:

- html default background to grey (avoids white flash during init)
- unified links behavior
- added more theme variables
- removed the flex-expand transition (it wasn't working) and replaced it
  with a slide
- fixed LdLoading not centered on the content
- title on removable tags
- fixed an issue with encoded URI from vue-router
- unified Item resource URLs
- removed the iframe for PlainTextViewer (it wasn't working properly)
  and replaced it with a pre
- fixed clear and search buttons tabindex
- fixed the information panel bumping up during the fade animation of
  tag's dropdown
- fixed some focus outlines not appearing correctly
- moved CSS variables to the :root context
- Code cleaning

GitHub: closes #217
GitHub: closes #300
GitHub: closes #297
GitHub: closes #105
GitHub: closes #267
GitHub: closes #275
GitHub: closes #228
GitHub: closes #215
GitHub: closes #112
---
 .../src/views/layout/left/LayoutCommandSearch.vue  |  64 +++++++
 viewer/src/views/layout/left/LayoutInformation.vue |  99 ++++++++++
 viewer/src/views/layout/left/LayoutLeft.vue        | 158 ++++++++++++++++
 viewer/src/views/layout/left/LayoutProposition.vue | 208 +++++++++++++++++++++
 viewer/src/views/layout/left/LayoutTagInput.vue    | 164 ++++++++++++++++
 viewer/src/views/layout/left/LayoutTagList.vue     |  74 ++++++++
 viewer/src/views/layout/top/LayoutBreadcrumb.vue   | 130 +++++++++++++
 viewer/src/views/layout/top/LayoutCommand.vue      | 127 +++++++++++++
 viewer/src/views/layout/top/LayoutCommandSort.vue  | 117 ++++++++++++
 viewer/src/views/layout/top/LayoutTop.vue          |  38 ++++
 10 files changed, 1179 insertions(+)
 create mode 100644 viewer/src/views/layout/left/LayoutCommandSearch.vue
 create mode 100644 viewer/src/views/layout/left/LayoutInformation.vue
 create mode 100644 viewer/src/views/layout/left/LayoutLeft.vue
 create mode 100644 viewer/src/views/layout/left/LayoutProposition.vue
 create mode 100644 viewer/src/views/layout/left/LayoutTagInput.vue
 create mode 100644 viewer/src/views/layout/left/LayoutTagList.vue
 create mode 100644 viewer/src/views/layout/top/LayoutBreadcrumb.vue
 create mode 100644 viewer/src/views/layout/top/LayoutCommand.vue
 create mode 100644 viewer/src/views/layout/top/LayoutCommandSort.vue
 create mode 100644 viewer/src/views/layout/top/LayoutTop.vue

(limited to 'viewer/src/views/layout')

diff --git a/viewer/src/views/layout/left/LayoutCommandSearch.vue b/viewer/src/views/layout/left/LayoutCommandSearch.vue
new file mode 100644
index 0000000..ab31a84
--- /dev/null
+++ b/viewer/src/views/layout/left/LayoutCommandSearch.vue
@@ -0,0 +1,64 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2022  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>
+  <div
+    class="flex"
+    :class="[$style.commands, $style.webkitFlexShrinkFix]"
+  >
+    <button
+      tabindex="60"
+      @click="emit('clear')"
+    >
+      <fa-icon :icon="faEraser" />
+      <span>{{ t("command.search.clear") }}</span>
+    </button>
+    <button
+      tabindex="61"
+      class="flex-grow-1"
+      @click="emit('search')"
+    >
+      <fa-icon :icon="faSearch" />
+      <span>{{ t("command.search.search") }}</span>
+    </button>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { faEraser, faSearch } from '@fortawesome/free-solid-svg-icons';
+import { useI18n } from 'vue-i18n';
+
+const emit = defineEmits(['clear', 'search']);
+
+const { t } = useI18n();
+</script>
+
+<style lang="scss" module>
+// fix flexbox shrinking and overlap in old webkit versions
+// https://github.com/pacien/ldgallery/issues/183
+.webkitFlexShrinkFix {
+  flex: none;
+}
+
+.commands {
+  span {
+    margin-left: 0.5rem;
+  }
+}
+</style>
diff --git a/viewer/src/views/layout/left/LayoutInformation.vue b/viewer/src/views/layout/left/LayoutInformation.vue
new file mode 100644
index 0000000..780a458
--- /dev/null
+++ b/viewer/src/views/layout/left/LayoutInformation.vue
@@ -0,0 +1,99 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2022  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>
+  <div
+    v-if="item"
+    class="flex-column"
+    :class="$style.infopanel"
+  >
+    <div
+      v-if="item.title"
+      :class="$style.title"
+    >
+      {{ item.title }}
+    </div>
+    <time
+      v-if="item.datetime"
+      :datetime="item.datetime"
+      :class="$style.datetime"
+    >
+      {{ formatDate }}
+    </time>
+    <LdMarkdown
+      v-if="item.description"
+      :class="$style.description"
+      :markdown="item.description"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { Item } from '@/@types/gallery';
+import { LdMarkdown } from '@/components/async';
+import { computed, PropType } from 'vue';
+
+const props = defineProps({
+  item: { type: Object as PropType<Item>, required: true },
+});
+
+const formatDate = computed(() => {
+  const { datetime } = props.item;
+  const date = datetime.substring(0, 10);
+  const time = datetime.substring(11, 16);
+  return `${date} ${time}`;
+});
+</script>
+
+<style lang="scss" module>
+@import "~@/assets/scss/theme";
+
+.infopanel {
+  padding: 2px 2px 7px 7px;
+  overflow-wrap: break-word;
+
+  .title {
+    font-weight: bold;
+  }
+  .datetime {
+    font-size: 0.9em;
+    color: $palette-300;
+  }
+  .description {
+    padding-bottom: 7px;
+    > * {
+      margin-top: 5px;
+    }
+    ul,
+    ol {
+      margin-left: 1em;
+    }
+    ul {
+      list-style-type: disc;
+    }
+    a {
+      color: $palette-200;
+      &:hover {
+        color: $palette-050;
+        text-decoration: underline;
+      }
+    }
+  }
+}
+</style>
diff --git a/viewer/src/views/layout/left/LayoutLeft.vue b/viewer/src/views/layout/left/LayoutLeft.vue
new file mode 100644
index 0000000..bb3e747
--- /dev/null
+++ b/viewer/src/views/layout/left/LayoutLeft.vue
@@ -0,0 +1,158 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2022  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>
+  <div
+    class="flex-column"
+    :class="$style.sidebar"
+  >
+    <LayoutTagList v-model="searchFilters" />
+    <LayoutTagInput
+      v-model="searchFilters"
+      @search="search"
+      @opening="isOpenSearch=true"
+      @closing="isOpenSearch=false"
+    />
+    <!-- We disable the components beneath the Dropdown for accessibility purposes -->
+    <LayoutCommandSearch
+      v-show="!isOpenSearch"
+      @clear="clear"
+      @search="search"
+    />
+    <h1
+      v-show="!isOpenSearch"
+      :class="$style.title"
+    >
+      {{ t("panelLeft.propositions.related") }}
+    </h1>
+    <div
+      v-show="!isOpenSearch"
+      class="scrollbar no-scroll-x"
+      :class="$style.flexShrinkFully"
+    >
+      <LayoutProposition
+        v-for="category in galleryStore.tagsCategories"
+        :key="category.tag"
+        v-model:search-filters="searchFilters"
+        :category="galleryStore.tagsIndex[category.tag]"
+        :show-category="galleryStore.tagsCategories.length > 1"
+        :tags-index="category.index"
+        :current-tags="currentTags"
+      />
+    </div>
+
+    <template v-if="galleryStore.currentItem">
+      <div class="flex-grow-1" />
+      <h1
+        :class="[$style.infoPanelTitleBar, $style.title]"
+        class="flex"
+        @click="infoOpen = !infoOpen"
+      >
+        {{ t("panelLeft.information.title") }}
+        <fa-icon :icon="infoOpen ? faCaretDown : faCaretUp" />
+      </h1>
+      <transition name="slide">
+        <LayoutInformation
+          v-show="infoOpen"
+          :item="galleryStore.currentItem"
+          class="scrollbar no-scroll-x"
+        />
+      </transition>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { TagSearch } from '@/@types/tag';
+import { useNavigation } from '@/services/navigation';
+import { useGalleryStore } from '@/store/galleryStore';
+import { faCaretDown, faCaretUp } from '@fortawesome/free-solid-svg-icons';
+import { computed, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+import LayoutCommandSearch from './LayoutCommandSearch.vue';
+import LayoutInformation from './LayoutInformation.vue';
+import LayoutProposition from './LayoutProposition.vue';
+import LayoutTagInput from './LayoutTagInput.vue';
+import LayoutTagList from './LayoutTagList.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+const navigation = useNavigation();
+const galleryStore = useGalleryStore();
+
+const searchFilters = ref<TagSearch[]>([]);
+const infoOpen = ref(true);
+const isOpenSearch = ref(false);
+
+function clear() {
+  searchFilters.value = [];
+  search();
+}
+
+function search() {
+  const lastDirectory = navigation.getLastDirectory(galleryStore.currentItemPath);
+  router.push({ path: lastDirectory.path, query: serializeSearch() }).catch(err => {
+    if (err.name !== 'NavigationDuplicated') throw err;
+  });
+}
+
+function serializeSearch() {
+  const query: Record<string, null> = {};
+  searchFilters.value.forEach(filter => (query[filter.display] = null));
+  return query;
+}
+
+const currentTags = computed(() => galleryStore.currentItem?.tags ?? []);
+
+watch(() => route.query, (query) => {
+  const filters = Object.keys(query);
+  if (filters.length > 0) galleryStore.search(filters).then(search => (searchFilters.value = [...search]));
+}, { immediate: true });
+</script>
+
+<style lang="scss" module>
+@import "~@/assets/scss/theme";
+
+.sidebar {
+  .title {
+    background-color: $proposed-category-bgcolor;
+    color: $title-color;
+    padding: 0.2em 0.5em;
+    margin: 0 0 1px 0;
+    font-variant: small-caps;
+    justify-content: space-between;
+    user-select: none;
+
+    >svg {
+      color: $link;
+      margin-top: 2px; // Fixes a vertical centering issue with the carret
+    }
+  }
+
+  .infoPanelTitleBar {
+    cursor: pointer;
+  }
+}
+
+.flexShrinkFully {
+  flex-shrink: 1000;
+}
+</style>
diff --git a/viewer/src/views/layout/left/LayoutProposition.vue b/viewer/src/views/layout/left/LayoutProposition.vue
new file mode 100644
index 0000000..97dc3a6
--- /dev/null
+++ b/viewer/src/views/layout/left/LayoutProposition.vue
@@ -0,0 +1,208 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2022  Guillaume FOUET
+--               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="$style.proposition">
+    <h2
+      v-if="showCategory && Object.keys(propositions).length"
+      :class="[$style.subtitle, $style.category]"
+    >
+      {{ title }}
+    </h2>
+    <div
+      v-for="proposed in proposedTags"
+      :key="proposed.rawTag"
+    >
+      <LdLink
+        :class="$style.operationBtns"
+        :title="t('tag-propositions.substraction')"
+        @click="add(Operation.SUBSTRACTION, proposed.rawTag)"
+      >
+        <fa-icon
+          :icon="faMinus"
+          alt="[-]"
+        />
+      </LdLink>
+
+      <LdLink
+        :class="$style.operationBtns"
+        :title="t('tag-propositions.addition')"
+        @click="add(Operation.ADDITION, proposed.rawTag)"
+      >
+        <fa-icon
+          :icon="faPlus"
+          alt="[+]"
+        />
+      </LdLink>
+
+      <LdLink
+        :class="$style.operationTag"
+        :title="t('tag-propositions.intersection')"
+        @click="add(Operation.INTERSECTION, proposed.rawTag)"
+      >
+        {{ proposed.rawTag }}
+      </LdLink>
+
+      <div
+        class="disabled"
+        :title="t('tag-propositions.item-count')"
+      >
+        {{ proposed.count }}
+      </div>
+    </div>
+    <div
+      v-if="showMoreCount > 0"
+      :class="$style.showmore"
+      @click="limit += showMoreCount"
+    >
+      {{ t("tag-propositions.showmore", [showMoreCount]) }}<fa-icon :icon="faAngleDoubleDown" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { Item, RawTag } from '@/@types/gallery';
+import { Operation } from '@/@types/operation';
+import { TagIndex, TagNode, TagSearch } from '@/@types/tag';
+import LdLink from '@/components/LdLink.vue';
+import { useGalleryStore } from '@/store/galleryStore';
+import { faAngleDoubleDown, faMinus, faPlus } from '@fortawesome/free-solid-svg-icons';
+import { useVModel } from '@vueuse/core';
+import { computed, PropType, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+const props = defineProps({
+  searchFilters: { type: Array<TagSearch>, required: true },
+  currentTags: { type: Array<string>, required: true },
+  tagsIndex: { type: Object as PropType<TagIndex>, required: true },
+  category: { type: Object as PropType<TagNode>, default: null },
+  showCategory: Boolean,
+});
+const emit = defineEmits(['update:searchFilters']);
+const model = useVModel(props, 'searchFilters', emit);
+
+const { t } = useI18n();
+const route = useRoute();
+const galleryStore = useGalleryStore();
+
+const initialTagDisplayLimit = computed(() => {
+  const limit = galleryStore.config?.initialTagDisplayLimit ?? 10;
+  return limit >= 0 ? limit : 1000;
+});
+
+const limit = ref(initialTagDisplayLimit.value);
+
+watch(() => route, () => (limit.value = initialTagDisplayLimit.value));
+
+const propositions = computed<Record<string, number>>(() => {
+  const propositions: Record<string, number> = {};
+  const searchFilters = model.value;
+  if (searchFilters.length > 0) {
+    // Tags count from current search
+    extractDistinctItems(searchFilters)
+      .flatMap(item => item.tags)
+      .map(rightmost)
+      .filter(rawTag => props.tagsIndex[rawTag] && !searchFilters.find(search => search.tag === rawTag))
+      .forEach(rawTag => (propositions[rawTag] = (propositions[rawTag] ?? 0) + 1));
+  } else {
+    // Tags count from the current directory
+    props.currentTags
+      .flatMap(tag => tag.split(':'))
+      .map(tag => props.tagsIndex[tag])
+      .filter(Boolean)
+      .forEach(tagindex => (propositions[tagindex.tag] = tagindex.items.length));
+  }
+  return propositions;
+});
+
+const proposedTags = computed(() => {
+  return Object.entries(propositions.value)
+    .sort((a, b) => b[1] - a[1])
+    .slice(0, limit.value)
+    .map(entry => ({ rawTag: entry[0], count: entry[1] }));
+});
+
+const showMoreCount = computed(() => {
+  return Object.keys(propositions.value).length - Object.keys(proposedTags.value).length;
+});
+
+const title = computed(() => {
+  return props.category?.tag ?? t('panelLeft.propositions.other');
+});
+
+function extractDistinctItems(currentTags: TagSearch[]): Item[] {
+  return [...new Set(currentTags.flatMap(tag => tag.items))];
+}
+
+function rightmost(tag: RawTag): RawTag {
+  const dot = tag.lastIndexOf(':');
+  return dot <= 0 ? tag : tag.substring(dot + 1);
+}
+
+function add(operation: Operation, rawTag: RawTag) {
+  const node = props.tagsIndex[rawTag];
+  const display = props.category ? `${operation}${props.category.tag}:${node.tag}` : `${operation}${node.tag}`;
+  model.value.push({ ...node, parent: props.category, operation, display });
+}
+</script>
+
+<style lang="scss" module>
+@import "~@/assets/scss/theme";
+
+.proposition {
+  .subtitle {
+    background-color: $proposed-category-bgcolor;
+    width: 100%;
+    padding: 0 0 6px 0;
+    margin: 0;
+    text-align: center;
+    font-variant: small-caps;
+  }
+  > div {
+    display: flex;
+    align-items: center;
+    padding-right: 7px;
+    .operationTag {
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+      flex-grow: 1;
+      cursor: pointer;
+    }
+    .operationBtns {
+      padding: 2px 7px;
+      cursor: pointer;
+    }
+  }
+  .showmore {
+    display: block;
+    text-align: right;
+    color: $palette-300;
+    cursor: pointer;
+    > svg {
+      margin-left: 10px;
+    }
+    &:hover {
+      color: $link-hover;
+    }
+  }
+}
+</style>
diff --git a/viewer/src/views/layout/left/LayoutTagInput.vue b/viewer/src/views/layout/left/LayoutTagInput.vue
new file mode 100644
index 0000000..7ad3ed0
--- /dev/null
+++ b/viewer/src/views/layout/left/LayoutTagInput.vue
@@ -0,0 +1,164 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2022  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>
+  <LdInput
+    ref="input"
+    v-model="search"
+    :placeholder="t('tagInput.placeholder')"
+    :tabindex="50"
+    @focus="e => (e.target as HTMLInputElement).select()"
+    @keypress.enter="inputEnter"
+    @keydown.backspace="inputBackspace"
+  />
+  <div style="position:relative;">
+    <Transition name="fade">
+      <div
+        v-if="openDropdown"
+        ref="dropdown"
+        class="scrollbar"
+        :class="$style.dropdown"
+        :style="dropdownStyle"
+      >
+        <div
+          v-for="(tag,idx) in filteredTags"
+          :key="tag.tagfiltered"
+          :tabindex="51 + idx"
+          @click="addTag(tag)"
+          @keypress.enter.space="addTag(tag)"
+        >
+          <div v-text="tag.display" />
+          <div v-text="tag.items.length" />
+        </div>
+        <div
+          v-if="!filteredTags.length"
+          class="disaled"
+          :class="$style.nomatch"
+          v-text="t('tagInput.nomatch')"
+        />
+      </div>
+    </Transition>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { TagSearch } from '@/@types/tag';
+import LdInput from '@/components/LdInput.vue';
+import { useIndexFactory } from '@/services/indexFactory';
+import { useGalleryStore } from '@/store/galleryStore';
+import { computedEager, onClickOutside, onKeyStroke, useElementBounding, useFocus, useVModel } from '@vueuse/core';
+import { computed, ref, StyleValue, watchEffect } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const props = defineProps({
+  modelValue: { type: Array<TagSearch>, required: true },
+});
+const emit = defineEmits(['update:modelValue', 'search', 'opening', 'closing']);
+const model = useVModel(props, 'modelValue', emit);
+
+const { t } = useI18n();
+const galeryStore = useGalleryStore();
+const indexFactory = useIndexFactory();
+
+const search = ref('');
+const openDropdown = computedEager<boolean>(() => !!search.value);
+watchEffect(() => {
+  if (openDropdown.value) emit('opening');
+  else emit('closing');
+});
+
+// ---
+
+const dropdown = ref();
+const { top } = useElementBounding(dropdown);
+const dropdownStyle = computedEager<StyleValue>(() => ({ height: `calc(100vh - 8px - ${top.value}px)` }));
+onClickOutside(dropdown, closeDropdown);
+onKeyStroke('Escape', closeDropdown);
+
+const input = ref();
+const { focused } = useFocus(input);
+
+// ---
+
+const filteredTags = computed(() => indexFactory.searchTags(galeryStore.tagsIndex, search.value, false)
+  .filter(filterAlreadyPresent)
+  .sort((a, b) => b.items.length - a.items.length));
+
+function filterAlreadyPresent(newSearch: TagSearch) {
+  return !model.value.find(
+    currentSearch =>
+      currentSearch.tag === newSearch.tag && (!currentSearch.parent || currentSearch.parent === newSearch.parent),
+  );
+}
+
+function addTag(tag?: TagSearch) {
+  const toPush = tag ?? filteredTags.value[0];
+  if (!toPush) return;
+  model.value.push(toPush);
+  closeDropdown();
+}
+function inputEnter() {
+  if (search.value) addTag();
+  else emit('search');
+}
+function inputBackspace() {
+  !openDropdown.value && model.value.pop();
+}
+function closeDropdown() {
+  search.value = '';
+  focused.value = true;
+}
+</script>
+
+<style lang="scss" module>
+@import "~@/assets/scss/theme";
+
+.dropdown {
+  position: absolute;
+  left: 0;
+  z-index: 10;
+  width: $layout-left;
+  color: $input-color;
+  background-color: $dropdown-item-color;
+  padding: 4px 0px;
+  > div {
+    display: flex;
+    justify-content: space-between;
+    padding: 4px 0;
+    margin: 2px; // For the focus border
+    cursor: pointer;
+    > div {
+      padding: 0 4px;
+    }
+    > div:last-child {
+      color: $text-light;
+    }
+    &:hover {
+      background-color: $dropdown-item-hover-color;
+    }
+    &:focus {
+      outline: solid 1px $button-active-color;
+    }
+    &.nomatch {
+      color: $text-light;
+      justify-content: center;
+    }
+  }
+}
+</style>
diff --git a/viewer/src/views/layout/left/LayoutTagList.vue b/viewer/src/views/layout/left/LayoutTagList.vue
new file mode 100644
index 0000000..670e6c3
--- /dev/null
+++ b/viewer/src/views/layout/left/LayoutTagList.vue
@@ -0,0 +1,74 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2022  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>
+  <div
+    v-show="model.length"
+    class="flex"
+    :class="$style.tag"
+  >
+    <TransitionGroup name="move">
+      <div
+        v-for="tag in model"
+        :key="tag.tagfiltered"
+        :title="t('panelLeft.taglist.activetag.title')"
+        @click="remove(tag)"
+        v-text="tag.display"
+      />
+    </TransitionGroup>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { TagSearch } from '@/@types/tag';
+import { useVModel } from '@vueuse/core';
+import { useI18n } from 'vue-i18n';
+
+const props = defineProps({
+  modelValue: { type: Array<TagSearch>, required: true },
+});
+const emit = defineEmits(['update:modelValue']);
+const model = useVModel(props, 'modelValue', emit);
+
+const { t } = useI18n();
+
+function remove(toRemove: TagSearch) {
+  model.value = model.value.filter(tag => tag !== toRemove);
+}
+</script>
+
+<style lang="scss" module>
+@import "~@/assets/scss/theme";
+
+.tag {
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  gap: 2px;
+  padding: 4px;
+  background-color: $input-background-color;
+  > div {
+    color: $text-light;
+    background-color: $tag-background-color;
+    padding: 0 8px 3px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/viewer/src/views/layout/top/LayoutBreadcrumb.vue b/viewer/src/views/layout/top/LayoutBreadcrumb.vue
new file mode 100644
index 0000000..2e70d66
--- /dev/null
+++ b/viewer/src/views/layout/top/LayoutBreadcrumb.vue
@@ -0,0 +1,130 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2022  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>
+  <div
+    ref="breadcrumb"
+    v-dragscroll.x
+    class="flex scrollbar"
+    :class="$style.ldBreadcrumb"
+  >
+    <div
+      v-show="!arrivedState.left"
+      :class="$style.ldBreadcrumbOverflowMask"
+    />
+    <ul>
+      <li
+        v-for="(item, idx) in currentItemPath"
+        :key="item.path"
+      >
+        <fa-icon
+          v-if="idx > 0"
+          :icon="faAngleRight"
+          class="disabled"
+        />
+        <LdLink
+          :to="item.path"
+        >
+          <fa-icon
+            :icon="navigation.getIcon(item)"
+            size="lg"
+          />
+          {{ item.title }}
+        </LdLink>
+      </li>
+      <li v-if="searchMode">
+        <fa-icon
+          :icon="faAngleRight"
+          class="disabled"
+        />
+        <fa-icon
+          :icon="faSearch"
+          size="lg"
+          class="disabled"
+        />
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { Item } from '@/@types/gallery';
+import LdLink from '@/components/LdLink.vue';
+import { useNavigation } from '@/services/navigation';
+import { faAngleRight, faSearch } from '@fortawesome/free-solid-svg-icons';
+import { useScroll } from '@vueuse/core';
+import { nextTick, onMounted, ref, watch } from 'vue';
+
+const props = defineProps({
+  currentItemPath: { type: Array<Item>, required: true },
+  searchMode: Boolean,
+});
+
+const breadcrumb = ref<HTMLDivElement>();
+
+const navigation = useNavigation();
+const { arrivedState } = useScroll(breadcrumb);
+
+onMounted(() =>
+  watch(() => props.currentItemPath, () => {
+    const div = breadcrumb.value;
+    if (div) nextTick(() => (div.scrollLeft = div.scrollWidth));
+  }, { immediate: true }));
+</script>
+
+<style lang="scss" module>
+@import "~@/assets/scss/theme";
+
+.ldBreadcrumbOverflowMask {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(
+    to right,
+    rgba($panel-top-bgcolor, 1) $breadcrumb-margins,
+    rgba($panel-top-bgcolor, 0) $breadcrumb-overflow-mask-size
+  );
+  pointer-events: none;
+}
+
+.ldBreadcrumb {
+  ul {
+    display: flex;
+    white-space: nowrap;
+    list-style: none;
+    padding: 2px; // Necessary for the focus outline
+    align-items: center;
+    li {
+      > * {
+        margin-left: $breadcrumb-margins;
+      }
+      > a {
+        padding: $breadcrumb-margins 2px;
+      }
+    }
+  }
+  &:global(.scrollbar) {
+    overflow-y: hidden;
+    scrollbar-width: none;
+    &::-webkit-scrollbar {
+      height: 0;
+    }
+  }
+}
+</style>
diff --git a/viewer/src/views/layout/top/LayoutCommand.vue b/viewer/src/views/layout/top/LayoutCommand.vue
new file mode 100644
index 0000000..8919da3
--- /dev/null
+++ b/viewer/src/views/layout/top/LayoutCommand.vue
@@ -0,0 +1,127 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2022  Guillaume FOUET
+--               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="flex"
+    :class="$style.commandBtns"
+  >
+    <LdLink
+      :title="t('command.search.slider')"
+      tabindex="10"
+      @click="uiStore.toggleFullWidth()"
+    >
+      <fa-icon
+        :icon="commandToggleSearchPanelIcon"
+        size="lg"
+      />
+    </LdLink>
+    <LayoutCommandSort :tabindex="20" />
+    <LdLink
+      :class="{ disabled: isEntryPoint(), [$style.commandSecondary]: true }"
+      :title="t('command.back')"
+      tabindex="30"
+      @click="isEntryPoint() || router.back()"
+    >
+      <fa-icon
+        :icon="faArrowLeft"
+        size="lg"
+      />
+    </LdLink>
+    <LdLink
+      :to="parent"
+      :class="{ disabled: isRoot }"
+      :title="t('command.parent')"
+      tabindex="40"
+    >
+      <fa-icon
+        :icon="faFolder"
+        size="xs"
+      />
+      <fa-icon
+        :icon="faLevelUpAlt"
+        size="lg"
+      />
+    </LdLink>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { Item } from '@/@types/gallery';
+import LdLink from '@/components/LdLink.vue';
+import { useUiStore } from '@/store/uiStore';
+import { faAngleDoubleLeft, faArrowLeft, faFolder, faLevelUpAlt, faSearch } from '@fortawesome/free-solid-svg-icons';
+import { computedEager } from '@vueuse/shared';
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+import LayoutCommandSort from './LayoutCommandSort.vue';
+
+const props = defineProps({
+  currentItemPath: { type: Array<Item>, required: true },
+});
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+const uiStore = useUiStore();
+
+const commandToggleSearchPanelIcon = computed(() => uiStore.fullWidth ? faSearch : faAngleDoubleLeft);
+const isRoot = computedEager(() => props.currentItemPath.length <= 1 && !uiStore.searchMode);
+const parent = computed(() => {
+  if (uiStore.searchMode) return decodeURIComponent(route.path);
+  const ln = props.currentItemPath.length;
+  if (ln > 1) return props.currentItemPath[ln - 2];
+  return '';
+});
+
+function isEntryPoint() {
+  return history.state?.ldgallery === 'ENTRYPOINT'; // Set by MainLayout.vue
+}
+</script>
+
+<style lang="scss" module>
+@import "~@/assets/scss/theme";
+
+.commandBtns {
+  background-color: $command-buttons-bgcolor;
+  justify-content: space-around;
+  vertical-align: middle;
+  align-items: center;
+  flex: 0 0 $layout-left;
+  user-select: none;
+
+  > a {
+    // normalise icon active boxes
+    width: $layout-top;
+    line-height: calc($layout-top - 4px); // 4px For the focus border
+    text-align: center;
+    vertical-align: middle;
+  }
+
+  @media only screen and (max-width: $tablet) {
+    flex: 0 1;
+
+    > .commandSecondary {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/viewer/src/views/layout/top/LayoutCommandSort.vue b/viewer/src/views/layout/top/LayoutCommandSort.vue
new file mode 100644
index 0000000..bb9744e
--- /dev/null
+++ b/viewer/src/views/layout/top/LayoutCommandSort.vue
@@ -0,0 +1,117 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2022  Guillaume FOUET
+--               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>
+  <LdLink
+    :title="t('command.sort.title')"
+    :tabindex="props.tabindex"
+    @click="openDropdown"
+  >
+    <fa-icon
+      :icon="faSortAmountDown"
+      size="lg"
+    />
+    <teleport to="body">
+      <Transition name="fade">
+        <div
+          v-if="showDropdown"
+          ref="dropdown"
+          :class="$style.dropdown"
+        >
+          <div
+            v-for="(sort,idx) in itemComparator.ITEM_SORTS"
+            :key="sort.name"
+            :tabindex="props.tabindex + idx + 1"
+            @click="selectedSort=sort"
+            @keypress.enter.space="selectedSort=sort"
+          >
+            <fa-icon :icon="sort.name == selectedSort.name ? faDotCircle : faCircle" />
+            <span v-text="sort.text" />
+          </div>
+        </div>
+      </Transition>
+    </teleport>
+  </LdLink>
+</template>
+
+<script setup lang="ts">
+import LdLink from '@/components/LdLink.vue';
+import { ItemSort, useItemComparator } from '@/services/itemComparator';
+import { useUiStore } from '@/store/uiStore';
+import { faCircle, faDotCircle, faSortAmountDown } from '@fortawesome/free-solid-svg-icons';
+import { onClickOutside, onKeyStroke } from '@vueuse/core';
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const props = defineProps({
+  tabindex: { type: Number, required: true },
+});
+
+const { t } = useI18n();
+const uiStore = useUiStore();
+const itemComparator = useItemComparator();
+
+const selectedSort = computed({
+  get: () => uiStore.sort,
+  set: (newValue: ItemSort) => (uiStore.sort = newValue),
+});
+
+const showDropdown = ref(false);
+
+const dropdown = ref();
+onClickOutside(dropdown, closeDropdown);
+onKeyStroke('Escape', closeDropdown);
+
+function openDropdown() {
+  showDropdown.value = true;
+}
+function closeDropdown() {
+  setTimeout(() => (showDropdown.value = false));
+}
+</script>
+
+<style lang="scss" module>
+@import "~@/assets/scss/theme";
+
+.dropdown {
+  position: absolute;
+  top: $layout-top;
+  left: 0;
+  z-index: 10;
+  width: $layout-left;
+  color: $input-color;
+  background-color: $dropdown-item-color;
+  padding: 8px 0px;
+  cursor: pointer;
+  > div {
+    padding: 8px 14px;
+    margin: 2px; // For the focus border
+    > span {
+      padding-left: 12px;
+    }
+    &:hover {
+      background-color: $dropdown-item-hover-color;
+    }
+    &:focus {
+      outline: solid 1px $button-active-color;
+    }
+  }
+}
+</style>
diff --git a/viewer/src/views/layout/top/LayoutTop.vue b/viewer/src/views/layout/top/LayoutTop.vue
new file mode 100644
index 0000000..b755c42
--- /dev/null
+++ b/viewer/src/views/layout/top/LayoutTop.vue
@@ -0,0 +1,38 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2022  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>
+  <div class="flex">
+    <LayoutCommand :current-item-path="galleryStore.currentItemPath" />
+    <LayoutBreadcrumb
+      :current-item-path="galleryStore.currentItemPath"
+      :search-mode="uiStore.searchMode"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useGalleryStore } from '@/store/galleryStore';
+import { useUiStore } from '@/store/uiStore';
+import LayoutBreadcrumb from './LayoutBreadcrumb.vue';
+import LayoutCommand from './LayoutCommand.vue';
+
+const uiStore = useUiStore();
+const galleryStore = useGalleryStore();
+</script>
-- 
cgit v1.2.3


From e704198437fb589ec8c954d12700d2a1f911522c Mon Sep 17 00:00:00 2001
From: Zéro~Informatique
Date: Sat, 3 Sep 2022 04:41:03 +0200
Subject: viewer: refactoring for tag and sort dropdowns

---
 viewer/src/views/layout/left/LayoutTagInput.vue   | 93 +++++++++--------------
 viewer/src/views/layout/top/LayoutCommandSort.vue | 60 ++++-----------
 2 files changed, 49 insertions(+), 104 deletions(-)

(limited to 'viewer/src/views/layout')

diff --git a/viewer/src/views/layout/left/LayoutTagInput.vue b/viewer/src/views/layout/left/LayoutTagInput.vue
index 7ad3ed0..a37c546 100644
--- a/viewer/src/views/layout/left/LayoutTagInput.vue
+++ b/viewer/src/views/layout/left/LayoutTagInput.vue
@@ -27,42 +27,38 @@
     @keypress.enter="inputEnter"
     @keydown.backspace="inputBackspace"
   />
-  <div style="position:relative;">
-    <Transition name="fade">
+  <LdDropdown
+    ref="dropdown"
+    v-model="showDropdown"
+    :list="filteredTags"
+    list-key="tagfiltered"
+    :tabindex-root="51"
+    :class="$style.dropdown"
+    :style="dropdownStyle"
+    @select="addTag"
+    @opening="emit('opening')"
+    @closing="cleanSearch(); emit('closing');"
+  >
+    <template #option="{option}:{option:TagSearch}">
+      <div v-text="option.display" />
+      <div v-text="option.items.length" />
+    </template>
+    <template #empty>
       <div
-        v-if="openDropdown"
-        ref="dropdown"
-        class="scrollbar"
-        :class="$style.dropdown"
-        :style="dropdownStyle"
-      >
-        <div
-          v-for="(tag,idx) in filteredTags"
-          :key="tag.tagfiltered"
-          :tabindex="51 + idx"
-          @click="addTag(tag)"
-          @keypress.enter.space="addTag(tag)"
-        >
-          <div v-text="tag.display" />
-          <div v-text="tag.items.length" />
-        </div>
-        <div
-          v-if="!filteredTags.length"
-          class="disaled"
-          :class="$style.nomatch"
-          v-text="t('tagInput.nomatch')"
-        />
-      </div>
-    </Transition>
-  </div>
+        :class="$style.nomatch"
+        v-text="t('tagInput.nomatch')"
+      />
+    </template>
+  </LdDropdown>
 </template>
 
 <script setup lang="ts">
 import { TagSearch } from '@/@types/tag';
+import LdDropdown from '@/components/LdDropdown.vue';
 import LdInput from '@/components/LdInput.vue';
 import { useIndexFactory } from '@/services/indexFactory';
 import { useGalleryStore } from '@/store/galleryStore';
-import { computedEager, onClickOutside, onKeyStroke, useElementBounding, useFocus, useVModel } from '@vueuse/core';
+import { computedEager, useElementBounding, useFocus, useVModel } from '@vueuse/core';
 import { computed, ref, StyleValue, watchEffect } from 'vue';
 import { useI18n } from 'vue-i18n';
 
@@ -77,19 +73,15 @@ const galeryStore = useGalleryStore();
 const indexFactory = useIndexFactory();
 
 const search = ref('');
-const openDropdown = computedEager<boolean>(() => !!search.value);
-watchEffect(() => {
-  if (openDropdown.value) emit('opening');
-  else emit('closing');
-});
+const showDropdown = ref(false);
+
+watchEffect(() => (showDropdown.value = !!search.value));
 
 // ---
 
 const dropdown = ref();
 const { top } = useElementBounding(dropdown);
 const dropdownStyle = computedEager<StyleValue>(() => ({ height: `calc(100vh - 8px - ${top.value}px)` }));
-onClickOutside(dropdown, closeDropdown);
-onKeyStroke('Escape', closeDropdown);
 
 const input = ref();
 const { focused } = useFocus(input);
@@ -111,16 +103,16 @@ function addTag(tag?: TagSearch) {
   const toPush = tag ?? filteredTags.value[0];
   if (!toPush) return;
   model.value.push(toPush);
-  closeDropdown();
+  cleanSearch();
 }
 function inputEnter() {
   if (search.value) addTag();
   else emit('search');
 }
 function inputBackspace() {
-  !openDropdown.value && model.value.pop();
+  !showDropdown.value && model.value.pop();
 }
-function closeDropdown() {
+function cleanSearch() {
   search.value = '';
   focused.value = true;
 }
@@ -130,35 +122,20 @@ function closeDropdown() {
 @import "~@/assets/scss/theme";
 
 .dropdown {
-  position: absolute;
-  left: 0;
-  z-index: 10;
-  width: $layout-left;
-  color: $input-color;
-  background-color: $dropdown-item-color;
-  padding: 4px 0px;
   > div {
     display: flex;
     justify-content: space-between;
-    padding: 4px 0;
-    margin: 2px; // For the focus border
-    cursor: pointer;
     > div {
       padding: 0 4px;
     }
     > div:last-child {
       color: $text-light;
     }
-    &:hover {
-      background-color: $dropdown-item-hover-color;
-    }
-    &:focus {
-      outline: solid 1px $button-active-color;
-    }
-    &.nomatch {
-      color: $text-light;
-      justify-content: center;
-    }
+  }
+  .nomatch {
+    color: $disabled-color;
+    justify-content: center;
+    cursor: default;
   }
 }
 </style>
diff --git a/viewer/src/views/layout/top/LayoutCommandSort.vue b/viewer/src/views/layout/top/LayoutCommandSort.vue
index bb9744e..8336621 100644
--- a/viewer/src/views/layout/top/LayoutCommandSort.vue
+++ b/viewer/src/views/layout/top/LayoutCommandSort.vue
@@ -22,41 +22,35 @@
   <LdLink
     :title="t('command.sort.title')"
     :tabindex="props.tabindex"
-    @click="openDropdown"
+    @click="showDropdown=!showDropdown"
   >
     <fa-icon
       :icon="faSortAmountDown"
       size="lg"
     />
     <teleport to="body">
-      <Transition name="fade">
-        <div
-          v-if="showDropdown"
-          ref="dropdown"
-          :class="$style.dropdown"
-        >
-          <div
-            v-for="(sort,idx) in itemComparator.ITEM_SORTS"
-            :key="sort.name"
-            :tabindex="props.tabindex + idx + 1"
-            @click="selectedSort=sort"
-            @keypress.enter.space="selectedSort=sort"
-          >
-            <fa-icon :icon="sort.name == selectedSort.name ? faDotCircle : faCircle" />
-            <span v-text="sort.text" />
-          </div>
-        </div>
-      </Transition>
+      <LdDropdown
+        v-model="showDropdown"
+        :list="itemComparator.ITEM_SORTS"
+        :tabindex-root="props.tabindex + 1"
+        :class="$style.dropdown"
+        @select="(sort: ItemSort) => selectedSort=sort"
+      >
+        <template #option="{option}:{option:ItemSort}">
+          <fa-icon :icon="option.name == selectedSort.name ? faDotCircle : faCircle" />
+          <span v-text="option.text" />
+        </template>
+      </LdDropdown>
     </teleport>
   </LdLink>
 </template>
 
 <script setup lang="ts">
+import LdDropdown from '@/components/LdDropdown.vue';
 import LdLink from '@/components/LdLink.vue';
 import { ItemSort, useItemComparator } from '@/services/itemComparator';
 import { useUiStore } from '@/store/uiStore';
 import { faCircle, faDotCircle, faSortAmountDown } from '@fortawesome/free-solid-svg-icons';
-import { onClickOutside, onKeyStroke } from '@vueuse/core';
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
@@ -74,44 +68,18 @@ const selectedSort = computed({
 });
 
 const showDropdown = ref(false);
-
-const dropdown = ref();
-onClickOutside(dropdown, closeDropdown);
-onKeyStroke('Escape', closeDropdown);
-
-function openDropdown() {
-  showDropdown.value = true;
-}
-function closeDropdown() {
-  setTimeout(() => (showDropdown.value = false));
-}
 </script>
 
 <style lang="scss" module>
 @import "~@/assets/scss/theme";
 
 .dropdown {
-  position: absolute;
   top: $layout-top;
-  left: 0;
-  z-index: 10;
-  width: $layout-left;
-  color: $input-color;
-  background-color: $dropdown-item-color;
-  padding: 8px 0px;
-  cursor: pointer;
   > div {
     padding: 8px 14px;
-    margin: 2px; // For the focus border
     > span {
       padding-left: 12px;
     }
-    &:hover {
-      background-color: $dropdown-item-hover-color;
-    }
-    &:focus {
-      outline: solid 1px $button-active-color;
-    }
   }
 }
 </style>
-- 
cgit v1.2.3