|
2 | 2 | import type { DevframeDockEntry, DevframeViewGroup } from '@devframes/hub' |
3 | 3 | import type { DocksContext } from '@devframes/hub/client' |
4 | 4 | import { watchDebounced } from '@vueuse/core' |
5 | | -import { computed, h, ref, useTemplateRef, watch } from 'vue' |
| 5 | +import { computed, h, nextTick, ref, useTemplateRef, watch } from 'vue' |
6 | 6 | import { t } from '../../i18n' |
7 | | -import { deriveSidebarCapacity, docksSplitGroupsWithCapacity, getGroupMembersGrouped } from '../../state/dock-settings' |
| 7 | +import { applyCustomOrderPatch, deriveSidebarCapacity, docksSplitGroupsWithCapacity, getGroupMembersGrouped, resolveGroupMemberMove } from '../../state/dock-settings' |
8 | 8 | import { getCurrentDockId } from '../../state/docks' |
9 | 9 | import { dockTooltipContent, setDocksSidebarOverflowPanel, setFloatingTooltip, useDocksSidebarOverflowPanel } from '../../state/floating-tooltip' |
10 | 10 | import { useSettings } from '../../state/settings-defaults' |
@@ -101,10 +101,112 @@ const currentInOverflow = computed(() => |
101 | 101 | const selectedInOverflow = computed(() => |
102 | 102 | !!props.selectedId && overflowGroups.value.some(([, items]) => items.some(m => m.id === props.selectedId))) |
103 | 103 |
|
| 104 | +// Set when a drag ends, so the click that follows it does not open the member. |
| 105 | +let suppressClick = false |
| 106 | +
|
104 | 107 | function select(id: string) { |
| 108 | + if (suppressClick) { |
| 109 | + suppressClick = false |
| 110 | + return |
| 111 | + } |
105 | 112 | props.context.docks.switchEntry(id) |
106 | 113 | } |
107 | 114 |
|
| 115 | +// --- Reorder --- |
| 116 | +// Drag a member up or down within its sub-category, or press Alt+ArrowUp / |
| 117 | +// Alt+ArrowDown on it. The order is saved to `docksCustomOrder`, the same |
| 118 | +// setting the Docks settings page edits. Pointer capture keeps the drag alive |
| 119 | +// while the pointer crosses the panel's iframe. |
| 120 | +const DRAG_THRESHOLD = 4 |
| 121 | +const draggingId = ref<string | null>(null) |
| 122 | +const dragOverId = ref<string | null>(null) |
| 123 | +let dragStart: { id: string, y: number } | null = null |
| 124 | +
|
| 125 | +function moveMember(fromId: string, toId: string): boolean { |
| 126 | + const patch = resolveGroupMemberMove(props.context.docks.entries, props.group.id, settings.value, fromId, toId) |
| 127 | + if (!patch) |
| 128 | + return false |
| 129 | + props.context.docks.settings.mutate(state => applyCustomOrderPatch(state, patch)) |
| 130 | + return true |
| 131 | +} |
| 132 | +
|
| 133 | +function findSubcategory(id: string) { |
| 134 | + return visibleGroups.value.find(([, items]) => items.some(m => m.id === id)) |
| 135 | +} |
| 136 | +
|
| 137 | +// Where the drop line shows on the hovered member: the dragged member takes |
| 138 | +// the hovered member's slot, so it lands before it when moving up and after |
| 139 | +// it when moving down. |
| 140 | +const dropSide = computed<'before' | 'after' | null>(() => { |
| 141 | + if (!draggingId.value || !dragOverId.value) |
| 142 | + return null |
| 143 | + const items = findSubcategory(draggingId.value)?.[1] ?? [] |
| 144 | + const from = items.findIndex(m => m.id === draggingId.value) |
| 145 | + const to = items.findIndex(m => m.id === dragOverId.value) |
| 146 | + return from > to |
| 147 | + ? 'before' |
| 148 | + : 'after' |
| 149 | +}) |
| 150 | +
|
| 151 | +function onMemberPointerDown(event: PointerEvent, id: string) { |
| 152 | + hideTooltip() |
| 153 | + suppressClick = false |
| 154 | + if (event.button !== 0) |
| 155 | + return |
| 156 | + dragStart = { id, y: event.clientY } |
| 157 | + ;(event.currentTarget as HTMLElement).setPointerCapture(event.pointerId) |
| 158 | +} |
| 159 | +
|
| 160 | +function onMemberPointerMove(event: PointerEvent) { |
| 161 | + if (!dragStart) |
| 162 | + return |
| 163 | + if (!draggingId.value) { |
| 164 | + if (Math.abs(event.clientY - dragStart.y) < DRAG_THRESHOLD) |
| 165 | + return |
| 166 | + draggingId.value = dragStart.id |
| 167 | + } |
| 168 | + const peers = findSubcategory(dragStart.id)?.[1] ?? [] |
| 169 | + const target = peers.find((m) => { |
| 170 | + const rect = sidebar.value?.querySelector(`[data-dock-id="${CSS.escape(m.id)}"]`)?.getBoundingClientRect() |
| 171 | + return rect && event.clientY >= rect.top && event.clientY <= rect.bottom |
| 172 | + }) |
| 173 | + dragOverId.value = target && target.id !== dragStart.id |
| 174 | + ? target.id |
| 175 | + : null |
| 176 | +} |
| 177 | +
|
| 178 | +function onMemberPointerUp() { |
| 179 | + if (draggingId.value) { |
| 180 | + // A drag is not a click, even when it ends on the start button. |
| 181 | + suppressClick = true |
| 182 | + if (dragOverId.value) |
| 183 | + moveMember(draggingId.value, dragOverId.value) |
| 184 | + } |
| 185 | + resetDrag() |
| 186 | +} |
| 187 | +
|
| 188 | +function resetDrag() { |
| 189 | + dragStart = null |
| 190 | + draggingId.value = null |
| 191 | + dragOverId.value = null |
| 192 | +} |
| 193 | +
|
| 194 | +async function onMemberKeydown(event: KeyboardEvent, id: string) { |
| 195 | + if (!event.altKey || (event.key !== 'ArrowUp' && event.key !== 'ArrowDown')) |
| 196 | + return |
| 197 | + event.preventDefault() |
| 198 | + const items = findSubcategory(id)?.[1] ?? [] |
| 199 | + const index = items.findIndex(m => m.id === id) |
| 200 | + const neighbor = items[index + (event.key === 'ArrowUp' |
| 201 | + ? -1 |
| 202 | + : 1)] |
| 203 | + if (!neighbor || !moveMember(id, neighbor.id)) |
| 204 | + return |
| 205 | + // Moving the focused button in the DOM can drop focus, so put it back. |
| 206 | + await nextTick() |
| 207 | + sidebar.value?.querySelector<HTMLElement>(`[data-dock-id="${CSS.escape(id)}"]`)?.focus() |
| 208 | +} |
| 209 | +
|
108 | 210 | function showTooltip(event: PointerEvent, entry: { title: string, description?: string }) { |
109 | 211 | setFloatingTooltip({ |
110 | 212 | content: dockTooltipContent(entry), |
@@ -212,19 +314,31 @@ const moreButtonActive = computed(() => selectedInOverflow.value || isOverflowPa |
212 | 314 | <button |
213 | 315 | v-for="member of members" |
214 | 316 | :key="member.id" |
| 317 | + :data-dock-id="member.id" |
215 | 318 | :aria-label="member.title" |
216 | 319 | :aria-current="currentId === member.id ? 'page' : undefined" |
217 | 320 | class="relative flex items-center h-8 rounded-lg transition" |
218 | 321 | :class="[ |
219 | 322 | expanded ? 'gap-2 px1.5' : 'justify-center w-8', |
220 | 323 | selectedId === member.id ? 'text-primary bg-active' : 'op60 hover:op100 hover:bg-active', |
| 324 | + draggingId === member.id ? 'op30!' : '', |
221 | 325 | ]" |
222 | | - @pointerenter="showTooltip($event, member)" |
| 326 | + @pointerenter="draggingId || showTooltip($event, member)" |
223 | 327 | @pointerleave="hideTooltip" |
224 | | - @pointerdown="hideTooltip" |
| 328 | + @pointerdown="onMemberPointerDown($event, member.id)" |
| 329 | + @pointermove="onMemberPointerMove" |
| 330 | + @pointerup="onMemberPointerUp" |
| 331 | + @pointercancel="resetDrag" |
225 | 332 | @click="select(member.id)" |
| 333 | + @keydown="onMemberKeydown($event, member.id)" |
226 | 334 | @contextmenu="openContextMenu($event, member)" |
227 | 335 | > |
| 336 | + <!-- Drop line: where the dragged member will land --> |
| 337 | + <div |
| 338 | + v-if="dragOverId === member.id" |
| 339 | + class="absolute inset-x-1 h-0.5 rounded-full bg-primary pointer-events-none" |
| 340 | + :class="dropSide === 'before' ? '-top-0.5' : '-bottom-0.5'" |
| 341 | + /> |
228 | 342 | <DockIcon :icon="member.icon" class="w-5 h-5 flex-none" /> |
229 | 343 | <span v-if="expanded" class="flex-1 min-w-0 text-left text-sm truncate">{{ member.title }}</span> |
230 | 344 | <div |
|
0 commit comments