Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
234d780
fix(tooltip): remove hideDelay and unused class
RivaIvanova Aug 27, 2025
0f0ebec
Merge branch 'vnext' into rivanova/update-tooltip-simple-sample
RivaIvanova Aug 28, 2025
91816fe
Merge pull request #3723 from IgniteUI/rivanova/update-tooltip-simple…
kacheshmarova Aug 29, 2025
e367c8d
Updating Staging with 20.1.0-rc.0 (#3726)
ChronosSF Aug 29, 2025
20ac142
Add cell merge samples (#3709)
MayaKirova Sep 1, 2025
c499eaf
feat(grids): added both side pinning samples (#3725)
tishko0 Sep 1, 2025
944da1a
fix(lob): adding client rendering for sample
ChronosSF Sep 4, 2025
a95167e
fix(lob): adding client rendering for sample (#3727)
ChronosSF Sep 4, 2025
f15201b
feat(cell-merging): add custom strategy cell merging samples for tgri…
IMinchev64 Sep 4, 2025
67b7975
deps(angular): bump to latest angular version
simeonoff Sep 16, 2025
4df45a7
npm(package-lock): update to include darwin-arm64-binaries
simeonoff Sep 16, 2025
64ab775
build(browserlist): bump target safari version
simeonoff Sep 16, 2025
668cb23
Merge pull request #3732 from IgniteUI/simeonoff/fix-vnext-darwin-arm64
ChronosSF Sep 17, 2025
b72f4dc
Merge branch 'vnext' into iminchev/cell-merging-custom-strat
ChronosSF Sep 25, 2025
f8fb3b8
Merge pull request #3729 from IgniteUI/iminchev/cell-merging-custom-s…
ChronosSF Sep 25, 2025
439a4be
feat(*): updating to rtm 20.1.0
ChronosSF Sep 25, 2025
b2026bb
feat(*): updating to live-editing rtm
ChronosSF Sep 25, 2025
d142c2d
Merge pull request #3734 from IgniteUI/sstoychev/updating-to-rtm
ChronosSF Sep 25, 2025
beaa9a0
Merge remote-tracking branch 'origin/master' into vnext
ChronosSF Sep 25, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ not > 0.5%
not last 2 versions
not dead
not IE 9-11
Safari >=15
Safari >=15.7
20 changes: 19 additions & 1 deletion live-editing/configs/GridConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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;
}
}
28 changes: 28 additions & 0 deletions live-editing/configs/HierarchicalGridConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
27 changes: 27 additions & 0 deletions live-editing/configs/TreeGridConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Loading
Loading