Skip to content

fix(material-experimental/column-resize): fix m2 colors #32388

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(material-experimental/column-resize): fix m2 colors #32388

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
8 changes: 5 additions & 3 deletions src/dev-app/theme-m3.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ html {
@include mat.all-component-themes($light-theme);
@include mat.system-level-colors($light-theme);
@include mat.system-level-typography($light-theme);
// TODO(mmalerba): Support M3 for experimental components.
@include matx.column-resize-theme($light-theme);

// TODO(mmalerba): Support M3 for experimental popover-edit.
// @include matx.popover-edit-theme($light-theme);
}

Expand All @@ -52,6 +53,7 @@ html {
typography: Roboto,
density: 0,
));
@include matx.column-resize-theme();
}

@include mat.system-classes();
Expand All @@ -76,8 +78,8 @@ body.demo-unicorn-dark-theme {
// Include the dark theme color styles.
@include mat.all-component-colors($dark-theme);
@include mat.system-level-colors($dark-theme);
// TODO(mmalerba): Support M3 for experimental components.
// @include matx.column-resize-color($dark-theme);
@include matx.column-resize-color($dark-theme);
// TODO(mmalerba): Support M3 for experimental popover-edit.
// @include matx.popover-edit-color($dark-theme);
}

Expand Down
48 changes: 36 additions & 12 deletions src/material-experimental/column-resize/_column-resize-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
@use '@angular/material' as mat;
@use 'sass:map';

@mixin color($theme) {
$resizable-hover-divider: mat.get-theme-color($theme, primary, 60);
$resizable-active-divider: mat.get-theme-color($theme, primary, 60);
@mixin color($theme: null) {
// If a theme is provided, use the primary color defined by the system map. Otherwise, let it
// fallback to the CSS variable system token. Wrap CSS variable definition in a root selector, if
// the call was made at the top level without a selector.
@if ($theme) {
@include _current-selector-or-root() {
--mat-column-resize-outline-color: #{map.get($theme, _mat-system, outline)};
--mat-column-resize-outline-hover-color: #{map.get($theme, _mat-system, primary)};
--mat-column-resize-outline-active-color: #{map.get($theme, _mat-system, primary)};
}
}

// TODO: these styles don't really belong in the `color` part of the theme.
// We should figure out a better place for them.
Expand Down Expand Up @@ -65,15 +73,15 @@

.mat-header-cell:not(.mat-resizable)::after,
.mat-mdc-header-cell:not(.mat-resizable)::after {
background: map.get($theme, _mat-system, outline);
background: var(--mat-column-resize-border-color, var(--mat-sys-outline));
}

.mat-resizable-handle {
background: $resizable-hover-divider;
background: var(--mat-column-resize-outline-hover-color, var(--mat-sys-primary));
}

.cdk-resizable-resize-disabled > .mat-resizable-handle {
background: map.get($theme, _mat-system, outline);
background: var(--mat-column-resize-border-color, var(--mat-sys-outline));
}
}

Expand All @@ -99,6 +107,8 @@
transition: none;
}

$resizable-active-divider: var(--mat-column-resize-outline-active-color, var(--mat-sys-primary));

.mat-resizable-handle:focus,
.mat-header-row.cdk-column-resize-hover-or-active .mat-resizable-handle:focus,
.mat-mdc-header-row.cdk-column-resize-hover-or-active .mat-resizable-handle:focus {
Expand Down Expand Up @@ -136,18 +146,32 @@
}
}

@mixin typography($theme) {}
@mixin typography($theme: null) {}

@mixin density($theme) {}
@mixin density($theme: null) {}

@mixin theme($theme) {
@if mat.theme-has($theme, color) {
@mixin theme($theme: null) {
@if mat.theme-has($theme, color) or not $theme {
@include color($theme);
}
@if mat.theme-has($theme, density) {
@if mat.theme-has($theme, density) or not $theme {
@include density($theme);
}
@if mat.theme-has($theme, typography) {
@if mat.theme-has($theme, typography) or not $theme {
@include typography($theme);
}
}

// Copy of Angular Material's `sass-utils.current-selector-or-root` function so
// that variables can be defined at a top-level safely.
// src/material/core/style/_sass-utils.scss
@mixin _current-selector-or-root($root: html) {
@if & {
@content;
}
@else {
#{$root} {
@content;
}
}
}
Loading