aboutsummaryrefslogtreecommitdiffstats
path: root/packages/forms/src
diff options
context:
space:
mode:
authorLibravatar vantezzen <properly@protonmail.com>2019-09-07 15:50:23 +0200
committerLibravatar vantezzen <properly@protonmail.com>2019-09-07 15:50:23 +0200
commite7a74514c1e7c3833dfdcf5900cb87f9e6e8354e (patch)
treeb8314e4155503b135dcb07e8b4a0e847e25c19cf /packages/forms/src
parentUpdate CHANGELOG.md (diff)
parentUpdate CHANGELOG.md (diff)
downloadferdium-app-e7a74514c1e7c3833dfdcf5900cb87f9e6e8354e.tar.gz
ferdium-app-e7a74514c1e7c3833dfdcf5900cb87f9e6e8354e.tar.zst
ferdium-app-e7a74514c1e7c3833dfdcf5900cb87f9e6e8354e.zip
Merge branch 'master' of https://github.com/meetfranz/franz into franz-5.3.0
Diffstat (limited to 'packages/forms/src')
-rw-r--r--packages/forms/src/button/index.tsx12
1 files changed, 2 insertions, 10 deletions
diff --git a/packages/forms/src/button/index.tsx b/packages/forms/src/button/index.tsx
index 3f129d0ff..b81154a43 100644
--- a/packages/forms/src/button/index.tsx
+++ b/packages/forms/src/button/index.tsx
@@ -1,4 +1,3 @@
1import * as mdiIcons from '@mdi/js';
2import Icon from '@mdi/react'; 1import Icon from '@mdi/react';
3import { Theme } from '@meetfranz/theme'; 2import { Theme } from '@meetfranz/theme';
4import classnames from 'classnames'; 3import classnames from 'classnames';
@@ -21,7 +20,7 @@ interface IProps extends IFormField, IWithStyle {
21 stretch?: boolean; 20 stretch?: boolean;
22 loaded?: boolean; 21 loaded?: boolean;
23 busy?: boolean; 22 busy?: boolean;
24 icon?: keyof typeof mdiIcons; 23 icon?: string;
25 href?: string; 24 href?: string;
26 target?: string; 25 target?: string;
27} 26}
@@ -175,7 +174,7 @@ class ButtonComponent extends Component<IProps> {
175 onClick, 174 onClick,
176 buttonType, 175 buttonType,
177 loaded, 176 loaded,
178 icon: iconName, 177 icon,
179 busy: busyProp, 178 busy: busyProp,
180 href, 179 href,
181 target, 180 target,
@@ -185,13 +184,6 @@ class ButtonComponent extends Component<IProps> {
185 busy, 184 busy,
186 } = this.state; 185 } = this.state;
187 186
188 let icon = '';
189 if (iconName && mdiIcons[iconName]) {
190 icon = mdiIcons[iconName];
191 } else if (iconName && !mdiIcons[iconName]) {
192 console.warn(`Icon '${iconName}' was not found`);
193 }
194
195 let showLoader = false; 187 let showLoader = false;
196 if (loaded) { 188 if (loaded) {
197 showLoader = !loaded; 189 showLoader = !loaded;