Skip to content

fix: theme toggle dropdown not showing #64

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
Melvynx wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: theme toggle dropdown not showing #64

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
25 changes: 14 additions & 11 deletions src/components/shared/theme/theme-selector/theme-trigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
"use client";

import { ChevronsUpDown } from "lucide-react";
import { ThemeColorPreview } from "../theme-color-preview";
import * as React from "react";
import { Button } from "@/components/ui/button";
import type { ThemeData } from "@/lib/theme";
import { extractThemeColors } from "@/lib/theme/utils";
import { cn } from "@/lib/utils";
import { ThemeColorPreview } from "../theme-color-preview";
import { getDisplayName } from "./utils";

interface ThemeTriggerProps {
interface ThemeTriggerProps
extends React.ComponentPropsWithoutRef<typeof Button> {
active: ThemeData | null | undefined;
currentMode: "light" | "dark";
isLoading: boolean;
Expand All @@ -17,16 +19,16 @@ interface ThemeTriggerProps {
open: boolean;
}

export function ThemeTrigger({
active,
currentMode,
isLoading,
label,
triggerClassName,
open,
}: ThemeTriggerProps) {
export const ThemeTrigger = React.forwardRef<
HTMLButtonElement,
ThemeTriggerProps
>(function ThemeTrigger(
{ active, currentMode, isLoading, label, triggerClassName, open, ...props },
ref,
) {
return (
<Button
ref={ref}
variant="outline"
role="combobox"
aria-expanded={open}
Expand All @@ -36,6 +38,7 @@ export function ThemeTrigger({
triggerClassName,
)}
title={label}
{...props}
>
<div className="hidden md:flex items-center gap-2 min-w-0">
{isLoading ? (
Expand Down Expand Up @@ -95,4 +98,4 @@ export function ThemeTrigger({
<ChevronsUpDown className="ml-2 h-4 w-4 md:h-3 md:w-3 shrink-0 opacity-50" />
</Button>
);
}
});