@vonage/vivid 3.49.0 → 3.50.1

package/shared/definition56.js

@@ -1,18 +1,9 @@
-import { a as attr, h as html, r as registerFactory } from './index.js';
-import { a as iconRegistries } from './definition26.js';
-import { f as focusRegistries } from './definition58.js';
-import { A as AffixIcon, a as affixIconTemplateFactory, I as IconWrapper } from './affix.js';
-import { T as TreeItem$1 } from './tree-item.js';
-import { a as applyMixins } from './apply-mixins.js';
-import { I as Icon } from './icon.js';
-import { f as focusTemplateFactory } from './focus2.js';
-import { e as elements, s as slotted } from './slotted.js';
-import { c as children } from './children.js';
-import { w as when } from './when.js';
+import { a as attr, F as FoundationElement, h as html, r as registerFactory } from './index.js';
+import { P as Popup, p as popupRegistries } from './definition60.js';
+import { a as anchored } from './anchored.js';
 import { c as classNames } from './class-names.js';
-import { r as ref } from './ref.js';
 
-const styles = "@supports selector(:focus-visible){:host(:focus-visible){outline:none}}:host([disabled]){cursor:not-allowed}.control{position:relative;display:inline-flex;box-sizing:border-box;align-items:center;background-color:var(--_appearance-color-fill);border-radius:8px;box-shadow:inset 0 0 0 1px var(--_appearance-color-outline);color:var(--_appearance-color-text);font:var(--vvd-typography-base);gap:12px;hyphens:auto;inline-size:100%;min-block-size:calc(1px*(40 + 4*clamp(-1,var(--vvd-size-density, 0),2)));padding-inline:16px;text-decoration:none;vertical-align:middle;word-break:break-word}.control{--_appearance-color-text: var(--_connotation-color-primary);--_appearance-color-fill: transparent;--_appearance-color-outline: transparent}.control:where(:disabled,.disabled){--_appearance-color-text: var(--vvd-color-neutral-300);--_appearance-color-fill: transparent;--_appearance-color-outline: transparent}.control:where(:hover,.hover):where(:not(:disabled,.disabled,.readonly)){--_appearance-color-text: var(--_connotation-color-primary);--_appearance-color-fill: var(--_connotation-color-faint);--_appearance-color-outline: transparent}.control:where(:active,.active):where(:not(:disabled,.disabled)){--_appearance-color-text: var(--_connotation-color-primary);--_appearance-color-fill: var(--_connotation-color-soft);--_appearance-color-outline: transparent}.control:where(.selected,[aria-current]):where(:not(:disabled,.disabled)){--_appearance-color-text: var(--_connotation-color-primary-text);--_appearance-color-fill: var(--_connotation-color-primary);--_appearance-color-outline: transparent}.control:where(.selected,[aria-current]):where(:hover,.hover):where(:not(:disabled,.disabled,.readonly)){--_appearance-color-text: var(--_connotation-color-primary-text);--_appearance-color-fill: var(--_connotation-color-primary-increment);--_appearance-color-outline: transparent}.control{--_connotation-color-primary: var(--vvd-tree-item-accent-primary, var(--vvd-color-canvas-text));--_connotation-color-primary-text: var(--vvd-tree-item-accent-primary-text, var(--vvd-color-canvas));--_connotation-color-primary-increment: var(--vvd-tree-item-accent-primary-increment, var(--vvd-color-neutral-800));--_connotation-color-faint: var(--vvd-tree-item-accent-faint, var(--vvd-color-neutral-50));--_connotation-color-soft: var(--vvd-tree-item-accent-soft, var(--vvd-color-neutral-100))}@supports selector(:focus-visible){.control:focus-visible{outline:none}}@supports (user-select: none){.control{user-select:none}}.control:not(.disabled){cursor:pointer}.control.disabled{pointer-events:none}.control .text{font:var(--vvd-typography-base)}.expandCollapseButton{display:flex;align-items:center;border-radius:8px;font-size:20px}.expandCollapseButton .expandCollapseIcon{margin:4px}.expandCollapseButton:hover{background-color:var(--vvd-color-neutral-100)}.selected .expandCollapseButton:hover{background-color:var(--vvd-color-neutral-700)}.items{display:flex;flex-direction:column;gap:4px;margin-block:4px;padding-inline-start:48px}:host(:not(:focus-visible)) .focus-indicator{display:none}slot[name=icon]{font-size:20px;line-height:1}.control:not(.disabled,.selected) slot[name=icon]{color:var(--vvd-color-neutral-600)}\n";
+const styles = ".control{pointer-events:none}.tooltip{width:var(--tooltip-inline-size, auto)}.tooltip-text{padding:8px 12px;color:var(--vvd-color-canvas-text);font:var(--vvd-typography-base-bold)}\n";
 
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -25,71 +16,109 @@ var __decorateClass = (decorators, target, key, kind) => {
     __defProp(target, key, result);
   return result;
 };
