@ionic/core 8.7.16-dev.11767111768.1552e96d → 8.7.16-dev.11767205737.13557925

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -249,7 +249,7 @@ const calculateSpringStep = (t) => {
249
249
  const SwipeToCloseDefaults = {
250
250
  MIN_PRESENTING_SCALE: 0.915,
251
251
  };
252
- const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) => {
252
+ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onGestureMove) => {
253
253
  /**
254
254
  * The step value at which a card modal
255
255
  * is eligible for dismissing via gesture.
@@ -406,6 +406,8 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) =>
406
406
  const processedStep = isAttemptingDismissWithCanDismiss ? calculateSpringStep(step / maxStep) : step;
407
407
  const clampedStep = helpers.clamp(0.0001, processedStep, maxStep);
408
408
  animation.progressStep(clampedStep);
409
+ // Notify modal of position change for safe-area updates
410
+ onGestureMove === null || onGestureMove === void 0 ? void 0 : onGestureMove();
409
411
  /**
410
412
  * When swiping down half way, the status bar style
411
413
  * should be reset to its default value.
@@ -949,7 +951,7 @@ const mdLeaveAnimation = (baseEl, opts) => {
949
951
  return baseAnimation;
950
952
  };
951
953
 
952
- const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange) => {
954
+ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange, onGestureMove) => {
953
955
  // Defaults for the sheet swipe animation
954
956
  const defaultBackdrop = [
955
957
  { offset: 0, opacity: 'var(--backdrop-opacity)' },
@@ -1280,6 +1282,8 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
1280
1282
  : step;
1281
1283
  offset = helpers.clamp(0.0001, processedStep, maxStep);
1282
1284
  animation.progressStep(offset);
1285
+ // Notify modal of position change for safe-area updates
1286
+ onGestureMove === null || onGestureMove === void 0 ? void 0 : onGestureMove();
1283
1287
  };
1284
1288
  const onEnd = (detail) => {
1285
1289
  /**
@@ -1474,9 +1478,9 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
1474
1478
  };
1475
1479
  };
1476
1480
 
1477
- const modalIosCss = ":host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--overflow:hidden;--border-radius:0;--border-width:0;--border-style:none;--border-color:transparent;--background:var(--ion-background-color, #fff);--box-shadow:none;--backdrop-opacity:0;left:0;right:0;top:0;bottom:0;display:-ms-flexbox;display:flex;position:absolute;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;outline:none;color:var(--ion-text-color, #000);contain:strict}.modal-wrapper,ion-backdrop{pointer-events:auto}:host(.overlay-hidden){display:none}.modal-wrapper,.modal-shadow{border-radius:var(--border-radius);width:var(--width);min-width:var(--min-width);max-width:var(--max-width);height:var(--height);min-height:var(--min-height);max-height:var(--max-height);border-width:var(--border-width);border-style:var(--border-style);border-color:var(--border-color);background:var(--background);-webkit-box-shadow:var(--box-shadow);box-shadow:var(--box-shadow);overflow:var(--overflow);z-index:10}.modal-shadow{position:absolute;background:transparent}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--width:600px;--height:500px;--ion-safe-area-top:0px;--ion-safe-area-bottom:0px;--ion-safe-area-right:0px;--ion-safe-area-left:0px}}@media only screen and (min-width: 768px) and (min-height: 768px){:host{--width:600px;--height:600px}}.modal-handle{left:0px;right:0px;top:5px;border-radius:8px;-webkit-margin-start:auto;margin-inline-start:auto;-webkit-margin-end:auto;margin-inline-end:auto;position:absolute;width:36px;height:5px;-webkit-transform:translateZ(0);transform:translateZ(0);border:0;background:var(--ion-color-step-350, var(--ion-background-color-step-350, #c0c0be));cursor:pointer;z-index:11}.modal-handle::before{-webkit-padding-start:4px;padding-inline-start:4px;-webkit-padding-end:4px;padding-inline-end:4px;padding-top:4px;padding-bottom:4px;position:absolute;width:36px;height:5px;-webkit-transform:translate(-50%, -50%);transform:translate(-50%, -50%);content:\"\"}:host(.modal-sheet){--height:calc(100% - (var(--ion-safe-area-top) + 10px))}:host(.modal-sheet) .modal-wrapper,:host(.modal-sheet) .modal-shadow{position:absolute;bottom:0}:host(.modal-sheet.modal-no-expand-scroll) ion-footer{position:absolute;bottom:0;width:var(--width)}:host{--backdrop-opacity:var(--ion-backdrop-opacity, 0.4)}:host(.modal-card),:host(.modal-sheet){--border-radius:10px}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--border-radius:10px}}.modal-wrapper{-webkit-transform:translate3d(0, 100%, 0);transform:translate3d(0, 100%, 0)}@media screen and (max-width: 767px){@supports (width: max(0px, 1px)){:host(.modal-card){--height:calc(100% - max(30px, var(--ion-safe-area-top)) - 10px)}}@supports not (width: max(0px, 1px)){:host(.modal-card){--height:calc(100% - 40px)}}:host(.modal-card) .modal-wrapper{border-start-start-radius:var(--border-radius);border-start-end-radius:var(--border-radius);border-end-end-radius:0;border-end-start-radius:0}:host(.modal-card){--backdrop-opacity:0;--width:100%;-ms-flex-align:end;align-items:flex-end}:host(.modal-card) .modal-shadow{display:none}:host(.modal-card) ion-backdrop{pointer-events:none}}@media screen and (min-width: 768px){:host(.modal-card){--width:calc(100% - 120px);--height:calc(100% - (120px + var(--ion-safe-area-top) + var(--ion-safe-area-bottom)));--max-width:720px;--max-height:1000px;--backdrop-opacity:0;--box-shadow:0px 0px 30px 10px rgba(0, 0, 0, 0.1);-webkit-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out}:host(.modal-card) .modal-wrapper{-webkit-box-shadow:none;box-shadow:none}:host(.modal-card) .modal-shadow{-webkit-box-shadow:var(--box-shadow);box-shadow:var(--box-shadow)}}:host(.modal-sheet) .modal-wrapper{border-start-start-radius:var(--border-radius);border-start-end-radius:var(--border-radius);border-end-end-radius:0;border-end-start-radius:0}";
1481
+ const modalIosCss = ":host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--overflow:hidden;--border-radius:0;--border-width:0;--border-style:none;--border-color:transparent;--background:var(--ion-background-color, #fff);--box-shadow:none;--backdrop-opacity:0;left:0;right:0;top:0;bottom:0;display:-ms-flexbox;display:flex;position:absolute;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;outline:none;color:var(--ion-text-color, #000);contain:strict}.modal-wrapper,ion-backdrop{pointer-events:auto}:host(.overlay-hidden){display:none}.modal-wrapper,.modal-shadow{border-radius:var(--border-radius);width:var(--width);min-width:var(--min-width);max-width:var(--max-width);height:var(--height);min-height:var(--min-height);max-height:var(--max-height);border-width:var(--border-width);border-style:var(--border-style);border-color:var(--border-color);background:var(--background);-webkit-box-shadow:var(--box-shadow);box-shadow:var(--box-shadow);overflow:var(--overflow);z-index:10}.modal-shadow{position:absolute;background:transparent}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--width:600px;--height:500px}}@media only screen and (min-width: 768px) and (min-height: 768px){:host{--width:600px;--height:600px}}.modal-handle{left:0px;right:0px;top:5px;border-radius:8px;-webkit-margin-start:auto;margin-inline-start:auto;-webkit-margin-end:auto;margin-inline-end:auto;position:absolute;width:36px;height:5px;-webkit-transform:translateZ(0);transform:translateZ(0);border:0;background:var(--ion-color-step-350, var(--ion-background-color-step-350, #c0c0be));cursor:pointer;z-index:11}.modal-handle::before{-webkit-padding-start:4px;padding-inline-start:4px;-webkit-padding-end:4px;padding-inline-end:4px;padding-top:4px;padding-bottom:4px;position:absolute;width:36px;height:5px;-webkit-transform:translate(-50%, -50%);transform:translate(-50%, -50%);content:\"\"}:host(.modal-sheet){--height:calc(100% - (var(--ion-safe-area-top) + 10px))}:host(.modal-sheet) .modal-wrapper,:host(.modal-sheet) .modal-shadow{position:absolute;bottom:0}:host(.modal-sheet.modal-no-expand-scroll) ion-footer{position:absolute;bottom:0;width:var(--width)}:host{--backdrop-opacity:var(--ion-backdrop-opacity, 0.4)}:host(.modal-card),:host(.modal-sheet){--border-radius:10px}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--border-radius:10px}}.modal-wrapper{-webkit-transform:translate3d(0, 100%, 0);transform:translate3d(0, 100%, 0)}@media screen and (max-width: 767px){@supports (width: max(0px, 1px)){:host(.modal-card){--height:calc(100% - max(30px, var(--ion-safe-area-top)) - 10px)}}@supports not (width: max(0px, 1px)){:host(.modal-card){--height:calc(100% - 40px)}}:host(.modal-card) .modal-wrapper{border-start-start-radius:var(--border-radius);border-start-end-radius:var(--border-radius);border-end-end-radius:0;border-end-start-radius:0}:host(.modal-card){--backdrop-opacity:0;--width:100%;-ms-flex-align:end;align-items:flex-end}:host(.modal-card) .modal-shadow{display:none}:host(.modal-card) ion-backdrop{pointer-events:none}}@media screen and (min-width: 768px){:host(.modal-card){--width:calc(100% - 120px);--height:calc(100% - (120px + var(--ion-safe-area-top) + var(--ion-safe-area-bottom)));--max-width:720px;--max-height:1000px;--backdrop-opacity:0;--box-shadow:0px 0px 30px 10px rgba(0, 0, 0, 0.1);-webkit-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out}:host(.modal-card) .modal-wrapper{-webkit-box-shadow:none;box-shadow:none}:host(.modal-card) .modal-shadow{-webkit-box-shadow:var(--box-shadow);box-shadow:var(--box-shadow)}}:host(.modal-sheet) .modal-wrapper{border-start-start-radius:var(--border-radius);border-start-end-radius:var(--border-radius);border-end-end-radius:0;border-end-start-radius:0}";
1478
1482
 
1479
- const modalMdCss = ":host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--overflow:hidden;--border-radius:0;--border-width:0;--border-style:none;--border-color:transparent;--background:var(--ion-background-color, #fff);--box-shadow:none;--backdrop-opacity:0;left:0;right:0;top:0;bottom:0;display:-ms-flexbox;display:flex;position:absolute;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;outline:none;color:var(--ion-text-color, #000);contain:strict}.modal-wrapper,ion-backdrop{pointer-events:auto}:host(.overlay-hidden){display:none}.modal-wrapper,.modal-shadow{border-radius:var(--border-radius);width:var(--width);min-width:var(--min-width);max-width:var(--max-width);height:var(--height);min-height:var(--min-height);max-height:var(--max-height);border-width:var(--border-width);border-style:var(--border-style);border-color:var(--border-color);background:var(--background);-webkit-box-shadow:var(--box-shadow);box-shadow:var(--box-shadow);overflow:var(--overflow);z-index:10}.modal-shadow{position:absolute;background:transparent}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--width:600px;--height:500px;--ion-safe-area-top:0px;--ion-safe-area-bottom:0px;--ion-safe-area-right:0px;--ion-safe-area-left:0px}}@media only screen and (min-width: 768px) and (min-height: 768px){:host{--width:600px;--height:600px}}.modal-handle{left:0px;right:0px;top:5px;border-radius:8px;-webkit-margin-start:auto;margin-inline-start:auto;-webkit-margin-end:auto;margin-inline-end:auto;position:absolute;width:36px;height:5px;-webkit-transform:translateZ(0);transform:translateZ(0);border:0;background:var(--ion-color-step-350, var(--ion-background-color-step-350, #c0c0be));cursor:pointer;z-index:11}.modal-handle::before{-webkit-padding-start:4px;padding-inline-start:4px;-webkit-padding-end:4px;padding-inline-end:4px;padding-top:4px;padding-bottom:4px;position:absolute;width:36px;height:5px;-webkit-transform:translate(-50%, -50%);transform:translate(-50%, -50%);content:\"\"}:host(.modal-sheet){--height:calc(100% - (var(--ion-safe-area-top) + 10px))}:host(.modal-sheet) .modal-wrapper,:host(.modal-sheet) .modal-shadow{position:absolute;bottom:0}:host(.modal-sheet.modal-no-expand-scroll) ion-footer{position:absolute;bottom:0;width:var(--width)}:host{--backdrop-opacity:var(--ion-backdrop-opacity, 0.32)}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--border-radius:2px;--box-shadow:0 28px 48px rgba(0, 0, 0, 0.4)}}.modal-wrapper{-webkit-transform:translate3d(0, 40px, 0);transform:translate3d(0, 40px, 0);opacity:0.01}";
1483
+ const modalMdCss = ":host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--overflow:hidden;--border-radius:0;--border-width:0;--border-style:none;--border-color:transparent;--background:var(--ion-background-color, #fff);--box-shadow:none;--backdrop-opacity:0;left:0;right:0;top:0;bottom:0;display:-ms-flexbox;display:flex;position:absolute;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;outline:none;color:var(--ion-text-color, #000);contain:strict}.modal-wrapper,ion-backdrop{pointer-events:auto}:host(.overlay-hidden){display:none}.modal-wrapper,.modal-shadow{border-radius:var(--border-radius);width:var(--width);min-width:var(--min-width);max-width:var(--max-width);height:var(--height);min-height:var(--min-height);max-height:var(--max-height);border-width:var(--border-width);border-style:var(--border-style);border-color:var(--border-color);background:var(--background);-webkit-box-shadow:var(--box-shadow);box-shadow:var(--box-shadow);overflow:var(--overflow);z-index:10}.modal-shadow{position:absolute;background:transparent}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--width:600px;--height:500px}}@media only screen and (min-width: 768px) and (min-height: 768px){:host{--width:600px;--height:600px}}.modal-handle{left:0px;right:0px;top:5px;border-radius:8px;-webkit-margin-start:auto;margin-inline-start:auto;-webkit-margin-end:auto;margin-inline-end:auto;position:absolute;width:36px;height:5px;-webkit-transform:translateZ(0);transform:translateZ(0);border:0;background:var(--ion-color-step-350, var(--ion-background-color-step-350, #c0c0be));cursor:pointer;z-index:11}.modal-handle::before{-webkit-padding-start:4px;padding-inline-start:4px;-webkit-padding-end:4px;padding-inline-end:4px;padding-top:4px;padding-bottom:4px;position:absolute;width:36px;height:5px;-webkit-transform:translate(-50%, -50%);transform:translate(-50%, -50%);content:\"\"}:host(.modal-sheet){--height:calc(100% - (var(--ion-safe-area-top) + 10px))}:host(.modal-sheet) .modal-wrapper,:host(.modal-sheet) .modal-shadow{position:absolute;bottom:0}:host(.modal-sheet.modal-no-expand-scroll) ion-footer{position:absolute;bottom:0;width:var(--width)}:host{--backdrop-opacity:var(--ion-backdrop-opacity, 0.32)}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--border-radius:2px;--box-shadow:0 28px 48px rgba(0, 0, 0, 0.4)}}.modal-wrapper{-webkit-transform:translate3d(0, 40px, 0);transform:translate3d(0, 40px, 0);opacity:0.01}";
1480
1484
 
1481
1485
  const Modal = class {
1482
1486
  constructor(hostRef) {
@@ -1499,6 +1503,8 @@ const Modal = class {
1499
1503
  this.inline = false;
1500
1504
  // Whether or not modal is being dismissed via gesture
1501
1505
  this.gestureAnimationDismissing = false;
1506
+ // Whether to skip coordinate-based safe-area detection (for fullscreen phone modals)
1507
+ this.skipSafeAreaCoordinateDetection = false;
1502
1508
  this.presented = false;
1503
1509
  /** @internal */
1504
1510
  this.hasController = false;
@@ -1689,7 +1695,9 @@ const Modal = class {
1689
1695
  }
1690
1696
  }
