From f4b4416ea52d564bc2dbe543a82084ed98843ccc Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Fri, 30 Jul 2021 10:54:54 +0200 Subject: chore: migrate from tslint to @typescript-eslint (#1706) - update .eslintrc to work for .js and .ts - update devDependencies - lint properly both root /src and nested /packages - update webhint recommended setting for tsconfig.json to shrink output - Manage all eslint rules from the repo root - escape single quotes in scripts to please windows build Co-authored-by: Vijay A --- packages/ui/src/infobox/index.tsx | 49 ++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 29 deletions(-) (limited to 'packages/ui/src/infobox/index.tsx') diff --git a/packages/ui/src/infobox/index.tsx b/packages/ui/src/infobox/index.tsx index bd62fc4ea..961262001 100644 --- a/packages/ui/src/infobox/index.tsx +++ b/packages/ui/src/infobox/index.tsx @@ -3,8 +3,8 @@ import classnames from 'classnames'; import React, { Component } from 'react'; import injectStyle from 'react-jss'; +import { Icon } from '..'; import { Theme } from '../../../theme'; -import { Icon } from '../'; import { IWithStyle } from '../typings/generic'; interface IProps extends IWithStyle { @@ -27,7 +27,7 @@ interface IState { const buttonStyles = (theme: Theme) => { const styles = {}; - Object.keys(theme.styleTypes).map((style) => { + Object.keys(theme.styleTypes).map(style => { Object.assign(styles, { [style]: { background: theme.styleTypes[style].accent, @@ -73,18 +73,21 @@ const styles = (theme: Theme) => ({ marginRight: 10, }, close: { - color: (props: IProps) => theme.styleTypes[props.type ? props.type : 'primary'].contrast, + color: (props: IProps) => + theme.styleTypes[props.type ? props.type : 'primary'].contrast, marginRight: -5, border: 0, background: 'none', }, cta: { - borderColor: (props: IProps) => theme.styleTypes[props.type ? props.type : 'primary'].contrast, + borderColor: (props: IProps) => + theme.styleTypes[props.type ? props.type : 'primary'].contrast, borderRadius: theme.borderRadiusSmall, borderStyle: 'solid', borderWidth: 1, background: 'none', - color: (props: IProps) => theme.styleTypes[props.type ? props.type : 'primary'].contrast, + color: (props: IProps) => + theme.styleTypes[props.type ? props.type : 'primary'].contrast, marginLeft: 15, padding: [4, 10], fontSize: theme.uiFontSize, @@ -113,9 +116,7 @@ class InfoboxComponent extends Component { }; dismiss() { - const { - onDismiss, - } = this.props; + const { onDismiss } = this.props; this.setState({ isDismissing: true, @@ -129,7 +130,7 @@ class InfoboxComponent extends Component { this.setState({ dismissed: true, }); - }, 3000); + }, 3000); } componentWillUnmount(): void { @@ -144,26 +145,24 @@ class InfoboxComponent extends Component { icon, type, ctaLabel, - ctaLoading, ctaOnClick, dismissable, className, } = this.props; - const { - isDismissing, - dismissed, - } = this.state; + const { isDismissing, dismissed } = this.state; if (dismissed) { return null; } return ( -
+
{ })} data-type="franz-infobox" > - {icon && ( - - )} -
- {children} -
+ {icon && } +
{children}
{ctaLabel && ( - )} -- cgit v1.2.3-54-g00ecf