Manage path transitions when opening cmd-k links

This commit is contained in:
Sam Becker 2024-02-24 13:42:27 -06:00
parent cb190650ff
commit c0b041bf4f

View File

@ -1,7 +1,14 @@
'use client';
import { Command } from 'cmdk';
import { ReactNode, useEffect, useMemo, useRef, useState } from 'react';
import {
ReactNode,
useEffect,
useMemo,
useRef,
useState,
useTransition,
} from 'react';
import Modal from './Modal';
import { clsx } from 'clsx/lite';
import { useDebounce } from 'use-debounce';
@ -45,6 +52,16 @@ export default function CommandKClient({
const isOpenRef = useRef(isOpen);
const [isPending, startTransition] = useTransition();
const shouldCloseAfterPending = useRef(false);
useEffect(() => {
if (!isPending && shouldCloseAfterPending.current) {
setIsOpen?.(false);
shouldCloseAfterPending.current = false;
}
}, [isPending, setIsOpen]);
// Raw query values
const [queryLiveRaw, setQueryLive] = useState('');
const [queryDebouncedRaw] =
@ -149,7 +166,7 @@ export default function CommandKClient({
onClose={() => setIsOpen?.(false)}
fast
>
<div className="space-y-1.5">
<div className={clsx('space-y-1.5', isPending && 'opacity-30')}>
<div className="relative">
<Command.Input
onChangeCapture={(e) => setQueryLive(e.currentTarget.value)}
@ -163,6 +180,7 @@ export default function CommandKClient({
'placeholder:dark:text-gray-700',
)}
placeholder="Search photos, views, settings ..."
disabled={isPending}
/>
{isLoading &&
<span className={clsx(
@ -223,10 +241,14 @@ export default function CommandKClient({
'data-[selected=true]:dark:bg-gray-900/75',
)}
onSelect={() => {
if (path) {
startTransition(() => {
shouldCloseAfterPending.current = true;
router.push(path, { scroll: true });
});
} else {
setIsOpen?.(false);
action?.();
if (path) {
router.push(path);
}
}}
>