Improve model selector type (#3877)

xh · Dec 27, 2024 · 96a8ebe · 96a8ebe
1 parent c46329f
commit 96a8ebe
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/core/model/HoistModel.ts b/core/model/HoistModel.ts
@@ -11,6 +11,7 @@ import {DefaultHoistProps, HoistBase, LoadSpecConfig, managed, PlainObject} from
 import {instanceManager} from '../impl/InstanceManager';
 import {Loadable, LoadSpec, LoadSupport} from '../load';
 import {ModelSelector} from './';
+import {Class} from 'type-fest';
 
 /**
  * Core superclass for stateful Models in Hoist. Models are used throughout the toolkit and
@@ -221,6 +222,4 @@ export abstract class HoistModel extends HoistBase implements Loadable {
     }
 }
 
-export interface HoistModelClass<T extends HoistModel> extends Function {
-    prototype: T;
-}
+export type HoistModelClass<T extends HoistModel> = Class<T> | {prototype: Pick<T, keyof T>};
diff --git a/desktop/cmp/tab/TabSwitcher.ts b/desktop/cmp/tab/TabSwitcher.ts
@@ -30,7 +30,7 @@ import {
 } from '@xh/hoist/utils/react';
 import classNames from 'classnames';
 import {compact, isEmpty, isFinite} from 'lodash';
-import {CSSProperties, ReactElement} from 'react';
+import {CSSProperties, ReactElement, KeyboardEvent} from 'react';
 
 /**
  * Component to indicate and control the active tab of a TabContainer.

diff --git a/desktop/cmp/viewmanager/dialog/ManageDialog.ts b/desktop/cmp/viewmanager/dialog/ManageDialog.ts
@@ -24,7 +24,7 @@ import {viewPanel} from './ViewPanel';
 /**
  * Default management dialog for ViewManager.
  */
-export const manageDialog = hoistCmp.factory<ManageDialogModel>({
+export const manageDialog = hoistCmp.factory({
     displayName: 'ManageDialog',
     className: 'xh-view-manager__manage-dialog',
     model: uses(() => ManageDialogModel),

diff --git a/desktop/cmp/viewmanager/dialog/ViewMultiPanel.ts b/desktop/cmp/viewmanager/dialog/ViewMultiPanel.ts
@@ -14,7 +14,7 @@ import {pluralize} from '@xh/hoist/utils/js';
 import {every, isEmpty} from 'lodash';
 import {ManageDialogModel} from './ManageDialogModel';
 
-export const viewMultiPanel = hoistCmp.factory<ManageDialogModel>({
+export const viewMultiPanel = hoistCmp.factory({
     model: uses(() => ManageDialogModel),
     render({model}) {
         const views = model.selectedViews;