From 610a06bcb9d874eaf0cdf4a0b1e2ec2ea687561f Mon Sep 17 00:00:00 2001 From: Matt Pharoah Date: Thu, 9 Feb 2023 13:06:17 -0500 Subject: [PATCH] Use PropertyKey instead of string where appropriate --- src/events/sl-after-collapse.ts | 2 +- src/events/sl-after-expand.ts | 2 +- src/events/sl-after-hide.ts | 2 +- src/events/sl-after-show.ts | 2 +- src/events/sl-blur.ts | 2 +- src/events/sl-cancel.ts | 2 +- src/events/sl-change.ts | 2 +- src/events/sl-clear.ts | 2 +- src/events/sl-close.ts | 2 +- src/events/sl-collapse.ts | 2 +- src/events/sl-expand.ts | 2 +- src/events/sl-finish.ts | 2 +- src/events/sl-focus.ts | 2 +- src/events/sl-hide.ts | 2 +- src/events/sl-initial-focus.ts | 2 +- src/events/sl-input.ts | 2 +- src/events/sl-lazy-change.ts | 2 +- src/events/sl-lazy-load.ts | 2 +- src/events/sl-load.ts | 2 +- src/events/sl-remove.ts | 2 +- src/events/sl-reposition.ts | 2 +- src/events/sl-show.ts | 2 +- src/events/sl-start.ts | 2 +- src/internal/shoelace-element.ts | 12 ++++++------ 24 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/events/sl-after-collapse.ts b/src/events/sl-after-collapse.ts index d5689a9e5..c3ddc7d16 100644 --- a/src/events/sl-after-collapse.ts +++ b/src/events/sl-after-collapse.ts @@ -1,4 +1,4 @@ -type SlAfterCollapseEvent = CustomEvent>; +type SlAfterCollapseEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-after-expand.ts b/src/events/sl-after-expand.ts index abd8769e0..91be5690c 100644 --- a/src/events/sl-after-expand.ts +++ b/src/events/sl-after-expand.ts @@ -1,4 +1,4 @@ -type SlAfterExpandEvent = CustomEvent>; +type SlAfterExpandEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-after-hide.ts b/src/events/sl-after-hide.ts index 2f4c5bdee..e507a3b97 100644 --- a/src/events/sl-after-hide.ts +++ b/src/events/sl-after-hide.ts @@ -1,4 +1,4 @@ -type SlAfterHideEvent = CustomEvent>; +type SlAfterHideEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-after-show.ts b/src/events/sl-after-show.ts index cf513ef61..9bc1813d5 100644 --- a/src/events/sl-after-show.ts +++ b/src/events/sl-after-show.ts @@ -1,4 +1,4 @@ -type SlAfterShowEvent = CustomEvent>; +type SlAfterShowEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-blur.ts b/src/events/sl-blur.ts index c3048a0a0..e042cad99 100644 --- a/src/events/sl-blur.ts +++ b/src/events/sl-blur.ts @@ -1,4 +1,4 @@ -type SlBlurEvent = CustomEvent>; +type SlBlurEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-cancel.ts b/src/events/sl-cancel.ts index 3b7447943..8df4ef3db 100644 --- a/src/events/sl-cancel.ts +++ b/src/events/sl-cancel.ts @@ -1,4 +1,4 @@ -type SlCancelEvent = CustomEvent>; +type SlCancelEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-change.ts b/src/events/sl-change.ts index 99acc24f9..b3352c561 100644 --- a/src/events/sl-change.ts +++ b/src/events/sl-change.ts @@ -1,4 +1,4 @@ -type SlChangeEvent = CustomEvent>; +type SlChangeEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-clear.ts b/src/events/sl-clear.ts index 8955eecb0..17a0d6dca 100644 --- a/src/events/sl-clear.ts +++ b/src/events/sl-clear.ts @@ -1,4 +1,4 @@ -type SlClearEvent = CustomEvent>; +type SlClearEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-close.ts b/src/events/sl-close.ts index c822eb0f1..5f72ea439 100644 --- a/src/events/sl-close.ts +++ b/src/events/sl-close.ts @@ -1,4 +1,4 @@ -type SlCloseEvent = CustomEvent>; +type SlCloseEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-collapse.ts b/src/events/sl-collapse.ts index 252a743ad..194ec3b27 100644 --- a/src/events/sl-collapse.ts +++ b/src/events/sl-collapse.ts @@ -1,4 +1,4 @@ -type SlCollapseEvent = CustomEvent>; +type SlCollapseEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-expand.ts b/src/events/sl-expand.ts index 5e4ed09ad..57b823a9b 100644 --- a/src/events/sl-expand.ts +++ b/src/events/sl-expand.ts @@ -1,4 +1,4 @@ -type SlExpandEvent = CustomEvent>; +type SlExpandEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-finish.ts b/src/events/sl-finish.ts index 6d95dfe94..91c5788cb 100644 --- a/src/events/sl-finish.ts +++ b/src/events/sl-finish.ts @@ -1,4 +1,4 @@ -type SlFinishEvent = CustomEvent>; +type SlFinishEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-focus.ts b/src/events/sl-focus.ts index eac7f7f02..438be58ed 100644 --- a/src/events/sl-focus.ts +++ b/src/events/sl-focus.ts @@ -1,4 +1,4 @@ -type SlFocusEvent = CustomEvent>; +type SlFocusEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-hide.ts b/src/events/sl-hide.ts index 7a75d37b4..36b2f2717 100644 --- a/src/events/sl-hide.ts +++ b/src/events/sl-hide.ts @@ -1,4 +1,4 @@ -type SlHideEvent = CustomEvent>; +type SlHideEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-initial-focus.ts b/src/events/sl-initial-focus.ts index f2d7d6af9..587e74ceb 100644 --- a/src/events/sl-initial-focus.ts +++ b/src/events/sl-initial-focus.ts @@ -1,4 +1,4 @@ -type SlInitialFocusEvent = CustomEvent>; +type SlInitialFocusEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-input.ts b/src/events/sl-input.ts index 030dce263..98f4bed56 100644 --- a/src/events/sl-input.ts +++ b/src/events/sl-input.ts @@ -1,4 +1,4 @@ -type SlInputEvent = CustomEvent>; +type SlInputEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-lazy-change.ts b/src/events/sl-lazy-change.ts index 2d6e4f2a6..5cf215802 100644 --- a/src/events/sl-lazy-change.ts +++ b/src/events/sl-lazy-change.ts @@ -1,4 +1,4 @@ -type SlLazyChangeEvent = CustomEvent>; +type SlLazyChangeEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-lazy-load.ts b/src/events/sl-lazy-load.ts index 9476dfc1b..2acfe3415 100644 --- a/src/events/sl-lazy-load.ts +++ b/src/events/sl-lazy-load.ts @@ -1,4 +1,4 @@ -type SlLazyLoadEvent = CustomEvent>; +type SlLazyLoadEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-load.ts b/src/events/sl-load.ts index ae3e468cc..4d5f76eef 100644 --- a/src/events/sl-load.ts +++ b/src/events/sl-load.ts @@ -1,4 +1,4 @@ -type SlLoadEvent = CustomEvent>; +type SlLoadEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-remove.ts b/src/events/sl-remove.ts index 1b8a86e3c..d135fd237 100644 --- a/src/events/sl-remove.ts +++ b/src/events/sl-remove.ts @@ -1,4 +1,4 @@ -type SlRemoveEvent = CustomEvent>; +type SlRemoveEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-reposition.ts b/src/events/sl-reposition.ts index b4c5b1860..25d60c545 100644 --- a/src/events/sl-reposition.ts +++ b/src/events/sl-reposition.ts @@ -1,4 +1,4 @@ -type SlRepositionEvent = CustomEvent>; +type SlRepositionEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-show.ts b/src/events/sl-show.ts index 870467a4e..641fa0616 100644 --- a/src/events/sl-show.ts +++ b/src/events/sl-show.ts @@ -1,4 +1,4 @@ -type SlShowEvent = CustomEvent>; +type SlShowEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/events/sl-start.ts b/src/events/sl-start.ts index f021f8fe4..6f6f81de5 100644 --- a/src/events/sl-start.ts +++ b/src/events/sl-start.ts @@ -1,4 +1,4 @@ -type SlStartEvent = CustomEvent>; +type SlStartEvent = CustomEvent>; declare global { interface GlobalEventHandlersEventMap { diff --git a/src/internal/shoelace-element.ts b/src/internal/shoelace-element.ts index 4e2c4a441..20ba2e42d 100644 --- a/src/internal/shoelace-element.ts +++ b/src/internal/shoelace-element.ts @@ -2,8 +2,8 @@ import { LitElement } from 'lit'; import { property } from 'lit/decorators.js'; type EventTypeRequiresDetail = T extends keyof GlobalEventHandlersEventMap - ? GlobalEventHandlersEventMap[T] extends CustomEvent> - ? GlobalEventHandlersEventMap[T] extends CustomEvent> + ? GlobalEventHandlersEventMap[T] extends CustomEvent> + ? GlobalEventHandlersEventMap[T] extends CustomEvent> ? never : Partial extends GlobalEventHandlersEventMap[T]['detail'] ? never @@ -12,8 +12,8 @@ type EventTypeRequiresDetail = T extends keyof GlobalEventHandlersEventMap : never; type EventTypeDoesNotRequireDetail = T extends keyof GlobalEventHandlersEventMap - ? GlobalEventHandlersEventMap[T] extends CustomEvent> - ? GlobalEventHandlersEventMap[T] extends CustomEvent> + ? GlobalEventHandlersEventMap[T] extends CustomEvent> + ? GlobalEventHandlersEventMap[T] extends CustomEvent> ? T : Partial extends GlobalEventHandlersEventMap[T]['detail'] ? T @@ -31,8 +31,8 @@ type EventTypesWithoutRequiredDetail = { type WithRequired = T & { [P in K]-?: T[P] }; type SlEventInit = T extends keyof GlobalEventHandlersEventMap - ? GlobalEventHandlersEventMap[T] extends CustomEvent> - ? GlobalEventHandlersEventMap[T] extends CustomEvent> + ? GlobalEventHandlersEventMap[T] extends CustomEvent> + ? GlobalEventHandlersEventMap[T] extends CustomEvent> ? CustomEventInit : Partial extends GlobalEventHandlersEventMap[T]['detail'] ? CustomEventInit