mirror of
https://github.com/modrinth/code.git
synced 2026-08-30 11:36:05 +00:00
* refactor: remove unused legacy onboarded flag * sqlx prepare * feat: add onboarding checklist app db and add vue provider * feat: add welcome page * feat: add onboarding checklist component * feat: move checklist visibility source of truth in app db * feat: split up import modpack button * feat-small: style tweak * feat: remove discover section from homepage and add library * refactor: move welcome screen to component * refactor: move grid display into /library * refactor: rename existing components * refactor: split up the current library page files * feat: add create group modal * feat: add instance group definitions * feat: update accordian for instance groups * feat: add delete group * feat: implement rename instance groups * refactor: move instance group api out * feat: add context menu for groups * feat: style instance items in library * feat: add selected instance item state * feat: implement action bar for selection * feat: drag and drop to move between groups * feat: show ungrouped with header * feat: improve edit group name * small fix * small style fixes * feat: improve selection behaviour * fix: dont toggle group when context menu open * feat: drag and drop multiple selected * small * feat: add remove from group in action bar * feat: add delay on icon hiding in inline input * feat: improve icon hiding delay * fix: bad routes.js * feat: implement sort and filter options * refactor: dont prefix filenames * feat: change open/collapse group target * feat: improve ungrouped behaviour * feat: add shift to select multiple instances * fix: icon disappear transition * feat: add esc while dragging to cancel * feat: update sorting and moved label * feat: update context menu * fix: multiple context menus can be opened * refactor: instance groups to be identified by ID instead of name, names become display data * feat: creating new group always adds instance * feat: create group button, fix instance selection, and increase group name max length * feat: strokes * fix: show getting started checklist in all sidebar * feat: set size on microsoft login screen * fix: use ButtonStyled in Chips component * feat: creating groups with selected instances and fix some moving selection and duplication bugs * pnpm prepr * feat: add tooltip for instance already in group * feat: create instance with content in creation flow modal - search modpack becomes search projects - creation flow modal context receives prepareProjectInstall and createProjectInstall callbacks, from content-install.ts (shared with ContentInstallModal) * feat: update instance card styles * refactor: separate out instance card content * update styles * refactor: instance card * fix: width of instance * feat: update empty state * feat: update sort and grouping dropdowns * feat: better context menu options * feat: add group action buttons * feat: add/remove favourites group * remove manual sort * feat: improve the "New group" jank * feat: add group by instance type and change group sorting * feat: welcome screen styles match figma * feat: not signed in skins demo * feat: new hosting empty state * feat: new instance card style * feat: add tooltip and spice up animation more * feat: improve the transitions for groups after dropping many instances * feat: set instance group membership for bulk moving * feat: remove fade out * fix: allow dragging from buttons inside instance card * fix: library page load in behaviour * small fix * feat: add group ordering and reordering * feat: add drag to reorder groups * fix: switching page not clearing selected instances * style fixes * style fix * fix spacing * feat: jump in changes * feat: add styled newly created instances * feat: improve jump in cards styles * fix: welcome screen style * fix: empty state styles * feat: max 5 jump in items * feat: max new instances to 3 * fix: search icon * feat: clear selection after move * feat: skins list use check icon styles * feat: list will be deleted instances and default sort last played * fix: stroke * remove: no more group settings in instance general settings * fix: resolving modpack server install * feat: icon editor * feat: add three hue shifted variants * fix: surprise me doesnt pick symbol * feat: add customize icon to create instance modal * feat: skins loading state style * fix: welcome logo * fix: copy * fix: left over usage of ButtonStyled from main's refactor * feat: some leaked merge stuff * feat: server empty state styles * remove: instance helper text * remove: auto link in set up stage * feat: auto focus on search when modal open * fix: delete instance modal style * remove: modpack meta repeating * fix: icon * fix: font weight * fix: dropdown filter preview heights * pnpm prepr * fix: sign into modrinth flashing change in position * feat: add avatar transparent corner gets padding * feat: drag and hold over group opens group * feat: add random icon for custom instance * feat: update loading icon * polish: empty state for search * polish: jump in cards * fix: avatar could skip checking for image if tauri loads it first * feat: add icon customize and randomizer in content install modal for add to new instances * fix: avatar cannot read image pixels due to cors * refactor: popup notifications toast type for instance sharing notifications * feat: apply random icons modal and add popup notification for it * polish: style * fix: set_webview_visible * QA * qa * feat: add inner white 15 opacity stroke around avatar * add to catalog * pnpm prepr * fix: app event import * feat: add new icons and backgrounds for icon editor * feat: recents list generate from randomized icons and save icon in editor + icon editor modal fixes * qa * refactor: recipe -> config * fix: event bus * polish * feat: add safe guard against randomizing empty icons * feat: navigate to instance after creation * fix: icon file names * i18n on welcome screen * i18n pass on PR * fix: inconsistent max group name length * refactor: use sqlx macro * feat: add instance icon background selection drag * feat: update catalog order * fix: remove gradient for welcome screen * remove: frog * fix: min width * feat: update corner size * fix: context menu styles * prepr * fix: instance name trimming * reorder * fix: instance card loading state stayed until hovering * feat: add icon randomizer blacklist * blog * prepr --------- Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
237 lines
6.3 KiB
Vue
237 lines
6.3 KiB
Vue
<script setup lang="ts">
|
|
import {
|
|
DragDropProvider,
|
|
type DragEndEvent,
|
|
type DragMoveEvent,
|
|
type DragOverEvent,
|
|
DragOverlay,
|
|
type DragStartEvent,
|
|
} from '@dnd-kit/vue'
|
|
import { computed, nextTick, onBeforeUnmount, ref, toRef, watch } from 'vue'
|
|
|
|
import DragGather from '@/components/ui/library/instance-group/drag-gather.vue'
|
|
import DragPreview from '@/components/ui/library/instance-group/drag-preview.vue'
|
|
import { useInstanceDragGather } from '@/components/ui/library/instance-group/use-instance-drag-gather'
|
|
import { useLibrary } from '@/components/ui/library/use-library'
|
|
import type { GameInstance } from '@/helpers/types'
|
|
|
|
type InstanceDragData = {
|
|
instanceId: string
|
|
fromGroup: string
|
|
}
|
|
|
|
type InstanceGroupDndDropData = {
|
|
groupId: string
|
|
}
|
|
|
|
const props = defineProps<{
|
|
instances: GameInstance[]
|
|
}>()
|
|
|
|
const GROUP_HOVER_OPEN_DELAY = 750
|
|
|
|
const {
|
|
activeInstanceGroupDrag,
|
|
instanceGroupDragPointer,
|
|
instanceGroupDragStatus,
|
|
instanceGroupDragTarget,
|
|
isSectionCollapsed,
|
|
setSectionCollapsed,
|
|
startInstanceGroupDrag,
|
|
updateInstanceGroupDrag,
|
|
finishInstanceGroupDrag,
|
|
setInstanceGroupDragTarget,
|
|
getInstanceGroupDropState,
|
|
moveDraggedInstancesToGroup,
|
|
} = useLibrary()
|
|
|
|
const draggedInstances = computed(() => {
|
|
const drag = activeInstanceGroupDrag.value
|
|
if (!drag) return []
|
|
|
|
const draggedInstanceIds = new Set(drag.instances.map((selection) => selection.instanceId))
|
|
return props.instances.filter((instance) => draggedInstanceIds.has(instance.id))
|
|
})
|
|
const draggedInstance = computed(() => {
|
|
const drag = activeInstanceGroupDrag.value
|
|
return drag
|
|
? props.instances.find((instance) => instance.id === drag.primaryInstanceId)
|
|
: undefined
|
|
})
|
|
const {
|
|
items: gatherItems,
|
|
target: gatherTarget,
|
|
isGathering,
|
|
start: startGather,
|
|
updateTarget: updateGatherTarget,
|
|
clear: clearGather,
|
|
finish: finishGather,
|
|
} = useInstanceDragGather(toRef(props, 'instances'))
|
|
|
|
const instanceGroupDragStatusPopover = ref<HTMLElement>()
|
|
let statusPopoverFrame: number | undefined
|
|
let groupHoverOpenTimeout: ReturnType<typeof setTimeout> | undefined
|
|
|
|
const instanceGroupDragStatusStyle = computed(() => ({
|
|
left: `${Math.min(instanceGroupDragPointer.value.x + 4, window.innerWidth - 220)}px`,
|
|
top: `${Math.min(instanceGroupDragPointer.value.y + 4, window.innerHeight - 48)}px`,
|
|
}))
|
|
|
|
const hoveredCollapsedGroupId = computed(() => {
|
|
const target = instanceGroupDragTarget.value
|
|
if (
|
|
!activeInstanceGroupDrag.value ||
|
|
!target ||
|
|
!isSectionCollapsed(target) ||
|
|
!getInstanceGroupDropState(target).canDrop
|
|
) {
|
|
return null
|
|
}
|
|
|
|
return target
|
|
})
|
|
|
|
watch(
|
|
activeInstanceGroupDrag,
|
|
(drag) => {
|
|
if (statusPopoverFrame !== undefined) {
|
|
cancelAnimationFrame(statusPopoverFrame)
|
|
statusPopoverFrame = undefined
|
|
}
|
|
|
|
const popover = instanceGroupDragStatusPopover.value
|
|
if (!drag) {
|
|
if (popover?.matches(':popover-open')) {
|
|
popover.hidePopover()
|
|
}
|
|
return
|
|
}
|
|
|
|
statusPopoverFrame = requestAnimationFrame(() => {
|
|
statusPopoverFrame = undefined
|
|
const currentPopover = instanceGroupDragStatusPopover.value
|
|
if (activeInstanceGroupDrag.value && !currentPopover?.matches(':popover-open')) {
|
|
currentPopover?.showPopover()
|
|
}
|
|
})
|
|
},
|
|
{ flush: 'sync' },
|
|
)
|
|
|
|
function clearGroupHoverOpenTimeout() {
|
|
if (groupHoverOpenTimeout !== undefined) {
|
|
clearTimeout(groupHoverOpenTimeout)
|
|
}
|
|
groupHoverOpenTimeout = undefined
|
|
}
|
|
|
|
watch(hoveredCollapsedGroupId, (target) => {
|
|
clearGroupHoverOpenTimeout()
|
|
if (!target) return
|
|
|
|
groupHoverOpenTimeout = setTimeout(() => {
|
|
groupHoverOpenTimeout = undefined
|
|
if (hoveredCollapsedGroupId.value === target) {
|
|
setSectionCollapsed(target, false)
|
|
}
|
|
}, GROUP_HOVER_OPEN_DELAY)
|
|
})
|
|
|
|
onBeforeUnmount(() => {
|
|
if (statusPopoverFrame !== undefined) {
|
|
cancelAnimationFrame(statusPopoverFrame)
|
|
}
|
|
clearGroupHoverOpenTimeout()
|
|
})
|
|
|
|
function isAltKeyPressed(event?: Event) {
|
|
return event instanceof MouseEvent || event instanceof KeyboardEvent ? event.altKey : false
|
|
}
|
|
|
|
function handleDragStart(event: DragStartEvent) {
|
|
const sourceData = event.operation.source?.data as InstanceDragData | undefined
|
|
if (!sourceData) return
|
|
|
|
const pointer = event.operation.position.current
|
|
startInstanceGroupDrag(
|
|
sourceData.instanceId,
|
|
sourceData.fromGroup,
|
|
pointer,
|
|
isAltKeyPressed(event.nativeEvent),
|
|
)
|
|
startGather(activeInstanceGroupDrag.value, sourceData, pointer)
|
|
}
|
|
|
|
function handleDragMove(event: DragMoveEvent) {
|
|
const pointer = event.to ?? event.operation.position.current
|
|
updateInstanceGroupDrag(pointer, isAltKeyPressed(event.nativeEvent))
|
|
if (gatherItems.value.length > 0) {
|
|
updateGatherTarget(pointer)
|
|
}
|
|
}
|
|
|
|
function handleDragOver(event: DragOverEvent) {
|
|
const targetData = event.operation.target?.data as InstanceGroupDndDropData | undefined
|
|
setInstanceGroupDragTarget(targetData?.groupId ?? null)
|
|
}
|
|
|
|
async function handleDragEnd(event: DragEndEvent) {
|
|
clearGroupHoverOpenTimeout()
|
|
const targetData = event.operation.target?.data as InstanceGroupDndDropData | undefined
|
|
let isMovingInstances = false
|
|
if (!event.canceled && targetData) {
|
|
const dropState = getInstanceGroupDropState(targetData.groupId)
|
|
if (dropState.canDrop) {
|
|
void moveDraggedInstancesToGroup(targetData.groupId, dropState.operation === 'add')
|
|
isMovingInstances = true
|
|
}
|
|
}
|
|
if (isMovingInstances) {
|
|
await nextTick()
|
|
}
|
|
|
|
clearGather()
|
|
finishInstanceGroupDrag()
|
|
}
|
|
</script>
|
|
|
|
<template>
|
|
<DragDropProvider
|
|
@drag-start="handleDragStart"
|
|
@drag-move="handleDragMove"
|
|
@drag-over="handleDragOver"
|
|
@drag-end="handleDragEnd"
|
|
>
|
|
<slot />
|
|
<Teleport to="body">
|
|
<div class="pointer-events-none fixed inset-0 z-[9999]">
|
|
<DragOverlay :drop-animation="null">
|
|
<div
|
|
v-if="draggedInstance"
|
|
class="w-full transition-all duration-150 ease-out"
|
|
:class="isGathering ? 'scale-[0.975]' : 'scale-100'"
|
|
>
|
|
<DragPreview :instance="draggedInstance" :count="draggedInstances.length" />
|
|
</div>
|
|
</DragOverlay>
|
|
</div>
|
|
</Teleport>
|
|
</DragDropProvider>
|
|
<DragGather
|
|
v-if="gatherItems.length > 0"
|
|
:items="gatherItems"
|
|
:target="gatherTarget"
|
|
@complete="finishGather"
|
|
/>
|
|
<Teleport to="body">
|
|
<div
|
|
ref="instanceGroupDragStatusPopover"
|
|
popover="manual"
|
|
class="pointer-events-none fixed inset-auto z-[9999] m-0 rounded-xl border border-solid border-surface-5 bg-surface-4 px-2 py-1.5 text-sm font-semibold text-contrast empty:hidden"
|
|
:style="instanceGroupDragStatusStyle"
|
|
>
|
|
{{ instanceGroupDragStatus }}
|
|
</div>
|
|
</Teleport>
|
|
</template>
|