From b43d95216ebc29e3afeb903324f03c150b7d122c Mon Sep 17 00:00:00 2001 From: Austin Date: Sun, 6 May 2018 14:52:30 -0500 Subject: [PATCH 1/3] fix(scrolling): adds right to fix pushed content --- src/cdk-experimental/scrolling/virtual-scroll-viewport.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cdk-experimental/scrolling/virtual-scroll-viewport.scss b/src/cdk-experimental/scrolling/virtual-scroll-viewport.scss index bb9e62f4825f..9fa58133d5dd 100644 --- a/src/cdk-experimental/scrolling/virtual-scroll-viewport.scss +++ b/src/cdk-experimental/scrolling/virtual-scroll-viewport.scss @@ -11,6 +11,7 @@ cdk-virtual-scroll-viewport { position: absolute; top: 0; left: 0; + right: 0; will-change: contents, transform; } From 96850005c4ce1a308e7ccc3a6b58658ebcfb97ab Mon Sep 17 00:00:00 2001 From: Austin Date: Mon, 7 May 2018 15:35:33 -0500 Subject: [PATCH 2/3] chore: address feedback --- .../scrolling/virtual-scroll-viewport.scss | 9 ++++++++- .../scrolling/virtual-scroll-viewport.ts | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/cdk-experimental/scrolling/virtual-scroll-viewport.scss b/src/cdk-experimental/scrolling/virtual-scroll-viewport.scss index 9fa58133d5dd..1fe2099e3c2f 100644 --- a/src/cdk-experimental/scrolling/virtual-scroll-viewport.scss +++ b/src/cdk-experimental/scrolling/virtual-scroll-viewport.scss @@ -11,10 +11,17 @@ cdk-virtual-scroll-viewport { position: absolute; top: 0; left: 0; - right: 0; will-change: contents, transform; } +.orientation-horizontal { + bottom: 0; +} + +.orientation-vertical { + right: 0; +} + // Spacer element that whose width or height will be adjusted to match the size of the entire data // set if it were rendered all at once. This ensures that the scrollable content region is the // correct size. diff --git a/src/cdk-experimental/scrolling/virtual-scroll-viewport.ts b/src/cdk-experimental/scrolling/virtual-scroll-viewport.ts index f01f82ca6ba4..ea2a35f7b6af 100644 --- a/src/cdk-experimental/scrolling/virtual-scroll-viewport.ts +++ b/src/cdk-experimental/scrolling/virtual-scroll-viewport.ts @@ -42,6 +42,8 @@ function rangesEqual(r1: ListRange, r2: ListRange): boolean { styleUrls: ['virtual-scroll-viewport.css'], host: { 'class': 'cdk-virtual-scroll-viewport', + '[class.orientation-horizontal]': 'orientation === "horizontal"', + '[class.orientation-vertical]': 'orientation === "vertical"', }, encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, From 427e6826031e9bf8ab7e727223c27c96047e0e78 Mon Sep 17 00:00:00 2001 From: Austin Date: Mon, 7 May 2018 15:39:48 -0500 Subject: [PATCH 3/3] chore: address pr feedback --- src/cdk-experimental/scrolling/virtual-scroll-viewport.scss | 4 ++-- src/cdk-experimental/scrolling/virtual-scroll-viewport.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cdk-experimental/scrolling/virtual-scroll-viewport.scss b/src/cdk-experimental/scrolling/virtual-scroll-viewport.scss index 1fe2099e3c2f..eef90817bbce 100644 --- a/src/cdk-experimental/scrolling/virtual-scroll-viewport.scss +++ b/src/cdk-experimental/scrolling/virtual-scroll-viewport.scss @@ -14,11 +14,11 @@ cdk-virtual-scroll-viewport { will-change: contents, transform; } -.orientation-horizontal { +.virtual-scroll-orientation-horizontal { bottom: 0; } -.orientation-vertical { +.virtual-scroll-orientation-vertical { right: 0; } diff --git a/src/cdk-experimental/scrolling/virtual-scroll-viewport.ts b/src/cdk-experimental/scrolling/virtual-scroll-viewport.ts index ea2a35f7b6af..3f906aeabae9 100644 --- a/src/cdk-experimental/scrolling/virtual-scroll-viewport.ts +++ b/src/cdk-experimental/scrolling/virtual-scroll-viewport.ts @@ -42,8 +42,8 @@ function rangesEqual(r1: ListRange, r2: ListRange): boolean { styleUrls: ['virtual-scroll-viewport.css'], host: { 'class': 'cdk-virtual-scroll-viewport', - '[class.orientation-horizontal]': 'orientation === "horizontal"', - '[class.orientation-vertical]': 'orientation === "vertical"', + '[class.virtual-scroll-orientation-horizontal]': 'orientation === "horizontal"', + '[class.virtual-scroll-orientation-vertical]': 'orientation === "vertical"', }, encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush,