Skip to content

Commit 74b3521

Browse files
committed
Merge branch 'didimmova/add-tailwind-sample-vnext' into didimmova/add-tailwind-styling-samples
2 parents a5a8d83 + 818a426 commit 74b3521

62 files changed

Lines changed: 4906 additions & 2799 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.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

gulpfile.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ const fs = require("fs");
33
const path = require("path");
44
const es = require('event-stream');
55
const fsExtra = require("fs-extra");
6+
const yargs = require("yargs");
7+
const { hideBin } = require('yargs/helpers');
68

79
require('ts-node').register({
810
transpileOnly: true,
@@ -14,7 +16,7 @@ require('ts-node').register({
1416
});
1517

1618
const { generateLiveEditing } = require('igniteui-live-editing');
17-
const argv = require("yargs").argv;
19+
const argv = yargs(hideBin(process.argv)).parse();
1820

1921
const submodule = "igniteui-live-editing-samples";
2022

live-editing/configs/GridConfigGenerator.ts

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import {
4444
IgcFormsModule
4545
} from 'igniteui-angular';
4646
import { Config, IConfigGenerator } from 'igniteui-live-editing'
47-
import { BaseAppConfig } from './BaseConfig';;
47+
import { BaseAppConfig } from './BaseConfig';
4848
export class GridConfigGenerator implements IConfigGenerator {
4949
public additionalImports = {
5050
IgxPreventDocumentScrollDirective: '../../src/app/directives/prevent-scroll.directive',
@@ -868,6 +868,24 @@ export class GridConfigGenerator implements IConfigGenerator {
868868
appConfig: BaseAppConfig
869869
}));
870870

871+
configs.push(new Config({
872+
component: 'GridCellMergeCustomSampleComponent',
873+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/customers.ts'],
874+
appConfig: BaseAppConfig
875+
}));
876+
877+
configs.push(new Config({
878+
component: 'GridCellMergeSampleComponent',
879+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/invoiceData.ts'],
880+
appConfig: BaseAppConfig
881+
}));
882+
883+
configs.push(new Config({
884+
component: 'GridBothSideToolbarPinningSampleComponent',
885+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/customers.ts'],
886+
appConfig: BaseAppConfig
887+
}));
888+
871889
return configs;
872890
}
873891
}

live-editing/configs/HierarchicalGridConfigGenerator.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,25 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
645645
component: 'HGridSummaryExportComponent'
646646
}));
647647

648+
configs.push(new Config({
649+
component: 'HGridCellMergeComponent',
650+
appConfig: BaseAppConfig,
651+
additionalFiles: [
652+
'/src/app/directives/prevent-scroll.directive.ts',
653+
'/src/app/data/hierarchical-data.ts'
654+
]
655+
}));
656+
657+
configs.push(new Config({
658+
component: 'HierarchicalGridBothSidePinningSampleComponent',
659+
appConfig: BaseAppConfig,
660+
additionalFiles: [
661+
'/src/app/directives/prevent-scroll.directive.ts',
662+
'/src/app/data/employeesData.ts',
663+
'/src/app/data/athletesData.ts'
664+
]
665+
}));
666+
648667
return configs;
649668
}
650669
}

live-editing/configs/QueryBuilderConfigGenerator.ts

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
import { Config, IConfigGenerator} from 'igniteui-live-editing'
1+
import { Config, IConfigGenerator } from 'igniteui-live-editing'
22
import { BaseAppConfig } from './BaseConfig';
33
export class QueryBuilderConfigGenerator implements IConfigGenerator {
44
public generateConfigs(): Config[] {
55
const configs = new Array<Config>();
66

7+
const HTTPConfig = structuredClone(BaseAppConfig);
8+
HTTPConfig.providers.push({ 'provider': 'provideHttpClient(),', 'import': '@angular/common/http' });
9+
710
configs.push(new Config({
811
component: 'QueryBuilderSample1Component',
912
appConfig: BaseAppConfig,
@@ -23,12 +26,19 @@ export class QueryBuilderConfigGenerator implements IConfigGenerator {
2326
shortenComponentPathBy: "/interactions/query-builder/"
2427
}));
2528

26-
// configs.push(new Config({
27-
// component: 'QueryBuilderSqlSampleComponent',
28-
// additionalDependencies: ["sql-formatter"],
29-
// appConfig: BaseAppConfig,
30-
// shortenComponentPathBy: "/interactions/query-builder/"
31-
// })); // sql-formatter is not available in the live editing environment and cannot be enabled per config atm
29+
configs.push(new Config({
30+
component: 'QueryBuilderRequestSampleComponent',
31+
additionalFiles: ["/src/app/interactions/query-builder/query-builder-style/layout.scss"],
32+
appConfig: HTTPConfig,
33+
shortenComponentPathBy: "/interactions/query-builder/"
34+
}));
35+
36+
configs.push(new Config({
37+
component: 'QueryBuilderSqlSampleComponent',
38+
additionalDependencies: ["sql-formatter"],
39+
appConfig: HTTPConfig,
40+
shortenComponentPathBy: "/interactions/query-builder/"
41+
}));
3242

3343
return configs;
3444
}

live-editing/configs/ThemingConfigGenerator.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
import {
2+
IgxCardComponent,
3+
IgxCardContentDirective,
4+
IgxCardHeaderComponent,
5+
IgxChipComponent,
6+
IgxIconComponent,
7+
IgxPrefixDirective,
8+
} from "igniteui-angular";
19
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing'
210
import { BaseAppConfig } from './BaseConfig';;
311
export class ThemingConfigGenerator implements IConfigGenerator {
@@ -36,6 +44,12 @@ export class ThemingConfigGenerator implements IConfigGenerator {
3644
shortenComponentPathBy: '/theming/'
3745
}));
3846

47+
configs.push(new Config({
48+
component: 'RoundnessComponent',
49+
appConfig: BaseAppConfig,
50+
shortenComponentPathBy: '/theming/roundness/'
51+
}));
52+
3953
configs.push(new Config({
4054
component: 'AnimationsSampleComponent',
4155
appConfig: BaseAppConfig,

live-editing/configs/TreeGridConfigGenerator.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -791,6 +791,24 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
791791
shortenComponentPathBy: '/tree-grid/'
792792
}));
793793

794+
configs.push(new Config({
795+
component: 'TreeGridCellMergeComponent',
796+
appConfig: BaseAppConfig,
797+
additionalFiles: [
798+
'/src/app/directives/prevent-scroll.directive.ts',
799+
'/src/app/tree-grid/data/employees-flat-detailed.ts'
800+
]
801+
}));
802+
803+
configs.push(new Config({
804+
component: 'TreeGridBothSidesPinningSampleComponent',
805+
additionalFiles: [
806+
'/src/app/directives/prevent-scroll.directive.ts',
807+
'/src/app/tree-grid/data/employees-flat-detailed.ts'
808+
],
809+
appConfig: BaseAppConfig
810+
}));
811+
794812
return configs;
795813
}
796814
}

0 commit comments

Comments
 (0)