Skip to content

Commit 3f882d4

Browse files
zdrawkuzdrawku
authored
Merge pull request #1293 from IgniteUI/80x-copy
Even 8.0.x and master
2 parents 5460539 + 7e6e194 commit 3f882d4

File tree

34 files changed

+447
-128
lines changed

34 files changed

+447
-128
lines changed

‎live-editing/configs/GridConfigGenerator.ts

+15-12
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,27 @@ import {
2828
IgxToastModule,
2929
IgxTooltipModule
3030
} from "igniteui-angular";
31+
// tslint:disable:max-line-length
32+
import { CustomGridPagingStyleSample } from "../../src/app/grid/custom-grid-paging-style/custom-grid-paging-style.component";
3133
import {
3234
GridBatchEditingSampleComponent
3335
} from "../../src/app/grid/grid-batch-editing/grid-batch-editing-sample.component";
3436
import { GridWithTransactionsComponent } from "../../src/app/grid/grid-batch-editing/grid-transaction.component";
3537
import { GridComponent } from "../../src/app/grid/grid-boston-marathon/grid.component";
38+
import { GridClipboardSampleComponent } from "../../src/app/grid/grid-clipboard-operations-sample/grid-clipboard-operations-sample.component";
3639
import {
3740
GridColumnHidingSampleComponent
3841
} from "../../src/app/grid/grid-column-hiding-sample/grid-column-hiding-sample.component";
3942
import {
4043
GridColumnHidingToolbarSampleComponent
4144
} from "../../src/app/grid/grid-column-hiding-toolbar-sample/grid-column-hiding-toolbar-sample.component";
42-
// tslint:disable-next-line:max-line-length
4345
import { GridCompositeDataComponent } from "../../src/app/grid/grid-composite-data-binding/grid-composite-data.component";
4446
import {
4547
GridConditionalCellStyleComponent
4648
} from "../../src/app/grid/grid-conditional-cell-style/grid-conditional-cell-style.component";
4749
import { ContextmenuComponent } from "../../src/app/grid/grid-contextmenu-sample/contextmenu/contextmenu.component";
48-
// tslint:disable-next-line: max-line-length
4950
import { GridContextmenuSampleComponent } from "../../src/app/grid/grid-contextmenu-sample/grid-contextmenu-sample.component";
5051
import { GridCustomFilteringComponent } from "../../src/app/grid/grid-custom-filtering/grid-custom-filtering.component";
51-
// tslint:disable-next-line: max-line-length
5252
import { GridCustomKBNavigationComponent } from "../../src/app/grid/grid-custom-kb-navigation/grid-custom-kb-navigation-sample.component";
5353
import {
5454
GridDisplayDensitySampleComponent
@@ -75,20 +75,12 @@ import { GridMovingSampleComponent } from "../../src/app/grid/grid-moving-sample
7575
import {
7676
GridMovingStyledSampleComponent
7777
} from "../../src/app/grid/grid-moving-styled-sample/grid-moving-styled-sample.component";
78-
79-
// tslint:disable-next-line: max-line-length
78+
import { GridMRLCustomNavigationComponent } from "../../src/app/grid/grid-mrl-custom-navigation/grid-mrl-custom-navigation.component";
8079
import { GridMultiCellSelectionStyleComponent } from "../../src/app/grid/grid-multi-cell-selection-style/grid-multi-cell-selection-style.component";
81-
// tslint:disable-next-line:max-line-length
8280
import { GridMultiCellSelectionComponent } from "../../src/app/grid/grid-multi-cell-selection/grid-multi-cell-selection.component";
8381
import {
8482
GridMultiRowLayoutConfigurationComponent
8583
} from "../../src/app/grid/grid-multi-row-layout-configuration/grid-multi-row-layout-configuration.component";
86-
87-
// tslint:disable-next-line: max-line-length
88-
import { GridMRLCustomNavigationComponent } from "../../src/app/grid/grid-mrl-custom-navigation/grid-mrl-custom-navigation.component";
89-
90-
// tslint:disable-next-line: max-line-length
91-
import { CustomGridPagingStyleSample } from "../../src/app/grid/custom-grid-paging-style/custom-grid-paging-style.component";
9284
import { GridMultiRowLayoutComponent } from "../../src/app/grid/grid-multi-row-layout/grid-multi-row-layout.component";
9385
import { GridNestedDataBindComponent } from "../../src/app/grid/grid-nested-data-binding/grid-nested-data-bind";
9486
import { PagingSampleComponent } from "../../src/app/grid/grid-paging-sample/grid-paging-sample.component";
@@ -133,6 +125,7 @@ import { RemoteServiceVirt } from "../../src/app/grid/services/remoteService";
133125
import { AppModuleConfig } from "./core/AppModuleConfig";
134126
import { Config } from "./core/Config";
135127
import { IConfigGenerator } from "./core/IConfigGenerator";
128+
// tslint:enable:max-line-length
136129

137130
export class GridConfigGenerator implements IConfigGenerator {
138131
public generateConfigs(): Config[] {
@@ -741,6 +734,16 @@ export class GridConfigGenerator implements IConfigGenerator {
741734
})
742735
}));
743736

