@ionic/core 8.7.17-dev.11771359170.1fda0949 → 8.7.17-dev.11771865171.14f4c2cf

package/dist/collection/components/range/range.js

@@ -17,13 +17,30 @@ import { roundToMaxDecimalPlaces } from "../../utils/floating-point";
  * @slot start - Content is placed to the left of the range slider in LTR, and to the right in RTL.
  * @slot end - Content is placed to the right of the range slider in LTR, and to the left in RTL.
  *
+ * @part label - The label text describing the range.
  * @part tick - An inactive tick mark.
  * @part tick-active - An active tick mark.
- * @part pin - The counter that appears above a knob.
- * @part knob - The handle that is used to drag the range.
  * @part bar - The inactive part of the bar.
  * @part bar-active - The active part of the bar.
- * @part label - The label text describing the range.
+ * @part knob-handle - The container element that wraps the knob and handles drag interactions.
+ * @part knob-handle-a - The container element for the first knob. Only available when `dualKnobs` is `true`.
+ * @part knob-handle-b - The container element for the second knob. Only available when `dualKnobs` is `true`.
+ * @part knob-handle-lower - The container element for the lower knob. Only available when `dualKnobs` is `true`.
+ * @part knob-handle-upper - The container element for the upper knob. Only available when `dualKnobs` is `true`.
+ * @part pin - The counter that appears above a knob.
+ * @part pin-a - The counter that appears above the first knob. Only available when `dualKnobs` is `true`.
+ * @part pin-b - The counter that appears above the second knob. Only available when `dualKnobs` is `true`.
+ * @part pin-lower - The counter that appears above the lower knob. Only available when `dualKnobs` is `true`.
+ * @part pin-upper - The counter that appears above the upper knob. Only available when `dualKnobs` is `true`.
+ * @part knob - The visual knob element that appears on the range track.
+ * @part knob-a - The visual knob element for the first knob. Only available when `dualKnobs` is `true`.
+ * @part knob-b - The visual knob element for the second knob. Only available when `dualKnobs` is `true`.
+ * @part knob-lower - The visual knob element for the lower knob. Only available when `dualKnobs` is `true`.
+ * @part knob-upper - The visual knob element for the upper knob. Only available when `dualKnobs` is `true`.
+ * @part activated - Added to the knob-handle, knob, and pin when the knob is activated (has the `ion-activated` class). Only one set has this part at a time when `dualKnobs` is `true`.
+ * @part focused - Added to the knob-handle, knob, and pin that currently has focus. Only one set has this part at a time when `dualKnobs` is `true`.
+ * @part hover - Added to the knob-handle, knob, and pin when the knob has hover. Only one set has this part at a time when `dualKnobs` is `true`.
+ * @part pressed - Added to the knob-handle, knob, and pin that is currently being pressed to drag. Only one set has this part at a time when `dualKnobs` is `true`.
  */
 export class Range {
     constructor() {
@@ -34,6 +51,7 @@ export class Range {
         this.inheritedAttributes = {};
         this.contentEl = null;
         this.initialContentScrollY = true;
+        this.focusFromPointer = false;
         this.ratioA = 0;
         this.ratioB = 0;
         /**
@@ -143,6 +161,29 @@ export class Range {
                 this.gesture.enable(!this.disabled);
             }
         };
+        /**
+         * Observes the knob handles for the ion-activated class and syncs
+         * activatedKnob so the activated part is correctly set on the handle,
+         * knob, and pin.
+         */
+        this.setupActivatedObserver = () => {
+            const knobHandleA = this.el.shadowRoot.querySelector('.range-knob-handle-a');
+            const knobHandleB = this.el.shadowRoot.querySelector('.range-knob-handle-b');
+            const syncActivated = () => {
+                this.activatedKnob = (knobHandleA === null || knobHandleA === void 0 ? void 0 : knobHandleA.classList.contains('ion-activated'))
+                    ? 'A'
+                    : (knobHandleB === null || knobHandleB === void 0 ? void 0 : knobHandleB.classList.contains('ion-activated'))
+                        ? 'B'
+                        : undefined;
+            };
+            this.activatedObserver = new MutationObserver(syncActivated);
+            this.activatedObserver.observe(this.el.shadowRoot, {
+                attributes: true,
+                attributeFilter: ['class'],
+                subtree: true,
+            });
+            syncActivated();
+        };
         this.handleKeyboard = (knob, isIncrease) => {
             const { ensureValueInBounds } = this;
             let step = this.step;
@@ -165,6 +206,7 @@ export class Range {
         this.onBlur = () => {
             if (this.hasFocus) {
                 this.hasFocus = false;
+                this.focusedKnob = undefined;
                 this.ionBlur.emit();
             }
         };
@@ -175,21 +217,20 @@ export class Range {
             }
         };
         this.onKnobFocus = (knob) => {
+            // Clicking focuses the range which is needed for the keyboard,
+            // but we only want to add the ion-focused class when focused via Tab.
+            if (!this.focusFromPointer) {
+                this.focusedKnob = knob;
+            }
+            else {
+                this.focusFromPointer = false;
+                this.focusedKnob = undefined;
+            }
+            // If the knob was not already focused, emit the focus event
             if (!this.hasFocus) {
                 this.hasFocus = true;
                 this.ionFocus.emit();
             }
-            // Manually manage ion-focused class for dual knobs
-            if (this.dualKnobs && this.el.shadowRoot) {
-                const knobA = this.el.shadowRoot.querySelector('.range-knob-a');
-                const knobB = this.el.shadowRoot.querySelector('.range-knob-b');
-                // Remove ion-focused from both knobs first
-                knobA === null || knobA === void 0 ? void 0 : knobA.classList.remove('ion-focused');
-                knobB === null || knobB === void 0 ? void 0 : knobB.classList.remove('ion-focused');
-                // Add ion-focused only to the focused knob
-                const focusedKnobEl = knob === 'A' ? knobA : knobB;
-                focusedKnobEl === null || focusedKnobEl === void 0 ? void 0 : focusedKnobEl.classList.add('ion-focused');
-            }
         };
         this.onKnobBlur = () => {
             // Check if focus is moving to another knob within the same range
@@ -201,18 +242,18 @@ export class Range {
                 if (!isStillFocusedOnKnob) {
                     if (this.hasFocus) {
                         this.hasFocus = false;
+                        this.focusedKnob = undefined;
                         this.ionBlur.emit();
                     }
-                    // Remove ion-focused from both knobs when focus leaves the range
-                    if (this.dualKnobs && this.el.shadowRoot) {
-                        const knobA = this.el.shadowRoot.querySelector('.range-knob-a');
-                        const knobB = this.el.shadowRoot.querySelector('.range-knob-b');
-                        knobA === null || knobA === void 0 ? void 0 : knobA.classList.remove('ion-focused');
-                        knobB === null || knobB === void 0 ? void 0 : knobB.classList.remove('ion-focused');
-                    }
                 }
             }, 0);
         };
+        this.onKnobMouseEnter = (knob) => {
+            this.hoveredKnob = knob;
+        };
+        this.onKnobMouseLeave = () => {
+            this.hoveredKnob = undefined;
+        };
     }
     debounceChanged() {
         const { ionInput, debounce, originalIonInput } = this;
@@ -289,6 +330,7 @@ export class Range {
         this.originalIonInput = this.ionInput;
         this.setupGesture();
         this.updateRatio();
+        this.setupActivatedObserver();
         this.didLoad = true;
     }
     connectedCallback() {
@@ -314,6 +356,10 @@ export class Range {
             this.gesture.destroy();
             this.gesture = undefined;
         }
+        if (this.activatedObserver) {
+            this.activatedObserver.disconnect();
+            this.activatedObserver = undefined;
+        }
     }
     getValue() {
         var _a;
@@ -466,7 +512,6 @@ export class Range {
             ratio = 1 - ratio;
         }
         this.pressedKnob = !this.dualKnobs || Math.abs(this.ratioA - ratio) < Math.abs(this.ratioB - ratio) ? 'A' : 'B';
-        this.setFocus(this.pressedKnob);
     }
     get valA() {
         return ratioToValue(this.ratioA, this.min, this.max, this.step);
@@ -493,9 +538,23 @@ export class Range {
     updateRatio() {
         const value = this.getValue();
         const { min, max } = this;
+        /**
+         * For dual knobs, value gives lower/upper but not which is A vs B.
+         * Assign (lowerRatio, upperRatio) to (ratioA, ratioB) in the way that
+         * minimizes change from the current ratios so the knobs don't swap.
+         */
         if (this.dualKnobs) {
-            this.ratioA = valueToRatio(value.lower, min, max);
-            this.ratioB = valueToRatio(value.upper, min, max);
+            const lowerRatio = valueToRatio(value.lower, min, max);
+            const upperRatio = valueToRatio(value.upper, min, max);
+            if (Math.abs(this.ratioA - lowerRatio) + Math.abs(this.ratioB - upperRatio) <=
+                Math.abs(this.ratioA - upperRatio) + Math.abs(this.ratioB - lowerRatio)) {
+                this.ratioA = lowerRatio;
+                this.ratioB = upperRatio;
+            }
+            else {
+                this.ratioA = upperRatio;
+                this.ratioB = lowerRatio;
+            }
         }
         else {
             this.ratioA = valueToRatio(value, min, max);
@@ -512,14 +571,6 @@ export class Range {
             };
         this.noUpdate = false;
     }
-    setFocus(knob) {
-        if (this.el.shadowRoot) {
-            const knobEl = this.el.shadowRoot.querySelector(knob === 'A' ? '.range-knob-a' : '.range-knob-b');
-            if (knobEl) {
-                knobEl.focus();
-            }
-        }
-    }
     /**
      * Returns true if content was passed to the "start" slot
      */
@@ -537,7 +588,7 @@ export class Range {
     }
     renderRangeSlider() {
         var _a;
-        const { min, max, step, handleKeyboard, pressedKnob, disabled, pin, ratioLower, ratioUpper, pinFormatter, inheritedAttributes, } = this;
+        const { min, max, step, handleKeyboard, activatedKnob, focusedKnob, hoveredKnob, pressedKnob, disabled, pin, ratioLower, ratioUpper, pinFormatter, inheritedAttributes, } = this;
         let barStart = `${ratioLower * 100}%`;
         let barEnd = `${100 - ratioUpper * 100}%`;
         const rtl = isRTL(this.el);
@@ -597,7 +648,9 @@ export class Range {
                 ticks.push(tick);
             }
         }
-        return (h("div", { class: "range-slider", ref: (rangeEl) => (this.rangeSlider = rangeEl),
+        return (h("div", { class: "range-slider", ref: (rangeEl) => (this.rangeSlider = rangeEl), onPointerDown: () => {
+                this.focusFromPointer = true;
+            },
             /**
              * Since the gesture has a threshold, the value
              * won't change until the user has dragged past
@@ -610,6 +663,7 @@ export class Range {
              * we need to listen for the "pointerUp" event.
              */
             onPointerUp: (ev) => {
+                this.focusFromPointer = false;
                 /**
                  * If the user drags the knob on the web
                  * version (does not occur on mobile),
@@ -635,6 +689,11 @@ export class Range {
                 'has-ticks': ticks.length > 0,
             }, role: "presentation", style: barStyle, part: "bar-active" })), renderKnob(rtl, {
             knob: 'A',
+            position: getKnobPosition('A', this.ratioA, this.ratioB, this.dualKnobs),
+            dualKnobs: this.dualKnobs,
+            activated: activatedKnob === 'A',
+            focused: focusedKnob === 'A',
+            hovered: hoveredKnob === 'A',
             pressed: pressedKnob === 'A',
             value: this.valA,
             ratio: this.ratioA,
@@ -647,9 +706,16 @@ export class Range {
             inheritedAttributes,
             onKnobFocus: this.onKnobFocus,
             onKnobBlur: this.onKnobBlur,
+            onKnobMouseEnter: this.onKnobMouseEnter,
+            onKnobMouseLeave: this.onKnobMouseLeave,
         }), this.dualKnobs &&
             renderKnob(rtl, {
                 knob: 'B',
+                position: getKnobPosition('B', this.ratioA, this.ratioB, this.dualKnobs),
+                dualKnobs: this.dualKnobs,
+                activated: activatedKnob === 'B',
+                focused: focusedKnob === 'B',
+                hovered: hoveredKnob === 'B',
                 pressed: pressedKnob === 'B',
                 value: this.valB,
                 ratio: this.ratioB,
@@ -662,6 +728,8 @@ export class Range {
                 inheritedAttributes,
                 onKnobFocus: this.onKnobFocus,
                 onKnobBlur: this.onKnobBlur,
+                onKnobMouseEnter: this.onKnobMouseEnter,
+                onKnobMouseLeave: this.onKnobMouseLeave,
             })));
     }
     render() {
@@ -680,6 +748,12 @@ export class Range {
         const hasEndContent = (hasLabel && labelPlacement === 'end') || this.hasEndSlotContent;
         const needsEndAdjustment = inItem && !hasEndContent;
         const mode = getIonMode(this);
+        /**
+         * Determine the name and position of the pressed knob to apply
+         * Host classes for styling.
+         */
+        const pressedKnobName = dualKnobs ? pressedKnob === null || pressedKnob === void 0 ? void 0 : pressedKnob.toLowerCase() : undefined;
+        const pressedKnobPosition = dualKnobs && pressedKnob ? getKnobPosition(pressedKnob, this.ratioA, this.ratioB, dualKnobs) : undefined;
         /**
          * Determine if any knob is at the min or max value to
          * apply Host classes for styling.
@@ -687,21 +761,24 @@ export class Range {
         const valueAtMin = dualKnobs ? this.valA === min || this.valB === min : this.valA === min;
         const valueAtMax = dualKnobs ? this.valA === max || this.valB === max : this.valA === max;
         renderHiddenInput(true, el, this.name, JSON.stringify(this.getValue()), disabled);
-        return (h(Host, { key: 'ed646a42d51b8fe22012198c354cbcf5a389c108', onFocusin: this.onFocus, onFocusout: this.onBlur, id: rangeId, class: createColorClasses(this.color, {
+        return (h(Host, { key: '8e439db9836fdefdc779573082c788e3ddb3ef73', onFocusin: this.onFocus, onFocusout: this.onBlur, id: rangeId, class: createColorClasses(this.color, {
                 [mode]: true,
                 'in-item': inItem,
                 'range-disabled': disabled,
+                'range-dual-knobs': dualKnobs,
                 'range-pressed': pressedKnob !== undefined,
+                [`range-pressed-${pressedKnobName}`]: pressedKnob !== undefined && pressedKnobName !== undefined,
+                [`range-pressed-${pressedKnobPosition}`]: pressedKnob !== undefined && pressedKnobPosition !== undefined,
                 'range-has-pin': pin,
                 [`range-label-placement-${labelPlacement}`]: true,
                 'range-item-start-adjustment': needsStartAdjustment,
                 'range-item-end-adjustment': needsEndAdjustment,
                 'range-value-min': valueAtMin,
                 'range-value-max': valueAtMax,
-            }) }, h("label", { key: '3083e4f2a624e3b268396acb4415f7c6ac44d851', class: "range-wrapper", id: "range-label" }, h("div", { key: '47b92f94d2a0381dd7c5cd3dda54ed2942096715', class: {
+            }) }, h("label", { key: 'e14c56db4d1eef11a3a0639c4bbed368041fc3eb', class: "range-wrapper", id: "range-label" }, h("div", { key: '16d125b0af19fdfa3663731657a7cca51a7ed442', class: {
                 'label-text-wrapper': true,
                 'label-text-wrapper-hidden': !hasLabel,
-            }, part: "label" }, label !== undefined ? h("div", { class: "label-text" }, label) : h("slot", { name: "label" })), h("div", { key: '5341da8d19eb29091df680978a0e20cc8f2eec65', class: "native-wrapper" }, h("slot", { key: '09f1437078032676695442d8c827a16faa7dffe2', name: "start" }), this.renderRangeSlider(), h("slot", { key: '02b7781970ea4d44f10b5f4627a2ca36eca45f85', name: "end" })))));
+            }, part: "label" }, label !== undefined ? h("div", { class: "label-text" }, label) : h("slot", { name: "label" })), h("div", { key: '545cc52a3e675e9df328dab537a4e44b7f3c59f8', class: "native-wrapper" }, h("slot", { key: 'ac54b45a21c9db231ebe11498d508d05864b56fb', name: "start" }), this.renderRangeSlider(), h("slot", { key: '7182dba53df2ff878d572b30afda64b37082c82e', name: "end" })))));
     }
     static get is() { return "ion-range"; }
     static get encapsulation() { return "shadow"; }
@@ -1057,6 +1134,9 @@ export class Range {
         return {
             "ratioA": {},
             "ratioB": {},
+            "activatedKnob": {},
+            "focusedKnob": {},
+            "hoveredKnob": {},
             "pressedKnob": {}
         };
     }
@@ -1203,7 +1283,7 @@ export class Range {
             }];
     }
 }
-const renderKnob = (rtl, { knob, value, ratio, min, max, disabled, pressed, pin, handleKeyboard, pinFormatter, inheritedAttributes, onKnobFocus, onKnobBlur, }) => {
+const renderKnob = (rtl, { knob, position, dualKnobs, value, ratio, min, max, disabled, activated, focused, hovered, pressed, pin, handleKeyboard, pinFormatter, inheritedAttributes, onKnobFocus, onKnobBlur, onKnobMouseEnter, onKnobMouseLeave, }) => {
     const start = rtl ? 'right' : 'left';
     const knobStyle = () => {
         const style = {};
@@ -1224,16 +1304,66 @@ const renderKnob = (rtl, { knob, value, ratio, min, max, disabled, pressed, pin,
                 ev.preventDefault();
                 ev.stopPropagation();
             }
-        }, onFocus: () => onKnobFocus(knob), onBlur: onKnobBlur, class: {
+        }, onFocus: () => onKnobFocus(knob), onBlur: onKnobBlur, onMouseEnter: () => onKnobMouseEnter(knob), onMouseLeave: onKnobMouseLeave, class: {
             'range-knob-handle': true,
-            'range-knob-a': knob === 'A',
-            'range-knob-b': knob === 'B',
+            'range-knob-handle-a': knob === 'A',
+            'range-knob-handle-b': knob === 'B',
             'range-knob-pressed': pressed,
             'range-knob-min': value === min,
             'range-knob-max': value === max,
             'ion-activatable': true,
             'ion-focusable': true,
-        }, style: knobStyle(), role: "slider", tabindex: disabled ? -1 : 0, "aria-label": ariaLabel !== undefined ? ariaLabel : null, "aria-labelledby": ariaLabel === undefined ? 'range-label' : null, "aria-valuemin": min, "aria-valuemax": max, "aria-disabled": disabled ? 'true' : null, "aria-valuenow": value }, pin && (h("div", { class: "range-pin", role: "presentation", part: "pin" }, pinFormatter(value))), h("div", { class: "range-knob", role: "presentation", part: "knob" })));
+            'ion-focused': focused,
+        }, part: [
+            'knob-handle',
+            dualKnobs && knob === 'A' && 'knob-handle-a',
+            dualKnobs && knob === 'B' && 'knob-handle-b',
+            dualKnobs && position === 'lower' && 'knob-handle-lower',
+            dualKnobs && position === 'upper' && 'knob-handle-upper',
+            pressed && 'pressed',
+            focused && 'focused',
+            hovered && 'hover',
+            activated && 'activated',
+        ]
+            .filter(Boolean)
+            .join(' '), style: knobStyle(), role: "slider", tabindex: disabled ? -1 : 0, "aria-label": ariaLabel !== undefined ? ariaLabel : null, "aria-labelledby": ariaLabel === undefined ? 'range-label' : null, "aria-valuemin": min, "aria-valuemax": max, "aria-disabled": disabled ? 'true' : null, "aria-valuenow": value }, pin && (h("div", { class: "range-pin", role: "presentation", part: [
+            'pin',
+            dualKnobs && knob === 'A' && 'pin-a',
+            dualKnobs && knob === 'B' && 'pin-b',
+            dualKnobs && position === 'lower' && 'pin-lower',
+            dualKnobs && position === 'upper' && 'pin-upper',
+            pressed && 'pressed',
+            focused && 'focused',
+            hovered && 'hover',
+            activated && 'activated',
+        ]
+            .filter(Boolean)
+            .join(' ') }, pinFormatter(value))), h("div", { class: "range-knob", role: "presentation", part: [
+            'knob',
+            dualKnobs && knob === 'A' && 'knob-a',
+            dualKnobs && knob === 'B' && 'knob-b',
+            dualKnobs && position === 'lower' && 'knob-lower',
+            dualKnobs && position === 'upper' && 'knob-upper',
+            pressed && 'pressed',
+            focused && 'focused',
+            hovered && 'hover',
+            activated && 'activated',
+        ]
+            .filter(Boolean)
+            .join(' ') })));
+};
+/**
+ * Returns whether the given knob is at the lower or upper position based
+ * on current ratios for the given knob.
+ */
+const getKnobPosition = (knob, ratioA, ratioB, dualKnobs) => {
+    if (dualKnobs) {
+        if (knob === 'A') {
+            return ratioA <= ratioB ? 'lower' : 'upper';
+        }
+        return ratioB <= ratioA ? 'lower' : 'upper';
+    }
+    return 'lower';
 };
 const ratioToValue = (ratio, min, max, step) => {
     let value = (max - min) * ratio;