@esri/calcite-components 1.0.0-next.371 → 1.0.0-next.375

package/dist/components/calcite-tree-item.js

@@ -55,7 +55,7 @@ let CalciteTreeItem$1 = class extends HTMLElement {
       this.expanded = !this.expanded;
       if (this.selectionMode !== TreeSelectionMode.Ancestors) {
         this.calciteTreeItemSelect.emit({
-          modifyCurrentSelection: event.shiftKey,
+          modifyCurrentSelection: this.isSelectionMultiLike,
           forceToggle: true
         });
       }
@@ -89,6 +89,11 @@ let CalciteTreeItem$1 = class extends HTMLElement {
   expandedHandler(newValue) {
     this.updateParentIsExpanded(this.el, newValue);
   }
+  getselectionMode() {
+    this.isSelectionMultiLike =
+      this.selectionMode === TreeSelectionMode.Multi ||
+        this.selectionMode === TreeSelectionMode.MultiChildren;
+  }
   //--------------------------------------------------------------------------
   //
   //  Lifecycle
@@ -140,7 +145,8 @@ let CalciteTreeItem$1 = class extends HTMLElement {
         [CSS.chevron]: true,
         [CSS_UTILITY.rtl]: rtl
       }, "data-test-id": "icon", icon: ICONS.chevronRight, onClick: this.iconClickHandler, scale: "s" })) : null;
-    const checkbox = this.selectionMode === TreeSelectionMode.Ancestors ? (h("label", { class: CSS.checkboxLabel }, h("calcite-checkbox", { checked: this.selected, class: CSS.checkbox, "data-test-id": "checkbox", indeterminate: this.hasChildren && this.indeterminate, scale: this.scale, tabIndex: -1 }), h("slot", null))) : null;
+    const defaultSlotNode = h("slot", { key: "default-slot" });
+    const checkbox = this.selectionMode === TreeSelectionMode.Ancestors ? (h("label", { class: CSS.checkboxLabel, key: "checkbox-label" }, h("calcite-checkbox", { checked: this.selected, class: CSS.checkbox, "data-test-id": "checkbox", indeterminate: this.hasChildren && this.indeterminate, scale: this.scale, tabIndex: -1 }), defaultSlotNode)) : null;
     const selectedIcon = showBulletPoint
       ? ICONS.bulletPoint
       : showCheckmark
@@ -155,7 +161,7 @@ let CalciteTreeItem$1 = class extends HTMLElement {
     return (h(Host, { "aria-expanded": this.hasChildren ? this.expanded.toString() : undefined, "aria-hidden": hidden.toString(), "aria-selected": this.selected ? "true" : showCheckmark ? "false" : undefined, "calcite-hydrated-hidden": hidden, role: "treeitem", tabindex: this.parentExpanded || this.depth === 1 ? "0" : "-1" }, h("div", { class: {
         [CSS.nodeContainer]: true,
         [CSS_UTILITY.rtl]: rtl
-      }, "data-selection-mode": this.selectionMode, ref: (el) => (this.defaultSlotWrapper = el) }, chevron, bulletOrCheckIcon, checkbox ? checkbox : h("slot", null)), h("div", { class: {
+      }, "data-selection-mode": this.selectionMode, ref: (el) => (this.defaultSlotWrapper = el) }, chevron, bulletOrCheckIcon, checkbox ? checkbox : defaultSlotNode), h("div", { class: {
         [CSS.childrenContainer]: true,
         [CSS_UTILITY.rtl]: rtl
       }, "data-test-id": "calcite-tree-children", onClick: this.childrenClickHandler, ref: (el) => (this.childrenSlotWrapper = el), role: this.hasChildren ? "group" : undefined }, h("slot", { name: SLOTS.children }))));
@@ -174,7 +180,7 @@ let CalciteTreeItem$1 = class extends HTMLElement {
       window.open(link.href, target);
     }
     this.calciteTreeItemSelect.emit({
-      modifyCurrentSelection: e.shiftKey || this.selectionMode === TreeSelectionMode.Ancestors,
+      modifyCurrentSelection: this.selectionMode === TreeSelectionMode.Ancestors || this.isSelectionMultiLike,
       forceToggle: false
     });
   }
