Merge branch 'main' into UXRFC-439

gravity-ui · Jan 23, 2025 · 449ee3d · 449ee3d
2 parents 1cb5bc8 + 3f580e1
commit 449ee3d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/components/FilePreview/FilePreview.scss b/src/components/FilePreview/FilePreview.scss
@@ -135,7 +135,7 @@ $smallRoundedButtonSize: 24px;
         width: 96px;
     }
 
-    &-image {
+    &__image {
         position: absolute;
         inset-block-start: 0;
         inset-inline-start: 0;

diff --git a/src/components/Sheet/SheetContent.tsx b/src/components/Sheet/SheetContent.tsx
@@ -59,6 +59,7 @@ interface SheetContentState {
     veilTouched: boolean;
     isAnimating: boolean;
     inWindowResizeScope: boolean;
+    delayedResize: boolean;
 }
 
 class SheetContent extends React.Component<SheetContentInnerProps, SheetContentState> {
@@ -86,6 +87,7 @@ class SheetContent extends React.Component<SheetContentInnerProps, SheetContentS
         veilTouched: false,
         isAnimating: false,
         inWindowResizeScope: false,
+        delayedResize: false,
     };
 
     componentDidMount() {
@@ -333,12 +335,14 @@ class SheetContent extends React.Component<SheetContentInnerProps, SheetContentS
             y: e.nativeEvent.touches[0].clientY,
         });
 
-        this.setState({deltaY: delta});
-
+        // if allowHideOnContentScroll is true and delta <= 0, it's a content scroll
+        // animation is not needed
         if (delta <= 0) {
+            this.setState({deltaY: 0});
             return;
         }
 
+        this.setState({deltaY: delta});
         this.setStyles({status: 'showing', deltaHeight: delta});
     };
 
@@ -397,6 +401,12 @@ class SheetContent extends React.Component<SheetContentInnerProps, SheetContentS
 
         if (this.veilOpacity === '0') {
             this.props.hideSheet();
+            return;
+        }
+
+        if (this.state.delayedResize) {
+            this.onResizeWindow();
+            this.setState({delayedResize: false});
         }
     };
 
@@ -410,6 +420,7 @@ class SheetContent extends React.Component<SheetContentInnerProps, SheetContentS
 
     private onResizeWindow = () => {
         if (this.state.isAnimating) {
+            this.setState({delayedResize: true});
             return;
         }