Skip to content
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

fix-dropdown-menu-component-modal-behaviour #184

Merged
merged 3 commits into from
Mar 26, 2024
Merged

fix-dropdown-menu-component-modal-behaviour #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a471945
fix-dropdown-menu-component-modal-behaviour
Rash-Hit Mar 10, 2024
6bc09d7
--lint-fix--
Rash-Hit Mar 10, 2024
a9e6d45
Merge branch 'main' into fix-dropdown-menu-component-modal-behaviour
Rash-Hit Mar 24, 2024
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
2 changes: 1 addition & 1 deletion src/components/ThemeToggler.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function ThemeToggler() {
const { setTheme } = useTheme();

return (
<DropdownMenu>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button variant="outline" size="iconSM">
<SunDimIcon className="h-[1rem] w-[1rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
Expand Down
4 changes: 2 additions & 2 deletions src/components/comment/Comments.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const Comments = async ({
parentId={data?.parentComment?.id}
/>
<div className="mb-5 flex mt-5">
<DropdownMenu key="1">
<DropdownMenu key="1" modal={false}>
<DropdownMenuTrigger asChild>
<Button
className="w-[200px] justify-between text-left font-normal"
Expand Down Expand Up @@ -169,7 +169,7 @@ const Comments = async ({
</DropdownMenuGroup>
</DropdownMenuContent>
</DropdownMenu>
<DropdownMenu>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button
className="w-[200px] justify-between text-left font-normal"
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/dropdown-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const DropdownMenuItem = React.forwardRef<
<DropdownMenuPrimitive.Item
ref={ref}
className={cn(
'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
'relative flex cursor-pointer select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
inset && 'pl-8',
className,
)}
Expand Down
Loading