From: LeeLenaleee <39033624+LeeLenaleee@users.noreply.github.com> Date: Sat, 6 Feb 2021 00:15:35 +0000 (+0100) Subject: Fix/type dateadapter override (#8377) X-Git-Tag: v3.0.0-beta.11~41 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22ca8af1cd1bae9cbf0ce60859ba1c780575b003;p=thirdparty%2FChart.js.git Fix/type dateadapter override (#8377) * Not totally sure this is right , but since in core.adapters.js override is part of the dateadapter it seems logical it should be there. Should also fix #8369 * implemented feedback * Declare the dataAdapter since it will be available at runtime if someone overrides it * remove declaration. if this is giving problems in the future it might need te be added again --- diff --git a/types/adapters.d.ts b/types/adapters.d.ts index 8429fd616..65f48a180 100644 --- a/types/adapters.d.ts +++ b/types/adapters.d.ts @@ -1,6 +1,10 @@ export type TimeUnit = 'millisecond' | 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'quarter' | 'year'; -export interface DateAdapterBase { +export interface DateAdapter { + // Override one or multiple of the methods to adjust to the logic of the current date library. + override(members: Partial): void; + readonly options: any; + /** * Returns a map of time formats for the supported formatting units defined * in Unit as well as 'datetime' representing a detailed date/time string. @@ -54,16 +58,6 @@ export interface DateAdapterBase { endOf(timestamp: number, unit: TimeUnit | 'isoWeek'): number; } -export interface DateAdapter extends DateAdapterBase { - readonly options: any; -} - -export const DateAdapter: { - prototype: DateAdapter; - new(options: any): DateAdapter; - override(members: Partial): void; -}; - export const _adapters: { _date: DateAdapter; }; diff --git a/types/index.esm.d.ts b/types/index.esm.d.ts index 581db43d3..c398b0f5f 100644 --- a/types/index.esm.d.ts +++ b/types/index.esm.d.ts @@ -24,7 +24,7 @@ import { ScriptableAndArrayOptions } from './scriptable'; -export { DateAdapterBase, DateAdapter, TimeUnit, _adapters } from './adapters'; +export { DateAdapter, TimeUnit, _adapters } from './adapters'; export { Animation, Animations, Animator, AnimationEvent } from './animation'; export { Color } from './color'; export { Element } from './element';