Skip to content

Commit 3de3be6

Browse files
authored
Merge branch 'vnext' into apetrov/grid-advanced-excel-samples-vnext
2 parents 8d2dbb7 + 7e7f46b commit 3de3be6

34 files changed

Lines changed: 5825 additions & 3093 deletions

.browserslistrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ not > 0.5%
1010
not last 2 versions
1111
not dead
1212
not IE 9-11
13-
Safari >=15
13+
Safari >=15.7

.postcssrc.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"plugins": {
3+
"@tailwindcss/postcss": {}
4+
}
5+
}

live-editing/configs/HierarchicalGridConfigGenerator.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,15 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
654654
]
655655
}));
656656

657+
configs.push(new Config({
658+
component: 'HGridCellMergeCustomComponent',
659+
appConfig: BaseAppConfig,
660+
additionalFiles: [
661+
'/src/app/directives/prevent-scroll.directive.ts',
662+
'/src/app/data/hierarchical-data.ts'
663+
]
664+
}));
665+
657666
configs.push(new Config({
658667
component: 'HierarchicalGridBothSidePinningSampleComponent',
659668
appConfig: BaseAppConfig,

live-editing/configs/ThemingConfigGenerator.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@ export class ThemingConfigGenerator implements IConfigGenerator {
7676
shortenComponentPathBy: '/theming/angular/'
7777
}));
7878

79+
configs.push(new Config({
80+
component: 'TailwindSampleComponent',
81+
appConfig: BaseAppConfig,
82+
shortenComponentPathBy: '/theming/tailwind/',
83+
additionalDependencies: ['tailwindcss', '@tailwindcss/postcss'],
84+
additionalFiles: [".postcssrc.json"],
85+
}));
86+
7987
return configs;
8088
}
8189
}

live-editing/configs/TreeGridConfigGenerator.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,15 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
800800
]
801801
}));
802802

803+
configs.push(new Config({
804+
component: 'TreeGridCellMergeCustomComponent',
805+
appConfig: BaseAppConfig,
806+
additionalFiles: [
807+
'/src/app/directives/prevent-scroll.directive.ts',
808+
'/src/app/tree-grid/data/employees-flat-detailed.ts'
809+
]
810+
}));
811+
803812
configs.push(new Config({
804813
component: 'TreeGridBothSidesPinningSampleComponent',
805814
additionalFiles: [

0 commit comments

Comments
 (0)