1
0
forked from noxious/client

Applied to object list as well

This commit is contained in:
Colin Kallemein 2024-07-20 17:12:14 +02:00
parent ddfa3b4952
commit c3aff706f0
2 changed files with 56 additions and 15 deletions

View File

@ -41,7 +41,6 @@
<div class="overflow-auto h-full w-[35%] flex flex-col relative"> <div class="overflow-auto h-full w-[35%] flex flex-col relative">
<TileList v-if="selectedCategory === 'tiles'" /> <TileList v-if="selectedCategory === 'tiles'" />
<ObjectList v-if="selectedCategory === 'objects'" /> <ObjectList v-if="selectedCategory === 'objects'" />
<ObjectList v-if="selectedCategory === 'objects'" />
</div> </div>
<div class="absolute w-[1px] bg-cyan-200 h-full top-0 left-1/2"></div> <div class="absolute w-[1px] bg-cyan-200 h-full top-0 left-1/2"></div>

View File

@ -7,15 +7,28 @@
<input v-model="searchQuery" class="input-cyan w-full" placeholder="Search..." @input="handleSearch" /> <input v-model="searchQuery" class="input-cyan w-full" placeholder="Search..." @input="handleSearch" />
<div class="absolute left-0 bottom-0 w-full h-[1px] bg-cyan-200"></div> <div class="absolute left-0 bottom-0 w-full h-[1px] bg-cyan-200"></div>
</div> </div>
<a class="relative p-2.5 cursor-pointer" :class="{ 'bg-cyan/80': assetManagerStore.selectedObject?.id === object.id }" v-for="(object, index) in filteredObjects" :key="index" @click="assetManagerStore.setSelectedObject(object as Object)"> <div v-bind="containerProps" class="overflow-y-auto relative" @scroll="onScroll">
<div class="flex items-center gap-2.5"> <div v-bind="wrapperProps" ref="elementToScroll">
<div class="h-[28px] w-[75px] max-w-[75px] flex justify-center"> <a
<img class="h-[28px]" :src="`${config.server_endpoint}/assets/objects/${object.id}.png`" alt="Object" /> v-for="{ data: object } in list"
</div> :key="object.id"
<span>{{ object.name }}</span> class="relative p-2.5 cursor-pointer block"
:class="{ 'bg-cyan/80': assetManagerStore.selectedObject?.id === object.id }"
@click="assetManagerStore.setSelectedObject(object as Object)"
>
<div class="flex items-center gap-2.5">
<div class="h-[28px] w-[75px] max-w-[75px] flex justify-center">
<img class="h-[28px]" :src="`${config.server_endpoint}/assets/objects/${object.id}.png`" alt="Object" />
</div>
<span>{{ object.name }}</span>
</div>
<div class="absolute left-0 bottom-0 w-full h-[1px] bg-cyan-200"></div>
</a>
</div> </div>
<div class="absolute left-0 bottom-0 w-full h-[1px] bg-cyan-200"></div> <button class="left-[calc(50%_-_60px)] fixed bottom-2.5 min-w-[unset] w-[50px] h-[50px] rounded-lg bg-cyan/50 p-0 hover:bg-cyan" v-show="hasScrolled" @click="toTop">
</a> <img class="absolute invert w-[30px] h-[30px] left-1/2 top-1/2 translate-x-[-50%] translate-y-[-50%] rotate-180" src="/assets/icons/zoneEditor/chevron.svg" alt="" />
</button>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -25,6 +38,7 @@ import { onMounted, ref, computed } from 'vue'
import { useAssetManagerStore } from '@/stores/assetManager' import { useAssetManagerStore } from '@/stores/assetManager'
import { useAssetStore } from '@/stores/assets' import { useAssetStore } from '@/stores/assets'
import type { Object } from '@/types' import type { Object } from '@/types'
import { useVirtualList } from '@vueuse/core'
const gameStore = useGameStore() const gameStore = useGameStore()
const objectUploadField = ref(null) const objectUploadField = ref(null)
@ -33,10 +47,13 @@ const assetStore = useAssetStore()
const searchQuery = ref('') const searchQuery = ref('')
const hasScrolled = ref(false)
const elementToScroll = ref()
const handleFileUpload = (e: Event) => { const handleFileUpload = (e: Event) => {
const files = (e.target as HTMLInputElement).files const files = (e.target as HTMLInputElement).files
if (!files) return if (!files) return
gameStore.connection.emit('gm:object:upload', files, (response: boolean) => { gameStore.connection?.emit('gm:object:upload', files, (response: boolean) => {
if (!response) { if (!response) {
if (config.development) console.error('Failed to upload object') if (config.development) console.error('Failed to upload object')
return return
@ -44,26 +61,51 @@ const handleFileUpload = (e: Event) => {
assetStore.fetchAssets() assetStore.fetchAssets()
gameStore.connection.emit('gm:object:list', {}, (response: Object[]) => { gameStore.connection?.emit('gm:object:list', {}, (response: Object[]) => {
assetManagerStore.setObjectList(response) assetManagerStore.setObjectList(response)
}) })
}) })
} }
const handleSearch = () => { const handleSearch = () => {
// The filtering is handled by the computed property, so we don't need to do anything here // Trigger a re-render of the virtual list
// This function is kept in case you want to add debounce or other functionality later virtualList.value?.scrollTo(0)
} }
const filteredObjects = computed(() => { const filteredObjects = computed(() => {
if (!searchQuery.value) { if (!searchQuery.value) {
return assetManagerStore.objectList return assetManagerStore.objectList
} }
return assetManagerStore.objectList.filter((object) => object.name.toLowerCase().includes(searchQuery.value.toLowerCase())) return assetManagerStore.objectList.filter((object) =>
object.name.toLowerCase().includes(searchQuery.value.toLowerCase())
)
}) })
const { list, containerProps, wrapperProps, scrollTo } = useVirtualList(
filteredObjects,
{
itemHeight: 48,
},
)
const virtualList = ref({ scrollTo })
const onScroll = () => {
let scrollTop = elementToScroll.value.style.marginTop.replace('px', '');
if (scrollTop > 80) {
hasScrolled.value = true
} else if (scrollTop <= 80) {
hasScrolled.value = false
}
}
function toTop() {
virtualList.value?.scrollTo(0)
}
onMounted(() => { onMounted(() => {
gameStore.connection.emit('gm:object:list', {}, (response: Object[]) => { gameStore.connection?.emit('gm:object:list', {}, (response: Object[]) => {
assetManagerStore.setObjectList(response) assetManagerStore.setObjectList(response)
}) })
}) })