A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: input select and multi select scrolling and item selection issues
aminnausin67a26f4a5e7d
diff --git a/resources/js/components/pinesUI/InputMultiChip.vue b/resources/js/components/pinesUI/InputMultiChip.vueindex e6cc9a68..2c1730d1 100644--- a/resources/js/components/pinesUI/InputMultiChip.vue+++ b/resources/js/components/pinesUI/InputMultiChip.vue@@ -196,7 +196,7 @@ watch(><OnClickOutside@trigger.stop="select.toggleSelect(false)"- @keydown.esc="+ @keydown.esc.stop="(event: Event) => {if (select.selectOpen) {select.toggleSelect(false);@@ -204,7 +204,7 @@ watch(}}"- @keydown.down="+ @keydown.down.stop="(event: Event) => {if (select.selectOpen) {select.selectableItemActiveNext();@@ -214,7 +214,7 @@ watch(event.preventDefault();}"- @keydown.up="+ @keydown.up.stop="(event: Event) => {if (select.selectOpen) {select.selectableItemActivePrevious();@@ -240,7 +240,7 @@ watch(@change="selectInput?.$el.scrollIntoView({ behavior: 'smooth', block: 'center' })"@focus="selectButton?.scrollIntoView({ behavior: 'smooth', block: 'center' })"/>- <ButtonIcon :type="'button'" tabindex="549" :disabled="!newValue" @click="handleCreate" class="ring-inset" title="Add a new tag">+ <ButtonIcon :type="'button'" :disabled="!newValue" @click="handleCreate" class="ring-inset" title="Add a new tag"><template #icon><MdiLightPlus class="w-6 h-6" /></template>@@ -267,7 +267,6 @@ watch(}"class="relative flex items-center h-full py-2 pl-8 cursor-pointer select-none data-[disabled=true]:opacity-50 data-[disabled=true]:pointer-events-none"- :tabindex="`55${index}`"><span class="block truncate">{{ item.name }}</span></li>diff --git a/resources/js/components/pinesUI/InputSelect.vue b/resources/js/components/pinesUI/InputSelect.vueindex ecfe1a8f..e114f73d 100755--- a/resources/js/components/pinesUI/InputSelect.vue+++ b/resources/js/components/pinesUI/InputSelect.vue@@ -1,8 +1,9 @@<script setup lang="ts">import useSelect from '@/composables/useSelect';-import { onMounted, ref, watch } from 'vue';+import { onMounted, useTemplateRef, watch } from 'vue';import { OnClickOutside } from '@vueuse/components';+import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';interface SelectItem {title: string;@@ -57,8 +58,8 @@ const props = withDefaults();const emit = defineEmits(['selectItem']);-const selectButton = ref<HTMLElement | null>(null);-const selectableItemsList = ref(null);+const selectButton = useTemplateRef('selectButton');+const selectableItemsList = useTemplateRef('selectableItemsList');const select = useSelect(props.options, { selectableItemsList, selectButton });const handleItemClick = (item: any, setFocus = true) => {@@ -79,57 +80,22 @@ onMounted(() => {watch(selectButton,() => {+ if (!selectButton.value) return;select.selectButton = selectButton;},{ immediate: true },);watch(- selectableItemsList,+ () => selectableItemsList.value,() => {+ if (!selectableItemsList.value) return;select.selectableItemsList = selectableItemsList;},{ immediate: true },);</script><template>- <OnClickOutside- @trigger="select.toggleSelect(false)"- @keydown.esc="- (event: Event) => {- if (select.selectOpen) {- select.toggleSelect(false);- event.stopPropagation();- }- }- "- @keydown.down="- (event: Event) => {- if (select.selectOpen) {- select.selectableItemActiveNext();- } else {- select.toggleSelect(true);- }- event.preventDefault();- }- "- @keydown.up="- (event: Event) => {- if (select.selectOpen) {- select.selectableItemActivePrevious();- } else {- select.toggleSelect(true);- }- event.preventDefault();- }- "- @keydown.enter="- //@ts-ignore- select.selectedItem = select.selectableItemActive;- select.toggleSelect(false);- "- @keydown="select.selectKeydown($event)"- :class="`relative ${rootClass}`"- >+ <section :class="`relative ${rootClass}`"><button:id="name ?? 'Select'"ref="selectButton"@@ -161,49 +127,93 @@ watch(</button><Transition enter-active-class="transition ease-out duration-50" enter-from-class="opacity-0 -translate-y-1" enter-to-class="opacity-100">- <ul- v-show="select.selectOpen"- ref="selectableItemsList"+ <UseFocusTrap+ v-if="select.selectOpen":class="{- 'bottom-0 mb-10': select.selectDropdownPosition == 'top',- 'top-0 mt-10': select.selectDropdownPosition == 'bottom',+ 'bottom-0 mb-11': select.selectDropdownPosition == 'top',+ 'top-0 mt-11': select.selectDropdownPosition == 'bottom',}"- class="z-30 absolute w-full mt-1 overflow-auto text-sm rounded-md shadow-md max-h-56 focus:outline-none ring-1 ring-opacity-5 ring-black dark:ring-neutral-700 bg-white dark:bg-neutral-800/70 backdrop-blur-lg"- v-cloak+ class="z-30 absolute w-full mt-1 overflow-clip text-sm rounded-md shadow-md max-h-56 ring-1 ring-opacity-5 ring-black dark:ring-neutral-700 bg-white dark:bg-neutral-800/70 backdrop-blur-lg"+ :options="{ allowOutsideClick: true, returnFocusOnDeactivate: false }">- <template v-for="item in select.selectableItems" :key="item.value">- <li- @click="handleItemClick(item)"- :id="item.value + '-' + select.selectId"- :data-disabled="item.disabled ? item.disabled : ''"- :class="{- 'bg-neutral-100 dark:bg-neutral-900/70 text-gray-900 dark:text-neutral-100': select.selectableItemIsActive(item),- 'text-gray-700 dark:text-neutral-300': !select.selectableItemIsActive(item),- }"- @mousemove="select.selectableItemActive = item"- class="relative flex items-center h-full py-2 pl-8 cursor-pointer select-none data-[disabled=true]:opacity-50 data-[disabled=true]:pointer-events-none"- :title="item.title"- >- <svg- v-if="- //@ts-ignore- select.selectedItem.value == item.value- "- class="absolute left-0 w-4 h-4 ml-2 stroke-current text-neutral-400"- xmlns="http://www.w3.org/2000/svg"- viewBox="0 0 24 24"- fill="none"- stroke="currentColor"- stroke-width="2"- stroke-linecap="round"- stroke-linejoin="round"- >- <polyline points="20 6 9 17 4 12"></polyline>- </svg>- <span class="block font-medium truncate">{{ item.title }}</span>- </li>- </template>- </ul>+ <OnClickOutside+ @trigger.stop="select.toggleSelect(false)"+ @keydown.esc.stop="+ (event: Event) => {+ if (select.selectOpen) {+ select.toggleSelect(false);+ event.stopPropagation();+ }+ }+ "+ @keydown.down.stop.prevent="+ (event: Event) => {+ if (select.selectOpen) {+ select.selectableItemActiveNext();+ } else {+ select.toggleSelect(true);+ }+ event.preventDefault();+ }+ "+ @keydown.up.stop.prevent="+ (event: Event) => {+ if (select.selectOpen) {+ select.selectableItemActivePrevious();+ } else {+ select.toggleSelect(true);+ }+ event.preventDefault();+ }+ "+ @keydown.enter.stop="+ //@ts-ignore+ select.selectedItem = select.selectableItemActive;+ select.toggleSelect(false);+ "+ @keydown="select.selectKeydown($event)"+ v-cloak+ >+ <ul ref="selectableItemsList" class="w-full overflow-auto max-h-56 scrollbar-thin focus:outline-none" tabindex="-1">+ <template v-for="item in select.selectableItems" :key="item.value">+ <li+ @click="handleItemClick(item)"+ @keydown.enter="handleItemClick(item)"+ @keydown.space="handleItemClick(item)"+ @focus="select.selectableItemActive = item"+ @mousemove="select.selectableItemActive = item"+ :id="item.value + '-' + select.selectId"+ :data-disabled="item.disabled ? item.disabled : ''"+ :class="{+ 'bg-neutral-100 dark:bg-neutral-900/70 text-gray-900 dark:text-neutral-100': select.selectableItemIsActive(item),+ 'text-gray-700 dark:text-neutral-300': !select.selectableItemIsActive(item),+ }"+ class="rounded-md relative flex items-center h-full py-2 pl-8 cursor-pointer data-[disabled=true]:opacity-50 data-[disabled=true]:pointer-events-none"+ :title="item.title"+ tabindex="0"+ >+ <svg+ v-if="+ //@ts-ignore+ select.selectedItem.value == item.value+ "+ class="absolute left-0 w-4 h-4 ml-2 stroke-current text-neutral-400"+ xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 24 24"+ fill="none"+ stroke="currentColor"+ stroke-width="2"+ stroke-linecap="round"+ stroke-linejoin="round"+ >+ <polyline points="20 6 9 17 4 12"></polyline>+ </svg>+ <span class="block font-medium truncate">{{ item.title }}</span>+ </li>+ </template>+ </ul>+ </OnClickOutside>+ </UseFocusTrap></Transition>- </OnClickOutside>+ </section></template>diff --git a/resources/js/composables/useMultiSelect.js b/resources/js/composables/useMultiSelect.jsindex d40761ae..a7e43b8f 100644--- a/resources/js/composables/useMultiSelect.js+++ b/resources/js/composables/useMultiSelect.js@@ -31,27 +31,22 @@ export default function useMultiSelect({ options, defaultItems }, refs) {let index = this.selectableItems.indexOf(this.selectableItemActive);if (index < this.selectableItems.length - 1) {this.selectableItemActive = this.selectableItems[index + 1];- this.selectScrollToActiveItem();+ this.selectScrollToActiveItem(index + 1);}},selectableItemActivePrevious() {let index = this.selectableItems.indexOf(this.selectableItemActive);if (index > 0) {this.selectableItemActive = this.selectableItems[index - 1];- this.selectScrollToActiveItem();+ this.selectScrollToActiveItem(index - 1);}},- selectScrollToActiveItem() {- if (this.selectableItemActive) {- let activeElement = document.getElementById(this.selectableItemActive.value + '-' + this.selectId);- if (!activeElement) return;- let newScrollPos = activeElement.offsetTop + activeElement.offsetHeight - this.selectableItemsList.offsetHeight;- if (newScrollPos > 0) {- this.selectableItemsList.scrollTop = newScrollPos;- } else {- this.selectableItemsList.scrollTop = 0;- }- }+ selectScrollToActiveItem(index) {+ let activeElement = document.getElementById(index + '-' + this.selectId);++ if (!activeElement) return;++ activeElement.scrollIntoView({ behavior: 'smooth', block: 'center' });},selectKeydown(event) {if (event.keyCode >= 65 && event.keyCode <= 90) {@@ -60,7 +55,8 @@ export default function useMultiSelect({ options, defaultItems }, refs) {if (selectedItemBestMatch) {if (this.selectOpen) {this.selectableItemActive = selectedItemBestMatch;- this.selectScrollToActiveItem();+ let index = this.selectableItems.indexOf(this.selectableItemActive);+ this.selectScrollToActiveItem(index);} else {// this.selectedItem = this.selectableItemActive === selectedItemBestMatch; // What does this line do there was only 1 equal}diff --git a/resources/js/composables/useSelect.js b/resources/js/composables/useSelect.jsindex 5b38a81f..b2782462 100755--- a/resources/js/composables/useSelect.js+++ b/resources/js/composables/useSelect.js@@ -39,16 +39,14 @@ export default function useSelect(options, refs) {}},selectScrollToActiveItem() {- if (this.selectableItemActive) {- let activeElement = document.getElementById(this.selectableItemActive.value + '-' + this.selectId);- if (!activeElement) return;- let newScrollPos = activeElement.offsetTop + activeElement.offsetHeight - this.selectableItemsList.offsetHeight;- if (newScrollPos > 0) {- this.selectableItemsList.scrollTop = newScrollPos;- } else {- this.selectableItemsList.scrollTop = 0;- }- }+ if (!this.selectableItemActive) return;++ let activeElement = document.getElementById(this.selectableItemActive.value + '-' + this.selectId);++ if (!activeElement) return;+ console.log(activeElement);++ activeElement.scrollIntoView({ behavior: 'smooth', block: 'center' });},selectKeydown(event) {if (event.keyCode >= 65 && event.keyCode <= 90) {@@ -86,6 +84,7 @@ export default function useSelect(options, refs) {return bestMatch;},selectPositionUpdate() {+ if (!this.selectableItemsList || !this.selectButton) return;let selectDropdownBottomPos =this.selectButton?.getBoundingClientRect().top + this.selectButton.offsetHeight + parseInt(window.getComputedStyle(this.selectableItemsList).maxHeight);if (window.innerHeight < selectDropdownBottomPos) {