@esri/calcite-components 1.0.0-next.422 → 1.0.0-next.425

package/dist/collection/components/slider/slider.js

@@ -9,6 +9,9 @@ import { clamp, decimalPlaces } from "../../utils/math";
 import { connectLabel, disconnectLabel } from "../../utils/label";
 import { afterConnectDefaultValueSet, connectForm, disconnectForm, HiddenFormInputSlot } from "../../utils/form";
 import { updateHostInteraction } from "../../utils/interactive";
+function isRange(value) {
+  return Array.isArray(value);
+}
 export class Slider {
   constructor() {
     //--------------------------------------------------------------------------
@@ -45,13 +48,12 @@ export class Slider {
     /** Interval to move on up/down keys */
     this.step = 1;
     /** Currently selected number (if single select) */
-    this.value = null;
+    this.value = 0;
     /**
      * Specify the scale of the slider, defaults to m
      */
     this.scale = "m";
     this.guid = `calcite-slider-${guid()}`;
-    this.isRange = false;
     this.activeProp = "value";
     this.minMaxValueRange = null;
     this.minValueDragRange = null;
@@ -61,7 +63,7 @@ export class Slider {
       event.preventDefault();
       if (this.dragProp) {
         const value = this.translate(event.clientX || event.pageX);
-        if (this.isRange && this.dragProp === "minMaxValue") {
+        if (isRange(this.value) && this.dragProp === "minMaxValue") {
           if (this.minValueDragRange && this.maxValueDragRange && this.minMaxValueRange) {
             const newMinValue = value - this.minValueDragRange;
             const newMaxValue = value + this.maxValueDragRange;
@@ -107,12 +109,20 @@ export class Slider {
   histogramWatcher(newHistogram) {
     this.hasHistogram = !!newHistogram;
   }
+  valueHandler() {
+    this.setMinMaxFromValue();
+  }
+  minMaxValueHandler() {
+    this.setValueFromMinMax();
+  }
   //--------------------------------------------------------------------------
   //
   //  Lifecycle
   //
   //--------------------------------------------------------------------------
   connectedCallback() {
+    this.setMinMaxFromValue();
+    this.setValueFromMinMax();
     connectLabel(this);
     connectForm(this);
   }
@@ -122,11 +132,12 @@ export class Slider {
     this.removeDragListeners();
   }
   componentWillLoad() {
-    this.isRange = !!(this.maxValue || this.maxValue === 0);
     this.tickValues = this.generateTickValues();
-    this.value = this.clamp(this.value);
+    if (!isRange(this.value)) {
+      this.value = this.clamp(this.value);
+    }
     afterConnectDefaultValueSet(this, this.value);
-    if (this.snap) {
+    if (this.snap && !isRange(this.value)) {
       this.value = this.getClosestStep(this.value);
     }
     if (this.histogram) {
@@ -136,9 +147,9 @@ export class Slider {
   componentDidRender() {
     if (this.labelHandles) {
       this.adjustHostObscuredHandleLabel("value");
-      if (this.isRange) {
+      if (isRange(this.value)) {
         this.adjustHostObscuredHandleLabel("minValue");
-        if (!(this.precise && this.isRange && !this.hasHistogram)) {
+        if (!(this.precise && !this.hasHistogram)) {
           this.hyphenateCollidingRangeHandleLabels();
         }
       }
@@ -148,23 +159,23 @@ export class Slider {
   }
   render() {
     const id = this.el.id || this.guid;
+    const maxProp = isRange(this.value) ? "maxValue" : "value";
+    const value = isRange(this.value) ? this.maxValue : this.value;
     const min = this.minValue || this.min;
-    const max = this.maxValue || this.value;
-    const maxProp = this.isRange ? "maxValue" : "value";
-    const value = this[maxProp];
     const useMinValue = this.shouldUseMinValue();
     const minInterval = this.getUnitInterval(useMinValue ? this.minValue : min) * 100;
-    const maxInterval = this.getUnitInterval(max) * 100;
+    const maxInterval = this.getUnitInterval(value) * 100;
     const mirror = this.shouldMirror();
     const leftThumbOffset = `${mirror ? 100 - minInterval : minInterval}%`;
     const rightThumbOffset = `${mirror ? maxInterval : 100 - maxInterval}%`;
-    const handle = (h("div", { "aria-disabled": this.disabled, "aria-label": this.isRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
+    const valueIsRange = isRange(this.value);
+    const handle = (h("div", { "aria-disabled": this.disabled, "aria-label": valueIsRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
         thumb: true,
         "thumb--value": true,
         "thumb--active": this.lastDragProp !== "minMaxValue" && this.dragProp === maxProp
       }, onBlur: () => (this.activeProp = null), onFocus: () => (this.activeProp = maxProp), onPointerDown: () => this.dragStart(maxProp), ref: (el) => (this.maxHandle = el), role: "slider", style: { right: rightThumbOffset }, tabIndex: 0 },
       h("div", { class: "handle" })));
-    const labeledHandle = (h("div", { "aria-disabled": this.disabled, "aria-label": this.isRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
+    const labeledHandle = (h("div", { "aria-disabled": this.disabled, "aria-label": valueIsRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
         thumb: true,
         "thumb--value": true,
         "thumb--active": this.lastDragProp !== "minMaxValue" && this.dragProp === maxProp
@@ -173,7 +184,7 @@ export class Slider {
       h("span", { "aria-hidden": "true", class: "handle__label handle__label--value static" }, value ? value.toLocaleString() : value),
       h("span", { "aria-hidden": "true", class: "handle__label handle__label--value transformed" }, value ? value.toLocaleString() : value),
       h("div", { class: "handle" })));
-    const histogramLabeledHandle = (h("div", { "aria-disabled": this.disabled, "aria-label": this.isRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
+    const histogramLabeledHandle = (h("div", { "aria-disabled": this.disabled, "aria-label": valueIsRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
         thumb: true,
         "thumb--value": true,
         "thumb--active": this.lastDragProp !== "minMaxValue" && this.dragProp === maxProp
@@ -182,7 +193,7 @@ export class Slider {
       h("span", { "aria-hidden": "true", class: "handle__label handle__label--value" }, value ? value.toLocaleString() : value),
       h("span", { "aria-hidden": "true", class: "handle__label handle__label--value static" }, value ? value.toLocaleString() : value),
       h("span", { "aria-hidden": "true", class: "handle__label handle__label--value transformed" }, value ? value.toLocaleString() : value)));
-    const preciseHandle = (h("div", { "aria-disabled": this.disabled, "aria-label": this.isRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
+    const preciseHandle = (h("div", { "aria-disabled": this.disabled, "aria-label": valueIsRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
         thumb: true,
         "thumb--value": true,
         "thumb--active": this.lastDragProp !== "minMaxValue" && this.dragProp === maxProp,
@@ -190,7 +201,7 @@ export class Slider {
       }, onBlur: () => (this.activeProp = null), onFocus: () => (this.activeProp = maxProp), onPointerDown: () => this.dragStart(maxProp), ref: (el) => (this.maxHandle = el), role: "slider", style: { right: rightThumbOffset }, tabIndex: 0 },
       h("div", { class: "handle" }),
       h("div", { class: "handle-extension" })));
-    const histogramPreciseHandle = (h("div", { "aria-disabled": this.disabled, "aria-label": this.isRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
+    const histogramPreciseHandle = (h("div", { "aria-disabled": this.disabled, "aria-label": valueIsRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
         thumb: true,
         "thumb--value": true,
         "thumb--active": this.lastDragProp !== "minMaxValue" && this.dragProp === maxProp,
@@ -198,7 +209,7 @@ export class Slider {
       }, onBlur: () => (this.activeProp = null), onFocus: () => (this.activeProp = maxProp), onPointerDown: () => this.dragStart(maxProp), ref: (el) => (this.maxHandle = el), role: "slider", style: { right: rightThumbOffset }, tabIndex: 0 },
       h("div", { class: "handle-extension" }),
       h("div", { class: "handle" })));
-    const labeledPreciseHandle = (h("div", { "aria-disabled": this.disabled, "aria-label": this.isRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
+    const labeledPreciseHandle = (h("div", { "aria-disabled": this.disabled, "aria-label": valueIsRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
         thumb: true,
         "thumb--value": true,
         "thumb--active": this.lastDragProp !== "minMaxValue" && this.dragProp === maxProp,
@@ -209,7 +220,7 @@ export class Slider {
       h("span", { "aria-hidden": "true", class: "handle__label handle__label--value transformed" }, value ? value.toLocaleString() : value),
       h("div", { class: "handle" }),
       h("div", { class: "handle-extension" })));
-    const histogramLabeledPreciseHandle = (h("div", { "aria-disabled": this.disabled, "aria-label": this.isRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
+    const histogramLabeledPreciseHandle = (h("div", { "aria-disabled": this.disabled, "aria-label": valueIsRange ? this.maxLabel : this.minLabel, "aria-orientation": "horizontal", "aria-valuemax": this.max, "aria-valuemin": this.min, "aria-valuenow": value, class: {
         thumb: true,
         "thumb--value": true,
         "thumb--active": this.lastDragProp !== "minMaxValue" && this.dragProp === maxProp,
@@ -266,7 +277,7 @@ export class Slider {
     return (h(Host, { id: id, onTouchStart: this.handleTouchStart },
       h("div", { class: {
           ["container"]: true,
-          ["container--range"]: this.isRange,
+          ["container--range"]: valueIsRange,
           [`scale--${this.scale}`]: true
         } },
         this.renderGraph(),
@@ -277,7 +288,7 @@ export class Slider {
             } }),
           h("div", { class: "ticks" }, this.tickValues.map((tick) => {
             const tickOffset = `${this.getUnitInterval(tick) * 100}%`;
-            let activeTicks = tick >= min && tick <= max;
+            let activeTicks = tick >= min && tick <= value;
             if (useMinValue) {
               activeTicks = tick >= this.minValue && tick <= this.maxValue;
             }
@@ -290,18 +301,18 @@ export class Slider {
               } }, this.renderTickLabel(tick)));
           }))),
         h("div", { class: "thumb-container" },
-          !this.precise && !this.labelHandles && this.isRange && minHandle,
+          !this.precise && !this.labelHandles && valueIsRange && minHandle,
           !this.hasHistogram &&
             !this.precise &&
             this.labelHandles &&
-            this.isRange &&
+            valueIsRange &&
             minLabeledHandle,
-          this.precise && !this.labelHandles && this.isRange && minPreciseHandle,
-          this.precise && this.labelHandles && this.isRange && minLabeledPreciseHandle,
+          this.precise && !this.labelHandles && valueIsRange && minPreciseHandle,
+          this.precise && this.labelHandles && valueIsRange && minLabeledPreciseHandle,
           this.hasHistogram &&
             !this.precise &&
             this.labelHandles &&
-            this.isRange &&
+            valueIsRange &&
             minHistogramLabeledHandle,
           !this.precise && !this.labelHandles && handle,
           !this.hasHistogram && !this.precise && this.labelHandles && labeledHandle,
@@ -316,9 +327,10 @@ export class Slider {
           h(HiddenFormInputSlot, { component: this })))));
   }
   renderGraph() {
-    return this.histogram ? (h("calcite-graph", { class: "graph", colorStops: this.histogramStops, data: this.histogram, highlightMax: this.isRange ? this.maxValue : this.value, highlightMin: this.isRange ? this.minValue : this.min, max: this.max, min: this.min })) : null;
+    return this.histogram ? (h("calcite-graph", { class: "graph", colorStops: this.histogramStops, data: this.histogram, highlightMax: isRange(this.value) ? this.maxValue : this.value, highlightMin: isRange(this.value) ? this.minValue : this.min, max: this.max, min: this.min })) : null;
   }
   renderTickLabel(tick) {
+    const valueIsRange = isRange(this.value);
     const isMinTickLabel = tick === this.min;
     const isMaxTickLabel = tick === this.max;
     const tickLabel = (h("span", { class: {
@@ -326,26 +338,26 @@ export class Slider {
         "tick__label--min": isMinTickLabel,
         "tick__label--max": isMaxTickLabel
       } }, tick.toLocaleString()));
-    if (this.labelTicks && !this.hasHistogram && !this.isRange) {
+    if (this.labelTicks && !this.hasHistogram && !valueIsRange) {
       return tickLabel;
     }
     if (this.labelTicks &&
       !this.hasHistogram &&
-      this.isRange &&
+      valueIsRange &&
       !this.precise &&
       !this.labelHandles) {
       return tickLabel;
     }
     if (this.labelTicks &&
       !this.hasHistogram &&
-      this.isRange &&
+      valueIsRange &&
       !this.precise &&
       this.labelHandles) {
       return tickLabel;
     }
     if (this.labelTicks &&
       !this.hasHistogram &&
-      this.isRange &&
+      valueIsRange &&
       this.precise &&
       (isMinTickLabel || isMaxTickLabel)) {
       return tickLabel;
@@ -429,7 +441,7 @@ export class Slider {
     const x = event.clientX || event.pageX;
     const position = this.translate(x);
     let prop = "value";
-    if (this.isRange) {
+    if (isRange(this.value)) {
       const inRange = position >= this.minValue && position <= this.maxValue;
       if (inRange && this.lastDragProp === "minMaxValue") {
         prop = "minMaxValue";
@@ -465,6 +477,19 @@ export class Slider {
   //  Private Methods
   //
   //--------------------------------------------------------------------------
+  setValueFromMinMax() {
+    const { minValue, maxValue } = this;
+    if (typeof minValue === "number" && typeof maxValue === "number") {
+      this.value = [minValue, maxValue];
+    }
+  }
+  setMinMaxFromValue() {
+    const { value } = this;
+    if (isRange(value)) {
+      this.minValue = value[0];
+      this.maxValue = value[1];
+    }
+  }
   onLabelClick() {
     this.setFocus();
   }
@@ -472,7 +497,7 @@ export class Slider {
     return this.mirrored && !this.hasHistogram;
   }
   shouldUseMinValue() {
-    if (!this.isRange) {
+    if (!isRange(this.value)) {
       return false;
     }
     return ((this.hasHistogram && this.maxValue === 0) || (!this.hasHistogram && this.minValue === 0));
@@ -687,19 +712,20 @@ export class Slider {
    * Hides bounding tick labels that are obscured by either handle.
    */
   hideObscuredBoundingTickLabels() {
-    if (!this.hasHistogram && !this.isRange && !this.labelHandles && !this.precise) {
+    const valueIsRange = isRange(this.value);
+    if (!this.hasHistogram && !valueIsRange && !this.labelHandles && !this.precise) {
       return;
     }
-    if (!this.hasHistogram && !this.isRange && this.labelHandles && !this.precise) {
+    if (!this.hasHistogram && !valueIsRange && this.labelHandles && !this.precise) {
       return;
     }
-    if (!this.hasHistogram && !this.isRange && !this.labelHandles && this.precise) {
+    if (!this.hasHistogram && !valueIsRange && !this.labelHandles && this.precise) {
       return;
     }
-    if (!this.hasHistogram && !this.isRange && this.labelHandles && this.precise) {
+    if (!this.hasHistogram && !valueIsRange && this.labelHandles && this.precise) {
       return;
     }
-    if (!this.hasHistogram && this.isRange && !this.precise) {
+    if (!this.hasHistogram && valueIsRange && !this.precise) {
       return;
     }
     if (this.hasHistogram && !this.precise && !this.labelHandles) {
@@ -1147,8 +1173,8 @@ export class Slider {
       "type": "number",
       "mutable": true,
       "complexType": {
-        "original": "null | number",
-        "resolved": "number",
+        "original": "null | number | number[]",
+        "resolved": "number | number[]",
         "references": {}
       },
       "required": false,
@@ -1159,7 +1185,7 @@ export class Slider {
       },
       "attribute": "value",
       "reflect": true,
-      "defaultValue": "null"
+      "defaultValue": "0"
     },
     "scale": {
       "type": "string",
@@ -1263,6 +1289,15 @@ export class Slider {
   static get watchers() { return [{
       "propName": "histogram",
       "methodName": "histogramWatcher"
+    }, {
+      "propName": "value",
+      "methodName": "valueHandler"
+    }, {
+      "propName": "minValue",
+      "methodName": "minMaxValueHandler"
+    }, {
+      "propName": "maxValue",
+      "methodName": "minMaxValueHandler"
     }]; }
   static get listeners() { return [{
       "name": "keydown",

package/dist/collection/components/tab/tab.js

@@ -16,14 +16,6 @@ export class Tab {
     this.active = false;
     /** @internal Parent tabs component scale value */
     this.scale = "m";
-    //--------------------------------------------------------------------------
-    //
-    //  Private State/Props
-    //
-    //--------------------------------------------------------------------------
-    /**
-     * @internal
-     */
     this.guid = `calcite-tab-title-${guid()}`;
   }
   //--------------------------------------------------------------------------
@@ -37,12 +29,15 @@ export class Tab {
       h("section", null,
         h("slot", null))));
   }
+  connectedCallback() {
+    this.parentTabsEl = this.el.closest("calcite-tabs");
+  }
   componentDidLoad() {
     this.calciteTabRegister.emit();
   }
   componentWillRender() {
     var _a;
-    this.scale = (_a = this.el.closest("calcite-tabs")) === null || _a === void 0 ? void 0 : _a.scale;
+    this.scale = (_a = this.parentTabsEl) === null || _a === void 0 ? void 0 : _a.scale;
   }
   disconnectedCallback() {
     var _a;
@@ -57,10 +52,13 @@ export class Tab {
   //
   //--------------------------------------------------------------------------
   tabChangeHandler(event) {
+    const targetTabsEl = event
+      .composedPath()
+      .find((el) => el.tagName === "CALCITE-TABS");
     // to allow `<calcite-tabs>` to be nested we need to make sure this
-    // `calciteTabChange` event was actually fired from a title that is a
-    // child of the `<calcite-tabs>` that is the a parent of this tab.
-    if (!event.composedPath().includes(this.el.closest("calcite-tabs"))) {
+    // `calciteTabChange` event was actually fired from a within the same
+    // `<calcite-tabs>` that is the a parent of this tab.
+    if (targetTabsEl !== this.parentTabsEl) {
       return;
     }
     if (this.tab) {

package/dist/collection/components/tab-nav/tab-nav.js

@@ -52,6 +52,9 @@ export class TabNav {
   //  Lifecycle
   //
   //--------------------------------------------------------------------------
+  connectedCallback() {
+    this.parentTabsEl = this.el.closest("calcite-tabs");
+  }
   componentWillLoad() {
     const storageKey = `calcite-tab-nav-${this.storageId}`;
     if (localStorage && this.storageId && localStorage.getItem(storageKey)) {
@@ -63,11 +66,11 @@ export class TabNav {
     }
   }
   componentWillRender() {
-    var _a, _b, _c, _d;
-    this.layout = (_a = this.el.closest("calcite-tabs")) === null || _a === void 0 ? void 0 : _a.layout;
-    this.position = (_b = this.el.closest("calcite-tabs")) === null || _b === void 0 ? void 0 : _b.position;
-    this.scale = (_c = this.el.closest("calcite-tabs")) === null || _c === void 0 ? void 0 : _c.scale;
-    this.bordered = (_d = this.el.closest("calcite-tabs")) === null || _d === void 0 ? void 0 : _d.bordered;
+    const { parentTabsEl } = this;
+    this.layout = parentTabsEl === null || parentTabsEl === void 0 ? void 0 : parentTabsEl.layout;
+    this.position = parentTabsEl === null || parentTabsEl === void 0 ? void 0 : parentTabsEl.position;
+    this.scale = parentTabsEl === null || parentTabsEl === void 0 ? void 0 : parentTabsEl.scale;
+    this.bordered = parentTabsEl === null || parentTabsEl === void 0 ? void 0 : parentTabsEl.bordered;
     // fix issue with active tab-title not lining up with blue indicator
     if (this.selectedTabEl) {
       this.updateOffsetPosition();

package/dist/collection/components/tab-title/tab-title.js

@@ -32,9 +32,6 @@ export class TabTitle {
     this.mutationObserver = createObserver("mutation", () => this.updateHasText());
     /** determine if there is slotted text for styling purposes */
     this.hasText = false;
-    /**
-     * @internal
-     */
     this.guid = `calcite-tab-title-${guid()}`;
   }
   activeTabChanged() {
@@ -107,15 +104,19 @@ export class TabTitle {
   //
   //--------------------------------------------------------------------------
   tabChangeHandler(event) {
-    if (event.composedPath().includes(this.parentTabNavEl)) {
-      if (this.tab) {
-        this.active = this.tab === event.detail.tab;
-      }
-      else {
-        this.getTabIndex().then((index) => {
-          this.active = index === event.detail.tab;
-        });
-      }
+    const targetTabsEl = event
+      .composedPath()
+      .find((el) => el.tagName === "CALCITE-TABS");
+    if (targetTabsEl !== this.parentTabsEl) {
+      return;
+    }
+    if (this.tab) {
+      this.active = this.tab === event.detail.tab;
+    }
+    else {
+      this.getTabIndex().then((index) => {
+        this.active = index === event.detail.tab;
+      });
     }
   }
   onClick() {

package/dist/collection/components/tabs/tabs.js

@@ -42,14 +42,12 @@ export class Tabs {
     //
     //--------------------------------------------------------------------------
     /**
-     * @internal
      *
      * Stores an array of ids of `<calcite-tab-titles>`s to match up ARIA
      * attributes.
      */
     this.titles = [];
     /**
-     * @internal
      *
      * Stores an array of ids of `<calcite-tab>`s to match up ARIA attributes.
      */
@@ -114,7 +112,6 @@ export class Tabs {
   //
   //--------------------------------------------------------------------------
   /**
-   * @internal
    *
    * Matches up elements from the internal `tabs` and `titles` to automatically
    * update the ARIA attributes and link `<calcite-tab>` and