voyager-ionic-core 8.7.6 → 8.7.9
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/button.js +3 -7
- package/components/checkbox.js +4 -7
- package/components/header.js +42 -4
- package/components/index2.js +74 -3
- package/components/ion-accordion.js +93 -14
- package/components/ion-input.js +6 -14
- package/components/ion-select.js +58 -10
- package/components/ion-textarea.js +5 -13
- package/components/ion-toggle.js +4 -7
- package/components/{notch-controller.js → validity.js} +14 -1
- package/dist/cjs/{index-CD5Rjp23.js → index-094mMFB-.js} +76 -5
- package/dist/cjs/index.cjs.js +3 -3
- package/dist/cjs/ion-accordion_2.cjs.entry.js +91 -13
- package/dist/cjs/ion-app_8.cjs.entry.js +43 -5
- package/dist/cjs/ion-button_2.cjs.entry.js +3 -7
- package/dist/cjs/ion-checkbox.cjs.entry.js +4 -7
- package/dist/cjs/ion-input.cjs.entry.js +7 -15
- package/dist/cjs/ion-modal.cjs.entry.js +1 -1
- package/dist/cjs/ion-nav_2.cjs.entry.js +1 -1
- package/dist/cjs/ion-popover.cjs.entry.js +1 -1
- package/dist/cjs/ion-select_3.cjs.entry.js +56 -10
- package/dist/cjs/ion-textarea.cjs.entry.js +6 -14
- package/dist/cjs/ion-toggle.cjs.entry.js +4 -7
- package/dist/cjs/ionic.cjs.js +1 -1
- package/dist/cjs/{ios.transition-j9CclgEW.js → ios.transition-BOt_uW73.js} +1 -1
- package/dist/cjs/loader.cjs.js +1 -1
- package/dist/cjs/{md.transition-CwFyRSfv.js → md.transition-Dt968VXB.js} +1 -1
- package/dist/cjs/{notch-controller-Bzqhjm4f.js → validity-C8QoAYT2.js} +14 -0
- package/dist/collection/components/accordion/accordion.js +93 -14
- package/dist/collection/components/button/button.js +3 -7
- package/dist/collection/components/checkbox/checkbox.js +4 -7
- package/dist/collection/components/header/header.ios.css +27 -1
- package/dist/collection/components/header/header.js +5 -4
- package/dist/collection/components/header/header.utils.js +37 -0
- package/dist/collection/components/input/input.js +6 -14
- package/dist/collection/components/select/select.js +59 -11
- package/dist/collection/components/textarea/textarea.js +5 -13
- package/dist/collection/components/toggle/toggle.js +4 -7
- package/dist/collection/utils/forms/index.js +1 -0
- package/dist/collection/utils/forms/validity.js +15 -0
- package/dist/collection/utils/test/playwright/page/utils/spy-on-event.js +32 -0
- package/dist/collection/utils/transition/index.js +74 -3
- package/dist/docs.json +1 -1
- package/dist/esm/{index-D6G2seR8.js → index-r2D9DEro.js} +76 -5
- package/dist/esm/index.js +3 -3
- package/dist/esm/ion-accordion_2.entry.js +91 -13
- package/dist/esm/ion-app_8.entry.js +43 -5
- package/dist/esm/ion-button_2.entry.js +3 -7
- package/dist/esm/ion-checkbox.entry.js +4 -7
- package/dist/esm/ion-input.entry.js +6 -14
- package/dist/esm/ion-modal.entry.js +1 -1
- package/dist/esm/ion-nav_2.entry.js +1 -1
- package/dist/esm/ion-popover.entry.js +1 -1
- package/dist/esm/ion-select_3.entry.js +55 -9
- package/dist/esm/ion-textarea.entry.js +5 -13
- package/dist/esm/ion-toggle.entry.js +4 -7
- package/dist/esm/ionic.js +1 -1
- package/dist/esm/{ios.transition-Bpq9ixwv.js → ios.transition-BDzw0_Hm.js} +1 -1
- package/dist/esm/loader.js +1 -1
- package/dist/esm/{md.transition-zOA0oanq.js → md.transition-BzDYi3qq.js} +1 -1
- package/dist/esm/{notch-controller-BwelN_JM.js → validity-B8oWougr.js} +14 -1
- package/dist/ionic/index.esm.js +1 -1
- package/dist/ionic/ionic.esm.js +1 -1
- package/dist/ionic/p-43ed1ef5.entry.js +4 -0
- package/dist/ionic/p-4cc26913.entry.js +4 -0
- package/dist/ionic/{p-323421af.entry.js → p-5a39a99a.entry.js} +1 -1
- package/dist/ionic/p-5fb517e4.entry.js +4 -0
- package/dist/ionic/p-8bdfc8f6.entry.js +4 -0
- package/dist/ionic/{p-9a36e2e7.entry.js → p-95bddd49.entry.js} +1 -1
- package/dist/ionic/{p-DPhQmGJN.js → p-C7hRNDhM.js} +1 -1
- package/dist/ionic/p-DUt5fQmA.js +4 -0
- package/dist/ionic/{p-9R1XyICs.js → p-DZRJwG4S.js} +1 -1
- package/dist/ionic/{p-DCv9sLH2.js → p-DieJyvMP.js} +1 -1
- package/dist/ionic/p-d0a2a1ab.entry.js +4 -0
- package/dist/ionic/p-dc2e126d.entry.js +4 -0
- package/dist/ionic/{p-de7b5fa3.entry.js → p-e16b69e1.entry.js} +1 -1
- package/dist/ionic/p-f65f9308.entry.js +4 -0
- package/dist/ionic/p-fc278823.entry.js +4 -0
- package/dist/ionic/svg/checkbox-outline.svg +1 -0
- package/dist/ionic/svg/checkbox-sharp.svg +1 -0
- package/dist/ionic/svg/checkbox.svg +1 -0
- package/dist/ionic/svg/checkmark-circle-outline.svg +1 -0
- package/dist/ionic/svg/checkmark-circle-sharp.svg +1 -0
- package/dist/ionic/svg/checkmark-circle.svg +1 -0
- package/dist/ionic/svg/checkmark-done-circle-outline.svg +1 -0
- package/dist/ionic/svg/checkmark-done-circle-sharp.svg +1 -0
- package/dist/ionic/svg/checkmark-done-circle.svg +1 -0
- package/dist/ionic/svg/checkmark-done-outline.svg +1 -0
- package/dist/ionic/svg/checkmark-done-sharp.svg +1 -0
- package/dist/ionic/svg/checkmark-done.svg +1 -0
- package/dist/ionic/svg/checkmark-outline.svg +1 -0
- package/dist/ionic/svg/checkmark-sharp.svg +1 -0
- package/dist/ionic/svg/checkmark.svg +1 -0
- package/dist/ionic/svg/chevron-back-circle-outline.svg +1 -0
- package/dist/ionic/svg/chevron-back-circle-sharp.svg +1 -0
- package/dist/ionic/svg/chevron-back-circle.svg +1 -0
- package/dist/ionic/svg/chevron-back-outline.svg +1 -0
- package/dist/ionic/svg/chevron-back-sharp.svg +1 -0
- package/dist/ionic/svg/chevron-back.svg +1 -0
- package/dist/ionic/svg/chevron-collapse-outline.svg +1 -0
- package/dist/ionic/svg/chevron-collapse-sharp.svg +1 -0
- package/dist/ionic/svg/chevron-collapse.svg +1 -0
- package/dist/ionic/svg/chevron-down-circle-outline.svg +1 -0
- package/dist/ionic/svg/chevron-down-circle-sharp.svg +1 -0
- package/dist/ionic/svg/chevron-down-circle.svg +1 -0
- package/dist/ionic/svg/chevron-down-outline.svg +1 -0
- package/dist/ionic/svg/chevron-down-sharp.svg +1 -0
- package/dist/ionic/svg/chevron-down.svg +1 -0
- package/dist/ionic/svg/chevron-expand-outline.svg +1 -0
- package/dist/ionic/svg/chevron-expand-sharp.svg +1 -0
- package/dist/ionic/svg/chevron-expand.svg +1 -0
- package/dist/ionic/svg/chevron-forward-circle-outline.svg +1 -0
- package/dist/ionic/svg/chevron-forward-circle-sharp.svg +1 -0
- package/dist/ionic/svg/chevron-forward-circle.svg +1 -0
- package/dist/ionic/svg/chevron-forward-outline.svg +1 -0
- package/dist/ionic/svg/chevron-forward-sharp.svg +1 -0
- package/dist/ionic/svg/chevron-forward.svg +1 -0
- package/dist/ionic/svg/chevron-up-circle-outline.svg +1 -0
- package/dist/ionic/svg/chevron-up-circle-sharp.svg +1 -0
- package/dist/ionic/svg/chevron-up-circle.svg +1 -0
- package/dist/ionic/svg/chevron-up-outline.svg +1 -0
- package/dist/ionic/svg/chevron-up-sharp.svg +1 -0
- package/dist/ionic/svg/chevron-up.svg +1 -0
- package/dist/ionic/svg/clipboard-outline.svg +1 -0
- package/dist/ionic/svg/clipboard-sharp.svg +1 -0
- package/dist/ionic/svg/clipboard.svg +1 -0
- package/dist/ionic/svg/close-circle-outline.svg +1 -0
- package/dist/ionic/svg/close-circle-sharp.svg +1 -0
- package/dist/ionic/svg/close-circle.svg +1 -0
- package/dist/ionic/svg/close-outline.svg +1 -0
- package/dist/ionic/svg/close-sharp.svg +1 -0
- package/dist/ionic/svg/close.svg +1 -0
- package/dist/ionic/svg/cloud-circle-outline.svg +1 -0
- package/dist/ionic/svg/cloud-circle-sharp.svg +1 -0
- package/dist/ionic/svg/cloud-circle.svg +1 -0
- package/dist/ionic/svg/cloud-done-outline.svg +1 -0
- package/dist/ionic/svg/cloud-done-sharp.svg +1 -0
- package/dist/ionic/svg/cloud-done.svg +1 -0
- package/dist/ionic/svg/cloud-download-outline.svg +1 -0
- package/dist/ionic/svg/cloud-download-sharp.svg +1 -0
- package/dist/ionic/svg/cloud-download.svg +1 -0
- package/dist/ionic/svg/cloud-offline-outline.svg +1 -0
- package/dist/ionic/svg/cloud-offline-sharp.svg +1 -0
- package/dist/ionic/svg/cloud-offline.svg +1 -0
- package/dist/ionic/svg/cloud-outline.svg +1 -0
- package/dist/ionic/svg/cloud-sharp.svg +1 -0
- package/dist/ionic/svg/cloud-upload-outline.svg +1 -0
- package/dist/ionic/svg/cloud-upload-sharp.svg +1 -0
- package/dist/ionic/svg/cloud-upload.svg +1 -0
- package/dist/ionic/svg/cloud.svg +1 -0
- package/dist/ionic/svg/cloudy-night-outline.svg +1 -0
- package/dist/ionic/svg/cloudy-night-sharp.svg +1 -0
- package/dist/ionic/svg/cloudy-night.svg +1 -0
- package/dist/ionic/svg/cloudy-outline.svg +1 -0
- package/dist/ionic/svg/cloudy-sharp.svg +1 -0
- package/dist/ionic/svg/cloudy.svg +1 -0
- package/dist/ionic/svg/code-download-outline.svg +1 -0
- package/dist/ionic/svg/code-download-sharp.svg +1 -0
- package/dist/ionic/svg/code-download.svg +1 -0
- package/dist/ionic/svg/code-outline.svg +1 -0
- package/dist/ionic/svg/code-sharp.svg +1 -0
- package/dist/ionic/svg/code-slash-outline.svg +1 -0
- package/dist/ionic/svg/code-slash-sharp.svg +1 -0
- package/dist/ionic/svg/code-slash.svg +1 -0
- package/dist/ionic/svg/code-working-outline.svg +1 -0
- package/dist/ionic/svg/code-working-sharp.svg +1 -0
- package/dist/ionic/svg/code-working.svg +1 -0
- package/dist/ionic/svg/code.svg +1 -0
- package/dist/ionic/svg/cog-outline.svg +1 -0
- package/dist/ionic/svg/cog-sharp.svg +1 -0
- package/dist/ionic/svg/cog.svg +1 -0
- package/dist/ionic/svg/color-fill-outline.svg +1 -0
- package/dist/ionic/svg/color-fill-sharp.svg +1 -0
- package/dist/ionic/svg/color-fill.svg +1 -0
- package/dist/ionic/svg/color-filter-outline.svg +1 -0
- package/dist/ionic/svg/color-filter-sharp.svg +1 -0
- package/dist/ionic/svg/color-filter.svg +1 -0
- package/dist/ionic/svg/color-palette-outline.svg +1 -0
- package/dist/ionic/svg/color-palette-sharp.svg +1 -0
- package/dist/ionic/svg/color-palette.svg +1 -0
- package/dist/ionic/svg/color-wand-outline.svg +1 -0
- package/dist/ionic/svg/color-wand-sharp.svg +1 -0
- package/dist/ionic/svg/color-wand.svg +1 -0
- package/dist/ionic/svg/compass-outline.svg +1 -0
- package/dist/ionic/svg/compass-sharp.svg +1 -0
- package/dist/ionic/svg/compass.svg +1 -0
- package/dist/ionic/svg/construct-outline.svg +1 -0
- package/dist/ionic/svg/construct-sharp.svg +1 -0
- package/dist/ionic/svg/construct.svg +1 -0
- package/dist/ionic/svg/contract-outline.svg +1 -0
- package/dist/ionic/svg/contract-sharp.svg +1 -0
- package/dist/ionic/svg/contract.svg +1 -0
- package/dist/ionic/svg/contrast-outline.svg +1 -0
- package/dist/ionic/svg/contrast-sharp.svg +1 -0
- package/dist/ionic/svg/contrast.svg +1 -0
- package/dist/ionic/svg/copy-outline.svg +1 -0
- package/dist/ionic/svg/copy-sharp.svg +1 -0
- package/dist/ionic/svg/copy.svg +1 -0
- package/dist/ionic/svg/create-outline.svg +1 -0
- package/dist/ionic/svg/create-sharp.svg +1 -0
- package/dist/ionic/svg/create.svg +1 -0
- package/dist/ionic/svg/crop-outline.svg +1 -0
- package/dist/ionic/svg/crop-sharp.svg +1 -0
- package/dist/ionic/svg/crop.svg +1 -0
- package/dist/ionic/svg/cube-outline.svg +1 -0
- package/dist/ionic/svg/cube-sharp.svg +1 -0
- package/dist/ionic/svg/cube.svg +1 -0
- package/dist/ionic/svg/cut-outline.svg +1 -0
- package/dist/ionic/svg/cut-sharp.svg +1 -0
- package/dist/ionic/svg/cut.svg +1 -0
- package/dist/ionic/svg/desktop-outline.svg +1 -0
- package/dist/ionic/svg/desktop-sharp.svg +1 -0
- package/dist/ionic/svg/desktop.svg +1 -0
- package/dist/ionic/svg/diamond-outline.svg +1 -0
- package/dist/ionic/svg/diamond-sharp.svg +1 -0
- package/dist/ionic/svg/diamond.svg +1 -0
- package/dist/ionic/svg/dice-outline.svg +1 -0
- package/dist/ionic/svg/dice-sharp.svg +1 -0
- package/dist/ionic/svg/dice.svg +1 -0
- package/dist/ionic/svg/disc-outline.svg +1 -0
- package/dist/ionic/svg/disc-sharp.svg +1 -0
- package/dist/ionic/svg/disc.svg +1 -0
- package/dist/ionic/svg/document-attach-outline.svg +1 -0
- package/dist/ionic/svg/document-attach-sharp.svg +1 -0
- package/dist/ionic/svg/document-attach.svg +1 -0
- package/dist/ionic/svg/document-lock-outline.svg +1 -0
- package/dist/ionic/svg/document-lock-sharp.svg +1 -0
- package/dist/ionic/svg/document-lock.svg +1 -0
- package/dist/ionic/svg/document-outline.svg +1 -0
- package/dist/types/components/accordion/accordion.d.ts +18 -1
- package/dist/types/components/checkbox/checkbox.d.ts +0 -1
- package/dist/types/components/header/header.utils.d.ts +10 -0
- package/dist/types/components/input/input.d.ts +0 -4
- package/dist/types/components/select/select.d.ts +6 -0
- package/dist/types/components/textarea/textarea.d.ts +0 -4
- package/dist/types/components/toggle/toggle.d.ts +0 -1
- package/dist/types/utils/forms/index.d.ts +1 -0
- package/dist/types/utils/forms/validity.d.ts +10 -0
- package/dist/types/utils/transition/index.d.ts +9 -0
- package/hydrate/index.js +262 -73
- package/hydrate/index.mjs +262 -73
- package/package.json +3 -3
- package/dist/ionic/p-1c8a476d.entry.js +0 -4
- package/dist/ionic/p-3355a2ff.entry.js +0 -4
- package/dist/ionic/p-62e50f80.entry.js +0 -4
- package/dist/ionic/p-785026d7.entry.js +0 -4
- package/dist/ionic/p-78c74a3e.entry.js +0 -4
- package/dist/ionic/p-83fc84e7.entry.js +0 -4
- package/dist/ionic/p-913a7c1e.entry.js +0 -4
- package/dist/ionic/p-CMhMiYSX.js +0 -4
- package/dist/ionic/p-c17c0a01.entry.js +0 -4
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* (C) Ionic http://ionicframework.com - MIT License
|
|
3
3
|
*/
|
|
4
4
|
import { Build, Host, forceUpdate, h, writeTask, } from "@stencil/core";
|
|
5
|
-
import { createNotchController } from "../../utils/forms/index";
|
|
5
|
+
import { createNotchController, checkInvalidState } from "../../utils/forms/index";
|
|
6
6
|
import { inheritAriaAttributes, debounceEvent, inheritAttributes, componentOnReady } from "../../utils/helpers";
|
|
7
7
|
import { createSlotMutationController } from "../../utils/slot-mutation-controller";
|
|
8
8
|
import { createColorClasses, hostContext } from "../../utils/theme";
|
|
@@ -187,14 +187,6 @@ export class Textarea {
|
|
|
187
187
|
this.el.click();
|
|
188
188
|
}
|
|
189
189
|
}
|
|
190
|
-
/**
|
|
191
|
-
* Checks if the textarea is in an invalid state based on Ionic validation classes
|
|
192
|
-
*/
|
|
193
|
-
checkValidationState() {
|
|
194
|
-
const hasIonTouched = this.el.classList.contains('ion-touched');
|
|
195
|
-
const hasIonInvalid = this.el.classList.contains('ion-invalid');
|
|
196
|
-
return hasIonTouched && hasIonInvalid;
|
|
197
|
-
}
|
|
198
190
|
connectedCallback() {
|
|
199
191
|
const { el } = this;
|
|
200
192
|
this.slotMutationController = createSlotMutationController(el, ['label', 'start', 'end'], () => forceUpdate(this));
|
|
@@ -202,7 +194,7 @@ export class Textarea {
|
|
|
202
194
|
// Watch for class changes to update validation state
|
|
203
195
|
if (Build.isBrowser && typeof MutationObserver !== 'undefined') {
|
|
204
196
|
this.validationObserver = new MutationObserver(() => {
|
|
205
|
-
const newIsInvalid = this.
|
|
197
|
+
const newIsInvalid = checkInvalidState(this.el);
|
|
206
198
|
if (this.isInvalid !== newIsInvalid) {
|
|
207
199
|
this.isInvalid = newIsInvalid;
|
|
208
200
|
// Force a re-render to update aria-describedby immediately
|
|
@@ -215,7 +207,7 @@ export class Textarea {
|
|
|
215
207
|
});
|
|
216
208
|
}
|
|
217
209
|
// Always set initial state
|
|
218
|
-
this.isInvalid = this.
|
|
210
|
+
this.isInvalid = checkInvalidState(this.el);
|
|
219
211
|
this.debounceChanged();
|
|
220
212
|
if (Build.isBrowser) {
|
|
221
213
|
document.dispatchEvent(new CustomEvent('ionInputDidLoad', {
|
|
@@ -479,7 +471,7 @@ export class Textarea {
|
|
|
479
471
|
* TODO(FW-5592): Remove hasStartEndSlots condition
|
|
480
472
|
*/
|
|
481
473
|
const labelShouldFloat = labelPlacement === 'stacked' || (labelPlacement === 'floating' && (hasValue || hasFocus || hasStartEndSlots));
|
|
482
|
-
return (h(Host, { key: '
|
|
474
|
+
return (h(Host, { key: 'a70a62d7aae3831a50acd74f60b930925ada1326', class: createColorClasses(this.color, {
|
|
483
475
|
[mode]: true,
|
|
484
476
|
'has-value': hasValue,
|
|
485
477
|
'has-focus': hasFocus,
|
|
@@ -488,7 +480,7 @@ export class Textarea {
|
|
|
488
480
|
[`textarea-shape-${shape}`]: shape !== undefined,
|
|
489
481
|
[`textarea-label-placement-${labelPlacement}`]: true,
|
|
490
482
|
'textarea-disabled': disabled,
|
|
491
|
-
}) }, h("label", { key: '
|
|
483
|
+
}) }, h("label", { key: '8a2dd59a60f7469df84018eb0ede3a9ec3862703', class: "textarea-wrapper", htmlFor: inputId, onClick: this.onLabelClick }, this.renderLabelContainer(), h("div", { key: '1bfc368236e3da7a225a45118c27fbfc1fe5fa46', class: "textarea-wrapper-inner" }, h("div", { key: '215cbb2635ff52e31a8973376989b85e7245d40f', class: "start-slot-wrapper" }, h("slot", { key: '9f6b461cdee9d629deb695d2bea054ece2f32305', name: "start" })), h("div", { key: 'c1af35a2d5bc452bebe0b22a26d15ff52b4e9fc8', class: "native-wrapper", ref: (el) => (this.textareaWrapper = el) }, h("textarea", Object.assign({ key: '69a69b3cf0932baafbe37e6e846f1a571608d3f2', class: "native-textarea", ref: (el) => (this.nativeInput = el), id: inputId, disabled: disabled, autoCapitalize: this.autocapitalize, autoFocus: this.autofocus, enterKeyHint: this.enterkeyhint, inputMode: this.inputmode, minLength: this.minlength, maxLength: this.maxlength, name: this.name, placeholder: this.placeholder || '', readOnly: this.readonly, required: this.required, spellcheck: this.spellcheck, cols: this.cols, rows: this.rows, wrap: this.wrap, onInput: this.onInput, onChange: this.onChange, onBlur: this.onBlur, onFocus: this.onFocus, onKeyDown: this.onKeyDown, "aria-describedby": this.getHintTextID(), "aria-invalid": this.isInvalid ? 'true' : undefined }, this.inheritedAttributes), value)), h("div", { key: 'c053ea8b865d0e29763aed2e4939cc9c9e374c15', class: "end-slot-wrapper" }, h("slot", { key: '930aa641833b0df54b9ea10368fc2f46d5f491f6', name: "end" }))), shouldRenderHighlight && h("div", { key: '8d12597d15f5f429d80e8272ea99e64ed924e482', class: "textarea-highlight" })), this.renderBottomContent()));
|
|
492
484
|
}
|
|
493
485
|
static get is() { return "ion-textarea"; }
|
|
494
486
|
static get encapsulation() { return "scoped"; }
|
|
@@ -139,7 +139,6 @@ export class Toggle {
|
|
|
139
139
|
const { checked, value } = this;
|
|
140
140
|
const isNowChecked = !checked;
|
|
141
141
|
this.checked = isNowChecked;
|
|
142
|
-
this.setFocus();
|
|
143
142
|
this.ionChange.emit({
|
|
144
143
|
checked: isNowChecked,
|
|
145
144
|
value,
|
|
@@ -190,9 +189,7 @@ export class Toggle {
|
|
|
190
189
|
return this.value || '';
|
|
191
190
|
}
|
|
192
191
|
setFocus() {
|
|
193
|
-
|
|
194
|
-
this.focusEl.focus();
|
|
195
|
-
}
|
|
192
|
+
this.el.focus();
|
|
196
193
|
}
|
|
197
194
|
renderOnOffSwitchLabels(mode, checked) {
|
|
198
195
|
const icon = this.getSwitchLabelIcon(mode, checked);
|
|
@@ -242,7 +239,7 @@ export class Toggle {
|
|
|
242
239
|
const value = this.getValue();
|
|
243
240
|
const rtl = isRTL(el) ? 'rtl' : 'ltr';
|
|
244
241
|
renderHiddenInput(true, el, name, checked ? value : '', disabled);
|
|
245
|
-
return (h(Host, { key: '
|
|
242
|
+
return (h(Host, { key: '17bbbc8d229868e5c872b2bc5a3faf579780c5e0', role: "switch", "aria-checked": `${checked}`, "aria-describedby": this.getHintTextID(), "aria-invalid": this.getHintTextID() === errorTextId, onClick: this.onClick, "aria-labelledby": hasLabel ? inputLabelId : null, "aria-label": inheritedAttributes['aria-label'] || null, "aria-disabled": disabled ? 'true' : null, tabindex: disabled ? undefined : 0, onKeyDown: this.onKeyDown, onFocus: this.onFocus, onBlur: this.onBlur, class: createColorClasses(color, {
|
|
246
243
|
[mode]: true,
|
|
247
244
|
'in-item': hostContext('ion-item', el),
|
|
248
245
|
'toggle-activated': activated,
|
|
@@ -252,10 +249,10 @@ export class Toggle {
|
|
|
252
249
|
[`toggle-alignment-${alignment}`]: alignment !== undefined,
|
|
253
250
|
[`toggle-label-placement-${labelPlacement}`]: true,
|
|
254
251
|
[`toggle-${rtl}`]: true,
|
|
255
|
-
}) }, h("label", { key: '
|
|
252
|
+
}) }, h("label", { key: '673625b62a2c909e95dccb642c91312967a6cd1c', class: "toggle-wrapper", htmlFor: inputId }, h("input", Object.assign({ key: '7dc3f357b4708116663970047765da9f8f845bf0', type: "checkbox", role: "switch", "aria-checked": `${checked}`, checked: checked, disabled: disabled, id: inputId, required: required }, inheritedAttributes)), h("div", { key: '8f1c6a182031e8cbc6727e5f4ac0e00ad4247447', class: {
|
|
256
253
|
'label-text-wrapper': true,
|
|
257
254
|
'label-text-wrapper-hidden': !hasLabel,
|
|
258
|
-
}, part: "label", id: inputLabelId, onClick: this.onDivLabelClick }, h("slot", { key: '
|
|
255
|
+
}, part: "label", id: inputLabelId, onClick: this.onDivLabelClick }, h("slot", { key: '8322b9d54dc7edeb4e16fefcde9f7ebca8d5c3e1' }), this.renderHintText()), h("div", { key: 'fe6984143db817a7b3020a3f57cf5418fc3dcc0e', class: "native-wrapper" }, this.renderToggleControl()))));
|
|
259
256
|
}
|
|
260
257
|
static get is() { return "ion-toggle"; }
|
|
261
258
|
static get encapsulation() { return "shadow"; }
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/*!
|
|
2
|
+
* (C) Ionic http://ionicframework.com - MIT License
|
|
3
|
+
*/
|
|
4
|
+
/**
|
|
5
|
+
* Checks if the form element is in an invalid state based on
|
|
6
|
+
* Ionic validation classes.
|
|
7
|
+
*
|
|
8
|
+
* @param el The form element to check.
|
|
9
|
+
* @returns `true` if the element is invalid, `false` otherwise.
|
|
10
|
+
*/
|
|
11
|
+
export const checkInvalidState = (el) => {
|
|
12
|
+
const hasIonTouched = el.classList.contains('ion-touched');
|
|
13
|
+
const hasIonInvalid = el.classList.contains('ion-invalid');
|
|
14
|
+
return hasIonTouched && hasIonInvalid;
|
|
15
|
+
};
|
|
@@ -3,6 +3,38 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { addE2EListener, EventSpy } from "../event-spy";
|
|
5
5
|
export const spyOnEvent = async (page, eventName) => {
|
|
6
|
+
/**
|
|
7
|
+
* Tabbing out of the page boundary can lead to unreliable `ionBlur events,
|
|
8
|
+
* particularly in Firefox.
|
|
9
|
+
*
|
|
10
|
+
* This occurs because Playwright may incorrectly maintain focus state on the
|
|
11
|
+
* last element, even after a Tab press attempts to shift focus outside the
|
|
12
|
+
* viewport. To reliably trigger the necessary blur event, add a visually
|
|
13
|
+
* hidden, focusable element at the end of the page to receive focus instead of
|
|
14
|
+
* the browser.
|
|
15
|
+
*
|
|
16
|
+
* Playwright issue reference:
|
|
17
|
+
* https://github.com/microsoft/playwright/issues/32269
|
|
18
|
+
*/
|
|
19
|
+
if (eventName === 'ionBlur') {
|
|
20
|
+
const hiddenInput = await page.$('#hidden-input-for-ion-blur');
|
|
21
|
+
if (!hiddenInput) {
|
|
22
|
+
await page.evaluate(() => {
|
|
23
|
+
const input = document.createElement('input');
|
|
24
|
+
input.id = 'hidden-input-for-ion-blur';
|
|
25
|
+
input.style.position = 'absolute';
|
|
26
|
+
input.style.opacity = '0';
|
|
27
|
+
input.style.height = '0';
|
|
28
|
+
input.style.width = '0';
|
|
29
|
+
input.style.pointerEvents = 'none';
|
|
30
|
+
document.body.appendChild(input);
|
|
31
|
+
// Clean up the element when the page is unloaded.
|
|
32
|
+
window.addEventListener('unload', () => {
|
|
33
|
+
input.remove();
|
|
34
|
+
});
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
}
|
|
6
38
|
const spy = new EventSpy(eventName);
|
|
7
39
|
const handle = await page.evaluateHandle(() => window);
|
|
8
40
|
await addE2EListener(page, handle, eventName, (ev) => spy.push(ev));
|
|
@@ -10,11 +10,22 @@ const iosTransitionAnimation = () => import('./ios.transition');
|
|
|
10
10
|
const mdTransitionAnimation = () => import('./md.transition');
|
|
11
11
|
const focusController = createFocusController();
|
|
12
12
|
// TODO(FW-2832): types
|
|
13
|
+
/**
|
|
14
|
+
* Executes the main page transition.
|
|
15
|
+
* It also manages the lifecycle of header visibility (if any)
|
|
16
|
+
* to prevent visual flickering in iOS. The flickering only
|
|
17
|
+
* occurs for a condensed header that is placed above the content.
|
|
18
|
+
*
|
|
19
|
+
* @param opts Options for the transition.
|
|
20
|
+
* @returns A promise that resolves when the transition is complete.
|
|
21
|
+
*/
|
|
13
22
|
export const transition = (opts) => {
|
|
14
23
|
return new Promise((resolve, reject) => {
|
|
15
24
|
writeTask(() => {
|
|
16
|
-
|
|
17
|
-
|
|
25
|
+
const transitioningInactiveHeader = getIosIonHeader(opts);
|
|
26
|
+
beforeTransition(opts, transitioningInactiveHeader);
|
|
27
|
+
runTransition(opts)
|
|
28
|
+
.then((result) => {
|
|
18
29
|
if (result.animation) {
|
|
19
30
|
result.animation.destroy();
|
|
20
31
|
}
|
|
@@ -23,15 +34,21 @@ export const transition = (opts) => {
|
|
|
23
34
|
}, (error) => {
|
|
24
35
|
afterTransition(opts);
|
|
25
36
|
reject(error);
|
|
37
|
+
})
|
|
38
|
+
.finally(() => {
|
|
39
|
+
// Ensure that the header is restored to its original state.
|
|
40
|
+
setHeaderTransitionClass(transitioningInactiveHeader, false);
|
|
26
41
|
});
|
|
27
42
|
});
|
|
28
43
|
});
|
|
29
44
|
};
|
|
30
|
-
const beforeTransition = (opts) => {
|
|
45
|
+
const beforeTransition = (opts, transitioningInactiveHeader) => {
|
|
31
46
|
const enteringEl = opts.enteringEl;
|
|
32
47
|
const leavingEl = opts.leavingEl;
|
|
33
48
|
focusController.saveViewFocus(leavingEl);
|
|
34
49
|
setZIndex(enteringEl, leavingEl, opts.direction);
|
|
50
|
+
// Prevent flickering of the header by adding a class.
|
|
51
|
+
setHeaderTransitionClass(transitioningInactiveHeader, true);
|
|
35
52
|
if (opts.showGoBack) {
|
|
36
53
|
enteringEl.classList.add('can-go-back');
|
|
37
54
|
}
|
|
@@ -220,6 +237,39 @@ const setZIndex = (enteringEl, leavingEl, direction) => {
|
|
|
220
237
|
leavingEl.style.zIndex = '100';
|
|
221
238
|
}
|
|
222
239
|
};
|
|
240
|
+
/**
|
|
241
|
+
* Add a class to ensure that the header (if any)
|
|
242
|
+
* does not flicker during the transition. By adding the
|
|
243
|
+
* transitioning class, we ensure that the header has
|
|
244
|
+
* the necessary styles to prevent the following flickers:
|
|
245
|
+
* 1. When entering a page with a condensed header, the
|
|
246
|
+
* header should never be visible. However,
|
|
247
|
+
* it briefly renders the background color while
|
|
248
|
+
* the transition is occurring.
|
|
249
|
+
* 2. When leaving a page with a condensed header, the
|
|
250
|
+
* header has an opacity of 0 and the pages
|
|
251
|
+
* have a z-index which causes the entering page to
|
|
252
|
+
* briefly show it's content underneath the leaving page.
|
|
253
|
+
* 3. When entering a page or leaving a page with a fade
|
|
254
|
+
* header, the header should not have a background color.
|
|
255
|
+
* However, it briefly shows the background color while
|
|
256
|
+
* the transition is occurring.
|
|
257
|
+
*
|
|
258
|
+
* @param header The header element to modify.
|
|
259
|
+
* @param isTransitioning Whether the transition is occurring.
|
|
260
|
+
*/
|
|
261
|
+
const setHeaderTransitionClass = (header, isTransitioning) => {
|
|
262
|
+
if (!header) {
|
|
263
|
+
return;
|
|
264
|
+
}
|
|
265
|
+
const transitionClass = 'header-transitioning';
|
|
266
|
+
if (isTransitioning) {
|
|
267
|
+
header.classList.add(transitionClass);
|
|
268
|
+
}
|
|
269
|
+
else {
|
|
270
|
+
header.classList.remove(transitionClass);
|
|
271
|
+
}
|
|
272
|
+
};
|
|
223
273
|
export const getIonPageElement = (element) => {
|
|
224
274
|
if (element.classList.contains('ion-page')) {
|
|
225
275
|
return element;
|
|
@@ -231,3 +281,24 @@ export const getIonPageElement = (element) => {
|
|
|
231
281
|
// idk, return the original element so at least something animates and we don't have a null pointer
|
|
232
282
|
return element;
|
|
233
283
|
};
|
|
284
|
+
/**
|
|
285
|
+
* Retrieves the ion-header element from a page based on the
|
|
286
|
+
* direction of the transition.
|
|
287
|
+
*
|
|
288
|
+
* @param opts Options for the transition.
|
|
289
|
+
* @returns The ion-header element or null if not found or not in 'ios' mode.
|
|
290
|
+
*/
|
|
291
|
+
const getIosIonHeader = (opts) => {
|
|
292
|
+
const enteringEl = opts.enteringEl;
|
|
293
|
+
const leavingEl = opts.leavingEl;
|
|
294
|
+
const direction = opts.direction;
|
|
295
|
+
const mode = opts.mode;
|
|
296
|
+
if (mode !== 'ios') {
|
|
297
|
+
return null;
|
|
298
|
+
}
|
|
299
|
+
const element = direction === 'back' ? leavingEl : enteringEl;
|
|
300
|
+
if (!element) {
|
|
301
|
+
return null;
|
|
302
|
+
}
|
|
303
|
+
return element.querySelector('ion-header');
|
|
304
|
+
};
|
package/dist/docs.json
CHANGED
|
@@ -118,15 +118,26 @@ const createFocusController = () => {
|
|
|
118
118
|
};
|
|
119
119
|
const LAST_FOCUS = 'ion-last-focus';
|
|
120
120
|
|
|
121
|
-
const iosTransitionAnimation = () => import('./ios.transition-
|
|
122
|
-
const mdTransitionAnimation = () => import('./md.transition-
|
|
121
|
+
const iosTransitionAnimation = () => import('./ios.transition-BDzw0_Hm.js');
|
|
122
|
+
const mdTransitionAnimation = () => import('./md.transition-BzDYi3qq.js');
|
|
123
123
|
const focusController = createFocusController();
|
|
124
124
|
// TODO(FW-2832): types
|
|
125
|
+
/**
|
|
126
|
+
* Executes the main page transition.
|
|
127
|
+
* It also manages the lifecycle of header visibility (if any)
|
|
128
|
+
* to prevent visual flickering in iOS. The flickering only
|
|
129
|
+
* occurs for a condensed header that is placed above the content.
|
|
130
|
+
*
|
|
131
|
+
* @param opts Options for the transition.
|
|
132
|
+
* @returns A promise that resolves when the transition is complete.
|
|
133
|
+
*/
|
|
125
134
|
const transition = (opts) => {
|
|
126
135
|
return new Promise((resolve, reject) => {
|
|
127
136
|
writeTask(() => {
|
|
128
|
-
|
|
129
|
-
|
|
137
|
+
const transitioningInactiveHeader = getIosIonHeader(opts);
|
|
138
|
+
beforeTransition(opts, transitioningInactiveHeader);
|
|
139
|
+
runTransition(opts)
|
|
140
|
+
.then((result) => {
|
|
130
141
|
if (result.animation) {
|
|
131
142
|
result.animation.destroy();
|
|
132
143
|
}
|
|
@@ -135,15 +146,21 @@ const transition = (opts) => {
|
|
|
135
146
|
}, (error) => {
|
|
136
147
|
afterTransition(opts);
|
|
137
148
|
reject(error);
|
|
149
|
+
})
|
|
150
|
+
.finally(() => {
|
|
151
|
+
// Ensure that the header is restored to its original state.
|
|
152
|
+
setHeaderTransitionClass(transitioningInactiveHeader, false);
|
|
138
153
|
});
|
|
139
154
|
});
|
|
140
155
|
});
|
|
141
156
|
};
|
|
142
|
-
const beforeTransition = (opts) => {
|
|
157
|
+
const beforeTransition = (opts, transitioningInactiveHeader) => {
|
|
143
158
|
const enteringEl = opts.enteringEl;
|
|
144
159
|
const leavingEl = opts.leavingEl;
|
|
145
160
|
focusController.saveViewFocus(leavingEl);
|
|
146
161
|
setZIndex(enteringEl, leavingEl, opts.direction);
|
|
162
|
+
// Prevent flickering of the header by adding a class.
|
|
163
|
+
setHeaderTransitionClass(transitioningInactiveHeader, true);
|
|
147
164
|
if (opts.showGoBack) {
|
|
148
165
|
enteringEl.classList.add('can-go-back');
|
|
149
166
|
}
|
|
@@ -332,6 +349,39 @@ const setZIndex = (enteringEl, leavingEl, direction) => {
|
|
|
332
349
|
leavingEl.style.zIndex = '100';
|
|
333
350
|
}
|
|
334
351
|
};
|
|
352
|
+
/**
|
|
353
|
+
* Add a class to ensure that the header (if any)
|
|
354
|
+
* does not flicker during the transition. By adding the
|
|
355
|
+
* transitioning class, we ensure that the header has
|
|
356
|
+
* the necessary styles to prevent the following flickers:
|
|
357
|
+
* 1. When entering a page with a condensed header, the
|
|
358
|
+
* header should never be visible. However,
|
|
359
|
+
* it briefly renders the background color while
|
|
360
|
+
* the transition is occurring.
|
|
361
|
+
* 2. When leaving a page with a condensed header, the
|
|
362
|
+
* header has an opacity of 0 and the pages
|
|
363
|
+
* have a z-index which causes the entering page to
|
|
364
|
+
* briefly show it's content underneath the leaving page.
|
|
365
|
+
* 3. When entering a page or leaving a page with a fade
|
|
366
|
+
* header, the header should not have a background color.
|
|
367
|
+
* However, it briefly shows the background color while
|
|
368
|
+
* the transition is occurring.
|
|
369
|
+
*
|
|
370
|
+
* @param header The header element to modify.
|
|
371
|
+
* @param isTransitioning Whether the transition is occurring.
|
|
372
|
+
*/
|
|
373
|
+
const setHeaderTransitionClass = (header, isTransitioning) => {
|
|
374
|
+
if (!header) {
|
|
375
|
+
return;
|
|
376
|
+
}
|
|
377
|
+
const transitionClass = 'header-transitioning';
|
|
378
|
+
if (isTransitioning) {
|
|
379
|
+
header.classList.add(transitionClass);
|
|
380
|
+
}
|
|
381
|
+
else {
|
|
382
|
+
header.classList.remove(transitionClass);
|
|
383
|
+
}
|
|
384
|
+
};
|
|
335
385
|
const getIonPageElement = (element) => {
|
|
336
386
|
if (element.classList.contains('ion-page')) {
|
|
337
387
|
return element;
|
|
@@ -343,5 +393,26 @@ const getIonPageElement = (element) => {
|
|
|
343
393
|
// idk, return the original element so at least something animates and we don't have a null pointer
|
|
344
394
|
return element;
|
|
345
395
|
};
|
|
396
|
+
/**
|
|
397
|
+
* Retrieves the ion-header element from a page based on the
|
|
398
|
+
* direction of the transition.
|
|
399
|
+
*
|
|
400
|
+
* @param opts Options for the transition.
|
|
401
|
+
* @returns The ion-header element or null if not found or not in 'ios' mode.
|
|
402
|
+
*/
|
|
403
|
+
const getIosIonHeader = (opts) => {
|
|
404
|
+
const enteringEl = opts.enteringEl;
|
|
405
|
+
const leavingEl = opts.leavingEl;
|
|
406
|
+
const direction = opts.direction;
|
|
407
|
+
const mode = opts.mode;
|
|
408
|
+
if (mode !== 'ios') {
|
|
409
|
+
return null;
|
|
410
|
+
}
|
|
411
|
+
const element = direction === 'back' ? leavingEl : enteringEl;
|
|
412
|
+
if (!element) {
|
|
413
|
+
return null;
|
|
414
|
+
}
|
|
415
|
+
return element.querySelector('ion-header');
|
|
416
|
+
};
|
|
346
417
|
|
|
347
418
|
export { LIFECYCLE_WILL_ENTER as L, LIFECYCLE_DID_ENTER as a, LIFECYCLE_WILL_LEAVE as b, LIFECYCLE_DID_LEAVE as c, LIFECYCLE_WILL_UNLOAD as d, deepReady as e, getIonPageElement as g, lifecycle as l, setPageHidden as s, transition as t, waitForMount as w };
|
package/dist/esm/index.js
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
* (C) Ionic http://ionicframework.com - MIT License
|
|
3
3
|
*/
|
|
4
4
|
export { c as createAnimation } from './animation-Dt8bGnA-.js';
|
|
5
|
-
export { a as LIFECYCLE_DID_ENTER, c as LIFECYCLE_DID_LEAVE, L as LIFECYCLE_WILL_ENTER, b as LIFECYCLE_WILL_LEAVE, d as LIFECYCLE_WILL_UNLOAD, g as getIonPageElement } from './index-
|
|
6
|
-
export { iosTransitionAnimation } from './ios.transition-
|
|
7
|
-
export { mdTransitionAnimation } from './md.transition-
|
|
5
|
+
export { a as LIFECYCLE_DID_ENTER, c as LIFECYCLE_DID_LEAVE, L as LIFECYCLE_WILL_ENTER, b as LIFECYCLE_WILL_LEAVE, d as LIFECYCLE_WILL_UNLOAD, g as getIonPageElement } from './index-r2D9DEro.js';
|
|
6
|
+
export { iosTransitionAnimation } from './ios.transition-BDzw0_Hm.js';
|
|
7
|
+
export { mdTransitionAnimation } from './md.transition-BzDYi3qq.js';
|
|
8
8
|
export { g as getTimeGivenProgression } from './cubic-bezier-hHmYLOfE.js';
|
|
9
9
|
export { createGesture } from './index-CfgBF1SE.js';
|
|
10
10
|
export { g as getPlatforms, i as initialize, a as isPlatform } from './ionic-global-CDrldh-5.js';
|
|
@@ -13,10 +13,57 @@ const accordionMdCss = ":host{display:block;position:relative;width:100%;backgro
|
|
|
13
13
|
const Accordion = class {
|
|
14
14
|
constructor(hostRef) {
|
|
15
15
|
registerInstance(this, hostRef);
|
|
16
|
-
this.
|
|
16
|
+
this.accordionGroupUpdateHandler = () => {
|
|
17
|
+
/**
|
|
18
|
+
* Determine if this update will cause an actual state change.
|
|
19
|
+
* We only want to mark as "interacted" if the state is changing.
|
|
20
|
+
*/
|
|
21
|
+
const accordionGroup = this.accordionGroupEl;
|
|
22
|
+
if (accordionGroup) {
|
|
23
|
+
const value = accordionGroup.value;
|
|
24
|
+
const accordionValue = this.value;
|
|
25
|
+
const shouldExpand = Array.isArray(value) ? value.includes(accordionValue) : value === accordionValue;
|
|
26
|
+
const isExpanded = this.state === 4 /* AccordionState.Expanded */ || this.state === 8 /* AccordionState.Expanding */;
|
|
27
|
+
const stateWillChange = shouldExpand !== isExpanded;
|
|
28
|
+
/**
|
|
29
|
+
* Only mark as interacted if:
|
|
30
|
+
* 1. This is not the first update we've received with a defined value
|
|
31
|
+
* 2. The state is actually changing (prevents redundant updates from enabling animations)
|
|
32
|
+
*/
|
|
33
|
+
if (this.hasReceivedFirstUpdate && stateWillChange) {
|
|
34
|
+
this.hasInteracted = true;
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Only count this as the first update if the group value is defined.
|
|
38
|
+
* This prevents the initial undefined value from the group's componentDidLoad
|
|
39
|
+
* from being treated as the first real update.
|
|
40
|
+
*/
|
|
41
|
+
if (value !== undefined) {
|
|
42
|
+
this.hasReceivedFirstUpdate = true;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
this.updateState();
|
|
46
|
+
};
|
|
17
47
|
this.state = 1 /* AccordionState.Collapsed */;
|
|
18
48
|
this.isNext = false;
|
|
19
49
|
this.isPrevious = false;
|
|
50
|
+
/**
|
|
51
|
+
* Tracks whether a user-initiated interaction has occurred.
|
|
52
|
+
* Animations are disabled until the first interaction happens.
|
|
53
|
+
* This prevents the accordion from animating when it's programmatically
|
|
54
|
+
* set to an expanded or collapsed state on initial load.
|
|
55
|
+
*/
|
|
56
|
+
this.hasInteracted = false;
|
|
57
|
+
/**
|
|
58
|
+
* Tracks if this accordion has ever been expanded.
|
|
59
|
+
* Used to prevent the first expansion from animating.
|
|
60
|
+
*/
|
|
61
|
+
this.hasEverBeenExpanded = false;
|
|
62
|
+
/**
|
|
63
|
+
* Tracks if this accordion has received its first update from the group.
|
|
64
|
+
* Used to distinguish initial programmatic sets from user interactions.
|
|
65
|
+
*/
|
|
66
|
+
this.hasReceivedFirstUpdate = false;
|
|
20
67
|
/**
|
|
21
68
|
* The value of the accordion. Defaults to an autogenerated
|
|
22
69
|
* value.
|
|
@@ -121,10 +168,15 @@ const Accordion = class {
|
|
|
121
168
|
iconEl.setAttribute('aria-hidden', 'true');
|
|
122
169
|
ionItem.appendChild(iconEl);
|
|
123
170
|
};
|
|
124
|
-
this.expandAccordion = (
|
|
171
|
+
this.expandAccordion = () => {
|
|
125
172
|
const { contentEl, contentElWrapper } = this;
|
|
126
|
-
|
|
173
|
+
/**
|
|
174
|
+
* If the content elements aren't available yet, just set the state.
|
|
175
|
+
* This happens on initial render before the DOM is ready.
|
|
176
|
+
*/
|
|
177
|
+
if (contentEl === undefined || contentElWrapper === undefined) {
|
|
127
178
|
this.state = 4 /* AccordionState.Expanded */;
|
|
179
|
+
this.hasEverBeenExpanded = true;
|
|
128
180
|
return;
|
|
129
181
|
}
|
|
130
182
|
if (this.state === 4 /* AccordionState.Expanded */) {
|
|
@@ -133,6 +185,11 @@ const Accordion = class {
|
|
|
133
185
|
if (this.currentRaf !== undefined) {
|
|
134
186
|
cancelAnimationFrame(this.currentRaf);
|
|
135
187
|
}
|
|
188
|
+
/**
|
|
189
|
+
* Mark that this accordion has been expanded at least once.
|
|
190
|
+
* This allows subsequent expansions to animate.
|
|
191
|
+
*/
|
|
192
|
+
this.hasEverBeenExpanded = true;
|
|
136
193
|
if (this.shouldAnimate()) {
|
|
137
194
|
raf(() => {
|
|
138
195
|
this.state = 8 /* AccordionState.Expanding */;
|
|
@@ -150,9 +207,13 @@ const Accordion = class {
|
|
|
150
207
|
this.state = 4 /* AccordionState.Expanded */;
|
|
151
208
|
}
|
|
152
209
|
};
|
|
153
|
-
this.collapseAccordion = (
|
|
210
|
+
this.collapseAccordion = () => {
|
|
154
211
|
const { contentEl } = this;
|
|
155
|
-
|
|
212
|
+
/**
|
|
213
|
+
* If the content element isn't available yet, just set the state.
|
|
214
|
+
* This happens on initial render before the DOM is ready.
|
|
215
|
+
*/
|
|
216
|
+
if (contentEl === undefined) {
|
|
156
217
|
this.state = 1 /* AccordionState.Collapsed */;
|
|
157
218
|
return;
|
|
158
219
|
}
|
|
@@ -187,6 +248,18 @@ const Accordion = class {
|
|
|
187
248
|
* of what is set in the config.
|
|
188
249
|
*/
|
|
189
250
|
this.shouldAnimate = () => {
|
|
251
|
+
/**
|
|
252
|
+
* Don't animate until after the first user interaction.
|
|
253
|
+
* This prevents animations on initial load when accordions
|
|
254
|
+
* start in an expanded or collapsed state programmatically.
|
|
255
|
+
*
|
|
256
|
+
* Additionally, don't animate the very first expansion even if
|
|
257
|
+
* hasInteracted is true. This handles edge cases like React StrictMode
|
|
258
|
+
* where effects run twice and might incorrectly mark as interacted.
|
|
259
|
+
*/
|
|
260
|
+
if (!this.hasInteracted || !this.hasEverBeenExpanded) {
|
|
261
|
+
return false;
|
|
262
|
+
}
|
|
190
263
|
if (typeof window === 'undefined') {
|
|
191
264
|
return false;
|
|
192
265
|
}
|
|
@@ -203,7 +276,7 @@ const Accordion = class {
|
|
|
203
276
|
}
|
|
204
277
|
return true;
|
|
205
278
|
};
|
|
206
|
-
this.updateState = async (
|
|
279
|
+
this.updateState = async () => {
|
|
207
280
|
const accordionGroup = this.accordionGroupEl;
|
|
208
281
|
const accordionValue = this.value;
|
|
209
282
|
if (!accordionGroup) {
|
|
@@ -212,11 +285,11 @@ const Accordion = class {
|
|
|
212
285
|
const value = accordionGroup.value;
|
|
213
286
|
const shouldExpand = Array.isArray(value) ? value.includes(accordionValue) : value === accordionValue;
|
|
214
287
|
if (shouldExpand) {
|
|
215
|
-
this.expandAccordion(
|
|
288
|
+
this.expandAccordion();
|
|
216
289
|
this.isNext = this.isPrevious = false;
|
|
217
290
|
}
|
|
218
291
|
else {
|
|
219
|
-
this.collapseAccordion(
|
|
292
|
+
this.collapseAccordion();
|
|
220
293
|
/**
|
|
221
294
|
* When using popout or inset,
|
|
222
295
|
* the collapsed accordion items
|
|
@@ -264,14 +337,14 @@ const Accordion = class {
|
|
|
264
337
|
var _a;
|
|
265
338
|
const accordionGroupEl = (this.accordionGroupEl = (_a = this.el) === null || _a === void 0 ? void 0 : _a.closest('ion-accordion-group'));
|
|
266
339
|
if (accordionGroupEl) {
|
|
267
|
-
this.updateState(
|
|
268
|
-
addEventListener(accordionGroupEl, 'ionValueChange', this.
|
|
340
|
+
this.updateState();
|
|
341
|
+
addEventListener(accordionGroupEl, 'ionValueChange', this.accordionGroupUpdateHandler);
|
|
269
342
|
}
|
|
270
343
|
}
|
|
271
344
|
disconnectedCallback() {
|
|
272
345
|
const accordionGroupEl = this.accordionGroupEl;
|
|
273
346
|
if (accordionGroupEl) {
|
|
274
|
-
removeEventListener(accordionGroupEl, 'ionValueChange', this.
|
|
347
|
+
removeEventListener(accordionGroupEl, 'ionValueChange', this.accordionGroupUpdateHandler);
|
|
275
348
|
}
|
|
276
349
|
}
|
|
277
350
|
componentDidLoad() {
|
|
@@ -295,6 +368,11 @@ const Accordion = class {
|
|
|
295
368
|
const { accordionGroupEl, disabled, readonly, value, state } = this;
|
|
296
369
|
if (disabled || readonly)
|
|
297
370
|
return;
|
|
371
|
+
/**
|
|
372
|
+
* Mark that the user has interacted with the accordion.
|
|
373
|
+
* This enables animations for all future state changes.
|
|
374
|
+
*/
|
|
375
|
+
this.hasInteracted = true;
|
|
298
376
|
if (accordionGroupEl) {
|
|
299
377
|
/**
|
|
300
378
|
* Because the accordion group may or may
|
|
@@ -315,7 +393,7 @@ const Accordion = class {
|
|
|
315
393
|
const headerPart = expanded ? 'header expanded' : 'header';
|
|
316
394
|
const contentPart = expanded ? 'content expanded' : 'content';
|
|
317
395
|
this.setAria(expanded);
|
|
318
|
-
return (h(Host, { key: '
|
|
396
|
+
return (h(Host, { key: '9c90bce01eff7e5774a19f69c872f3761d66cf3c', class: {
|
|
319
397
|
[mode]: true,
|
|
320
398
|
'accordion-expanding': this.state === 8 /* AccordionState.Expanding */,
|
|
321
399
|
'accordion-expanded': this.state === 4 /* AccordionState.Expanded */,
|
|
@@ -326,7 +404,7 @@ const Accordion = class {
|
|
|
326
404
|
'accordion-disabled': disabled,
|
|
327
405
|
'accordion-readonly': readonly,
|
|
328
406
|
'accordion-animated': this.shouldAnimate(),
|
|
329
|
-
} }, h("div", { key: '
|
|
407
|
+
} }, h("div", { key: 'cab40d5bcf3c93fd78e70b6d3906a541e725837d', onClick: () => this.toggleExpanded(), id: "header", part: headerPart, "aria-controls": "content", ref: (headerEl) => (this.headerEl = headerEl) }, h("slot", { key: '672bc7fb3f9e18076b41e20fc9eaeab7cafcf3a2', name: "header" })), h("div", { key: 'fd777ca5b4ab04aa4f44c339d58c8cd987c52bcb', id: "content", part: contentPart, role: "region", "aria-labelledby": "header", ref: (contentEl) => (this.contentEl = contentEl) }, h("div", { key: '0aad70a71e2cd2c16b2e98fa0bdd40421d95fe16', id: "content-wrapper", ref: (contentElWrapper) => (this.contentElWrapper = contentElWrapper) }, h("slot", { key: 'd630e10ac7c56b4dbf943b523f26759b83aead55', name: "content" })))));
|
|
330
408
|
}
|
|
331
409
|
static get delegatesFocus() { return true; }
|
|
332
410
|
get el() { return getElement(this); }
|