feat(sheet): use push effect even if no safe areas detected

framework7io · Oct 14, 2022 · 5fd5130 · 5fd5130
1 parent da356cb
commit 5fd5130
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/src/core/components/sheet/sheet-class.js b/src/core/components/sheet/sheet-class.js
@@ -466,18 +466,18 @@ class Sheet extends Modal {
       if (sheet.push) {
         pushOffset = parseInt($el.css('--f7-sheet-push-offset'), 10);
         if (Number.isNaN(pushOffset)) pushOffset = 0;
-        if (pushOffset) {
-          $el.addClass('sheet-modal-push');
-          sheet.$htmlEl.addClass('with-modal-sheet-push');
-          if (!sheet.params.swipeToStep) {
-            sheet.$htmlEl[0].style.setProperty('--f7-sheet-push-scale', pushViewScale(pushOffset));
-          } else {
-            $pushViewEl = app.$el.children('.view, .views');
-            pushBorderRadius = parseFloat(
-              $el.css(`border-${isTopSheetModal ? 'bottom' : 'top'}-left-radius`),
-            );
-            $pushViewEl.css('border-radius', '0px');
-          }
+        if (!pushOffset) pushOffset = app.theme === 'ios' ? 44 : 48;
+        sheet.$htmlEl[0].style.setProperty('--f7-sheet-push-offset', `${pushOffset}px`);
+        $el.addClass('sheet-modal-push');
+        sheet.$htmlEl.addClass('with-modal-sheet-push');
+        if (!sheet.params.swipeToStep) {
+          sheet.$htmlEl[0].style.setProperty('--f7-sheet-push-scale', pushViewScale(pushOffset));
+        } else {
+          $pushViewEl = app.$el.children('.view, .views');
+          pushBorderRadius = parseFloat(
+            $el.css(`border-${isTopSheetModal ? 'bottom' : 'top'}-left-radius`),
+          );
+          $pushViewEl.css('border-radius', '0px');
         }
       }
     });
@@ -532,6 +532,7 @@ class Sheet extends Modal {
       sheet.emit('local::_swipeStep', true);
       if (sheet.push) {
         sheet.$htmlEl[0].style.removeProperty('--f7-sheet-push-scale');
+        sheet.$htmlEl[0].style.removeProperty('--f7-sheet-push-offset');
       }
     };
     sheet.stepToggle = function stepToggle() {