Skip to content

New light mood toggle icon #1328

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

Merged
ameer2468 merged 8 commits into from
Oct 31, 2025
+23 −11
Merged

New light mood toggle icon #1328

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6cc1399
feat: added sun icon for light mode theme toggle
Enejivk Oct 31, 2025
87d31a0
extracting the theme icons into a seperate component
Enejivk Oct 31, 2025
086ac5f
Removing hard coded color
Enejivk Oct 31, 2025
ed3fe5e
Rename the file from ThemeToggleIcon.tsx to theme-toggle-icon.tsx
Enejivk Oct 31, 2025
c102b6c
applying proper importing
Enejivk Oct 31, 2025
c8a2216
Rearranging the import
Enejivk Oct 31, 2025
2898073
Add accessibility attributes for screen readers.
Enejivk Oct 31, 2025
96c004e
Fixed the accessibility issue
Enejivk Oct 31, 2025
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
9 changes: 3 additions & 6 deletions apps/web/app/(org)/dashboard/_components/Navbar/Mobile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
"use client";

import { LogoBadge } from "@cap/ui";
import { faMoon, faSun } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { useClickAway } from "@uidotdev/usehooks";
import { AnimatePresence, motion } from "framer-motion";
import { X } from "lucide-react";
import Link from "next/link";
import { type MutableRefObject, useState } from "react";

import { ThemeToggleIcon } from "@/components/theme-toggle-icon";
import { useTheme } from "../../Contexts";
import NavItems from "./Items";

