Skip to content

refactor(cdk/a11y): Refactor focus indicator theme mixins to match other theme mixins #22427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2021
Merged

refactor(cdk/a11y): Refactor focus indicator theme mixins to match other theme mixins #22427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dev-app/theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ $candy-app-theme: mat.define-light-theme((
@include mdc-slider-theme.color($dark-colors);

// Include the dark theme colors for focus indicators.
.demo-strong-focus {
&.demo-strong-focus {
Copy link
Collaborator Author

@zelliott zelliott Apr 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a bug, AFAICT.

@include mat.strong-focus-indicators-color($dark-colors);
@include experimental.mdc-strong-focus-indicators-color($dark-colors);
}
Expand Down
47 changes: 10 additions & 37 deletions src/material-experimental/mdc-helpers/_focus-indicators-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,21 @@
@use 'sass:meta';
@use 'sass:map';
@use '../../material/core/theming/theming';

// Mixin that applies the border color for the focus indicators.
@mixin _border-color($color) {
.mat-mdc-focus-indicator::before {
border-color: $color;
}
}

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
$border-color: theming.get-color-from-palette(map.get($config, primary));
@include _border-color($border-color);
}

/// Mixin that sets the color of the focus indicators.
///
/// @param {color|map} $theme-or-color
/// If theme, focus indicators are set to the primary color of the theme. If
/// color, focus indicators are set to that color.
///
/// @example
/// .demo-dark-theme {
/// @include mat-mdc-strong-focus-indicators-theme($dark-theme-map);
/// }
///
/// @example
/// .demo-red-theme {
/// @include mat-mdc-strong-focus-indicators-theme(#f00);
/// }
// stylelint-disable-next-line material/theme-mixin-api
@mixin theme($theme-or-color) {
@if meta.type-of($theme-or-color) != 'map' {
@include _border-color($theme-or-color);
.mat-mdc-focus-indicator::before {
border-color: $border-color;
}
@else {
$theme: theming.private-legacy-get-theme($theme-or-color);
@include theming.private-check-duplicate-theme-styles($theme,
'mat-mdc-strong-focus-indicators') {
$color: theming.get-color-config($theme);
@if $color != null {
@include color($color);
}
}

@mixin theme($theme-or-color-config) {
$theme: theming.private-legacy-get-theme($theme-or-color-config);
@include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-focus-indicators') {
$color: theming.get-color-config($theme);
@if $color != null {
@include color($color);
}
}
}
2 changes: 1 addition & 1 deletion src/material-experimental/mdc-helpers/_focus-indicators.import.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@forward '../../material/core/focus-indicators/focus-indicators.import';
@forward 'focus-indicators' hide strong-focus-indicators;
@forward 'focus-indicators-theme' hide color, theme;
@forward 'focus-indicators' as mat-mdc-* hide mat-mdc-strong-focus-indicators-border-color;
@forward 'focus-indicators' as mat-mdc-*;
@forward 'focus-indicators-theme' as mat-mdc-strong-focus-indicators-*;

@import '../../material/core/theming/theming';
Expand Down
44 changes: 9 additions & 35 deletions src/material/core/focus-indicators/_focus-indicators-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,21 @@
@use 'sass:meta';
@use 'sass:map';
@use '../theming/theming';

@mixin color($config-or-theme) {
$config: theming.get-color-config($config-or-theme);
$border-color: theming.get-color-from-palette(map.get($config, primary));
@include _border-color($border-color);
}

/// Mixin that sets the color of the focus indicators.
///
/// @param {color|map} $theme-or-color
/// If theme, focus indicators are set to the primary color of the theme. If
/// color, focus indicators are set to that color.
///
/// @example
/// .demo-dark-theme {
/// @include mat-strong-focus-indicators-theme($dark-theme-map);
/// }
///
/// @example
/// .demo-red-theme {
/// @include mat-strong-focus-indicators-theme(#f00);
/// }
// stylelint-disable-next-line material/theme-mixin-api
@mixin theme($theme-or-color) {
@if meta.type-of($theme-or-color) != 'map' {
@include _border-color($theme-or-color);
}
@else {
$theme: theming.private-legacy-get-theme($theme-or-color);
@include theming.private-check-duplicate-theme-styles($theme, 'mat-strong-focus-indicators') {
$color: theming.get-color-config($theme);
@if $color != null {
@include color($color);
}
}
.mat-focus-indicator::before {
border-color: $border-color;
}
}

// Mixin that applies the border color for the focus indicators.
@mixin _border-color($color) {
.mat-focus-indicator::before {
border-color: $color;
@mixin theme($theme-or-color-config) {
$theme: theming.private-legacy-get-theme($theme-or-color-config);
@include theming.private-check-duplicate-theme-styles($theme, 'mat-focus-indicators') {
Copy link
Collaborator Author

@zelliott zelliott Apr 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: The id to private-check-duplicate-theme-styles was changed from mat-strong-focus-indicators to mat-focus-indicators to address a linter error I was getting:

Missing check for duplicative theme styles. material/theme-mixin-api
Please include the duplicate styles check mixin: theming.private-check-duplicate-theme-styles($theme, 'mat-focus-indicators')

$color: theming.get-color-config($theme);
@if $color != null {
@include color($color);
}
}
}
2 changes: 1 addition & 1 deletion src/material/core/focus-indicators/_focus-indicators.import.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $mat-white-6-opacity, $mat-white-87-opacity;
@forward 'focus-indicators' hide private-strong-focus-indicators-positioning,
strong-focus-indicators;
@forward 'focus-indicators-theme' hide color, theme;
@forward 'focus-indicators' as mat-* hide mat-strong-focus-indicators-border-color;
@forward 'focus-indicators' as mat-*;
@forward 'focus-indicators-theme' as mat-strong-focus-indicators-*;

@import '../theming/theming';
Expand Down