fix(mobile): pass exact button ref coordinates to drawer to strictly synchronize slide direction
Deploy Frontend / deploy (push) Successful in 1m13s
Deploy Frontend / deploy (push) Successful in 1m13s
This commit is contained in:
1 parent
bc8100b517
commit
f29d5f4bc3
4 files changed
+45
-40
No files matched your search
@@ -1,6 +1,6 @@
|
||||
"use client";
|
||||
import Image from "next/image";
|
||||
import React, { useState } from "react";
|
||||
import React, { useRef, useState } from "react";
|
||||
import MobileMenu from "../mobile-menu/mobileMenu";
|
||||
import { Dictionary } from "@/app/types/types";
|
||||
|
||||
@@ -10,12 +10,24 @@ interface BurgerButtonProps {
|
||||
|
||||
export default function BurgerButton({ dict }: BurgerButtonProps) {
|
||||
const [clicked, setClicked] = useState(false);
|
||||
const [side, setSide] = useState<"left" | "right">("right");
|
||||
const buttonRef = useRef<HTMLButtonElement>(null);
|
||||
|
||||
const handleToggle = () => {
|
||||
if (buttonRef.current && typeof window !== "undefined") {
|
||||
const rect = buttonRef.current.getBoundingClientRect();
|
||||
const onLeft = rect.left + rect.width / 2 < window.innerWidth / 2;
|
||||
setSide(onLeft ? "left" : "right");
|
||||
}
|
||||
setClicked((prev) => !prev);
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<button
|
||||
ref={buttonRef}
|
||||
className="flex select-none items-center justify-center whitespace-nowrap rounded-md bg-[#FD6F00] px-4 py-2 text-[16px] font-[600] text-[#fff] lg:hidden xl:text-[20px]"
|
||||
onClick={() => setClicked(!clicked)}
|
||||
onClick={handleToggle}
|
||||
aria-label="Toggle navigation menu"
|
||||
aria-expanded={clicked}
|
||||
>
|
||||
@@ -28,7 +40,12 @@ export default function BurgerButton({ dict }: BurgerButtonProps) {
|
||||
aria-hidden
|
||||
/>
|
||||
</button>
|
||||
<MobileMenu clicked={clicked} setClicked={setClicked} dict={dict} />
|
||||
<MobileMenu
|
||||
clicked={clicked}
|
||||
setClicked={setClicked}
|
||||
dict={dict}
|
||||
side={side}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -29,34 +29,24 @@ type PropsType = {
|
||||
clicked: boolean;
|
||||
setClicked: React.Dispatch<React.SetStateAction<boolean>>;
|
||||
dict: Dictionary;
|
||||
side?: "left" | "right";
|
||||
};
|
||||
|
||||
export default function MobileMenu({ clicked, setClicked, dict }: PropsType) {
|
||||
export default function MobileMenu({
|
||||
clicked,
|
||||
setClicked,
|
||||
dict,
|
||||
side = "right",
|
||||
}: PropsType) {
|
||||
const [mounted, setMounted] = useState(false);
|
||||
const router = useRouter();
|
||||
const selectedLocale = useSelectedLocale();
|
||||
const isRTL = selectedLocale === "fa";
|
||||
const [side, setSide] = useState<"left" | "right">("right");
|
||||
|
||||
useEffect(() => {
|
||||
setMounted(true);
|
||||
}, []);
|
||||
|
||||
// Detect which side the burger button is actually located on the screen
|
||||
useEffect(() => {
|
||||
const updateSide = () => {
|
||||
const btn = document.querySelector('button[aria-label="Toggle navigation menu"]');
|
||||
if (btn) {
|
||||
const rect = btn.getBoundingClientRect();
|
||||
const isLeft = rect.left + rect.width / 2 < window.innerWidth / 2;
|
||||
setSide(isLeft ? "left" : "right");
|
||||
}
|
||||
};
|
||||
updateSide();
|
||||
window.addEventListener("resize", updateSide);
|
||||
return () => window.removeEventListener("resize", updateSide);
|
||||
}, [clicked, isRTL]);
|
||||
|
||||
// Prevent background scrolling when mobile menu is open
|
||||
useEffect(() => {
|
||||
if (clicked) {
|
||||
|
||||
@@ -1,22 +1,35 @@
|
||||
"use client";
|
||||
|
||||
import React, { useState } from "react";
|
||||
import React, { useRef, useState } from "react";
|
||||
import { Menu } from "lucide-react";
|
||||
import MobileMenu from "../mobile-menu/mobileMenu";
|
||||
|
||||
export default function BurgerButton() {
|
||||
const [clicked, setClicked] = useState(false);
|
||||
const [side, setSide] = useState<"left" | "right">("right");
|
||||
const buttonRef = useRef<HTMLButtonElement>(null);
|
||||
|
||||
const handleToggle = () => {
|
||||
if (buttonRef.current && typeof window !== "undefined") {
|
||||
const rect = buttonRef.current.getBoundingClientRect();
|
||||
const onLeft = rect.left + rect.width / 2 < window.innerWidth / 2;
|
||||
setSide(onLeft ? "left" : "right");
|
||||
}
|
||||
setClicked((prev) => !prev);
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<button
|
||||
ref={buttonRef}
|
||||
className="flex h-9 w-9 select-none items-center justify-center rounded-xl border border-border bg-muted/60 text-foreground transition-all hover:bg-muted hover:text-primary md:hidden"
|
||||
onClick={() => setClicked(!clicked)}
|
||||
onClick={handleToggle}
|
||||
aria-label="Toggle navigation menu"
|
||||
aria-expanded={clicked}
|
||||
>
|
||||
<Menu className="h-5 w-5" />
|
||||
</button>
|
||||
<MobileMenu clicked={clicked} setClicked={setClicked} />
|
||||
<MobileMenu clicked={clicked} setClicked={setClicked} side={side} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -26,35 +26,20 @@ import { ThemeToggle } from "@/app/(routes)/(website)/components/theme-toggle/th
|
||||
type PropsType = {
|
||||
clicked: boolean;
|
||||
setClicked: React.Dispatch<React.SetStateAction<boolean>>;
|
||||
side?: "left" | "right";
|
||||
};
|
||||
|
||||
export default function MobileMenu({ clicked, setClicked }: PropsType) {
|
||||
export default function MobileMenu({ clicked, setClicked, side = "right" }: PropsType) {
|
||||
const [mounted, setMounted] = useState(false);
|
||||
const pathname = usePathname();
|
||||
const router = useRouter();
|
||||
const selectedLocale = useSelectedLocale();
|
||||
const isRTL = selectedLocale === "fa";
|
||||
const [side, setSide] = useState<"left" | "right">("right");
|
||||
|
||||
useEffect(() => {
|
||||
setMounted(true);
|
||||
}, []);
|
||||
|
||||
// Detect which side the burger button is actually located on the screen
|
||||
useEffect(() => {
|
||||
const updateSide = () => {
|
||||
const btn = document.querySelector('button[aria-label="Toggle navigation menu"]');
|
||||
if (btn) {
|
||||
const rect = btn.getBoundingClientRect();
|
||||
const isLeft = rect.left + rect.width / 2 < window.innerWidth / 2;
|
||||
setSide(isLeft ? "left" : "right");
|
||||
}
|
||||
};
|
||||
updateSide();
|
||||
window.addEventListener("resize", updateSide);
|
||||
return () => window.removeEventListener("resize", updateSide);
|
||||
}, [clicked, isRTL]);
|
||||
|
||||
// Prevent background scrolling when mobile menu is open
|
||||
useEffect(() => {
|
||||
if (clicked) {
|
||||
|
||||
Reference in new issue
Block a user