From aa833a49e32fb26f2c3ad9c3aaa26b08ed6e437d Mon Sep 17 00:00:00 2001 From: Sayri Suarez Date: Mon, 6 Mar 2023 14:11:07 -0800 Subject: [PATCH] feat(tooltip): only for diffbase PiperOrigin-RevId: 514521733 --- packages/mdc-icon-button/_icon-button-theme.scss | 14 +++++++------- packages/mdc-icon-button/_icon-button.scss | 12 ++++++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/packages/mdc-icon-button/_icon-button-theme.scss b/packages/mdc-icon-button/_icon-button-theme.scss index 0ddbc134d19..2ba20e14b38 100644 --- a/packages/mdc-icon-button/_icon-button-theme.scss +++ b/packages/mdc-icon-button/_icon-button-theme.scss @@ -343,13 +343,6 @@ $light-theme: ( @mixin _icon-color-with-map($color-map) { @include ink-color_(state.get-default-state($color-map)); - $disabled: state.get-disabled-state($color-map); - @if $disabled { - &:disabled { - @include ink-color_($disabled); - } - } - $focus: state.get-focus-state($color-map); @if $focus { @include ripple-theme.focus { @@ -370,6 +363,13 @@ $light-theme: ( @include ink-color_($pressed); } } + + $disabled: state.get-disabled-state($color-map); + @if $disabled { + &:disabled { + @include ink-color_($disabled); + } + } } @mixin _states-colors($color-map) { diff --git a/packages/mdc-icon-button/_icon-button.scss b/packages/mdc-icon-button/_icon-button.scss index 4bc8117054e..9c7002cb43b 100644 --- a/packages/mdc-icon-button/_icon-button.scss +++ b/packages/mdc-icon-button/_icon-button.scss @@ -191,6 +191,18 @@ $ripple-target: icon-button-theme.$ripple-target ); + &:disabled { + @include ripple-theme.states-opacities( + ( + hover: 0, + focus: 0, + press: 0, + ), + $ripple-target: icon-button-theme.$ripple-target, + $query: $query + ); + } + .mdc-icon-button__ripple { $feat-structure: feature-targeting.create-target($query, structure); @include feature-targeting.targets($feat-structure) {