From 101b88c9d1607023e073a985a2b46d2dce2c9c82 Mon Sep 17 00:00:00 2001 From: Hunter Loftis Date: Wed, 3 May 2023 11:13:57 -0400 Subject: [PATCH] fix: generate react/picker and pass react TS checks --- cem-react-wrapper.config.js | 2 +- packages/picker/src/Picker.ts | 18 +++++++++--------- packages/sidenav/src/Sidenav.ts | 3 ++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cem-react-wrapper.config.js b/cem-react-wrapper.config.js index c4256d60c4..490300bf39 100644 --- a/cem-react-wrapper.config.js +++ b/cem-react-wrapper.config.js @@ -30,7 +30,7 @@ export default { packagejson: false, plugins: [ reactWrapperPlugin({ - exclude: ['PickerBase', 'StoryDecorator'], + exclude: ['StoryDecorator'], outDir: '../../react', prettierConfig: yaml.load( readFileSync(resolve('../../.prettierrc.yaml')) diff --git a/packages/picker/src/Picker.ts b/packages/picker/src/Picker.ts index 1f5603ab2f..db92f55ead 100644 --- a/packages/picker/src/Picker.ts +++ b/packages/picker/src/Picker.ts @@ -62,15 +62,6 @@ const chevronClass = { xl: 'spectrum-UIIcon-ChevronDown300', }; -/** - * @element sp-picker - * - * @slot label - The placeholder content for the Picker - * @slot - menu items to be listed in the Picker - * @fires change - Announces that the `value` of the element has changed - * @fires sp-opened - Announces that the overlay has been opened - * @fires sp-closed - Announces that the overlay has been closed - */ export class PickerBase extends SizedMixin(Focusable) { /** * @private @@ -629,6 +620,15 @@ export class PickerBase extends SizedMixin(Focusable) { } } +/** + * @element sp-picker + * + * @slot label - The placeholder content for the Picker + * @slot - menu items to be listed in the Picker + * @fires change - Announces that the `value` of the element has changed + * @fires sp-opened - Announces that the overlay has been opened + * @fires sp-closed - Announces that the overlay has been closed + */ export class Picker extends PickerBase { public static override get styles(): CSSResultArray { return [pickerStyles, chevronStyles]; diff --git a/packages/sidenav/src/Sidenav.ts b/packages/sidenav/src/Sidenav.ts index c5c1adbc03..8bba9e196a 100644 --- a/packages/sidenav/src/Sidenav.ts +++ b/packages/sidenav/src/Sidenav.ts @@ -63,7 +63,8 @@ export class SideNav extends Focusable { }); }, direction: 'vertical', - elements: () => [...this.querySelectorAll('sp-sidenav-item')], + elements: () => + [...this.querySelectorAll('sp-sidenav-item')] as SideNavItem[], isFocusableElement: (el: SideNavItem) => !el.disabled && !this.isDisabledChild(el), });