fix(types): use any for Instance generic

5andu · Apr 17, 2020 · d01a815 · d01a815
1 parent 128a32e
commit d01a815
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/index.test-d.ts b/index.test-d.ts
@@ -17,6 +17,17 @@ import tippy, {
   CreateSingletonInstance,
 } from './src/types';
 
+interface CustomProps {
+  custom: number;
+}
+
+type FilteredProps = CustomProps &
+  Omit<Props, keyof CustomProps | keyof LifecycleHooks>;
+
+type ExtendedProps = FilteredProps & LifecycleHooks<FilteredProps>;
+
+declare const tippyExtended: Tippy<ExtendedProps>;
+
 const singleTarget = document.createElement('div');
 const mulitpleTargets = document.querySelectorAll('div');
 
@@ -37,31 +48,28 @@ expectType<DelegateInstance[]>(
 );
 
 const tippyInstances = [tippy(singleTarget), tippy(singleTarget)];
+const singleton = createSingleton(tippyInstances);
+
 expectType<CreateSingletonInstance>(createSingleton(tippyInstances));
 expectType<CreateSingletonInstance>(
   createSingleton(tippyInstances, {content: 'hello'})
 );
 expectType<CreateSingletonInstance>(
   createSingleton(tippyInstances, {overrides: ['content']})
 );
+expectType<(instances: Instance<any>[]) => void>(singleton.setInstances);
+
+// TODO: I want to assert that these *don't* error, but `tsd` does not provide
+// such a function(?)
+createSingleton(tippyExtended('button'));
+singleton.setInstances(tippyExtended('button'));
 
 expectType<Instance>(
   tippy(singleTarget, {
     plugins: [animateFill, followCursor, inlinePositioning, sticky],
   })
 );
 
-interface CustomProps {
-  custom: number;
-}
-
-type FilteredProps = CustomProps &
-  Omit<Props, keyof CustomProps | keyof LifecycleHooks>;
-
-type ExtendedProps = FilteredProps & LifecycleHooks<FilteredProps>;
-
-declare const tippyExtended: Tippy<ExtendedProps>;
-
 const customPlugin: Plugin<ExtendedProps> = {
   name: 'custom',
   defaultValue: 42,

diff --git a/src/types.ts b/src/types.ts
@@ -185,11 +185,11 @@ export type CreateSingletonProps<TProps = Props> = TProps & {
 export type CreateSingletonInstance<TProps = CreateSingletonProps> = Instance<
   TProps
 > & {
-  setInstances(instances: Instance<TProps>[]): void;
+  setInstances(instances: Instance<any>[]): void;
 };
 
 export type CreateSingleton<TProps = Props> = (
-  tippyInstances: Instance<TProps | Props>[],
+  tippyInstances: Instance<any>[],
   optionalProps?: Partial<CreateSingletonProps<TProps>>
 ) => CreateSingletonInstance<CreateSingletonProps<TProps>>;