@venite/components 0.16.35 → 0.16.37

package/dist/cjs/ion-range.cjs.entry.js

@@ -2,10 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const index = require('./index-245c99ad.js');
-const ionicGlobal = require('./ionic-global-b20a04a0.js');
-const helpers = require('./helpers-41dfb43a.js');
-const theme = require('./theme-81caa5b0.js');
+const index = require('./index-01fdec29.js');
+const ionicGlobal = require('./ionic-global-bd0aab94.js');
+const index$2 = require('./index-9c7b27e4.js');
+const helpers = require('./helpers-c2496722.js');
+const index$1 = require('./index-e56e09b8.js');
+const dir = require('./dir-5af5259a.js');
+const theme = require('./theme-b0b295c1.js');
 
 const rangeIosCss = ":host{--knob-handle-size:calc(var(--knob-size) * 2);display:flex;position:relative;flex:3;align-items:center;font-family:var(--ion-font-family, inherit);user-select:none;z-index:2}:host(.range-disabled){pointer-events:none}::slotted(ion-label){flex:initial}::slotted(ion-icon[slot]){font-size:24px}.range-slider{position:relative;flex:1;width:100%;height:var(--height);contain:size layout style;cursor:grab;touch-action:pan-y}:host(.range-pressed) .range-slider{cursor:grabbing}.range-pin{position:absolute;background:var(--ion-color-base);color:var(--ion-color-contrast);text-align:center;box-sizing:border-box}.range-knob-handle{left:0;top:calc((var(--height) - var(--knob-handle-size)) / 2);margin-left:calc(0px - var(--knob-handle-size) / 2);position:absolute;width:var(--knob-handle-size);height:var(--knob-handle-size);text-align:center}[dir=rtl] .range-knob-handle,:host-context([dir=rtl]) .range-knob-handle{left:unset;right:unset;right:0}@supports (margin-inline-start: 0) or (-webkit-margin-start: 0){.range-knob-handle{margin-left:unset;-webkit-margin-start:calc(0px - var(--knob-handle-size) / 2);margin-inline-start:calc(0px - var(--knob-handle-size) / 2)}}[dir=rtl] .range-knob-handle,:host-context([dir=rtl]) .range-knob-handle{left:unset}.range-knob-handle:active,.range-knob-handle:focus{outline:none}.range-bar{border-radius:var(--bar-border-radius);left:0;top:calc((var(--height) - var(--bar-height)) / 2);position:absolute;width:100%;height:var(--bar-height);background:var(--bar-background);pointer-events:none}[dir=rtl] .range-bar,:host-context([dir=rtl]) .range-bar{left:unset;right:unset;right:0}[dir=rtl] .range-bar,:host-context([dir=rtl]) .range-bar{left:unset}.range-knob{border-radius:var(--knob-border-radius);left:calc(50% - var(--knob-size) / 2);top:calc(50% - var(--knob-size) / 2);position:absolute;width:var(--knob-size);height:var(--knob-size);background:var(--knob-background);box-shadow:var(--knob-box-shadow);z-index:2;pointer-events:none}[dir=rtl] .range-knob,:host-context([dir=rtl]) .range-knob{left:unset;right:unset;right:calc(50% - var(--knob-size) / 2)}[dir=rtl] .range-knob,:host-context([dir=rtl]) .range-knob{left:unset}:host(.range-pressed) .range-bar-active{will-change:left, right}:host(.in-item){width:100%}:host(.in-item) ::slotted(ion-label){align-self:center}:host{--knob-border-radius:50%;--knob-background:#ffffff;--knob-box-shadow:0 3px 1px rgba(0, 0, 0, 0.1), 0 4px 8px rgba(0, 0, 0, 0.13), 0 0 0 1px rgba(0, 0, 0, 0.02);--knob-size:28px;--bar-height:2px;--bar-background:rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.1);--bar-background-active:var(--ion-color-primary, #3880ff);--bar-border-radius:0;--height:42px;padding-left:16px;padding-right:16px;padding-top:8px;padding-bottom:8px}@supports (margin-inline-start: 0) or (-webkit-margin-start: 0){:host{padding-left:unset;padding-right:unset;-webkit-padding-start:16px;padding-inline-start:16px;-webkit-padding-end:16px;padding-inline-end:16px}}:host(.ion-color) .range-bar-active,:host(.ion-color) .range-tick-active{background:var(--ion-color-base)}::slotted([slot=start]){margin-left:0;margin-right:16px;margin-top:0;margin-bottom:0}@supports (margin-inline-start: 0) or (-webkit-margin-start: 0){::slotted([slot=start]){margin-left:unset;margin-right:unset;-webkit-margin-start:0;margin-inline-start:0;-webkit-margin-end:16px;margin-inline-end:16px}}::slotted([slot=end]){margin-left:16px;margin-right:0;margin-top:0;margin-bottom:0}@supports (margin-inline-start: 0) or (-webkit-margin-start: 0){::slotted([slot=end]){margin-left:unset;margin-right:unset;-webkit-margin-start:16px;margin-inline-start:16px;-webkit-margin-end:0;margin-inline-end:0}}:host(.range-has-pin){padding-top:20px}.range-bar-active{bottom:0;width:auto;background:var(--bar-background-active)}.range-tick{margin-left:-1px;border-radius:0;position:absolute;top:18px;width:2px;height:8px;background:rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.1);pointer-events:none}@supports (margin-inline-start: 0) or (-webkit-margin-start: 0){.range-tick{margin-left:unset;-webkit-margin-start:-1px;margin-inline-start:-1px}}.range-tick-active{background:var(--bar-background-active)}.range-pin{transform:translate3d(0,  28px,  0) scale(0.01);padding-left:8px;padding-right:8px;padding-top:8px;padding-bottom:8px;display:inline-block;position:relative;top:-20px;min-width:28px;transition:transform 120ms ease;background:transparent;color:var(--ion-text-color, #000);font-size:12px;text-align:center}@supports (margin-inline-start: 0) or (-webkit-margin-start: 0){.range-pin{padding-left:unset;padding-right:unset;-webkit-padding-start:8px;padding-inline-start:8px;-webkit-padding-end:8px;padding-inline-end:8px}}.range-knob-pressed .range-pin{transform:translate3d(0,  0,  0) scale(1)}:host(.range-disabled){opacity:0.5}";
 