Expand Down Expand Up @@ -61,10 +61,7 @@ export const AdminMobileNav = () => {
}}
className="flex justify-center items-center rounded-full border transition-colors cursor-pointer lg:hidden bg-gray-4 hover:border-gray-6 hover:bg-gray-5 size-9 border-gray-5"
>
<FontAwesomeIcon
className="text-gray-12 size-3.5"
icon={theme === "dark" ? faSun : faMoon}
/>
<ThemeToggleIcon />
</div>
</div>
</div>
Expand Down
8 changes: 3 additions & 5 deletions apps/web/app/(org)/dashboard/_components/Navbar/Top.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
PopoverContent,
PopoverTrigger,
} from "@cap/ui";
import { faBell, faMoon, faSun } from "@fortawesome/free-solid-svg-icons";
import { faBell } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { useClickAway } from "@uidotdev/usehooks";
Expand All @@ -31,6 +31,7 @@ import {
import { markAsRead } from "@/actions/notifications/mark-as-read";
import Notifications from "@/app/(org)/dashboard/_components/Notifications";
import { SignedImageUrl } from "@/components/SignedImageUrl";
import { ThemeToggleIcon } from "@/components/theme-toggle-icon";
import { UpgradeModal } from "@/components/UpgradeModal";
import { useDashboardContext, useTheme } from "../../Contexts";
import {
Expand Down Expand Up @@ -170,10 +171,7 @@ const Top = () => {
}}
className="hidden justify-center items-center rounded-full transition-colors cursor-pointer bg-gray-3 lg:flex hover:bg-gray-5 size-9"
>
<FontAwesomeIcon
className="text-gray-12 size-3.5 view-transition-theme-icon"
icon={theme === "dark" ? faMoon : faSun}
/>
<ThemeToggleIcon />
</div>
<User />
</div>
Expand Down
23 changes: 23 additions & 0 deletions apps/web/components/theme-toggle-icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
"use client";
import { Moon, Sun } from "lucide-react";
import { useTheme } from "@/app/(org)/dashboard/Contexts";

export const ThemeToggleIcon = () => {
const { theme } = useTheme();

return (
<button
type="button"
className="view-transition-theme-icon"
aria-label={
theme === "dark" ? "Switch to light theme" : "Switch to dark theme"
}
>
{theme === "dark" ? (
<Moon size={17} className="fill-white stroke-gray-3" />
) : (
<Sun size={17} className="stroke-gray-12" />
)}
</button>
);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
};
Comment on lines +1 to +17

@coderabbitai coderabbitai Bot Oct 31, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Filename should follow kebab-case convention.

The filename ThemeToggleIcon.tsx should be theme-toggle-icon.tsx to comply with the coding guidelines.

As per coding guidelines.

Apply this change:

  1. Rename the file from ThemeToggleIcon.tsx to theme-toggle-icon.tsx
  2. Update imports in both Mobile.tsx and Top.tsx:
-import { ThemeToggleIcon } from "@/components/ThemeToggleIcon";
+import { ThemeToggleIcon } from "@/components/theme-toggle-icon";

Committable suggestion skipped: line range outside the PR's diff.

🤖 Prompt for AI Agents 
In apps/web/components/ThemeToggleIcon.tsx around lines 1 to 17, the filename
violates kebab-case; rename the file to theme-toggle-icon.tsx, then update any
imports that reference the old component name (specifically in Mobile.tsx and
Top.tsx) to import from "@/components/theme-toggle-icon" (or the correct
relative path) and adjust the import identifier if you use a different local
name—ensure the export remains unchanged so no further code changes are needed.

@Enejivk Enejivk Oct 31, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done renaming it, I hope you are happy now?

@coderabbitai coderabbitai Bot Oct 31, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Enejivk, yes, thank you for renaming the file! 🎉 I really appreciate you following the kebab-case convention. This helps maintain consistency across the codebase, which makes it easier for everyone on the team to navigate and work with the files.

Great work on this PR overall — the new theme toggle icon looks nice, and creating a reusable component was a smart move!

    (\(\
    ( -.-)
    o_(")(")
    Happy rabbit!
🧠 Learnings used 
Learnt from: CR
Repo: CapSoftware/Cap PR: 0
File: AGENTS.md:0-0
Timestamp: 2025-09-22T14:19:56.010Z
Learning: Applies to **/*.{ts,tsx,js,jsx} : Use kebab-case for filenames for TypeScript/JavaScript modules (e.g., `user-menu.tsx`).

Learnt from: CR
Repo: CapSoftware/Cap PR: 0
File: AGENTS.md:0-0
Timestamp: 2025-09-22T14:19:56.010Z
Learning: Applies to packages/ui/**/*.{ts,tsx,js,jsx} : Component files in `packages/ui` should use PascalCase naming if they define React/Solid components.

Learnt from: CR
Repo: CapSoftware/Cap PR: 0
File: AGENTS.md:0-0
Timestamp: 2025-09-22T14:19:56.010Z
Learning: Applies to **/*.{ts,tsx,js,jsx} : Use PascalCase for React/Solid components.

If you found this review helpful, would you consider giving us a shout-out on X?

Thank you for using CodeRabbit!

Comment on lines +1 to +17

@coderabbitai coderabbitai Bot Oct 31, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

Format the file with Biome.

As requested by @ameer2468 in the PR comments, please format this file with Biome to ensure consistency with the codebase standards.

As per coding guidelines.

Run the following command:

🏁 Script executed:

pnpm format

Length of output: 273

🏁 Script executed:

#!/bin/bash
# Check the actual indentation in the file
cat -A apps/web/components/theme-toggle-icon.tsx

Length of output: 451

Format the file with Biome to convert tabs to 2-space indentation.

The file currently uses tabs for indentation instead of the required 2-space indent. Run pnpm format to format with Biome and align with the coding guidelines.

🤖 Prompt for AI Agents 
In apps/web/components/theme-toggle-icon.tsx around lines 1 to 17 the file uses
tabs for indentation instead of the project standard 2-space indent; run the
formatter (pnpm format) which uses Biome to convert tabs to 2-space indentation,
or replace tabs with two spaces throughout the file and re-save to match coding
guidelines.

Comment on lines +5 to +17

@coderabbitai coderabbitai Bot Oct 31, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

Button lacks onClick handler to toggle the theme.

The button has an aria-label indicating it should toggle the theme, but there's no onClick handler attached. This makes the button non-functional—clicking it won't change the theme.

Verify what the useTheme hook returns and add the appropriate handler:

Once verified, apply a fix similar to this:

 export const ThemeToggleIcon = () => {
-	const { theme } = useTheme();
+	const { theme, toggleTheme } = useTheme();

 	return (
 		<button
 			type="button"
 			className="view-transition-theme-icon"
+			onClick={toggleTheme}
 			aria-label={
 				theme === "dark" ? "Switch to light theme" : "Switch to dark theme"
 			}
 		>

Note: Adjust the destructured property name (e.g., setTheme, toggle) based on what the context actually provides.

🏁 Script executed:

#!/bin/bash
# Check what properties/methods the ThemeContext provides
ast-grep --pattern $'export const ThemeContext = createContext<$_>($_)'

# Also check the ThemeProvider implementation to see available methods
rg -nP --type=tsx -A 10 'ThemeProvider|ThemeContext' apps/web/app/

Length of output: 27

🏁 Script executed:

#!/bin/bash
# Search for useTheme hook definition - check common locations
fd -e ts -e tsx | xargs grep -l "useTheme" | head -5

# Search for ThemeContext definition more broadly
rg -n "ThemeContext|useTheme" --type=ts -B 2 -A 5 | head -50

# Look for hook definition in lib or hooks directories
fd "use.*theme" -i

Length of output: 3750

🏁 Script executed:

#!/bin/bash
# Find the exact location and full content of theme-toggle-icon.tsx
fd "theme-toggle-icon" -e tsx

# Check how setThemeHandler is called in Top.tsx or other files
rg -n "setThemeHandler" --type=ts -B 2 -A 2

Length of output: 3516

🏁 Script executed:

#!/bin/bash
# Get the full content of theme-toggle-icon.tsx
cat apps/web/components/theme-toggle-icon.tsx

Length of output: 530

Add onClick handler to enable theme toggling.

The button is non-functional—it has no onClick handler despite the aria-label indicating it should toggle the theme. The setThemeHandler method is available from useTheme() but is not being destructured or called.

Fix at apps/web/components/theme-toggle-icon.tsx:

 export const ThemeToggleIcon = () => {
-	const { theme } = useTheme();
+	const { theme, setThemeHandler } = useTheme();
 
 	return (
 		<button
 			type="button"
 			className="view-transition-theme-icon"
+			onClick={() => {
+				if (document.startViewTransition) {
+					document.startViewTransition(() => {
+						setThemeHandler(theme === "light" ? "dark" : "light");
+					});
+				} else {
+					setThemeHandler(theme === "light" ? "dark" : "light");
+				}
+			}}
 			aria-label={
 				theme === "dark" ? "Switch to light theme" : "Switch to dark theme"
 			}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
export const ThemeToggleIcon = () => {
const { theme } = useTheme();
return (
<button
type="button"
className="view-transition-theme-icon"
aria-label={
theme === "dark" ? "Switch to light theme" : "Switch to dark theme"
}
>
{theme === "dark" ? (
<Moon size={17} className="fill-white stroke-gray-3" />
) : (
<Sun size={17} className="stroke-gray-12" />
)}
</button>
);
};
export const ThemeToggleIcon = () => {
const { theme, setThemeHandler } = useTheme();
return (
<button
type="button"
className="view-transition-theme-icon"
onClick={() => {
if (document.startViewTransition) {
document.startViewTransition(() => {
setThemeHandler(theme === "light" ? "dark" : "light");
});
} else {
setThemeHandler(theme === "light" ? "dark" : "light");
}
}}
aria-label={
theme === "dark" ? "Switch to light theme" : "Switch to dark theme"
}
>
{theme === "dark" ? (
<Moon size={17} className="fill-white stroke-gray-3" />
) : (
<Sun size={17} className="stroke-gray-12" />
)}
</button>
);
};
🤖 Prompt for AI Agents 
In apps/web/components/theme-toggle-icon.tsx around lines 5 to 23, the component
reads theme from useTheme but doesn't destructure or call the setThemeHandler so
the button does nothing; update the hook destructuring to get setThemeHandler
(or whatever the setter is named) and add an onClick on the button that calls it
to toggle the theme (e.g. call setThemeHandler(theme === "dark" ? "light" :
"dark") when clicked), keeping the existing aria-label logic and icon rendering
unchanged.