Skip to content

Commit e129b64

Browse files
ChronosSFChronosSF
committed
Merge remote-tracking branch 'origin/vnext' into copilot/transfer-grid-lite-samples
2 parents c95358f + 381619c commit e129b64

File tree

18 files changed

+201
-279
lines changed

18 files changed

+201
-279
lines changed

‎browser/config-overrides.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ module.exports = function override(config, env) {
180180
chunks: 'all',
181181
},
182182
igniteuiDockmanager: {
183-
test: /[\\/]node_modules[\\/](igniteui-dockmanager)[\\/]/,
184-
name: 'igniteui-dockmanager',
183+
test: /[\\/]node_modules[\\/](igniteui-react-dockmanager)[\\/]/,
184+
name: 'igniteui-react-dockmanager',
185185
chunks: 'all',
186186
}
187187
};

‎browser/package-lock.json‎

Lines changed: 22 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎browser/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@
2525
"file-saver": "1.3.8",
2626
"igniteui-dockmanager": "^1.17.0",
2727
"igniteui-grid-lite": "^1.0.0-alpha.9",
28-
"igniteui-react": "^19.3.0",
28+
"igniteui-react": "^19.4.0-rc.0",
2929
"igniteui-react-charts": "19.3.0-beta.0",
3030
"igniteui-react-core": "19.3.0-beta.0",
3131
"igniteui-react-dashboards": "19.3.0-beta.0",
3232
"igniteui-react-data-grids": "19.3.0-beta.0",
3333
"igniteui-react-datasources": "19.3.0-beta.0",
34+
"igniteui-react-dockmanager": "^19.4.0-rc.0",
3435
"igniteui-react-excel": "19.3.0-beta.0",
3536
"igniteui-react-gauges": "19.3.0-beta.0",
36-
"igniteui-react-grids": "^19.3.0",
37+
"igniteui-react-grids": "^19.4.0-rc.0",
3738
"igniteui-react-inputs": "19.3.0-beta.0",
3839
"igniteui-react-layouts": "19.3.0-beta.0",
3940
"igniteui-react-maps": "19.3.0-beta.0",

‎browser/src/index.tsx‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,3 @@ root.render(
3434
// Learn more about service workers: https://bit.ly/CRA-PWA
3535
RegisterServiceWorker();
3636
// serviceWorker.unregister();
37-
38-
// // copied from https://stenciljs.com/docs/react
39-
// import { applyPolyfills, defineCustomElements } from 'igniteui-dockmanager/loader';
40-
41-
// applyPolyfills().then(() => {
42-
// defineCustomElements();
43-
// });

‎browser/src/typedecls.d.ts‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎browser/tasks/gulp-samples.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ function updateIG(cb) {
860860
{ version: "^19.3.0", name: "igniteui-react" },
861861
// these IG packages are sometimes updated:
862862
{ version: "^6.3.0", name: "igniteui-webcomponents" },
863-
{ version: "^1.17.0", name: "igniteui-dockmanager" },
863+
{ version: "^19.4.0-rc.0", name: "igniteui-react-dockmanager" },
864864
// main react packages
865865
{ version: "^19.2.0", name: "react" },
866866
{ version: "^19.2.0", name: "react-dom" },

‎browser/templates/sample/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@material-ui/icons": { "version": "^4.5.1", "usage": "detect", "keywords": ["@material-ui/core"] },
2323
"@types/file-saver": { "version": "^2.0.0", "usage": "detect", "keywords": ["ExcelUtility"] },
2424
"file-saver": { "version": "^1.3.8", "usage": "detect", "keywords": ["ExcelUtility"] },
25-
"igniteui-dockmanager": { "version": "1.0.0", "usage": "detect", "note": "will detect if needs to inject it by checking import statements in source of a sample" },
25+
"igniteui-react-dockmanager": { "version": "1.0.0", "usage": "detect", "note": "will detect if needs to inject it by checking import statements in source of a sample" },
2626
"igniteui-react-core": { "version": "19.0.0-alpha.0", "usage": "always", "note": "will always force injecting it to a package.json "},
2727
"igniteui-react-maps": { "version": "19.0.0-alpha.0", "usage": "detect" },
2828
"igniteui-react-charts": { "version": "19.0.0-alpha.0", "usage": "detect", "keywords": ["igniteui-react-maps", "igniteui-react-spreadsheet-chart-adapter"] },

‎browser/tsconfig.paths.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"paths": {
55
"igniteui-react-core": [ "node_modules/igniteui-react-core", "node_modules/@infragistics/igniteui-react-core" ],
66
"igniteui-react-charts": [ "node_modules/igniteui-react-charts", "node_modules/@infragistics/igniteui-react-charts" ],
7+
"igniteui-react-dockmanager": [ "node_modules/igniteui-react-dockmanager", "node_modules/@infragistics/igniteui-react-dockmanager" ],
78
"igniteui-react-grids": [ "node_modules/igniteui-react-grids", "node_modules/@infragistics/igniteui-react-grids" ],
89
"igniteui-react-grids/grids": [ "node_modules/igniteui-react-grids/grids", "node_modules/@infragistics/igniteui-react-grids/grids" ],
910
"igniteui-react-data-grids": [ "node_modules/igniteui-react-data-grids", "node_modules/@infragistics/igniteui-react-data-grids" ],
@@ -17,9 +18,7 @@
1718
"igniteui-react-dashboards": [ "node_modules/igniteui-react-dashboards", "node_modules/@infragistics/igniteui-react-dashboards" ],
1819
"igniteui-react-spreadsheet": [ "node_modules/igniteui-react-spreadsheet", "node_modules/@infragistics/igniteui-react-spreadsheet" ],
1920
"igniteui-react-spreadsheet-chart-adapter": [ "node_modules/igniteui-react-spreadsheet-chart-adapter", "node_modules/@infragistics/igniteui-react-spreadsheet-chart-adapter" ],
20-
"igniteui-webcomponents": [ "node_modules/igniteui-webcomponents", "node_modules/@infragistics/igniteui-webcomponents" ],
21-
"igniteui-dockmanager": [ "node_modules/igniteui-dockmanager", "node_modules/@infragistics/igniteui-dockmanager" ],
22-
"igniteui-dockmanager/loader": [ "node_modules/igniteui-dockmanager/loader", "node_modules/@infragistics/igniteui-dockmanager/loader" ]
21+
"igniteui-webcomponents": [ "node_modules/igniteui-webcomponents", "node_modules/@infragistics/igniteui-webcomponents" ]
2322
}
2423
}
2524
}

