From e0511edc4dc909bd7415ca464323e70a250a609a Mon Sep 17 00:00:00 2001 From: triesap Date: Wed, 18 Feb 2026 20:56:18 +0000 Subject: [PATCH 1/4] Add drag and drop for space icons --- src/app/components/MenuOtherSpaces.svelte | 69 ++++++++++++++++- src/app/components/PrimaryNav.svelte | 23 +++--- src/routes/spaces/+page.svelte | 92 ++++++++++++++++++++++- 3 files changed, 165 insertions(+), 19 deletions(-) diff --git a/src/app/components/MenuOtherSpaces.svelte b/src/app/components/MenuOtherSpaces.svelte index 63a31858..2f7c3469 100644 --- a/src/app/components/MenuOtherSpaces.svelte +++ b/src/app/components/MenuOtherSpaces.svelte @@ -6,10 +6,73 @@ } const {urls}: Props = $props() + + const reorderUrls = (sourceUrl: string, targetUrl: string, currentUrls: string[]) => { + if (sourceUrl === targetUrl) { + return currentUrls + } + + const sourceIndex = currentUrls.indexOf(sourceUrl) + const targetIndex = currentUrls.indexOf(targetUrl) + + if (sourceIndex === -1 || targetIndex === -1) { + return currentUrls + } + + const nextUrls = currentUrls.filter(url => url !== sourceUrl) + + nextUrls.splice(targetIndex, 0, sourceUrl) + + return nextUrls + } + + const moveDraggedUrl = (targetUrl: string) => { + if (!draggedUrl) { + return + } + + orderedUrls = reorderUrls(draggedUrl, targetUrl, orderedUrls) + } + + const onDragStart = (e: DragEvent, url: string) => { + draggedUrl = url + + if (e.dataTransfer) { + e.dataTransfer.effectAllowed = "move" + e.dataTransfer.setData("text/plain", url) + } + } + + const onDragOver = (e: DragEvent, targetUrl: string) => { + e.preventDefault() + moveDraggedUrl(targetUrl) + } + + const onDrop = (e: DragEvent, targetUrl: string) => { + e.preventDefault() + moveDraggedUrl(targetUrl) + draggedUrl = undefined + } + + const onDragEnd = () => { + draggedUrl = undefined + } + + let orderedUrls = $state([...urls]) + let draggedUrl = $state() -
- {#each urls as url (url)} - +
+ {#each orderedUrls as url (url)} +
onDragStart(e, url)} + ondragover={e => onDragOver(e, url)} + ondrop={e => onDrop(e, url)} + ondragend={onDragEnd}> + +
{/each}
diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte index 7d3ff21f..47a4426b 100644 --- a/src/app/components/PrimaryNav.svelte +++ b/src/app/components/PrimaryNav.svelte @@ -1,7 +1,6 @@ @@ -60,15 +59,13 @@ {#each primarySpaceUrls as url (url)} {/each} - {#if secondarySpaceUrls.length > 0} - - - - {/if} + + + diff --git a/src/routes/spaces/+page.svelte b/src/routes/spaces/+page.svelte index ecf79939..d9b53c4e 100644 --- a/src/routes/spaces/+page.svelte +++ b/src/routes/spaces/+page.svelte @@ -12,6 +12,83 @@ import {pushModal} from "@app/util/modal" const addSpace = () => pushModal(SpaceAdd) + + const reconcileUrls = (currentUrls: string[], nextUrls: string[]) => { + const mergedUrls = currentUrls.filter(url => nextUrls.includes(url)) + + for (const url of nextUrls) { + if (!mergedUrls.includes(url)) { + mergedUrls.push(url) + } + } + + return mergedUrls + } + + const isSameOrder = (a: string[], b: string[]) => + a.length === b.length && a.every((url, index) => url === b[index]) + + const reorderUrls = (sourceUrl: string, targetUrl: string, currentUrls: string[]) => { + if (sourceUrl === targetUrl) { + return currentUrls + } + + const sourceIndex = currentUrls.indexOf(sourceUrl) + const targetIndex = currentUrls.indexOf(targetUrl) + + if (sourceIndex === -1 || targetIndex === -1) { + return currentUrls + } + + const nextUrls = currentUrls.filter(url => url !== sourceUrl) + + nextUrls.splice(targetIndex, 0, sourceUrl) + + return nextUrls + } + + const moveDraggedUrl = (targetUrl: string) => { + if (!draggedUrl) { + return + } + + orderedSpaceUrls = reorderUrls(draggedUrl, targetUrl, orderedSpaceUrls) + } + + const onDragStart = (e: DragEvent, url: string) => { + draggedUrl = url + + if (e.dataTransfer) { + e.dataTransfer.effectAllowed = "move" + e.dataTransfer.setData("text/plain", url) + } + } + + const onDragOver = (e: DragEvent, targetUrl: string) => { + e.preventDefault() + moveDraggedUrl(targetUrl) + } + + const onDrop = (e: DragEvent, targetUrl: string) => { + e.preventDefault() + moveDraggedUrl(targetUrl) + draggedUrl = undefined + } + + const onDragEnd = () => { + draggedUrl = undefined + } + + $effect(() => { + const nextUrls = reconcileUrls(orderedSpaceUrls, $userSpaceUrls) + + if (!isSameOrder(nextUrls, orderedSpaceUrls)) { + orderedSpaceUrls = nextUrls + } + }) + + let orderedSpaceUrls = $state([]) + let draggedUrl = $state() @@ -33,7 +110,7 @@ {/if} {/snippet} - + {#each PLATFORM_RELAYS as url (url)} {:else} @@ -43,8 +120,17 @@ Loading your spaces...
{:then} - {#each $userSpaceUrls as url (url)} - + {#each orderedSpaceUrls as url (url)} +
onDragStart(e, url)} + ondragover={e => onDragOver(e, url)} + ondrop={e => onDrop(e, url)} + ondragend={onDragEnd}> + +
{:else}

You haven't added any spaces yet!

-- 2.52.0 From 64a62a72d14909dfdb764bf9317ada9aab5acc43 Mon Sep 17 00:00:00 2001 From: triesap Date: Wed, 18 Feb 2026 21:28:21 +0000 Subject: [PATCH 2/4] Persist space icon order --- src/app/components/MenuOtherSpaces.svelte | 50 +++++++++++++---------- src/app/core/commands.ts | 15 +++++++ src/routes/spaces/+page.svelte | 49 +++++++++++----------- 3 files changed, 69 insertions(+), 45 deletions(-) diff --git a/src/app/components/MenuOtherSpaces.svelte b/src/app/components/MenuOtherSpaces.svelte index 2f7c3469..7159a183 100644 --- a/src/app/components/MenuOtherSpaces.svelte +++ b/src/app/components/MenuOtherSpaces.svelte @@ -1,5 +1,7 @@
diff --git a/src/app/core/commands.ts b/src/app/core/commands.ts index b33ec4d9..2ea604a8 100644 --- a/src/app/core/commands.ts +++ b/src/app/core/commands.ts @@ -37,6 +37,7 @@ import { makeList, addToListPublicly, removeFromListByPredicate, + updateList, getTag, getListTags, getRelayTagValues, @@ -148,6 +149,20 @@ export const removeSpaceMembership = async (url: string) => { return publishThunk({event, relays}) } +export const setSpaceMembershipOrder = async (urls: string[]) => { + const list = get(userGroupList) || makeList({kind: ROOMS}) + const orderedUrls = uniq(urls.map(normalizeRelayUrl)) + const relayTags = list.publicTags.filter(t => t[0] === "r") + const otherPublicTags = list.publicTags.filter(t => t[0] !== "r") + const relayTagByUrl = new Map(relayTags.map(t => [normalizeRelayUrl(t[1]), t])) + const orderedRelayTags = orderedUrls.map(url => relayTagByUrl.get(url) || ["r", url]) + const publicTags = [...orderedRelayTags, ...otherPublicTags] + const event = await updateList(list, {publicTags}).reconcile(nip44EncryptToSelf) + const relays = uniq([...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)]) + + return publishThunk({event, relays}) +} + export const addRoomMembership = async (url: string, h: string) => { const list = get(userGroupList) || makeList({kind: ROOMS}) const newTags = [ diff --git a/src/routes/spaces/+page.svelte b/src/routes/spaces/+page.svelte index d9b53c4e..48e0875e 100644 --- a/src/routes/spaces/+page.svelte +++ b/src/routes/spaces/+page.svelte @@ -1,4 +1,5 @@ -- 2.52.0 From 84acad4a207091640c9080b8a8eb4c5e202a1815 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Wed, 18 Feb 2026 14:55:58 -0800 Subject: [PATCH 3/4] Remove other spaces menu, just use the page version --- src/app/components/MenuOtherSpaces.svelte | 84 ----------------------- src/app/components/MenuSpacesItem.svelte | 2 +- src/app/components/PrimaryNav.svelte | 5 +- src/routes/spaces/+page.svelte | 2 +- 4 files changed, 3 insertions(+), 90 deletions(-) delete mode 100644 src/app/components/MenuOtherSpaces.svelte diff --git a/src/app/components/MenuOtherSpaces.svelte b/src/app/components/MenuOtherSpaces.svelte deleted file mode 100644 index 7159a183..00000000 --- a/src/app/components/MenuOtherSpaces.svelte +++ /dev/null @@ -1,84 +0,0 @@ - - -
- {#each orderedUrls as url (url)} -
onDragStart(e, url)} - ondragover={e => onDragOver(e, url)} - ondrop={e => onDrop(e, url)} - ondragend={onDragEnd}> - -
- {/each} -
diff --git a/src/app/components/MenuSpacesItem.svelte b/src/app/components/MenuSpacesItem.svelte index 01fe73bb..d342ccfc 100644 --- a/src/app/components/MenuSpacesItem.svelte +++ b/src/app/components/MenuSpacesItem.svelte @@ -13,7 +13,7 @@ - + {#snippet icon()} {/snippet} diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte index 47a4426b..e0f9d5a5 100644 --- a/src/app/components/PrimaryNav.svelte +++ b/src/app/components/PrimaryNav.svelte @@ -14,7 +14,6 @@ import Divider from "@lib/components/Divider.svelte" import PrimaryNavItem from "@lib/components/PrimaryNavItem.svelte" import ChatEnable from "@app/components/ChatEnable.svelte" - import MenuOtherSpaces from "@app/components/MenuOtherSpaces.svelte" import MenuSettings from "@app/components/MenuSettings.svelte" import PrimaryNavItemSpace from "@app/components/PrimaryNavItemSpace.svelte" import {userSpaceUrls, PLATFORM_RELAYS, PLATFORM_LOGO} from "@app/core/state" @@ -27,8 +26,6 @@ const {children}: Props = $props() - const showOtherSpacesMenu = () => pushModal(MenuOtherSpaces, {urls: $userSpaceUrls}) - const showSettingsMenu = () => pushModal(MenuSettings) const openChat = () => ($shouldUnwrap ? goto("/chat") : pushModal(ChatEnable, {next: "/chat"})) @@ -60,9 +57,9 @@ {/each} diff --git a/src/routes/spaces/+page.svelte b/src/routes/spaces/+page.svelte index 48e0875e..7fbb5084 100644 --- a/src/routes/spaces/+page.svelte +++ b/src/routes/spaces/+page.svelte @@ -113,7 +113,7 @@ {/if} {/snippet} - + {#each PLATFORM_RELAYS as url (url)} {:else} -- 2.52.0 From bc8803094344c9c5a11fbc4fb2b61d9d411fe740 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Wed, 18 Feb 2026 14:59:00 -0800 Subject: [PATCH 4/4] Bring back secondary space urls logic for showing notification badge --- src/app/components/PrimaryNav.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte index e0f9d5a5..081d9829 100644 --- a/src/app/components/PrimaryNav.svelte +++ b/src/app/components/PrimaryNav.svelte @@ -1,6 +1,7 @@ -- 2.52.0