@@ -63,12 +63,12 @@ export class SpeedDialItemButton extends Button {
63
63
super ( ) ;
64
64
this . verticalAlignment = 'middle' ;
65
65
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;
72
72
}
73
73
}
74
74
@CSSType ( 'MDSpeedDialButton' )
@@ -271,8 +271,8 @@ export class SpeedDial extends SpeedDialItemBase {
271
271
this . _fabsHolder . isPassThroughParentEnabled = true ;
272
272
}
273
273
this . _fabsHolder . flexDirection = this . orientation === 'vertical' ? 'column-reverse' : 'row-reverse' ;
274
- this . _fabsHolder . backgroundColor = new Color ( '#00000000' ) ;
275
274
this . _fabsHolder . visibility = 'hidden' ;
275
+ this . backgroundColor = new Color ( '#00000000' ) ;
276
276
277
277
this . _fabMainButton = new SpeedDialItem ( null , true ) ;
278
278
this . prepareItem ( this . _fabMainButton , true ) ;
@@ -284,7 +284,7 @@ export class SpeedDial extends SpeedDialItemBase {
284
284
this . addChild ( this . _fabsHolder ) ;
285
285
}
286
286
287
- get backDrop ( ) {
287
+ get backDrop ( ) {
288
288
return this ;
289
289
}
290
290
@@ -425,6 +425,7 @@ export class SpeedDial extends SpeedDialItemBase {
425
425
426
426
try {
427
427
this . _fabsHolder . visibility = 'visible' ;
428
+ this . isPassThroughParentEnabled = false ;
428
429
await new Animation ( params ) . play ( ) ;
429
430
fabs . forEach ( ( f ) => ( f . isUserInteractionEnabled = true ) ) ;
430
431
} catch ( err ) {
@@ -457,6 +458,7 @@ export class SpeedDial extends SpeedDialItemBase {
457
458
try {
458
459
fabs . forEach ( ( f ) => ( f . isUserInteractionEnabled = false ) ) ;
459
460
await new Animation ( params ) . play ( ) ;
461
+ this . isPassThroughParentEnabled = true ;
460
462
this . _fabsHolder . visibility = 'hidden' ;
461
463
} catch ( err ) {
462
464
// console.error(err);
@@ -492,9 +494,6 @@ export class SpeedDial extends SpeedDialItemBase {
492
494
set icon ( value : string | ImageSource ) {
493
495
this . _fabMainButton . icon = value ;
494
496
}
495
- set buttonIcon ( value : string | ImageSource ) {
496
- this . _fabMainButton . icon = value ;
497
- }
498
497
get buttonClass ( ) {
499
498
return this . _fabMainButton . buttonClass ;
500
499
}
@@ -516,39 +515,43 @@ export class SpeedDial extends SpeedDialItemBase {
516
515
this . _fabMainButton . color = value ;
517
516
}
518
517
get text ( ) {
519
- return this . text && this . _fabMainButton . text ;
518
+ return this . _fabMainButton . text ;
520
519
}
521
520
set text ( value : string ) {
522
- if ( this . _fabMainButton ) {
523
- this . _fabMainButton . text = value ;
524
- }
521
+ this . _fabMainButton . text = value ;
525
522
}
526
523
get title ( ) {
527
- return this . _fabMainButton && this . _fabMainButton . title ;
524
+ return this . _fabMainButton . title ;
528
525
}
529
526
set title ( value : string ) {
530
- if ( this . _fabMainButton ) {
531
- this . _fabMainButton . title = value ;
532
- }
527
+ this . _fabMainButton . title = value ;
533
528
}
534
529
//@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
+ // }
543
546
//@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
+ // }
552
555
553
556
get titleClass ( ) {
554
557
return this . _fabMainButton . titleClass ;
0 commit comments