feat(pagination): initial pagination component (#5156)

Author: andrewseguin

package-lock.json

@@ -78,4 +78,11 @@
              }">
     </cdk-row>
   </cdk-table>
+  
+  <md-paginator #paginator
+                [length]="_peopleDatabase.data.length"
+                [pageIndex]="0"
+                [pageSize]="10"
+                [pageSizeOptions]="[5, 10, 25, 100]">
+  </md-paginator>
 </div>

src/demo-app/data-table/data-table-demo.html

@@ -1,6 +1,7 @@
-import {Component} from '@angular/core';
+import {Component, ViewChild} from '@angular/core';
 import {PeopleDatabase, UserData} from './people-database';
 import {PersonDataSource} from './person-data-source';
+import {MdPaginator} from '@angular/material';
 
 export type UserProperties = 'userId' | 'userName' | 'progress' | 'color' | undefined;
 
@@ -19,13 +20,17 @@ export class DataTableDemo {
   changeReferences = false;
   highlights = new Set<string>();
 
-  constructor(public _peopleDatabase: PeopleDatabase) {
+  @ViewChild(MdPaginator) _paginator: MdPaginator;
+
+  constructor(public _peopleDatabase: PeopleDatabase) { }
+
+  ngOnInit() {
     this.connect();
   }
 
   connect() {
     this.propertiesToDisplay = ['userId', 'userName', 'progress', 'color'];
-    this.dataSource = new PersonDataSource(this._peopleDatabase);
+    this.dataSource = new PersonDataSource(this._peopleDatabase, this._paginator);
     this._peopleDatabase.initialize();
   }
 

src/demo-app/data-table/data-table-demo.ts

@@ -1,34 +1,58 @@
-import {CollectionViewer, DataSource} from '@angular/material';
+import {CollectionViewer, DataSource, MdPaginator} from '@angular/material';
 import {Observable} from 'rxjs/Observable';
 import {PeopleDatabase, UserData} from './people-database';
+import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 
 export class PersonDataSource extends DataSource<any> {
+  /** Data that should be displayed by the table. */
+  _displayData = new BehaviorSubject<UserData[]>([]);
+
+  /** Cached data provided by the display data. */
   _renderedData: any[] = [];
 
-  constructor(private _peopleDatabase: PeopleDatabase) {
+  constructor(private _peopleDatabase: PeopleDatabase,
+              private _paginator: MdPaginator) {
     super();
+
+    // Subscribe to page changes and database changes by clearing the cached data and
+    // determining the updated display data.
+    Observable.merge(this._paginator.page, this._peopleDatabase.dataChange).subscribe(() => {
+      this._renderedData = [];
+      this.updateDisplayData();
+    });
   }
 
   connect(collectionViewer: CollectionViewer): Observable<UserData[]> {
-    const changeStreams = Observable.combineLatest(
-        collectionViewer.viewChange,
-        this._peopleDatabase.dataChange);
-    return changeStreams.map((result: any[]) => {
-      const view: {start: number, end: number} = result[0];
+    this.updateDisplayData();
 
-      // Set the rendered rows length to the virtual page size. Fill in the data provided
-      // from the index start until the end index or pagination size, whichever is smaller.
-      this._renderedData.length = this._peopleDatabase.data.length;
+    const streams = [collectionViewer.viewChange, this._displayData];
+    return Observable.combineLatest(streams)
+        .map((results: [{start: number, end: number}, UserData[]]) => {
+          const [view, data] = results;
 
-      const buffer = 20;
-      let rangeStart = Math.max(0, view.start - buffer);
-      let rangeEnd = Math.min(this._peopleDatabase.data.length, view.end + buffer);
+          // Set the rendered rows length to the virtual page size. Fill in the data provided
+          // from the index start until the end index or pagination size, whichever is smaller.
+          this._renderedData.length = data.length;
 
-      for (let i = rangeStart; i < rangeEnd; i++) {
-        this._renderedData[i] = this._peopleDatabase.data[i];
-      }
+          const buffer = 20;
+          let rangeStart = Math.max(0, view.start - buffer);
+          let rangeEnd = Math.min(data.length, view.end + buffer);
 
-      return this._renderedData;
-    });
+          for (let i = rangeStart; i < rangeEnd; i++) {
+            this._renderedData[i] = data[i];
+          }
+
+          return this._renderedData;
+        });
+  }
+
+  updateDisplayData() {
+    const data = this._peopleDatabase.data.slice();
+
+    // Grab the page's slice of data.
+    const startIndex = this._paginator.pageIndex * this._paginator.pageSize;
+    const paginatedData = data.splice(startIndex, this._paginator.pageSize);
+
+    this._displayData.next(paginatedData);
   }
 }

src/demo-app/data-table/person-data-source.ts

@@ -61,6 +61,7 @@ import {
   MdListModule,
   MdMenuModule,
   MdNativeDateModule,
+  MdPaginatorModule,
   MdProgressBarModule,
   MdProgressSpinnerModule,
   MdRadioModule,
@@ -98,6 +99,7 @@ import {TableHeaderDemo} from './data-table/table-header-demo';
     MdListModule,
     MdMenuModule,
     MdCoreModule,
+    MdPaginatorModule,
     MdProgressBarModule,
     MdProgressSpinnerModule,
     MdRadioModule,

src/demo-app/demo-app-module.ts

@@ -14,6 +14,7 @@
 @import '../../input/input-theme';
 @import '../../list/list-theme';
 @import '../../menu/menu-theme';
+@import '../../paginator/paginator-theme';
 @import '../../progress-bar/progress-bar-theme';
 @import '../../progress-spinner/progress-spinner-theme';
 @import '../../radio/radio-theme';
@@ -44,6 +45,7 @@
   @include mat-input-theme($theme);
   @include mat-list-theme($theme);
   @include mat-menu-theme($theme);
+  @include mat-paginator-theme($theme);
   @include mat-progress-bar-theme($theme);
   @include mat-progress-spinner-theme($theme);
   @include mat-radio-theme($theme);

src/lib/core/theming/_all-theme.scss

@@ -12,6 +12,7 @@
 @import '../../input/input-theme';
 @import '../../list/list-theme';
 @import '../../menu/menu-theme';
+@import '../../paginator/paginator-theme';
 @import '../../progress-bar/progress-bar-theme';
 @import '../../progress-spinner/progress-spinner-theme';
 @import '../../radio/radio-theme';
@@ -42,6 +43,7 @@
   @include mat-icon-typography($config);
   @include mat-input-typography($config);
   @include mat-menu-typography($config);
+  @include mat-paginator-typography($config);
   @include mat-progress-bar-typography($config);
   @include mat-progress-spinner-typography($config);
   @include mat-radio-typography($config);

src/lib/core/typography/_all-typography.scss

@@ -46,6 +46,7 @@ import {StyleModule} from './core/style/index';
 import {MdDatepickerModule} from './datepicker/index';
 import {CdkDataTableModule} from './core/data-table/index';
 import {MdExpansionModule} from './expansion/index';
+import {MdPaginatorModule} from './paginator/index';
 
 const MATERIAL_MODULES = [
   MdAutocompleteModule,
@@ -62,6 +63,7 @@ const MATERIAL_MODULES = [
   MdInputModule,
   MdListModule,
   MdMenuModule,
+  MdPaginatorModule,
   MdProgressBarModule,
   MdProgressSpinnerModule,
   MdRadioModule,

src/lib/module.ts

@@ -0,0 +1,42 @@
+@import '../core/theming/palette';
+@import '../core/theming/theming';
+@import '../core/typography/typography-utils';
+
+
+@mixin mat-paginator-theme($theme) {
+  $foreground: map-get($theme, foreground);
+
+  .mat-paginator,
+  .mat-paginator-page-size .mat-select-trigger {
+    color: mat-color($foreground, secondary-text);
+  }
+
+  .mat-paginator-increment,
+  .mat-paginator-decrement {
+    border-top: 2px solid mat-color($foreground, 'icon');
+    border-right: 2px solid mat-color($foreground, 'icon');
+  }
+
+  .mat-icon-button[disabled] {
+    .mat-paginator-increment,
+    .mat-paginator-decrement {
+      border-color: mat-color($foreground, 'disabled');
+    }
+  }
+}
+
+@mixin mat-paginator-typography($config) {
+  .mat-paginator {
+    font: {
+      family: mat-font-family($config);
+      size: mat-font-size($config, caption);
+    }
+  }
+
+  .mat-paginator-page-size .mat-select-trigger {
+    font: {
+      family: mat-font-family($config);
+      size: mat-font-size($config, caption);
+    }
+  }
+}

src/lib/paginator/_paginator-theme.scss

@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
+import {MdCommonModule, OverlayModule} from '../core';
+import {MdButtonModule} from '../button/index';
+import {MdSelectModule} from '../select/index';
+import {MdPaginator} from './paginator';
+import {MdPaginatorIntl} from './paginator-intl';
+import {MdTooltipModule} from '../tooltip/index';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    MdButtonModule,
+    MdSelectModule,
+    MdTooltipModule,
+  ],
+  exports: [MdPaginator],
+  declarations: [MdPaginator],
+  providers: [MdPaginatorIntl],
+})
+export class MdPaginatorModule {}
+
+
+export * from './paginator';