‎samples/layouts/dock-manager/customize-buttons/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
"test": "vitest"
1313
},
1414
"dependencies": {
15-
"igniteui-dockmanager": "^1.17.0",
1615
"igniteui-react-core": "19.3.0-beta.0",
17-
"igniteui-webcomponents": "^6.3.0",
16+
"igniteui-react-dockmanager": "^19.4.0-rc.0",
1817
"react": "^19.2.0",
1918
"react-dom": "^19.2.0",
2019
"tslib": "^2.4.0"

‎samples/layouts/dock-manager/customize-buttons/src/index.tsx‎

Lines changed: 22 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,16 @@ import React from 'react';
22
import ReactDOM from 'react-dom/client';
33
import './index.css';
44
import './DockManagerStyles.css';
5-
import { IgcDockManagerComponent, IgcContentPane } from "igniteui-dockmanager";
6-
import { IgcDockManagerPaneType, IgcSplitPaneOrientation } from "igniteui-dockmanager";
7-
import { defineCustomElements } from "igniteui-dockmanager/loader";
8-
9-
/* eslint-disable */
10-
declare global {
11-
namespace JSX {
12-
// tslint:disable-next-line:interface-name
13-
interface IntrinsicElements {
14-
"igc-dockmanager": any;
15-
}
16-
}
17-
}
18-
/* eslint-enable */
19-
20-
defineCustomElements();
5+
import { IgrDockManager, IgrDockManagerPaneType, IgrSplitPaneOrientation } from 'igniteui-react-dockmanager';
216

227
export default class DockManagerOverview extends React.Component {
238

24-
public dockManager: IgcDockManagerComponent;
9+
public dockManager: IgrDockManager;
2510

2611
public render(): JSX.Element {
2712
return (
2813
<div className="container sample">
29-
<igc-dockmanager id="dockManager">
14+
<IgrDockManager id="dockManager">
3015
<div slot="content1" className="dockManagerContent">Content 1</div>
3116
<div slot="content2" className="dockManagerContent">Content 2</div>
3217
<div slot="content3" className="dockManagerContent">Content 3</div>
@@ -36,7 +21,7 @@ export default class DockManagerOverview extends React.Component {
3621
<div slot="content7" className="dockManagerContent">Content 7</div>
3722
<div slot="content8" className="dockManagerContent">Content 8</div>
3823
<div slot="content9" className="dockManagerContent">Content 9</div>
39-
</igc-dockmanager>
24+
</IgrDockManager>
4025
</div>
4126
);
4227
}
@@ -45,32 +30,32 @@ export default class DockManagerOverview extends React.Component {
4530
const pane = {
4631
// size: 150,
4732
header: paneHeader,
48-
type: IgcDockManagerPaneType.contentPane,
33+
type: IgrDockManagerPaneType.contentPane,
4934
contentId: contentID
5035
};
5136
return pane;
5237
}
5338

54-
public createSplitPane(orientation: IgcSplitPaneOrientation, contentPanes: any[], size?: number): any {
39+
public createSplitPane(orientation: IgrSplitPaneOrientation, contentPanes: any[], size?: number): any {
5540
const pane = {
56-
type: IgcDockManagerPaneType.splitPane,
41+
type: IgrDockManagerPaneType.splitPane,
5742
orientation: orientation,
5843
panes: contentPanes,
5944
size: size
6045
};
6146
return pane;
6247
}
6348

64-
public createTabPane(orientation: IgcSplitPaneOrientation, contentPanes: any[], size?: number): any {
49+
public createTabPane(orientation: IgrSplitPaneOrientation, contentPanes: any[], size?: number): any {
6550
const pane = {
66-
type: IgcDockManagerPaneType.documentHost,
51+
type: IgrDockManagerPaneType.documentHost,
6752
size: size,
6853
rootPane: {
69-
type: IgcDockManagerPaneType.splitPane,
54+
type: IgrDockManagerPaneType.splitPane,
7055
orientation: orientation,
7156
panes: [
7257
{
73-
type: IgcDockManagerPaneType.tabGroupPane,
58+
type: IgrDockManagerPaneType.tabGroupPane,
7459
panes: contentPanes
7560
}
7661
]
@@ -96,16 +81,16 @@ export default class DockManagerOverview extends React.Component {
9681
const pane8 = this.createContentPane('content8', 'Content Pane 2');
9782
const pane9 = this.createContentPane('content9', 'Floating Pane');
9883

99-
const tabPane1 = this.createTabPane(IgcSplitPaneOrientation.horizontal, [ pane3, pane4 ], 200);
84+
const tabPane1 = this.createTabPane(IgrSplitPaneOrientation.horizontal, [ pane3, pane4 ], 200);
10085

101-
const splitPane1 = this.createSplitPane(IgcSplitPaneOrientation.vertical, [ pane1, pane2 ]);
102-
const splitPane2 = this.createSplitPane(IgcSplitPaneOrientation.vertical, [ tabPane1, contentPane5 ], 200);
86+
const splitPane1 = this.createSplitPane(IgrSplitPaneOrientation.vertical, [ pane1, pane2 ]);
87+
const splitPane2 = this.createSplitPane(IgrSplitPaneOrientation.vertical, [ tabPane1, contentPane5 ], 200);
10388

104-
this.dockManager = document.getElementById("dockManager") as IgcDockManagerComponent;
89+
this.dockManager = document.getElementById("dockManager") as IgrDockManager;
10590
this.dockManager.layout = {
10691
rootPane: {
107-
type: IgcDockManagerPaneType.splitPane,
108-
orientation: IgcSplitPaneOrientation.horizontal,
92+
type: IgrDockManagerPaneType.splitPane,
93+
orientation: IgrSplitPaneOrientation.horizontal,
10994
panes: [
11095
splitPane1, // or:
11196
// {
@@ -124,11 +109,11 @@ export default class DockManagerOverview extends React.Component {
124109
// ]
125110
// },
126111
{
127-
type: IgcDockManagerPaneType.splitPane,
128-
orientation: IgcSplitPaneOrientation.vertical,
112+
type: IgrDockManagerPaneType.splitPane,
113+
orientation: IgrSplitPaneOrientation.vertical,
129114
panes: [
130115
{
131-
type: IgcDockManagerPaneType.tabGroupPane,
116+
type: IgrDockManagerPaneType.tabGroupPane,
132117
size: 200,
133118
panes: [ pane6, pane7 ]
134119
},
@@ -139,8 +124,8 @@ export default class DockManagerOverview extends React.Component {
139124
},
140125
floatingPanes: [
141126
{
142-
type: IgcDockManagerPaneType.splitPane,
143-
orientation: IgcSplitPaneOrientation.horizontal,
127+
type: IgrDockManagerPaneType.splitPane,
128+
orientation: IgrSplitPaneOrientation.horizontal,
144129
floatingHeight: 150,
145130
floatingWidth: 250,
146131
floatingLocation: { x: 300, y: 200 },

0 commit comments

Comments
 (0)