fix: ssr & touch

kobaltedev · Oct 31, 2023 · 3c582f1 · 3c582f1
1 parent 2d7f7a3
commit 3c582f1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/apps/docs/src/routes/docs/core.tsx b/apps/docs/src/routes/docs/core.tsx
@@ -93,6 +93,11 @@ const CORE_NAV_SECTIONS: NavSection[] = [
         title: "Link",
         href: "/docs/core/components/link",
       },
+      {
+        title: "Menubar",
+        href: "/docs/core/components/menubar",
+        status: "new",
+      },
       {
         title: "Pagination",
         href: "/docs/core/components/pagination",

diff --git a/packages/core/dev/App.tsx b/packages/core/dev/App.tsx
@@ -1,4 +1,3 @@
 export default function App() {
-  return <>
-  </>;
+  return <></>;
 }
diff --git a/packages/core/src/menu/menu-trigger.tsx b/packages/core/src/menu/menu-trigger.tsx
@@ -96,9 +96,6 @@ export function MenuTrigger(props: MenuTriggerProps) {
     callHandler(e, local.onClick);
 
     if (!local.disabled) {
-      // When opened by click, automatically focus Menubar menus
-      optionalMenubarContext?.setAutoFocusMenu(true);
-
       if (e.currentTarget.dataset.pointerType === "touch") context.toggle(true);
     }
   };

diff --git a/packages/core/src/menubar/menubar-root.tsx b/packages/core/src/menubar/menubar-root.tsx
@@ -22,6 +22,7 @@ import {
   onCleanup,
   splitProps,
 } from "solid-js";
+import { isServer } from "solid-js/web";
 
 import { AsChildProp, Polymorphic } from "../polymorphic";
 import { createControllableSignal, createInteractOutside } from "../primitives";
@@ -167,6 +168,7 @@ export function MenubarRoot(props: MenubarRootProps) {
   };
 
   createEffect(() => {
+    if (isServer) return;
     if (local.focusOnAlt) window.addEventListener("keydown", keydownHandler);
     else window.removeEventListener("keydown", keydownHandler);
   });
@@ -176,6 +178,7 @@ export function MenubarRoot(props: MenubarRootProps) {
   });
 
   onCleanup(() => {
+    if (isServer) return;
     window.removeEventListener("keydown", keydownHandler);
   });