Merge branch 'vnext' into sstoychev/fix-lite-ds

Author: ChronosSF

src/app/grid/grid-sample-pinning-both-sides/grid-toolbar-pinning-both-sides.component.html

@@ -14,9 +14,9 @@
     >
         <igx-grid-toolbar>
             <igx-grid-toolbar-actions>
-                <button igxButton="contained" (click)="unpinColumn()"> Unpin Column </button>
-                <button igxButton="contained" (click)="pinLeft()"> Pin Left </button>
-                <button igxButton="contained" (click)="pinRight()"> Pin Right </button>
+                <button igxButton="contained" (click)="unpinColumn()"> Unpin Selected Columns </button>
+                <button igxButton="contained" (click)="pinLeft()"> Pin Selected Left </button>
+                <button igxButton="contained" (click)="pinRight()"> Pin Selected Right </button>
             </igx-grid-toolbar-actions>
         </igx-grid-toolbar>
 

src/app/grid/grid-select/grid-select-sample.component.html

@@ -3,7 +3,7 @@
   </igx-column>
   <igx-column field="race" header="Race" [editable]="true">
     <ng-template igxCellEditor let-cell="cell" let-value>
-      <igx-select class="cell-select" [(ngModel)]="cell.editValue" [igxFocus]="true">
+      <igx-select [(ngModel)]="cell.editValue" [igxFocus]="true">
         @for (race of races; track race) {
           <igx-select-item [value]="race">
             {{ race }}
@@ -14,7 +14,7 @@
   </igx-column>
   <igx-column field="class" header="Class" [editable]="true">
     <ng-template igxCellEditor let-cell="cell" let-value>
-      <igx-select class="cell-select" [(ngModel)]="cell.editValue" [igxFocus]="true">
+      <igx-select [(ngModel)]="cell.editValue" [igxFocus]="true">
         @for (class of classes; track class) {
           <igx-select-item [value]="class">
             {{ class }}
@@ -27,7 +27,7 @@
   </igx-column>
   <igx-column field="alignment" header="Alignment" [editable]="true">
     <ng-template igxCellEditor let-cell="cell" let-value>
-      <igx-select class="cell-select"  [(ngModel)]="cell.editValue" [igxFocus]="true">
+      <igx-select [(ngModel)]="cell.editValue" [igxFocus]="true">
         @for (alignment of alignments; track alignment) {
           <igx-select-item [value]="alignment">
             {{ alignment }}

src/app/grid/grid-select/grid-select-sample.component.scss

@@ -2,8 +2,3 @@
     display: block;
     padding: 16px;
 }
-
-.cell-select {
-    width: 100%;
-    height: 100%;
-}

src/app/hierarchical-grid/hierarchical-grid-cell-merge-custom/hierarchical-grid-cell-merge-custom.component.html

@@ -1,6 +1,6 @@
 <div class="grid__wrapper">
     <igx-hierarchical-grid [igxPreventDocumentScroll]="true" #hGrid [data]="localData" [moving]="true" [sortingExpressions]="sortExpr"
-        [cellMergeMode]="cellMergeMode" [mergeStrategy]="perCountryMergeStrategy" [height]="'740px'" [width]="'100%'" [allowFiltering]="true" >
+        [cellMergeMode]="cellMergeMode" [mergeStrategy]="perCountryMergeStrategy" [height]="'400px'" [width]="'100%'" [allowFiltering]="true" >
         <igx-column field="CompanyName" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
         <igx-column field="ContactName" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
         <igx-column field="ContactTitle" [sortable]="true" [resizable]="true" [merge]="true" [editable]="true"></igx-column>

src/app/hierarchical-grid/hierarchical-grid-cell-merge-custom/hierarchical-grid-cell-merge-custom.component.ts

@@ -17,10 +17,6 @@ import { FormsModule } from '@angular/forms';
         IgxPreventDocumentScrollDirective,
         IgxColumnComponent,
         IgxRowIslandComponent,
-        IgxGridToolbarComponent,
-        IgxSelectComponent,
-        IgxSelectItemComponent,
-        IgxLabelDirective,
         FormsModule
     ]
 })

src/app/hierarchical-grid/hierarchical-grid-cell-merge/hierarchical-grid-cell-merge.component.html

@@ -1,6 +1,6 @@
 <div class="grid__wrapper">
     <igx-hierarchical-grid [igxPreventDocumentScroll]="true" #hGrid [data]="localData" [moving]="true" [sortingExpressions]="sortExpr"
