Simplify typedefs

BrightspaceUI · Dec 13, 2024 · 9183da6 · 9183da6
1 parent 551efae
commit 9183da6
Show file tree

Hide file tree

Showing 43 changed files with 90 additions and 43 deletions.
diff --git a/components/button/button-mixin.js b/components/button/button-mixin.js
@@ -1,8 +1,9 @@
 import { FocusMixin } from '../../mixins/focus/focus-mixin.js';
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
 /**

diff --git a/components/count-badge/count-badge-mixin.js b/components/count-badge/count-badge-mixin.js
@@ -12,8 +12,9 @@ import { styleMap } from 'lit/directives/style-map.js';
 const maxBadgeDigits = 5;
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/demo/demo-passthrough-mixin.js b/components/demo/demo-passthrough-mixin.js
@@ -1,8 +1,9 @@
 import { LitElement } from 'lit';
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/dialog/dialog-mixin.js b/components/dialog/dialog-mixin.js
@@ -29,8 +29,9 @@ const abortAction = 'abort';
 const defaultMargin = { top: 75, right: 30, bottom: 30, left: 30 };
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/dropdown/dropdown-content-mixin.js b/components/dropdown/dropdown-content-mixin.js
@@ -22,8 +22,9 @@ const pointerLength = 16;
 const pointerRotatedLength = Math.SQRT2 * parseFloat(pointerLength);
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/dropdown/dropdown-opener-mixin.js b/components/dropdown/dropdown-opener-mixin.js
@@ -8,8 +8,9 @@ const intersectionObserver = new IntersectionObserver(entries => {
 }, { threshold: 0 }); // 0-1 (0 -> intersection requires any pixel visible, 1 -> intersection requires all pixels visible)
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
 /**

diff --git a/components/form/form-element-mixin.js b/components/form/form-element-mixin.js
@@ -76,8 +76,9 @@ export class FormElementValidityState {
 }
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/form/form-mixin.js b/components/form/form-mixin.js
@@ -8,8 +8,9 @@ import { LocalizeCoreElement } from '../../helpers/localize-core-element.js';
 import { localizeFormElement } from './form-element-localize-helper.js';
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/hierarchical-view/hierarchical-view-mixin.js b/components/hierarchical-view/hierarchical-view-mixin.js
@@ -8,8 +8,9 @@ const __nativeFocus = document.createElement('div').focus;
 const escapeKeyCode = 27;
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
 /**

diff --git a/components/inputs/input-inline-help.js b/components/inputs/input-inline-help.js
@@ -13,8 +13,9 @@ export const inlineHelpStyles = [
 ];
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/list/list-item-button-mixin.js b/components/list/list-item-button-mixin.js
@@ -4,8 +4,9 @@ import { getUniqueId } from '../../helpers/uniqueId.js';
 import { ListItemMixin } from './list-item-mixin.js';
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/list/list-item-checkbox-mixin.js b/components/list/list-item-checkbox-mixin.js
@@ -5,8 +5,9 @@ import { SelectionInfo } from '../selection/selection-mixin.js';
 import { SkeletonMixin } from '../skeleton/skeleton-mixin.js';
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/list/list-item-drag-drop-mixin.js b/components/list/list-item-drag-drop-mixin.js
@@ -247,8 +247,9 @@ export class NewPositionEventDetails {
 }
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/list/list-item-expand-collapse-mixin.js b/components/list/list-item-expand-collapse-mixin.js
@@ -8,8 +8,9 @@ const dragIntervalDelay = 100;
 const dragHoverDropTime = 1000;
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/list/list-item-link-mixin.js b/components/list/list-item-link-mixin.js
@@ -4,8 +4,9 @@ import { getUniqueId } from '../../helpers/uniqueId.js';
 import { ListItemMixin } from './list-item-mixin.js';
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/list/list-item-mixin.js b/components/list/list-item-mixin.js
@@ -40,8 +40,9 @@ function addTabListener() {
 let hasDisplayedKeyboardTooltip = false;
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/list/list-item-role-mixin.js b/components/list/list-item-role-mixin.js
@@ -1,8 +1,9 @@
 import { findComposedAncestor } from '../../helpers/dom.js';
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
 /**

diff --git a/components/menu/menu-item-mixin.js b/components/menu/menu-item-mixin.js
@@ -1,6 +1,7 @@
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
 /**

diff --git a/components/menu/menu-item-radio-mixin.js b/components/menu/menu-item-radio-mixin.js
@@ -1,8 +1,9 @@
 import { MenuItemSelectableMixin } from './menu-item-selectable-mixin.js';
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
 /**

diff --git a/components/menu/menu-item-selectable-mixin.js b/components/menu/menu-item-selectable-mixin.js
@@ -1,8 +1,9 @@
 import { MenuItemMixin } from './menu-item-mixin.js';
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
 /**

diff --git a/components/meter/meter-mixin.js b/components/meter/meter-mixin.js
@@ -2,8 +2,9 @@ import { formatPercent } from '@brightspace-ui/intl/lib/number.js';
 import { LocalizeCoreElement } from '../../helpers/localize-core-element.js';
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/overflow-group/overflow-group-mixin.js b/components/overflow-group/overflow-group-mixin.js
@@ -26,8 +26,9 @@ async function filterAsync(arr, callback) {
 }
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/paging/pageable-mixin.js b/components/paging/pageable-mixin.js
@@ -3,8 +3,9 @@ import { html } from 'lit';
 import { SubscriberRegistryController } from '../../controllers/subscriber/subscriberControllers.js';
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/paging/pageable-subscriber-mixin.js b/components/paging/pageable-subscriber-mixin.js
@@ -1,10 +1,12 @@
 import { EventSubscriberController, IdSubscriberController } from '../../controllers/subscriber/subscriberControllers.js';
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
+
 /**
  * @template {ReactiveElementClassType} S
  * @param {S} superclass

diff --git a/components/popover/popover-mixin.js b/components/popover/popover-mixin.js
@@ -20,8 +20,9 @@ const isSupported = ('popover' in HTMLElement.prototype);
 console.log('Popover', isSupported);
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/selection/selection-action-mixin.js b/components/selection/selection-action-mixin.js
@@ -4,10 +4,12 @@ import { SelectionInfo } from './selection-mixin.js';
 import { SelectionObserverMixin } from './selection-observer-mixin.js';
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
+
 /**
  * @template {ReactiveElementClassType} S
  * @param {S} superclass

diff --git a/components/selection/selection-mixin.js b/components/selection/selection-mixin.js
@@ -45,10 +45,12 @@ export class SelectionInfo {
 }
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
+
 /**
  * @template {ReactiveElementClassType} S
  * @param {S} superclass

diff --git a/components/selection/selection-observer-mixin.js b/components/selection/selection-observer-mixin.js
@@ -2,10 +2,12 @@ import { cssEscape } from '../../helpers/dom.js';
 import { SelectionInfo } from './selection-mixin.js';
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
+
 /**
  * @template {ReactiveElementClassType} S
  * @param {S} superclass

diff --git a/components/skeleton/skeleton-group-mixin.js b/components/skeleton/skeleton-group-mixin.js
@@ -3,8 +3,9 @@ import { SkeletonMixin } from './skeleton-mixin.js';
 import { SubscriberRegistryController } from '../../controllers/subscriber/subscriberControllers.js';
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
 /**

diff --git a/components/skeleton/skeleton-mixin.js b/components/skeleton/skeleton-mixin.js
@@ -149,8 +149,9 @@ export const skeletonStyles = css`
 `;
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
 /**

diff --git a/components/switch/switch-mixin.js b/components/switch/switch-mixin.js
@@ -8,8 +8,9 @@ import { ifDefined } from 'lit/directives/if-defined.js';
 import { RtlMixin } from '../../mixins/rtl/rtl-mixin.js';
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/tabs/tab-panel-mixin.js b/components/tabs/tab-panel-mixin.js
@@ -2,8 +2,9 @@ import { css } from 'lit';
 import { getUniqueId } from '../../helpers/uniqueId.js';
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
 /**

diff --git a/components/tag-list/tag-list-item-mixin.js b/components/tag-list/tag-list-item-mixin.js
@@ -39,8 +39,9 @@ export function resetHasDisplayedKeyboardTooltip() {
 }
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**

diff --git a/components/validation/validation-custom-mixin.js b/components/validation/validation-custom-mixin.js
@@ -1,8 +1,9 @@
 import { isCustomFormElement } from '../form/form-helper.js';
 
 /**
+ * @typedef {typeof import('lit').ReactiveElement} ReactiveElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').ReactiveElement>} ReactiveElementConstructor
- * @typedef {ReactiveElementConstructor & Pick<typeof import('lit').ReactiveElement, keyof typeof import('lit').ReactiveElement>} ReactiveElementClassType
+ * @typedef {ReactiveElementConstructor & Pick<ReactiveElementType, keyof ReactiveElementType>} ReactiveElementClassType
  */
 
 /**

diff --git a/mixins/arrow-keys/arrow-keys-mixin.js b/mixins/arrow-keys/arrow-keys-mixin.js
@@ -10,8 +10,9 @@ const keyCodes = Object.freeze({
 });
 
 /**
+ * @typedef {typeof import('lit').LitElement} LitElementType
  * @typedef {import('@open-wc/dedupe-mixin').Constructor<import('lit').LitElement>} LitElementConstructor
- * @typedef {LitElementConstructor & Pick<typeof import('lit').LitElement, keyof typeof import('lit').LitElement>} LitElementClassType
+ * @typedef {LitElementConstructor & Pick<LitElementType, keyof LitElementType>} LitElementClassType
  */
 
 /**