From aa5eadf3845c77b82255cb8d7326ff862b31cdcf Mon Sep 17 00:00:00 2001 From: Rene Date: Tue, 12 Jul 2022 23:45:17 +0200 Subject: [PATCH] fix types --- .../optionsValidationPlugin/transformation.ts | 2 +- .../overlayscrollbars/src/support/dom/attribute.ts | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/overlayscrollbars/src/plugins/optionsValidationPlugin/transformation.ts b/packages/overlayscrollbars/src/plugins/optionsValidationPlugin/transformation.ts index e90b813..cb05a9e 100644 --- a/packages/overlayscrollbars/src/plugins/optionsValidationPlugin/transformation.ts +++ b/packages/overlayscrollbars/src/plugins/optionsValidationPlugin/transformation.ts @@ -4,7 +4,7 @@ import { OptionsTemplateNativeTypes, OptionsTemplateTypes, OptionsTemplateValue, -} from 'plugins/optionsValidation/validation'; +} from 'plugins/optionsValidationPlugin/validation'; import { PlainObject } from 'typings'; import { isArray } from 'support/utils/types'; import { each, keys } from 'support/utils'; diff --git a/packages/overlayscrollbars/src/support/dom/attribute.ts b/packages/overlayscrollbars/src/support/dom/attribute.ts index b3bd9a6..df65294 100644 --- a/packages/overlayscrollbars/src/support/dom/attribute.ts +++ b/packages/overlayscrollbars/src/support/dom/attribute.ts @@ -12,10 +12,10 @@ type Attr = { | void; }; -type GetSetProp = { - (elm: HTMLElement | false | null | undefined): number; - (elm: HTMLElement | false | null | undefined, value: number): void; - (elm: HTMLElement | false | null | undefined, value?: number): number | void; +type GetSetProp = { + (elm: HTMLElement | false | null | undefined): T; + (elm: HTMLElement | false | null | undefined, value: T): void; + (elm: HTMLElement | false | null | undefined, value?: T): number | void; }; const getSetProp = ( @@ -102,7 +102,7 @@ export const removeAttr = (elm: Element | false | null | undefined, attrName: st export const scrollLeft = (( elm: HTMLElement | false | null | undefined, value?: number -): number | void => getSetProp('scrollLeft', 0, elm, value) as number) as GetSetProp; +): number | void => getSetProp('scrollLeft', 0, elm, value) as number) as GetSetProp; /** * Gets or sets the scrollTop value of the given element depending whether the value attribute is given. @@ -112,7 +112,7 @@ export const scrollLeft = (( export const scrollTop = (( elm: HTMLElement | false | null | undefined, value?: number -): number | void => getSetProp('scrollTop', 0, elm, value) as number) as GetSetProp; +): number | void => getSetProp('scrollTop', 0, elm, value) as number) as GetSetProp; /** * Gets or sets the value of the given input element depending whether the value attribute is given. @@ -122,4 +122,4 @@ export const scrollTop = (( export const val = (( elm: HTMLInputElement | false | null | undefined, value?: string -): string | void => getSetProp('value', '', elm, value) as string) as GetSetProp; +): string | void => getSetProp('value', '', elm, value) as string) as GetSetProp;