-        [cellMergeMode]="cellMergeMode" [height]="'740px'" [width]="'100%'" [allowFiltering]="true" >
+        [cellMergeMode]="cellMergeMode" [height]="'450px'" [width]="'100%'" [allowFiltering]="true" >
         <igx-grid-toolbar>
             <igx-select [(ngModel)]="cellMergeMode">
                 <label igxLabel>Select Merge Type Root</label>

src/app/hierarchical-grid/hierarchical-grid-sample-both-sides-pinning/hierarchical-grid-both-sides-pinning.component.html

@@ -13,9 +13,9 @@
     <igx-grid-toolbar>
         <igx-grid-toolbar-title>Hierarchical Grid</igx-grid-toolbar-title>
             <igx-grid-toolbar-actions>
-                <button igxButton="contained" (click)="unpinColumn()"> Unpin Column </button>
-                <button igxButton="contained" (click)="pinLeft()"> Pin Left </button>
-                <button igxButton="contained" (click)="pinRight()"> Pin Right </button>
+                <button igxButton="contained" (click)="unpinColumn()"> Unpin Selected Columns </button>
+                <button igxButton="contained" (click)="pinLeft()"> Pin Selected Left </button>
+                <button igxButton="contained" (click)="pinRight()"> Pin Selected Right </button>
             </igx-grid-toolbar-actions>
         </igx-grid-toolbar>
 

src/app/scheduling/timepicker/timepicker-sample-6/timepicker-sample-6.component.html

@@ -1,9 +1,9 @@
 <igx-time-picker #picker [(ngModel)]="today" [inputFormat]="'hh:mm'">
     <igx-picker-toggle igxPrefix>
-        <igx-icon (click)="picker.toggle()">access_alarm</igx-icon>
+        <igx-icon>access_alarm</igx-icon>
     </igx-picker-toggle>
     <igx-hint>{{today.toLocaleString()}}</igx-hint>
-    <ng-template igxTimePickerActions>
+    <ng-template igxPickerActions>
         <div class="action-buttons">
             <button igxButton="flat" (click)="picker.cancelButtonClick()">cancel</button>
             <button igxButton="flat" (click)="picker.okButtonClick()">done</button>

src/app/scheduling/timepicker/timepicker-sample-6/timepicker-sample-6.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { IgxTimePickerComponent } from 'igniteui-angular/time-picker';
-import { IgxPickerToggleComponent } from 'igniteui-angular/core';
+import { IgxPickerActionsDirective, IgxPickerToggleComponent } from 'igniteui-angular/core';
 import { IgxHintDirective, IgxPrefixDirective } from 'igniteui-angular/input-group';
 import { IgxIconComponent } from 'igniteui-angular/icon';
 import { IgxButtonDirective } from 'igniteui-angular/directives';
@@ -10,7 +10,7 @@ import { FormsModule } from '@angular/forms';
     selector: 'app-timepicker-sample-6',
     styleUrls: ['./timepicker-sample-6.component.scss'],
     templateUrl: './timepicker-sample-6.component.html',
-    imports: [IgxTimePickerComponent, FormsModule, IgxPickerToggleComponent, IgxPrefixDirective, IgxIconComponent, IgxHintDirective, IgxButtonDirective]
+    imports: [IgxTimePickerComponent, FormsModule, IgxPickerToggleComponent, IgxPrefixDirective, IgxIconComponent, IgxHintDirective, IgxButtonDirective, IgxPickerActionsDirective]
 })
 export class TimePickerSample6Component {
 

src/app/tree-grid/tree-grid-cell-merge-custom-sample/tree-grid-cell-merge-custom-sample.component.html

@@ -1,5 +1,5 @@
 <div class="grid__wrapper">
-    <igx-tree-grid #treeGrid [igxPreventDocumentScroll]="true" [data]="data" width="100%" height="800px"
+    <igx-tree-grid #treeGrid [igxPreventDocumentScroll]="true" [data]="data" width="100%" height="720px"
         [sortingExpressions]="sortExpr" [autoGenerate]="false" primaryKey="ID" foreignKey="ParentID"
         [cellMergeMode]="cellMergeMode" [mergeStrategy]="mergeStrategy">
         <igx-column [field]="'Name'" dataType="string" width="250px" [editable]="true"></igx-column>