diff options
Diffstat (limited to 'src/components/ui')
-rw-r--r-- | src/components/ui/AppLoader/index.tsx | 23 | ||||
-rw-r--r-- | src/components/ui/Link.tsx | 4 | ||||
-rw-r--r-- | src/components/ui/Select.tsx | 4 | ||||
-rw-r--r-- | src/components/ui/Tabs/Tabs.tsx | 2 | ||||
-rw-r--r-- | src/components/ui/WebviewLoader/index.tsx | 2 | ||||
-rw-r--r-- | src/components/ui/colorPickerInput/index.tsx | 2 | ||||
-rw-r--r-- | src/components/ui/headline/index.tsx | 11 | ||||
-rw-r--r-- | src/components/ui/select/index.tsx | 6 |
8 files changed, 21 insertions, 33 deletions
diff --git a/src/components/ui/AppLoader/index.tsx b/src/components/ui/AppLoader/index.tsx index f4d9b8e73..64c840aaa 100644 --- a/src/components/ui/AppLoader/index.tsx +++ b/src/components/ui/AppLoader/index.tsx | |||
@@ -61,18 +61,17 @@ class AppLoader extends Component<IProps, IState> { | |||
61 | className={classes.component} | 61 | className={classes.component} |
62 | spinnerColor={theme.colorAppLoaderSpinner} | 62 | spinnerColor={theme.colorAppLoaderSpinner} |
63 | > | 63 | > |
64 | {texts && | 64 | {texts?.map((text, i) => ( |
65 | texts.map((text, i) => ( | 65 | <span |
66 | <span | 66 | key={text} |
67 | key={text} | 67 | className={classnames({ |
68 | className={classnames({ | 68 | [`${classes.slogan}`]: true, |
69 | [`${classes.slogan}`]: true, | 69 | [`${classes.visible}`]: step === i, |
70 | [`${classes.visible}`]: step === i, | 70 | })} |
71 | })} | 71 | > |
72 | > | 72 | {text} |
73 | {text} | 73 | </span> |
74 | </span> | 74 | ))} |
75 | ))} | ||
76 | </FullscreenLoader> | 75 | </FullscreenLoader> |
77 | ); | 76 | ); |
78 | } | 77 | } |
diff --git a/src/components/ui/Link.tsx b/src/components/ui/Link.tsx index b5890ebd1..a9a429d3a 100644 --- a/src/components/ui/Link.tsx +++ b/src/components/ui/Link.tsx | |||
@@ -20,10 +20,6 @@ interface IProps extends Partial<StoresProps> { | |||
20 | @inject('stores') | 20 | @inject('stores') |
21 | @observer | 21 | @observer |
22 | class Link extends Component<IProps> { | 22 | class Link extends Component<IProps> { |
23 | constructor(props: IProps) { | ||
24 | super(props); | ||
25 | } | ||
26 | |||
27 | onClick(e: MouseEvent<HTMLAnchorElement>): void { | 23 | onClick(e: MouseEvent<HTMLAnchorElement>): void { |
28 | const { disabled = false, target = '', to } = this.props; | 24 | const { disabled = false, target = '', to } = this.props; |
29 | if (disabled) { | 25 | if (disabled) { |
diff --git a/src/components/ui/Select.tsx b/src/components/ui/Select.tsx index 8ae2945ce..a2ed4216f 100644 --- a/src/components/ui/Select.tsx +++ b/src/components/ui/Select.tsx | |||
@@ -24,10 +24,6 @@ class Select extends Component<IProps> { | |||
24 | private element: RefObject<HTMLSelectElement> = | 24 | private element: RefObject<HTMLSelectElement> = |
25 | createRef<HTMLSelectElement>(); | 25 | createRef<HTMLSelectElement>(); |
26 | 26 | ||
27 | constructor(props: IProps) { | ||
28 | super(props); | ||
29 | } | ||
30 | |||
31 | multipleChange(e: ChangeEvent<HTMLSelectElement>): void { | 27 | multipleChange(e: ChangeEvent<HTMLSelectElement>): void { |
32 | e.preventDefault(); | 28 | e.preventDefault(); |
33 | if (!this.element.current) { | 29 | if (!this.element.current) { |
diff --git a/src/components/ui/Tabs/Tabs.tsx b/src/components/ui/Tabs/Tabs.tsx index 2c34d7e24..d7f75c8b8 100644 --- a/src/components/ui/Tabs/Tabs.tsx +++ b/src/components/ui/Tabs/Tabs.tsx | |||
@@ -41,6 +41,7 @@ class Tab extends Component<IProps, IState> { | |||
41 | <div className="content-tabs__tabs"> | 41 | <div className="content-tabs__tabs"> |
42 | {Children.map(children, (child, i) => ( | 42 | {Children.map(children, (child, i) => ( |
43 | <button | 43 | <button |
44 | // eslint-disable-next-line react/no-array-index-key | ||
44 | key={i} | 45 | key={i} |
45 | className={classnames({ | 46 | className={classnames({ |
46 | 'content-tabs__item': true, | 47 | 'content-tabs__item': true, |
@@ -56,6 +57,7 @@ class Tab extends Component<IProps, IState> { | |||
56 | <div className="content-tabs__content"> | 57 | <div className="content-tabs__content"> |
57 | {Children.map(children, (child, i) => ( | 58 | {Children.map(children, (child, i) => ( |
58 | <div | 59 | <div |
60 | // eslint-disable-next-line react/no-array-index-key | ||
59 | key={i} | 61 | key={i} |
60 | className={classnames({ | 62 | className={classnames({ |
61 | 'content-tabs__item': true, | 63 | 'content-tabs__item': true, |
diff --git a/src/components/ui/WebviewLoader/index.tsx b/src/components/ui/WebviewLoader/index.tsx index 81923b6ca..c4e9c724c 100644 --- a/src/components/ui/WebviewLoader/index.tsx +++ b/src/components/ui/WebviewLoader/index.tsx | |||
@@ -32,7 +32,7 @@ class WebviewLoader extends Component<IProps> { | |||
32 | return ( | 32 | return ( |
33 | <FullscreenLoader | 33 | <FullscreenLoader |
34 | className={classes.component} | 34 | className={classes.component} |
35 | title={`${intl.formatMessage(messages.loading, { service: name })}`} | 35 | title={intl.formatMessage(messages.loading, { service: name })} |
36 | loaded={loaded} | 36 | loaded={loaded} |
37 | /> | 37 | /> |
38 | ); | 38 | ); |
diff --git a/src/components/ui/colorPickerInput/index.tsx b/src/components/ui/colorPickerInput/index.tsx index 9bab6efec..2367175bd 100644 --- a/src/components/ui/colorPickerInput/index.tsx +++ b/src/components/ui/colorPickerInput/index.tsx | |||
@@ -25,7 +25,7 @@ class ColorPickerInput extends Component<IProps> { | |||
25 | 25 | ||
26 | componentDidMount(): void { | 26 | componentDidMount(): void { |
27 | const { focus = false } = this.props; | 27 | const { focus = false } = this.props; |
28 | if (focus && this.inputElement && this.inputElement.current) { | 28 | if (focus && this.inputElement?.current) { |
29 | this.inputElement.current.focus(); | 29 | this.inputElement.current.focus(); |
30 | } | 30 | } |
31 | } | 31 | } |
diff --git a/src/components/ui/headline/index.tsx b/src/components/ui/headline/index.tsx index bebd8adcf..424190a6a 100644 --- a/src/components/ui/headline/index.tsx +++ b/src/components/ui/headline/index.tsx | |||
@@ -67,12 +67,11 @@ class HeadlineComponent extends Component<IProps> { | |||
67 | } | 67 | } |
68 | 68 | ||
69 | const Headline = injectStyle(styles, { injectTheme: true })(HeadlineComponent); | 69 | const Headline = injectStyle(styles, { injectTheme: true })(HeadlineComponent); |
70 | const createH = (level: number) => (props: Omit<IProps, 'classes'>) => | 70 | const createH = (level: number) => (props: Omit<IProps, 'classes'>) => ( |
71 | ( | 71 | <Headline level={level} {...props}> |
72 | <Headline level={level} {...props}> | 72 | {props.children} |
73 | {props.children} | 73 | </Headline> |
74 | </Headline> | 74 | ); |
75 | ); | ||
76 | 75 | ||
77 | export const H1 = createH(1); | 76 | export const H1 = createH(1); |
78 | export const H2 = createH(2); | 77 | export const H2 = createH(2); |
diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx index 017de5423..902eb7748 100644 --- a/src/components/ui/select/index.tsx +++ b/src/components/ui/select/index.tsx | |||
@@ -301,11 +301,7 @@ class SelectComponent extends Component<IProps, IState> { | |||
301 | this.select(Object.keys(options!)[selected]); | 301 | this.select(Object.keys(options!)[selected]); |
302 | } | 302 | } |
303 | 303 | ||
304 | if ( | 304 | if (this.activeOptionRef?.current && this.scrollContainerRef?.current) { |
305 | this.activeOptionRef?.current && | ||
306 | this.scrollContainerRef && | ||
307 | this.scrollContainerRef.current | ||
308 | ) { | ||
309 | const containerTopOffset = this.scrollContainerRef.current.offsetTop; | 305 | const containerTopOffset = this.scrollContainerRef.current.offsetTop; |
310 | const optionTopOffset = this.activeOptionRef.current.offsetTop; | 306 | const optionTopOffset = this.activeOptionRef.current.offsetTop; |
311 | 307 | ||