Просмотр исходного кода

Merge pull request #6231 from weseek/feat/fix-ui-flickering-on-sidebar-content

feat: Remove useEffect to enable transition for sidebar mode
Yuki Takei 3 лет назад
Родитель
Сommit
5c6ff2228c
1 измененных файлов с 1 добавлено и 9 удалено
  1. 1 9
      packages/app/src/components/Sidebar.tsx

+ 1 - 9
packages/app/src/components/Sidebar.tsx

@@ -97,8 +97,6 @@ const Sidebar = (): JSX.Element => {
 
 
   const { scheduleToPut } = useUserUISettings();
   const { scheduleToPut } = useUserUISettings();
 
 
-  const [isTransitionEnabled, setTransitionEnabled] = useState(false);
-
   const [isHover, setHover] = useState(false);
   const [isHover, setHover] = useState(false);
   const [isHoverOnResizableContainer, setHoverOnResizableContainer] = useState(false);
   const [isHoverOnResizableContainer, setHoverOnResizableContainer] = useState(false);
   const [isDragging, setDrag] = useState(false);
   const [isDragging, setDrag] = useState(false);
@@ -242,12 +240,6 @@ const Sidebar = (): JSX.Element => {
 
 
   }, [dragableAreaMouseUpHandler, draggableAreaMoveHandler, isResizableByDrag]);
   }, [dragableAreaMouseUpHandler, draggableAreaMoveHandler, isResizableByDrag]);
 
 
-  useEffect(() => {
-    setTimeout(() => {
-      setTransitionEnabled(true);
-    }, 1000);
-  }, []);
-
   useEffect(() => {
   useEffect(() => {
     toggleDrawerMode(isDrawerMode);
     toggleDrawerMode(isDrawerMode);
   }, [isDrawerMode, toggleDrawerMode]);
   }, [isDrawerMode, toggleDrawerMode]);
@@ -301,7 +293,7 @@ const Sidebar = (): JSX.Element => {
         <div className={`d-print-none ${isDrawerMode ? 'grw-sidebar-drawer' : 'grw-sidebar-dock'} ${isDrawerOpened ? 'open' : ''}`}>
         <div className={`d-print-none ${isDrawerMode ? 'grw-sidebar-drawer' : 'grw-sidebar-dock'} ${isDrawerOpened ? 'open' : ''}`}>
           <div className="data-layout-container">
           <div className="data-layout-container">
             <div
             <div
-              className={`navigation ${isTransitionEnabled ? 'transition-enabled' : ''}`}
+              className='navigation transition-enabled'
               onMouseEnter={hoverOnHandler}
               onMouseEnter={hoverOnHandler}
               onMouseLeave={hoverOutHandler}
               onMouseLeave={hoverOutHandler}
             >
             >