Skip to content

fix(multiple): remove webkit-overflow-scrolling #30003

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
Nov 13, 2024
Merged

fix(multiple): remove webkit-overflow-scrolling #30003

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
1 change: 0 additions & 1 deletion src/cdk/scrolling/virtual-scroll-viewport.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ cdk-virtual-scroll-viewport {
overflow: auto;
will-change: scroll-position;
contain: strict;
-webkit-overflow-scrolling: touch;
}

// Wrapper element for the rendered content. This element will be transformed to push the rendered
Expand Down
1 change: 0 additions & 1 deletion src/material/core/style/_menu-common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ $icon-margin: 16px !default;
min-width: $overlay-min-width;
max-width: $overlay-max-width;
overflow: auto;
-webkit-overflow-scrolling: touch; // for momentum scroll on mobile
}

@mixin item-base() {
Expand Down
39 changes: 26 additions & 13 deletions src/material/sidenav/drawer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@ $drawer-over-drawer-z-index: 4;
@include drawer-stacking-context();

@include token-utils.use-tokens(
tokens-mat-sidenav.$prefix, tokens-mat-sidenav.get-token-slots()) {
tokens-mat-sidenav.$prefix,
tokens-mat-sidenav.get-token-slots()
) {
@include token-utils.create-token-slot(color, content-text-color);
@include token-utils.create-token-slot(background-color, content-background-color);
}

box-sizing: border-box;
-webkit-overflow-scrolling: touch;

// Need this to take up space in the layout.
display: block;
Expand All @@ -58,8 +59,10 @@ $drawer-over-drawer-z-index: 4;
}

// Note that the `NoopAnimationsModule` is being handled inside of the component code.
&.ng-animate-disabled, .ng-animate-disabled & {
.mat-drawer-backdrop, .mat-drawer-content {
&.ng-animate-disabled,
.ng-animate-disabled & {
.mat-drawer-backdrop,
.mat-drawer-content {
transition: none;
}
}
Expand All @@ -84,7 +87,9 @@ $drawer-over-drawer-z-index: 4;
visibility: visible;

@include token-utils.use-tokens(
tokens-mat-sidenav.$prefix, tokens-mat-sidenav.get-token-slots()) {
tokens-mat-sidenav.$prefix,
tokens-mat-sidenav.get-token-slots()
) {
@include token-utils.create-token-slot(background-color, scrim-color);
}
}
Expand Down Expand Up @@ -128,7 +133,9 @@ $drawer-over-drawer-z-index: 4;
@include drawer-stacking-context($drawer-over-drawer-z-index);

@include token-utils.use-tokens(
tokens-mat-sidenav.$prefix, tokens-mat-sidenav.get-token-slots()) {
tokens-mat-sidenav.$prefix,
tokens-mat-sidenav.get-token-slots()
) {
@include token-utils.create-token-slot(color, container-text-color);
@include token-utils.create-token-slot(box-shadow, container-elevation-shadow);
@include token-utils.create-token-slot(background-color, container-background-color);
Expand All @@ -147,14 +154,15 @@ $drawer-over-drawer-z-index: 4;
overflow-y: auto; // TODO(kara): revisit scrolling behavior for drawers
transform: translate3d(-100%, 0, 0);


&, [dir='rtl'] &.mat-drawer-end {
&,
[dir='rtl'] &.mat-drawer-end {
@include cdk.high-contrast {
border-right: $high-contrast-border;
}
}

[dir='rtl'] &, &.mat-drawer-end {
[dir='rtl'] &,
&.mat-drawer-end {
@include cdk.high-contrast {
border-left: $high-contrast-border;
border-right: none;
Expand All @@ -170,7 +178,9 @@ $drawer-over-drawer-z-index: 4;
transform: translate3d(100%, 0, 0);

@include token-utils.use-tokens(
tokens-mat-sidenav.$prefix, tokens-mat-sidenav.get-token-slots()) {
tokens-mat-sidenav.$prefix,
tokens-mat-sidenav.get-token-slots()
) {
@include token-utils.create-token-slot(border-top-left-radius, container-shape);
@include token-utils.create-token-slot(border-bottom-left-radius, container-shape);
border-top-right-radius: 0;
Expand All @@ -180,7 +190,9 @@ $drawer-over-drawer-z-index: 4;

[dir='rtl'] & {
@include token-utils.use-tokens(
tokens-mat-sidenav.$prefix, tokens-mat-sidenav.get-token-slots()) {
tokens-mat-sidenav.$prefix,
tokens-mat-sidenav.get-token-slots()
) {
@include token-utils.create-token-slot(border-top-left-radius, container-shape);
@include token-utils.create-token-slot(border-bottom-left-radius, container-shape);
border-top-right-radius: 0;
Expand Down Expand Up @@ -215,7 +227,9 @@ $drawer-over-drawer-z-index: 4;
box-shadow: none;

@include token-utils.use-tokens(
tokens-mat-sidenav.$prefix, tokens-mat-sidenav.get-token-slots()) {
tokens-mat-sidenav.$prefix,
tokens-mat-sidenav.get-token-slots()
) {
@include token-utils.create-token-slot(border-right-color, container-divider-color);
border-right-width: 1px;
border-right-style: solid;
Expand Down Expand Up @@ -251,7 +265,6 @@ $drawer-over-drawer-z-index: 4;
width: 100%;
height: 100%;
overflow: auto;
-webkit-overflow-scrolling: touch;
}

.mat-sidenav-fixed {
Expand Down
Loading