From 3a26c4511f57efa10582a831e7bf7cbf893e4d1c Mon Sep 17 00:00:00 2001
From: Shane Osbourne <shane.osbourne8@gmail.com>
Date: Fri, 17 Jan 2025 15:21:36 +0000
Subject: [PATCH] give a theme context to customizer button

---
 .../pages/new-tab/app/components/App.js       | 29 ++++++++++---------
 .../customizer/components/CustomizerMenu.js   |  4 +--
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/special-pages/pages/new-tab/app/components/App.js b/special-pages/pages/new-tab/app/components/App.js
index 62db4bcc0..5693f51a5 100644
--- a/special-pages/pages/new-tab/app/components/App.js
+++ b/special-pages/pages/new-tab/app/components/App.js
@@ -61,20 +61,21 @@ export function App() {
                         </div>
                     </div>
                 </main>
-                <CustomizerMenuPositionedFixed>
-                    {customizerKind === 'menu' && <CustomizerMenu />}
-                    {customizerKind === 'drawer' && (
-                        <CustomizerButton
-                            buttonId={buttonId}
-                            menuId={drawerId}
-                            toggleMenu={toggle}
-                            buttonRef={buttonRef}
-                            isOpen={isOpen}
-                            kind={'drawer'}
-                            theme={main}
-                        />
-                    )}
-                </CustomizerMenuPositionedFixed>
+                <div data-theme={main}>
+                    <CustomizerMenuPositionedFixed>
+                        {customizerKind === 'menu' && <CustomizerMenu />}
+                        {customizerKind === 'drawer' && (
+                            <CustomizerButton
+                                buttonId={buttonId}
+                                menuId={drawerId}
+                                toggleMenu={toggle}
+                                buttonRef={buttonRef}
+                                isOpen={isOpen}
+                                kind={'drawer'}
+                            />
+                        )}
+                    </CustomizerMenuPositionedFixed>
+                </div>
                 {customizerKind === 'drawer' && (
                     <aside
                         class={cn(styles.aside, styles.asideLayout, styles.asideScroller)}
diff --git a/special-pages/pages/new-tab/app/customizer/components/CustomizerMenu.js b/special-pages/pages/new-tab/app/customizer/components/CustomizerMenu.js
index 005e0505f..d3da51b55 100644
--- a/special-pages/pages/new-tab/app/customizer/components/CustomizerMenu.js
+++ b/special-pages/pages/new-tab/app/customizer/components/CustomizerMenu.js
@@ -112,10 +112,9 @@ export function useContextMenu() {
  * @param {import("@preact/signals").Signal<boolean>|boolean} props.isOpen
  * @param {() => void} [props.toggleMenu]
  * @param {import("preact").Ref<HTMLButtonElement>} [props.buttonRef]
- * @param {import('@preact/signals').Signal<'light' | 'dark'>} [props.theme]
  * @param {"menu" | "drawer"} props.kind
  */
-export function CustomizerButton({ menuId, buttonId, isOpen, toggleMenu, buttonRef, kind, theme }) {
+export function CustomizerButton({ menuId, buttonId, isOpen, toggleMenu, buttonRef, kind }) {
     const { t } = useTypedTranslation();
     return (
         <button
@@ -126,7 +125,6 @@ export function CustomizerButton({ menuId, buttonId, isOpen, toggleMenu, buttonR
             aria-expanded={isOpen}
             aria-controls={menuId}
             data-kind={kind}
-            data-theme={theme}
             id={buttonId}
         >
             <CustomizeIcon />