Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions packages/rolldown/src/app/pages/session/[session]/chunks.vue
Original file line number Diff line number Diff line change
Expand Up @@ -213,14 +213,12 @@ watch(() => settings.value.chunkViewType, () => {
<DataSearchPanel v-model="searchValue" :rules="[]">
<template v-if="pathSelectorVisible" #search>
<DataPathSelector :data="searched" import-id-key="chunk_id" :search-keys="['name']" @select="selectPathNodes" @close="togglePathSelector(false)">
<template #list="{ select, data }">
<ChunksFlatList
:session="session"
:chunks="data"
:link="false"
:basic="true"
@select="select"
/>
<template #option="{ item }">
<ChunksBaseInfo :chunk="item" basic class="flex gap-4 items-center text-sm font-mono">
<template #left-after>
<DisplayBadge v-if="item.is_initial" text="initial" />
</template>
</ChunksBaseInfo>
</template>
<template #item="{ id }">
{{ chunksMap.get(id)?.name || '[unnamed]' }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,21 +141,11 @@ function toggleDisplay(type: ClientSettings['moduleGraphViewType']) {
<DataSearchPanel v-model="searchValue" :rules="searchFilterTypes">
<template v-if="pathSelectorVisible" #search>
<DataPathSelector :data="searched" import-id-key="module_id" :search-keys="['id']" @select="selectPathNodes" @close="togglePathSelector(false)">
<template #list="{ select, data }">
<ModulesFlatList
v-if="data?.length"
:session="session"
:modules="data"
disable-tooltip
:link="false"
@select="select"
/>
</template>
<template #item="{ id }">
<DisplayModuleId
:id="id"
:session="session"
class="block text-nowrap"
class="block"
:link="false"
:disable-tooltip="true"
/>
Expand Down
17 changes: 9 additions & 8 deletions packages/ui/src/components/Data/DataPathSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ const emit = defineEmits<{
}>()

defineSlots<{
list: (props: {
select: (module: T) => void
data: T[]
}) => void
option?: (props: { item: T }) => void
item: (props: {
id: string
}) => void
Expand Down Expand Up @@ -111,8 +108,10 @@ function close() {
:data="startSelector.modules.value"
@clear="() => { startSelector.clear(); endSelector.clear() }"
>
<template #list>
<slot name="list" :select="startSelector.select" :data="startSelector.modules.value" />
<template #option="{ item }">
<slot name="option" :item="item">
<slot :id="item.id" name="item" />
</slot>
</template>
<template #item>
<slot :id="startSelector.state.value.selected!" name="item" />
Expand All @@ -127,8 +126,10 @@ function close() {
:data="filteredEndModules"
@clear="endSelector.clear"
>
<template #list>
<slot name="list" :select="endSelector.select" :data="filteredEndModules" />
<template #option="{ item }">
<slot name="option" :item="item">
<slot :id="item.id" name="item" />
</slot>
</template>
<template #item>
<slot :id="endSelector.state.value.selected!" name="item" />
Expand Down
118 changes: 93 additions & 25 deletions packages/ui/src/components/Data/DataPathSelectorItem.vue
Original file line number Diff line number Diff line change
@@ -1,52 +1,120 @@
<script setup lang="ts" generic="T extends { id: string, imports: unknown[] }">
import type { GraphPathSelector } from '../../composables/graph-path-selector'
import { hideAllPoppers, Menu as VMenu } from 'floating-vue'

withDefaults(
defineProps<{
selector: GraphPathSelector<T>
placeholder: string
data?: T[]
emptyStateText?: string
onClear?: () => void
}>(),
{
data: undefined,
emptyStateText: undefined,
onClear: undefined,
},
)
import { Menu as VMenu } from 'floating-vue'
import { nextTick, ref, useId, useTemplateRef, watch } from 'vue'
import { DynamicScroller, DynamicScrollerItem } from 'vue-virtual-scroller'
import 'vue-virtual-scroller/index.css'

const props = defineProps<{
selector: GraphPathSelector<T>
placeholder: string
data: T[]
}>()

const emit = defineEmits<{
(e: 'clear'): void
}>()

defineSlots<{
list: () => void
option: (props: { item: T }) => void
item: () => void
empty: () => void
empty?: () => void
}>()

const search = defineModel<string>('search', { required: true })
const listId = useId()
const open = ref(false)
const activeIndex = ref(-1)
const scroller = useTemplateRef('scroller')
const input = useTemplateRef('input')
const clearButton = useTemplateRef('clearButton')

watch([() => props.data, open], () => {
activeIndex.value = -1
}, { flush: 'sync' })

watch([scroller, activeIndex], ([list, index]) => {
if (index >= 0)
list?.scrollToItem(index, { align: 'nearest' })
}, { flush: 'post' })

function move(direction: number) {
open.value = true
if (!props.data.length)
return

activeIndex.value = activeIndex.value < 0
? (direction > 0 ? 0 : props.data.length - 1)
: Math.max(0, Math.min(props.data.length - 1, activeIndex.value + direction))
}

async function select(item: T) {
open.value = false
props.selector.select(item)
await nextTick()
clearButton.value?.focus()
}

function onKeyDown(event: KeyboardEvent) {
if (event.isComposing)
return

const candidate = props.data[activeIndex.value]
if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
event.preventDefault()
move(event.key === 'ArrowDown' ? 1 : -1)
}
else if (open.value && event.key === 'Enter' && candidate) {
event.preventDefault()
select(candidate)
}
else if (open.value && event.key === 'Escape') {
event.stopPropagation()
open.value = false
}
}

async function clear() {
emit('clear')
await nextTick()
input.value?.focus()
}
</script>

<template>
<div class="flex-1 w-0 h-full">
<div v-if="selector.state.value.selected" class="w-full overflow-hidden flex items-center border border-base rounded p1 relative">
<div class="overflow-hidden text-ellipsis pr6 w-0 flex-1">
<div class="overflow-hidden text-ellipsis text-nowrap pr6 w-0 flex-1">
<slot name="item" />
</div>
<button class="i-carbon-clean text-4 hover:op100 op50 absolute right-2" title="Clear" @click="emit('clear')" />
<button ref="clearButton" type="button" class="i-carbon-clean text-4 hover:op100 op50 absolute right-2" :aria-label="`Clear ${placeholder}`" title="Clear" @click="clear" />
</div>
<VMenu v-else :distance="15" :triggers="['click']" :auto-hide="false" :delay="{ show: 300, hide: 150 }" class="h-full">
<VMenu v-else v-model:shown="open" :distance="15" :triggers="[]" :popper-triggers="[]" :auto-hide="false" :delay="0" no-auto-focus class="h-full">
<input
ref="input"
v-model="search"
class="py1 px4 w-full h-full border border-base rounded-1" style="outline: none" :placeholder="placeholder"
@blur="hideAllPoppers"
role="combobox" aria-autocomplete="list"
:aria-label="placeholder" :aria-expanded="open" :aria-controls="listId"
:aria-activedescendant="open && activeIndex >= 0 ? `${listId}-${activeIndex}` : undefined"
class="py1 px4 w-full h-full border border-base rounded-1" :placeholder="placeholder"
@focus="open = true" @click="open = true" @input="open = true" @blur="open = false"
@keydown="onKeyDown"
>
<template #popper>
<div class="p2 w100 flex flex-col gap2">
<slot v-if="data?.length" name="list" />
<div :id="listId" role="listbox" :aria-label="placeholder" class="p2 w100">
<DynamicScroller v-if="data.length" :key="search" ref="scroller" :items="data" key-field="id" :min-item-size="32" class="max-h-64 overflow-y-auto">
<template #default="{ item, index, active }">
<DynamicScrollerItem :item="item" :active="active" :index="index">
<div
:id="active ? `${listId}-${index}` : undefined" role="option" :aria-selected="index === activeIndex"
:class="{ 'bg-active': index === activeIndex }" class="mb1 cursor-pointer rounded border border-base px2 py1 hover:bg-active"
@mousedown.prevent @click="select(item as T)"
>
<slot name="option" :item="(item as T)" />
</div>
</DynamicScrollerItem>
</template>
</DynamicScroller>
<slot v-else name="empty" />
</div>
</template>
Expand Down
12 changes: 1 addition & 11 deletions packages/vite/src/app/pages/graph.vue
Original file line number Diff line number Diff line change
Expand Up @@ -255,21 +255,11 @@ onKeyDown('Escape', (e) => {
<DataSearchPanel v-model="searchValue" :rules="searchFilterTypes">
<template v-if="pathSelectorVisible" #search>
<DataPathSelector :data="searched" import-id-key="module_id" :search-keys="['id']" @select="selectPathNodes" @close="togglePathSelector(false)">
<template #list="{ select, data }">
<ModulesFlatList
v-if="data?.length"
:root="root"
:modules="data"
disable-tooltip
:link="false"
@select="select"
/>
</template>
<template #item="{ id }">
<DisplayModuleId
:id="id"
:cwd="root"
class="block text-nowrap"
class="block"
:link="false"
:disable-tooltip="true"
/>
Expand Down
Loading