1691
1697
  onWindowResize() {
1692
- // Only handle resize for iOS card modals when no custom animations are provided
1698
+ // Update safe-area overrides for all modal types on resize
1699
+ this.updateSafeAreaOverrides();
1700
+ // Only handle view transition for iOS card modals when no custom animations are provided
1693
1701
  if (ionicGlobal.getIonMode(this) !== 'ios' || !this.presentingElement || this.enterAnimation || this.leaveAnimation) {
1694
1702
  return;
1695
1703
  }
@@ -1871,6 +1879,8 @@ const Modal = class {
1871
1879
  else if (!this.keepContentsMounted) {
1872
1880
  await index$4.waitForMount();
1873
1881
  }
1882
+ // Predict safe-area needs based on modal configuration to avoid visual snap
1883
+ this.setInitialSafeAreaOverrides(presentingElement);
1874
1884
  index$3.writeTask(() => this.el.classList.add('show-modal'));
1875
1885
  const hasCardModal = presentingElement !== undefined;
1876
1886
  /**
@@ -1932,6 +1942,8 @@ const Modal = class {
1932
1942
  else if (hasCardModal) {
1933
1943
  this.initSwipeToClose();
1934
1944
  }
1945
+ // Now that animation is complete, update safe-area based on actual position
1946
+ this.updateSafeAreaOverrides();
1935
1947
  // Initialize view transition listener for iOS card modals
1936
1948
  this.initViewTransitionListener();
1937
1949
  // Initialize parent removal observer
@@ -1983,7 +1995,7 @@ const Modal = class {
1983
1995
  await this.dismiss(undefined, overlays.GESTURE);
1984
1996
  this.gestureAnimationDismissing = false;
1985
1997
  });
1986
- });
1998
+ }, () => this.updateSafeAreaOverrides());
1987
1999
  this.gesture.enable(true);
1988
2000
  }
1989
2001
  initSheetGesture() {
@@ -2004,7 +2016,8 @@ const Modal = class {
2004
2016
  this.currentBreakpoint = breakpoint;
2005
2017
  this.ionBreakpointDidChange.emit({ breakpoint });
2006
2018
  }
2007
- });
2019
+ this.updateSafeAreaOverrides();
2020
+ }, () => this.updateSafeAreaOverrides());
2008
2021
  this.gesture = gesture;
2009
2022
  this.moveSheetToBreakpoint = moveSheetToBreakpoint;
2010
2023
  this.gesture.enable(true);
@@ -2082,6 +2095,97 @@ const Modal = class {
2082
2095
  // Clear the cached reference
2083
2096
  this.cachedPageParent = undefined;
2084
2097
  }
2098
+ /**
2099
+ * Sets initial safe-area overrides based on modal configuration before
2100
+ * the modal becomes visible. This predicts whether the modal will touch
2101
+ * screen edges to avoid a visual snap after animation completes.
2102
+ */
2103
+ setInitialSafeAreaOverrides(presentingElement) {
2104
+ const style = this.el.style;
2105
+ const isSheetModal = this.breakpoints !== undefined && this.initialBreakpoint !== undefined;
2106
+ const isCardModal = presentingElement !== undefined;
2107
+ const isTablet = window.innerWidth >= 768;
2108
+ // Sheet modals always touch bottom edge, never top/left/right
2109
+ if (isSheetModal) {
2110
+ style.setProperty('--ion-safe-area-top', '0px');
2111
+ style.setProperty('--ion-safe-area-left', '0px');
2112
+ style.setProperty('--ion-safe-area-right', '0px');
2113
+ return;
2114
+ }
2115
+ // Card modals are inset from all edges
2116
+ if (isCardModal) {
2117
+ this.zeroAllSafeAreas();
2118
+ return;
2119
+ }
2120
+ // Phone-sized fullscreen modals inherit safe areas and use wrapper padding
2121
+ if (!isTablet) {
2122
+ this.applyFullscreenSafeArea();
2123
+ return;
2124
+ }
2125
+ // Check if tablet modal is fullscreen via CSS custom properties
2126
+ const computedStyle = getComputedStyle(this.el);
2127
+ const width = computedStyle.getPropertyValue('--width').trim();
2128
+ const height = computedStyle.getPropertyValue('--height').trim();
2129
+ const isFullscreen = width === '100%' && height === '100%';
2130
+ if (isFullscreen) {
2131
+ this.applyFullscreenSafeArea();
2132
+ }
2133
+ else {
2134
+ // Centered dialog doesn't touch edges
2135
+ this.zeroAllSafeAreas();
2136
+ }
2137
+ }
2138
+ /**
2139
+ * Applies safe-area handling for fullscreen modals.
2140
+ * Adds wrapper padding when no footer is present to prevent
2141
+ * content from overlapping system navigation areas.
2142
+ */
2143
+ applyFullscreenSafeArea() {
2144
+ this.skipSafeAreaCoordinateDetection = true;
2145
+ const hasFooter = this.el.querySelector('ion-footer') !== null;
2146
+ if (!hasFooter && this.wrapperEl) {
2147
+ this.wrapperEl.style.setProperty('padding-bottom', 'var(--ion-safe-area-bottom, 0px)');
2148
+ this.wrapperEl.style.setProperty('box-sizing', 'border-box');
2149
+ }
2150
+ }
2151
+ /**
2152
+ * Sets all safe-area CSS variables to 0px for modals that
2153
+ * don't touch screen edges.
2154
+ */
2155
+ zeroAllSafeAreas() {
2156
+ const style = this.el.style;
2157
+ style.setProperty('--ion-safe-area-top', '0px');
2158
+ style.setProperty('--ion-safe-area-bottom', '0px');
2159
+ style.setProperty('--ion-safe-area-left', '0px');
2160
+ style.setProperty('--ion-safe-area-right', '0px');
2161
+ }
2162
+ /**
2163
+ * Updates safe-area CSS variable overrides based on whether the modal
2164
+ * is touching each edge of the viewport. Called after animation
2165
+ * and during gestures to handle dynamic position changes.
2166
+ */
2167
+ updateSafeAreaOverrides() {
2168
+ if (this.skipSafeAreaCoordinateDetection) {
2169
+ return;
2170
+ }
2171
+ const wrapper = this.wrapperEl;
2172
+ if (!wrapper) {
2173
+ return;
2174
+ }
2175
+ const rect = wrapper.getBoundingClientRect();
2176
+ const threshold = 2;
2177
+ const touchingTop = rect.top <= threshold;
2178
+ const touchingBottom = rect.bottom >= window.innerHeight - threshold;
2179
+ const touchingLeft = rect.left <= threshold;
2180
+ const touchingRight = rect.right >= window.innerWidth - threshold;
2181
+ const style = this.el.style;
2182
+ touchingTop ? style.removeProperty('--ion-safe-area-top') : style.setProperty('--ion-safe-area-top', '0px');
2183
+ touchingBottom
2184
+ ? style.removeProperty('--ion-safe-area-bottom')
2185
+ : style.setProperty('--ion-safe-area-bottom', '0px');
2186
+ touchingLeft ? style.removeProperty('--ion-safe-area-left') : style.setProperty('--ion-safe-area-left', '0px');
2187
+ touchingRight ? style.removeProperty('--ion-safe-area-right') : style.setProperty('--ion-safe-area-right', '0px');
2188
+ }
2085
2189
  sheetOnDismiss() {
2086
2190
  /**
2087
2191
  * While the gesture animation is finishing
@@ -2174,6 +2278,8 @@ const Modal = class {
2174
2278
  }
2175
2279
  this.currentBreakpoint = undefined;
2176
2280
  this.animation = undefined;
2281
+ // Reset safe-area detection flag for potential re-presentation
2282
+ this.skipSafeAreaCoordinateDetection = false;
2177
2283
  unlock();
2178
2284
  return dismissed;
2179
2285
  }
@@ -2255,6 +2361,10 @@ const Modal = class {
2255
2361
  this.currentViewIsPortrait = window.innerWidth < 768;
2256
2362
  }
2257
2363
  handleViewTransition() {
2364
+ // Only run view transitions when the modal is presented
2365
+ if (!this.presented) {
2366
+ return;
2367
+ }
2258
2368
  const isPortrait = window.innerWidth < 768;
2259
2369
  // Only transition if view state actually changed
2260
2370
  if (this.currentViewIsPortrait === isPortrait) {
@@ -2419,20 +2529,20 @@ const Modal = class {
2419
2529
  const isCardModal = presentingElement !== undefined && mode === 'ios';
2420
2530
  const isHandleCycle = handleBehavior === 'cycle';
2421
2531
  const isSheetModalWithHandle = isSheetModal && showHandle;
2422
- return (index$3.h(index$3.Host, Object.assign({ key: '9a75095a13de0cfc96f1fa69fd92777d25da8daa', "no-router": true,
2532
+ return (index$3.h(index$3.Host, Object.assign({ key: 'b93c9d20985ca4800b34c0165957b12b0a9d6789', "no-router": true,
2423
2533
  // Allow the modal to be navigable when the handle is focusable
2424
2534
  tabIndex: isHandleCycle && isSheetModalWithHandle ? 0 : -1 }, htmlAttributes, { style: {
2425
2535
  zIndex: `${20000 + this.overlayIndex}`,
2426
- }, class: Object.assign({ [mode]: true, ['modal-default']: !isCardModal && !isSheetModal, [`modal-card`]: isCardModal, [`modal-sheet`]: isSheetModal, [`modal-no-expand-scroll`]: isSheetModal && !expandToScroll, 'overlay-hidden': true, [overlays.FOCUS_TRAP_DISABLE_CLASS]: focusTrap === false }, theme.getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }), index$3.h("ion-backdrop", { key: 'd02612d8063ef20f59f173ff47795f71cdaaf63e', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && index$3.h("div", { key: '708761b70a93e34c08faae079569f444c7416a4c', class: "modal-shadow" }), index$3.h("div", Object.assign({ key: 'a72226ff1a98229f9bfd9207b98fc57e02baa430',
2536
+ }, class: Object.assign({ [mode]: true, ['modal-default']: !isCardModal && !isSheetModal, [`modal-card`]: isCardModal, [`modal-sheet`]: isSheetModal, [`modal-no-expand-scroll`]: isSheetModal && !expandToScroll, 'overlay-hidden': true, [overlays.FOCUS_TRAP_DISABLE_CLASS]: focusTrap === false }, theme.getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }), index$3.h("ion-backdrop", { key: '732b9355b3c0b051d19e1e0cedd7c49e3ad6fdda', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && index$3.h("div", { key: '874dcbb38da5a9feecafc5d3d1cb9f140f7fe48c', class: "modal-shadow" }), index$3.h("div", Object.assign({ key: '0d0c28581d49aeb0f764387a76ad54f68c35a6d5',
2427
2537
  /*
2428
2538
  role and aria-modal must be used on the
2429
2539
  same element. They must also be set inside the
2430
2540
  shadow DOM otherwise ion-button will not be highlighted
2431
2541
  when using VoiceOver: https://bugs.webkit.org/show_bug.cgi?id=247134
2432
2542
  */
2433
- role: "dialog" }, inheritedAttributes, { "aria-modal": "true", class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }), showHandle && (index$3.h("button", { key: '0547f32323882660221385d84d492929caa77c6b', class: "modal-handle",
2543
+ role: "dialog" }, inheritedAttributes, { "aria-modal": "true", class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }), showHandle && (index$3.h("button", { key: 'a27a7ecc9857b4dc2f8a6f64bb01487ac578f5aa', class: "modal-handle",
2434
2544
  // Prevents the handle from receiving keyboard focus when it does not cycle
2435
- tabIndex: !isHandleCycle ? -1 : 0, "aria-label": "Activate to adjust the size of the dialog overlaying the screen", onClick: isHandleCycle ? this.onHandleClick : undefined, part: "handle", ref: (el) => (this.dragHandleEl = el) })), index$3.h("slot", { key: 'fccbd64518b6fa22f9e874deb6b4ba55d8d89c3b', onSlotchange: this.onSlotChange }))));
2545
+ tabIndex: !isHandleCycle ? -1 : 0, "aria-label": "Activate to adjust the size of the dialog overlaying the screen", onClick: isHandleCycle ? this.onHandleClick : undefined, part: "handle", ref: (el) => (this.dragHandleEl = el) })), index$3.h("slot", { key: '2ca0a826798dbc5cfe06e94b6a2d0ef375d018bc', onSlotchange: this.onSlotChange }))));
2436
2546
  }
