From 04d33e5630dc9eddae3d6685fff9b9a836e5e50b Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Fri, 10 Aug 2018 20:12:58 +0200 Subject: [PATCH] fix(fab-button): sets pointer-events none when disabled relates to #15129 fixes #15120 --- core/src/components/fab-button/fab-button.scss | 5 +++++ core/src/components/fab-button/fab-button.tsx | 1 + core/src/components/fab/test/basic/index.html | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/components/fab-button/fab-button.scss b/core/src/components/fab-button/fab-button.scss index e15b14ea02..046c1e3598 100755 --- a/core/src/components/fab-button/fab-button.scss +++ b/core/src/components/fab-button/fab-button.scss @@ -15,6 +15,8 @@ --padding-top: calc((#{$fab-size} - var(--size)) / 2); --padding-bottom: calc((#{$fab-size} - var(--size)) / 2); + display: block; + color: #{current-color(contrast)}; font-size: 14px; @@ -27,6 +29,9 @@ font-kerning: none; } +:host(.fab-button-disabled) { + pointer-events: none; +} :host(.activated) { --background: #{current-color(tint)}; diff --git a/core/src/components/fab-button/fab-button.tsx b/core/src/components/fab-button/fab-button.tsx index 021a719e4b..4cbe7c2763 100755 --- a/core/src/components/fab-button/fab-button.tsx +++ b/core/src/components/fab-button/fab-button.tsx @@ -81,6 +81,7 @@ export class FabButton { class: { ...createColorClasses(this.color), ...this.getFabClassMap(), + 'fab-button-disabled': this.disabled, 'fab-button-translucent': this.translucent } }; diff --git a/core/src/components/fab/test/basic/index.html b/core/src/components/fab/test/basic/index.html index fd940b71b0..3f939d720b 100644 --- a/core/src/components/fab/test/basic/index.html +++ b/core/src/components/fab/test/basic/index.html @@ -24,7 +24,7 @@
log
Test - FAB + FAB