-class TreeItem extends TreeItem$1 {
-}
+let Tooltip = class extends FoundationElement {
+  constructor() {
+    super(...arguments);
+    this.open = false;
+    this.#show = () => {
+      this.open = true;
+    };
+    this.#hide = () => {
+      this.open = false;
+    };
+    this.#closeOnEscape = (e) => {
+      if (e.key === "Escape")
+        this.#hide();
+    };
+  }
+  connectedCallback() {
+    super.connectedCallback();
+    this.#updateListeners();
+  }
+  disconnectedCallback() {
+    super.disconnectedCallback();
+    this.#updateListeners();
+  }
+  /**
+   * @internal
+   */
+  _anchorElChanged(oldValue, newValue) {
+    if (oldValue)
+      this.#cleanupAnchor(oldValue);
+    if (newValue)
+      this.#setupAnchor(newValue);
+  }
+  #setupAnchor(a) {
+    a.addEventListener("mouseover", this.#show);
+    a.addEventListener("mouseout", this.#hide);
+    a.addEventListener("focusin", this.#show);
+    a.addEventListener("focusout", this.#hide);
+  }
+  #cleanupAnchor(a) {
+    a.removeEventListener("mouseover", this.#show);
+    a.removeEventListener("mouseout", this.#hide);
+    a.removeEventListener("focusin", this.#show);
+    a.removeEventListener("focusout", this.#hide);
+  }
+  #show;
+  #hide;
+  #updateListeners() {
+    document.removeEventListener("keydown", this.#closeOnEscape);
+    if (this.open && this.isConnected) {
+      document.addEventListener("keydown", this.#closeOnEscape);
+    }
+  }
+  #closeOnEscape;
+  /**
+   * @internal
+   */
+  openChanged(oldValue) {
+    if (oldValue === void 0)
+      return;
+    this.#updateListeners();
+  }
+};
 __decorateClass([
   attr
-], TreeItem.prototype, "text", 2);
-applyMixins(TreeItem, AffixIcon);
+], Tooltip.prototype, "text", 2);
+__decorateClass([
+  attr({ mode: "fromView" })
+], Tooltip.prototype, "placement", 2);
+__decorateClass([
+  attr({ mode: "boolean" })
+], Tooltip.prototype, "open", 2);
+Tooltip = __decorateClass([
+  anchored
+], Tooltip);
 
 const getClasses = ({
-  disabled,
-  selected
+  open
 }) => classNames(
   "control",
-  ["disabled", disabled],
-  ["selected", Boolean(selected)]
+  ["open", Boolean(open)]
 );
-const expandCollapseButton = (context) => {
-  const iconTag = context.tagFor(Icon);
+const TooltipTemplate = (context) => {
+  const popupTag = context.tagFor(Popup);
   return html`
-	<div aria-hidden="true"
-		class="expandCollapseButton"
-		@click="${(x, c) => x.handleExpandCollapseButtonClick(c.event)}"
-			${ref("expandCollapseButton")}
-	>
-		<${iconTag} class="expandCollapseIcon" name="${(x) => x.expanded ? "chevron-down-line" : "chevron-right-line"}"></${iconTag}>
-	</div>`;
-};
-const TreeItemTemplate = (context) => {
-  const affixIconTemplate = affixIconTemplateFactory(context);
-  const focusTemplate = focusTemplateFactory(context);
-  return html`
-	<template
-			role="treeitem"
-			slot="${(x) => x.isNestedItem() ? "item" : void 0}"
-			tabindex="-1"
-			aria-expanded="${(x) => x.childItems && x.childItems.length > 0 ? x.expanded : void 0}"
-			aria-selected="${(x) => x.selected}"
-			aria-disabled="${(x) => x.disabled}"
-			@focusin="${(x, c) => x.handleFocus(c.event)}"
-			@focusout="${(x, c) => x.handleBlur(c.event)}"
-			${children({ property: "childItems", filter: elements(context.tagFor(TreeItem)) })}
-			>
-			<div class="${getClasses}">
-				${() => focusTemplate}
-				${when((x) => x.childItems && x.childItems.length > 0, expandCollapseButton(context))}
-				${(x) => affixIconTemplate(x.icon, IconWrapper.Slot)}
-				${(x) => x.text}
-			</div>
-			${when(
-    (x) => x.childItems && x.childItems.length > 0 && x.expanded,
-    html`
-				<div role="group" class="items">
-					<slot name="item" ${slotted("items")}></slot>
-				</div>`
-  )}
-		</template>`;
+<${popupTag} class="${getClasses}" arrow alternate
+	:placement=${(x) => x.placement}
+	:anchor="${(x) => x._anchorEl}"
+	:open=${(x) => x.open}
+  exportparts="vvd-theme-alternate">
+  <div class="tooltip" role="tooltip">
+    <header part="vvd-theme-alternate" class="tooltip-header">
+      <div class="tooltip-text">${(x) => x.text}</div>
+    </header>
+  </div>
+</${popupTag}>`;
 };
 
-const treeItemDefinition = TreeItem.compose(
-  {
-    baseName: "tree-item",
-    template: TreeItemTemplate,
-    styles
-  }
-);
-const treeItemRegistries = [treeItemDefinition(), ...iconRegistries, ...focusRegistries];
-const registerTreeItem = registerFactory(treeItemRegistries);
+const tooltipDefinition = Tooltip.compose({
+  baseName: "tooltip",
+  template: TooltipTemplate,
+  styles
+});
+const tooltipRegistries = [tooltipDefinition(), ...popupRegistries];
+const registerTooltip = registerFactory(tooltipRegistries);
 
-export { treeItemRegistries as a, registerTreeItem as r, treeItemDefinition as t };
+export { tooltipRegistries as a, registerTooltip as r, tooltipDefinition as t };

package/shared/definition57.cjs

@@ -1,310 +1,95 @@
 'use strict';
 
 const index = require('./index.cjs');
+const definition = require('./definition26.cjs');
+const affix = require('./affix.cjs');
 const treeItem = require('./tree-item.cjs');
-const dom = require('./dom.cjs');
-const keyCodes = require('./key-codes.cjs');
-const ref = require('./ref.cjs');
+const applyMixins = require('./apply-mixins.cjs');
+const icon = require('./icon.cjs');
 const slotted = require('./slotted.cjs');
+const children = require('./children.cjs');
+const when = require('./when.cjs');
 const classNames = require('./class-names.cjs');
+const ref = require('./ref.cjs');
 
-/**
- * A Tree view Custom HTML Element.
- * Implements the {@link https://w3c.github.io/aria-practices/#TreeView | ARIA TreeView }.
- *
- * @slot - The default slot for tree items
- *
- * @public
- */
-let TreeView$1 = class TreeView extends index.FoundationElement {
-    constructor() {
-        super(...arguments);
-        /**
-         * The tree item that is designated to be in the tab queue.
-         *
-         * @internal
-         */
-        this.currentFocused = null;
-        /**
-         * Handle focus events
-         *
-         * @internal
-         */
-        this.handleFocus = (e) => {
-            if (this.slottedTreeItems.length < 1) {
-                // no child items, nothing to do
-                return;
-            }
-            if (e.target === this) {
-                if (this.currentFocused === null) {
-                    this.currentFocused = this.getValidFocusableItem();
-                }
-                if (this.currentFocused !== null) {
-                    treeItem.TreeItem.focusItem(this.currentFocused);
-                }
-                return;
-            }
-            if (this.contains(e.target)) {
-                this.setAttribute("tabindex", "-1");
-                this.currentFocused = e.target;
-            }
-        };
-        /**
-         * Handle blur events
-         *
-         * @internal
-         */
-        this.handleBlur = (e) => {
-            if (e.target instanceof HTMLElement &&
-                (e.relatedTarget === null || !this.contains(e.relatedTarget))) {
-                this.setAttribute("tabindex", "0");
-            }
-        };
-        /**
-         * KeyDown handler
-         *
-         *  @internal
-         */
-        this.handleKeyDown = (e) => {
-            if (e.defaultPrevented) {
-                return;
-            }
-            if (this.slottedTreeItems.length < 1) {
-                return true;
-            }
-            const treeItems = this.getVisibleNodes();
-            switch (e.key) {
-                case keyCodes.keyHome:
-                    if (treeItems.length) {
-                        treeItem.TreeItem.focusItem(treeItems[0]);
-                    }
-                    return;
-                case keyCodes.keyEnd:
-                    if (treeItems.length) {
-                        treeItem.TreeItem.focusItem(treeItems[treeItems.length - 1]);
-                    }
-                    return;
-                case keyCodes.keyArrowLeft:
-                    if (e.target && this.isFocusableElement(e.target)) {
-                        const item = e.target;
-                        if (item instanceof treeItem.TreeItem &&
-                            item.childItemLength() > 0 &&
-                            item.expanded) {
-                            item.expanded = false;
-                        }
-                        else if (item instanceof treeItem.TreeItem &&
-                            item.parentElement instanceof treeItem.TreeItem) {
-                            treeItem.TreeItem.focusItem(item.parentElement);
-                        }
-                    }
-                    return false;
-                case keyCodes.keyArrowRight:
-                    if (e.target && this.isFocusableElement(e.target)) {
-                        const item = e.target;
-                        if (item instanceof treeItem.TreeItem &&
-                            item.childItemLength() > 0 &&
-                            !item.expanded) {
-                            item.expanded = true;
-                        }
-                        else if (item instanceof treeItem.TreeItem && item.childItemLength() > 0) {
-                            this.focusNextNode(1, e.target);
-                        }
-                    }
-                    return;
-                case keyCodes.keyArrowDown:
-                    if (e.target && this.isFocusableElement(e.target)) {
-                        this.focusNextNode(1, e.target);
-                    }
-                    return;
-                case keyCodes.keyArrowUp:
-                    if (e.target && this.isFocusableElement(e.target)) {
-                        this.focusNextNode(-1, e.target);
-                    }
-                    return;
-                case keyCodes.keyEnter:
-                    // In single-select trees where selection does not follow focus (see note below),
-                    // the default action is typically to select the focused node.
-                    this.handleClick(e);
-                    return;
-            }
-            // don't prevent default if we took no action
-            return true;
-        };
-        /**
-         * Handles the selected-changed events bubbling up
-         * from child tree items
-         *
-         *  @internal
-         */
-        this.handleSelectedChange = (e) => {
-            if (e.defaultPrevented) {
-                return;
-            }
-            if (!(e.target instanceof Element) || !treeItem.isTreeItemElement(e.target)) {
-                return true;
-            }
-            const item = e.target;
-            if (item.selected) {
-                if (this.currentSelected && this.currentSelected !== item) {
-                    this.currentSelected.selected = false;
-                }
-                // new selected item
-                this.currentSelected = item;
-            }
-            else if (!item.selected && this.currentSelected === item) {
-                // selected item deselected
-                this.currentSelected = null;
-            }
-            return;
-        };
-        /**
-         * Updates the tree view when slottedTreeItems changes
-         */
-        this.setItems = () => {
-            // force single selection
-            // defaults to first one found
-            const selectedItem = this.treeView.querySelector("[aria-selected='true']");
-            this.currentSelected = selectedItem;
-            // invalidate the current focused item if it is no longer valid
-            if (this.currentFocused === null || !this.contains(this.currentFocused)) {
-                this.currentFocused = this.getValidFocusableItem();
-            }
-            // toggle properties on child elements
-            this.nested = this.checkForNestedItems();
-            const treeItems = this.getVisibleNodes();
-            treeItems.forEach(node => {
-                if (treeItem.isTreeItemElement(node)) {
-                    node.nested = this.nested;
-                }
-            });
-        };
-        /**
-         * check if the item is focusable
-         */
-        this.isFocusableElement = (el) => {
-            return treeItem.isTreeItemElement(el);
-        };
-        this.isSelectedElement = (el) => {
-            return el.selected;
-        };
-    }
-    slottedTreeItemsChanged() {
-        if (this.$fastController.isConnected) {
-            // update for slotted children change
-            this.setItems();
-        }
-    }
-    connectedCallback() {
-        super.connectedCallback();
-        this.setAttribute("tabindex", "0");
-        index.DOM.queueUpdate(() => {
-            this.setItems();
-        });
-    }
-    /**
-     * Handles click events bubbling up
-     *
-     *  @internal
-     */
-    handleClick(e) {
-        if (e.defaultPrevented) {
-            // handled, do nothing
-            return;
-        }
-        if (!(e.target instanceof Element) || !treeItem.isTreeItemElement(e.target)) {
-            // not a tree item, ignore
-            return true;
-        }
-        const item = e.target;
-        if (!item.disabled) {
-            item.selected = !item.selected;
-        }
-        return;
-    }
-    /**
-     * Move focus to a tree item based on its offset from the provided item
-     */
-    focusNextNode(delta, item) {
-        const visibleNodes = this.getVisibleNodes();
-        if (!visibleNodes) {
-            return;
-        }
-        const focusItem = visibleNodes[visibleNodes.indexOf(item) + delta];
-        if (dom.isHTMLElement(focusItem)) {
-            treeItem.TreeItem.focusItem(focusItem);
-        }
-    }
-    /**
-     * checks if there are any nested tree items
-     */
-    getValidFocusableItem() {
-        const treeItems = this.getVisibleNodes();
-        // default to selected element if there is one
-        let focusIndex = treeItems.findIndex(this.isSelectedElement);
-        if (focusIndex === -1) {
-            // otherwise first focusable tree item
-            focusIndex = treeItems.findIndex(this.isFocusableElement);
-        }
-        if (focusIndex !== -1) {
-            return treeItems[focusIndex];
-        }
-        return null;
-    }
-    /**
-     * checks if there are any nested tree items
-     */
-    checkForNestedItems() {
-        return this.slottedTreeItems.some((node) => {
-            return treeItem.isTreeItemElement(node) && node.querySelector("[role='treeitem']");
-        });
-    }
-    getVisibleNodes() {
-        return dom.getDisplayedNodes(this, "[role='treeitem']") || [];
-    }
-};
-index.__decorate([
-    index.attr({ attribute: "render-collapsed-nodes" })
-], TreeView$1.prototype, "renderCollapsedNodes", void 0);
-index.__decorate([
-    index.observable
-], TreeView$1.prototype, "currentSelected", void 0);
-index.__decorate([
-    index.observable
-], TreeView$1.prototype, "slottedTreeItems", void 0);
-
-const styles = ".control{position:relative;display:flex;flex-direction:column;gap:4px}\n";
+const styles = ":host(:focus-visible){outline:none}:host([disabled]){cursor:not-allowed}.control{position:relative;display:inline-flex;box-sizing:border-box;align-items:center;background-color:var(--_appearance-color-fill);border-radius:8px;box-shadow:inset 0 0 0 1px var(--_appearance-color-outline);color:var(--_appearance-color-text);font:var(--vvd-typography-base);gap:12px;hyphens:auto;inline-size:100%;min-block-size:calc(1px*(40 + 4*clamp(-1,var(--vvd-size-density, 0),2)));padding-inline:16px;text-decoration:none;vertical-align:middle;word-break:break-word}.control{--_appearance-color-text: var(--_connotation-color-primary);--_appearance-color-fill: transparent;--_appearance-color-outline: transparent}.control:where(:disabled,.disabled){--_appearance-color-text: var(--vvd-color-neutral-300);--_appearance-color-fill: transparent;--_appearance-color-outline: transparent}.control:where(:hover,.hover):where(:not(:disabled,.disabled,.readonly)){--_appearance-color-text: var(--_connotation-color-primary);--_appearance-color-fill: var(--_connotation-color-faint);--_appearance-color-outline: transparent}.control:where(:active,.active):where(:not(:disabled,.disabled)){--_appearance-color-text: var(--_connotation-color-primary);--_appearance-color-fill: var(--_connotation-color-soft);--_appearance-color-outline: transparent}.control:where(.selected,[aria-current]):where(:not(:disabled,.disabled)){--_appearance-color-text: var(--_connotation-color-primary-text);--_appearance-color-fill: var(--_connotation-color-primary);--_appearance-color-outline: transparent}.control:where(.selected,[aria-current]):where(:hover,.hover):where(:not(:disabled,.disabled,.readonly)){--_appearance-color-text: var(--_connotation-color-primary-text);--_appearance-color-fill: var(--_connotation-color-primary-increment);--_appearance-color-outline: transparent}.control{--_connotation-color-primary: var(--vvd-tree-item-accent-primary, var(--vvd-color-canvas-text));--_connotation-color-primary-text: var(--vvd-tree-item-accent-primary-text, var(--vvd-color-canvas));--_connotation-color-primary-increment: var(--vvd-tree-item-accent-primary-increment, var(--vvd-color-neutral-800));--_connotation-color-faint: var(--vvd-tree-item-accent-faint, var(--vvd-color-neutral-50));--_connotation-color-soft: var(--vvd-tree-item-accent-soft, var(--vvd-color-neutral-100))}@supports (user-select: none){.control{user-select:none}}.control:not(.disabled){cursor:pointer}.control.disabled{pointer-events:none}:host(:focus-visible) .control{box-shadow:inset 0 0 0 3px var(--focus-stroke-gap-color, currentColor);outline:2px solid var(--focus-stroke-color, var(--vvd-color-canvas-text));outline-offset:calc(-2px - var(--focus-inset, 0px))}:host(:focus-visible) .control:not(.selected){--focus-stroke-gap-color: transparent}.control .text{font:var(--vvd-typography-base)}.expandCollapseButton{display:flex;align-items:center;border-radius:8px;font-size:20px}.expandCollapseButton .expandCollapseIcon{margin:4px}.expandCollapseButton:hover{background-color:var(--vvd-color-neutral-100)}.selected .expandCollapseButton:hover{background-color:var(--vvd-color-neutral-700)}.items{display:flex;flex-direction:column;gap:4px;margin-block:4px;padding-inline-start:48px}slot[name=icon]{font-size:20px;line-height:1}.control:not(.disabled,.selected) slot[name=icon]{color:var(--vvd-color-neutral-600)}\n";
 
-class TreeView extends TreeView$1 {
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result)
+    __defProp(target, key, result);
+  return result;
+};
+class TreeItem extends treeItem.TreeItem {
 }
+__decorateClass([
+  index.attr
+], TreeItem.prototype, "text", 2);
+applyMixins.applyMixins(TreeItem, affix.AffixIcon);
 
-const getClasses = (_) => classNames.classNames("control");
-const TreeViewTemplate = () => {
+const getClasses = ({
+  disabled,
+  selected
+}) => classNames.classNames(
+  "control",
+  ["disabled", disabled],
+  ["selected", Boolean(selected)]
+);
+const expandCollapseButton = (context) => {
+  const iconTag = context.tagFor(icon.Icon);
+  return index.html`
+	<div aria-hidden="true"
+		class="expandCollapseButton"
+		@click="${(x, c) => x.handleExpandCollapseButtonClick(c.event)}"
+			${ref.ref("expandCollapseButton")}
+	>
+		<${iconTag} class="expandCollapseIcon" name="${(x) => x.expanded ? "chevron-down-line" : "chevron-right-line"}"></${iconTag}>
+	</div>`;
+};
+const TreeItemTemplate = (context) => {
+  const affixIconTemplate = affix.affixIconTemplateFactory(context);
   return index.html`
 	<template
-		role="tree"
-		${ref.ref("treeView")}
-		@keydown="${(x, c) => x.handleKeyDown(c.event)}"
-		@focusin="${(x, c) => x.handleFocus(c.event)}"
-		@focusout="${(x, c) => x.handleBlur(c.event)}"
-		@click="${(x, c) => x.handleClick(c.event)}"
-		@selected-change="${(x, c) => x.handleSelectedChange(c.event)}"
-		>
-		<div class="${getClasses}">
-			<slot ${slotted.slotted("slottedTreeItems")}></slot>
-		</div>
-	</template>`;
+			role="treeitem"
+			slot="${(x) => x.isNestedItem() ? "item" : void 0}"
+			tabindex="-1"
+			aria-expanded="${(x) => x.childItems && x.childItems.length > 0 ? x.expanded : void 0}"
+			aria-selected="${(x) => x.selected}"
+			aria-disabled="${(x) => x.disabled}"
+			@focusin="${(x, c) => x.handleFocus(c.event)}"
+			@focusout="${(x, c) => x.handleBlur(c.event)}"
+			${children.children({ property: "childItems", filter: slotted.elements(context.tagFor(TreeItem)) })}
+			>
+			<div class="${getClasses}">
+				${when.when((x) => x.childItems && x.childItems.length > 0, expandCollapseButton(context))}
+				${(x) => affixIconTemplate(x.icon, affix.IconWrapper.Slot)}
+				${(x) => x.text}
+			</div>
+			${when.when(
+    (x) => x.childItems && x.childItems.length > 0 && x.expanded,
+    index.html`
+				<div role="group" class="items">
+					<slot name="item" ${slotted.slotted("items")}></slot>
+				</div>`
+  )}
+		</template>`;
 };
 
-const treeViewDefinition = TreeView.compose(
+const treeItemDefinition = TreeItem.compose(
   {
-    baseName: "tree-view",
-    template: TreeViewTemplate,
+    baseName: "tree-item",
+    template: TreeItemTemplate,
     styles
   }
 );
-const treeViewRegistries = [treeViewDefinition()];
-const registerTreeView = index.registerFactory(treeViewRegistries);
+const treeItemRegistries = [treeItemDefinition(), ...definition.iconRegistries];
+const registerTreeItem = index.registerFactory(treeItemRegistries);
 
-exports.registerTreeView = registerTreeView;
-exports.treeViewDefinition = treeViewDefinition;
-exports.treeViewRegistries = treeViewRegistries;
+exports.registerTreeItem = registerTreeItem;
+exports.treeItemDefinition = treeItemDefinition;
+exports.treeItemRegistries = treeItemRegistries;