Merge b4acad3 into b4d0e47

growingio · Mar 8, 2021 · 9ba233d · 9ba233d
2 parents b4d0e47 + b4acad3
commit 9ba233d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/src/components/layout/sider.tsx b/src/components/layout/sider.tsx
@@ -88,7 +88,7 @@ const Sider = ({
       className={classNames(prefixCls, className, {
         [`${prefixCls}-suspend`]: !!suspendedPosition,
         [`${prefixCls}-suspend-${suspendedPosition}`]: !!suspendedPosition,
-        [`${prefixCls}-collapsed`]: localCollapsed && !suspendedPosition,
+        [`${prefixCls}-collapsed`]: localCollapsed,
         [`${prefixCls}-suspend-collapsed`]: localCollapsed && !!suspendedPosition,
       })}
       style={mergedStyle}

diff --git a/src/components/layout/style/index.less b/src/components/layout/style/index.less
@@ -90,23 +90,23 @@
       cursor: pointer;
       user-select: none;
     }
-  }
 
-  &-sider-suspend {
-    position: absolute;
-    z-index: 1050;
-    width: var(--layout-sider-width);
-    height: 100%;
-    &-left {
-      left: 0;
-      transform: translateX(var(--layout-sider-collapsedWidth-negative));
-    }
-    &-right {
-      right: 0;
-      transform: translateX(var(--layout-sider-collapsedWidth));
-    }
-    &-collapsed {
-      width: var(--layout-sider-collapsedWidth);
+    &-suspend {
+      position: absolute;
+      z-index: 1050;
+      width: var(--layout-sider-width);
+      height: 100%;
+      &-left {
+        left: 0;
+        transform: translateX(var(--layout-sider-collapsedWidth-negative));
+      }
+      &-right {
+        right: 0;
+        transform: translateX(var(--layout-sider-collapsedWidth));
+      }
+      &-collapsed {
+        width: var(--layout-sider-collapsedWidth);
+      }
     }
   }
 }