Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default function App() {
moving={true}
cellMergeMode={cellMergeMode}
mergeStrategy={perCountryMergeStrategy}
height="740px"
height="400px"
width="100%"
allowFiltering={true}
>
Expand Down
2 changes: 1 addition & 1 deletion samples/grids/hierarchical-grid/cell-merge/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default function App() {
cellMergeMode={cellMergeMode}
allowFiltering={true}
width="100%"
height="740px"
height="450px"
>
<IgrGridToolbar>
<IgrSelect
Expand Down
10 changes: 2 additions & 8 deletions samples/grids/tree-grid/cell-merge-custom-sample/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
import React, { useEffect, useState } from "react";
import React, { useState } from "react";
import ReactDOM from "react-dom/client";
import "./index.css";

import { IgrSelect, IgrSelectItem } from "igniteui-react";
import {
GridCellMergeMode,
IgrGridToolbar,
SortingDirection,
IgrSortingExpression,
IgrTreeGrid,
IgrGridMergeStrategy,
IgrDefaultTreeGridMergeStrategy,
IgrByLevelTreeGridMergeStrategy,
IgrDefaultMergeStrategy,
} from "igniteui-react-grids";
import { IgrColumn } from "igniteui-react-grids";

Expand All @@ -38,16 +34,14 @@ export default function App() {
<IgrTreeGrid
data={data}
width="100%"
height="800px"
height="700px"
sortingExpressions={sortExpr}
autoGenerate={false}
primaryKey="ID"
foreignKey="ParentID"
cellMergeMode={cellMergeMode}
mergeStrategy={customMergeStrategy as IgrGridMergeStrategy}
>
<IgrGridToolbar />

<IgrColumn
field="Name"
dataType="string"
Expand Down
2 changes: 1 addition & 1 deletion samples/grids/tree-grid/cell-merge/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default function App() {
<IgrTreeGrid
data={data}
width="100%"
height="800px"
height="720px"
sortingExpressions={sortExpr}
autoGenerate={false}
primaryKey="ID"
Expand Down