Skip to content

Collection selection always show in "full screen" mode. #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
colgiati wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Collection selection always show in "full screen" mode. #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 2 additions & 55 deletions src/@/components/BookmarkForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { Toaster } from './ui/Toaster.tsx';
import { getCollections } from '../lib/actions/collections.ts';
import { getTags } from '../lib/actions/tags.ts';
import { X } from 'lucide-react';
import { Popover, PopoverContent, PopoverTrigger } from './ui/Popover.tsx';
import { Popover, PopoverTrigger } from './ui/Popover.tsx';
import { CaretSortIcon } from '@radix-ui/react-icons';
import {
Command,
Expand Down Expand Up @@ -233,7 +233,7 @@ const BookmarkForm = () => {
</FormControl>
</PopoverTrigger>

{!openOptions && openCollections ? (
{openCollections ? (
<div
className={`fade-up min-w-full p-0 overflow-y-auto ${
openCollections
Expand Down Expand Up @@ -301,59 +301,6 @@ const BookmarkForm = () => {
)}
</Command>
</div>
) : openOptions && openCollections ? (
<PopoverContent
className={`min-w-full p-0 overflow-y-auto max-h-[200px]`}
>
<Command className="flex-grow min-w-full dropdown-content">
<CommandInput
className="min-w-[280px]"
placeholder="Search collection..."
/>
<CommandEmpty>No Collection found.</CommandEmpty>
{Array.isArray(collections) && (
<CommandGroup className="w-full">
{isLoading ? (
<CommandItem
value="Getting collections..."
key="Getting collections..."
onSelect={() => {
form.setValue('collection', {
name: 'Unorganized',
});
setOpenCollections(false);
}}
>
Unorganized
</CommandItem>
) : (
collections?.map(
(collection: {
name: string;
id: number;
ownerId: number;
}) => (
<CommandItem
value={collection.name}
key={collection.id}
onSelect={() => {
form.setValue('collection', {
ownerId: collection.ownerId,
id: collection.id,
name: collection.name,
});
setOpenCollections(false);
}}
>
{collection.name}
</CommandItem>
)
)
)}
</CommandGroup>
)}
</Command>
</PopoverContent>
) : undefined}
</Popover>
</div>
Expand Down