From 11c992b04f3cad6badf0ae86da65f490e31dd359 Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Sat, 4 Dec 2021 10:51:16 +0100 Subject: chore: upgrade react-jss to latest (#2302) --- src/components/ui/button/index.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/components/ui/button/index.tsx') diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx index 12e5e4449..d91b1ee19 100644 --- a/src/components/ui/button/index.tsx +++ b/src/components/ui/button/index.tsx @@ -2,11 +2,11 @@ import Icon from '@mdi/react'; import classnames from 'classnames'; import { Property } from 'csstype'; import { Component, MouseEvent } from 'react'; -import injectStyle, { withTheme } from 'react-jss'; +import injectStyle, { WithStylesProps } from 'react-jss'; import Loader from 'react-loader'; import { Theme } from '../../../themes'; -import { IFormField, IWithStyle } from '../typings/generic'; +import { IFormField } from '../typings/generic'; type ButtonType = | 'primary' @@ -16,7 +16,7 @@ type ButtonType = | 'warning' | 'inverted'; -interface IProps extends IFormField, IWithStyle { +interface IProps extends IFormField, WithStylesProps { className?: string; disabled?: boolean; id?: string; @@ -179,7 +179,7 @@ class ButtonComponent extends Component { const { classes, className, - theme, + // theme, disabled, id, label, @@ -213,7 +213,7 @@ class ButtonComponent extends Component { loaded={false} width={4} scale={0.45} - color={theme.buttonLoaderColor[buttonType!]} + // color={theme.buttonLoaderColor[buttonType!]} parentClassName={classes.loader} /> )} @@ -262,4 +262,6 @@ class ButtonComponent extends Component { } } -export const Button = injectStyle(styles)(withTheme(ButtonComponent)); +export const Button = injectStyle(styles, { injectTheme: true })( + ButtonComponent, +); -- cgit v1.2.3-70-g09d2