737+
configs.push(new Config({
738+
component: GridClipboardSampleComponent,
739+
additionalFiles: ["/src/app/data/nwindData.ts"],
740+
appModuleConfig: new AppModuleConfig({
741+
imports: [GridClipboardSampleComponent, IgxGridModule, IgxSwitchModule],
742+
ngDeclarations: [GridClipboardSampleComponent],
743+
ngImports: [IgxGridModule, IgxSwitchModule]
744+
})
745+
}));
746+
744747
return configs;
745748
}
746749
}

‎live-editing/configs/HierarchicalGridConfigGenerator.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// tslint:disable:max-line-length
2+
import { HttpClientModule } from "@angular/common/http";
23
import {
34
IgxButtonGroupModule,
45
IgxButtonModule,
@@ -211,9 +212,9 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
211212
configs.push(new Config({
212213
additionalFiles: ["/src/app/hierarchical-grid/hierarchical-grid-paging/remotePagingService.ts"],
213214
appModuleConfig: new AppModuleConfig({
214-
imports: [IgxHierarchicalGridModule, HGridRemotePagingSampleComponent],
215+
imports: [IgxHierarchicalGridModule, HGridRemotePagingSampleComponent, HttpClientModule],
215216
ngDeclarations: [HGridRemotePagingSampleComponent],
216-
ngImports: [IgxHierarchicalGridModule]
217+
ngImports: [IgxHierarchicalGridModule, HttpClientModule]
217218
}),
218219
component: HGridRemotePagingSampleComponent
219220
}));

‎live-editing/configs/ThemingConfigGenerator.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
// tslint:disable:object-literal-sort-keys
33
import { IgxButtonGroupModule, IgxButtonModule, IgxCalendarModule, IgxCardModule,
44
IgxDatePickerModule, IgxDialogModule, IgxDropDownModule, IgxGridModule, IgxIconModule,
5-
IgxInputGroupModule, IgxLayoutModule, IgxRippleModule, IgxSnackbarModule, IgxToggleModule } from "igniteui-angular";
5+
IgxInputGroupModule, IgxLayoutModule, IgxRippleModule, IgxSelectModule, IgxSnackbarModule,
6+
IgxToggleModule } from "igniteui-angular";
67
import { DarkThemeSampleComponent } from "../../src/app/theming/dark-theme-sample/dark-theme-sample.component";
78
import { DefaultThemeSampleComponent } from "../../src/app/theming/default-theme-sample/default-theme-sample.component";
89
import { DisplayDensityComponent } from "../../src/app/theming/display-density/display-density.component";
@@ -29,13 +30,13 @@ export class ThemingConfigGenerator implements IConfigGenerator {
2930
imports: [IgxDropDownModule,
3031
IgxGridModule, IgxDialogModule, IgxSnackbarModule, IgxLayoutModule, ThemeChooserSampleComponent,
3132
IgxCalendarModule, IgxToggleModule, IgxIconModule, IgxRippleModule, IgxButtonModule,
32-
IgxInputGroupModule, IgxDatePickerModule],
33+
IgxInputGroupModule, IgxDatePickerModule, IgxSelectModule],
3334
ngDeclarations: [ThemeChooserSampleComponent],
3435
ngImports: [IgxDropDownModule,
3536
IgxDialogModule, IgxSnackbarModule, IgxLayoutModule,
3637
IgxToggleModule, IgxIconModule, IgxRippleModule, IgxButtonModule,
3738
IgxCalendarModule, IgxInputGroupModule, IgxDatePickerModule,
38-
IgxGridModule, IgxLayoutModule]
39+
IgxGridModule, IgxLayoutModule, IgxSelectModule]
3940
}),
4041
shortenComponentPathBy: "/theming/"
4142
}));

