Merge branch 'master' into bpachilova/drp-samples-update-6189

Author: kacheshmarova

.browserslistrc

@@ -10,4 +10,4 @@ not > 0.5%
 not last 2 versions
 not dead
 not IE 9-11
-Safari >=15
+Safari >=15.7

live-editing/configs/GridConfigGenerator.ts

@@ -44,7 +44,7 @@ import {
     IgcFormsModule
 } from 'igniteui-angular';
 import { Config, IConfigGenerator } from 'igniteui-live-editing'
-import { BaseAppConfig } from './BaseConfig';;
+import { BaseAppConfig } from './BaseConfig';
 export class GridConfigGenerator implements IConfigGenerator {
     public additionalImports = {
         IgxPreventDocumentScrollDirective: '../../src/app/directives/prevent-scroll.directive',
@@ -868,6 +868,24 @@ export class GridConfigGenerator implements IConfigGenerator {
             appConfig: BaseAppConfig
         }));
 
+        configs.push(new Config({
+            component: 'GridCellMergeCustomSampleComponent',
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/customers.ts'],
+            appConfig: BaseAppConfig
+        }));
+
+        configs.push(new Config({
+            component: 'GridCellMergeSampleComponent',
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/invoiceData.ts'],
+            appConfig: BaseAppConfig
+        }));
+
+        configs.push(new Config({
+            component: 'GridBothSideToolbarPinningSampleComponent',
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/customers.ts'],
+            appConfig: BaseAppConfig
+        }));
+
         return configs;
     }
 }

live-editing/configs/HierarchicalGridConfigGenerator.ts

@@ -645,6 +645,34 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
             component: 'HGridSummaryExportComponent'
         }));
 
+        configs.push(new Config({
+            component: 'HGridCellMergeComponent',
+            appConfig: BaseAppConfig,
+            additionalFiles: [
+                '/src/app/directives/prevent-scroll.directive.ts',
+                '/src/app/data/hierarchical-data.ts'
+            ]
+        }));
+
+        configs.push(new Config({
+            component: 'HGridCellMergeCustomComponent',
+            appConfig: BaseAppConfig,
+            additionalFiles: [
+                '/src/app/directives/prevent-scroll.directive.ts',
+                '/src/app/data/hierarchical-data.ts'
+            ]
+        }));
+
+        configs.push(new Config({
+            component: 'HierarchicalGridBothSidePinningSampleComponent',
+            appConfig: BaseAppConfig,
+            additionalFiles: [
+                '/src/app/directives/prevent-scroll.directive.ts',
+                '/src/app/data/employeesData.ts',
+                '/src/app/data/athletesData.ts'
+            ]
+        }));
+
         return configs;
     }
 }

live-editing/configs/TreeGridConfigGenerator.ts

@@ -791,6 +791,33 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
             shortenComponentPathBy: '/tree-grid/'
         }));
 
+        configs.push(new Config({
+            component: 'TreeGridCellMergeComponent',
+            appConfig: BaseAppConfig,
+            additionalFiles: [
+                '/src/app/directives/prevent-scroll.directive.ts',
+                '/src/app/tree-grid/data/employees-flat-detailed.ts'
+            ]
+        }));
+
+        configs.push(new Config({
+            component: 'TreeGridCellMergeCustomComponent',
+            appConfig: BaseAppConfig,
+            additionalFiles: [
+                '/src/app/directives/prevent-scroll.directive.ts',
+                '/src/app/tree-grid/data/employees-flat-detailed.ts'
+            ]
+        }));
+
+        configs.push(new Config({
+            component: 'TreeGridBothSidesPinningSampleComponent',
+            additionalFiles: [
+                '/src/app/directives/prevent-scroll.directive.ts',
+                '/src/app/tree-grid/data/employees-flat-detailed.ts'
+            ],
+            appConfig: BaseAppConfig
+        }));
+
         return configs;
     }
 }