Merge branch 'dev' into benelan/boolean-reflection-lumina

Esri · Oct 31, 2024 · cc991dc · cc991dc
2 parents 2086c7e + 1005109
commit cc991dc
Show file tree

Hide file tree

Showing 22 changed files with 1,344 additions and 283 deletions.
diff --git a/packages/calcite-components/src/components.d.ts b/packages/calcite-components/src/components.d.ts
diff --git a/packages/calcite-components/src/components/action/action.scss b/packages/calcite-components/src/components/action/action.scss
@@ -18,7 +18,7 @@
 
 :host {
   @extend %component-host;
-  @apply flex bg-transparent;
+  @apply flex bg-transparent cursor-pointer;
 }
 
 :host,
@@ -62,7 +62,6 @@ button {
     m-0
     flex
     w-auto
-    cursor-pointer
     items-center
     justify-start
     border-none
@@ -73,6 +72,7 @@ button {
   color: var(--calcite-action-text-color, var(--calcite-color-text-3));
   text-align: unset;
   flex: 1 0 auto;
+  cursor: inherit;
 
   &:hover,
   &:focus {
@@ -173,7 +173,8 @@ button {
 
 :host([scale="s"]) {
   .button {
-    @apply text-n2h px-2 font-normal;
+    @apply text-n2h font-normal;
+    padding-inline: var(--calcite-internal-action-padding-inline, theme("spacing.2"));
     padding-block: var(--calcite-internal-action-padding-block, var(--calcite-size-xxs));
   }
   .button--text-visible .icon-container {
@@ -183,7 +184,8 @@ button {
 
 :host([scale="m"]) {
   .button {
-    @apply text-n1h px-4 font-normal;
+    @apply text-n1h font-normal;
+    padding-inline: var(--calcite-internal-action-padding-inline, theme("spacing.4"));
     padding-block: var(--calcite-internal-action-padding-block, var(--calcite-size-md));
   }
   .button--text-visible .icon-container {
@@ -193,7 +195,8 @@ button {
 
 :host([scale="l"]) {
   .button {
-    @apply text-0h px-5 font-normal;
+    @apply text-0h font-normal;
+    padding-inline: var(--calcite-internal-action-padding-inline, theme("spacing.5"));
     padding-block: var(--calcite-internal-action-padding-block, var(--calcite-size-xl));
   }
   .button--text-visible .icon-container {

diff --git a/packages/calcite-components/src/components/dropdown/dropdown.tsx b/packages/calcite-components/src/components/dropdown/dropdown.tsx
@@ -591,6 +591,7 @@ export class Dropdown
       this.toggleDropdown();
       event.preventDefault();
     } else if (key === "ArrowDown" || key === "ArrowUp") {
+      event.preventDefault();
       this.focusLastDropdownItem = key === "ArrowUp";
       this.open = true;
       this.el.addEventListener("calciteDropdownOpen", this.onOpenEnd);

diff --git a/packages/calcite-components/src/components/list-item/list-item.e2e.ts b/packages/calcite-components/src/components/list-item/list-item.e2e.ts
@@ -48,10 +48,6 @@ describe("calcite-list-item", () => {
         propertyName: "dragHandle",
         defaultValue: false,
       },
-      {
-        propertyName: "dragSelected",
-        defaultValue: false,
-      },
       {
         propertyName: "filterHidden",
         defaultValue: false,
@@ -139,15 +135,15 @@ describe("calcite-list-item", () => {
     await page.setContent(`<calcite-list-item></calcite-list-item>`);
     await page.waitForChanges();
 
-    let handleNode = await page.find("calcite-list-item >>> calcite-handle");
+    let handleNode = await page.find("calcite-list-item >>> calcite-sort-handle");
 
     expect(handleNode).toBeNull();
 
     const item = await page.find("calcite-list-item");
     item.setProperty("dragHandle", true);
     await page.waitForChanges();
 
-    handleNode = await page.find("calcite-list-item >>> calcite-handle");
+    handleNode = await page.find("calcite-list-item >>> calcite-sort-handle");
 
     expect(handleNode).not.toBeNull();
   });
@@ -375,29 +371,4 @@ describe("calcite-list-item", () => {
     expect(await listItem.getProperty("open")).toBe(false);
     expect(calciteListItemToggle).toHaveReceivedEventTimes(2);
   });
-
-  it("should fire calciteListItemDragHandleChange event when drag handle is clicked", async () => {
-    const page = await newE2EPage({
-      html: html`<calcite-list-item drag-handle></calcite-list-item>`,
-    });
-
-    const listItem = await page.find("calcite-list-item");
-    const calciteListItemDragHandleChange = await page.spyOnEvent("calciteListItemDragHandleChange", "window");
-
-    expect(await listItem.getProperty("dragSelected")).toBe(false);
-
-    const dragHandle = await page.find(`calcite-list-item >>> calcite-handle`);
-    await dragHandle.callMethod("setFocus");
-    await page.waitForChanges();
-
-    await dragHandle.press("Space");
-    await page.waitForChanges();
-    expect(await listItem.getProperty("dragSelected")).toBe(true);
-    expect(calciteListItemDragHandleChange).toHaveReceivedEventTimes(1);
-
-    await dragHandle.press("Space");
-    await page.waitForChanges();
-    expect(await listItem.getProperty("dragSelected")).toBe(false);
-    expect(calciteListItemDragHandleChange).toHaveReceivedEventTimes(2);
-  });
 });
diff --git a/packages/calcite-components/src/components/list-item/list-item.scss b/packages/calcite-components/src/components/list-item/list-item.scss
@@ -193,7 +193,7 @@
   @apply flex items-center;
 
   calcite-action,
-  calcite-handle {
+  calcite-sort-handle {
     @apply self-stretch;
   }
 }
@@ -208,7 +208,7 @@
   @apply p-0 relative;
   ::slotted(calcite-action),
   ::slotted(calcite-action-menu),
-  ::slotted(calcite-handle),
+  ::slotted(calcite-sort-handle),
   ::slotted(calcite-dropdown) {
     @apply self-stretch;
 
@@ -223,7 +223,7 @@
     .close,
     ::slotted(calcite-action),
     ::slotted(calcite-action-menu),
-    ::slotted(calcite-handle),
+    ::slotted(calcite-sort-handle),
     ::slotted(calcite-dropdown) {
       block-size: calc(100% - theme("spacing[1]"));
     }

diff --git a/packages/calcite-components/src/components/list-item/list-item.tsx b/packages/calcite-components/src/components/list-item/list-item.tsx
@@ -40,13 +40,9 @@ import {
   setUpLoadableComponent,
 } from "../../utils/loadable";
 import { SortableComponentItem } from "../../utils/sortableComponent";
+import { MoveTo } from "../sort-handle/interfaces";
 import { ListItemMessages } from "./assets/list-item/t9n";
-import {
-  getDepth,
-  getListItemChildren,
-  getListItemChildLists,
-  updateListItemChildren,
-} from "./utils";
+import { getDepth, hasListItemChildren } from "./utils";
 import { CSS, activeCellTestAttribute, ICONS, SLOTS } from "./resources";
 
 const focusMap = new Map<HTMLCalciteListElement, number>();
@@ -140,11 +136,6 @@ export class ListItem
    */
   @Prop() dragHandle = false;
 
-  /**
-   * When `true`, the component's drag handle is selected.
-   */
-  @Prop({ mutable: true, reflect: true }) dragSelected = false;
-
   /**
    * Hides the component when filtered.
    *
@@ -162,6 +153,13 @@ export class ListItem
    */
   @Prop() metadata: Record<string, unknown>;
 
+  /**
+   * Sets the item to display a border.
+   *
+   * @internal
+   */
+  @Prop() moveToItems: MoveTo[] = [];
+
   /**
    * When `true`, the item is open to show child components.
    */
@@ -173,14 +171,14 @@ export class ListItem
   }
 
   /**
-   * Used to specify the aria-setsize attribute to define the number of items in the current set of list for accessibility.
+   * Used to determine what menu options are available in the sort-handle
    *
    * @internal
    */
   @Prop() setSize: number = null;
 
   /**
-   * Used to specify the aria-posinset attribute to define the number or position in the current set of list items for accessibility.
+   * Used to determine what menu options are available in the sort-handle
    *
    * @internal
    */
@@ -229,6 +227,21 @@ export class ListItem
    */
   @Prop({ mutable: true }) selectionAppearance: SelectionAppearance = null;
 
+  /**
+   * When `true`, displays and positions the sort handle.
+   */
+  @Prop({ mutable: true }) sortHandleOpen = false;
+
+  @Watch("sortHandleOpen")
+  sortHandleOpenHandler(): void {
+    if (!this.sortHandleEl) {
+      return;
+    }
+
+    // we set the property instead of the attribute to ensure open/close events are emitted properly
+    this.sortHandleEl.open = this.sortHandleOpen;
+  }
+
   /**
    * Use this property to override individual strings used by the component.
    */
@@ -264,10 +277,17 @@ export class ListItem
    */
   @Event({ cancelable: false }) calciteListItemClose: EventEmitter<void>;
 
-  /**
-   * Fires when the drag handle is selected.
-   */
-  @Event({ cancelable: false }) calciteListItemDragHandleChange: EventEmitter<void>;
+  /** Fires when the sort handle is requested to be closed and before the closing transition begins. */
+  @Event({ cancelable: false }) calciteListItemSortHandleBeforeClose: EventEmitter<void>;
+
+  /** Fires when the sort handle is closed and animation is complete. */
+  @Event({ cancelable: false }) calciteListItemSortHandleClose: EventEmitter<void>;
+
+  /** Fires when the sort handle is added to the DOM but not rendered, and before the opening transition begins. */
+  @Event({ cancelable: false }) calciteListItemSortHandleBeforeOpen: EventEmitter<void>;
+
+  /** Fires when the sort handle is open and animation is complete. */
+  @Event({ cancelable: false }) calciteListItemSortHandleOpen: EventEmitter<void>;
 
   /**
    * Fires when the open button is clicked.
@@ -367,6 +387,8 @@ export class ListItem
 
   defaultSlotEl: HTMLSlotElement;
 
+  private sortHandleEl: HTMLCalciteSortHandleElement;
+
   // --------------------------------------------------------------------------
   //
   //  Lifecycle
@@ -466,7 +488,7 @@ export class ListItem
   }
 
   renderDragHandle(): VNode {
-    const { label, dragHandle, dragSelected, dragDisabled, setPosition, setSize } = this;
+    const { label, dragHandle, dragDisabled, setPosition, setSize, moveToItems } = this;
 
     return dragHandle ? (
       <div
@@ -477,11 +499,16 @@ export class ListItem
         ref={(el) => (this.handleGridEl = el)}
         role="gridcell"
       >
-        <calcite-handle
+        <calcite-sort-handle
           disabled={dragDisabled}
           label={label}
-          onCalciteHandleChange={this.dragHandleSelectedChangeHandler}
-          selected={dragSelected}
+          moveToItems={moveToItems}
+          onCalciteSortHandleBeforeClose={this.handleSortHandleBeforeClose}
+          onCalciteSortHandleBeforeOpen={this.handleSortHandleBeforeOpen}
+          onCalciteSortHandleClose={this.handleSortHandleClose}
+          onCalciteSortHandleOpen={this.handleSortHandleOpen}
+          overlayPositioning="fixed"
+          ref={this.setSortHandleEl}
           setPosition={setPosition}
           setSize={setSize}
         />
@@ -659,8 +686,6 @@ export class ListItem
       openable,
       open,
       level,
-      setPosition,
-      setSize,
       active,
       label,
       selected,
@@ -691,9 +716,7 @@ export class ListItem
               aria-expanded={openable ? toAriaBoolean(open) : null}
               aria-label={label}
               aria-level={level}
-              aria-posinset={setPosition}
               aria-selected={toAriaBoolean(selected)}
-              aria-setsize={setSize}
               class={{
                 [CSS.row]: true,
                 [CSS.container]: true,
@@ -731,10 +754,31 @@ export class ListItem
   //
   // --------------------------------------------------------------------------
 
-  private dragHandleSelectedChangeHandler = (event: CustomEvent<void>): void => {
-    this.dragSelected = (event.target as HTMLCalciteHandleElement).selected;
-    this.calciteListItemDragHandleChange.emit();
+  private setSortHandleEl = (el: HTMLCalciteSortHandleElement): void => {
+    this.sortHandleEl = el;
+    this.sortHandleOpenHandler();
+  };
+
+  private handleSortHandleBeforeOpen = (event: CustomEvent<void>): void => {
+    event.stopPropagation();
+    this.calciteListItemSortHandleBeforeOpen.emit();
+  };
+
+  private handleSortHandleBeforeClose = (event: CustomEvent<void>): void => {
+    event.stopPropagation();
+    this.calciteListItemSortHandleBeforeClose.emit();
+  };
+
+  private handleSortHandleClose = (event: CustomEvent<void>): void => {
     event.stopPropagation();
+    this.sortHandleOpen = false;
+    this.calciteListItemSortHandleClose.emit();
+  };
+
+  private handleSortHandleOpen = (event: CustomEvent<void>): void => {
+    event.stopPropagation();
+    this.sortHandleOpen = true;
+    this.calciteListItemSortHandleOpen.emit();
   };
 
   private emitInternalListItemActive = (): void => {
@@ -815,11 +859,7 @@ export class ListItem
       return;
     }
 
-    const listItemChildren = getListItemChildren(slotEl);
-    const listItemChildLists = getListItemChildLists(slotEl);
-    updateListItemChildren(listItemChildren);
-
-    this.openable = !!listItemChildren.length || !!listItemChildLists.length;
+    this.openable = hasListItemChildren(slotEl);
   }
 
   private handleDefaultSlotChange = (event: Event): void => {