Fixed theming bug in button and button group.

This commit is contained in:
2019-08-08 13:46:02 +02:00
parent cdc6461064
commit 97d33cf177
72 changed files with 255 additions and 844 deletions
+10 -4
View File
@@ -2366,8 +2366,8 @@
strokeActive: theme.strokeActive,
strokeActiveWidth: theme.strokeActiveWidth,
strokeActiveAlpha: theme.strokeActiveAlpha,
textStyle: theme.textStyle,
textStyleActive: theme.textStyleActive,
textStyle: {},
textStyleActive: {},
style: 'default',
radius: theme.radius,
disabled: false,
@@ -2387,6 +2387,9 @@
this.id = this.opts.id;
this.opts.textStyle = Object.assign({}, theme.textStyle, this.opts.textStyle);
this.opts.textStyleActive = Object.assign({}, theme.textStyleActive, this.opts.textStyleActive);
if (typeof this.opts.icon === 'undefined' && typeof this.opts.iconActive !== 'undefined') {
this.opts.icon = this.opts.iconActive;
} else if (typeof this.opts.icon !== 'undefined' && typeof this.opts.iconActive === 'undefined') {
@@ -3051,8 +3054,8 @@
strokeActive: theme.strokeActive,
strokeActiveWidth: theme.strokeActiveWidth,
strokeActiveAlpha: theme.strokeActiveAlpha,
textStyle: theme.textStyle,
textStyleActive: theme.textStyleActive,
textStyle: {},
textStyleActive: {},
style: 'default',
radius: theme.radius,
disabled: null,
@@ -3064,6 +3067,9 @@
},
opts
);
this.opts.textStyle = Object.assign({}, theme.textStyle, this.opts.textStyle);
this.opts.textStyleActive = Object.assign({}, theme.textStyleActive, this.opts.textStyleActive);
this.buttons = [];