Merge branch 'master' into stepper-states

Author: arodr967

.firebaserc

@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "staging": "material2-dev"
+  }
+}

.github/CODEOWNERS

@@ -86,6 +86,8 @@
 # CDK experimental package
 /src/cdk-experimental/**                           @jelbourn
 /src/cdk-experimental/dialog/**                    @jelbourn @josephperrott @crisbeto
+/src/cdk-experimental/scrolling/**                 @mmalerba
+/src/cdk-experimental/drag-drop/**                 @crisbeto
 
 # Docs examples & guides
 /guides/**                                         @amcdnl @jelbourn
@@ -109,6 +111,7 @@
 /src/demo-app/demo-app/**                          @jelbourn
 /src/demo-app/dialog/**                            @jelbourn @crisbeto
 /src/demo-app/drawer/**                            @mmalerba
+/src/demo-app/drag-drop/**                         @crisbeto
 /src/demo-app/example/**                           @andrewseguin
 /src/demo-app/examples-page/**                     @andrewseguin
 /src/demo-app/expansion/**                         @josephperrott
@@ -141,6 +144,7 @@
 /src/demo-app/tooltip/**                           @andrewseguin
 /src/demo-app/tree/**                              @tinayuangao
 /src/demo-app/typography/**                        @crisbeto
+/src/demo-app/virtual-scroll/**                    @mmalerba
 
 # E2E app
 /e2e/*                                             @jelbourn
@@ -165,6 +169,7 @@
 /e2e/components/stepper-e2e.spec.ts                @mmalerba
 /e2e/components/tabs-e2e.spec.ts                   @andrewseguin
 /e2e/components/toolbar-e2e.spec.ts                @devversion
+/e2e/components/virtual-scroll-e2e.spec.ts         @mmalerba
 /e2e/util/**                                       @jelbourn
 /src/e2e-app/*                                     @jelbourn
 /src/e2e-app/block-scroll-strategy/**              @andrewseguin @crisbeto
@@ -183,6 +188,7 @@
 /src/e2e-app/sidenav/**                            @mmalerba
 /src/e2e-app/slide-toggle/**                       @devversion
 /src/e2e-app/tabs/**                               @andrewseguin
+/src/e2e-app/virtual-scroll/**                     @mmalerba
 
 # Universal app
 /src/universal-app/**                              @jelbourn

.github/angular-robot.yml

@@ -38,7 +38,6 @@ merge:
     # list of labels that a PR needs to have, checked with a regexp (e.g. "PR target:" will work for the label "PR target: master")
     requiredLabels:
       - "target: *"
-      - "pr: merge ready"
       - "cla: yes"
 
     # list of labels that a PR shouldn't have, checked after the required labels with a regexp

.gitignore

@@ -4,7 +4,6 @@
 /dist
 /tmp
 /deploy
-/screenshots
 /bazel-out
 
 # Example module file will be auto-generated.

.travis.yml

@@ -18,7 +18,13 @@ addons:
 branches:
   only:
   - master
+  - 5.0.x
+  - 5.1.x
   - 5.2.x
+  - 6.0.x
+  - 6.1.x
+  - 6.2.x
+  - 6.3.x
 
 jobs:
   include:
@@ -34,8 +40,6 @@ jobs:
       if: type = push
     - env: "DEPLOY_MODE=docs-content"
       if: type = push
-    - env: "DEPLOY_MODE=screenshot-tool"
-      if: type = cron
     - env: "DEPLOY_MODE=dashboard"
       if: type = cron
     # Closure Compiler CI check is temporarily disabled until a new version of

CHANGELOG.md

@@ -24,6 +24,3 @@ To run lint, run `gulp lint`.
 
 ### Running benchmarks
 Not yet implemented.
-
-### Running screenshot diff tests
-Not yet implemented.

DEV_ENVIRONMENT.md

@@ -26,13 +26,13 @@ and which pieces are blocked) and make a comment.
 Also see our [`help wanted`](https://github.com/angular/material2/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
 label.
 
-High level stuff planned for Q2 2018 (April - June):
-* Implementing cdk virtual-scroll
-* Implementing cdk drag-and-drop
+High level stuff planned for Q3 2018 (July - September):
+* Finishing cdk virtual-scroll
+* Finishing cdk drag-and-drop
+* New cdk/collections selection directives
 * Ongoing migration to bazel
-* Table feature improvements
 * Improve docs for cdk
-* Accessibility improvements for select, autocomplete, button-toggle, and chips.
+* Bug fixes and code health improvements, especially around accessibility.
 
 
 #### Available features
@@ -47,7 +47,7 @@ High level stuff planned for Q2 2018 (April - June):
 | cards            |                                                        |   [Docs][2]  |
 | checkbox         |                                                        |   [Docs][3]  |
 | chips            |                                                        |   [Docs][26] |
-| data-table       |                           More features coming in 2018 |   [Docs][28] |
+| data-table       |                                                        |   [Docs][28] |
 | datepicker       |                                                        |   [Docs][25] |
 | dialog           |                                                        |   [Docs][22] |
 | divider          |                                                        |   [Docs][35] |
@@ -85,8 +85,7 @@ High level stuff planned for Q2 2018 (April - June):
 
 | Feature          | Status                              | Docs         | Issue          |
 |------------------|-------------------------------------|--------------|----------------|
-| sticky-header    |        In-progress, planned Q2 2018 |           -  |   [#474][0474] |
-| virtual-repeat   |        Prototyping, planned Q2 2018 |           -  |   [#823][0823] |
+| virtual-repeat   |        In-progress, planned Q3 2018 |           -  |   [#823][0823] |
 | fab speed-dial   |            Not started, not planned |           -  |   [#860][0860] |
 | fab toolbar      |            Not started, not planned |           -  |              - |
 | bottom-nav       |            Not started, not planned |           -  |   [#408][0408] |

README.md

@@ -16,13 +16,14 @@ check_bazel_version("0.13.0")
 node_repositories(package_json = ["//:package.json"])
 
 # Add sass rules
-git_repository(
+http_archive(
   name = "io_bazel_rules_sass",
-  remote = "https://github.com/bazelbuild/rules_sass.git",
-  tag = "0.0.3",
+  url = "https://github.com/bazelbuild/rules_sass/archive/0.1.0.zip",
+  strip_prefix = "rules_sass-0.1.0",
+  sha256 = "b243c4d64f054c174051785862ab079050d90b37a1cef7da93821c6981cb9ad4",
 )
 
-load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
+load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
 sass_repositories()
 
 # Add TypeScript rules

WORKSPACE

@@ -1,5 +1,4 @@
 import {browser, Key, element, by} from 'protractor';
-import {screenshot} from '../screenshot';
 import {getScrollPosition} from '../util/index';
 
 
@@ -18,8 +17,6 @@ describe('scroll blocking', () => {
     clickOn('disable');
     scrollPage(0, 300);
     expect((await getScrollPosition()).y).toBe(300, 'Exected page to be scrollable again.');
-
-    screenshot();
   });
 
   it('should not be able to scroll programmatically along the y axis', async () => {
@@ -33,8 +30,6 @@ describe('scroll blocking', () => {
     clickOn('disable');
     scrollPage(300, 0);
     expect((await getScrollPosition()).x).toBe(300, 'Exected page to be scrollable again.');
-
-    screenshot();
   });
 
   it('should not be able to scroll via the keyboard along the y axis', async () => {
@@ -55,8 +50,6 @@ describe('scroll blocking', () => {
     await body.sendKeys(Key.ARROW_DOWN);
     expect((await getScrollPosition()).y)
         .toBeGreaterThan(100, 'Expected the page to be scrollable again.');
-
-    screenshot();
   });
 
   it('should not be able to scroll via the keyboard along the x axis', async () => {
@@ -77,8 +70,6 @@ describe('scroll blocking', () => {
     await body.sendKeys(Key.ARROW_RIGHT);
     expect((await getScrollPosition()).x)
         .toBeGreaterThan(100, 'Expected the page to be scrollable again.');
-
-    screenshot();
   });
 
   it('should not be able to scroll the page after reaching the end of an element along the y axis',
@@ -94,8 +85,6 @@ describe('scroll blocking', () => {
       scroller.sendKeys(Key.ARROW_DOWN);
       scroller.sendKeys(Key.ARROW_DOWN);
       expect((await getScrollPosition()).y).toBe(100, 'Expected the page not to have scrolled.');
-
-      screenshot();
     });
 
   it('should not be able to scroll the page after reaching the end of an element along the x axis',
@@ -111,8 +100,6 @@ describe('scroll blocking', () => {
       scroller.sendKeys(Key.ARROW_RIGHT);
       scroller.sendKeys(Key.ARROW_RIGHT);
       expect((await getScrollPosition()).x).toBe(100, 'Expected the page not to have scrolled.');
-
-      screenshot();
     });
 });
 

e2e/components/block-scroll-strategy-e2e.spec.ts

@@ -1,6 +1,4 @@
 import {browser, by, element, ExpectedConditions} from 'protractor';
-import {screenshot} from '../screenshot';
-
 
 describe('button', () => {
   describe('disabling behavior', () => {
@@ -12,15 +10,13 @@ describe('button', () => {
 
       await browser.wait(ExpectedConditions.not(
         ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element')))));
-      screenshot('clicked once');
 
       element(by.id('disable-toggle')).click();
       element(by.id('test-button')).click();
       expect(await element(by.id('click-counter')).getText()).toEqual('1');
 
       await browser.wait(ExpectedConditions.not(
         ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element')))));
-      screenshot('click disabled');
     });
   });
 });

e2e/components/button-e2e.spec.ts

@@ -1,13 +1,11 @@
 import {browser, by, element} from 'protractor';
-import {screenshot} from '../screenshot';
 
 describe('button-toggle', () => {
 
   beforeEach(() => browser.get('/button-toggle'));
 
   it('should show a button-toggle', async () => {
     expect(element(by.tagName('mat-button-toggle'))).toBeDefined();
-    screenshot();
   });
 
 });

e2e/components/button-toggle-e2e.spec.ts

@@ -1,5 +1,4 @@
 import {browser, by, element} from 'protractor';
-import {screenshot} from '../screenshot';
 
 describe('mat-card', () => {
 
@@ -8,8 +7,6 @@ describe('mat-card', () => {
   it('should show a card', async () => {
     const card = element(by.tagName('mat-card'));
     expect(card).toBeDefined();
-
-    screenshot('fancy card example');
   });
 
 });

e2e/components/card-e2e.spec.ts

@@ -1,6 +1,4 @@
 import {browser, by, element, Key, ExpectedConditions} from 'protractor';
-import {screenshot} from '../screenshot';
-
 
 describe('checkbox', () => {
 
@@ -11,15 +9,13 @@ describe('checkbox', () => {
       let checkboxEl = element(by.id('test-checkbox'));
       let inputEl = element(by.css('input[id=test-checkbox-input]'));
 
-      screenshot('start');
       checkboxEl.click();
 
       expect(inputEl.getAttribute('checked'))
           .toBeTruthy('Expect checkbox "checked" property to be true');
 
       await browser.wait(ExpectedConditions.not(
         ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element')))));
-      screenshot('checked');
 
       checkboxEl.click();
 
@@ -28,7 +24,6 @@ describe('checkbox', () => {
 
       await browser.wait(ExpectedConditions.not(
         ExpectedConditions.presenceOf(element(by.css('div.mat-ripple-element')))));
-      screenshot('unchecked');
     });
 
     it('should toggle the checkbox when pressing space', () => {

e2e/components/checkbox-e2e.spec.ts

@@ -6,16 +6,13 @@ import {
   clickElementAtPoint,
   waitForElement,
 } from '../util/index';
-import {screenshot} from '../screenshot';
-
 
 describe('dialog', () => {
   beforeEach(() => browser.get('/dialog'));
 
   it('should open a dialog', () => {
     element(by.id('default')).click();
     expectToExist('mat-dialog-container');
-    screenshot('simple dialog opened');
   });
 
   it('should open a template dialog', () => {

e2e/components/dialog-e2e.spec.ts

@@ -1,18 +1,15 @@
 import {browser, by, element} from 'protractor';
-import {screenshot} from '../screenshot';
 
 describe('expansion', () => {
 
   beforeEach(() => browser.get('/expansion'));
 
   it('should show an accordion', async () => {
     expect(element(by.css('.mat-accordion'))).toBeDefined();
-    screenshot();
   });
 
   it('should show two panels', async () => {
     expect(await element.all(by.css('.mat-expansion-panel')).count()).toBe(2);
-    screenshot();
   });
 
   it('should hide contents of the expansion panel on click', async () => {

e2e/components/expansion-e2e.spec.ts

@@ -1,13 +1,11 @@
 import {browser} from 'protractor';
 import {expectToExist} from '../util/index';
-import {screenshot} from '../screenshot';
 
 describe('grid-list', () => {
   beforeEach(() => browser.get('/grid-list'));
 
   it('should render a grid list container', () => {
     expectToExist('mat-grid-list');
-    screenshot();
   });
 
   it('should render list items inside the grid list container', () => {

e2e/components/grid-list-e2e.spec.ts

@@ -1,12 +1,4 @@
 import {browser, by, element} from 'protractor';
-import {screenshot} from '../screenshot';
-
-
-function blurAndScreenshot(msg: string) {
-  browser.executeScript(`document.activeElement && document.activeElement.blur();`);
-  screenshot(msg);
-}
-
 
 describe('input', () => {
   describe('text input', () => {
@@ -67,7 +59,6 @@ describe('input', () => {
     it('should resize correctly', () => {
       let input = element(by.id('autosize-text-area'));
       input.sendKeys('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
-      blurAndScreenshot('autosize multiple rows');
     });
 
     it('should enfore max rows', () => {
@@ -77,7 +68,6 @@ describe('input', () => {
           'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
           'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +
           'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
-      blurAndScreenshot('autosize more than max rows');
     });
   });
 });

e2e/components/input-e2e.spec.ts

@@ -1,13 +1,11 @@
 import {browser} from 'protractor';
 import {expectToExist} from '../util/index';
-import {screenshot} from '../screenshot';
 
 describe('list', () => {
   beforeEach(() => browser.get('/list'));
 
   it('should render a list container', () => {
     expectToExist('mat-list');
-    screenshot();
   });
 
   it('should render list items inside the list container', () => {