2437
2547
  get el() { return index$3.getElement(this); }
2438
2548
  static get watchers() { return {
@@ -660,6 +660,8 @@ const calculateWindowAdjustment = (side, coordTop, coordLeft, bodyPadding, bodyW
660
660
  let bottom;
661
661
  let originX = contentOriginX;
662
662
  let originY = contentOriginY;
663
+ let checkSafeAreaTop = false;
664
+ let checkSafeAreaBottom = false;
663
665
  let checkSafeAreaLeft = false;
664
666
  let checkSafeAreaRight = false;
665
667
  const triggerTop = triggerCoordinates
@@ -704,10 +706,18 @@ const calculateWindowAdjustment = (side, coordTop, coordLeft, bodyPadding, bodyW
704
706
  * We chose 12 here so that the popover position looks a bit nicer as
705
707
  * it is not right up against the edge of the screen.
706
708
  */
707
- top = Math.max(12, triggerTop - contentHeight - triggerHeight - (arrowHeight - 1));
709
+ top = Math.max(bodyPadding, triggerTop - contentHeight - triggerHeight - (arrowHeight - 1));
708
710
  arrowTop = top + contentHeight;
709
711
  originY = 'bottom';
710
712
  addPopoverBottomClass = true;
713
+ /**
714
+ * If the popover is positioned near the top edge, account for safe area.
715
+ * This ensures the popover doesn't overlap with status bars or notches.
716
+ */
717
+ if (top <= bodyPadding + safeAreaMargin) {
718
+ checkSafeAreaTop = true;
719
+ top = bodyPadding;
720
+ }
711
721
  /**
712
722
  * If not enough room for popover to appear
713
723
  * above trigger, then cut it off.
@@ -715,6 +725,12 @@ const calculateWindowAdjustment = (side, coordTop, coordLeft, bodyPadding, bodyW
715
725
  }
716
726
  else {
717
727
  bottom = bodyPadding;
728
+ /**
729
+ * When the popover is pinned to the bottom, account for safe area.
730
+ * This ensures the popover doesn't overlap with home indicators
731
+ * or navigation bars (e.g., Android API 36+ edge-to-edge).
732
+ */
733
+ checkSafeAreaBottom = true;
718
734
  }
719
735
  }
720
736
  return {
@@ -723,6 +739,8 @@ const calculateWindowAdjustment = (side, coordTop, coordLeft, bodyPadding, bodyW
723
739
  bottom,
724
740
  originX,
725
741
  originY,
742
+ checkSafeAreaTop,
743
+ checkSafeAreaBottom,
726
744
  checkSafeAreaLeft,
727
745
  checkSafeAreaRight,
728
746
  arrowTop,
@@ -783,7 +801,7 @@ const iosEnterAnimation = (baseEl, opts) => {
783
801
  const results = getPopoverPosition(isRTL, contentWidth, contentHeight, arrowWidth, arrowHeight, reference, side, align, defaultPosition, trigger, ev);
784
802
  const padding = size === 'cover' ? 0 : POPOVER_IOS_BODY_PADDING;
785
803
  const margin = size === 'cover' ? 0 : 25;
786
- const { originX, originY, top, left, bottom, checkSafeAreaLeft, checkSafeAreaRight, arrowTop, arrowLeft, addPopoverBottomClass, } = calculateWindowAdjustment(side, results.top, results.left, padding, bodyWidth, bodyHeight, contentWidth, contentHeight, margin, results.originX, results.originY, results.referenceCoordinates, results.arrowTop, results.arrowLeft, arrowHeight);
804
+ const { originX, originY, top, left, bottom, checkSafeAreaTop, checkSafeAreaBottom, checkSafeAreaLeft, checkSafeAreaRight, arrowTop, arrowLeft, addPopoverBottomClass, } = calculateWindowAdjustment(side, results.top, results.left, padding, bodyWidth, bodyHeight, contentWidth, contentHeight, margin, results.originX, results.originY, results.referenceCoordinates, results.arrowTop, results.arrowLeft, arrowHeight);
787
805
  const baseAnimation = animation.createAnimation();
788
806
  const backdropAnimation = animation.createAnimation();
789
807
  const contentAnimation = animation.createAnimation();
@@ -813,19 +831,35 @@ const iosEnterAnimation = (baseEl, opts) => {
813
831
  if (addPopoverBottomClass) {
814
832
  baseEl.classList.add('popover-bottom');
815
833
  }
816
- if (bottom !== undefined) {
817
- contentEl.style.setProperty('bottom', `${bottom}px`);
818
- }
834
+ /**
835
+ * Safe area CSS variable adjustments.
836
+ * When the popover is positioned near an edge, we add the corresponding
837
+ * safe-area inset to ensure the popover doesn't overlap with system UI
838
+ * (status bars, home indicators, navigation bars on Android API 36+, etc.)
839
+ */
840
+ const safeAreaTop = ' + var(--ion-safe-area-top, 0)';
841
+ const safeAreaBottom = ' + var(--ion-safe-area-bottom, 0)';
819
842
  const safeAreaLeft = ' + var(--ion-safe-area-left, 0)';
820
843
  const safeAreaRight = ' - var(--ion-safe-area-right, 0)';
844
+ let topValue = `${top}px`;
845
+ let bottomValue = bottom !== undefined ? `${bottom}px` : undefined;
821
846
  let leftValue = `${left}px`;
847
+ if (checkSafeAreaTop) {
848
+ topValue = `${top}px${safeAreaTop}`;
849
+ }
850
+ if (checkSafeAreaBottom && bottomValue !== undefined) {
851
+ bottomValue = `${bottom}px${safeAreaBottom}`;
852
+ }
822
853
  if (checkSafeAreaLeft) {
823
854
  leftValue = `${left}px${safeAreaLeft}`;
824
855
  }
825
856
  if (checkSafeAreaRight) {
826
857
  leftValue = `${left}px${safeAreaRight}`;
827
858
  }
828
- contentEl.style.setProperty('top', `calc(${top}px + var(--offset-y, 0))`);
859
+ if (bottomValue !== undefined) {
860
+ contentEl.style.setProperty('bottom', `calc(${bottomValue})`);
861
+ }
862
+ contentEl.style.setProperty('top', `calc(${topValue} + var(--offset-y, 0))`);
829
863
  contentEl.style.setProperty('left', `calc(${leftValue} + var(--offset-x, 0))`);
830
864
  contentEl.style.setProperty('transform-origin', `${originY} ${originX}`);
831
865
  if (arrowEl !== null) {
@@ -901,7 +935,23 @@ const mdEnterAnimation = (baseEl, opts) => {
901
935
  };
902
936
  const results = getPopoverPosition(isRTL, contentWidth, contentHeight, 0, 0, reference, side, align, defaultPosition, trigger, ev);
903
937
  const padding = size === 'cover' ? 0 : POPOVER_MD_BODY_PADDING;
904
- const { originX, originY, top, left, bottom } = calculateWindowAdjustment(side, results.top, results.left, padding, bodyWidth, bodyHeight, contentWidth, contentHeight, 0, results.originX, results.originY, results.referenceCoordinates);
938
+ const { originX, originY, top, left, bottom, checkSafeAreaTop, checkSafeAreaBottom } = calculateWindowAdjustment(side, results.top, results.left, padding, bodyWidth, bodyHeight, contentWidth, contentHeight, 0, results.originX, results.originY, results.referenceCoordinates);
939
+ /**
940
+ * Safe area CSS variable adjustments.
941
+ * When the popover is positioned near an edge, we add the corresponding
942
+ * safe-area inset to ensure the popover doesn't overlap with system UI
943
+ * (status bars, home indicators, navigation bars on Android API 36+, etc.)
944
+ */
945
+ const safeAreaTop = ' + var(--ion-safe-area-top, 0)';
946
+ const safeAreaBottom = ' + var(--ion-safe-area-bottom, 0)';
947
+ let topValue = `${top}px`;
948
+ let bottomValue = bottom !== undefined ? `${bottom}px` : undefined;
949
+ if (checkSafeAreaTop) {
950
+ topValue = `${top}px${safeAreaTop}`;
951
+ }
952
+ if (checkSafeAreaBottom && bottomValue !== undefined) {
953
+ bottomValue = `${bottom}px${safeAreaBottom}`;
954
+ }
905
955
  const baseAnimation = animation.createAnimation();
906
956
  const backdropAnimation = animation.createAnimation();
907
957
  const wrapperAnimation = animation.createAnimation();
@@ -918,13 +968,13 @@ const mdEnterAnimation = (baseEl, opts) => {
918
968
  contentAnimation
919
969
  .addElement(contentEl)
920
970
  .beforeStyles({
921
- top: `calc(${top}px + var(--offset-y, 0px))`,
971
+ top: `calc(${topValue} + var(--offset-y, 0px))`,
922
972
  left: `calc(${left}px + var(--offset-x, 0px))`,
923
973
  'transform-origin': `${originY} ${originX}`,
924
974
  })
925
975
  .beforeAddWrite(() => {
926
- if (bottom !== undefined) {
927
- contentEl.style.setProperty('bottom', `${bottom}px`);
976
+ if (bottomValue !== undefined) {
977
+ contentEl.style.setProperty('bottom', `calc(${bottomValue})`);
928
978
  }
929
979
  })
930
980
  .fromTo('transform', 'scale(0.8)', 'scale(1)');
@@ -7,7 +7,7 @@ import { clamp, getElementRoot, raf } from "../../../utils/helpers";
7
7
  import { FOCUS_TRAP_DISABLE_CLASS } from "../../../utils/overlays";
8
8
  import { getBackdropValueForSheet } from "../utils";
9
9
  import { calculateSpringStep, handleCanDismiss } from "./utils";
10
- export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange) => {
10
+ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange, onGestureMove) => {
11
11
  // Defaults for the sheet swipe animation
12
12
  const defaultBackdrop = [
13
13
  { offset: 0, opacity: 'var(--backdrop-opacity)' },
@@ -338,6 +338,8 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
338
338
  : step;
339
339
  offset = clamp(0.0001, processedStep, maxStep);
340
340
  animation.progressStep(offset);
341
+ // Notify modal of position change for safe-area updates
342
+ onGestureMove === null || onGestureMove === void 0 ? void 0 : onGestureMove();
341
343
  };
342
344
  const onEnd = (detail) => {
343
345
  /**
@@ -12,7 +12,7 @@ import { calculateSpringStep, handleCanDismiss } from "./utils";
12
12
  export const SwipeToCloseDefaults = {
13
13
  MIN_PRESENTING_SCALE: 0.915,
14
14
  };
15
- export const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) => {
15
+ export const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onGestureMove) => {
16
16
  /**
17
17
  * The step value at which a card modal
18
18
  * is eligible for dismissing via gesture.
@@ -169,6 +169,8 @@ export const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismi
169
169
  const processedStep = isAttemptingDismissWithCanDismiss ? calculateSpringStep(step / maxStep) : step;
170
170
  const clampedStep = clamp(0.0001, processedStep, maxStep);
171
171
  animation.progressStep(clampedStep);
172
+ // Notify modal of position change for safe-area updates
173
+ onGestureMove === null || onGestureMove === void 0 ? void 0 : onGestureMove();
172
174
  /**
173
175
  * When swiping down half way, the status bar style
174
176
  * should be reset to its default value.
@@ -135,10 +135,6 @@ ion-backdrop {
135
135
  :host {
136
136
  --width: 600px;
137
137
  --height: 500px;
138
- --ion-safe-area-top: 0px;
139
- --ion-safe-area-bottom: 0px;
140
- --ion-safe-area-right: 0px;
141
- --ion-safe-area-left: 0px;
142
138
  }
143
139
  }
144
140
  @media only screen and (min-width: 768px) and (min-height: 768px) {