‎live-editing/configs/TreeGridConfigGenerator.ts

+13
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
} from "igniteui-angular";
2424
import { TreeGridBatchEditingSampleComponent } from "../../src/app/tree-grid/tree-grid-batch-editing/tree-grid-batch-editing-sample.component";
2525
import { TreeGridChilddatakeySampleComponent } from "../../src/app/tree-grid/tree-grid-childdatakey-sample/tree-grid-childdatakey-sample.component";
26+
import { TreeGridClipboardSampleComponent } from "../../src/app/tree-grid/tree-grid-clipboard-operations-sample/tree-grid-clipboard-operations-sample.component";
2627
import { TreeGridColumnHidingSampleComponent } from "../../src/app/tree-grid/tree-grid-column-hiding-sample/tree-grid-column-hiding-sample.component";
2728
import { TreeGridColumnHidingToolbarSampleComponent } from "../../src/app/tree-grid/tree-grid-column-hiding-toolbar-sample/tree-grid-column-hiding-toolbar-sample.component";
2829
import { TreeGridColumnMovingSampleComponent } from "../../src/app/tree-grid/tree-grid-column-moving-sample/tree-grid-column-moving-sample.component";
@@ -606,6 +607,18 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
606607
shortenComponentPathBy: "/tree-grid/"
607608
}));
608609

610+
// TreeGrid Clipboard actions sample
611+
configs.push(new Config({
612+
additionalFiles: ["/src/app/tree-grid/tree-grid-childdatakey-sample/data.ts"],
613+
appModuleConfig: new AppModuleConfig({
614+
imports: [IgxTreeGridModule, TreeGridClipboardSampleComponent, IgxSwitchModule],
615+
ngDeclarations: [TreeGridClipboardSampleComponent],
616+
ngImports: [IgxTreeGridModule, IgxSwitchModule]
617+
}),
618+
component: TreeGridClipboardSampleComponent,
619+
shortenComponentPathBy: "/tree-grid/"
620+
}));
621+
609622
return configs;
610623
}
611624
}

‎package-lock.json

+19-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/app/grid-finjs/grid-finjs-demo.component.scss

