Merge pull request #50 from Jim-Hodapp-Coaching/adjust_tiptap_editor_…

…dark_mode_styling Fix dark mode style for TipTap component toolbar buttons
refactor-group · Nov 1, 2024 · 27039cb · 27039cb
2 parents a1d2f69 + dd97cf3
commit 27039cb
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 26 deletions.
diff --git a/src/app/coaching-sessions/[id]/page.tsx b/src/app/coaching-sessions/[id]/page.tsx
@@ -234,9 +234,8 @@ export default function CoachingSessionsPage() {
                   className="w-[260px] text-sm"
                   side="left"
                 >
-                  To view changes to the Notes made by someone else during this
-                  session, before making any new changes yourself, click this
-                  button.
+                  To view any changes made to Notes by another session
+                  participant before making new changes, click this button.
                 </HoverCardContent>
               </HoverCard>
             </div>

diff --git a/src/components/ui/coaching-sessions/tiptap-editor.tsx b/src/components/ui/coaching-sessions/tiptap-editor.tsx
@@ -121,8 +121,8 @@ const TipTapEditor = forwardRef<EditorRef, TipTapProps>(
           <Button
             variant="ghost"
             onClick={() => editor.chain().focus().toggleBold().run()}
-            className={`p-2 rounded ${
-              editor.isActive("bold") ? "bg-gray-200" : ""
+            className={`p-2 mr-0.5 rounded ${
+              editor.isActive("bold") ? "button-active" : ""
             }`}
             title="Bold (Ctrl+B)"
           >
@@ -133,8 +133,8 @@ const TipTapEditor = forwardRef<EditorRef, TipTapProps>(
           <Button
             variant="ghost"
             onClick={() => editor.chain().focus().toggleItalic().run()}
-            className={`p-2 rounded ${
-              editor.isActive("italic") ? "bg-gray-200" : ""
+            className={`p-2 mr-0.5 rounded ${
+              editor.isActive("italic") ? "button-active" : ""
             }`}
             title="Italic (Ctrl+I)"
           >
@@ -145,8 +145,8 @@ const TipTapEditor = forwardRef<EditorRef, TipTapProps>(
           <Button
             variant="ghost"
             onClick={() => editor.chain().focus().toggleUnderline().run()}
-            className={`p-2 rounded ${
-              editor.isActive("underline") ? "bg-gray-200" : ""
+            className={`p-2 mr-0.5 rounded ${
+              editor.isActive("underline") ? "button-active" : ""
             }`}
             title="Underline (Ctrl+U)"
           >
@@ -157,9 +157,10 @@ const TipTapEditor = forwardRef<EditorRef, TipTapProps>(
           <Button
             variant="ghost"
             onClick={() => editor.chain().focus().toggleStrike().run()}
-            className={`p-2 rounded ${
-              editor.isActive("strike") ? "bg-gray-200" : ""
-            }`}
+            className={`p-2 mr-0.5 rounded ${
+              editor.isActive("strike") ? "button-active" : ""
+            }
+            `}
             title="Strike Through"
           >
             <Strikethrough className="h-4 w-4" />
@@ -169,8 +170,8 @@ const TipTapEditor = forwardRef<EditorRef, TipTapProps>(
           <Button
             variant="ghost"
             onClick={() => editor.chain().focus().toggleHighlight().run()}
-            className={`p-2 rounded ${
-              editor.isActive("highlight") ? "bg-gray-200" : ""
+            className={`p-2 mr-0.5 rounded ${
+              editor.isActive("highlight") ? "button-active" : ""
             }`}
             title="Highlight Text"
           >
@@ -183,8 +184,8 @@ const TipTapEditor = forwardRef<EditorRef, TipTapProps>(
             onClick={() =>
               editor.chain().focus().toggleHeading({ level: 1 }).run()
             }
-            className={`p-2 rounded ${
-              editor.isActive("heading", { level: 1 }) ? "bg-gray-200" : ""
+            className={`p-2 mr-0.5 rounded ${
+              editor.isActive("heading", { level: 1 }) ? "button-active" : ""
             }`}
             title="Heading1"
           >
@@ -197,8 +198,8 @@ const TipTapEditor = forwardRef<EditorRef, TipTapProps>(
             onClick={() =>
               editor.chain().focus().toggleHeading({ level: 2 }).run()
             }
-            className={`p-2 rounded ${
-              editor.isActive("heading", { level: 2 }) ? "bg-gray-200" : ""
+            className={`p-2 mr-0.5 rounded ${
+              editor.isActive("heading", { level: 2 }) ? "button-active" : ""
             }`}
             title="Heading2"
           >
@@ -211,8 +212,8 @@ const TipTapEditor = forwardRef<EditorRef, TipTapProps>(
             onClick={() =>
               editor.chain().focus().toggleHeading({ level: 3 }).run()
             }
-            className={`p-2 rounded ${
-              editor.isActive("heading", { level: 3 }) ? "bg-gray-200" : ""
+            className={`p-2 mr-0.5 rounded ${
+              editor.isActive("heading", { level: 3 }) ? "button-active" : ""
             }`}
             title="Heading3"
           >
@@ -223,8 +224,8 @@ const TipTapEditor = forwardRef<EditorRef, TipTapProps>(
           <Button
             variant="ghost"
             onClick={() => editor.chain().focus().toggleBulletList().run()}
-            className={`p-2 rounded ${
-              editor.isActive("bulletList") ? "bg-gray-200" : ""
+            className={`p-2 mr-0.5 rounded ${
+              editor.isActive("bulletList") ? "button-active" : ""
             }`}
             title="Bullet List"
           >
@@ -235,8 +236,8 @@ const TipTapEditor = forwardRef<EditorRef, TipTapProps>(
           <Button
             variant="ghost"
             onClick={() => editor.chain().focus().toggleOrderedList().run()}
-            className={`p-2 rounded ${
-              editor.isActive("orderedList") ? "bg-gray-200" : ""
+            className={`p-2 mr-0.5 rounded ${
+              editor.isActive("orderedList") ? "button-active" : ""
             }`}
             title="Ordered List"
           >
@@ -246,8 +247,8 @@ const TipTapEditor = forwardRef<EditorRef, TipTapProps>(
           <Button
             variant="ghost"
             onClick={() => editor.chain().focus().toggleCodeBlock().run()}
-            className={`p-2 rounded ${
-              editor.isActive("codeBlock") ? "is-active" : ""
+            className={`p-2 mr-0.5 rounded ${
+              editor.isActive("codeBlock") ? "button-active" : ""
             }`}
           >
             <Braces className="h-4 w-4" />

diff --git a/src/styles/styles.scss b/src/styles/styles.scss
@@ -10,6 +10,8 @@
     margin-top: 0;
   }
 
+
+
   /* List styles */
   ul,
   ol {
@@ -146,3 +148,10 @@
     margin: 2rem 0;
   }
 }
+
+// Toolbar button styling for an active (i.e. toggled on) light/dark mode
+.button-active {
+  @apply bg-gray-200;
+  @apply dark:text-black;
+  @apply hover:dark:text-white;
+}