@ionic/core 8.7.4-dev.11756465095.1387c832 → 8.7.4-dev.11756888693.1b2f4d4a
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/ion-datetime.js +3 -4
- package/components/ion-menu.js +2 -5
- package/components/overlays.js +109 -18
- package/components/picker-column-option.js +4 -4
- package/components/picker-column.js +39 -3
- package/components/select-modal.js +1 -1
- package/dist/cjs/index.cjs.js +1 -1
- package/dist/cjs/ion-action-sheet.cjs.entry.js +1 -1
- package/dist/cjs/ion-alert.cjs.entry.js +1 -1
- package/dist/cjs/ion-datetime_3.cjs.entry.js +4 -4
- package/dist/cjs/ion-loading.cjs.entry.js +1 -1
- package/dist/cjs/ion-menu_3.cjs.entry.js +3 -6
- package/dist/cjs/ion-modal.cjs.entry.js +1 -1
- package/dist/cjs/ion-picker-column-option.cjs.entry.js +4 -4
- package/dist/cjs/ion-picker-column.cjs.entry.js +39 -3
- package/dist/cjs/ion-popover.cjs.entry.js +1 -1
- package/dist/cjs/ion-select-modal.cjs.entry.js +2 -2
- package/dist/cjs/ion-select_3.cjs.entry.js +1 -1
- package/dist/cjs/ion-toast.cjs.entry.js +1 -1
- package/dist/cjs/{overlays-Di-PotkY.js → overlays-cmlYi6Sc.js} +108 -17
- package/dist/collection/components/datetime/datetime.js +3 -4
- package/dist/collection/components/menu/menu.js +2 -9
- package/dist/collection/components/picker-column/picker-column.js +39 -3
- package/dist/collection/components/picker-column-option/picker-column-option.ios.css +2 -2
- package/dist/collection/components/picker-column-option/picker-column-option.js +1 -1
- package/dist/collection/components/picker-column-option/picker-column-option.md.css +2 -2
- package/dist/collection/components/select-modal/select-modal.ionic.css +4 -0
- package/dist/collection/utils/overlays.js +109 -17
- package/dist/docs.json +1 -5
- package/dist/esm/index.js +1 -1
- package/dist/esm/ion-action-sheet.entry.js +1 -1
- package/dist/esm/ion-alert.entry.js +1 -1
- package/dist/esm/ion-datetime_3.entry.js +4 -4
- package/dist/esm/ion-loading.entry.js +1 -1
- package/dist/esm/ion-menu_3.entry.js +3 -6
- package/dist/esm/ion-modal.entry.js +1 -1
- package/dist/esm/ion-picker-column-option.entry.js +4 -4
- package/dist/esm/ion-picker-column.entry.js +39 -3
- package/dist/esm/ion-popover.entry.js +1 -1
- package/dist/esm/ion-select-modal.entry.js +2 -2
- package/dist/esm/ion-select_3.entry.js +1 -1
- package/dist/esm/ion-toast.entry.js +1 -1
- package/dist/esm/{overlays-B1-bMbOY.js → overlays-e6TpXUJS.js} +109 -18
- package/dist/ionic/index.esm.js +1 -1
- package/dist/ionic/ionic.esm.js +1 -1
- package/dist/ionic/{p-f0e88837.entry.js → p-0cffd1bf.entry.js} +1 -1
- package/dist/ionic/{p-fcba862e.entry.js → p-1fd86237.entry.js} +1 -1
- package/dist/ionic/{p-db20a452.entry.js → p-34198a78.entry.js} +1 -1
- package/dist/ionic/p-417569b5.entry.js +4 -0
- package/dist/ionic/p-45b08f61.entry.js +4 -0
- package/dist/ionic/p-63b6f13f.entry.js +4 -0
- package/dist/ionic/p-80de7b65.entry.js +4 -0
- package/dist/ionic/{p-00239ebc.entry.js → p-9d9584bd.entry.js} +1 -1
- package/dist/ionic/p-9f1d66d0.entry.js +4 -0
- package/dist/ionic/p-DkI7cEUN.js +4 -0
- package/dist/ionic/{p-c847a353.entry.js → p-bfad272a.entry.js} +1 -1
- package/dist/ionic/{p-361408bb.entry.js → p-d45f502a.entry.js} +1 -1
- package/dist/ionic/{p-3b1c39cf.entry.js → p-f116e723.entry.js} +1 -1
- package/dist/types/components/picker-column/picker-column.d.ts +7 -0
- package/hydrate/index.js +157 -33
- package/hydrate/index.mjs +157 -33
- package/package.json +2 -2
- package/dist/ionic/p-47b803fc.entry.js +0 -4
- package/dist/ionic/p-66b83d63.entry.js +0 -4
- package/dist/ionic/p-9e575e4e.entry.js +0 -4
- package/dist/ionic/p-CKq50gmC.js +0 -4
- package/dist/ionic/p-a953afe2.entry.js +0 -4
- package/dist/ionic/p-f4d11cbb.entry.js +0 -4
|
@@ -7,7 +7,6 @@ import { c as caretRightSvg } from './caret-right.js';
|
|
|
7
7
|
import { startFocusVisible } from './focus-visible.js';
|
|
8
8
|
import { r as raf, g as getElementRoot, e as renderHiddenInput } from './helpers.js';
|
|
9
9
|
import { a as printIonError, p as printIonWarning, c as config } from './index4.js';
|
|
10
|
-
import { F as FOCUS_TRAP_DISABLE_CLASS } from './overlays.js';
|
|
11
10
|
import { i as isRTL } from './dir.js';
|
|
12
11
|
import { c as createColorClasses } from './theme.js';
|
|
13
12
|
import { f as chevronForward, b as chevronBack, g as caretDownSharp, h as caretUpSharp, c as chevronDown } from './index6.js';
|
|
@@ -1309,7 +1308,7 @@ const Datetime = /*@__PURE__*/ proxyCustomElement(class Datetime extends HTMLEle
|
|
|
1309
1308
|
const renderArray = forcePresentation === 'time-date'
|
|
1310
1309
|
? [this.renderTimePickerColumns(forcePresentation), this.renderDatePickerColumns(forcePresentation)]
|
|
1311
1310
|
: [this.renderDatePickerColumns(forcePresentation), this.renderTimePickerColumns(forcePresentation)];
|
|
1312
|
-
return h("ion-picker",
|
|
1311
|
+
return h("ion-picker", null, renderArray);
|
|
1313
1312
|
}
|
|
1314
1313
|
renderDatePickerColumns(forcePresentation) {
|
|
1315
1314
|
return forcePresentation === 'date-time' || forcePresentation === 'time-date'
|
|
@@ -1936,7 +1935,7 @@ const Datetime = /*@__PURE__*/ proxyCustomElement(class Datetime extends HTMLEle
|
|
|
1936
1935
|
const hasDatePresentation = presentation === 'date' || presentation === 'date-time' || presentation === 'time-date';
|
|
1937
1936
|
const hasWheelVariant = hasDatePresentation && preferWheel;
|
|
1938
1937
|
renderHiddenInput(true, el, name, formatValue(value), disabled);
|
|
1939
|
-
return (h(Host, { key: '
|
|
1938
|
+
return (h(Host, { key: '40f8732998d123ef5c700080cc423bb8310654d5', "aria-disabled": disabled ? 'true' : null, onFocus: this.onFocus, onBlur: this.onBlur, class: Object.assign({}, createColorClasses(color, {
|
|
1940
1939
|
[theme]: true,
|
|
1941
1940
|
['datetime-readonly']: readonly,
|
|
1942
1941
|
['datetime-disabled']: disabled,
|
|
@@ -1946,7 +1945,7 @@ const Datetime = /*@__PURE__*/ proxyCustomElement(class Datetime extends HTMLEle
|
|
|
1946
1945
|
[`datetime-size-${size}`]: true,
|
|
1947
1946
|
[`datetime-prefer-wheel`]: hasWheelVariant,
|
|
1948
1947
|
[`datetime-grid`]: isGridStyle,
|
|
1949
|
-
})) }, h("div", { key: '
|
|
1948
|
+
})) }, h("div", { key: '0a323aa4e3cd9c96495d0dc3bf7985c8723f5e8c', class: "intersection-tracker", ref: (el) => (this.intersectionTrackerRef = el) }), this.renderDatetime(theme)));
|
|
1950
1949
|
}
|
|
1951
1950
|
get el() { return this; }
|
|
1952
1951
|
static get watchers() { return {
|
package/components/ion-menu.js
CHANGED
|
@@ -301,9 +301,6 @@ const Menu = /*@__PURE__*/ proxyCustomElement(class Menu extends HTMLElement {
|
|
|
301
301
|
* @param role The role of the element that is closing the menu.
|
|
302
302
|
*/
|
|
303
303
|
setOpen(shouldOpen, animated = true, role) {
|
|
304
|
-
var _a;
|
|
305
|
-
// Blur the active element to prevent it from being kept focused inside an element that will be set with aria-hidden="true"
|
|
306
|
-
(_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.blur();
|
|
307
304
|
return menuController._setOpen(this, shouldOpen, animated, role);
|
|
308
305
|
}
|
|
309
306
|
trapKeyboardFocus(ev, doc) {
|
|
@@ -666,14 +663,14 @@ const Menu = /*@__PURE__*/ proxyCustomElement(class Menu extends HTMLElement {
|
|
|
666
663
|
* the ionBackButton listener in the menu controller
|
|
667
664
|
* will handle closing the menu when Escape is pressed.
|
|
668
665
|
*/
|
|
669
|
-
return (h(Host, { key: '
|
|
666
|
+
return (h(Host, { key: 'b0e4627dc1a53c796913d3da9b7575f0d69086d0', onKeyDown: shouldUseCloseWatcher() ? null : this.onKeydown, role: "navigation", "aria-label": inheritedAttributes['aria-label'] || 'menu', class: {
|
|
670
667
|
[theme]: true,
|
|
671
668
|
[`menu-type-${type}`]: true,
|
|
672
669
|
'menu-enabled': !disabled,
|
|
673
670
|
[`menu-side-${side}`]: true,
|
|
674
671
|
'menu-pane-visible': isPaneVisible,
|
|
675
672
|
'split-pane-side': hostContext('ion-split-pane', el),
|
|
676
|
-
} }, h("div", { key: '
|
|
673
|
+
} }, h("div", { key: '6733a5a84b2bcb8f52fb2bac1c286ab5ac1a9321', class: "menu-inner", part: "container", ref: (el) => (this.menuInnerEl = el) }, h("slot", { key: 'a527ba8092d9eb1ee570f3bdd47c6d4d35cd4dfd' })), h("ion-backdrop", { key: '693c82c16d5110cc08eb651309d092a848329cc1', ref: (el) => (this.backdropEl = el), class: "menu-backdrop", tappable: false, stopPropagation: false, part: "backdrop" })));
|
|
677
674
|
}
|
|
678
675
|
get el() { return this; }
|
|
679
676
|
static get watchers() { return {
|
package/components/overlays.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* (C) Ionic http://ionicframework.com - MIT License
|
|
3
3
|
*/
|
|
4
|
-
import { c as getIonMode, d as doc, O as OVERLAY_BACK_BUTTON_PRIORITY, s as shouldUseCloseWatcher } from './ionic-global.js';
|
|
4
|
+
import { c as getIonMode, d as doc, a as isPlatform, O as OVERLAY_BACK_BUTTON_PRIORITY, s as shouldUseCloseWatcher } from './ionic-global.js';
|
|
5
5
|
import { h as focusVisibleElement, c as componentOnReady, a as addEventListener, b as removeEventListener, g as getElementRoot } from './helpers.js';
|
|
6
6
|
import { c as config, a as printIonError, p as printIonWarning } from './index4.js';
|
|
7
7
|
import { C as CoreDelegate } from './framework-delegate.js';
|
|
@@ -488,17 +488,15 @@ const getPresentedOverlay = (doc, overlayTag, id) => {
|
|
|
488
488
|
*/
|
|
489
489
|
const setRootAriaHidden = (hidden = false) => {
|
|
490
490
|
const root = getAppRoot(document);
|
|
491
|
-
const viewContainer = root.querySelector('ion-router-outlet, #ion-view-container-root');
|
|
491
|
+
const viewContainer = root.querySelector('ion-router-outlet, ion-nav, #ion-view-container-root');
|
|
492
492
|
if (!viewContainer) {
|
|
493
493
|
return;
|
|
494
494
|
}
|
|
495
495
|
if (hidden) {
|
|
496
496
|
viewContainer.setAttribute('aria-hidden', 'true');
|
|
497
|
-
viewContainer.setAttribute('inert', '');
|
|
498
497
|
}
|
|
499
498
|
else {
|
|
500
499
|
viewContainer.removeAttribute('aria-hidden');
|
|
501
|
-
viewContainer.removeAttribute('inert');
|
|
502
500
|
}
|
|
503
501
|
};
|
|
504
502
|
const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation, opts) => {
|
|
@@ -506,17 +504,6 @@ const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation, opts)
|
|
|
506
504
|
if (overlay.presented) {
|
|
507
505
|
return;
|
|
508
506
|
}
|
|
509
|
-
/**
|
|
510
|
-
* When an overlay that steals focus
|
|
511
|
-
* is dismissed, focus should be returned
|
|
512
|
-
* to the element that was focused
|
|
513
|
-
* prior to the overlay opening. Toast
|
|
514
|
-
* does not steal focus and is excluded
|
|
515
|
-
* from returning focus as a result.
|
|
516
|
-
*/
|
|
517
|
-
if (overlay.el.tagName !== 'ION-TOAST') {
|
|
518
|
-
restoreElementFocus(overlay.el);
|
|
519
|
-
}
|
|
520
507
|
/**
|
|
521
508
|
* Due to accessibility guidelines, toasts do not have
|
|
522
509
|
* focus traps.
|
|
@@ -528,6 +515,8 @@ const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation, opts)
|
|
|
528
515
|
setRootAriaHidden(true);
|
|
529
516
|
document.body.classList.add(BACKDROP_NO_SCROLL);
|
|
530
517
|
}
|
|
518
|
+
hideUnderlyingOverlaysFromScreenReaders(overlay.el);
|
|
519
|
+
hideAnimatingOverlayFromScreenReaders(overlay.el);
|
|
531
520
|
overlay.presented = true;
|
|
532
521
|
overlay.willPresent.emit();
|
|
533
522
|
(_a = overlay.willPresentShorthand) === null || _a === void 0 ? void 0 : _a.emit();
|
|
@@ -541,6 +530,17 @@ const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation, opts)
|
|
|
541
530
|
overlay.didPresent.emit();
|
|
542
531
|
(_b = overlay.didPresentShorthand) === null || _b === void 0 ? void 0 : _b.emit();
|
|
543
532
|
}
|
|
533
|
+
/**
|
|
534
|
+
* When an overlay that steals focus
|
|
535
|
+
* is dismissed, focus should be returned
|
|
536
|
+
* to the element that was focused
|
|
537
|
+
* prior to the overlay opening. Toast
|
|
538
|
+
* does not steal focus and is excluded
|
|
539
|
+
* from returning focus as a result.
|
|
540
|
+
*/
|
|
541
|
+
if (overlay.el.tagName !== 'ION-TOAST') {
|
|
542
|
+
restoreElementFocus(overlay.el);
|
|
543
|
+
}
|
|
544
544
|
/**
|
|
545
545
|
* If the focused element is already
|
|
546
546
|
* inside the overlay component then
|
|
@@ -563,7 +563,6 @@ const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation, opts)
|
|
|
563
563
|
* screen readers.
|
|
564
564
|
*/
|
|
565
565
|
overlay.el.removeAttribute('aria-hidden');
|
|
566
|
-
overlay.el.removeAttribute('inert');
|
|
567
566
|
};
|
|
568
567
|
/**
|
|
569
568
|
* When an overlay component is dismissed,
|
|
@@ -580,8 +579,6 @@ const restoreElementFocus = async (overlayEl) => {
|
|
|
580
579
|
if (!previousElement) {
|
|
581
580
|
return;
|
|
582
581
|
}
|
|
583
|
-
// Ensure active element is blurred to prevent a11y warning issues
|
|
584
|
-
previousElement.blur();
|
|
585
582
|
const shadowRoot = previousElement === null || previousElement === void 0 ? void 0 : previousElement.shadowRoot;
|
|
586
583
|
if (shadowRoot) {
|
|
587
584
|
// If there are no inner focusable elements, just focus the host element.
|
|
@@ -645,6 +642,12 @@ const dismiss = async (overlay, data, role, name, iosLeaveAnimation, mdLeaveAnim
|
|
|
645
642
|
}
|
|
646
643
|
overlay.presented = false;
|
|
647
644
|
try {
|
|
645
|
+
/**
|
|
646
|
+
* There is no need to show the overlay to screen readers during
|
|
647
|
+
* the dismiss animation. This is because the overlay will be removed
|
|
648
|
+
* from the DOM after the animation is complete.
|
|
649
|
+
*/
|
|
650
|
+
hideAnimatingOverlayFromScreenReaders(overlay.el);
|
|
648
651
|
// Overlay contents should not be clickable during dismiss
|
|
649
652
|
overlay.el.style.setProperty('pointer-events', 'none');
|
|
650
653
|
overlay.willDismiss.emit({ data, role });
|
|
@@ -683,6 +686,7 @@ const dismiss = async (overlay, data, role, name, iosLeaveAnimation, mdLeaveAnim
|
|
|
683
686
|
printIonError(`[${overlay.el.tagName.toLowerCase()}] - `, err);
|
|
684
687
|
}
|
|
685
688
|
overlay.el.remove();
|
|
689
|
+
revealOverlaysToScreenReaders();
|
|
686
690
|
return true;
|
|
687
691
|
};
|
|
688
692
|
const getAppRoot = (doc) => {
|
|
@@ -879,6 +883,93 @@ const createTriggerController = () => {
|
|
|
879
883
|
removeClickListener,
|
|
880
884
|
};
|
|
881
885
|
};
|
|
886
|
+
/**
|
|
887
|
+
* The overlay that is being animated also needs to hide from screen
|
|
888
|
+
* readers during its animation. This ensures that assistive technologies
|
|
889
|
+
* like TalkBack do not announce or interact with the content until the
|
|
890
|
+
* animation is complete, avoiding confusion for users.
|
|
891
|
+
*
|
|
892
|
+
* When the overlay is presented on an Android device, TalkBack's focus rings
|
|
893
|
+
* may appear in the wrong position due to the transition (specifically
|
|
894
|
+
* `transform` styles). This occurs because the focus rings are initially
|
|
895
|
+
* displayed at the starting position of the elements before the transition
|
|
896
|
+
* begins. This workaround ensures the focus rings do not appear in the
|
|
897
|
+
* incorrect location.
|
|
898
|
+
*
|
|
899
|
+
* If this solution is applied to iOS devices, then it leads to a bug where
|
|
900
|
+
* the overlays cannot be accessed by screen readers. This is due to
|
|
901
|
+
* VoiceOver not being able to update the accessibility tree when the
|
|
902
|
+
* `aria-hidden` is removed.
|
|
903
|
+
*
|
|
904
|
+
* @param overlay - The overlay that is being animated.
|
|
905
|
+
*/
|
|
906
|
+
const hideAnimatingOverlayFromScreenReaders = (overlay) => {
|
|
907
|
+
if (doc === undefined)
|
|
908
|
+
return;
|
|
909
|
+
if (isPlatform('android')) {
|
|
910
|
+
/**
|
|
911
|
+
* Once the animation is complete, this attribute will be removed.
|
|
912
|
+
* This is done at the end of the `present` method.
|
|
913
|
+
*/
|
|
914
|
+
overlay.setAttribute('aria-hidden', 'true');
|
|
915
|
+
}
|
|
916
|
+
};
|
|
917
|
+
/**
|
|
918
|
+
* Ensure that underlying overlays have aria-hidden if necessary so that screen readers
|
|
919
|
+
* cannot move focus to these elements. Note that we cannot rely on focus/focusin/focusout
|
|
920
|
+
* events here because those events do not fire when the screen readers moves to a non-focusable
|
|
921
|
+
* element such as text.
|
|
922
|
+
* Without this logic screen readers would be able to move focus outside of the top focus-trapped overlay.
|
|
923
|
+
*
|
|
924
|
+
* @param newTopMostOverlay - The overlay that is being presented. Since the overlay has not been
|
|
925
|
+
* fully presented yet at the time this function is called it will not be included in the getPresentedOverlays result.
|
|
926
|
+
*/
|
|
927
|
+
const hideUnderlyingOverlaysFromScreenReaders = (newTopMostOverlay) => {
|
|
928
|
+
var _a;
|
|
929
|
+
if (doc === undefined)
|
|
930
|
+
return;
|
|
931
|
+
const overlays = getPresentedOverlays(doc);
|
|
932
|
+
for (let i = overlays.length - 1; i >= 0; i--) {
|
|
933
|
+
const presentedOverlay = overlays[i];
|
|
934
|
+
const nextPresentedOverlay = (_a = overlays[i + 1]) !== null && _a !== void 0 ? _a : newTopMostOverlay;
|
|
935
|
+
/**
|
|
936
|
+
* If next overlay has aria-hidden then all remaining overlays will have it too.
|
|
937
|
+
* Or, if the next overlay is a Toast that does not have aria-hidden then current overlay
|
|
938
|
+
* should not have aria-hidden either so focus can remain in the current overlay.
|
|
939
|
+
*/
|
|
940
|
+
if (nextPresentedOverlay.hasAttribute('aria-hidden') || nextPresentedOverlay.tagName !== 'ION-TOAST') {
|
|
941
|
+
presentedOverlay.setAttribute('aria-hidden', 'true');
|
|
942
|
+
}
|
|
943
|
+
}
|
|
944
|
+
};
|
|
945
|
+
/**
|
|
946
|
+
* When dismissing an overlay we need to reveal the new top-most overlay to screen readers.
|
|
947
|
+
* If the top-most overlay is a Toast we potentially need to reveal more overlays since
|
|
948
|
+
* focus is never automatically moved to the Toast.
|
|
949
|
+
*/
|
|
950
|
+
const revealOverlaysToScreenReaders = () => {
|
|
951
|
+
if (doc === undefined)
|
|
952
|
+
return;
|
|
953
|
+
const overlays = getPresentedOverlays(doc);
|
|
954
|
+
for (let i = overlays.length - 1; i >= 0; i--) {
|
|
955
|
+
const currentOverlay = overlays[i];
|
|
956
|
+
/**
|
|
957
|
+
* If the current we are looking at is a Toast then we can remove aria-hidden.
|
|
958
|
+
* However, we potentially need to keep looking at the overlay stack because there
|
|
959
|
+
* could be more Toasts underneath. Additionally, we need to unhide the closest non-Toast
|
|
960
|
+
* overlay too so focus can move there since focus is never automatically moved to the Toast.
|
|
961
|
+
*/
|
|
962
|
+
currentOverlay.removeAttribute('aria-hidden');
|
|
963
|
+
/**
|
|
964
|
+
* If we found a non-Toast element then we can just remove aria-hidden and stop searching entirely
|
|
965
|
+
* since this overlay should always receive focus. As a result, all underlying overlays should still
|
|
966
|
+
* be hidden from screen readers.
|
|
967
|
+
*/
|
|
968
|
+
if (currentOverlay.tagName !== 'ION-TOAST') {
|
|
969
|
+
break;
|
|
970
|
+
}
|
|
971
|
+
}
|
|
972
|
+
};
|
|
882
973
|
const FOCUS_TRAP_DISABLE_CLASS = 'ion-disable-focus-trap';
|
|
883
974
|
|
|
884
975
|
export { BACKDROP as B, FOCUS_TRAP_DISABLE_CLASS as F, GESTURE as G, OVERLAY_GESTURE_PRIORITY as O, alertController as a, actionSheetController as b, popoverController as c, createDelegateController as d, createTriggerController as e, present as f, dismiss as g, eventMethod as h, isCancel as i, prepareOverlay as j, setOverlayId as k, loadingController as l, modalController as m, focusFirstDescendant as n, getPresentedOverlay as o, pickerController as p, focusLastDescendant as q, safeCall as s, toastController as t };
|
|
@@ -6,11 +6,11 @@ import { d as inheritAttributes } from './helpers.js';
|
|
|
6
6
|
import { c as createColorClasses } from './theme.js';
|
|
7
7
|
import { b as getIonTheme } from './ionic-global.js';
|
|
8
8
|
|
|
9
|
-
const ionicPickerColumnOptionMdCss = "
|
|
9
|
+
const ionicPickerColumnOptionMdCss = "button{padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;width:100%;height:34px;border:0px;outline:none;background:transparent;color:inherit;font-family:var(--ion-font-family, inherit);font-size:inherit;line-height:34px;text-align:inherit;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;overflow:hidden}:host(.option-disabled){opacity:0.4}:host(.option-disabled) button{cursor:default}:host(.option-active){color:var(--ion-color-base)}";
|
|
10
10
|
|
|
11
|
-
const pickerColumnOptionIosCss = "
|
|
11
|
+
const pickerColumnOptionIosCss = "button{padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;width:100%;height:34px;border:0px;outline:none;background:transparent;color:inherit;font-family:var(--ion-font-family, inherit);font-size:inherit;line-height:34px;text-align:inherit;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;overflow:hidden}:host(.option-disabled){opacity:0.4}:host(.option-disabled) button{cursor:default}";
|
|
12
12
|
|
|
13
|
-
const pickerColumnOptionMdCss = "
|
|
13
|
+
const pickerColumnOptionMdCss = "button{padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;width:100%;height:34px;border:0px;outline:none;background:transparent;color:inherit;font-family:var(--ion-font-family, inherit);font-size:inherit;line-height:34px;text-align:inherit;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;overflow:hidden}:host(.option-disabled){opacity:0.4}:host(.option-disabled) button{cursor:default}:host(.option-active){color:var(--ion-color-base)}";
|
|
14
14
|
|
|
15
15
|
const PickerColumnOption = /*@__PURE__*/ proxyCustomElement(class PickerColumnOption extends HTMLElement {
|
|
16
16
|
constructor() {
|
|
@@ -104,7 +104,7 @@ const PickerColumnOption = /*@__PURE__*/ proxyCustomElement(class PickerColumnOp
|
|
|
104
104
|
return (h(Host, { key: '9ceebae71b6df0b01f36691d82d716f6756625d9', class: createColorClasses(color, {
|
|
105
105
|
[theme]: true,
|
|
106
106
|
['option-disabled']: disabled,
|
|
107
|
-
}) }, h("
|
|
107
|
+
}) }, h("button", { key: 'f6b973f486688a74a08b60c09ab41b640e49db6b', tabindex: "-1", "aria-label": ariaLabel, disabled: disabled, onClick: () => this.onClick() }, h("slot", { key: 'ff9607efb6a87c60c9421c32c81612e4650c6862' }))));
|
|
108
108
|
}
|
|
109
109
|
get el() { return this; }
|
|
110
110
|
static get watchers() { return {
|
|
@@ -408,6 +408,23 @@ const PickerColumn = /*@__PURE__*/ proxyCustomElement(class PickerColumn extends
|
|
|
408
408
|
var _a;
|
|
409
409
|
return el ? (_a = el.getAttribute('aria-label')) !== null && _a !== void 0 ? _a : el.innerText : '';
|
|
410
410
|
};
|
|
411
|
+
/**
|
|
412
|
+
* Render an element that overlays the column. This element is for assistive
|
|
413
|
+
* tech to allow users to navigate the column up/down. This element should receive
|
|
414
|
+
* focus as it listens for synthesized keyboard events as required by the
|
|
415
|
+
* slider role: https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/slider_role
|
|
416
|
+
*/
|
|
417
|
+
this.renderAssistiveFocusable = () => {
|
|
418
|
+
const { activeItem } = this;
|
|
419
|
+
const valueText = this.getOptionValueText(activeItem);
|
|
420
|
+
/**
|
|
421
|
+
* When using the picker, the valuetext provides important context that valuenow
|
|
422
|
+
* does not. Additionally, using non-zero valuemin/valuemax values can cause
|
|
423
|
+
* WebKit to incorrectly announce numeric valuetext values (such as a year
|
|
424
|
+
* like "2024") as percentages: https://bugs.webkit.org/show_bug.cgi?id=273126
|
|
425
|
+
*/
|
|
426
|
+
return (h("div", { ref: (el) => (this.assistiveFocusable = el), class: "assistive-focusable", role: "slider", tabindex: this.disabled ? undefined : 0, "aria-label": this.ariaLabel, "aria-valuemin": 0, "aria-valuemax": 0, "aria-valuenow": 0, "aria-valuetext": valueText, "aria-orientation": "vertical", onKeyDown: (ev) => this.onKeyDown(ev) }));
|
|
427
|
+
};
|
|
411
428
|
}
|
|
412
429
|
ariaLabelChanged(newValue) {
|
|
413
430
|
this.ariaLabel = newValue;
|
|
@@ -548,14 +565,33 @@ const PickerColumn = /*@__PURE__*/ proxyCustomElement(class PickerColumn extends
|
|
|
548
565
|
render() {
|
|
549
566
|
const { color, disabled, isActive, numericInput } = this;
|
|
550
567
|
const theme = getIonTheme(this);
|
|
551
|
-
return (h(Host, { key: '
|
|
568
|
+
return (h(Host, { key: '03736b14a79aaadec0f7bdac8b61584bd87ccad0', class: createColorClasses(color, {
|
|
552
569
|
[theme]: true,
|
|
553
570
|
['picker-column-active']: isActive,
|
|
554
571
|
['picker-column-numeric-input']: numericInput,
|
|
555
572
|
['picker-column-disabled']: disabled,
|
|
556
|
-
}) }, h("slot", { key: '
|
|
573
|
+
}) }, this.renderAssistiveFocusable(), h("slot", { key: '68c982ebabe6549bda8473b5e75fe1a2a5bfac02', name: "prefix" }), h("div", { key: '9347af6d92c2743262627f0e22cd2ab6e36697fa', "aria-hidden": "true", class: "picker-opts", ref: (el) => {
|
|
557
574
|
this.scrollEl = el;
|
|
558
|
-
},
|
|
575
|
+
},
|
|
576
|
+
/**
|
|
577
|
+
* When an element has an overlay scroll style and
|
|
578
|
+
* a fixed height, Firefox will focus the scrollable
|
|
579
|
+
* container if the content exceeds the container's
|
|
580
|
+
* dimensions.
|
|
581
|
+
*
|
|
582
|
+
* This causes keyboard navigation to focus to this
|
|
583
|
+
* element instead of going to the next element in
|
|
584
|
+
* the tab order.
|
|
585
|
+
*
|
|
586
|
+
* The desired behavior is for the user to be able to
|
|
587
|
+
* focus the assistive focusable element and tab to
|
|
588
|
+
* the next element in the tab order. Instead of tabbing
|
|
589
|
+
* to this element.
|
|
590
|
+
*
|
|
591
|
+
* To prevent this, we set the tabIndex to -1. This
|
|
592
|
+
* will match the behavior of the other browsers.
|
|
593
|
+
*/
|
|
594
|
+
tabIndex: -1 }, h("div", { key: '48aa739ea118e6c6c92dd32aa669afc8cbc9bbd9', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '4c5acf2374d2ad96c3cc0e927023d2ba8615ce4d', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: 'ae5cad7c4deeb08619d4021dfa1f2ba7d0cd9c09', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("slot", { key: '076bb7a8359908369b56ad8021d812fa0d094f5b' }), h("div", { key: '7cf4d0a8d32a9c304fbdb7469c2a5528b91744b9', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '2c6585e2091abc2b83dc77c419d5a8a4d317f499', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), h("div", { key: '2ee73069dede56b1edc0adfd3037ff0f83389c3e', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0")), h("slot", { key: 'f704bf80e0a0c91d0a50114cba974bbb9d7937d1', name: "suffix" })));
|
|
559
595
|
}
|
|
560
596
|
get el() { return this; }
|
|
561
597
|
static get watchers() { return {
|
|
@@ -19,7 +19,7 @@ import { d as defineCustomElement$3 } from './ripple-effect.js';
|
|
|
19
19
|
import { d as defineCustomElement$2 } from './title.js';
|
|
20
20
|
import { d as defineCustomElement$1 } from './toolbar.js';
|
|
21
21
|
|
|
22
|
-
const selectModalIonicCss = ".sc-ion-select-modal-ionic-h{height:100%}ion-item.sc-ion-select-modal-ionic{--border-width:0}ion-toolbar.sc-ion-select-modal-ionic{font-size:var(--ion-font-size-450, 1.125rem);font-weight:var(--ion-font-weight-medium, 500);letter-spacing:var(--ion-font-letter-spacing-0, 0%);line-height:var(--ion-font-line-height-700, var(--ion-scale-700, 28px));text-decoration:none;text-transform:none}ion-list.sc-ion-select-modal-ionic ion-radio.sc-ion-select-modal-ionic::part(container),ion-list.sc-ion-select-modal-ionic ion-radio.sc-ion-select-modal-ionic [part~=\"container\"]{display:none}ion-list.sc-ion-select-modal-ionic ion-radio.sc-ion-select-modal-ionic::part(label),ion-list.sc-ion-select-modal-ionic ion-radio.sc-ion-select-modal-ionic [part~=\"label\"]{margin-left:0;margin-right:0;margin-top:0;margin-bottom:0}ion-list.sc-ion-select-modal-ionic ion-radio.sc-ion-select-modal-ionic::part(label),ion-list.sc-ion-select-modal-ionic ion-radio.sc-ion-select-modal-ionic [part~=\"label\"],ion-list.sc-ion-select-modal-ionic ion-checkbox.sc-ion-select-modal-ionic::part(label),ion-list.sc-ion-select-modal-ionic ion-checkbox.sc-ion-select-modal-ionic [part~=\"label\"]{font-size:var(--ion-font-size-400, 1rem);font-weight:var(--ion-font-weight-medium, 500);letter-spacing:var(--ion-font-letter-spacing-0, 0%);line-height:var(--ion-font-line-height-600, var(--ion-scale-600, 24px));text-decoration:none;text-transform:none}.item-radio-checked.sc-ion-select-modal-ionic,.item-checkbox-checked.sc-ion-select-modal-ionic{--background:var(--ion-semantics-primary-100, var(--ion-primitives-blue-100, #f2f4fd));--border-radius:var(--ion-border-radius-400, var(--ion-scale-400, 16px))}ion-content.sc-ion-select-modal-ionic{--padding-start:var(--ion-space-400, var(--ion-scale-400, 16px)) !important;--padding-end:var(--ion-space-400, var(--ion-scale-400, 16px)) !important;--padding-bottom:var(--ion-space-1200, var(--ion-scale-1200, 48px)) !important}";
|
|
22
|
+
const selectModalIonicCss = ".sc-ion-select-modal-ionic-h{height:100%}ion-item.sc-ion-select-modal-ionic{--border-width:0}ion-item.ion-focused.sc-ion-select-modal-ionic::part(native)::after,ion-item.ion-focused.sc-ion-select-modal-ionic [part~=\"native\"]::after{border:none}ion-toolbar.sc-ion-select-modal-ionic{font-size:var(--ion-font-size-450, 1.125rem);font-weight:var(--ion-font-weight-medium, 500);letter-spacing:var(--ion-font-letter-spacing-0, 0%);line-height:var(--ion-font-line-height-700, var(--ion-scale-700, 28px));text-decoration:none;text-transform:none}ion-list.sc-ion-select-modal-ionic ion-radio.sc-ion-select-modal-ionic::part(container),ion-list.sc-ion-select-modal-ionic ion-radio.sc-ion-select-modal-ionic [part~=\"container\"]{display:none}ion-list.sc-ion-select-modal-ionic ion-radio.sc-ion-select-modal-ionic::part(label),ion-list.sc-ion-select-modal-ionic ion-radio.sc-ion-select-modal-ionic [part~=\"label\"]{margin-left:0;margin-right:0;margin-top:0;margin-bottom:0}ion-list.sc-ion-select-modal-ionic ion-radio.sc-ion-select-modal-ionic::part(label),ion-list.sc-ion-select-modal-ionic ion-radio.sc-ion-select-modal-ionic [part~=\"label\"],ion-list.sc-ion-select-modal-ionic ion-checkbox.sc-ion-select-modal-ionic::part(label),ion-list.sc-ion-select-modal-ionic ion-checkbox.sc-ion-select-modal-ionic [part~=\"label\"]{font-size:var(--ion-font-size-400, 1rem);font-weight:var(--ion-font-weight-medium, 500);letter-spacing:var(--ion-font-letter-spacing-0, 0%);line-height:var(--ion-font-line-height-600, var(--ion-scale-600, 24px));text-decoration:none;text-transform:none}.item-radio-checked.sc-ion-select-modal-ionic,.item-checkbox-checked.sc-ion-select-modal-ionic{--background:var(--ion-semantics-primary-100, var(--ion-primitives-blue-100, #f2f4fd));--border-radius:var(--ion-border-radius-400, var(--ion-scale-400, 16px))}ion-content.sc-ion-select-modal-ionic{--padding-start:var(--ion-space-400, var(--ion-scale-400, 16px)) !important;--padding-end:var(--ion-space-400, var(--ion-scale-400, 16px)) !important;--padding-bottom:var(--ion-space-1200, var(--ion-scale-1200, 48px)) !important}";
|
|
23
23
|
|
|
24
24
|
const selectModalIosCss = ".sc-ion-select-modal-ios-h{height:100%}ion-item.sc-ion-select-modal-ios{--inner-padding-end:0}ion-radio.sc-ion-select-modal-ios::after{bottom:0;position:absolute;width:calc(100% - 0.9375rem - 16px);border-width:0px 0px 0.55px 0px;border-style:solid;border-color:var(--ion-item-border-color, var(--ion-border-color, var(--ion-color-step-250, var(--ion-background-color-step-250, #c8c7cc))));content:\"\"}ion-radio.sc-ion-select-modal-ios::after{inset-inline-start:calc(0.9375rem + 16px)}";
|
|
25
25
|
|
package/dist/cjs/index.cjs.js
CHANGED
|
@@ -15,7 +15,7 @@ var index$2 = require('./index-DNh170BW.js');
|
|
|
15
15
|
var config = require('./config-CKhELRRu.js');
|
|
16
16
|
var theme = require('./theme-CeDs6Hcv.js');
|
|
17
17
|
var index$3 = require('./index-DgkpUJvi.js');
|
|
18
|
-
var overlays = require('./overlays-
|
|
18
|
+
var overlays = require('./overlays-cmlYi6Sc.js');
|
|
19
19
|
require('./gesture-controller-dtqlP_q4.js');
|
|
20
20
|
require('./focus-visible-BIj-I3-C.js');
|
|
21
21
|
require('./framework-delegate-D94PxJL6.js');
|
|
@@ -7,7 +7,7 @@ var index = require('./index-DNh170BW.js');
|
|
|
7
7
|
var buttonActive = require('./button-active-BcEaeF5Y.js');
|
|
8
8
|
var helpers = require('./helpers-CYFB2_7O.js');
|
|
9
9
|
var lockController = require('./lock-controller-aDB9wrEf.js');
|
|
10
|
-
var overlays = require('./overlays-
|
|
10
|
+
var overlays = require('./overlays-cmlYi6Sc.js');
|
|
11
11
|
var theme = require('./theme-CeDs6Hcv.js');
|
|
12
12
|
var ionicGlobal = require('./ionic-global-RZLbse4y.js');
|
|
13
13
|
var animation = require('./animation-BXRtNUgm.js');
|
|
@@ -8,7 +8,7 @@ var config = require('./config-CKhELRRu.js');
|
|
|
8
8
|
var buttonActive = require('./button-active-BcEaeF5Y.js');
|
|
9
9
|
var helpers = require('./helpers-CYFB2_7O.js');
|
|
10
10
|
var lockController = require('./lock-controller-aDB9wrEf.js');
|
|
11
|
-
var overlays = require('./overlays-
|
|
11
|
+
var overlays = require('./overlays-cmlYi6Sc.js');
|
|
12
12
|
var theme = require('./theme-CeDs6Hcv.js');
|
|
13
13
|
var ionicGlobal = require('./ionic-global-RZLbse4y.js');
|
|
14
14
|
var animation = require('./animation-BXRtNUgm.js');
|
|
@@ -8,13 +8,13 @@ var caretLeft = require('./caret-left-CxZXLRv5.js');
|
|
|
8
8
|
var caretRight = require('./caret-right-CRCgv98E.js');
|
|
9
9
|
var focusVisible = require('./focus-visible-BIj-I3-C.js');
|
|
10
10
|
var helpers = require('./helpers-CYFB2_7O.js');
|
|
11
|
-
var overlays = require('./overlays-Di-PotkY.js');
|
|
12
11
|
var dir = require('./dir-Cn0z1rJH.js');
|
|
13
12
|
var theme = require('./theme-CeDs6Hcv.js');
|
|
14
13
|
var index$1 = require('./index-DqmRDbxg.js');
|
|
15
14
|
var ionicGlobal = require('./ionic-global-RZLbse4y.js');
|
|
16
15
|
var data = require('./data-Crxp8jrQ.js');
|
|
17
16
|
var lockController = require('./lock-controller-aDB9wrEf.js');
|
|
17
|
+
var overlays = require('./overlays-cmlYi6Sc.js');
|
|
18
18
|
var animation = require('./animation-BXRtNUgm.js');
|
|
19
19
|
var haptic = require('./haptic-r0GBrUII.js');
|
|
20
20
|
require('./framework-delegate-D94PxJL6.js');
|
|
@@ -1305,7 +1305,7 @@ const Datetime = class {
|
|
|
1305
1305
|
const renderArray = forcePresentation === 'time-date'
|
|
1306
1306
|
? [this.renderTimePickerColumns(forcePresentation), this.renderDatePickerColumns(forcePresentation)]
|
|
1307
1307
|
: [this.renderDatePickerColumns(forcePresentation), this.renderTimePickerColumns(forcePresentation)];
|
|
1308
|
-
return index.h("ion-picker",
|
|
1308
|
+
return index.h("ion-picker", null, renderArray);
|
|
1309
1309
|
}
|
|
1310
1310
|
renderDatePickerColumns(forcePresentation) {
|
|
1311
1311
|
return forcePresentation === 'date-time' || forcePresentation === 'time-date'
|
|
@@ -1932,7 +1932,7 @@ const Datetime = class {
|
|
|
1932
1932
|
const hasDatePresentation = presentation === 'date' || presentation === 'date-time' || presentation === 'time-date';
|
|
1933
1933
|
const hasWheelVariant = hasDatePresentation && preferWheel;
|
|
1934
1934
|
helpers.renderHiddenInput(true, el, name, data.formatValue(value), disabled);
|
|
1935
|
-
return (index.h(index.Host, { key: '
|
|
1935
|
+
return (index.h(index.Host, { key: '40f8732998d123ef5c700080cc423bb8310654d5', "aria-disabled": disabled ? 'true' : null, onFocus: this.onFocus, onBlur: this.onBlur, class: Object.assign({}, theme.createColorClasses(color, {
|
|
1936
1936
|
[theme$1]: true,
|
|
1937
1937
|
['datetime-readonly']: readonly,
|
|
1938
1938
|
['datetime-disabled']: disabled,
|
|
@@ -1942,7 +1942,7 @@ const Datetime = class {
|
|
|
1942
1942
|
[`datetime-size-${size}`]: true,
|
|
1943
1943
|
[`datetime-prefer-wheel`]: hasWheelVariant,
|
|
1944
1944
|
[`datetime-grid`]: isGridStyle,
|
|
1945
|
-
})) }, index.h("div", { key: '
|
|
1945
|
+
})) }, index.h("div", { key: '0a323aa4e3cd9c96495d0dc3bf7985c8723f5e8c', class: "intersection-tracker", ref: (el) => (this.intersectionTrackerRef = el) }), this.renderDatetime(theme$1)));
|
|
1946
1946
|
}
|
|
1947
1947
|
get el() { return index.getElement(this); }
|
|
1948
1948
|
static get watchers() { return {
|
|
@@ -7,7 +7,7 @@ var index = require('./index-DNh170BW.js');
|
|
|
7
7
|
var config = require('./config-CKhELRRu.js');
|
|
8
8
|
var helpers = require('./helpers-CYFB2_7O.js');
|
|
9
9
|
var lockController = require('./lock-controller-aDB9wrEf.js');
|
|
10
|
-
var overlays = require('./overlays-
|
|
10
|
+
var overlays = require('./overlays-cmlYi6Sc.js');
|
|
11
11
|
var theme = require('./theme-CeDs6Hcv.js');
|
|
12
12
|
var ionicGlobal = require('./ionic-global-RZLbse4y.js');
|
|
13
13
|
var animation = require('./animation-BXRtNUgm.js');
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
|
|
6
6
|
var index = require('./index-DNh170BW.js');
|
|
7
7
|
var cubicBezier = require('./cubic-bezier-DAjy1V-e.js');
|
|
8
|
-
var overlays = require('./overlays-
|
|
8
|
+
var overlays = require('./overlays-cmlYi6Sc.js');
|
|
9
9
|
var gestureController = require('./gesture-controller-dtqlP_q4.js');
|
|
10
10
|
var ionicGlobal = require('./ionic-global-RZLbse4y.js');
|
|
11
11
|
var helpers = require('./helpers-CYFB2_7O.js');
|
|
@@ -301,9 +301,6 @@ const Menu = class {
|
|
|
301
301
|
* @param role The role of the element that is closing the menu.
|
|
302
302
|
*/
|
|
303
303
|
setOpen(shouldOpen, animated = true, role) {
|
|
304
|
-
var _a;
|
|
305
|
-
// Blur the active element to prevent it from being kept focused inside an element that will be set with aria-hidden="true"
|
|
306
|
-
(_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.blur();
|
|
307
304
|
return index$1.menuController._setOpen(this, shouldOpen, animated, role);
|
|
308
305
|
}
|
|
309
306
|
trapKeyboardFocus(ev, doc) {
|
|
@@ -666,14 +663,14 @@ const Menu = class {
|
|
|
666
663
|
* the ionBackButton listener in the menu controller
|
|
667
664
|
* will handle closing the menu when Escape is pressed.
|
|
668
665
|
*/
|
|
669
|
-
return (index.h(index.Host, { key: '
|
|
666
|
+
return (index.h(index.Host, { key: 'b0e4627dc1a53c796913d3da9b7575f0d69086d0', onKeyDown: ionicGlobal.shouldUseCloseWatcher() ? null : this.onKeydown, role: "navigation", "aria-label": inheritedAttributes['aria-label'] || 'menu', class: {
|
|
670
667
|
[theme$1]: true,
|
|
671
668
|
[`menu-type-${type}`]: true,
|
|
672
669
|
'menu-enabled': !disabled,
|
|
673
670
|
[`menu-side-${side}`]: true,
|
|
674
671
|
'menu-pane-visible': isPaneVisible,
|
|
675
672
|
'split-pane-side': theme.hostContext('ion-split-pane', el),
|
|
676
|
-
} }, index.h("div", { key: '
|
|
673
|
+
} }, index.h("div", { key: '6733a5a84b2bcb8f52fb2bac1c286ab5ac1a9321', class: "menu-inner", part: "container", ref: (el) => (this.menuInnerEl = el) }, index.h("slot", { key: 'a527ba8092d9eb1ee570f3bdd47c6d4d35cd4dfd' })), index.h("ion-backdrop", { key: '693c82c16d5110cc08eb651309d092a848329cc1', ref: (el) => (this.backdropEl = el), class: "menu-backdrop", tappable: false, stopPropagation: false, part: "backdrop" })));
|
|
677
674
|
}
|
|
678
675
|
get el() { return index.getElement(this); }
|
|
679
676
|
static get watchers() { return {
|
|
@@ -9,7 +9,7 @@ var frameworkDelegate = require('./framework-delegate-D94PxJL6.js');
|
|
|
9
9
|
var helpers = require('./helpers-CYFB2_7O.js');
|
|
10
10
|
var lockController = require('./lock-controller-aDB9wrEf.js');
|
|
11
11
|
var capacitor = require('./capacitor-CVcQYFDK.js');
|
|
12
|
-
var overlays = require('./overlays-
|
|
12
|
+
var overlays = require('./overlays-cmlYi6Sc.js');
|
|
13
13
|
var theme = require('./theme-CeDs6Hcv.js');
|
|
14
14
|
var index$3 = require('./index-DkmXWuZ7.js');
|
|
15
15
|
var ionicGlobal = require('./ionic-global-RZLbse4y.js');
|
|
@@ -9,11 +9,11 @@ var theme = require('./theme-CeDs6Hcv.js');
|
|
|
9
9
|
var ionicGlobal = require('./ionic-global-RZLbse4y.js');
|
|
10
10
|
require('./focus-visible-BIj-I3-C.js');
|
|
11
11
|
|
|
12
|
-
const ionicPickerColumnOptionMdCss = "
|
|
12
|
+
const ionicPickerColumnOptionMdCss = "button{padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;width:100%;height:34px;border:0px;outline:none;background:transparent;color:inherit;font-family:var(--ion-font-family, inherit);font-size:inherit;line-height:34px;text-align:inherit;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;overflow:hidden}:host(.option-disabled){opacity:0.4}:host(.option-disabled) button{cursor:default}:host(.option-active){color:var(--ion-color-base)}";
|
|
13
13
|
|
|
14
|
-
const pickerColumnOptionIosCss = "
|
|
14
|
+
const pickerColumnOptionIosCss = "button{padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;width:100%;height:34px;border:0px;outline:none;background:transparent;color:inherit;font-family:var(--ion-font-family, inherit);font-size:inherit;line-height:34px;text-align:inherit;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;overflow:hidden}:host(.option-disabled){opacity:0.4}:host(.option-disabled) button{cursor:default}";
|
|
15
15
|
|
|
16
|
-
const pickerColumnOptionMdCss = "
|
|
16
|
+
const pickerColumnOptionMdCss = "button{padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;margin-left:0;margin-right:0;margin-top:0;margin-bottom:0;width:100%;height:34px;border:0px;outline:none;background:transparent;color:inherit;font-family:var(--ion-font-family, inherit);font-size:inherit;line-height:34px;text-align:inherit;text-overflow:ellipsis;white-space:nowrap;cursor:pointer;overflow:hidden}:host(.option-disabled){opacity:0.4}:host(.option-disabled) button{cursor:default}:host(.option-active){color:var(--ion-color-base)}";
|
|
17
17
|
|
|
18
18
|
const PickerColumnOption = class {
|
|
19
19
|
constructor(hostRef) {
|
|
@@ -105,7 +105,7 @@ const PickerColumnOption = class {
|
|
|
105
105
|
return (index.h(index.Host, { key: '9ceebae71b6df0b01f36691d82d716f6756625d9', class: theme.createColorClasses(color, {
|
|
106
106
|
[theme$1]: true,
|
|
107
107
|
['option-disabled']: disabled,
|
|
108
|
-
}) }, index.h("
|
|
108
|
+
}) }, index.h("button", { key: 'f6b973f486688a74a08b60c09ab41b640e49db6b', tabindex: "-1", "aria-label": ariaLabel, disabled: disabled, onClick: () => this.onClick() }, index.h("slot", { key: 'ff9607efb6a87c60c9421c32c81612e4650c6862' }))));
|
|
109
109
|
}
|
|
110
110
|
get el() { return index.getElement(this); }
|
|
111
111
|
static get watchers() { return {
|
|
@@ -410,6 +410,23 @@ const PickerColumn = class {
|
|
|
410
410
|
var _a;
|
|
411
411
|
return el ? (_a = el.getAttribute('aria-label')) !== null && _a !== void 0 ? _a : el.innerText : '';
|
|
412
412
|
};
|
|
413
|
+
/**
|
|
414
|
+
* Render an element that overlays the column. This element is for assistive
|
|
415
|
+
* tech to allow users to navigate the column up/down. This element should receive
|
|
416
|
+
* focus as it listens for synthesized keyboard events as required by the
|
|
417
|
+
* slider role: https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/slider_role
|
|
418
|
+
*/
|
|
419
|
+
this.renderAssistiveFocusable = () => {
|
|
420
|
+
const { activeItem } = this;
|
|
421
|
+
const valueText = this.getOptionValueText(activeItem);
|
|
422
|
+
/**
|
|
423
|
+
* When using the picker, the valuetext provides important context that valuenow
|
|
424
|
+
* does not. Additionally, using non-zero valuemin/valuemax values can cause
|
|
425
|
+
* WebKit to incorrectly announce numeric valuetext values (such as a year
|
|
426
|
+
* like "2024") as percentages: https://bugs.webkit.org/show_bug.cgi?id=273126
|
|
427
|
+
*/
|
|
428
|
+
return (index.h("div", { ref: (el) => (this.assistiveFocusable = el), class: "assistive-focusable", role: "slider", tabindex: this.disabled ? undefined : 0, "aria-label": this.ariaLabel, "aria-valuemin": 0, "aria-valuemax": 0, "aria-valuenow": 0, "aria-valuetext": valueText, "aria-orientation": "vertical", onKeyDown: (ev) => this.onKeyDown(ev) }));
|
|
429
|
+
};
|
|
413
430
|
}
|
|
414
431
|
ariaLabelChanged(newValue) {
|
|
415
432
|
this.ariaLabel = newValue;
|
|
@@ -550,14 +567,33 @@ const PickerColumn = class {
|
|
|
550
567
|
render() {
|
|
551
568
|
const { color, disabled, isActive, numericInput } = this;
|
|
552
569
|
const theme$1 = ionicGlobal.getIonTheme(this);
|
|
553
|
-
return (index.h(index.Host, { key: '
|
|
570
|
+
return (index.h(index.Host, { key: '03736b14a79aaadec0f7bdac8b61584bd87ccad0', class: theme.createColorClasses(color, {
|
|
554
571
|
[theme$1]: true,
|
|
555
572
|
['picker-column-active']: isActive,
|
|
556
573
|
['picker-column-numeric-input']: numericInput,
|
|
557
574
|
['picker-column-disabled']: disabled,
|
|
558
|
-
}) }, index.h("slot", { key: '
|
|
575
|
+
}) }, this.renderAssistiveFocusable(), index.h("slot", { key: '68c982ebabe6549bda8473b5e75fe1a2a5bfac02', name: "prefix" }), index.h("div", { key: '9347af6d92c2743262627f0e22cd2ab6e36697fa', "aria-hidden": "true", class: "picker-opts", ref: (el) => {
|
|
559
576
|
this.scrollEl = el;
|
|
560
|
-
},
|
|
577
|
+
},
|
|
578
|
+
/**
|
|
579
|
+
* When an element has an overlay scroll style and
|
|
580
|
+
* a fixed height, Firefox will focus the scrollable
|
|
581
|
+
* container if the content exceeds the container's
|
|
582
|
+
* dimensions.
|
|
583
|
+
*
|
|
584
|
+
* This causes keyboard navigation to focus to this
|
|
585
|
+
* element instead of going to the next element in
|
|
586
|
+
* the tab order.
|
|
587
|
+
*
|
|
588
|
+
* The desired behavior is for the user to be able to
|
|
589
|
+
* focus the assistive focusable element and tab to
|
|
590
|
+
* the next element in the tab order. Instead of tabbing
|
|
591
|
+
* to this element.
|
|
592
|
+
*
|
|
593
|
+
* To prevent this, we set the tabIndex to -1. This
|
|
594
|
+
* will match the behavior of the other browsers.
|
|
595
|
+
*/
|
|
596
|
+
tabIndex: -1 }, index.h("div", { key: '48aa739ea118e6c6c92dd32aa669afc8cbc9bbd9', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), index.h("div", { key: '4c5acf2374d2ad96c3cc0e927023d2ba8615ce4d', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), index.h("div", { key: 'ae5cad7c4deeb08619d4021dfa1f2ba7d0cd9c09', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), index.h("slot", { key: '076bb7a8359908369b56ad8021d812fa0d094f5b' }), index.h("div", { key: '7cf4d0a8d32a9c304fbdb7469c2a5528b91744b9', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), index.h("div", { key: '2c6585e2091abc2b83dc77c419d5a8a4d317f499', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0"), index.h("div", { key: '2ee73069dede56b1edc0adfd3037ff0f83389c3e', class: "picker-item-empty", "aria-hidden": "true" }, "\u00A0")), index.h("slot", { key: 'f704bf80e0a0c91d0a50114cba974bbb9d7937d1', name: "suffix" })));
|
|
561
597
|
}
|
|
562
598
|
get el() { return index.getElement(this); }
|
|
563
599
|
static get watchers() { return {
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
'use strict';
|
|
5
5
|
|
|
6
6
|
var index = require('./index-DNh170BW.js');
|
|
7
|
-
var overlays = require('./overlays-
|
|
7
|
+
var overlays = require('./overlays-cmlYi6Sc.js');
|
|
8
8
|
var frameworkDelegate = require('./framework-delegate-D94PxJL6.js');
|
|
9
9
|
var helpers = require('./helpers-CYFB2_7O.js');
|
|
10
10
|
var lockController = require('./lock-controller-aDB9wrEf.js');
|