Types: Change context.chart to plain Chart (#9477)

chartjs · Jul 27, 2021 · 243c970 · 243c970
1 parent e8f2a5a
commit 243c970
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/types/index.esm.d.ts b/types/index.esm.d.ts
@@ -1,4 +1,4 @@
-import { DeepPartial, DistributiveArray, IntersectItems, UnionToIntersection } from './utils';
+import { DeepPartial, DistributiveArray, UnionToIntersection } from './utils';
 
 import { TimeUnit } from './adapters';
 import { AnimationEvent } from './animation';
@@ -17,7 +17,7 @@ export { LayoutItem, LayoutPosition } from './layout';
 
 export interface ScriptableContext<TType extends ChartType> {
   active: boolean;
-  chart: IntersectItems<Chart<TType>>;
+  chart: Chart;
   dataIndex: number;
   dataset: UnionToIntersection<ChartDataset<TType>>;
   datasetIndex: number;

diff --git a/types/tests/scriptable.ts b/types/tests/scriptable.ts
@@ -10,9 +10,9 @@ interface test {
 }
 
 const testImpl: test = {
-  pie: (ctx) => ctx.parsed,
+  pie: (ctx) => ctx.parsed + ctx.chart.width,
   line: (ctx) => ctx.parsed.x + ctx.parsed.y,
-  testA: (ctx) => ctx.parsed,
+  testA: (ctx) => ctx.parsed + ctx.dataset.data[0],
   testB: (ctx) => ctx.parsed.x + ctx.parsed.y,
   // @ts-expect-error combined type should not be any
   testC: (ctx) => ctx.fail,

diff --git a/types/utils.d.ts b/types/utils.d.ts
@@ -19,12 +19,3 @@ export type DistributiveArray<T> = [T] extends [unknown] ? Array<T> : never
 // https://stackoverflow.com/a/50375286
 export type UnionToIntersection<U> = (U extends unknown ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 
-// https://stackoverflow.com/a/59463385
-type TupleKeys<T extends unknown> = Exclude<keyof T, keyof []>
-type Foo<T extends unknown> = {
-    [K in TupleKeys<T>]: {foo: T[K]}
-}
-type Values<T> = T[keyof T]
-type Unfoo<T> = T extends { foo: unknown } ? T['foo'] : never;
-
-export type IntersectItems<T extends unknown> = Unfoo<UnionToIntersection<Values<Foo<T>>>>;