Skip to content

Commit 060d4df

Browse files
authored
Merge pull request #620 from IgniteUI/vnext
Merging vnext to master
2 parents 32564c7 + 4d8e23c commit 060d4df

File tree

912 files changed

+34420
-7713
lines changed

Some content is hidden

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

912 files changed

+34420
-7713
lines changed

browser/public/index.html

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@
424424
<a class="nav-link" href="#" data-nav="/samples/grids/grid/binding-composite-data"><span>Binding Composite Data</span></a>
425425
<a class="nav-link" href="#" data-nav="/samples/grids/grid/binding-crud-data"><span>Binding Crud Data</span></a>
426426
<a class="nav-link" href="#" data-nav="/samples/grids/grid/binding-nested-data-1"><span>Binding Nested Data1</span></a>
427+
<a class="nav-link" href="#" data-nav="/samples/grids/grid/cascading-combo"><span>Cascading Combo</span></a>
427428
<a class="nav-link" href="#" data-nav="/samples/grids/grid/cell-editing-sample"><span>Cell Editing Sample</span></a>
428429
<a class="nav-link" href="#" data-nav="/samples/grids/grid/cell-editing-styling"><span>Cell Editing Styling</span></a>
429430
<a class="nav-link" href="#" data-nav="/samples/grids/grid/cell-selection-mode"><span>Cell Selection Mode</span></a>
@@ -467,7 +468,9 @@
467468
<a class="nav-link" href="#" data-nav="/samples/grids/grid/data-validator-service-cross-field"><span>Data Validator Service Cross Field</span></a>
468469
<a class="nav-link" href="#" data-nav="/samples/grids/grid/data-validator-service-extended"><span>Data Validator Service Extended</span></a>
469470
<a class="nav-link" href="#" data-nav="/samples/grids/grid/editing-columns"><span>Editing Columns</span></a>
471+
<a class="nav-link" href="#" data-nav="/samples/grids/grid/editing-events"><span>Editing Events</span></a>
470472
<a class="nav-link" href="#" data-nav="/samples/grids/grid/editing-excel-style"><span>Editing Excel Style</span></a>
473+
<a class="nav-link" href="#" data-nav="/samples/grids/grid/editing-lifecycle"><span>Editing Lifecycle</span></a>
471474
<a class="nav-link" href="#" data-nav="/samples/grids/grid/excel-exporting"><span>Excel Exporting</span></a>
472475
<a class="nav-link" href="#" data-nav="/samples/grids/grid/excel-style-filtering-sample-1"><span>Excel Style Filtering Sample1</span></a>
473476
<a class="nav-link" href="#" data-nav="/samples/grids/grid/excel-style-filtering-sample-2"><span>Excel Style Filtering Sample2</span></a>
@@ -485,9 +488,13 @@
485488
<a class="nav-link" href="#" data-nav="/samples/grids/grid/groupby-summary-options"><span>Groupby Summary Options</span></a>
486489
<a class="nav-link" href="#" data-nav="/samples/grids/grid/groupby-summary-styling"><span>Groupby Summary Styling</span></a>
487490
<a class="nav-link" href="#" data-nav="/samples/grids/grid/infinite-scroll"><span>Infinite Scroll</span></a>
491+
<a class="nav-link" href="#" data-nav="/samples/grids/grid/keyboard-custom-navigation"><span>Keyboard Custom Navigation</span></a>
492+
<a class="nav-link" href="#" data-nav="/samples/grids/grid/keyboard-mrl-navigation"><span>Keyboard Mrl Navigation</span></a>
493+
<a class="nav-link" href="#" data-nav="/samples/grids/grid/keyboard-navigation-guide"><span>Keyboard Navigation Guide</span></a>
488494
<a class="nav-link" href="#" data-nav="/samples/grids/grid/layout-display-density"><span>Layout Display Density</span></a>
489495
<a class="nav-link" href="#" data-nav="/samples/grids/grid/master-detail"><span>Master Detail</span></a>
490496
<a class="nav-link" href="#" data-nav="/samples/grids/grid/multi-cell-selection-mode"><span>Multi Cell Selection Mode</span></a>
497+
<a class="nav-link" href="#" data-nav="/samples/grids/grid/multi-column-headers-export"><span>Multi Column Headers Export</span></a>
491498
<a class="nav-link" href="#" data-nav="/samples/grids/grid/multi-column-headers-overview"><span>Multi Column Headers Overview</span></a>
492499
<a class="nav-link" href="#" data-nav="/samples/grids/grid/multi-column-headers-styling"><span>Multi Column Headers Styling</span></a>
493500
<a class="nav-link" href="#" data-nav="/samples/grids/grid/multi-column-headers-template"><span>Multi Column Headers Template</span></a>
@@ -511,6 +518,8 @@
511518
<a class="nav-link" href="#" data-nav="/samples/grids/grid/row-selection-template-excel"><span>Row Selection Template Excel</span></a>
512519
<a class="nav-link" href="#" data-nav="/samples/grids/grid/row-selection-template-numbers"><span>Row Selection Template Numbers</span></a>
513520
<a class="nav-link" href="#" data-nav="/samples/grids/grid/row-styles"><span>Row Styles</span></a>
521+
<a class="nav-link" href="#" data-nav="/samples/grids/grid/state-persistence-about"><span>State Persistence About</span></a>
522+
<a class="nav-link" href="#" data-nav="/samples/grids/grid/state-persistence-main"><span>State Persistence Main</span></a>
514523
<a class="nav-link" href="#" data-nav="/samples/grids/grid/styling-custom-css"><span>Styling Custom Css</span></a>
515524
<a class="nav-link" href="#" data-nav="/samples/grids/grid/toolbar-sample-1"><span>Toolbar Sample1</span></a>
516525
<a class="nav-link" href="#" data-nav="/samples/grids/grid/toolbar-sample-2"><span>Toolbar Sample2</span></a>
@@ -562,15 +571,22 @@
562571
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/column-selection-group"><span>Column Selection Group</span></a>
563572
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/column-selection-mode"><span>Column Selection Mode</span></a>
564573
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/column-selection-style"><span>Column Selection Style</span></a>
574+
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/column-sorting-indicators"><span>Column Sorting Indicators</span></a>
575+
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/column-sorting-options"><span>Column Sorting Options</span></a>
576+
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/column-sorting-style"><span>Column Sorting Style</span></a>
565577
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/conditional-cell-style-1"><span>Conditional Cell Style1</span></a>
566578
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/editing-columns"><span>Editing Columns</span></a>
567579
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/editing-events"><span>Editing Events</span></a>
580+
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/editing-lifecycle"><span>Editing Lifecycle</span></a>
568581
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/excel-exporting"><span>Excel Exporting</span></a>
569582
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/excel-style-filtering-sample-1"><span>Excel Style Filtering Sample1</span></a>
570583
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/excel-style-filtering-sample-2"><span>Excel Style Filtering Sample2</span></a>
571584
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/excel-style-filtering-sample-3"><span>Excel Style Filtering Sample3</span></a>
572585
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/excel-style-filtering-style"><span>Excel Style Filtering Style</span></a>
573586
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/layout-display-density"><span>Layout Display Density</span></a>
587+
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/load-on-demand"><span>Load On Demand</span></a>
588+
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/multi-column-headers-export"><span>Multi Column Headers Export</span></a>
589+
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/multi-column-headers-overview"><span>Multi Column Headers Overview</span></a>
574590
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/multi-column-headers-styling"><span>Multi Column Headers Styling</span></a>
575591
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/multi-column-headers-template"><span>Multi Column Headers Template</span></a>
576592
<a class="nav-link" href="#" data-nav="/samples/grids/tree-grid/overview"><span>Overview</span></a>

