improve bookmarks page layout

2025-05-08 17:36:26 +01:00
parent 9b47b806d5
commit 79a17a714e
2 changed files with 133 additions and 64 deletions
--- a/packages/web/src/app/bookmarks.tsx
+++ b/packages/web/src/app/bookmarks.tsx
@@ -34,7 +34,9 @@ interface BookmarkPageState {
 	bookmarkToBeDeleted: LinkBookmark | null
 	layoutMode: LayoutMode
 	activeDialog: ActiveDialog
+	actionBarHeight: number

+	setActionBarHeight: (height: number) => void
 	setActiveDialog: (dialog: ActiveDialog) => void
 	setBookmarkItemExpanded: (isExpanded: boolean) => void
 	setBookmarkPreviewOpened: (isOpened: boolean) => void
@@ -54,6 +56,11 @@ const useBookmarkPageStore = create<BookmarkPageState>()((set, get) => ({
 	bookmarkToBeDeleted: null,
 	layoutMode: LAYOUT_MODE.popup,
 	activeDialog: ActiveDialog.None,
+	actionBarHeight: 0,
+
+	setActionBarHeight(height: number) {
+		set({ actionBarHeight: height })
+	},

 	setActiveDialog(dialog: ActiveDialog) {
 		set({ activeDialog: dialog })
@@ -77,16 +84,21 @@ const useBookmarkPageStore = create<BookmarkPageState>()((set, get) => ({

 	reconcileSelection(bookmarks: LinkBookmark[]) {
 		const { selectedBookmarkId, selectedBookmarkIndex } = get()
-		const newIndex = bookmarks.findIndex((bookmark) => bookmark.id === selectedBookmarkId)
-		if (newIndex !== selectedBookmarkIndex) {
-			if (newIndex >= 0) {
-				set({ selectedBookmarkIndex: newIndex })
-			} else if (selectedBookmarkIndex >= bookmarks.length - 1) {
-				set({ selectedBookmarkIndex: bookmarks.length - 1 })
-			} else if (selectedBookmarkIndex === 0) {
-				set({ selectedBookmarkIndex: 0 })
-			} else {
-				set({ selectedBookmarkIndex: selectedBookmarkIndex + 1 })
+
+		if (!selectedBookmarkId) {
+			set({ selectedBookmarkId: bookmarks[selectedBookmarkIndex].id })
+		} else {
+			const newIndex = bookmarks.findIndex((bookmark) => bookmark.id === selectedBookmarkId)
+			if (newIndex !== selectedBookmarkIndex) {
+				if (newIndex >= 0) {
+					set({ selectedBookmarkIndex: newIndex })
+				} else if (selectedBookmarkIndex >= bookmarks.length - 1) {
+					set({ selectedBookmarkIndex: bookmarks.length - 1 })
+				} else if (selectedBookmarkIndex === 0) {
+					set({ selectedBookmarkIndex: 0 })
+				} else {
+					set({ selectedBookmarkIndex: selectedBookmarkIndex + 1 })
+				}
 			}
 		}
 	},
@@ -121,15 +133,7 @@ function Page() {
 	return (
 		<div className="relative">
 			<Main>
-				<div className="flex flex-col md:flex-row justify-center py-16 lg:py-32">
-					<header className="mb-4 md:mb-0 md:mr-16 text-start">
-						<h1 className="font-bold text-start">
-							<span className="invisible md:hidden">&gt;&nbsp;</span>
-							YOUR BOOKMARKS
-						</h1>
-					</header>
-					<BookmarkListSection />
-				</div>
+				<BookmarkListPane />
 				<BookmarkPreview />
 				<ActionBar />
 			</Main>
@@ -145,8 +149,8 @@ function Main({ children }: React.PropsWithChildren) {
 	return (
 		<main
 			className={clsx(
-				"px-4 lg:px-8 2xl:px-0 grid flex justify-center relative w-full",
-				isPreviewOpened && layoutMode === LAYOUT_MODE.sideBySide ? "grid-cols-2" : "grid-cols-1",
+				"grid flex justify-center relative w-full",
+				isPreviewOpened && layoutMode === LAYOUT_MODE.sideBySide ? "grid-cols-3" : "grid-cols-1",
 			)}
 		>
 			{children}
@@ -154,6 +158,28 @@ function Main({ children }: React.PropsWithChildren) {
 	)
 }

+function BookmarkListPane() {
+	const isBookmarkPreviewOpened = useBookmarkPageStore((state) => state.isBookmarkPreviewOpened)
+
+	return (
+		<div className={clsx("flex flex-col py-16", { "md:flex-row lg:py-32 justify-center ": !isBookmarkPreviewOpened })}>
+			<header className="mb-4 md:mb-0 md:mr-16 text-start">
+				<h1 className={clsx("font-bold text-start", { "mb-4": isBookmarkPreviewOpened })}>
+					<span
+						className={clsx("invisible", {
+							"md:hidden": !isBookmarkPreviewOpened,
+						})}
+					>
+						&nbsp;&gt;&nbsp;
+					</span>
+					YOUR BOOKMARKS
+				</h1>
+			</header>
+			<BookmarkListSection />
+		</div>
+	)
+}
+
 function PageDialog() {
 	const dialog = useBookmarkPageStore((state) => state.activeDialog)
 	switch (dialog) {
@@ -385,42 +411,57 @@ function BookmarkList({ bookmarks }: { bookmarks: LinkBookmark[] }) {
 		reconcileSelection(bookmarks)
 	}, [bookmarks, reconcileSelection])

-	useEffect(() => {
-		function onKeyDown(event: KeyboardEvent) {
-			const state = useBookmarkPageStore.getState()
+	useMnemonics(
+		{
+			j: selectNextItem,
+			ArrowDown: selectNextItem,

-			switch (event.key) {
-				case "ArrowDown": {
-					const nextIndex = state.selectedBookmarkIndex + 1
-					if (nextIndex < bookmarks.length) {
-						state.selectBookmark(bookmarks[nextIndex], nextIndex)
-					}
-					break
-				}
-				case "ArrowUp": {
-					const prevIndex = state.selectedBookmarkIndex - 1
-					if (prevIndex >= 0) {
-						state.selectBookmark(bookmarks[prevIndex], prevIndex)
-					}
-					break
-				}
-				case "ArrowLeft":
-					state.setBookmarkItemExpanded(false)
-					break
-				case "ArrowRight":
-					state.setBookmarkItemExpanded(true)
-					break
-				default:
-					break
-			}
+			k: selectPrevItem,
+			ArrowUp: selectPrevItem,
+
+			h: collapseItem,
+			ArrowLeft: collapseItem,
+
+			l: expandItem,
+			ArrowRight: expandItem,
+
+			Enter: () => {
+				const state = useBookmarkPageStore.getState()
+				expandItem()
+				state.setBookmarkPreviewOpened(true)
+			},
+		},
+		{
+			ignore: useCallback(() => useBookmarkPageStore.getState().activeDialog !== ActiveDialog.None, []),
+		},
+	)
+
+	function selectPrevItem() {
+		const state = useBookmarkPageStore.getState()
+		const prevIndex = state.selectedBookmarkIndex - 1
+		if (prevIndex >= 0) {
+			state.selectBookmark(bookmarks[prevIndex], prevIndex)
 		}
+	}

-		window.addEventListener("keydown", onKeyDown)
-
-		return () => {
-			window.removeEventListener("keydown", onKeyDown)
+	function selectNextItem() {
+		const state = useBookmarkPageStore.getState()
+		const nextIndex = state.selectedBookmarkIndex + 1
+		if (nextIndex < bookmarks.length) {
+			state.selectBookmark(bookmarks[nextIndex], nextIndex)
 		}
-	}, [bookmarks])
+	}
+
+	function expandItem() {
+		const state = useBookmarkPageStore.getState()
+		state.setBookmarkItemExpanded(true)
+	}
+
+	function collapseItem() {
+		const state = useBookmarkPageStore.getState()
+		state.setBookmarkItemExpanded(false)
+		state.setBookmarkPreviewOpened(false)
+	}

 	return (
 		<div className="flex flex-col container max-w-2xl -mt-2">
@@ -444,7 +485,7 @@ function BookmarkPreview() {
 	return (
 		<div
 			className={clsx(
-				"h-screen flex justify-center items-center border-l border-stone-700 dark:border-stone-300 flex dark:bg-stone-900",
+				"h-screen col-span-2 flex justify-center items-center border-l border-stone-700 dark:border-stone-300 flex dark:bg-stone-900",
 				{
 					"absolute inset-0 border-l-0": layoutMode === LAYOUT_MODE.popup,
 				},
@@ -457,6 +498,7 @@ function BookmarkPreview() {

 function BookmarkPreviewFrame() {
 	const selectedBookmarkId = useBookmarkPageStore((state) => state.selectedBookmarkId)
+	const actionBarHeight = useBookmarkPageStore((state) => state.actionBarHeight)
 	const { data, status } = useAuthenticatedQuery(["bookmarks", selectedBookmarkId], () =>
 		fetchApi(`/bookmark/${selectedBookmarkId}`, {
 			headers: {
@@ -473,7 +515,13 @@ function BookmarkPreviewFrame() {
 				</p>
 			)
 		case "success":
-			return <iframe className="bg-stone-200 dark:bg-stone-900 w-full h-full pb-20" srcDoc={data} />
+			return (
+				<iframe
+					className="prose bg-stone-200 dark:bg-stone-900 w-full h-full"
+					style={{ paddingBottom: actionBarHeight }}
+					srcDoc={data}
+				/>
+			)

 		default:
 			return null
@@ -513,7 +561,6 @@ function BookmarkListItem({ bookmark, index }: { bookmark: LinkBookmark; index:
 	function expandOrOpenPreview() {
 		setBookmarkItemExpanded(true)
 		if (useBookmarkPageStore.getState().layoutMode === LAYOUT_MODE.sideBySide) {
-			console.log(useBookmarkPageStore.getState().layoutMode)
 			setBookmarkPreviewOpened(true)
 		}
 	}
@@ -628,6 +675,10 @@ function OpenBookmarkPreviewButton() {

 function ActionBar() {
 	const setActiveDialog = useBookmarkPageStore((state) => state.setActiveDialog)
+	const setActionBarHeight = useBookmarkPageStore((state) => state.setActionBarHeight)
+	const layoutMode = useBookmarkPageStore((state) => state.layoutMode)
+	const isBookmarkPreviewOpened = useBookmarkPageStore((state) => state.isBookmarkPreviewOpened)
+	const setBookmarkPreviewOpened = useBookmarkPageStore((state) => state.setBookmarkPreviewOpened)

 	useMnemonics(
 		{
@@ -640,15 +691,32 @@ function ActionBar() {
 		setActiveDialog(ActiveDialog.AddBookmark)
 	}

+	function closePreview() {
+		setBookmarkPreviewOpened(false)
+	}
+
 	return (
-		<div className="fixed z-10 bottom-0 left-0 right-0 bg-stone-200 dark:bg-stone-900 border-t-1 flex flex-row justify-center py-4 space-x-4">
-			<Button onClick={addBookmark}>
-				<span className="underline">A</span>DD
-			</Button>
-			<Button>
-				<span className="underline">S</span>EARCH
-			</Button>
-			<LogOutButton />
+		<div
+			ref={(el) => {
+				if (el) {
+					setActionBarHeight(el.clientHeight)
+				}
+			}}
+			className="fixed z-10 bottom-0 left-0 right-0 bg-stone-200 dark:bg-stone-900 border-t-1 flex flex-row justify-center py-4 space-x-4"
+		>
+			{layoutMode === LAYOUT_MODE.popup && isBookmarkPreviewOpened ? (
+				<Button onClick={closePreview}>CLOSE</Button>
+			) : (
+				<>
+					<Button onClick={addBookmark}>
+						<span className="underline">A</span>DD
+					</Button>
+					<Button>
+						<span className="underline">S</span>EARCH
+					</Button>
+					<LogOutButton />
+				</>
+			)}
 		</div>
 	)
 }
--- a/packages/web/src/hooks/use-mnemonics.ts
+++ b/packages/web/src/hooks/use-mnemonics.ts
@@ -6,6 +6,7 @@ function useMnemonics(
 ) {
 	useEffect(() => {
 		function onKeyDown(event: KeyboardEvent) {
+			console.log(event.key)
 			if (!ignore(event)) {
 				mnemonicMap[event.key]?.(event)
 			}