fix(layout): sidebar height on mobile (#84)

jundaoapp · Dec 26, 2023 · eee69eb · eee69eb
1 parent 358379f
commit eee69eb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/src/components/layout/index.scss b/src/components/layout/index.scss
@@ -46,6 +46,7 @@
         transition: var(--jdd-sidebar-transition);
         z-index: 50;
         max-width: 90vw;
+        height: 100dvh;
       }
 
       .layout-sidebar:first-child {

diff --git a/src/components/layout/index.tsx b/src/components/layout/index.tsx
@@ -2,6 +2,7 @@ import { WindowEventListener } from "@solid-primitives/event-listener";
 import { createBreakpoints } from "@solid-primitives/media";
 import { combineProps } from "@solid-primitives/props";
 import { Show, createEffect, createSignal } from "solid-js";
+import { isServer } from "solid-js/web";
 import { IntrinsicComponentProps } from "../types";
 import { processProps } from "../utilities";
 import LayoutContent from "./content";
@@ -57,6 +58,7 @@ function InnerLayout(props: LayoutProps) {
 	const [sidebarTransition, setSidebarTransition] = createSignal(false);
 
 	createEffect(() => {
+		if (isServer) return;
 		setSidebarTransition(true);
 
 		setTimeout(() => {
@@ -88,7 +90,7 @@ function InnerLayout(props: LayoutProps) {
 					? "transform 0.3s var(--jdd-transition-function), opacity 0.3s var(--jdd-transition-function)"
 					: "",
 				get "--jdd-layout-backdrop-opacity"() {
-					if (leftSidebarOpen() || rightSidebarOpen()) {
+					if (isServer || leftSidebarOpen() || rightSidebarOpen()) {
 						return "";
 					}
 
@@ -140,13 +142,19 @@ function InnerLayout(props: LayoutProps) {
 
 		let swipeDirection: "left" | "right" | undefined;
 
-		// Left swipe
-		if (swipeStart().x < local.swipeDistanceFromSides) {
+		// Swipe from left to right
+		if (
+			getSidebarLeft() !== undefined &&
+			swipeStart().x < local.swipeDistanceFromSides
+		) {
 			swipeDirection = "right";
 		}
 
-		// Right swipe
-		if (window.innerWidth - swipeStart().x < local.swipeDistanceFromSides) {
+		// Swipe from right to left
+		if (
+			getSidebarRight() !== undefined &&
+			window.innerWidth - swipeStart().x < local.swipeDistanceFromSides
+		) {
 			swipeDirection = "left";
 		}
 

diff --git a/src/components/sidenav/index.scss b/src/components/sidenav/index.scss
@@ -46,9 +46,11 @@
     color: var(--jdd-blue-6);
   }
 
-  &:hover:not(:disabled):not([aria-disabled]) {
-    background: var(--jdd-blue-6);
-    color: var(--jdd-gray-1);
+  &:not(:disabled):not([aria-disabled]) {
+    &:hover, &:focus-visible {
+      background: var(--jdd-blue-6);
+      color: var(--jdd-gray-1);
+    }
   }
 
   > svg, span > svg {