@@ -183,7 +189,7 @@ let CalciteTreeItem$1 = class extends HTMLElement {
     switch (e.key) {
       case " ":
         this.calciteTreeItemSelect.emit({
-          modifyCurrentSelection: e.shiftKey,
+          modifyCurrentSelection: this.isSelectionMultiLike,
           forceToggle: false
         });
         e.preventDefault();
@@ -198,7 +204,7 @@ let CalciteTreeItem$1 = class extends HTMLElement {
         }
         else {
           this.calciteTreeItemSelect.emit({
-            modifyCurrentSelection: e.shiftKey,
+            modifyCurrentSelection: this.isSelectionMultiLike,
             forceToggle: false
           });
         }
@@ -269,7 +275,8 @@ let CalciteTreeItem$1 = class extends HTMLElement {
   }
   get el() { return this; }
   static get watchers() { return {
-    "expanded": ["expandedHandler"]
+    "expanded": ["expandedHandler"],
+    "selectionMode": ["getselectionMode"]
   }; }
   static get style() { return calciteTreeItemCss; }
 };

package/dist/components/dom.js

@@ -122,9 +122,9 @@ async function focusElement(el) {
   }
   return isCalciteFocusable(el) ? el.setFocus() : el.focus();
 }
-const defaultSlotSelector = "> :not([slot])";
+const defaultSlotSelector = ":not([slot])";
 function getSlotted(element, slotName, options) {
-  if (!Array.isArray(slotName) && typeof slotName !== "string") {
+  if (slotName && !Array.isArray(slotName) && typeof slotName !== "string") {
     options = slotName;
     slotName = null;
   }
@@ -138,12 +138,15 @@ function getSlotted(element, slotName, options) {
   }
   return querySingle(element, slotSelector, options);
 }
+function getDirectChildren(el, selector) {
+  return el ? Array.from(el.children || []).filter((child) => child === null || child === void 0 ? void 0 : child.matches(selector)) : [];
+}
 function queryMultiple(element, slotSelector, options) {
-  let matches = Array.from(element.querySelectorAll(slotSelector));
+  let matches = slotSelector === defaultSlotSelector
+    ? getDirectChildren(element, defaultSlotSelector)
+    : Array.from(element.querySelectorAll(slotSelector));
   matches = options && options.direct === false ? matches : matches.filter((el) => el.parentElement === element);
-  if (slotSelector === defaultSlotSelector) {
-    matches = matches.filter((match) => match === null || match === void 0 ? void 0 : match.assignedSlot);
-  }
+  matches = (options === null || options === void 0 ? void 0 : options.matches) ? matches.filter((el) => el === null || el === void 0 ? void 0 : el.matches(options.matches)) : matches;
   const selector = options === null || options === void 0 ? void 0 : options.selector;
   return selector
     ? matches
@@ -153,11 +156,11 @@ function queryMultiple(element, slotSelector, options) {
     : matches;
 }
 function querySingle(element, slotSelector, options) {
-  let match = element.querySelector(slotSelector);
-  if (slotSelector === defaultSlotSelector) {
-    match = (match === null || match === void 0 ? void 0 : match.assignedSlot) ? match : null;
-  }
+  let match = slotSelector === defaultSlotSelector
+    ? getDirectChildren(element, defaultSlotSelector)[0] || null
+    : element.querySelector(slotSelector);
   match = options && options.direct === false ? match : (match === null || match === void 0 ? void 0 : match.parentElement) === element ? match : null;
+  match = (options === null || options === void 0 ? void 0 : options.matches) ? ((match === null || match === void 0 ? void 0 : match.matches(options.matches)) ? match : null) : match;
   const selector = options === null || options === void 0 ? void 0 : options.selector;
   return selector ? match === null || match === void 0 ? void 0 : match.querySelector(selector) : match;
 }