@ionic/core 7.4.2-dev.11695832397.13fa6703 → 7.4.2-dev.11695927273.1323de22
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/data.js +96 -22
- package/components/haptic.js +1 -0
- package/components/ion-content.js +5 -51
- package/components/ion-datetime-button.js +4 -4
- package/components/ion-datetime.js +3 -3
- package/components/ion-nav.js +2 -1
- package/components/ion-router-outlet.js +1 -1
- package/components/ion-router.js +3 -0
- package/components/ion-tab-bar.js +0 -4
- package/components/ion-toast.js +117 -11
- package/components/ios.transition.js +1 -0
- package/components/overlays.js +1 -0
- package/css/core.css +1 -0
- package/css/core.css.map +1 -1
- package/css/ionic.bundle.css +1 -1
- package/css/ionic.bundle.css.map +1 -1
- package/dist/cjs/{button-active-32f15660.js → button-active-19cc8cae.js} +1 -1
- package/dist/cjs/{data-db832785.js → data-c8d21093.js} +96 -22
- package/dist/cjs/{haptic-c5f6b4d5.js → haptic-678abc9f.js} +1 -0
- package/dist/cjs/{index-b183138a.js → index-77d4b2e7.js} +2 -2
- package/dist/cjs/index.cjs.js +4 -4
- package/dist/cjs/ion-action-sheet.cjs.entry.js +3 -3
- package/dist/cjs/ion-alert.cjs.entry.js +3 -3
- package/dist/cjs/ion-app_8.cjs.entry.js +5 -51
- package/dist/cjs/ion-datetime-button.cjs.entry.js +4 -4
- package/dist/cjs/ion-datetime_3.cjs.entry.js +5 -5
- package/dist/cjs/ion-loading.cjs.entry.js +1 -1
- package/dist/cjs/ion-menu_3.cjs.entry.js +1 -1
- package/dist/cjs/ion-modal.cjs.entry.js +2 -2
- package/dist/cjs/ion-nav_2.cjs.entry.js +3 -2
- package/dist/cjs/ion-picker-column-internal.cjs.entry.js +1 -1
- package/dist/cjs/ion-popover.cjs.entry.js +2 -2
- package/dist/cjs/ion-refresher_2.cjs.entry.js +1 -1
- package/dist/cjs/ion-reorder_2.cjs.entry.js +1 -1
- package/dist/cjs/ion-route_4.cjs.entry.js +3 -0
- package/dist/cjs/ion-select_3.cjs.entry.js +1 -1
- package/dist/cjs/ion-tab-bar_2.cjs.entry.js +0 -4
- package/dist/cjs/ion-toast.cjs.entry.js +136 -32
- package/dist/cjs/ion-toggle.cjs.entry.js +1 -1
- package/dist/cjs/ionic.cjs.js +1 -1
- package/dist/cjs/{ios.transition-4b93903d.js → ios.transition-458ee399.js} +2 -1
- package/dist/cjs/loader.cjs.js +1 -1
- package/dist/cjs/{md.transition-79f3a215.js → md.transition-3423dd44.js} +1 -1
- package/dist/cjs/{overlays-d3a13e61.js → overlays-817dca17.js} +1 -0
- package/dist/collection/components/content/content.js +10 -50
- package/dist/collection/components/datetime/datetime.js +12 -6
- package/dist/collection/components/datetime/test/hour-cycle/datetime.e2e.js +14 -0
- package/dist/collection/components/datetime/utils/data.js +33 -7
- package/dist/collection/components/datetime/utils/format.js +27 -10
- package/dist/collection/components/datetime/utils/helpers.js +37 -5
- package/dist/collection/components/datetime-button/datetime-button.js +4 -4
- package/dist/collection/components/nav/nav.css +1 -0
- package/dist/collection/components/nav/nav.js +1 -0
- package/dist/collection/components/router/router.js +2 -0
- package/dist/collection/components/router/utils/path.js +1 -0
- package/dist/collection/components/router-outlet/router-outlet.css +1 -0
- package/dist/collection/components/tab-bar/tab-bar.js +0 -21
- package/dist/collection/components/toast/animations/ios.enter.js +40 -3
- package/dist/collection/components/toast/animations/ios.leave.js +8 -4
- package/dist/collection/components/toast/animations/md.enter.js +41 -3
- package/dist/collection/components/toast/test/position-anchor/toast.e2e.js +45 -0
- package/dist/collection/components/toast/toast.js +61 -6
- package/dist/collection/utils/native/haptic.js +1 -0
- package/dist/collection/utils/overlays.js +1 -0
- package/dist/collection/utils/transition/ios.transition.js +1 -0
- package/dist/docs.json +83 -10
- package/dist/esm/{button-active-513e9fff.js → button-active-d2346892.js} +1 -1
- package/dist/esm/{data-009dbf15.js → data-44d9e816.js} +96 -22
- package/dist/esm/{haptic-6447af60.js → haptic-1243b917.js} +1 -0
- package/dist/esm/{index-87684bba.js → index-dac72b4c.js} +2 -2
- package/dist/esm/index.js +4 -4
- package/dist/esm/ion-action-sheet.entry.js +3 -3
- package/dist/esm/ion-alert.entry.js +3 -3
- package/dist/esm/ion-app_8.entry.js +6 -52
- package/dist/esm/ion-datetime-button.entry.js +4 -4
- package/dist/esm/ion-datetime_3.entry.js +5 -5
- package/dist/esm/ion-loading.entry.js +1 -1
- package/dist/esm/ion-menu_3.entry.js +1 -1
- package/dist/esm/ion-modal.entry.js +2 -2
- package/dist/esm/ion-nav_2.entry.js +3 -2
- package/dist/esm/ion-picker-column-internal.entry.js +1 -1
- package/dist/esm/ion-popover.entry.js +2 -2
- package/dist/esm/ion-refresher_2.entry.js +1 -1
- package/dist/esm/ion-reorder_2.entry.js +1 -1
- package/dist/esm/ion-route_4.entry.js +3 -0
- package/dist/esm/ion-select_3.entry.js +1 -1
- package/dist/esm/ion-tab-bar_2.entry.js +0 -4
- package/dist/esm/ion-toast.entry.js +117 -13
- package/dist/esm/ion-toggle.entry.js +1 -1
- package/dist/esm/ionic.js +1 -1
- package/dist/esm/{ios.transition-81e1aed6.js → ios.transition-991c1a56.js} +2 -1
- package/dist/esm/loader.js +1 -1
- package/dist/esm/{md.transition-5becd8b5.js → md.transition-fb443521.js} +1 -1
- package/dist/esm/{overlays-8fc6656c.js → overlays-e064e499.js} +1 -0
- package/dist/esm-es5/{button-active-513e9fff.js → button-active-d2346892.js} +1 -1
- package/dist/esm-es5/data-44d9e816.js +4 -0
- package/dist/esm-es5/{index-87684bba.js → index-dac72b4c.js} +1 -1
- package/dist/esm-es5/index.js +1 -1
- package/dist/esm-es5/ion-action-sheet.entry.js +1 -1
- package/dist/esm-es5/ion-alert.entry.js +1 -1
- package/dist/esm-es5/ion-app_8.entry.js +1 -1
- package/dist/esm-es5/ion-datetime-button.entry.js +1 -1
- package/dist/esm-es5/ion-datetime_3.entry.js +1 -1
- package/dist/esm-es5/ion-loading.entry.js +1 -1
- package/dist/esm-es5/ion-menu_3.entry.js +1 -1
- package/dist/esm-es5/ion-modal.entry.js +1 -1
- package/dist/esm-es5/ion-nav_2.entry.js +1 -1
- package/dist/esm-es5/ion-picker-column-internal.entry.js +1 -1
- package/dist/esm-es5/ion-popover.entry.js +1 -1
- package/dist/esm-es5/ion-refresher_2.entry.js +1 -1
- package/dist/esm-es5/ion-reorder_2.entry.js +1 -1
- package/dist/esm-es5/ion-select_3.entry.js +1 -1
- package/dist/esm-es5/ion-tab-bar_2.entry.js +1 -1
- package/dist/esm-es5/ion-toast.entry.js +1 -1
- package/dist/esm-es5/ion-toggle.entry.js +1 -1
- package/dist/esm-es5/ionic.js +1 -1
- package/dist/esm-es5/{ios.transition-81e1aed6.js → ios.transition-991c1a56.js} +1 -1
- package/dist/esm-es5/loader.js +1 -1
- package/dist/esm-es5/{md.transition-5becd8b5.js → md.transition-fb443521.js} +1 -1
- package/dist/html.html-data.json +11 -1
- package/dist/ionic/index.esm.js +1 -1
- package/dist/ionic/ionic.esm.js +1 -1
- package/dist/ionic/{p-37456282.system.entry.js → p-06116432.system.entry.js} +1 -1
- package/dist/ionic/{p-270aa06b.entry.js → p-14dec15f.entry.js} +1 -1
- package/dist/ionic/{p-60838ce3.system.entry.js → p-161a6465.system.entry.js} +1 -1
- package/dist/ionic/p-17240d90.js +4 -0
- package/dist/ionic/{p-a6d8476b.system.entry.js → p-17e6836b.system.entry.js} +1 -1
- package/dist/ionic/p-1f448082.system.entry.js +4 -0
- package/dist/ionic/{p-972763df.js → p-2b70878e.js} +1 -1
- package/dist/ionic/{p-13a91505.entry.js → p-2d74ee51.entry.js} +1 -1
- package/dist/ionic/{p-f8f60fbf.entry.js → p-2dac36bf.entry.js} +1 -1
- package/dist/ionic/{p-c5729044.system.entry.js → p-2df840d9.system.entry.js} +1 -1
- package/dist/ionic/{p-de676d36.system.entry.js → p-2ffbf4bc.system.entry.js} +1 -1
- package/dist/ionic/{p-4616f20a.system.entry.js → p-30bd5385.system.entry.js} +1 -1
- package/dist/ionic/{p-00aed720.system.js → p-315dd3f8.system.js} +1 -1
- package/dist/ionic/{p-b098f738.system.js → p-35d1c3bb.system.js} +1 -1
- package/dist/ionic/p-3ae2faf0.entry.js +4 -0
- package/dist/ionic/{p-08c5b9f4.system.entry.js → p-3b1a8994.system.entry.js} +1 -1
- package/dist/ionic/p-419b8565.entry.js +4 -0
- package/dist/ionic/{p-82da795c.system.entry.js → p-420da334.system.entry.js} +1 -1
- package/dist/ionic/{p-73f50e29.system.js → p-48393630.system.js} +1 -1
- package/dist/ionic/{p-918d5f19.system.js → p-4cf29e23.system.js} +1 -1
- package/dist/ionic/p-50b11c2b.system.entry.js +4 -0
- package/dist/ionic/{p-53bbd357.system.entry.js → p-5d522814.system.entry.js} +1 -1
- package/dist/ionic/p-5e84b718.system.entry.js +4 -0
- package/dist/ionic/{p-3730f493.entry.js → p-62f05fd2.entry.js} +1 -1
- package/dist/ionic/p-674e6f0c.js +4 -0
- package/dist/ionic/p-6edbc09b.system.js +1 -1
- package/dist/ionic/{p-5e2dc8e0.js → p-716fbba9.js} +1 -1
- package/dist/ionic/{p-f920f5ca.entry.js → p-7779d376.entry.js} +1 -1
- package/dist/ionic/{p-a720dc73.entry.js → p-78f204ee.entry.js} +1 -1
- package/dist/ionic/p-86e73df8.system.entry.js +4 -0
- package/dist/ionic/{p-7129d04e.entry.js → p-8a26eaba.entry.js} +1 -1
- package/dist/ionic/{p-d8b2c214.entry.js → p-974cbc3a.entry.js} +1 -1
- package/dist/ionic/{p-90d892fd.entry.js → p-990aaa2f.entry.js} +1 -1
- package/dist/ionic/{p-8fdd4a2f.system.js → p-9eb5455c.system.js} +1 -1
- package/dist/ionic/{p-4912b933.entry.js → p-a27a6256.entry.js} +1 -1
- package/dist/ionic/{p-b95fd3c6.entry.js → p-b61cf76c.entry.js} +1 -1
- package/dist/ionic/{p-ee6d9730.entry.js → p-b7dad585.entry.js} +1 -1
- package/dist/ionic/p-b8c3f071.system.js +4 -0
- package/dist/ionic/{p-40e16caa.system.entry.js → p-be337735.system.entry.js} +1 -1
- package/dist/ionic/p-c44645f2.entry.js +4 -0
- package/dist/ionic/{p-c7fca267.entry.js → p-c8251e8c.entry.js} +1 -1
- package/dist/ionic/p-d6dcbd7c.js +4 -0
- package/dist/ionic/{p-65a4c12f.system.entry.js → p-ec3fa33b.system.entry.js} +1 -1
- package/dist/ionic/{p-7e46b6ab.entry.js → p-f180d2b6.entry.js} +1 -1
- package/dist/ionic/{p-4a1ac160.system.entry.js → p-f767d6b4.system.entry.js} +1 -1
- package/dist/ionic/{p-63a73b69.system.entry.js → p-f7f6af24.system.entry.js} +1 -1
- package/dist/types/components/content/content.d.ts +1 -2
- package/dist/types/components/datetime/datetime-interface.d.ts +1 -0
- package/dist/types/components/datetime/datetime.d.ts +2 -2
- package/dist/types/components/datetime/utils/data.d.ts +3 -3
- package/dist/types/components/datetime/utils/format.d.ts +3 -3
- package/dist/types/components/datetime/utils/helpers.d.ts +15 -1
- package/dist/types/components/tab-bar/tab-bar.d.ts +0 -8
- package/dist/types/components/toast/animations/ios.enter.d.ts +2 -1
- package/dist/types/components/toast/animations/md.enter.d.ts +2 -1
- package/dist/types/components/toast/toast-interface.d.ts +6 -0
- package/dist/types/components/toast/toast.d.ts +9 -1
- package/dist/types/components.d.ts +16 -8
- package/hydrate/index.js +229 -93
- package/package.json +4 -5
- package/dist/esm-es5/data-009dbf15.js +0 -4
- package/dist/ionic/p-1a36bf45.system.entry.js +0 -4
- package/dist/ionic/p-1f6ac05b.system.entry.js +0 -4
- package/dist/ionic/p-27614d55.entry.js +0 -4
- package/dist/ionic/p-3c0b06ef.system.entry.js +0 -4
- package/dist/ionic/p-44ef7224.system.js +0 -4
- package/dist/ionic/p-5e0cf844.system.entry.js +0 -4
- package/dist/ionic/p-67c441fa.entry.js +0 -4
- package/dist/ionic/p-72a1cbc7.js +0 -4
- package/dist/ionic/p-78a293a5.js +0 -4
- package/dist/ionic/p-7cfd253c.js +0 -4
- package/dist/ionic/p-875a2dce.entry.js +0 -4
- /package/dist/esm-es5/{haptic-6447af60.js → haptic-1243b917.js} +0 -0
- /package/dist/esm-es5/{overlays-8fc6656c.js → overlays-e064e499.js} +0 -0
- /package/dist/ionic/{p-f9015336.js → p-3faf56ab.js} +0 -0
- /package/dist/ionic/{p-7a3caa4e.system.js → p-40bd36f3.system.js} +0 -0
- /package/dist/ionic/{p-14d7b7e2.system.js → p-b4b4bb29.system.js} +0 -0
- /package/dist/ionic/{p-bb6f38ed.js → p-b923f3d7.js} +0 -0
package/components/data.js
CHANGED
|
@@ -53,13 +53,19 @@ const warnIfValueOutOfBounds = (value, min, max) => {
|
|
|
53
53
|
const isLeapYear = (year) => {
|
|
54
54
|
return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
|
|
55
55
|
};
|
|
56
|
-
|
|
56
|
+
/**
|
|
57
|
+
* Determines the hour cycle for a user.
|
|
58
|
+
* If the hour cycle is explicitly defined, just use that.
|
|
59
|
+
* Otherwise, we try to derive it from either the specified
|
|
60
|
+
* locale extension tags or from Intl.DateTimeFormat directly.
|
|
61
|
+
*/
|
|
62
|
+
const getHourCycle = (locale, hourCycle) => {
|
|
57
63
|
/**
|
|
58
|
-
* If developer has explicitly enabled
|
|
64
|
+
* If developer has explicitly enabled 24-hour time
|
|
59
65
|
* then return early and do not look at the system default.
|
|
60
66
|
*/
|
|
61
67
|
if (hourCycle !== undefined) {
|
|
62
|
-
return hourCycle
|
|
68
|
+
return hourCycle;
|
|
63
69
|
}
|
|
64
70
|
/**
|
|
65
71
|
* If hourCycle was not specified, check the locale
|
|
@@ -70,7 +76,7 @@ const is24Hour = (locale, hourCycle) => {
|
|
|
70
76
|
const formatted = new Intl.DateTimeFormat(locale, { hour: 'numeric' });
|
|
71
77
|
const options = formatted.resolvedOptions();
|
|
72
78
|
if (options.hourCycle !== undefined) {
|
|
73
|
-
return options.hourCycle
|
|
79
|
+
return options.hourCycle;
|
|
74
80
|
}
|
|
75
81
|
/**
|
|
76
82
|
* If hourCycle is not specified (either through lack
|
|
@@ -83,7 +89,33 @@ const is24Hour = (locale, hourCycle) => {
|
|
|
83
89
|
if (!hour) {
|
|
84
90
|
throw new Error('Hour value not found from DateTimeFormat');
|
|
85
91
|
}
|
|
86
|
-
|
|
92
|
+
/**
|
|
93
|
+
* Midnight for h11 starts at 0:00am
|
|
94
|
+
* Midnight for h12 starts at 12:00am
|
|
95
|
+
* Midnight for h23 starts at 00:00
|
|
96
|
+
* Midnight for h24 starts at 24:00
|
|
97
|
+
*/
|
|
98
|
+
switch (hour.value) {
|
|
99
|
+
case '0':
|
|
100
|
+
return 'h11';
|
|
101
|
+
case '12':
|
|
102
|
+
return 'h12';
|
|
103
|
+
case '00':
|
|
104
|
+
return 'h23';
|
|
105
|
+
case '24':
|
|
106
|
+
return 'h24';
|
|
107
|
+
default:
|
|
108
|
+
throw new Error(`Invalid hour cycle "${hourCycle}"`);
|
|
109
|
+
}
|
|
110
|
+
};
|
|
111
|
+
/**
|
|
112
|
+
* Determine if the hour cycle uses a 24-hour format.
|
|
113
|
+
* Returns true for h23 and h24. Returns false otherwise.
|
|
114
|
+
* If you don't know the hourCycle, use getHourCycle above
|
|
115
|
+
* and pass the result into this function.
|
|
116
|
+
*/
|
|
117
|
+
const is24Hour = (hourCycle) => {
|
|
118
|
+
return hourCycle === 'h23' || hourCycle === 'h24';
|
|
87
119
|
};
|
|
88
120
|
/**
|
|
89
121
|
* Given a date object, returns the number
|
|
@@ -750,7 +782,7 @@ const getFormattedDayPeriod = (dayPeriod) => {
|
|
|
750
782
|
}
|
|
751
783
|
return dayPeriod.toUpperCase();
|
|
752
784
|
};
|
|
753
|
-
const getLocalizedTime = (locale, refParts,
|
|
785
|
+
const getLocalizedTime = (locale, refParts, hourCycle) => {
|
|
754
786
|
const timeParts = {
|
|
755
787
|
hour: refParts.hour,
|
|
756
788
|
minute: refParts.minute,
|
|
@@ -772,7 +804,7 @@ const getLocalizedTime = (locale, refParts, use24Hour) => {
|
|
|
772
804
|
* We use hourCycle here instead of hour12 due to:
|
|
773
805
|
* https://bugs.chromium.org/p/chromium/issues/detail?id=1347316&q=hour12&can=2
|
|
774
806
|
*/
|
|
775
|
-
hourCycle
|
|
807
|
+
hourCycle,
|
|
776
808
|
/**
|
|
777
809
|
* Setting Z at the end indicates that this
|
|
778
810
|
* date string is in the UTC time zone. This
|
|
@@ -810,17 +842,33 @@ const addTimePadding = (value) => {
|
|
|
810
842
|
* 12 hour times it ensures that
|
|
811
843
|
* hour 0 is formatted as '12'.
|
|
812
844
|
*/
|
|
813
|
-
const getFormattedHour = (hour,
|
|
814
|
-
if (use24Hour) {
|
|
815
|
-
return addTimePadding(hour);
|
|
816
|
-
}
|
|
845
|
+
const getFormattedHour = (hour, hourCycle) => {
|
|
817
846
|
/**
|
|
818
|
-
*
|
|
819
|
-
*
|
|
820
|
-
*
|
|
847
|
+
* Midnight for h11 starts at 0:00am
|
|
848
|
+
* Midnight for h12 starts at 12:00am
|
|
849
|
+
* Midnight for h23 starts at 00:00
|
|
850
|
+
* Midnight for h24 starts at 24:00
|
|
821
851
|
*/
|
|
822
852
|
if (hour === 0) {
|
|
823
|
-
|
|
853
|
+
switch (hourCycle) {
|
|
854
|
+
case 'h11':
|
|
855
|
+
return '0';
|
|
856
|
+
case 'h12':
|
|
857
|
+
return '12';
|
|
858
|
+
case 'h23':
|
|
859
|
+
return '00';
|
|
860
|
+
case 'h24':
|
|
861
|
+
return '24';
|
|
862
|
+
default:
|
|
863
|
+
throw new Error(`Invalid hour cycle "${hourCycle}"`);
|
|
864
|
+
}
|
|
865
|
+
}
|
|
866
|
+
const use24Hour = is24Hour(hourCycle);
|
|
867
|
+
/**
|
|
868
|
+
* h23 and h24 use 24 hour times.
|
|
869
|
+
*/
|
|
870
|
+
if (use24Hour) {
|
|
871
|
+
return addTimePadding(hour);
|
|
824
872
|
}
|
|
825
873
|
return hour.toString();
|
|
826
874
|
};
|
|
@@ -1055,8 +1103,14 @@ const minutes = [
|
|
|
1055
1103
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
|
|
1056
1104
|
32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
|
|
1057
1105
|
];
|
|
1106
|
+
// h11 hour system uses 0-11. Midnight starts at 0:00am.
|
|
1107
|
+
const hour11 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
|
|
1108
|
+
// h12 hour system uses 0-12. Midnight starts at 12:00am.
|
|
1058
1109
|
const hour12 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
|
|
1110
|
+
// h23 hour system uses 0-23. Midnight starts at 0:00.
|
|
1059
1111
|
const hour23 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23];
|
|
1112
|
+
// h24 hour system uses 1-24. Midnight starts at 24:00.
|
|
1113
|
+
const hour24 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0];
|
|
1060
1114
|
/**
|
|
1061
1115
|
* Given a locale and a mode,
|
|
1062
1116
|
* return an array with formatted days
|
|
@@ -1125,14 +1179,33 @@ const getDaysOfMonth = (month, year, firstDayOfWeek) => {
|
|
|
1125
1179
|
}
|
|
1126
1180
|
return days;
|
|
1127
1181
|
};
|
|
1182
|
+
/**
|
|
1183
|
+
* Returns an array of pre-defined hour
|
|
1184
|
+
* values based on the provided hourCycle.
|
|
1185
|
+
*/
|
|
1186
|
+
const getHourData = (hourCycle) => {
|
|
1187
|
+
switch (hourCycle) {
|
|
1188
|
+
case 'h11':
|
|
1189
|
+
return hour11;
|
|
1190
|
+
case 'h12':
|
|
1191
|
+
return hour12;
|
|
1192
|
+
case 'h23':
|
|
1193
|
+
return hour23;
|
|
1194
|
+
case 'h24':
|
|
1195
|
+
return hour24;
|
|
1196
|
+
default:
|
|
1197
|
+
throw new Error(`Invalid hour cycle "${hourCycle}"`);
|
|
1198
|
+
}
|
|
1199
|
+
};
|
|
1128
1200
|
/**
|
|
1129
1201
|
* Given a local, reference datetime parts and option
|
|
1130
1202
|
* max/min bound datetime parts, calculate the acceptable
|
|
1131
1203
|
* hour and minute values according to the bounds and locale.
|
|
1132
1204
|
*/
|
|
1133
|
-
const generateTime = (refParts, hourCycle = 'h12', minParts, maxParts, hourValues, minuteValues) => {
|
|
1134
|
-
const
|
|
1135
|
-
|
|
1205
|
+
const generateTime = (locale, refParts, hourCycle = 'h12', minParts, maxParts, hourValues, minuteValues) => {
|
|
1206
|
+
const computedHourCycle = getHourCycle(locale, hourCycle);
|
|
1207
|
+
const use24Hour = is24Hour(computedHourCycle);
|
|
1208
|
+
let processedHours = getHourData(computedHourCycle);
|
|
1136
1209
|
let processedMinutes = minutes;
|
|
1137
1210
|
let isAMAllowed = true;
|
|
1138
1211
|
let isPMAllowed = true;
|
|
@@ -1464,11 +1537,12 @@ const getCombinedDateColumnData = (locale, todayParts, minParts, maxParts, dayVa
|
|
|
1464
1537
|
};
|
|
1465
1538
|
};
|
|
1466
1539
|
const getTimeColumnsData = (locale, refParts, hourCycle, minParts, maxParts, allowedHourValues, allowedMinuteValues) => {
|
|
1467
|
-
const
|
|
1468
|
-
const
|
|
1540
|
+
const computedHourCycle = getHourCycle(locale, hourCycle);
|
|
1541
|
+
const use24Hour = is24Hour(computedHourCycle);
|
|
1542
|
+
const { hours, minutes, am, pm } = generateTime(locale, refParts, computedHourCycle, minParts, maxParts, allowedHourValues, allowedMinuteValues);
|
|
1469
1543
|
const hoursItems = hours.map((hour) => {
|
|
1470
1544
|
return {
|
|
1471
|
-
text: getFormattedHour(hour,
|
|
1545
|
+
text: getFormattedHour(hour, computedHourCycle),
|
|
1472
1546
|
value: getInternalHourValue(hour, use24Hour, refParts.ampm),
|
|
1473
1547
|
};
|
|
1474
1548
|
});
|
|
@@ -1498,4 +1572,4 @@ const getTimeColumnsData = (locale, refParts, hourCycle, minParts, maxParts, all
|
|
|
1498
1572
|
};
|
|
1499
1573
|
};
|
|
1500
1574
|
|
|
1501
|
-
export { getDayColumnData as A, getYearColumnData as B, isMonthFirstLocale as C, getTimeColumnsData as D, isLocaleDayPeriodRTL as E, getMonthAndYear as F, getDaysOfWeek as G, getDaysOfMonth as H, generateMonths as I,
|
|
1575
|
+
export { getDayColumnData as A, getYearColumnData as B, isMonthFirstLocale as C, getTimeColumnsData as D, isLocaleDayPeriodRTL as E, getMonthAndYear as F, getDaysOfWeek as G, getDaysOfMonth as H, generateMonths as I, getHourCycle as J, getLocalizedTime as K, getMonthAndDay as L, formatValue as M, getNextYear as N, getPreviousYear as O, clampDate as P, parseAmPm as Q, calculateHourFromAMPM as R, getLocalizedDateTime as S, getMonthDayAndYear as T, getDay as a, isAfter as b, isSameDay as c, getPreviousMonth as d, getNextMonth as e, getPartsFromCalendarDay as f, generateDayAriaLabel as g, getEndOfWeek as h, isBefore as i, getStartOfWeek as j, getPreviousDay as k, getNextDay as l, getPreviousWeek as m, getNextWeek as n, parseMaxParts as o, parseMinParts as p, parseDate as q, convertToArrayOfNumbers as r, convertDataToISO as s, getToday as t, getClosestValidDate as u, validateParts as v, warnIfValueOutOfBounds as w, getNumDaysInMonth as x, getCombinedDateColumnData as y, getMonthColumnData as z };
|
package/components/haptic.js
CHANGED
|
@@ -76,6 +76,7 @@ const HapticEngine = {
|
|
|
76
76
|
* if the browser does not support the Vibrate API.
|
|
77
77
|
*/
|
|
78
78
|
if ((capacitor === null || capacitor === void 0 ? void 0 : capacitor.getPlatform()) === 'web') {
|
|
79
|
+
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
|
|
79
80
|
return typeof navigator !== 'undefined' && navigator.vibrate !== undefined;
|
|
80
81
|
}
|
|
81
82
|
return true;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* (C) Ionic http://ionicframework.com - MIT License
|
|
3
3
|
*/
|
|
4
4
|
import { proxyCustomElement, HTMLElement, createEvent, Build, readTask, forceUpdate, h, Host } from '@stencil/core/internal/client';
|
|
5
|
-
import {
|
|
5
|
+
import { c as componentOnReady } from './helpers.js';
|
|
6
6
|
import { b as getIonMode, a as isPlatform } from './ionic-global.js';
|
|
7
7
|
import { i as isRTL } from './dir.js';
|
|
8
8
|
import { c as createColorClasses, h as hostContext } from './theme.js';
|
|
@@ -25,7 +25,6 @@ const Content = /*@__PURE__*/ proxyCustomElement(class Content extends HTMLEleme
|
|
|
25
25
|
this.cBottom = -1;
|
|
26
26
|
this.isMainContent = true;
|
|
27
27
|
this.resizeTimeout = null;
|
|
28
|
-
this.tabsElement = null;
|
|
29
28
|
// Detail is used in a hot loop in the scroll event, by allocating it here
|
|
30
29
|
// V8 will be able to inline any read/write to it since it's a monomorphic class.
|
|
31
30
|
// https://mrale.ph/blog/2015/01/11/whats-up-with-monomorphism.html
|
|
@@ -56,57 +55,12 @@ const Content = /*@__PURE__*/ proxyCustomElement(class Content extends HTMLEleme
|
|
|
56
55
|
}
|
|
57
56
|
connectedCallback() {
|
|
58
57
|
this.isMainContent = this.el.closest('ion-menu, ion-popover, ion-modal') === null;
|
|
59
|
-
/**
|
|
60
|
-
* The fullscreen content offsets need to be
|
|
61
|
-
* computed after the tab bar has loaded. Since
|
|
62
|
-
* lazy evaluation means components are not hydrated
|
|
63
|
-
* at the same time, we need to wait for the ionTabBarLoaded
|
|
64
|
-
* event to fire. This does not impact dist-custom-elements
|
|
65
|
-
* because there is no hydration there.
|
|
66
|
-
*/
|
|
67
|
-
if (hasLazyBuild(this.el)) {
|
|
68
|
-
/**
|
|
69
|
-
* We need to cache the reference to the tabs.
|
|
70
|
-
* If just the content is unmounted then we won't
|
|
71
|
-
* be able to query for the closest tabs on disconnectedCallback
|
|
72
|
-
* since the content has been removed from the DOM tree.
|
|
73
|
-
*/
|
|
74
|
-
const closestTabs = (this.tabsElement = this.el.closest('ion-tabs'));
|
|
75
|
-
if (closestTabs !== null) {
|
|
76
|
-
/**
|
|
77
|
-
* When adding and removing the event listener
|
|
78
|
-
* we need to make sure we pass the same function reference
|
|
79
|
-
* otherwise the event listener will not be removed properly.
|
|
80
|
-
* We can't only pass `this.resize` because "this" in the function
|
|
81
|
-
* context becomes a reference to IonTabs instead of IonContent.
|
|
82
|
-
*
|
|
83
|
-
* Additionally, we listen for ionTabBarLoaded on the IonTabs
|
|
84
|
-
* instance rather than the IonTabBar instance. It's possible for
|
|
85
|
-
* a tab bar to be conditionally rendered/mounted. Since ionTabBarLoaded
|
|
86
|
-
* bubbles, we can catch any instances of child tab bars loading by listening
|
|
87
|
-
* on IonTabs.
|
|
88
|
-
*/
|
|
89
|
-
this.tabsLoadCallback = () => this.resize();
|
|
90
|
-
closestTabs.addEventListener('ionTabBarLoaded', this.tabsLoadCallback);
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
58
|
}
|
|
94
59
|
disconnectedCallback() {
|
|
95
60
|
this.onScrollEnd();
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
* be cleared otherwise this will create a memory
|
|
100
|
-
* leak where the IonTabs instance can never be
|
|
101
|
-
* garbage collected.
|
|
102
|
-
*/
|
|
103
|
-
const { tabsElement, tabsLoadCallback } = this;
|
|
104
|
-
if (tabsElement !== null && tabsLoadCallback !== undefined) {
|
|
105
|
-
tabsElement.removeEventListener('ionTabBarLoaded', tabsLoadCallback);
|
|
106
|
-
}
|
|
107
|
-
this.tabsElement = null;
|
|
108
|
-
this.tabsLoadCallback = undefined;
|
|
109
|
-
}
|
|
61
|
+
}
|
|
62
|
+
onAppLoad() {
|
|
63
|
+
this.resize();
|
|
110
64
|
}
|
|
111
65
|
/**
|
|
112
66
|
* Rotating certain devices can update
|
|
@@ -367,7 +321,7 @@ const Content = /*@__PURE__*/ proxyCustomElement(class Content extends HTMLEleme
|
|
|
367
321
|
"scrollToBottom": [64],
|
|
368
322
|
"scrollByPoint": [64],
|
|
369
323
|
"scrollToPoint": [64]
|
|
370
|
-
}, [[9, "resize", "onResize"]]]);
|
|
324
|
+
}, [[8, "appload", "onAppLoad"], [9, "resize", "onResize"]]]);
|
|
371
325
|
const getParentElement = (el) => {
|
|
372
326
|
var _a;
|
|
373
327
|
if (el.parentElement) {
|
|
@@ -6,7 +6,7 @@ import { a as addEventListener, c as componentOnReady } from './helpers.js';
|
|
|
6
6
|
import { a as printIonError } from './index6.js';
|
|
7
7
|
import { c as createColorClasses } from './theme.js';
|
|
8
8
|
import { b as getIonMode } from './ionic-global.js';
|
|
9
|
-
import { q as parseDate, t as getToday, J as
|
|
9
|
+
import { q as parseDate, t as getToday, J as getHourCycle, S as getLocalizedDateTime, F as getMonthAndYear, K as getLocalizedTime, T as getMonthDayAndYear } from './data.js';
|
|
10
10
|
import { d as defineCustomElement$2 } from './ripple-effect.js';
|
|
11
11
|
|
|
12
12
|
const iosDatetimeButtonCss = ":host{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center}:host button{border-radius:8px;-webkit-padding-start:12px;padding-inline-start:12px;-webkit-padding-end:12px;padding-inline-end:12px;padding-top:6px;padding-bottom:6px;-webkit-margin-start:2px;margin-inline-start:2px;-webkit-margin-end:2px;margin-inline-end:2px;margin-top:0px;margin-bottom:0px;position:relative;-webkit-transition:150ms color ease-in-out;transition:150ms color ease-in-out;border:none;background:var(--ion-color-step-300, #edeef0);color:var(--ion-text-color, #000);font-family:inherit;font-size:inherit;cursor:pointer;-webkit-appearance:none;-moz-appearance:none;appearance:none;overflow:hidden}:host(.time-active) #time-button,:host(.date-active) #date-button{color:var(--ion-color-base)}:host(.datetime-button-disabled){pointer-events:none}:host(.datetime-button-disabled) button{opacity:0.4}";
|
|
@@ -63,13 +63,13 @@ const DatetimeButton = /*@__PURE__*/ proxyCustomElement(class DatetimeButton ext
|
|
|
63
63
|
* warning in the console.
|
|
64
64
|
*/
|
|
65
65
|
const firstParsedDatetime = parsedDatetimes[0];
|
|
66
|
-
const
|
|
66
|
+
const computedHourCycle = getHourCycle(locale, hourCycle);
|
|
67
67
|
this.dateText = this.timeText = undefined;
|
|
68
68
|
switch (datetimePresentation) {
|
|
69
69
|
case 'date-time':
|
|
70
70
|
case 'time-date':
|
|
71
71
|
const dateText = getMonthDayAndYear(locale, firstParsedDatetime);
|
|
72
|
-
const timeText = getLocalizedTime(locale, firstParsedDatetime,
|
|
72
|
+
const timeText = getLocalizedTime(locale, firstParsedDatetime, computedHourCycle);
|
|
73
73
|
if (preferWheel) {
|
|
74
74
|
this.dateText = `${dateText} ${timeText}`;
|
|
75
75
|
}
|
|
@@ -96,7 +96,7 @@ const DatetimeButton = /*@__PURE__*/ proxyCustomElement(class DatetimeButton ext
|
|
|
96
96
|
}
|
|
97
97
|
break;
|
|
98
98
|
case 'time':
|
|
99
|
-
this.timeText = getLocalizedTime(locale, firstParsedDatetime,
|
|
99
|
+
this.timeText = getLocalizedTime(locale, firstParsedDatetime, computedHourCycle);
|
|
100
100
|
break;
|
|
101
101
|
case 'month-year':
|
|
102
102
|
this.dateText = getMonthAndYear(locale, firstParsedDatetime);
|
|
@@ -9,7 +9,7 @@ import { i as isRTL } from './dir.js';
|
|
|
9
9
|
import { c as createColorClasses } from './theme.js';
|
|
10
10
|
import { a as chevronBack, f as chevronForward, c as chevronDown, g as caretUpSharp, h as caretDownSharp } from './index7.js';
|
|
11
11
|
import { b as getIonMode } from './ionic-global.js';
|
|
12
|
-
import { g as generateDayAriaLabel, a as getDay, i as isBefore, b as isAfter, c as isSameDay, d as getPreviousMonth, e as getNextMonth, v as validateParts, f as getPartsFromCalendarDay, h as getEndOfWeek, j as getStartOfWeek, k as getPreviousDay, l as getNextDay, m as getPreviousWeek, n as getNextWeek, p as parseMinParts, o as parseMaxParts, q as parseDate, w as warnIfValueOutOfBounds, r as convertToArrayOfNumbers, s as convertDataToISO, t as getToday, u as getClosestValidDate, x as getNumDaysInMonth, y as getCombinedDateColumnData, z as getMonthColumnData, A as getDayColumnData, B as getYearColumnData, C as isMonthFirstLocale, D as getTimeColumnsData, E as isLocaleDayPeriodRTL, F as getMonthAndYear, G as getDaysOfWeek, H as getDaysOfMonth, I as generateMonths, J as
|
|
12
|
+
import { g as generateDayAriaLabel, a as getDay, i as isBefore, b as isAfter, c as isSameDay, d as getPreviousMonth, e as getNextMonth, v as validateParts, f as getPartsFromCalendarDay, h as getEndOfWeek, j as getStartOfWeek, k as getPreviousDay, l as getNextDay, m as getPreviousWeek, n as getNextWeek, p as parseMinParts, o as parseMaxParts, q as parseDate, w as warnIfValueOutOfBounds, r as convertToArrayOfNumbers, s as convertDataToISO, t as getToday, u as getClosestValidDate, x as getNumDaysInMonth, y as getCombinedDateColumnData, z as getMonthColumnData, A as getDayColumnData, B as getYearColumnData, C as isMonthFirstLocale, D as getTimeColumnsData, E as isLocaleDayPeriodRTL, F as getMonthAndYear, G as getDaysOfWeek, H as getDaysOfMonth, I as generateMonths, J as getHourCycle, K as getLocalizedTime, L as getMonthAndDay, M as formatValue, N as getNextYear, O as getPreviousYear, P as clampDate, Q as parseAmPm, R as calculateHourFromAMPM } from './data.js';
|
|
13
13
|
import { d as defineCustomElement$c } from './backdrop.js';
|
|
14
14
|
import { d as defineCustomElement$b } from './button.js';
|
|
15
15
|
import { d as defineCustomElement$a } from './buttons.js';
|
|
@@ -1533,7 +1533,7 @@ const Datetime = /*@__PURE__*/ proxyCustomElement(class Datetime extends HTMLEle
|
|
|
1533
1533
|
}
|
|
1534
1534
|
renderTimeOverlay() {
|
|
1535
1535
|
const { hourCycle, isTimePopoverOpen, locale } = this;
|
|
1536
|
-
const
|
|
1536
|
+
const computedHourCycle = getHourCycle(locale, hourCycle);
|
|
1537
1537
|
const activePart = this.getActivePartsWithFallback();
|
|
1538
1538
|
return [
|
|
1539
1539
|
h("div", { class: "time-header" }, this.renderTimeLabel()),
|
|
@@ -1552,7 +1552,7 @@ const Datetime = /*@__PURE__*/ proxyCustomElement(class Datetime extends HTMLEle
|
|
|
1552
1552
|
await popoverRef.onWillDismiss();
|
|
1553
1553
|
this.isTimePopoverOpen = false;
|
|
1554
1554
|
}
|
|
1555
|
-
} }, getLocalizedTime(locale, activePart,
|
|
1555
|
+
} }, getLocalizedTime(locale, activePart, computedHourCycle)),
|
|
1556
1556
|
h("ion-popover", { alignment: "center", translucent: true, overlayIndex: 1, arrow: false, onWillPresent: (ev) => {
|
|
1557
1557
|
/**
|
|
1558
1558
|
* Intersection Observers do not consistently fire between Blink and Webkit
|
package/components/ion-nav.js
CHANGED
|
@@ -76,7 +76,7 @@ const convertToViews = (pages) => {
|
|
|
76
76
|
.filter((v) => v !== null);
|
|
77
77
|
};
|
|
78
78
|
|
|
79
|
-
const navCss = ":host{left:0;right:0;top:0;bottom:0;position:absolute;contain:layout size style;z-index:0}";
|
|
79
|
+
const navCss = ":host{left:0;right:0;top:0;bottom:0;position:absolute;contain:layout size style;overflow:hidden;z-index:0}";
|
|
80
80
|
|
|
81
81
|
const Nav = /*@__PURE__*/ proxyCustomElement(class Nav extends HTMLElement {
|
|
82
82
|
constructor() {
|
|
@@ -746,6 +746,7 @@ const Nav = /*@__PURE__*/ proxyCustomElement(class Nav extends HTMLElement {
|
|
|
746
746
|
: undefined;
|
|
747
747
|
const mode = getIonMode(this);
|
|
748
748
|
const enteringEl = enteringView.element;
|
|
749
|
+
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
|
|
749
750
|
const leavingEl = leavingView && leavingView.element;
|
|
750
751
|
const animationOpts = Object.assign(Object.assign({ mode, showGoBack: this.canGoBackSync(enteringView), baseEl: this.el, progressCallback, animated: this.animated && config.getBoolean('animated', true), enteringEl,
|
|
751
752
|
leavingEl }, opts), { animationBuilder: opts.animationBuilder || this.animation || config.get('navAnimation') });
|
|
@@ -8,7 +8,7 @@ import { s as shallowEqualStringMap, l as hasLazyBuild } from './helpers.js';
|
|
|
8
8
|
import { t as transition } from './index2.js';
|
|
9
9
|
import { b as getIonMode, c as config } from './ionic-global.js';
|
|
10
10
|
|
|
11
|
-
const routerOutletCss = ":host{left:0;right:0;top:0;bottom:0;position:absolute;contain:layout size style;z-index:0}";
|
|
11
|
+
const routerOutletCss = ":host{left:0;right:0;top:0;bottom:0;position:absolute;contain:layout size style;overflow:hidden;z-index:0}";
|
|
12
12
|
|
|
13
13
|
const RouterOutlet = /*@__PURE__*/ proxyCustomElement(class RouterOutlet extends HTMLElement {
|
|
14
14
|
constructor() {
|
package/components/ion-router.js
CHANGED
|
@@ -44,6 +44,7 @@ const chainToSegments = (chain) => {
|
|
|
44
44
|
for (const route of chain) {
|
|
45
45
|
for (const segment of route.segments) {
|
|
46
46
|
if (segment[0] === ':') {
|
|
47
|
+
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
|
|
47
48
|
const param = route.params && route.params[segment.slice(1)];
|
|
48
49
|
if (!param) {
|
|
49
50
|
return null;
|
|
@@ -740,12 +741,14 @@ const Router = /*@__PURE__*/ proxyCustomElement(class Router extends HTMLElement
|
|
|
740
741
|
}
|
|
741
742
|
const routes = readRoutes(this.el);
|
|
742
743
|
const fromChain = findChainForSegments(from, routes);
|
|
744
|
+
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
|
|
743
745
|
const beforeLeaveHook = fromChain && fromChain[fromChain.length - 1].beforeLeave;
|
|
744
746
|
const canLeave = beforeLeaveHook ? await beforeLeaveHook() : true;
|
|
745
747
|
if (canLeave === false || typeof canLeave === 'object') {
|
|
746
748
|
return canLeave;
|
|
747
749
|
}
|
|
748
750
|
const toChain = findChainForSegments(to, routes);
|
|
751
|
+
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
|
|
749
752
|
const beforeEnterHook = toChain && toChain[toChain.length - 1].beforeEnter;
|
|
750
753
|
return beforeEnterHook ? beforeEnterHook() : true;
|
|
751
754
|
}
|
|
@@ -16,7 +16,6 @@ const TabBar = /*@__PURE__*/ proxyCustomElement(class TabBar extends HTMLElement
|
|
|
16
16
|
this.__registerHost();
|
|
17
17
|
this.__attachShadow();
|
|
18
18
|
this.ionTabBarChanged = createEvent(this, "ionTabBarChanged", 7);
|
|
19
|
-
this.ionTabBarLoaded = createEvent(this, "ionTabBarLoaded", 7);
|
|
20
19
|
this.keyboardCtrl = null;
|
|
21
20
|
this.keyboardVisible = false;
|
|
22
21
|
this.color = undefined;
|
|
@@ -51,9 +50,6 @@ const TabBar = /*@__PURE__*/ proxyCustomElement(class TabBar extends HTMLElement
|
|
|
51
50
|
this.keyboardCtrl.destroy();
|
|
52
51
|
}
|
|
53
52
|
}
|
|
54
|
-
componentDidLoad() {
|
|
55
|
-
this.ionTabBarLoaded.emit();
|
|
56
|
-
}
|
|
57
53
|
render() {
|
|
58
54
|
const { color, translucent, keyboardVisible } = this;
|
|
59
55
|
const mode = getIonMode(this);
|
package/components/ion-toast.js
CHANGED
|
@@ -10,19 +10,56 @@ import { d as createDelegateController, e as createTriggerController, i as isCan
|
|
|
10
10
|
import { g as getClassMap, c as createColorClasses } from './theme.js';
|
|
11
11
|
import { c as config, b as getIonMode } from './ionic-global.js';
|
|
12
12
|
import { c as createAnimation } from './animation.js';
|
|
13
|
+
import { w as win } from './index5.js';
|
|
13
14
|
import { d as defineCustomElement$3 } from './icon.js';
|
|
14
15
|
import { d as defineCustomElement$2 } from './ripple-effect.js';
|
|
15
16
|
|
|
16
17
|
/**
|
|
17
18
|
* iOS Toast Enter Animation
|
|
18
19
|
*/
|
|
19
|
-
const iosEnterAnimation = (baseEl,
|
|
20
|
+
const iosEnterAnimation = (baseEl, opts) => {
|
|
20
21
|
const baseAnimation = createAnimation();
|
|
21
22
|
const wrapperAnimation = createAnimation();
|
|
23
|
+
const { position, positionAnchor } = opts;
|
|
22
24
|
const root = getElementRoot(baseEl);
|
|
23
25
|
const wrapperEl = root.querySelector('.toast-wrapper');
|
|
24
|
-
|
|
25
|
-
|
|
26
|
+
/**
|
|
27
|
+
* Start with a predefined offset from the edge the toast will be
|
|
28
|
+
* positioned relative to. By default, this will be the top edge
|
|
29
|
+
* of the screen.
|
|
30
|
+
*/
|
|
31
|
+
let offset = position === 'top' ? 10 : -10;
|
|
32
|
+
let top, bottom;
|
|
33
|
+
/**
|
|
34
|
+
* If positionAnchor is defined, add in the distance from the top
|
|
35
|
+
* of the screen to the target anchor edge. For position="top", the
|
|
36
|
+
* bottom anchor edge is targeted. For position="bottom", the top
|
|
37
|
+
* anchor edge is targeted.
|
|
38
|
+
*/
|
|
39
|
+
if (positionAnchor && win) {
|
|
40
|
+
const box = positionAnchor.getBoundingClientRect();
|
|
41
|
+
if (position === 'top') {
|
|
42
|
+
offset += box.bottom;
|
|
43
|
+
}
|
|
44
|
+
else if (position === 'bottom') {
|
|
45
|
+
/**
|
|
46
|
+
* Just box.top is the distance from the top edge of the screen
|
|
47
|
+
* to the top edge of the anchor. We want to calculate from the
|
|
48
|
+
* bottom edge of the screen instead.
|
|
49
|
+
*/
|
|
50
|
+
offset -= win.innerHeight - box.top;
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* We don't include safe area here because that should already be
|
|
54
|
+
* accounted for when checking the position of the anchor.
|
|
55
|
+
*/
|
|
56
|
+
top = `${offset}px`;
|
|
57
|
+
bottom = `${offset}px`;
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
top = `calc(${offset}px + var(--ion-safe-area-top, 0px))`;
|
|
61
|
+
bottom = `calc(${offset}px - var(--ion-safe-area-bottom, 0px))`;
|
|
62
|
+
}
|
|
26
63
|
wrapperAnimation.addElement(wrapperEl);
|
|
27
64
|
switch (position) {
|
|
28
65
|
case 'top':
|
|
@@ -48,18 +85,22 @@ const iosLeaveAnimation = (baseEl, position) => {
|
|
|
48
85
|
const wrapperAnimation = createAnimation();
|
|
49
86
|
const root = getElementRoot(baseEl);
|
|
50
87
|
const wrapperEl = root.querySelector('.toast-wrapper');
|
|
51
|
-
const bottom = `calc(-10px - var(--ion-safe-area-bottom, 0px))`;
|
|
52
|
-
const top = `calc(10px + var(--ion-safe-area-top, 0px))`;
|
|
53
88
|
wrapperAnimation.addElement(wrapperEl);
|
|
89
|
+
/**
|
|
90
|
+
* For top/bottom positions, we use to() instead of fromTo() so that if
|
|
91
|
+
* the positionAnchor prop was used, we don't need to recalculate the
|
|
92
|
+
* toast and/or anchor's position and duplicate work from the enter
|
|
93
|
+
* animation.
|
|
94
|
+
*/
|
|
54
95
|
switch (position) {
|
|
55
96
|
case 'top':
|
|
56
|
-
wrapperAnimation.
|
|
97
|
+
wrapperAnimation.to('transform', 'translateY(-100%)');
|
|
57
98
|
break;
|
|
58
99
|
case 'middle':
|
|
59
100
|
wrapperAnimation.fromTo('opacity', 0.99, 0);
|
|
60
101
|
break;
|
|
61
102
|
default:
|
|
62
|
-
wrapperAnimation.
|
|
103
|
+
wrapperAnimation.to('transform', 'translateY(100%)');
|
|
63
104
|
break;
|
|
64
105
|
}
|
|
65
106
|
return baseAnimation.easing('cubic-bezier(.36,.66,.04,1)').duration(300).addAnimation(wrapperAnimation);
|
|
@@ -68,13 +109,50 @@ const iosLeaveAnimation = (baseEl, position) => {
|
|
|
68
109
|
/**
|
|
69
110
|
* MD Toast Enter Animation
|
|
70
111
|
*/
|
|
71
|
-
const mdEnterAnimation = (baseEl,
|
|
112
|
+
const mdEnterAnimation = (baseEl, opts) => {
|
|
72
113
|
const baseAnimation = createAnimation();
|
|
73
114
|
const wrapperAnimation = createAnimation();
|
|
115
|
+
const { position, positionAnchor } = opts;
|
|
74
116
|
const root = getElementRoot(baseEl);
|
|
75
117
|
const wrapperEl = root.querySelector('.toast-wrapper');
|
|
76
|
-
|
|
77
|
-
|
|
118
|
+
/**
|
|
119
|
+
* Start with a predefined offset from the edge the toast will be
|
|
120
|
+
* positioned relative to. By default, this will be the top edge
|
|
121
|
+
* of the screen for position="top", or the bottom edge for
|
|
122
|
+
* position="bottom".
|
|
123
|
+
*/
|
|
124
|
+
let offset = 8;
|
|
125
|
+
let top, bottom;
|
|
126
|
+
/**
|
|
127
|
+
* If positionAnchor is defined, add in the distance from the target
|
|
128
|
+
* screen edge to the target anchor edge. For position="top", the
|
|
129
|
+
* bottom anchor edge is targeted. For position="bottom", the top
|
|
130
|
+
* anchor edge is targeted.
|
|
131
|
+
*/
|
|
132
|
+
if (positionAnchor && win) {
|
|
133
|
+
const box = positionAnchor.getBoundingClientRect();
|
|
134
|
+
if (position === 'top') {
|
|
135
|
+
offset += box.bottom;
|
|
136
|
+
}
|
|
137
|
+
else if (position === 'bottom') {
|
|
138
|
+
/**
|
|
139
|
+
* Just box.top is the distance from the top edge of the screen
|
|
140
|
+
* to the top edge of the anchor. We want to calculate from the
|
|
141
|
+
* bottom edge of the screen instead.
|
|
142
|
+
*/
|
|
143
|
+
offset += win.innerHeight - box.top;
|
|
144
|
+
}
|
|
145
|
+
/**
|
|
146
|
+
* We don't include safe area here because that should already be
|
|
147
|
+
* accounted for when checking the position of the anchor.
|
|
148
|
+
*/
|
|
149
|
+
top = `${offset}px`;
|
|
150
|
+
bottom = `${offset}px`;
|
|
151
|
+
}
|
|
152
|
+
else {
|
|
153
|
+
top = `calc(${offset}px + var(--ion-safe-area-top, 0px))`;
|
|
154
|
+
bottom = `calc(${offset}px + var(--ion-safe-area-bottom, 0px))`;
|
|
155
|
+
}
|
|
78
156
|
wrapperAnimation.addElement(wrapperEl);
|
|
79
157
|
switch (position) {
|
|
80
158
|
case 'top':
|
|
@@ -149,6 +227,7 @@ const Toast = /*@__PURE__*/ proxyCustomElement(class Toast extends HTMLElement {
|
|
|
149
227
|
this.message = undefined;
|
|
150
228
|
this.keyboardClose = false;
|
|
151
229
|
this.position = 'bottom';
|
|
230
|
+
this.positionAnchor = undefined;
|
|
152
231
|
this.buttons = undefined;
|
|
153
232
|
this.translucent = false;
|
|
154
233
|
this.animated = true;
|
|
@@ -196,7 +275,33 @@ const Toast = /*@__PURE__*/ proxyCustomElement(class Toast extends HTMLElement {
|
|
|
196
275
|
async present() {
|
|
197
276
|
const unlock = await this.lockController.lock();
|
|
198
277
|
await this.delegateController.attachViewToDom();
|
|
199
|
-
|
|
278
|
+
const { position, positionAnchor } = this;
|
|
279
|
+
let anchor;
|
|
280
|
+
if (position === 'middle' && positionAnchor !== undefined) {
|
|
281
|
+
printIonWarning('The positionAnchor property is ignored when using position="middle".', this.el);
|
|
282
|
+
}
|
|
283
|
+
else if (typeof positionAnchor === 'string') {
|
|
284
|
+
/**
|
|
285
|
+
* If the anchor is defined as an ID, find the element.
|
|
286
|
+
* We do this on every present so the toast doesn't need
|
|
287
|
+
* to account for the surrounding DOM changing since the
|
|
288
|
+
* last time it was presented.
|
|
289
|
+
*/
|
|
290
|
+
const foundEl = document.getElementById(positionAnchor);
|
|
291
|
+
if (foundEl === null) {
|
|
292
|
+
printIonWarning(`An anchor element with an ID of ${positionAnchor} was not found in the DOM.`, this.el);
|
|
293
|
+
}
|
|
294
|
+
else {
|
|
295
|
+
anchor = foundEl;
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
else {
|
|
299
|
+
anchor = positionAnchor;
|
|
300
|
+
}
|
|
301
|
+
await present(this, 'toastEnter', iosEnterAnimation, mdEnterAnimation, {
|
|
302
|
+
position,
|
|
303
|
+
positionAnchor: anchor,
|
|
304
|
+
});
|
|
200
305
|
/**
|
|
201
306
|
* Content is revealed to screen readers after
|
|
202
307
|
* the transition to avoid jank since this
|
|
@@ -354,6 +459,7 @@ const Toast = /*@__PURE__*/ proxyCustomElement(class Toast extends HTMLElement {
|
|
|
354
459
|
"message": [1],
|
|
355
460
|
"keyboardClose": [4, "keyboard-close"],
|
|
356
461
|
"position": [1],
|
|
462
|
+
"positionAnchor": [1, "position-anchor"],
|
|
357
463
|
"buttons": [16],
|
|
358
464
|
"translucent": [4],
|
|
359
465
|
"animated": [4],
|
|
@@ -203,6 +203,7 @@ const iosTransitionAnimation = (navEl, opts) => {
|
|
|
203
203
|
.easing(opts.easing || EASING)
|
|
204
204
|
.fill('both')
|
|
205
205
|
.beforeRemoveClass('ion-page-invisible');
|
|
206
|
+
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
|
|
206
207
|
if (leavingEl && navEl !== null && navEl !== undefined) {
|
|
207
208
|
const navDecorAnimation = createAnimation();
|
|
208
209
|
navDecorAnimation.addElement(navEl);
|
package/components/overlays.js
CHANGED
|
@@ -68,6 +68,7 @@ const setOverlayId = (el) => {
|
|
|
68
68
|
return el.id;
|
|
69
69
|
};
|
|
70
70
|
const createOverlay = (tagName, opts) => {
|
|
71
|
+
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
|
|
71
72
|
if (typeof window !== 'undefined' && typeof window.customElements !== 'undefined') {
|
|
72
73
|
return window.customElements.whenDefined(tagName).then(() => {
|
|
73
74
|
const element = document.createElement(tagName);
|