@@ -18,15 +21,23 @@ const Range = class {
     this.ionStyle = index.createEvent(this, "ionStyle", 7);
     this.ionFocus = index.createEvent(this, "ionFocus", 7);
     this.ionBlur = index.createEvent(this, "ionBlur", 7);
+    this.ionKnobMoveStart = index.createEvent(this, "ionKnobMoveStart", 7);
+    this.ionKnobMoveEnd = index.createEvent(this, "ionKnobMoveEnd", 7);
+    this.didLoad = false;
     this.noUpdate = false;
     this.hasFocus = false;
+    this.inheritedAttributes = {};
+    this.contentEl = null;
+    this.initialContentScrollY = true;
     this.ratioA = 0;
     this.ratioB = 0;
     /**
      * How long, in milliseconds, to wait to trigger the
      * `ionChange` event after each change in the range value.
+     * This also impacts form bindings such as `ngModel` or `v-model`.
      */
     this.debounce = 0;
+    // TODO: In Ionic Framework v6 this should initialize to this.rangeId like the other form components do.
     /**
      * The name of the control, which is submitted with the form data.
      */
@@ -48,6 +59,11 @@ const Range = class {
      * is pressed.
      */
     this.pin = false;
+    /**
+     * A callback used to format the pin text.
+     * By default the pin text is set to `Math.round(value)`.
+     */
+    this.pinFormatter = (value) => Math.round(value);
     /**
      * If `true`, the knob snaps to tick marks evenly spaced based
      * on the step property value.
@@ -77,14 +93,30 @@ const Range = class {
       if (this.dualKnobs) {
         return {
           lower: this.clampBounds(value.lower),
-          upper: this.clampBounds(value.upper)
+          upper: this.clampBounds(value.upper),
         };
       }
       else {
         return this.clampBounds(value);
       }
     };
+    this.setupGesture = async () => {
+      const rangeSlider = this.rangeSlider;
+      if (rangeSlider) {
+        this.gesture = (await Promise.resolve().then(function () { return require('./index-12082cba.js'); })).createGesture({
+          el: rangeSlider,
+          gestureName: 'range',
+          gesturePriority: 100,
+          threshold: 0,
+          onStart: (ev) => this.onStart(ev),
+          onMove: (ev) => this.onMove(ev),
+          onEnd: (ev) => this.onEnd(ev),
+        });
+        this.gesture.enable(!this.disabled);
+      }
+    };
     this.handleKeyboard = (knob, isIncrease) => {
+      const { ensureValueInBounds } = this;
       let step = this.step;
       step = step > 0 ? step : 1;
       step = step / (this.max - this.min);
@@ -97,7 +129,9 @@ const Range = class {
       else {
         this.ratioB = helpers.clamp(0, this.ratioB + step, 1);
       }
+      this.ionKnobMoveStart.emit({ value: ensureValueInBounds(this.value) });
       this.updateValue();
+      this.ionKnobMoveEnd.emit({ value: ensureValueInBounds(this.value) });
     };
     this.onBlur = () => {
       if (this.hasFocus) {
@@ -127,6 +161,19 @@ const Range = class {
       this.updateRatio();
     }
   }
+  activeBarStartChanged() {
+    const { activeBarStart } = this;
+    if (activeBarStart !== undefined) {
+      if (activeBarStart > this.max) {
+        index$1.printIonWarning(`Range: The value of activeBarStart (${activeBarStart}) is greater than the max (${this.max}). Valid values are greater than or equal to the min value and less than or equal to the max value.`, this.el);
+        this.activeBarStart = this.max;
+      }
+      else if (activeBarStart < this.min) {
+        index$1.printIonWarning(`Range: The value of activeBarStart (${activeBarStart}) is less than the min (${this.min}). Valid values are greater than or equal to the min value and less than or equal to the max value.`, this.el);
+        this.activeBarStart = this.min;
+      }
+    }
+  }
   disabledChanged() {
     if (this.gesture) {
       this.gesture.enable(!this.disabled);
@@ -140,10 +187,33 @@ const Range = class {
     value = this.ensureValueInBounds(value);
     this.ionChange.emit({ value });
   }
+  componentWillLoad() {
+    /**
+     * If user has custom ID set then we should
+     * not assign the default incrementing ID.
+     */
+    this.rangeId = this.el.hasAttribute('id') ? this.el.getAttribute('id') : `ion-r-${rangeIds++}`;
+    this.inheritedAttributes = helpers.inheritAriaAttributes(this.el);
+  }
+  componentDidLoad() {
+    this.setupGesture();
+    this.didLoad = true;
+  }
   connectedCallback() {
     this.updateRatio();
     this.debounceChanged();
     this.disabledChanged();
+    this.activeBarStartChanged();
+    /**
+     * If we have not yet rendered
+     * ion-range, then rangeSlider is not defined.
+     * But if we are moving ion-range via appendChild,
+     * then rangeSlider will be defined.
+     */
+    if (this.didLoad) {
+      this.setupGesture();
+    }
+    this.contentEl = index$2.findClosestIonContent(this.el);
   }
   disconnectedCallback() {
     if (this.gesture) {
@@ -151,21 +221,6 @@ const Range = class {
       this.gesture = undefined;
     }
   }
-  async componentDidLoad() {
-    const rangeSlider = this.rangeSlider;
-    if (rangeSlider) {
-      this.gesture = (await Promise.resolve().then(function () { return require('./index-8197bb45.js'); })).createGesture({
-        el: rangeSlider,
-        gestureName: 'range',
-        gesturePriority: 100,
-        threshold: 0,
-        onStart: ev => this.onStart(ev),
-        onMove: ev => this.onMove(ev),
-        onEnd: ev => this.onEnd(ev),
-      });
-      this.gesture.enable(!this.disabled);
-    }
-  }
   getValue() {
     const value = this.value || 0;
     if (this.dualKnobs) {
@@ -174,7 +229,7 @@ const Range = class {
       }
       return {
         lower: 0,
-        upper: value
+        upper: value,
       };
     }
     else {
@@ -186,40 +241,46 @@ const Range = class {
   }
   emitStyle() {
     this.ionStyle.emit({
-      'interactive': true,
-      'interactive-disabled': this.disabled
+      interactive: true,
+      'interactive-disabled': this.disabled,
     });
   }
   onStart(detail) {
-    const rect = this.rect = this.rangeSlider.getBoundingClientRect();
+    const { contentEl } = this;
+    if (contentEl) {
+      this.initialContentScrollY = index$2.disableContentScrollY(contentEl);
+    }
+    const rect = (this.rect = this.rangeSlider.getBoundingClientRect());
     const currentX = detail.currentX;
     // figure out which knob they started closer to
     let ratio = helpers.clamp(0, (currentX - rect.left) / rect.width, 1);
-    if (document.dir === 'rtl') {
+    if (dir.isRTL(this.el)) {
       ratio = 1 - ratio;
     }
-    this.pressedKnob =
-      !this.dualKnobs ||
-        Math.abs(this.ratioA - ratio) < Math.abs(this.ratioB - ratio)
-        ? 'A'
-        : 'B';
+    this.pressedKnob = !this.dualKnobs || Math.abs(this.ratioA - ratio) < Math.abs(this.ratioB - ratio) ? 'A' : 'B';
     this.setFocus(this.pressedKnob);
     // update the active knob's position
     this.update(currentX);
+    this.ionKnobMoveStart.emit({ value: this.ensureValueInBounds(this.value) });
   }
   onMove(detail) {
     this.update(detail.currentX);
   }
   onEnd(detail) {
+    const { contentEl, initialContentScrollY } = this;
+    if (contentEl) {
+      index$2.resetContentScrollY(contentEl, initialContentScrollY);
+    }
     this.update(detail.currentX);
     this.pressedKnob = undefined;
+    this.ionKnobMoveEnd.emit({ value: this.ensureValueInBounds(this.value) });
   }
   update(currentX) {
     // figure out where the pointer is currently at
     // update the knob being interacted with
     const rect = this.rect;
     let ratio = helpers.clamp(0, (currentX - rect.left) / rect.width, 1);
-    if (document.dir === 'rtl') {
+    if (dir.isRTL(this.el)) {
       ratio = 1 - ratio;
     }
     if (this.snaps) {
@@ -246,7 +307,11 @@ const Range = class {
     if (this.dualKnobs) {
       return Math.min(this.ratioA, this.ratioB);
     }
-    return 0;
+    const { activeBarStart } = this;
+    if (activeBarStart == null) {
+      return 0;
+    }
+    return valueToRatio(activeBarStart, this.min, this.max);
   }
   get ratioUpper() {
     if (this.dualKnobs) {
@@ -272,7 +337,7 @@ const Range = class {
       ? valA
       : {
         lower: Math.min(valA, valB),
-        upper: Math.max(valA, valB)
+        upper: Math.max(valA, valB),
       };
     this.noUpdate = false;
   }
@@ -285,72 +350,126 @@ const Range = class {
     }
   }
   render() {
-    const { min, max, step, el, handleKeyboard, pressedKnob, disabled, pin, ratioLower, ratioUpper } = this;
+    var _a;
+    const { min, max, step, el, handleKeyboard, pressedKnob, disabled, pin, ratioLower, ratioUpper, inheritedAttributes, rangeId, pinFormatter, } = this;
+    /**
+     * Look for external label, ion-label, or aria-labelledby.
+     * If none, see if user placed an aria-label on the host
+     * and use that instead.
+     */
+    let { labelText } = helpers.getAriaLabel(el, rangeId);
+    if (labelText === undefined || labelText === null) {
+      labelText = inheritedAttributes['aria-label'];
+    }
     const mode = ionicGlobal.getIonMode(this);
-    const barStart = `${ratioLower * 100}%`;
-    const barEnd = `${100 - ratioUpper * 100}%`;
-    const doc = document;
-    const isRTL = doc.dir === 'rtl';
-    const start = isRTL ? 'right' : 'left';
-    const end = isRTL ? 'left' : 'right';
+    let barStart = `${ratioLower * 100}%`;
+    let barEnd = `${100 - ratioUpper * 100}%`;
+    const rtl = dir.isRTL(this.el);
+    const start = rtl ? 'right' : 'left';
+    const end = rtl ? 'left' : 'right';
     const tickStyle = (tick) => {
       return {
-        [start]: tick[start]
+        [start]: tick[start],
       };
     };
+    if (this.dualKnobs === false) {
+      /**
+       * When the value is less than the activeBarStart or the min value,
+       * the knob will display at the start of the active bar.
+       */
+      if (this.valA < ((_a = this.activeBarStart) !== null && _a !== void 0 ? _a : this.min)) {
+        /**
+         * Sets the bar positions relative to the upper and lower limits.
+         * Converts the ratio values into percentages, used as offsets for left/right styles.
+         *
+         * The ratioUpper refers to the knob position on the bar.
+         * The ratioLower refers to the end position of the active bar (the value).
+         */
+        barStart = `${ratioUpper * 100}%`;
+        barEnd = `${100 - ratioLower * 100}%`;
+      }
+      else {
+        /**
+         * Otherwise, the knob will display at the end of the active bar.
+         *
+         * The ratioLower refers to the start position of the active bar (the value).
+         * The ratioUpper refers to the knob position on the bar.
+         */
+        barStart = `${ratioLower * 100}%`;
+        barEnd = `${100 - ratioUpper * 100}%`;
+      }
+    }
     const barStyle = {
       [start]: barStart,
-      [end]: barEnd
+      [end]: barEnd,
     };
     const ticks = [];
     if (this.snaps && this.ticks) {
       for (let value = min; value <= max; value += step) {
         const ratio = valueToRatio(value, min, max);
+        const ratioMin = Math.min(ratioLower, ratioUpper);
+        const ratioMax = Math.max(ratioLower, ratioUpper);
         const tick = {
           ratio,
-          active: ratio >= ratioLower && ratio <= ratioUpper,
+          /**
+           * Sets the tick mark as active when the tick is between the min bounds and the knob.
+           * When using activeBarStart, the tick mark will be active between the knob and activeBarStart.
+           */
+          active: ratio >= ratioMin && ratio <= ratioMax,
         };
         tick[start] = `${ratio * 100}%`;
         ticks.push(tick);
       }
     }
     helpers.renderHiddenInput(true, el, this.name, JSON.stringify(this.getValue()), disabled);
-    return (index.h(index.Host, { onFocusin: this.onFocus, onFocusout: this.onBlur, class: Object.assign(Object.assign({}, theme.createColorClasses(this.color)), { [mode]: true, 'in-item': theme.hostContext('ion-item', el), 'range-disabled': disabled, 'range-pressed': pressedKnob !== undefined, 'range-has-pin': pin }) }, index.h("slot", { name: "start" }), index.h("div", { class: "range-slider", ref: rangeEl => this.rangeSlider = rangeEl }, ticks.map(tick => (index.h("div", { style: tickStyle(tick), role: "presentation", class: {
+    return (index.h(index.Host, { onFocusin: this.onFocus, onFocusout: this.onBlur, id: rangeId, class: theme.createColorClasses(this.color, {
+        [mode]: true,
+        'in-item': theme.hostContext('ion-item', el),
+        'range-disabled': disabled,
+        'range-pressed': pressedKnob !== undefined,
+        'range-has-pin': pin,
+      }) }, index.h("slot", { name: "start" }), index.h("div", { class: "range-slider", ref: (rangeEl) => (this.rangeSlider = rangeEl) }, ticks.map((tick) => (index.h("div", { style: tickStyle(tick), role: "presentation", class: {
         'range-tick': true,
-        'range-tick-active': tick.active
-      }, part: tick.active ? 'tick-active' : 'tick' }))), index.h("div", { class: "range-bar", role: "presentation", part: "bar" }), index.h("div", { class: "range-bar range-bar-active", role: "presentation", style: barStyle, part: "bar-active" }), renderKnob(isRTL, {
+        'range-tick-active': tick.active,
+      }, part: tick.active ? 'tick-active' : 'tick' }))), index.h("div", { class: "range-bar", role: "presentation", part: "bar" }), index.h("div", { class: "range-bar range-bar-active", role: "presentation", style: barStyle, part: "bar-active" }), renderKnob(rtl, {
       knob: 'A',
       pressed: pressedKnob === 'A',
       value: this.valA,
       ratio: this.ratioA,
       pin,
+      pinFormatter,
       disabled,
       handleKeyboard,
       min,
-      max
-    }), this.dualKnobs && renderKnob(isRTL, {
-      knob: 'B',
-      pressed: pressedKnob === 'B',
-      value: this.valB,
-      ratio: this.ratioB,
-      pin,
-      disabled,
-      handleKeyboard,
-      min,
-      max
-    })), index.h("slot", { name: "end" })));
+      max,
+      labelText,
+    }), this.dualKnobs &&
+      renderKnob(rtl, {
+        knob: 'B',
+        pressed: pressedKnob === 'B',
+        value: this.valB,
+        ratio: this.ratioB,
+        pin,
+        pinFormatter,
+        disabled,
+        handleKeyboard,
+        min,
+        max,
+        labelText,
+      })), index.h("slot", { name: "end" })));
   }
   get el() { return index.getElement(this); }
   static get watchers() { return {
     "debounce": ["debounceChanged"],
     "min": ["minChanged"],
     "max": ["maxChanged"],
+    "activeBarStart": ["activeBarStartChanged"],
     "disabled": ["disabledChanged"],
     "value": ["valueChanged"]
   }; }
 };
-const renderKnob = (isRTL, { knob, value, ratio, min, max, disabled, pressed, pin, handleKeyboard }) => {
-  const start = isRTL ? 'right' : 'left';
+const renderKnob = (rtl, { knob, value, ratio, min, max, disabled, pressed, pin, handleKeyboard, labelText, pinFormatter }) => {
+  const start = rtl ? 'right' : 'left';
   const knobStyle = () => {
     const style = {};
     style[start] = `${ratio * 100}%`;
@@ -374,8 +493,8 @@ const renderKnob = (isRTL, { knob, value, ratio, min, max, disabled, pressed, pi
       'range-knob-b': knob === 'B',
       'range-knob-pressed': pressed,
       'range-knob-min': value === min,
-      'range-knob-max': value === max
-    }, style: knobStyle(), role: "slider", tabindex: disabled ? -1 : 0, "aria-valuemin": min, "aria-valuemax": max, "aria-disabled": disabled ? 'true' : null, "aria-valuenow": value }, pin && index.h("div", { class: "range-pin", role: "presentation", part: "pin" }, Math.round(value)), index.h("div", { class: "range-knob", role: "presentation", part: "knob" })));
+      'range-knob-max': value === max,
+    }, style: knobStyle(), role: "slider", tabindex: disabled ? -1 : 0, "aria-label": labelText, "aria-valuemin": min, "aria-valuemax": max, "aria-disabled": disabled ? 'true' : null, "aria-valuenow": value }, pin && (index.h("div", { class: "range-pin", role: "presentation", part: "pin" }, pinFormatter(value))), index.h("div", { class: "range-knob", role: "presentation", part: "knob" })));
 };
 const ratioToValue = (ratio, min, max, step) => {
   let value = (max - min) * ratio;
@@ -387,6 +506,7 @@ const ratioToValue = (ratio, min, max, step) => {
 const valueToRatio = (value, min, max) => {
   return helpers.clamp(0, (value - min) / (max - min), 1);
 };
+let rangeIds = 0;
 Range.style = {
   ios: rangeIosCss,
   md: rangeMdCss

package/dist/cjs/ion-refresher-content.cjs.entry.js

@@ -2,10 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const index = require('./index-245c99ad.js');
-const ionicGlobal = require('./ionic-global-b20a04a0.js');
-const index$1 = require('./index-4b7e4228.js');
-const spinnerConfigs = require('./spinner-configs-b0bec093.js');
+const index = require('./index-01fdec29.js');
+const index$2 = require('./index-b6879fbc.js');
+const ionicGlobal = require('./ionic-global-bd0aab94.js');
+const index$1 = require('./index-af080b50.js');
+const spinnerConfigs = require('./spinner-configs-0ac05f2d.js');
 
 const RefresherContent = class {
   constructor(hostRef) {
@@ -14,7 +15,7 @@ const RefresherContent = class {
   componentWillLoad() {
     if (this.pullingIcon === undefined) {
       const mode = ionicGlobal.getIonMode(this);
-      const overflowRefresher = this.el.style.webkitOverflowScrolling !== undefined ? 'lines' : 'arrow-down';
+      const overflowRefresher = this.el.style.webkitOverflowScrolling !== undefined ? 'lines' : index$2.arrowDown;
       this.pullingIcon = ionicGlobal.config.get('refreshingIcon', mode === 'ios' && ionicGlobal.isPlatform('mobile') ? ionicGlobal.config.get('spinner', overflowRefresher) : 'circular');
     }
     if (this.refreshingSpinner === undefined) {
@@ -26,13 +27,7 @@ const RefresherContent = class {
     const pullingIcon = this.pullingIcon;
     const hasSpinner = pullingIcon != null && spinnerConfigs.SPINNERS[pullingIcon] !== undefined;
     const mode = ionicGlobal.getIonMode(this);
-    return (index.h(index.Host, { class: mode }, index.h("div", { class: "refresher-pulling" }, this.pullingIcon && hasSpinner &&
-      index.h("div", { class: "refresher-pulling-icon" }, index.h("div", { class: "spinner-arrow-container" }, index.h("ion-spinner", { name: this.pullingIcon, paused: true }), mode === 'md' && this.pullingIcon === 'circular' &&
-        index.h("div", { class: "arrow-container" }, index.h("ion-icon", { name: "caret-back-sharp" })))), this.pullingIcon && !hasSpinner &&
-      index.h("div", { class: "refresher-pulling-icon" }, index.h("ion-icon", { icon: this.pullingIcon, lazy: false })), this.pullingText &&
-      index.h("div", { class: "refresher-pulling-text", innerHTML: index$1.sanitizeDOMString(this.pullingText) })), index.h("div", { class: "refresher-refreshing" }, this.refreshingSpinner &&
-      index.h("div", { class: "refresher-refreshing-icon" }, index.h("ion-spinner", { name: this.refreshingSpinner })), this.refreshingText &&
-      index.h("div", { class: "refresher-refreshing-text", innerHTML: index$1.sanitizeDOMString(this.refreshingText) }))));
+    return (index.h(index.Host, { class: mode }, index.h("div", { class: "refresher-pulling" }, this.pullingIcon && hasSpinner && (index.h("div", { class: "refresher-pulling-icon" }, index.h("div", { class: "spinner-arrow-container" }, index.h("ion-spinner", { name: this.pullingIcon, paused: true }), mode === 'md' && this.pullingIcon === 'circular' && (index.h("div", { class: "arrow-container" }, index.h("ion-icon", { icon: index$2.caretBackSharp })))))), this.pullingIcon && !hasSpinner && (index.h("div", { class: "refresher-pulling-icon" }, index.h("ion-icon", { icon: this.pullingIcon, lazy: false }))), this.pullingText && (index.h("div", { class: "refresher-pulling-text", innerHTML: index$1.sanitizeDOMString(this.pullingText) }))), index.h("div", { class: "refresher-refreshing" }, this.refreshingSpinner && (index.h("div", { class: "refresher-refreshing-icon" }, index.h("ion-spinner", { name: this.refreshingSpinner }))), this.refreshingText && (index.h("div", { class: "refresher-refreshing-text", innerHTML: index$1.sanitizeDOMString(this.refreshingText) })))));
   }
   get el() { return index.getElement(this); }
 };