Skip to content

Commit a65ea0b

Browse files
committed
fix(speeddial): some speeddial fixes
1 parent c76c5cf commit a65ea0b

File tree

1 file changed

+38
-35
lines changed

1 file changed

+38
-35
lines changed

src/speeddial/index.ts

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ export class SpeedDialItemButton extends Button {
6363
super();
6464
this.verticalAlignment = 'middle';
6565
this.style['css:font-size'] = 26;
66-
this.style['css:border-radius'] = 28;
67-
this.style['css:width'] = 56;
68-
this.style['css:height'] = 56;
69-
this.style['css:margin'] = 16;
70-
this.style['css:dynamic-elevation-offset'] = 2;
71-
this.style['css:font-size'] = 26;
66+
// this.style['css:border-radius'] = 28;
67+
// this.style['css:width'] = 56;
68+
// this.style['css:height'] = 56;
69+
// this.style['css:margin'] = 16;
70+
// this.style['css:dynamic-elevation-offset'] = 2;
71+
// this.style['css:font-size'] = 26;
7272
}
7373
}
7474
@CSSType('MDSpeedDialButton')
@@ -271,8 +271,8 @@ export class SpeedDial extends SpeedDialItemBase {
271271
this._fabsHolder.isPassThroughParentEnabled = true;
272272
}
273273
this._fabsHolder.flexDirection = this.orientation === 'vertical' ? 'column-reverse' : 'row-reverse';
274-
this._fabsHolder.backgroundColor = new Color('#00000000');
275274
this._fabsHolder.visibility = 'hidden';
275+
this.backgroundColor = new Color('#00000000');
276276

277277
this._fabMainButton = new SpeedDialItem(null, true);
278278
this.prepareItem(this._fabMainButton, true);
@@ -284,7 +284,7 @@ export class SpeedDial extends SpeedDialItemBase {
284284
this.addChild(this._fabsHolder);
285285
}
286286

287-
get backDrop () {
287+
get backDrop() {
288288
return this;
289289
}
290290

@@ -425,6 +425,7 @@ export class SpeedDial extends SpeedDialItemBase {
425425

426426
try {
427427
this._fabsHolder.visibility = 'visible';
428+
this.isPassThroughParentEnabled = false;
428429
await new Animation(params).play();
429430
fabs.forEach((f) => (f.isUserInteractionEnabled = true));
430431
} catch (err) {
@@ -457,6 +458,7 @@ export class SpeedDial extends SpeedDialItemBase {
457458
try {
458459
fabs.forEach((f) => (f.isUserInteractionEnabled = false));
459460
await new Animation(params).play();
461+
this.isPassThroughParentEnabled = true;
460462
this._fabsHolder.visibility = 'hidden';
461463
} catch (err) {
462464
// console.error(err);
@@ -492,9 +494,6 @@ export class SpeedDial extends SpeedDialItemBase {
492494
set icon(value: string | ImageSource) {
493495
this._fabMainButton.icon = value;
494496
}
495-
set buttonIcon(value: string | ImageSource) {
496-
this._fabMainButton.icon = value;
497-
}
498497
get buttonClass() {
499498
return this._fabMainButton.buttonClass;
500499
}
@@ -516,39 +515,43 @@ export class SpeedDial extends SpeedDialItemBase {
516515
this._fabMainButton.color = value;
517516
}
518517
get text() {
519-
return this.text && this._fabMainButton.text;
518+
return this._fabMainButton.text;
520519
}
521520
set text(value: string) {
522-
if (this._fabMainButton) {
523-
this._fabMainButton.text = value;
524-
}
521+
this._fabMainButton.text = value;
525522
}
526523
get title() {
527-
return this._fabMainButton && this._fabMainButton.title;
524+
return this._fabMainButton.title;
528525
}
529526
set title(value: string) {
530-
if (this._fabMainButton) {
531-
this._fabMainButton.title = value;
532-
}
527+
this._fabMainButton.title = value;
533528
}
534529
//@ts-ignore
535-
get buttonBackgroundColor() {
536-
return this._fabMainButton && this._fabMainButton.backgroundColor;
537-
}
538-
set buttonBackgroundColor(value: string | Color) {
539-
if (this._fabMainButton) {
540-
this._fabMainButton.backgroundColor = value;
541-
}
542-
}
530+
// get backgroundColor() {
531+
// return this._fabMainButton.backgroundColor;
532+
// }
533+
// set backgroundColor(value: string | Color) {
534+
// if (this._fabMainButton) {
535+
// this._fabMainButton.backgroundColor = value;
536+
// }
537+
// }
538+
// get ['css:background-color']() {
539+
// return this._fabMainButton.backgroundColor;
540+
// }
541+
// set ['css:background-color'](value: string | Color) {
542+
// if (this._fabMainButton) {
543+
// this._fabMainButton.backgroundColor = value;
544+
// }
545+
// }
543546
//@ts-ignore
544-
get buttonBackgroundImage() {
545-
return this._fabMainButton && this._fabMainButton.backgroundImage;
546-
}
547-
set buttonBackgroundImage(value: string | LinearGradient) {
548-
if (this._fabMainButton) {
549-
this._fabMainButton.backgroundImage = value;
550-
}
551-
}
547+
// get backgroundImage() {
548+
// return this._fabMainButton && this._fabMainButton.backgroundImage;
549+
// }
550+
// set backgroundImage(value: string | LinearGradient) {
551+
// if (this._fabMainButton) {
552+
// this._fabMainButton.backgroundImage = value;
553+
// }
554+
// }
552555

553556
get titleClass() {
554557
return this._fabMainButton.titleClass;

0 commit comments

Comments
 (0)