browser/tasks/gulp-samples.js

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,19 @@ var sampleSources = [
7171
// '!' + igConfig.SamplesCopyPath + '/grids/tree-grid/**/package.json',
7272
'!' + igConfig.SamplesCopyPath + '/grids/tree-grid/row-styles/package.json', // BUG webTreeGridRowStylesHandler does not export
7373

74-
'!' + igConfig.SamplesCopyPath + '/grids/tree-grid/editing-lifecycle/package.json', // BUG TS2339: Property 'cancel' does not exist on type 'IgcGridEditEventArgs'.
75-
'!' + igConfig.SamplesCopyPath + '/grids/tree-grid/multi-column-headers-export/package.json', // BUG Module '"igniteui-webcomponents-grids/grids"' has no exported member 'IgcExporterEventEventArgs'.
76-
'!' + igConfig.SamplesCopyPath + '/grids/tree-grid/multi-column-headers-overview/package.json', // BUG Property 'treegrid' does not exist on type 'TreeGridMultiColumnHeadersOverview'. Did you mean 'treeGrid'?
77-
'!' + igConfig.SamplesCopyPath + '/grids/tree-grid/multi-column-headers-overview/package.json', // BUG Type 'IgcTreeGridComponent' is missing the following properties from type 'IgcGridComponent':
78-
'!' + igConfig.SamplesCopyPath + '/grids/tree-grid/multi-column-headers-overview/package.json', // BUG: Type 'IgcTreeGridComponent' is not assignable to type 'IgcGridComponent'.
79-
'!' + igConfig.SamplesCopyPath + '/grids/grid/keyboard-custom-navigation/package.json', // BUG export 'GridKeydownTargetType' (imported as 'GridKeydownTargetType') was not found in 'igniteui-webcomponents-grids/grids'
80-
'!' + igConfig.SamplesCopyPath + '/grids/grid/cascading-combo/package.json', // BUG Cannot find name 'CodeGenHelper'.
81-
'!' + igConfig.SamplesCopyPath + '/grids/grid/editing-events/package.json', // BUG Property 'cancel' does not exist on type 'IgcGridEditEventArgs'.
82-
'!' + igConfig.SamplesCopyPath + '/grids/grid/editing-lifecycle/package.json', // BUG Property 'cancel' does not exist on type 'IgcGridEditEventArgs'.
83-
'!' + igConfig.SamplesCopyPath + '/grids/grid/keyboard-custom-navigation/package.json', // BUG Property 'event' does not exist on type 'IgcGridKeydownEventArgs'.
84-
'!' + igConfig.SamplesCopyPath + '/grids/grid/keyboard-custom-navigation/package.json', // BUG 'GridKeydownTargetType' only refers to a type, but is being used as a value here.
85-
'!' + igConfig.SamplesCopyPath + '/grids/grid/keyboard-mrl-navigation/package.json', // BUG Property 'event' does not exist on type 'IgcGridKeydownEventArgs'.
86-
'!' + igConfig.SamplesCopyPath + '/grids/grid/multi-column-headers-export/package.json', // BUG Module '"igniteui-webcomponents-grids/grids"' has no exported member 'IgcExporterEventEventArgs'.
74+
// '!' + igConfig.SamplesCopyPath + '/grids/tree-grid/editing-lifecycle/package.json', // BUG TS2339: Property 'cancel' does not exist on type 'IgcGridEditEventArgs'.
75+
// '!' + igConfig.SamplesCopyPath + '/grids/tree-grid/multi-column-headers-export/package.json', // BUG Module '"igniteui-webcomponents-grids/grids"' has no exported member 'IgcExporterEventEventArgs'.
76+
// '!' + igConfig.SamplesCopyPath + '/grids/tree-grid/multi-column-headers-overview/package.json', // BUG Property 'treegrid' does not exist on type 'TreeGridMultiColumnHeadersOverview'. Did you mean 'treeGrid'?
77+
// '!' + igConfig.SamplesCopyPath + '/grids/tree-grid/multi-column-headers-overview/package.json', // BUG Type 'IgcTreeGridComponent' is missing the following properties from type 'IgcGridComponent':
78+
// '!' + igConfig.SamplesCopyPath + '/grids/tree-grid/multi-column-headers-overview/package.json', // BUG: Type 'IgcTreeGridComponent' is not assignable to type 'IgcGridComponent'.
79+
// '!' + igConfig.SamplesCopyPath + '/grids/grid/keyboard-custom-navigation/package.json', // BUG export 'GridKeydownTargetType' (imported as 'GridKeydownTargetType') was not found in 'igniteui-webcomponents-grids/grids'
80+
// '!' + igConfig.SamplesCopyPath + '/grids/grid/cascading-combo/package.json', // BUG Cannot find name 'CodeGenHelper'.
81+
// '!' + igConfig.SamplesCopyPath + '/grids/grid/editing-events/package.json', // BUG Property 'cancel' does not exist on type 'IgcGridEditEventArgs'.
82+
// '!' + igConfig.SamplesCopyPath + '/grids/grid/editing-lifecycle/package.json', // BUG Property 'cancel' does not exist on type 'IgcGridEditEventArgs'.
83+
// '!' + igConfig.SamplesCopyPath + '/grids/grid/keyboard-custom-navigation/package.json', // BUG Property 'event' does not exist on type 'IgcGridKeydownEventArgs'.
84+
// '!' + igConfig.SamplesCopyPath + '/grids/grid/keyboard-custom-navigation/package.json', // BUG 'GridKeydownTargetType' only refers to a type, but is being used as a value here.
85+
// '!' + igConfig.SamplesCopyPath + '/grids/grid/keyboard-mrl-navigation/package.json', // BUG Property 'event' does not exist on type 'IgcGridKeydownEventArgs'.
86+
// '!' + igConfig.SamplesCopyPath + '/grids/grid/multi-column-headers-export/package.json', // BUG Module '"igniteui-webcomponents-grids/grids"' has no exported member 'IgcExporterEventEventArgs'.
8787

8888
// '!' + igConfig.SamplesCopyPath + '/grids/grid/**/package.json',
8989
// '!' + igConfig.SamplesCopyPath + '/grids/pivot-grid/**/package.json',
@@ -975,19 +975,19 @@ function updateIG(cb) {
975975
// { name: "igniteui-webcomponents-core", version: "3.2.2" }, // PUBLIC NPM
976976
let packageUpgrades = [
977977
// these IG packages are often updated:
978-
{ name: "igniteui-webcomponents-core" , version: "4.3.2" },
979-
{ name: "igniteui-webcomponents-charts" , version: "4.3.2" },
980-
{ name: "igniteui-webcomponents-excel" , version: "4.3.2" },
981-
{ name: "igniteui-webcomponents-gauges" , version: "4.3.2" },
982-
{ name: "igniteui-webcomponents-grids" , version: "4.3.2" },
983-
{ name: "igniteui-webcomponents-inputs" , version: "4.3.2" },
984-
{ name: "igniteui-webcomponents-layouts" , version: "4.3.2" },
985-
{ name: "igniteui-webcomponents-maps" , version: "4.3.2" },
986-
{ name: "igniteui-webcomponents-spreadsheet-chart-adapter", version: "4.3.2" },
987-
{ name: "igniteui-webcomponents-spreadsheet" , version: "4.3.2" },
988-
{ name: "igniteui-webcomponents-datasources" , version: "4.3.2" },
978+
{ name: "igniteui-webcomponents-core" , version: "4.6.0" },
979+
{ name: "igniteui-webcomponents-charts" , version: "4.6.0" },
980+
{ name: "igniteui-webcomponents-excel" , version: "4.6.0" },
981+
{ name: "igniteui-webcomponents-gauges" , version: "4.6.0" },
982+
{ name: "igniteui-webcomponents-grids" , version: "4.6.0" },
983+
{ name: "igniteui-webcomponents-inputs" , version: "4.6.0" },
984+
{ name: "igniteui-webcomponents-layouts" , version: "4.6.0" },
985+
{ name: "igniteui-webcomponents-maps" , version: "4.6.0" },
986+
{ name: "igniteui-webcomponents-spreadsheet-chart-adapter", version: "4.6.0" },
987+
{ name: "igniteui-webcomponents-spreadsheet" , version: "4.6.0" },
988+
{ name: "igniteui-webcomponents-datasources" , version: "4.6.0" },
989989
// these IG packages are sometimes updated:
990-
{ name: "igniteui-webcomponents", version: "4.5.0" },
990+
{ name: "igniteui-webcomponents", version: "4.6.0" },
991991
{ name: "igniteui-dockmanager", version: "1.14.2" },
992992
// other packages:
993993
{ name: "webpack", version: "^5.74.0" },

0 commit comments

Comments
 (0)