lowcoder-org
diff --git a/‎client/packages/lowcoder-design/src/components/Drawer.tsx
Lines changed: 72 additions & 21 deletions b/‎client/packages/lowcoder-design/src/components/Drawer.tsx
Lines changed: 72 additions & 21 deletions
@@ -1,13 +1,32 @@
 import { default as AntdDrawer, DrawerProps as AntdDrawerProps } from "antd/es/drawer";
 import Handle from "./Modal/handler";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useState, useCallback, useRef } from "react";
 import { Resizable, ResizeHandle } from "react-resizable";
 import { useResizeDetector } from "react-resize-detector";
 import styled from "styled-components";
 
 const StyledDrawer = styled(AntdDrawer)`
   & .ant-drawer-content-wrapper {
-    transition-duration: 0s;
+    transition: transform 0.3s cubic-bezier(0.7, 0.3, 0.1, 1) !important;
+    will-change: transform;
+    transform: translate3d(0, 0, 0);
+  }
+
+  & .ant-drawer-content {
+    transition: none !important;
+  }
+
+  & .ant-drawer-mask {
+    transition: opacity 0.3s cubic-bezier(0.7, 0.3, 0.1, 1) !important;
+    will-change: opacity;
+  }
+
+  & .ant-drawer-header {
+    transition: none !important;
+  }
+
+  & .ant-drawer-body {
+    transition: none !important;
   }
 `;
 
@@ -53,36 +72,68 @@ export function Drawer(props: DrawerProps) {
     () => (resizable ? [getResizeHandle(placement)] : []),
     [placement, resizable]
   );
-  const isTopBom = ["top", "bottom"].includes(placement);
+  const isTopBom = useMemo(() => ["top", "bottom"].includes(placement), [placement]);
   const [width, setWidth] = useState<number>();
   const [height, setHeight] = useState<number>();
+  const mountedRef = useRef(true);
+
+  // Combined effect for width and height cleanup
   useEffect(() => {
-    setWidth(undefined);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [drawerWidth]);
+    if (drawerWidth !== undefined) {
+      setWidth(undefined);
+    }
+    if (drawerHeight !== undefined) {
+      setHeight(undefined);
+    }
+  }, [drawerWidth, drawerHeight]);
+
+  // Cleanup on unmount
   useEffect(() => {
-    setHeight(undefined);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [drawerHeight]);
-  const { width: detectWidth, height: detectHeight, ref } = useResizeDetector();
-  // log.info("Drawer. drawerWidth: ", drawerWidth, " width: ", width, "detectWidth: ", detectWidth);
+    return () => {
+      mountedRef.current = false;
+    };
+  }, []);
+
+  const { width: detectWidth, height: detectHeight, ref } = useResizeDetector({
+    onResize: () => {
+      // Only update if component is still mounted
+      if (!mountedRef.current) return;
+    }
+  });
+
+  const handleResizeStart = useCallback(
+    (event: React.SyntheticEvent, { node, size, handle }: { node: HTMLElement; size: { width: number; height: number }; handle: ResizeHandle }) => {
+      props.onResizeStart?.(event, node, size, handle);
+    },
+    [props.onResizeStart]
+  );
+
+  const handleResize = useCallback(
+    (event: React.SyntheticEvent, { node, size, handle }: { node: HTMLElement; size: { width: number; height: number }; handle: ResizeHandle }) => {
+      if (!mountedRef.current) return;
+      isTopBom ? setHeight(size.height) : setWidth(size.width);
+      props.onResize?.(event, node, size, handle);
+    },
+    [isTopBom, props.onResize]
+  );
+
+  const handleResizeStop = useCallback(
+    (event: React.SyntheticEvent, { node, size, handle }: { node: HTMLElement; size: { width: number; height: number }; handle: ResizeHandle }) => {
+      props.onResizeStop?.(event, node, size, handle);
+    },
+    [props.onResizeStop]
+  );
+
   return (
     <StyledDrawer width={width ?? drawerWidth} height={height ?? drawerHeight} {...otherProps}>
       <Resizable
         width={width ?? detectWidth ?? 0}
         height={height ?? detectHeight ?? 0}
         resizeHandles={resizeHandles}
         handle={Handle}
-        onResizeStart={(event, { node, size, handle }) =>
-          props.onResizeStart?.(event, node, size, handle)
-        }
-        onResize={(event, { node, size, handle }) => {
-          isTopBom ? setHeight(size.height) : setWidth(size.width);
-          props.onResize?.(event, node, size, handle);
-        }}
-        onResizeStop={(event, { node, size, handle }) =>
-          props.onResizeStop?.(event, node, size, handle)
-        }
+        onResizeStart={handleResizeStart}
+        onResize={handleResize}
+        onResizeStop={handleResizeStop}
       >
         <div ref={ref} style={{ height: "100%" }}>
           {children}