+3
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,17 @@
168168
}
169169
.finjs-slider {
170170
width: 40%;
171+
min-width: 145px;
171172
}
172173
.finjs-play-controls {
173174
width: 45%;
174175
min-width: 500px;
176+
margin-top: 20px;
175177
}
176178
.sample-toolbar {
177179
height: 20px;
178180
font-size: 0.8rem;
181+
line-height: 20px;
179182
}
180183
.fin-dark-theme {
181184
.finjs-slider,

‎src/app/grid/custom-grid-paging-style/custom-grid-paging-style.component.html

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="grid__wrapper">
2-
<igx-grid #grid1 [data]="data" [paging]="true" [perPage]="10" height="500px" width="100%" displayDensity="cosy">
2+
<igx-grid #grid1 [data]="data" [paging]="true" [perPage]="10" height="500px" width="100%" displayDensity="cosy" [paginationTemplate]="pager">
33
<igx-column header="Rank" headerClasses="myClass" field="Id" sortable="true">
44
</igx-column>
55

@@ -39,4 +39,22 @@
3939
</ng-template>
4040
</igx-column>
4141
</igx-grid>
42+
43+
<ng-template #pager let-grid>
44+
<div *ngIf="grid.paging && grid.totalPages > 0" class="igx-grid-paginator__pager" style="justify-content: center">
45+
<button [disabled]="grid.isFirstPage" (click)="grid.paginate(0)" igxButton="icon" igxRipple igxRippleCentered="true">
46+
<igx-icon>first_page</igx-icon>
47+
</button>
48+
<button [disabled]="grid.isFirstPage" (click)="grid.previousPage()" igxButton="icon" igxRipple igxRippleCentered="true">
49+
<igx-icon>chevron_left</igx-icon>
50+
</button>
51+
<span>{{ grid.page + 1 }} of {{ grid.totalPages }}</span>
52+
<button [disabled]="grid.isLastPage" (click)="grid.nextPage()" igxRipple igxRippleCentered="true" igxButton="icon">
53+
<igx-icon>chevron_right</igx-icon>
54+
</button>
55+
<button [disabled]="grid.isLastPage" (click)="grid.paginate(grid.totalPages - 1)" igxButton="icon" igxRipple igxRippleCentered="true">
56+
<igx-icon>last_page</igx-icon>
57+
</button>
58+
</div>
59+
</ng-template>
4260
</div>

‎src/app/grid/custom-grid-paging-style/custom-grid-paging-style.component.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $dark-button: igx-button-theme( $icon-color: #FFCD0F, $icon-hover-color: #292826
1010
:host {
1111
::ng-deep {
1212
@include igx-grid-paginator($dark-grid-paginator);
13-
.igx-paginator {
13+
.igx-grid-paginator__pager {
1414
@include igx-button($dark-button);
1515
}
1616
}
@@ -93,4 +93,4 @@ $dark-button: igx-button-theme( $icon-color: #FFCD0F, $icon-hover-color: #292826
9393
.grid__wrapper {
9494
width: 950px;
9595
margin: 10px auto;
96-
}
96+
}

‎src/app/grid/grid-boston-marathon/grid.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ <h5 class="switch-sample__title">Boston Marathon 2018</h5>
9393
</igx-grid>
9494

9595
<ng-template #pager let-grid>
96-
<div *ngIf="grid.paging && grid.totalPages > 0" class="igx-paginator">
96+
<div class="igx-grid-paginator__pager" style="justify-content: center">
9797
<button [disabled]="grid.isFirstPage" (click)="grid.paginate(0)" igxButton="icon" igxRipple
9898
igxRippleCentered="true">
9999
<igx-icon>first_page</igx-icon>
@@ -113,4 +113,4 @@ <h5 class="switch-sample__title">Boston Marathon 2018</h5>
113113
</div>
114114
</ng-template>
115115

116-
</div>
116+
</div>

‎src/app/grid/grid-boston-marathon/grid.component.scss

+3-9
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
$row-selected-text-color: #ddd,
77
$row-hover-background: #f8f8f8,
88
$row-border-color: #f8f8f8,
9-
9+
1010
$cell-selected-background: igx-color($default-palette, grays, 800),
1111
$cell-selected-text-color: #fff
1212
);
13-
13+
1414
$progressBar-sample-theme: igx-progress-linear-theme(
1515
$track-color: rgba(181,181,181, .5),
1616
$fill-color-default: orange
1717
);
18-
18+
1919
.grid__wrapper {
2020
@include igx-grid($grid-sample-theme);
2121
@include igx-progress-linear($progressBar-sample-theme);
@@ -124,12 +124,6 @@
124124
}
125125
}
126126

127-
.igx-paginator>* {
128-
margin: 0 .3125rem;
129-
display: flex;
130-
align-items: center;
131-
}
132-
133127
.linear-bar-container {
134128
width: 100%;
135129
}

0 commit comments

Comments
 (0)