diff --git a/src/base/helpers/float.ts b/src/base/helpers/float.ts index 847fd2c4..913bde8b 100644 --- a/src/base/helpers/float.ts +++ b/src/base/helpers/float.ts @@ -24,16 +24,12 @@ export const makePropTypes = makePropTypesFactory(vars => ({ export const transform: TransformFunction = props => { const { clearfix, pull, ...rest } = props; - // Can remove "no-any" and "no-unsafe-any" with TypeScript 3.3 - // https://github.com/Microsoft/TypeScript/pull/29121 - // tslint:disable:no-any - // tslint:disable:no-unsafe-any - (rest as any).className = classNames( + rest.className = classNames( { "is-clearfix": clearfix, [`is-pulled-${pull}`]: pull, }, - (rest as any).className, + rest.className, ); return rest; diff --git a/src/base/helpers/other.ts b/src/base/helpers/other.ts index d4de5b7f..1387f489 100644 --- a/src/base/helpers/other.ts +++ b/src/base/helpers/other.ts @@ -42,11 +42,7 @@ export const transform: TransformFunction = props => { unselectable, ...rest } = props; - // Can remove "no-any" and "no-unsafe-any" with TypeScript 3.3 - // https://github.com/Microsoft/TypeScript/pull/29121 - // tslint:disable:no-any - // tslint:disable:no-unsafe-any - (rest as any).className = classNames( + rest.className = classNames( { "is-marginless": marginless, "is-paddingless": paddingless, @@ -55,7 +51,7 @@ export const transform: TransformFunction = props => { "is-shadowless": shadowless, "is-unselectable": unselectable, }, - (rest as any).className, + rest.className, ); return rest; diff --git a/src/base/helpers/overflow.ts b/src/base/helpers/overflow.ts index 62fe30d5..2df36b49 100644 --- a/src/base/helpers/overflow.ts +++ b/src/base/helpers/overflow.ts @@ -20,14 +20,7 @@ export const makePropTypes = makePropTypesFactory(vars => ({ export const transform: TransformFunction = props => { const { clipped, ...rest } = props; - // Can remove "no-any" and "no-unsafe-any" with TypeScript 3.3 - // https://github.com/Microsoft/TypeScript/pull/29121 - // tslint:disable:no-any - // tslint:disable:no-unsafe-any - (rest as any).className = classNames( - { "is-clipped": clipped }, - (rest as any).className, - ); + rest.className = classNames({ "is-clipped": clipped }, rest.className); return rest; }; diff --git a/src/base/helpers/overlay.ts b/src/base/helpers/overlay.ts index 66ef627d..e399352a 100644 --- a/src/base/helpers/overlay.ts +++ b/src/base/helpers/overlay.ts @@ -19,14 +19,7 @@ export const makePropTypes = makePropTypesFactory(vars => ({ export const transform: TransformFunction = props => { const { overlay, ...rest } = props; - // Can remove "no-any" and "no-unsafe-any" with TypeScript 3.3 - // https://github.com/Microsoft/TypeScript/pull/29121 - // tslint:disable:no-any - // tslint:disable:no-unsafe-any - (rest as any).className = classNames( - { "is-overlay": overlay }, - (rest as any).className, - ); + rest.className = classNames({ "is-overlay": overlay }, rest.className); return rest; }; diff --git a/src/base/helpers/responsive.ts b/src/base/helpers/responsive.ts index eb0d251c..c0ae1dff 100644 --- a/src/base/helpers/responsive.ts +++ b/src/base/helpers/responsive.ts @@ -45,13 +45,13 @@ export type ResponsiveBreakpointProps = Partial<{ export type ResponsiveHelpersProps = Partial<{ responsive: Partial< { - [B in Variables["breakpointsLimited"]]: LimitedResponsiveBreakpointProps + [B in Variables["breakpointsLimited"]]: LimitedResponsiveBreakpointProps; } & { [B in Exclude< Variables["breakpoints"], Variables["breakpointsLimited"] - >]: ResponsiveBreakpointProps + >]: ResponsiveBreakpointProps; } >; }>; @@ -109,11 +109,7 @@ export const makePropTypes = makePropTypesFactory(vars => ({ export const transform: TransformFunction = props => { const { responsive, ...rest } = props; - // Can remove "no-any" and "no-unsafe-any" with TypeScript 3.3 - // https://github.com/Microsoft/TypeScript/pull/29121 - // tslint:disable:no-any - // tslint:disable:no-unsafe-any - (rest as any).className = classNames( + rest.className = classNames( responsive !== undefined ? Object.keys(responsive) .filter(breakpoint => responsive[breakpoint] !== undefined) @@ -152,7 +148,7 @@ export const transform: TransformFunction = props => { }) .reduce((acc, cv) => ({ ...acc, ...cv }), {}) : undefined, - (rest as any).className, + rest.className, ); return rest; diff --git a/src/base/helpers/typography.ts b/src/base/helpers/typography.ts index b9187c54..f1ad4d78 100644 --- a/src/base/helpers/typography.ts +++ b/src/base/helpers/typography.ts @@ -41,11 +41,7 @@ export const transform: TransformFunction = props => { ...rest } = props; - // Can remove "no-any" and "no-unsafe-any" with TypeScript 3.3 - // https://github.com/Microsoft/TypeScript/pull/29121 - // tslint:disable:no-any - // tslint:disable:no-unsafe-any - (rest as any).className = classNames( + rest.className = classNames( { [`has-background-${backgroundColor}`]: backgroundColor, [`has-text-${textColor}`]: textColor, @@ -55,7 +51,7 @@ export const transform: TransformFunction = props => { [`has-text-weight-${textWeight}`]: textWeight, [`is-size-${textSize}`]: textSize, }, - (rest as any).className, + rest.className, ); return rest; diff --git a/src/base/helpers/visibility.ts b/src/base/helpers/visibility.ts index e10f0e62..67c6efb1 100644 --- a/src/base/helpers/visibility.ts +++ b/src/base/helpers/visibility.ts @@ -29,17 +29,13 @@ export const makePropTypes = makePropTypesFactory(vars => ({ export const transform: TransformFunction = props => { const { hidden, invisible, srOnly, ...rest } = props; - // Can remove "no-any" and "no-unsafe-any" with TypeScript 3.3 - // https://github.com/Microsoft/TypeScript/pull/29121 - // tslint:disable:no-any - // tslint:disable:no-unsafe-any - (rest as any).className = classNames( + rest.className = classNames( { "is-hidden": hidden, "is-invisible": invisible, "is-sr-only": srOnly, }, - (rest as any).className, + rest.className, ); return rest;