@ionic/core 8.7.17-dev.11767891829.1a63afa3 → 8.7.17-dev.11767895575.16ea7cef
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.
- package/components/content.js +8 -96
- package/components/ion-tab-bar.js +23 -3
- package/components/modal.js +12 -213
- package/components/popover.js +11 -83
- package/dist/cjs/ion-app_8.cjs.entry.js +20 -107
- package/dist/cjs/ion-modal.cjs.entry.js +12 -213
- package/dist/cjs/ion-popover.cjs.entry.js +11 -83
- package/dist/cjs/ion-tab-bar_2.cjs.entry.js +23 -3
- package/dist/collection/components/content/content.css +0 -10
- package/dist/collection/components/content/content.js +6 -94
- package/dist/collection/components/modal/gestures/sheet.js +1 -3
- package/dist/collection/components/modal/gestures/swipe-to-close.js +1 -3
- package/dist/collection/components/modal/modal.ios.css +4 -0
- package/dist/collection/components/modal/modal.js +7 -205
- package/dist/collection/components/modal/modal.md.css +4 -0
- package/dist/collection/components/popover/animations/ios.enter.js +5 -21
- package/dist/collection/components/popover/animations/md.enter.js +5 -30
- package/dist/collection/components/popover/utils.js +1 -32
- package/dist/collection/components/tab-bar/tab-bar.js +23 -3
- package/dist/docs.json +1 -1
- package/dist/esm/ion-app_8.entry.js +9 -96
- package/dist/esm/ion-modal.entry.js +12 -213
- package/dist/esm/ion-popover.entry.js +11 -83
- package/dist/esm/ion-tab-bar_2.entry.js +23 -3
- package/dist/ionic/ionic.esm.js +1 -1
- package/dist/ionic/p-172a579f.entry.js +4 -0
- package/dist/ionic/p-732b2fd6.entry.js +4 -0
- package/dist/ionic/p-91840a80.entry.js +4 -0
- package/dist/ionic/p-f9061316.entry.js +4 -0
- package/dist/types/components/content/content.d.ts +0 -24
- package/dist/types/components/modal/gestures/sheet.d.ts +1 -1
- package/dist/types/components/modal/gestures/swipe-to-close.d.ts +1 -1
- package/dist/types/components/modal/modal.d.ts +0 -45
- package/dist/types/components/popover/utils.d.ts +0 -2
- package/dist/types/components/tab-bar/tab-bar.d.ts +1 -0
- package/hydrate/index.js +52 -385
- package/hydrate/index.mjs +52 -385
- package/package.json +1 -1
- package/dist/ionic/p-7268efa5.entry.js +0 -4
- package/dist/ionic/p-968a55d1.entry.js +0 -4
- package/dist/ionic/p-d9fd799f.entry.js +0 -4
- package/dist/ionic/p-ec9ca3fe.entry.js +0 -4
package/components/content.js
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* (C) Ionic http://ionicframework.com - MIT License
|
|
3
3
|
*/
|
|
4
|
-
import { proxyCustomElement, HTMLElement, createEvent,
|
|
5
|
-
import { w as win } from './index9.js';
|
|
4
|
+
import { proxyCustomElement, HTMLElement, createEvent, Build, readTask, forceUpdate, h, Host } from '@stencil/core/internal/client';
|
|
6
5
|
import { i as inheritAriaAttributes, k as hasLazyBuild, c as componentOnReady } from './helpers.js';
|
|
7
6
|
import { b as getIonMode, a as isPlatform } from './ionic-global.js';
|
|
8
7
|
import { i as isRTL } from './dir.js';
|
|
9
8
|
import { c as createColorClasses, h as hostContext } from './theme.js';
|
|
10
9
|
|
|
11
|
-
const contentCss = ":host{--background:var(--ion-background-color, #fff);--color:var(--ion-text-color, #000);--padding-top:0px;--padding-bottom:0px;--padding-start:0px;--padding-end:0px;--keyboard-offset:0px;--offset-top:0px;--offset-bottom:0px;--overflow:auto;display:block;position:relative;-ms-flex:1;flex:1;width:100%;height:100%;margin:0 !important;padding:0 !important;font-family:var(--ion-font-family, inherit);contain:size style}:host(.ion-color) .inner-scroll{background:var(--ion-color-base);color:var(--ion-color-contrast)}#background-content{left:0px;right:0px;top:calc(var(--offset-top) * -1);bottom:calc(var(--offset-bottom) * -1);position:absolute;background:var(--background)}.inner-scroll{left:0px;right:0px;top:calc(var(--offset-top) * -1);bottom:calc(var(--offset-bottom) * -1);-webkit-padding-start:var(--padding-start);padding-inline-start:var(--padding-start);-webkit-padding-end:var(--padding-end);padding-inline-end:var(--padding-end);padding-top:calc(var(--padding-top) + var(--offset-top));padding-bottom:calc(var(--padding-bottom) + var(--keyboard-offset) + var(--offset-bottom));position:absolute;color:var(--color);-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden;-ms-touch-action:pan-x pan-y pinch-zoom;touch-action:pan-x pan-y pinch-zoom}.scroll-y,.scroll-x{-webkit-overflow-scrolling:touch;z-index:0;will-change:scroll-position}.scroll-y{overflow-y:var(--overflow);overscroll-behavior-y:contain}.scroll-x{overflow-x:var(--overflow);overscroll-behavior-x:contain}.overscroll::before,.overscroll::after{position:absolute;width:1px;height:1px;content:\"\"}.overscroll::before{bottom:-1px}.overscroll::after{top:-1px}:host(.content-sizing){display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;min-height:0;contain:none}:host(.content-sizing) .inner-scroll{position:relative;top:0;bottom:0;margin-top:calc(var(--offset-top) * -1);margin-bottom:calc(var(--offset-bottom) * -1)}.transition-effect{display:none;position:absolute;width:100%;height:100vh;opacity:0;pointer-events:none}:host(.content-ltr) .transition-effect{left:-100%;}:host(.content-rtl) .transition-effect{right:-100%;}.transition-cover{position:absolute;right:0;width:100%;height:100%;background:black;opacity:0.1}.transition-shadow{display:block;position:absolute;width:100%;height:100%;-webkit-box-shadow:inset -9px 0 9px 0 rgba(0, 0, 100, 0.03);box-shadow:inset -9px 0 9px 0 rgba(0, 0, 100, 0.03)}:host(.content-ltr) .transition-shadow{right:0;}:host(.content-rtl) .transition-shadow{left:0;-webkit-transform:scaleX(-1);transform:scaleX(-1)}
|
|
10
|
+
const contentCss = ":host{--background:var(--ion-background-color, #fff);--color:var(--ion-text-color, #000);--padding-top:0px;--padding-bottom:0px;--padding-start:0px;--padding-end:0px;--keyboard-offset:0px;--offset-top:0px;--offset-bottom:0px;--overflow:auto;display:block;position:relative;-ms-flex:1;flex:1;width:100%;height:100%;margin:0 !important;padding:0 !important;font-family:var(--ion-font-family, inherit);contain:size style}:host(.ion-color) .inner-scroll{background:var(--ion-color-base);color:var(--ion-color-contrast)}#background-content{left:0px;right:0px;top:calc(var(--offset-top) * -1);bottom:calc(var(--offset-bottom) * -1);position:absolute;background:var(--background)}.inner-scroll{left:0px;right:0px;top:calc(var(--offset-top) * -1);bottom:calc(var(--offset-bottom) * -1);-webkit-padding-start:var(--padding-start);padding-inline-start:var(--padding-start);-webkit-padding-end:var(--padding-end);padding-inline-end:var(--padding-end);padding-top:calc(var(--padding-top) + var(--offset-top));padding-bottom:calc(var(--padding-bottom) + var(--keyboard-offset) + var(--offset-bottom));position:absolute;color:var(--color);-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden;-ms-touch-action:pan-x pan-y pinch-zoom;touch-action:pan-x pan-y pinch-zoom}.scroll-y,.scroll-x{-webkit-overflow-scrolling:touch;z-index:0;will-change:scroll-position}.scroll-y{overflow-y:var(--overflow);overscroll-behavior-y:contain}.scroll-x{overflow-x:var(--overflow);overscroll-behavior-x:contain}.overscroll::before,.overscroll::after{position:absolute;width:1px;height:1px;content:\"\"}.overscroll::before{bottom:-1px}.overscroll::after{top:-1px}:host(.content-sizing){display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;min-height:0;contain:none}:host(.content-sizing) .inner-scroll{position:relative;top:0;bottom:0;margin-top:calc(var(--offset-top) * -1);margin-bottom:calc(var(--offset-bottom) * -1)}.transition-effect{display:none;position:absolute;width:100%;height:100vh;opacity:0;pointer-events:none}:host(.content-ltr) .transition-effect{left:-100%;}:host(.content-rtl) .transition-effect{right:-100%;}.transition-cover{position:absolute;right:0;width:100%;height:100%;background:black;opacity:0.1}.transition-shadow{display:block;position:absolute;width:100%;height:100%;-webkit-box-shadow:inset -9px 0 9px 0 rgba(0, 0, 100, 0.03);box-shadow:inset -9px 0 9px 0 rgba(0, 0, 100, 0.03)}:host(.content-ltr) .transition-shadow{right:0;}:host(.content-rtl) .transition-shadow{left:0;-webkit-transform:scaleX(-1);transform:scaleX(-1)}::slotted([slot=fixed]){position:absolute;-webkit-transform:translateZ(0);transform:translateZ(0)}";
|
|
12
11
|
|
|
13
12
|
const Content = /*@__PURE__*/ proxyCustomElement(class Content extends HTMLElement {
|
|
14
13
|
constructor(registerHost) {
|
|
@@ -29,12 +28,6 @@ const Content = /*@__PURE__*/ proxyCustomElement(class Content extends HTMLEleme
|
|
|
29
28
|
this.isMainContent = true;
|
|
30
29
|
this.resizeTimeout = null;
|
|
31
30
|
this.inheritedAttributes = {};
|
|
32
|
-
/**
|
|
33
|
-
* Track whether this content has sibling header/footer elements.
|
|
34
|
-
* When absent, we need to apply safe-area padding directly.
|
|
35
|
-
*/
|
|
36
|
-
this.hasHeader = false;
|
|
37
|
-
this.hasFooter = false;
|
|
38
31
|
this.tabsElement = null;
|
|
39
32
|
// Detail is used in a hot loop in the scroll event, by allocating it here
|
|
40
33
|
// V8 will be able to inline any read/write to it since it's a monomorphic class.
|
|
@@ -89,13 +82,7 @@ const Content = /*@__PURE__*/ proxyCustomElement(class Content extends HTMLEleme
|
|
|
89
82
|
this.inheritedAttributes = inheritAriaAttributes(this.el);
|
|
90
83
|
}
|
|
91
84
|
connectedCallback() {
|
|
92
|
-
|
|
93
|
-
// Content is "main" if not inside menu/popover/modal and not nested in another ion-content
|
|
94
|
-
this.isMainContent =
|
|
95
|
-
this.el.closest('ion-menu, ion-popover, ion-modal') === null &&
|
|
96
|
-
((_a = this.el.parentElement) === null || _a === void 0 ? void 0 : _a.closest('ion-content')) === null;
|
|
97
|
-
// Detect sibling header/footer for safe-area handling
|
|
98
|
-
this.detectSiblingElements();
|
|
85
|
+
this.isMainContent = this.el.closest('ion-menu, ion-popover, ion-modal') === null;
|
|
99
86
|
/**
|
|
100
87
|
* The fullscreen content offsets need to be
|
|
101
88
|
* computed after the tab bar has loaded. Since
|
|
@@ -126,86 +113,13 @@ const Content = /*@__PURE__*/ proxyCustomElement(class Content extends HTMLEleme
|
|
|
126
113
|
* bubbles, we can catch any instances of child tab bars loading by listening
|
|
127
114
|
* on IonTabs.
|
|
128
115
|
*/
|
|
129
|
-
this.tabsLoadCallback = () =>
|
|
130
|
-
this.resize();
|
|
131
|
-
// Re-detect footer when tab bar loads (it may not exist during initial detection)
|
|
132
|
-
this.updateSiblingDetection();
|
|
133
|
-
forceUpdate(this);
|
|
134
|
-
};
|
|
116
|
+
this.tabsLoadCallback = () => this.resize();
|
|
135
117
|
closestTabs.addEventListener('ionTabBarLoaded', this.tabsLoadCallback);
|
|
136
118
|
}
|
|
137
119
|
}
|
|
138
120
|
}
|
|
139
|
-
/**
|
|
140
|
-
* Detects sibling ion-header and ion-footer elements and sets up
|
|
141
|
-
* a mutation observer to handle dynamic changes (e.g., conditional rendering).
|
|
142
|
-
*/
|
|
143
|
-
detectSiblingElements() {
|
|
144
|
-
this.updateSiblingDetection();
|
|
145
|
-
// Watch for dynamic header/footer changes (common in React conditional rendering)
|
|
146
|
-
const parent = this.el.parentElement;
|
|
147
|
-
if (parent && !this.parentMutationObserver && win !== undefined && 'MutationObserver' in win) {
|
|
148
|
-
this.parentMutationObserver = new MutationObserver(() => {
|
|
149
|
-
const prevHasHeader = this.hasHeader;
|
|
150
|
-
const prevHasFooter = this.hasFooter;
|
|
151
|
-
this.updateSiblingDetection();
|
|
152
|
-
// Only trigger re-render if header/footer detection actually changed
|
|
153
|
-
if (prevHasHeader !== this.hasHeader || prevHasFooter !== this.hasFooter) {
|
|
154
|
-
forceUpdate(this);
|
|
155
|
-
}
|
|
156
|
-
});
|
|
157
|
-
this.parentMutationObserver.observe(parent, { childList: true });
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
/**
|
|
161
|
-
* Updates hasHeader/hasFooter based on current DOM state.
|
|
162
|
-
* Checks both direct siblings and elements wrapped in custom components
|
|
163
|
-
* (e.g., <my-header><ion-header>...</ion-header></my-header>).
|
|
164
|
-
*/
|
|
165
|
-
updateSiblingDetection() {
|
|
166
|
-
const parent = this.el.parentElement;
|
|
167
|
-
if (parent) {
|
|
168
|
-
// First check for direct ion-header/ion-footer siblings
|
|
169
|
-
this.hasHeader = parent.querySelector(':scope > ion-header') !== null;
|
|
170
|
-
this.hasFooter = parent.querySelector(':scope > ion-footer') !== null;
|
|
171
|
-
// If not found, check if any sibling contains them (wrapped components)
|
|
172
|
-
if (!this.hasHeader) {
|
|
173
|
-
this.hasHeader = this.siblingContainsElement(parent, 'ion-header');
|
|
174
|
-
}
|
|
175
|
-
if (!this.hasFooter) {
|
|
176
|
-
this.hasFooter = this.siblingContainsElement(parent, 'ion-footer');
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
// If no footer found, check if we're inside ion-tabs which has ion-tab-bar
|
|
180
|
-
if (!this.hasFooter) {
|
|
181
|
-
const tabs = this.el.closest('ion-tabs');
|
|
182
|
-
if (tabs) {
|
|
183
|
-
this.hasFooter = tabs.querySelector(':scope > ion-tab-bar') !== null;
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
/**
|
|
188
|
-
* Checks if any sibling element of ion-content contains the specified element.
|
|
189
|
-
* Only searches one level deep to avoid finding elements in nested pages.
|
|
190
|
-
*/
|
|
191
|
-
siblingContainsElement(parent, tagName) {
|
|
192
|
-
for (const sibling of parent.children) {
|
|
193
|
-
// Skip ion-content itself
|
|
194
|
-
if (sibling === this.el)
|
|
195
|
-
continue;
|
|
196
|
-
// Check if this sibling contains the target element as an immediate child
|
|
197
|
-
if (sibling.querySelector(`:scope > ${tagName}`) !== null) {
|
|
198
|
-
return true;
|
|
199
|
-
}
|
|
200
|
-
}
|
|
201
|
-
return false;
|
|
202
|
-
}
|
|
203
121
|
disconnectedCallback() {
|
|
204
|
-
var _a;
|
|
205
122
|
this.onScrollEnd();
|
|
206
|
-
// Clean up mutation observer to prevent memory leaks
|
|
207
|
-
(_a = this.parentMutationObserver) === null || _a === void 0 ? void 0 : _a.disconnect();
|
|
208
|
-
this.parentMutationObserver = undefined;
|
|
209
123
|
if (hasLazyBuild(this.el)) {
|
|
210
124
|
/**
|
|
211
125
|
* The event listener and tabs caches need to
|
|
@@ -452,28 +366,26 @@ const Content = /*@__PURE__*/ proxyCustomElement(class Content extends HTMLEleme
|
|
|
452
366
|
}
|
|
453
367
|
}
|
|
454
368
|
render() {
|
|
455
|
-
const { fixedSlotPlacement,
|
|
369
|
+
const { fixedSlotPlacement, inheritedAttributes, isMainContent, scrollX, scrollY, el } = this;
|
|
456
370
|
const rtl = isRTL(el) ? 'rtl' : 'ltr';
|
|
457
371
|
const mode = getIonMode(this);
|
|
458
372
|
const forceOverscroll = this.shouldForceOverscroll();
|
|
459
373
|
const transitionShadow = mode === 'ios';
|
|
460
374
|
this.resize();
|
|
461
|
-
return (h(Host, Object.assign({ key: '
|
|
375
|
+
return (h(Host, Object.assign({ key: 'cd8781f848d8dc926fe66f43d43c49564425a507', role: isMainContent ? 'main' : undefined, class: createColorClasses(this.color, {
|
|
462
376
|
[mode]: true,
|
|
463
377
|
'content-sizing': hostContext('ion-popover', this.el),
|
|
464
378
|
overscroll: forceOverscroll,
|
|
465
379
|
[`content-${rtl}`]: true,
|
|
466
|
-
'safe-area-top': isMainContent && !hasHeader,
|
|
467
|
-
'safe-area-bottom': isMainContent && !hasFooter,
|
|
468
380
|
}), style: {
|
|
469
381
|
'--offset-top': `${this.cTop}px`,
|
|
470
382
|
'--offset-bottom': `${this.cBottom}px`,
|
|
471
|
-
} }, inheritedAttributes), h("div", { key: '
|
|
383
|
+
} }, inheritedAttributes), h("div", { key: '95b112d7cae30f22ef778ceffb88edb4d941c170', ref: (el) => (this.backgroundContentEl = el), id: "background-content", part: "background" }), fixedSlotPlacement === 'before' ? h("slot", { name: "fixed" }) : null, h("div", { key: '2fdfcbc39fb66f11b6191911f2941c660f4c12e5', class: {
|
|
472
384
|
'inner-scroll': true,
|
|
473
385
|
'scroll-x': scrollX,
|
|
474
386
|
'scroll-y': scrollY,
|
|
475
387
|
overscroll: (scrollX || scrollY) && forceOverscroll,
|
|
476
|
-
}, ref: (scrollEl) => (this.scrollEl = scrollEl), onScroll: this.scrollEvents ? (ev) => this.onScroll(ev) : undefined, part: "scroll" }, h("slot", { key: '
|
|
388
|
+
}, ref: (scrollEl) => (this.scrollEl = scrollEl), onScroll: this.scrollEvents ? (ev) => this.onScroll(ev) : undefined, part: "scroll" }, h("slot", { key: '6bc77e0054ec8e21635a7f2abfe0ca46e0962e03' })), transitionShadow ? (h("div", { class: "transition-effect" }, h("div", { class: "transition-cover" }), h("div", { class: "transition-shadow" }))) : null, fixedSlotPlacement === 'after' ? h("slot", { name: "fixed" }) : null));
|
|
477
389
|
}
|
|
478
390
|
get el() { return this; }
|
|
479
391
|
static get style() { return contentCss; }
|
|
@@ -20,6 +20,7 @@ const TabBar = /*@__PURE__*/ proxyCustomElement(class TabBar extends HTMLElement
|
|
|
20
20
|
this.ionTabBarChanged = createEvent(this, "ionTabBarChanged", 7);
|
|
21
21
|
this.ionTabBarLoaded = createEvent(this, "ionTabBarLoaded", 7);
|
|
22
22
|
this.keyboardCtrl = null;
|
|
23
|
+
this.keyboardCtrlPromise = null;
|
|
23
24
|
this.didLoad = false;
|
|
24
25
|
this.keyboardVisible = false;
|
|
25
26
|
/**
|
|
@@ -55,7 +56,7 @@ const TabBar = /*@__PURE__*/ proxyCustomElement(class TabBar extends HTMLElement
|
|
|
55
56
|
}
|
|
56
57
|
}
|
|
57
58
|
async connectedCallback() {
|
|
58
|
-
|
|
59
|
+
const promise = createKeyboardController(async (keyboardOpen, waitForResize) => {
|
|
59
60
|
/**
|
|
60
61
|
* If the keyboard is hiding, then we need to wait
|
|
61
62
|
* for the webview to resize. Otherwise, the tab bar
|
|
@@ -66,21 +67,40 @@ const TabBar = /*@__PURE__*/ proxyCustomElement(class TabBar extends HTMLElement
|
|
|
66
67
|
}
|
|
67
68
|
this.keyboardVisible = keyboardOpen; // trigger re-render by updating state
|
|
68
69
|
});
|
|
70
|
+
this.keyboardCtrlPromise = promise;
|
|
71
|
+
const keyboardCtrl = await promise;
|
|
72
|
+
/**
|
|
73
|
+
* Only assign if this is still the current promise.
|
|
74
|
+
* Otherwise, a new connectedCallback has started or
|
|
75
|
+
* disconnectedCallback was called, so destroy this instance.
|
|
76
|
+
*/
|
|
77
|
+
if (this.keyboardCtrlPromise === promise) {
|
|
78
|
+
this.keyboardCtrl = keyboardCtrl;
|
|
79
|
+
this.keyboardCtrlPromise = null;
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
keyboardCtrl.destroy();
|
|
83
|
+
}
|
|
69
84
|
}
|
|
70
85
|
disconnectedCallback() {
|
|
86
|
+
if (this.keyboardCtrlPromise) {
|
|
87
|
+
this.keyboardCtrlPromise.then((ctrl) => ctrl.destroy());
|
|
88
|
+
this.keyboardCtrlPromise = null;
|
|
89
|
+
}
|
|
71
90
|
if (this.keyboardCtrl) {
|
|
72
91
|
this.keyboardCtrl.destroy();
|
|
92
|
+
this.keyboardCtrl = null;
|
|
73
93
|
}
|
|
74
94
|
}
|
|
75
95
|
render() {
|
|
76
96
|
const { color, translucent, keyboardVisible } = this;
|
|
77
97
|
const mode = getIonMode(this);
|
|
78
98
|
const shouldHide = keyboardVisible && this.el.getAttribute('slot') !== 'top';
|
|
79
|
-
return (h(Host, { key: '
|
|
99
|
+
return (h(Host, { key: '9daf4e2acaff6e3ce3878cf9dd5109fb1afbbebe', role: "tablist", "aria-hidden": shouldHide ? 'true' : null, class: createColorClasses(color, {
|
|
80
100
|
[mode]: true,
|
|
81
101
|
'tab-bar-translucent': translucent,
|
|
82
102
|
'tab-bar-hidden': shouldHide,
|
|
83
|
-
}) }, h("slot", { key: '
|
|
103
|
+
}) }, h("slot", { key: '1d15aa2da8501e8e7eff11ad4a491478be845c43' })));
|
|
84
104
|
}
|
|
85
105
|
get el() { return this; }
|
|
86
106
|
static get watchers() { return {
|
package/components/modal.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
* (C) Ionic http://ionicframework.com - MIT License
|
|
3
3
|
*/
|
|
4
4
|
import { proxyCustomElement, HTMLElement, createEvent, writeTask, h, Host } from '@stencil/core/internal/client';
|
|
5
|
-
import { w as win } from './index9.js';
|
|
6
5
|
import { a as findClosestIonContent, i as isIonContent, d as disableContentScrollY, r as resetContentScrollY, f as findIonContent, p as printIonContentErrorMsg } from './index8.js';
|
|
7
6
|
import { C as CoreDelegate, a as attachComponent, d as detachComponent } from './framework-delegate.js';
|
|
8
7
|
import { f as clamp, g as getElementRoot, r as raf, d as inheritAttributes, k as hasLazyBuild } from './helpers.js';
|
|
@@ -17,6 +16,7 @@ import { KEYBOARD_DID_OPEN } from './keyboard.js';
|
|
|
17
16
|
import { c as createAnimation } from './animation.js';
|
|
18
17
|
import { g as getTimeGivenProgression } from './cubic-bezier.js';
|
|
19
18
|
import { createGesture } from './index3.js';
|
|
19
|
+
import { w as win } from './index9.js';
|
|
20
20
|
import { d as defineCustomElement$1 } from './backdrop.js';
|
|
21
21
|
|
|
22
22
|
var Style;
|
|
@@ -246,7 +246,7 @@ const calculateSpringStep = (t) => {
|
|
|
246
246
|
const SwipeToCloseDefaults = {
|
|
247
247
|
MIN_PRESENTING_SCALE: 0.915,
|
|
248
248
|
};
|
|
249
|
-
const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss
|
|
249
|
+
const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) => {
|
|
250
250
|
/**
|
|
251
251
|
* The step value at which a card modal
|
|
252
252
|
* is eligible for dismissing via gesture.
|
|
@@ -403,8 +403,6 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onG
|
|
|
403
403
|
const processedStep = isAttemptingDismissWithCanDismiss ? calculateSpringStep(step / maxStep) : step;
|
|
404
404
|
const clampedStep = clamp(0.0001, processedStep, maxStep);
|
|
405
405
|
animation.progressStep(clampedStep);
|
|
406
|
-
// Notify modal of position change for safe-area updates
|
|
407
|
-
onGestureMove === null || onGestureMove === void 0 ? void 0 : onGestureMove();
|
|
408
406
|
/**
|
|
409
407
|
* When swiping down half way, the status bar style
|
|
410
408
|
* should be reset to its default value.
|
|
@@ -948,7 +946,7 @@ const mdLeaveAnimation = (baseEl, opts) => {
|
|
|
948
946
|
return baseAnimation;
|
|
949
947
|
};
|
|
950
948
|
|
|
951
|
-
const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange
|
|
949
|
+
const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange) => {
|
|
952
950
|
// Defaults for the sheet swipe animation
|
|
953
951
|
const defaultBackdrop = [
|
|
954
952
|
{ offset: 0, opacity: 'var(--backdrop-opacity)' },
|
|
@@ -1279,8 +1277,6 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
|
|
|
1279
1277
|
: step;
|
|
1280
1278
|
offset = clamp(0.0001, processedStep, maxStep);
|
|
1281
1279
|
animation.progressStep(offset);
|
|
1282
|
-
// Notify modal of position change for safe-area updates
|
|
1283
|
-
onGestureMove === null || onGestureMove === void 0 ? void 0 : onGestureMove();
|
|
1284
1280
|
};
|
|
1285
1281
|
const onEnd = (detail) => {
|
|
1286
1282
|
/**
|
|
@@ -1475,9 +1471,9 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
|
|
|
1475
1471
|
};
|
|
1476
1472
|
};
|
|
1477
1473
|
|
|
1478
|
-
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}";
|
|
1474
|
+
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}";
|
|
1479
1475
|
|
|
1480
|
-
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}";
|
|
1476
|
+
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}";
|
|
1481
1477
|
|
|
1482
1478
|
const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
|
|
1483
1479
|
constructor(registerHost) {
|
|
@@ -1504,10 +1500,6 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
|
|
|
1504
1500
|
this.inline = false;
|
|
1505
1501
|
// Whether or not modal is being dismissed via gesture
|
|
1506
1502
|
this.gestureAnimationDismissing = false;
|
|
1507
|
-
// Whether to skip coordinate-based safe-area detection (for fullscreen phone modals)
|
|
1508
|
-
this.skipSafeAreaCoordinateDetection = false;
|
|
1509
|
-
// Track previous safe-area state to avoid redundant DOM writes
|
|
1510
|
-
this.prevSafeAreaState = { top: false, bottom: false, left: false, right: false };
|
|
1511
1503
|
this.presented = false;
|
|
1512
1504
|
/** @internal */
|
|
1513
1505
|
this.hasController = false;
|
|
@@ -1698,10 +1690,7 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
|
|
|
1698
1690
|
}
|
|
1699
1691
|
}
|
|
1700
1692
|
onWindowResize() {
|
|
1701
|
-
//
|
|
1702
|
-
this.cachedSafeAreas = undefined;
|
|
1703
|
-
this.updateSafeAreaOverrides();
|
|
1704
|
-
// Only handle view transition for iOS card modals when no custom animations are provided
|
|
1693
|
+
// Only handle resize for iOS card modals when no custom animations are provided
|
|
1705
1694
|
if (getIonMode(this) !== 'ios' || !this.presentingElement || this.enterAnimation || this.leaveAnimation) {
|
|
1706
1695
|
return;
|
|
1707
1696
|
}
|
|
@@ -1724,8 +1713,6 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
|
|
|
1724
1713
|
this.triggerController.removeClickListener();
|
|
1725
1714
|
this.cleanupViewTransitionListener();
|
|
1726
1715
|
this.cleanupParentRemovalObserver();
|
|
1727
|
-
// Reset safe-area state to handle removal without dismiss (e.g., framework unmount)
|
|
1728
|
-
this.resetSafeAreaState();
|
|
1729
1716
|
}
|
|
1730
1717
|
componentWillLoad() {
|
|
1731
1718
|
var _a;
|
|
@@ -1885,8 +1872,6 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
|
|
|
1885
1872
|
else if (!this.keepContentsMounted) {
|
|
1886
1873
|
await waitForMount();
|
|
1887
1874
|
}
|
|
1888
|
-
// Predict safe-area needs based on modal configuration to avoid visual snap
|
|
1889
|
-
this.setInitialSafeAreaOverrides(presentingElement);
|
|
1890
1875
|
writeTask(() => this.el.classList.add('show-modal'));
|
|
1891
1876
|
const hasCardModal = presentingElement !== undefined;
|
|
1892
1877
|
/**
|
|
@@ -1948,8 +1933,6 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
|
|
|
1948
1933
|
else if (hasCardModal) {
|
|
1949
1934
|
this.initSwipeToClose();
|
|
1950
1935
|
}
|
|
1951
|
-
// Now that animation is complete, update safe-area based on actual position
|
|
1952
|
-
this.updateSafeAreaOverrides();
|
|
1953
1936
|
// Initialize view transition listener for iOS card modals
|
|
1954
1937
|
this.initViewTransitionListener();
|
|
1955
1938
|
// Initialize parent removal observer
|
|
@@ -2001,7 +1984,7 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
|
|
|
2001
1984
|
await this.dismiss(undefined, GESTURE);
|
|
2002
1985
|
this.gestureAnimationDismissing = false;
|
|
2003
1986
|
});
|
|
2004
|
-
}
|
|
1987
|
+
});
|
|
2005
1988
|
this.gesture.enable(true);
|
|
2006
1989
|
}
|
|
2007
1990
|
initSheetGesture() {
|
|
@@ -2022,8 +2005,7 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
|
|
|
2022
2005
|
this.currentBreakpoint = breakpoint;
|
|
2023
2006
|
this.ionBreakpointDidChange.emit({ breakpoint });
|
|
2024
2007
|
}
|
|
2025
|
-
|
|
2026
|
-
}, () => this.updateSafeAreaOverrides());
|
|
2008
|
+
});
|
|
2027
2009
|
this.gesture = gesture;
|
|
2028
2010
|
this.moveSheetToBreakpoint = moveSheetToBreakpoint;
|
|
2029
2011
|
this.gesture.enable(true);
|
|
@@ -2101,187 +2083,6 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
|
|
|
2101
2083
|
// Clear the cached reference
|
|
2102
2084
|
this.cachedPageParent = undefined;
|
|
2103
2085
|
}
|
|
2104
|
-
/**
|
|
2105
|
-
* Sets initial safe-area overrides based on modal configuration before
|
|
2106
|
-
* the modal becomes visible. This predicts whether the modal will touch
|
|
2107
|
-
* screen edges to avoid a visual snap after animation completes.
|
|
2108
|
-
*/
|
|
2109
|
-
setInitialSafeAreaOverrides(presentingElement) {
|
|
2110
|
-
const style = this.el.style;
|
|
2111
|
-
const mode = getIonMode(this);
|
|
2112
|
-
const isSheetModal = this.breakpoints !== undefined && this.initialBreakpoint !== undefined;
|
|
2113
|
-
// Card modals only exist in iOS mode - in MD mode, presentingElement is ignored
|
|
2114
|
-
const isCardModal = presentingElement !== undefined && mode === 'ios';
|
|
2115
|
-
const isTablet = window.innerWidth >= 768;
|
|
2116
|
-
// Sheet modals always touch bottom edge, never top/left/right
|
|
2117
|
-
if (isSheetModal) {
|
|
2118
|
-
style.setProperty('--ion-safe-area-top', '0px');
|
|
2119
|
-
style.setProperty('--ion-safe-area-left', '0px');
|
|
2120
|
-
style.setProperty('--ion-safe-area-right', '0px');
|
|
2121
|
-
return;
|
|
2122
|
-
}
|
|
2123
|
-
// Card modals have rounded top corners
|
|
2124
|
-
if (isCardModal) {
|
|
2125
|
-
style.setProperty('--ion-safe-area-top', '0px');
|
|
2126
|
-
if (isTablet) {
|
|
2127
|
-
// On tablets, card modals are inset from all edges
|
|
2128
|
-
this.zeroAllSafeAreas();
|
|
2129
|
-
}
|
|
2130
|
-
else {
|
|
2131
|
-
// On phones, card modals still extend to the bottom edge
|
|
2132
|
-
style.setProperty('--ion-safe-area-left', '0px');
|
|
2133
|
-
style.setProperty('--ion-safe-area-right', '0px');
|
|
2134
|
-
this.applyFullscreenSafeArea();
|
|
2135
|
-
}
|
|
2136
|
-
return;
|
|
2137
|
-
}
|
|
2138
|
-
// Phone-sized fullscreen modals inherit safe areas and use wrapper padding
|
|
2139
|
-
if (!isTablet) {
|
|
2140
|
-
this.applyFullscreenSafeArea();
|
|
2141
|
-
return;
|
|
2142
|
-
}
|
|
2143
|
-
// Check if tablet modal is fullscreen via CSS custom properties
|
|
2144
|
-
const computedStyle = getComputedStyle(this.el);
|
|
2145
|
-
const width = computedStyle.getPropertyValue('--width').trim();
|
|
2146
|
-
const height = computedStyle.getPropertyValue('--height').trim();
|
|
2147
|
-
const isFullscreen = width === '100%' && height === '100%';
|
|
2148
|
-
if (isFullscreen) {
|
|
2149
|
-
this.applyFullscreenSafeArea();
|
|
2150
|
-
}
|
|
2151
|
-
else {
|
|
2152
|
-
// Centered dialog doesn't touch edges
|
|
2153
|
-
this.zeroAllSafeAreas();
|
|
2154
|
-
}
|
|
2155
|
-
}
|
|
2156
|
-
/**
|
|
2157
|
-
* Applies safe-area handling for fullscreen modals.
|
|
2158
|
-
* Adds wrapper padding when no footer is present to prevent
|
|
2159
|
-
* content from overlapping system navigation areas.
|
|
2160
|
-
*/
|
|
2161
|
-
applyFullscreenSafeArea() {
|
|
2162
|
-
this.skipSafeAreaCoordinateDetection = true;
|
|
2163
|
-
this.updateFooterPadding();
|
|
2164
|
-
// Watch for dynamic footer additions/removals (e.g., async data loading)
|
|
2165
|
-
// Use subtree:true to support wrapped footers in framework components
|
|
2166
|
-
// (e.g., <my-footer><ion-footer>...</ion-footer></my-footer>)
|
|
2167
|
-
if (!this.footerObserver && win !== undefined && 'MutationObserver' in win) {
|
|
2168
|
-
this.footerObserver = new MutationObserver(() => this.updateFooterPadding());
|
|
2169
|
-
this.footerObserver.observe(this.el, { childList: true, subtree: true });
|
|
2170
|
-
}
|
|
2171
|
-
}
|
|
2172
|
-
/**
|
|
2173
|
-
* Updates wrapper padding based on footer presence.
|
|
2174
|
-
* Called initially and when footer is dynamically added/removed.
|
|
2175
|
-
*/
|
|
2176
|
-
updateFooterPadding() {
|
|
2177
|
-
if (!this.wrapperEl)
|
|
2178
|
-
return;
|
|
2179
|
-
const hasFooter = this.el.querySelector('ion-footer') !== null;
|
|
2180
|
-
if (hasFooter) {
|
|
2181
|
-
this.wrapperEl.style.removeProperty('padding-bottom');
|
|
2182
|
-
this.wrapperEl.style.removeProperty('box-sizing');
|
|
2183
|
-
}
|
|
2184
|
-
else {
|
|
2185
|
-
this.wrapperEl.style.setProperty('padding-bottom', 'var(--ion-safe-area-bottom, 0px)');
|
|
2186
|
-
this.wrapperEl.style.setProperty('box-sizing', 'border-box');
|
|
2187
|
-
}
|
|
2188
|
-
}
|
|
2189
|
-
/**
|
|
2190
|
-
* Sets all safe-area CSS variables to 0px for modals that
|
|
2191
|
-
* don't touch screen edges.
|
|
2192
|
-
*/
|
|
2193
|
-
zeroAllSafeAreas() {
|
|
2194
|
-
const style = this.el.style;
|
|
2195
|
-
style.setProperty('--ion-safe-area-top', '0px');
|
|
2196
|
-
style.setProperty('--ion-safe-area-bottom', '0px');
|
|
2197
|
-
style.setProperty('--ion-safe-area-left', '0px');
|
|
2198
|
-
style.setProperty('--ion-safe-area-right', '0px');
|
|
2199
|
-
}
|
|
2200
|
-
/**
|
|
2201
|
-
* Resets all safe-area related state and styles.
|
|
2202
|
-
* Called during dismiss and disconnectedCallback to ensure clean state
|
|
2203
|
-
* for re-presentation of inline modals.
|
|
2204
|
-
*/
|
|
2205
|
-
resetSafeAreaState() {
|
|
2206
|
-
var _a;
|
|
2207
|
-
this.skipSafeAreaCoordinateDetection = false;
|
|
2208
|
-
this.cachedSafeAreas = undefined;
|
|
2209
|
-
this.prevSafeAreaState = { top: false, bottom: false, left: false, right: false };
|
|
2210
|
-
(_a = this.footerObserver) === null || _a === void 0 ? void 0 : _a.disconnect();
|
|
2211
|
-
this.footerObserver = undefined;
|
|
2212
|
-
// Clear wrapper styles that may have been set for safe-area handling
|
|
2213
|
-
if (this.wrapperEl) {
|
|
2214
|
-
this.wrapperEl.style.removeProperty('padding-bottom');
|
|
2215
|
-
this.wrapperEl.style.removeProperty('box-sizing');
|
|
2216
|
-
}
|
|
2217
|
-
// Clear safe-area CSS variable overrides
|
|
2218
|
-
const style = this.el.style;
|
|
2219
|
-
style.removeProperty('--ion-safe-area-top');
|
|
2220
|
-
style.removeProperty('--ion-safe-area-bottom');
|
|
2221
|
-
style.removeProperty('--ion-safe-area-left');
|
|
2222
|
-
style.removeProperty('--ion-safe-area-right');
|
|
2223
|
-
}
|
|
2224
|
-
/**
|
|
2225
|
-
* Gets the root safe-area values from the document element.
|
|
2226
|
-
* Uses cached values during gestures to avoid getComputedStyle calls.
|
|
2227
|
-
*/
|
|
2228
|
-
getSafeAreaValues() {
|
|
2229
|
-
if (!this.cachedSafeAreas) {
|
|
2230
|
-
const rootStyle = getComputedStyle(document.documentElement);
|
|
2231
|
-
this.cachedSafeAreas = {
|
|
2232
|
-
top: parseFloat(rootStyle.getPropertyValue('--ion-safe-area-top')) || 0,
|
|
2233
|
-
bottom: parseFloat(rootStyle.getPropertyValue('--ion-safe-area-bottom')) || 0,
|
|
2234
|
-
left: parseFloat(rootStyle.getPropertyValue('--ion-safe-area-left')) || 0,
|
|
2235
|
-
right: parseFloat(rootStyle.getPropertyValue('--ion-safe-area-right')) || 0,
|
|
2236
|
-
};
|
|
2237
|
-
}
|
|
2238
|
-
return this.cachedSafeAreas;
|
|
2239
|
-
}
|
|
2240
|
-
/**
|
|
2241
|
-
* Updates safe-area CSS variable overrides based on whether the modal
|
|
2242
|
-
* extends into each safe-area region. Called after animation
|
|
2243
|
-
* and during gestures to handle dynamic position changes.
|
|
2244
|
-
*
|
|
2245
|
-
* Optimized to avoid redundant DOM writes by tracking previous state.
|
|
2246
|
-
*/
|
|
2247
|
-
updateSafeAreaOverrides() {
|
|
2248
|
-
if (this.skipSafeAreaCoordinateDetection) {
|
|
2249
|
-
return;
|
|
2250
|
-
}
|
|
2251
|
-
const wrapper = this.wrapperEl;
|
|
2252
|
-
if (!wrapper) {
|
|
2253
|
-
return;
|
|
2254
|
-
}
|
|
2255
|
-
const rect = wrapper.getBoundingClientRect();
|
|
2256
|
-
const safeAreas = this.getSafeAreaValues();
|
|
2257
|
-
const extendsIntoTop = rect.top < safeAreas.top;
|
|
2258
|
-
const extendsIntoBottom = rect.bottom > window.innerHeight - safeAreas.bottom;
|
|
2259
|
-
const extendsIntoLeft = rect.left < safeAreas.left;
|
|
2260
|
-
const extendsIntoRight = rect.right > window.innerWidth - safeAreas.right;
|
|
2261
|
-
// Only update DOM when state actually changes
|
|
2262
|
-
const prev = this.prevSafeAreaState;
|
|
2263
|
-
const style = this.el.style;
|
|
2264
|
-
if (extendsIntoTop !== prev.top) {
|
|
2265
|
-
extendsIntoTop ? style.removeProperty('--ion-safe-area-top') : style.setProperty('--ion-safe-area-top', '0px');
|
|
2266
|
-
prev.top = extendsIntoTop;
|
|
2267
|
-
}
|
|
2268
|
-
if (extendsIntoBottom !== prev.bottom) {
|
|
2269
|
-
extendsIntoBottom
|
|
2270
|
-
? style.removeProperty('--ion-safe-area-bottom')
|
|
2271
|
-
: style.setProperty('--ion-safe-area-bottom', '0px');
|
|
2272
|
-
prev.bottom = extendsIntoBottom;
|
|
2273
|
-
}
|
|
2274
|
-
if (extendsIntoLeft !== prev.left) {
|
|
2275
|
-
extendsIntoLeft ? style.removeProperty('--ion-safe-area-left') : style.setProperty('--ion-safe-area-left', '0px');
|
|
2276
|
-
prev.left = extendsIntoLeft;
|
|
2277
|
-
}
|
|
2278
|
-
if (extendsIntoRight !== prev.right) {
|
|
2279
|
-
extendsIntoRight
|
|
2280
|
-
? style.removeProperty('--ion-safe-area-right')
|
|
2281
|
-
: style.setProperty('--ion-safe-area-right', '0px');
|
|
2282
|
-
prev.right = extendsIntoRight;
|
|
2283
|
-
}
|
|
2284
|
-
}
|
|
2285
2086
|
sheetOnDismiss() {
|
|
2286
2087
|
/**
|
|
2287
2088
|
* While the gesture animation is finishing
|
|
@@ -2374,8 +2175,6 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
|
|
|
2374
2175
|
}
|
|
2375
2176
|
this.currentBreakpoint = undefined;
|
|
2376
2177
|
this.animation = undefined;
|
|
2377
|
-
// Reset safe-area state for potential re-presentation
|
|
2378
|
-
this.resetSafeAreaState();
|
|
2379
2178
|
unlock();
|
|
2380
2179
|
return dismissed;
|
|
2381
2180
|
}
|
|
@@ -2625,20 +2424,20 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
|
|
|
2625
2424
|
const isCardModal = presentingElement !== undefined && mode === 'ios';
|
|
2626
2425
|
const isHandleCycle = handleBehavior === 'cycle';
|
|
2627
2426
|
const isSheetModalWithHandle = isSheetModal && showHandle;
|
|
2628
|
-
return (h(Host, Object.assign({ key: '
|
|
2427
|
+
return (h(Host, Object.assign({ key: '87328006ea6c75ebc518ace300438492a567223e', "no-router": true,
|
|
2629
2428
|
// Allow the modal to be navigable when the handle is focusable
|
|
2630
2429
|
tabIndex: isHandleCycle && isSheetModalWithHandle ? 0 : -1 }, htmlAttributes, { style: {
|
|
2631
2430
|
zIndex: `${20000 + this.overlayIndex}`,
|
|
2632
|
-
}, class: Object.assign({ [mode]: true, ['modal-default']: !isCardModal && !isSheetModal, [`modal-card`]: isCardModal, [`modal-sheet`]: isSheetModal, [`modal-no-expand-scroll`]: isSheetModal && !expandToScroll, 'overlay-hidden': true, [FOCUS_TRAP_DISABLE_CLASS]: focusTrap === false }, getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }), h("ion-backdrop", { key: '
|
|
2431
|
+
}, class: Object.assign({ [mode]: true, ['modal-default']: !isCardModal && !isSheetModal, [`modal-card`]: isCardModal, [`modal-sheet`]: isSheetModal, [`modal-no-expand-scroll`]: isSheetModal && !expandToScroll, 'overlay-hidden': true, [FOCUS_TRAP_DISABLE_CLASS]: focusTrap === false }, getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }), h("ion-backdrop", { key: 'ee94ff8e09b691dd4ad4e4db1720f06bc3c5a469', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: 'bffd69b4635c22d9f249725bd952c1e93d5615c7', class: "modal-shadow" }), h("div", Object.assign({ key: '1d394d3c68916e464ff1fbf5242419f4a3d3cca1',
|
|
2633
2432
|
/*
|
|
2634
2433
|
role and aria-modal must be used on the
|
|
2635
2434
|
same element. They must also be set inside the
|
|
2636
2435
|
shadow DOM otherwise ion-button will not be highlighted
|
|
2637
2436
|
when using VoiceOver: https://bugs.webkit.org/show_bug.cgi?id=247134
|
|
2638
2437
|
*/
|
|
2639
|
-
role: "dialog" }, inheritedAttributes, { "aria-modal": "true", class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }), showHandle && (h("button", { key: '
|
|
2438
|
+
role: "dialog" }, inheritedAttributes, { "aria-modal": "true", class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }), showHandle && (h("button", { key: '2dcf58792018e557e0c323baad2d672bc99c0bb1', class: "modal-handle",
|
|
2640
2439
|
// Prevents the handle from receiving keyboard focus when it does not cycle
|
|
2641
|
-
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) })), h("slot", { key: '
|
|
2440
|
+
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) })), h("slot", { key: '44164b1e8710c3895400ad9f44ecd99873874ad5', onSlotchange: this.onSlotChange }))));
|
|
2642
2441
|
}
|
|
2643
2442
|
get el() { return this; }
|
|
2644
2443
|
static get watchers() { return {
|