diff --git a/packages/calcite-components/src/components/pick-list/pick-list.tsx b/packages/calcite-components/src/components/pick-list/pick-list.tsx index 5449bbf0bee..2a467744db9 100644 --- a/packages/calcite-components/src/components/pick-list/pick-list.tsx +++ b/packages/calcite-components/src/components/pick-list/pick-list.tsx @@ -4,6 +4,7 @@ import { Event, EventEmitter, h, + Host, Listen, Method, Prop, @@ -21,6 +22,7 @@ import { createObserver } from "../../utils/observers"; import { HeadingLevel } from "../functional/Heading"; import type { ValueUnion } from "../types"; import { logger } from "../../utils/logger"; +import { toAriaBoolean } from "../../utils/dom"; import { ICON_TYPES } from "./resources"; import { calciteInternalListItemValueChangeHandler, @@ -302,6 +304,10 @@ export class PickList< } render(): VNode { - return ; + return ( + + + + ); } } diff --git a/packages/calcite-components/src/components/pick-list/shared-list-render.tsx b/packages/calcite-components/src/components/pick-list/shared-list-render.tsx index cf36af27894..a5df081cf86 100644 --- a/packages/calcite-components/src/components/pick-list/shared-list-render.tsx +++ b/packages/calcite-components/src/components/pick-list/shared-list-render.tsx @@ -1,6 +1,5 @@ -import { FunctionalComponent, h, Host, VNode } from "@stencil/core"; +import { FunctionalComponent, h, VNode } from "@stencil/core"; import { JSXBase } from "@stencil/core/internal"; -import { toAriaBoolean } from "../../utils/dom"; import { InteractiveContainer } from "../../utils/interactive"; import { CSS, SLOTS } from "./resources"; import { handleFilter, handleFilterEvent } from "./shared-list-logic"; @@ -25,9 +24,7 @@ interface ListProps extends DOMAttributes { storeAssistiveEl?: (el: HTMLSpanElement) => void; } -export const List: FunctionalComponent< - { props: ListProps } & Pick -> = ({ +export const List: FunctionalComponent<{ props: ListProps }> = ({ props: { disabled, loading, @@ -40,43 +37,32 @@ export const List: FunctionalComponent< dragEnabled, storeAssistiveEl, }, - onBlur, - onFocusin, - onKeyDown, }): VNode => { const defaultSlot = ; return ( - - -
- {dragEnabled ? ( - + +
+ {dragEnabled ? ( + + ) : null} +
+ {filterEnabled ? ( + ) : null} -
- {filterEnabled ? ( - - ) : null} - -
- {loading ? : null} - {defaultSlot} -
-
- + + + {loading ? : null} + {defaultSlot} +
+
); }; diff --git a/packages/calcite-components/src/components/value-list/value-list.tsx b/packages/calcite-components/src/components/value-list/value-list.tsx index e219543dba7..9bd7dfb1def 100644 --- a/packages/calcite-components/src/components/value-list/value-list.tsx +++ b/packages/calcite-components/src/components/value-list/value-list.tsx @@ -4,6 +4,7 @@ import { Event, EventEmitter, h, + Host, Listen, Method, Prop, @@ -59,7 +60,7 @@ import { disconnectSortableComponent, SortableComponent, } from "../../utils/sortableComponent"; -import { focusElement } from "../../utils/dom"; +import { focusElement, toAriaBoolean } from "../../utils/dom"; import { logger } from "../../utils/logger"; import { ValueListMessages } from "./assets/value-list/t9n"; import { CSS, ICON_TYPES } from "./resources"; @@ -511,12 +512,15 @@ export class ValueList< render(): VNode { return ( - + role="menu" + > + +
); } }