drawer fixes
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
import { Box, Container, Flex, Loader, useComputedColorScheme } from "@mantine/core";
|
||||
import { PropsWithChildren, Suspense, useEffect } from "react";
|
||||
import { PropsWithChildren, Suspense, useEffect, useRef } from "react";
|
||||
import { Drawer as VaulDrawer } from "vaul";
|
||||
import styles from "./styles.module.css";
|
||||
import FullScreenLoader from "../full-screen-loader";
|
||||
|
||||
interface DrawerProps extends PropsWithChildren {
|
||||
title?: string;
|
||||
@@ -17,6 +16,7 @@ const Drawer: React.FC<DrawerProps> = ({
|
||||
onChange,
|
||||
}) => {
|
||||
const colorScheme = useComputedColorScheme("light");
|
||||
const contentRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
useEffect(() => {
|
||||
const appElement = document.querySelector(".app") as HTMLElement;
|
||||
@@ -59,11 +59,31 @@ const Drawer: React.FC<DrawerProps> = ({
|
||||
};
|
||||
}, [opened, colorScheme]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!opened || !contentRef.current) return;
|
||||
|
||||
const resizeObserver = new ResizeObserver(() => {
|
||||
if (contentRef.current) {
|
||||
const drawerContent = contentRef.current.closest('[data-vaul-drawer-wrapper]');
|
||||
if (drawerContent) {
|
||||
(drawerContent as HTMLElement).style.height = 'auto';
|
||||
(drawerContent as HTMLElement).offsetHeight;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
resizeObserver.observe(contentRef.current);
|
||||
|
||||
return () => {
|
||||
resizeObserver.disconnect();
|
||||
};
|
||||
}, [opened, children]);
|
||||
|
||||
return (
|
||||
<VaulDrawer.Root open={opened} onOpenChange={onChange}>
|
||||
<VaulDrawer.Portal>
|
||||
<VaulDrawer.Overlay className={styles.drawerOverlay} />
|
||||
<VaulDrawer.Content className={styles.drawerContent} aria-describedby="drawer">
|
||||
<VaulDrawer.Content className={styles.drawerContent} aria-describedby="drawer" ref={contentRef}>
|
||||
<Container flex={1} p="md">
|
||||
<Box
|
||||
mb="sm"
|
||||
@@ -74,7 +94,7 @@ const Drawer: React.FC<DrawerProps> = ({
|
||||
mr="auto"
|
||||
style={{ borderRadius: "9999px" }}
|
||||
/>
|
||||
<Container mah="fit-content" mx="auto" maw="28rem" px={0}>
|
||||
<Container mx="auto" maw="28rem" px={0}>
|
||||
<VaulDrawer.Title>{title}</VaulDrawer.Title>
|
||||
<Suspense fallback={
|
||||
<Flex justify='center' align='center' w='100%' h={400}>
|
||||
|
||||
@@ -2,7 +2,7 @@ import { PropsWithChildren, useCallback } from "react";
|
||||
import { useIsMobile } from "@/hooks/use-is-mobile";
|
||||
import Drawer from "./drawer";
|
||||
import Modal from "./modal";
|
||||
import { Box, ScrollArea } from "@mantine/core";
|
||||
import { ScrollArea } from "@mantine/core";
|
||||
|
||||
interface SheetProps extends PropsWithChildren {
|
||||
title?: string;
|
||||
@@ -29,7 +29,7 @@ const Sheet: React.FC<SheetProps> = ({ title, children, opened, onChange }) => {
|
||||
scrollbars="y"
|
||||
type="scroll"
|
||||
>
|
||||
<Box mah="70vh">{children}</Box>
|
||||
{children}
|
||||
</ScrollArea>
|
||||
</SheetComponent>
|
||||
);
|
||||
|
||||
@@ -11,10 +11,13 @@
|
||||
border-top-left-radius: 20px;
|
||||
border-top-right-radius: 20px;
|
||||
margin-top: 24px;
|
||||
height: fit-content;
|
||||
height: auto !important;
|
||||
min-height: fit-content;
|
||||
max-height: 100dvh;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
outline: none;
|
||||
transition: height 0.2s ease-out;
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ function SwipeableTabs({
|
||||
const activeSlideRef = slideRefs.current[activeTab];
|
||||
if (!activeSlideRef) return;
|
||||
|
||||
let timeoutId: number;
|
||||
let timeoutId: any;
|
||||
const resizeObserver = new ResizeObserver(() => {
|
||||
clearTimeout(timeoutId);
|
||||
timeoutId = setTimeout(updateHeight, 16);
|
||||
|
||||
Reference in New Issue
Block a user