A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix multi chip
aminnausin6a104ead6150
diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vueindex c9fe1520..4d7824b9 100755--- a/resources/js/components/forms/EditVideo.vue+++ b/resources/js/components/forms/EditVideo.vue@@ -138,7 +138,7 @@ const handleRemoveTag = (tag) => {watch(tagsQuery, () => {if (tagsQuery.value?.data?.data) {- allTags.value = tagsQuery.value?.data.data;+ allTags.value = tagsQuery.value.data.data; // Array of tag resources}});</script>diff --git a/resources/js/components/pinesUI/InputMultiChip.vue b/resources/js/components/pinesUI/InputMultiChip.vueindex 39ab8c7d..d671022e 100644--- a/resources/js/components/pinesUI/InputMultiChip.vue+++ b/resources/js/components/pinesUI/InputMultiChip.vue@@ -1,5 +1,5 @@-<script setup>-import { onMounted, ref, watch } from 'vue';+<script setup lang="ts">+import { onMounted, ref, useTemplateRef, watch } from 'vue';import { OnClickOutside } from '@vueuse/components';import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component.mjs';@@ -12,77 +12,85 @@ import MdiLightPlus from '~icons/mdi-light/plus';// import CircumCirclePlus from '~icons/circum/circle-plus';-const props = defineProps({- placeholder: {- type: String,- default: 'Select Item',- },- defaultItems: {- type: Array,- default: () => [],- },- options: {- type: Array,- default: () => {- return [- {- name: 'name',- value: 'name',- disabled: false,- },- {- name: 'Date Uploaded',- value: 'date',- disabled: false,- },- {- name: 'Date released',- value: 'date_released',- disabled: false,- },- {- name: 'Episode',- value: 'episode',- disabled: false,- },- {- name: 'Season',- value: 'season',- disabled: false,- },- ];- },- },- max: {- type: Number,- default: 32,+interface SelectItem {+ id: number;+ name: string;+ relationships?: any;+}++const props = withDefaults(+ defineProps<{+ class?: string;+ rootClass?: string;+ placeholder?: string;+ defaultItems?: SelectItem[];+ options?: {+ name: string;+ value: string;+ disabled?: boolean;+ }[];+ max?: number;+ disabled?: boolean;+ title?: string;+ }>(),+ {+ placeholder: 'Select Item',+ defaultItems: () => [],+ options: () => [+ {+ name: 'name',+ value: 'name',+ disabled: false,+ },+ {+ name: 'Date Uploaded',+ value: 'date',+ disabled: false,+ },+ {+ name: 'Date released',+ value: 'date_released',+ disabled: false,+ },+ {+ name: 'Episode',+ value: 'episode',+ disabled: false,+ },+ {+ name: 'Season',+ value: 'season',+ disabled: false,+ },+ ],+ max: 32,},-});+);const emit = defineEmits(['createAction', 'selectItems', 'removeAction']);-const selectButton = ref(null);-const selectableItemsList = ref(null);+const selectButton = useTemplateRef('selectButton');+const selectableItemsList = useTemplateRef('selectableItemsList');const select = useMultiSelect(props, { selectableItemsList, selectButton });const newValue = ref('');-const handleItemClick = (item, setFocus = true, triggerSelect = true) => {+const handleItemClick = (item: any, setFocus = true, triggerSelect = true) => {if (!item?.name) return;select.selectedItems = [...select.selectedItems, item];select.toggleSelect(false);- if (setFocus) selectButton.value?.focus();+ if (setFocus && selectButton.value) selectButton.value.focus();if (triggerSelect) emit('selectItems', select.selectedItems);};-const handleRemoveChip = (name) => {- const item = select.selectedItems.find((item) => item.name === name);- select.selectedItems = select.selectedItems.filter((item) => item.name !== name);+const handleRemoveChip = (name: string) => {+ const item = select.selectedItems.find((item: SelectItem) => item.name === name);+ select.selectedItems = select.selectedItems.filter((item: SelectItem) => item.name !== name);emit('removeAction', item);};-const handleCreate = (e) => {+const handleCreate = (e: Event) => {e.preventDefault();e.stopPropagation();if (!newValue.value) return;@@ -91,26 +99,43 @@ const handleCreate = (e) => {};onMounted(() => {- if (props.defaultItems != undefined && props.defaultItems < props.options.length && props.defaultItems >= 0) {- handleItemClick(props.options[props.defaultItems], false);+ if (props.defaultItems != undefined && props.defaultItems.length < props.options.length && props.defaultItems.length >= 0) {+ // Default items is a list of selected tags+ // I assume this should handle click for all of the provided default items+ // idk where i got this code because this isn't PinesUI+ // idek if this should happen because it kind of worked without+ select.selectedItems = [];+ props.options.forEach((element) => {+ if (props.defaultItems.find((item) => item.name === element.name)) {+ handleItemClick(element, false);+ }+ });}});watch(- selectButton,- () => {+ () => selectButton.value,+ (value) => {+ if (!value) return;select.selectButton = selectButton;},{ immediate: true },);watch(- selectableItemsList,- () => {- select.selectableItemsList = selectableItemsList;+ () => selectableItemsList.value,+ (value) => {+ if (!value) return;},{ immediate: true },);+watch([() => selectButton.value, () => selectableItemsList.value], ([newSelectButton, newSelectableItemsList]) => {+ // console.log(newSelectButton, newSelectableItemsList, { selectButton, selectableItemsList });++ // if (!newSelectableItemsList) return;+ select.updateRefs({ selectButton, selectableItemsList });+});+watch(() => props.defaultItems,(newVal) => {@@ -125,95 +150,80 @@ watch(},{ immediate: true },);--watch(- props.defaultItems,- () => {- select.selectedItems = props.defaultItems ?? [];- },- { immediate: false },-);-watch(- props.options,- () => {- select.selectableItems = props.options;- },- { immediate: false },-);</script><template>- <div- @keydown.esc="- if (select.selectOpen) {- select.toggleSelect(false);- }- "- @keydown.down="- if (select.selectOpen) {- select.selectableItemActiveNext();- } else {- select.toggleSelect(true);- }- event.preventDefault();- "- @keydown.up="- if (select.selectOpen) {- select.selectableItemActivePrevious();- } else {- select.toggleSelect(true);- }- event.preventDefault();- "- @keydown.enter="handleItemClick(select.selectableItemActive)"- @keydown.space="handleItemClick(select.selectableItemActive)"- @keydown="select.selectKeydown($event)"- class="relative"- >- <OnClickOutside- @trigger="- () => {- console.log('???');- }+ <div class="relative">+ <button+ ref="selectButton"+ @click="select.toggleSelect(true)"+ :class="+ 'relative h-10 py-2 pl-3 pr-10 rounded-md shadow-sm mt-1 w-full flex items-center justify-between' ++ 'focus:outline-none border-none cursor-pointer ' ++ 'disabled:cursor-not-allowed disabled:opacity-50 ' ++ 'text-left text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-700 placeholder:text-neutral-400 ' ++ 'ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700 ' ++ `${select.selectOpen ? 'hocus:ring-0' : 'hocus:ring-[0.125rem]'} hover:ring-violet-400 hover:dark:ring-violet-700 focus:ring-indigo-400 dark:focus:ring-indigo-500 focus:outline-none`"- class="relative"+ :disabled="disabled"+ type="button"+ :title="title ?? 'Make Selection'">- <button- ref="selectButton"- @click="select.toggleSelect()"- :class="- 'relative h-10 py-2 pl-3 pr-10 rounded-md shadow-sm mt-1 w-full flex items-center justify-between' +- 'focus:outline-none border-none cursor-pointer ' +- 'disabled:cursor-not-allowed disabled:opacity-50 ' +- 'text-left text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-700 placeholder:text-neutral-400 ' +- 'ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700 ' +- `${select.selectOpen ? 'hocus:ring-0' : 'hocus:ring-[0.125rem]'} hover:ring-violet-400 hover:dark:ring-violet-700 focus:ring-indigo-400 dark:focus:ring-indigo-500 focus:outline-none`- "- type="button"+ <span class="truncate">{{ placeholder }}</span>+ <span class="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="w-5 h-5 text-gray-400">+ <path+ fill-rule="evenodd"+ d="M10 3a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L10 4.852 7.3 7.76a.75.75 0 01-1.1-1.02l3.25-3.5A.75.75 0 0110 3zm-3.76 9.2a.75.75 0 011.06.04l2.7 2.908 2.7-2.908a.75.75 0 111.1 1.02l-3.25 3.5a.75.75 0 01-1.1 0l-3.25-3.5a.75.75 0 01.04-1.06z"+ clip-rule="evenodd"+ ></path>+ </svg>+ </span>+ </button>+ <Transition enter-active-class="transition ease-out duration-50" enter-from-class="opacity-0 -translate-y-1" enter-to-class="opacity-100">+ <UseFocusTrap+ v-if="select.selectOpen"+ :class="{+ '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">- <span class="truncate">{{ placeholder }}</span>- <span class="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="w-5 h-5 text-gray-400">- <path- fill-rule="evenodd"- d="M10 3a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L10 4.852 7.3 7.76a.75.75 0 01-1.1-1.02l3.25-3.5A.75.75 0 0110 3zm-3.76 9.2a.75.75 0 011.06.04l2.7 2.908 2.7-2.908a.75.75 0 111.1 1.02l-3.25 3.5a.75.75 0 01-1.1 0l-3.25-3.5a.75.75 0 01.04-1.06z"- clip-rule="evenodd"- ></path>- </svg>- </span>- </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"- :class="{- '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"+ <OnClickOutside+ @trigger.stop="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="handleItemClick(select.selectableItemActive)"+ @keydown.space="handleItemClick(select.selectableItemActive)"+ @keydown="select.selectKeydown($event)"v-cloak>- <UseFocusTrap v-if="select.selectOpen" :options="{ immediate: true }">+ <ul ref="selectableItemsList" class="max-h-56"><li class="p-2 flex gap-2 w-full"><TextInput:placeholder="'Add a new tag here'"@@ -230,7 +240,9 @@ watch(</ButtonIcon></li><template- v-for="(item, index) in select.selectableItems.filter((selectable) => !select.selectedItems?.find((selected) => selectable.name === selected.name))"+ v-for="(item, index) in select.selectableItems.filter(+ (selectable: SelectItem) => !select.selectedItems?.find((selected: SelectItem) => selectable.name === selected.name),+ )":key="item.value"><li@@ -252,12 +264,12 @@ watch(<span class="block font-medium truncate">{{ item.name }}</span></li></template>- </UseFocusTrap>- </ul>- </Transition>- </OnClickOutside>- <span v-if="select.selectedItems?.length > 0" class="flex flex-wrap gap-1 pt-2 pb-1">- <ChipTag v-for="(chip, index) in select.selectedItems" v-bind:key="index" :label="chip.name" :removeable="true" @clickAction="handleRemoveChip(chip.name)" />- </span>+ </ul>+ </OnClickOutside>+ </UseFocusTrap>+ </Transition></div>+ <span v-if="select.selectedItems?.length > 0" class="flex flex-wrap gap-1 pt-2 pb-1">+ <ChipTag v-for="(chip, index) in select.selectedItems" v-bind:key="index" :label="chip.name" :removeable="true" @clickAction="handleRemoveChip(chip.name)" />+ </span></template>diff --git a/resources/js/components/pinesUI/InputSelect.vue b/resources/js/components/pinesUI/InputSelect.vueindex f9de2609..cc37de03 100755--- a/resources/js/components/pinesUI/InputSelect.vue+++ b/resources/js/components/pinesUI/InputSelect.vue@@ -145,13 +145,7 @@ watch(</span><span class="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none"><slot name="selectButtonIcon">- <svg- xmlns="http://www.w3.org/2000/svg"- viewBox="0 0 20 20"- fill="currentColor"- aria-hidden="true"- class="w-5 h-5 text-gray-400"- >+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="w-5 h-5 text-gray-400"><pathfill-rule="evenodd"d="M10 3a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L10 4.852 7.3 7.76a.75.75 0 01-1.1-1.02l3.25-3.5A.75.75 0 0110 3zm-3.76 9.2a.75.75 0 011.06.04l2.7 2.908 2.7-2.908a.75.75 0 111.1 1.02l-3.25 3.5a.75.75 0 01-1.1 0l-3.25-3.5a.75.75 0 01.04-1.06z"@@ -162,11 +156,7 @@ watch(</span></button>- <Transition- enter-active-class="transition ease-out duration-50"- enter-from-class="opacity-0 -translate-y-1"- enter-to-class="opacity-100"- >+ <Transition enter-active-class="transition ease-out duration-50" enter-from-class="opacity-0 -translate-y-1" enter-to-class="opacity-100"><ulv-show="select.selectOpen"ref="selectableItemsList"@@ -183,8 +173,7 @@ watch(: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),+ '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"diff --git a/resources/js/components/pinesUI/Popover.vue b/resources/js/components/pinesUI/Popover.vueindex 822ea429..2c28418d 100644--- a/resources/js/components/pinesUI/Popover.vue+++ b/resources/js/components/pinesUI/Popover.vue@@ -50,11 +50,7 @@ function popoverPositionCalculate() {if (!popoverButton.value) return;popoverPosition.value =- window.innerHeight <- popoverButton.value.$el.getBoundingClientRect().top +- popoverButton.value.$el.offsetHeight +- popoverOffset.value +- popoverHeight.value+ window.innerHeight < popoverButton.value.$el.getBoundingClientRect().top + popoverButton.value.$el.offsetHeight + popoverOffset.value + popoverHeight.value? 'top': 'bottom';}@@ -120,14 +116,7 @@ onUnmounted(() => {</script><template><div class="relative flex">- <component- :is="buttonComponent"- ref="popoverButton"- :class="buttonClass"- @click="popoverOpen = true"- v-bind="buttonAttributes"- :disabled="disabled"- >+ <component :is="buttonComponent" ref="popoverButton" :class="buttonClass" @click="popoverOpen = true" v-bind="buttonAttributes" :disabled="disabled"><template #text><slot name="buttonText"> </slot></template>@@ -187,10 +176,7 @@ onUnmounted(() => {</div><div class="grid gap-2"><div class="grid items-center grid-cols-3 gap-4">- <label- class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="width"- >Width</label+ <label class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="width">Width</label><inputclass="flex w-full h-8 col-span-2 px-3 py-2 text-sm bg-transparent border rounded-md border-input ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-400 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"id="width"@@ -198,10 +184,7 @@ onUnmounted(() => {/></div><div class="grid items-center grid-cols-3 gap-4">- <label- class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="maxWidth"- >Max. width</label+ <label class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="maxWidth">Max. width</label><inputclass="flex w-full h-8 col-span-2 px-3 py-2 text-sm bg-transparent border rounded-md border-input ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-400 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"id="maxWidth"@@ -209,10 +192,7 @@ onUnmounted(() => {/></div><div class="grid items-center grid-cols-3 gap-4">- <label- class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="height"- >Height</label+ <label class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="height">Height</label><inputclass="flex w-full h-8 col-span-2 px-3 py-2 text-sm bg-transparent border rounded-md border-input ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-400 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"id="height"@@ -220,10 +200,7 @@ onUnmounted(() => {/></div><div class="grid items-center grid-cols-3 gap-4">- <label- class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"- for="maxHeight"- >Max. height</label+ <label class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" for="maxHeight">Max. height</label><inputclass="flex w-full h-8 col-span-2 px-3 py-2 text-sm bg-transparent border rounded-md border-input ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-400 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"id="maxHeight"diff --git a/resources/js/composables/useMultiSelect.js b/resources/js/composables/useMultiSelect.jsindex 730edc42..2055182a 100644--- a/resources/js/composables/useMultiSelect.js+++ b/resources/js/composables/useMultiSelect.js@@ -20,6 +20,8 @@ export default function useMultiSelect({ options, defaultItems }, refs) {updateRefs(values) {this.selectButton = values.selectButton;this.selectableItemsList = values.selectableItemsList;++ this.selectPositionUpdate();},selectableItemIsActive(item) {console.log(item);@@ -90,10 +92,10 @@ export default function useMultiSelect({ options, defaultItems }, refs) {},selectPositionUpdate() {if (!this.selectButton || !this.selectableItemsList) return;+let selectDropdownBottomPos =- this.selectButton?.getBoundingClientRect().top +- this.selectButton.offsetHeight +- parseInt(window.getComputedStyle(this.selectableItemsList).maxHeight);+ this.selectButton?.getBoundingClientRect().top + this.selectButton.offsetHeight + parseInt(window.getComputedStyle(this.selectableItemsList).maxHeight);+if (window.innerHeight < selectDropdownBottomPos) {this.selectDropdownPosition = 'top';} else {