Skip to content

Commit 8a333b3

Browse files
authored
Merge pull request #1604 from IgniteUI/dpetev/react-charts-leftovers
2 parents adf3ed8 + b145245 commit 8a333b3

5 files changed

Lines changed: 16 additions & 34 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ A comprehensive modernization of all Angular templates to align with Angular v21
4747
### React & Web Components Template Updates
4848

4949
* **React (`igr-ts`):** added 30 missing component templates (accordion, avatar, badge, banner, button, button-group, calendar, card, checkbox, chip, circular-progress, date-picker, divider, dropdown, expansion-panel, form, icon, icon-button, input, linear-progress, list, navbar, radio-group, rating, ripple, slider, switch, tabs, text-area, tree) to match Web Components template coverage ([#1576](https://github.com/IgniteUI/igniteui-cli/pull/1576))
50+
* **React (`igr-ts`):** updated project template to latest with vite@8 ([#1598](https://github.com/IgniteUI/igniteui-cli/pull/1598))
5051
* **React packages update:** updated `igniteui-react-core/charts/gauges` to ~19.5.2 and `igniteui-react[-grids]` to ~19.6.0 ([#1567](https://github.com/IgniteUI/igniteui-cli/pull/1567))
5152
* **Web Components packages update:** updated igniteui-webcomponents packages to latest ([#1566](https://github.com/IgniteUI/igniteui-cli/pull/1566))
5253
* **Web Components grid fixes:** corrected component usage and dependencies in grid templates ([#1562](https://github.com/IgniteUI/igniteui-cli/pull/1562))

packages/cli/templates/react/igr-ts/category-chart/default/files/src/app/__path__/__filePrefix__.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useEffect, useState } from 'react';
1+
import { useState } from 'react';
22
import { IgrCategoryChartModule } from 'igniteui-react-charts';
33
import { IgrCategoryChart } from 'igniteui-react-charts';
44
import style from './style.module.css';
@@ -15,11 +15,7 @@ const data: any = [
1515

1616
export default function $(ClassName)() {
1717
const title = 'Category Chart';
18-
const [chartData, setChartData] = useState([]);
19-
20-
useEffect(() => {
21-
setChartData(data);
22-
}, []);
18+
const [chartData] = useState(data);
2319

2420
return (
2521
<div>

packages/cli/templates/react/igr-ts/doughnut-chart/default/files/src/app/__path__/__filePrefix__.tsx

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useEffect, useRef, useState } from 'react';
1+
import { useState } from 'react';
22
import { IgrDoughnutChartModule } from 'igniteui-react-charts';
33
import { IgrDoughnutChart } from 'igniteui-react-charts';
44
import { IgrRingSeriesModule } from 'igniteui-react-charts';
@@ -23,13 +23,8 @@ const data: any = [
2323

2424
export default function $(ClassName)() {
2525
const title = 'Doughnut Chart';
26-
const [chartData, setChartData] = useState([]);
27-
const legendRef: any = useRef(null);
28-
const chartRef: any = useRef(null);
29-
30-
useEffect(() => {
31-
setChartData(data);
32-
}, []);
26+
const [chartData] = useState(data);
27+
const [legend, setLegend] = useState<IgrItemLegend | null>(null);
3328

3429
return (
3530
<div>
@@ -42,18 +37,18 @@ export default function $(ClassName)() {
4237
</div>
4338
<div className={style.container}>
4439
<div className={style.legend}>
45-
<IgrItemLegend ref={legendRef} />
40+
<IgrItemLegend ref={setLegend} />
4641
</div>
4742
<div className={style.chart}>
48-
<IgrDoughnutChart ref={chartRef}
43+
<IgrDoughnutChart
4944
width="300px"
5045
height="300px">
5146
<IgrRingSeries
5247
name="ring1"
5348
dataSource={chartData}
5449
labelMemberPath="Company"
5550
valueMemberPath="MarketShare"
56-
legend={legendRef.current}
51+
legend={legend}
5752
/>
5853
</IgrDoughnutChart>
5954
</div>

packages/cli/templates/react/igr-ts/financial-chart/default/files/src/app/__path__/__filePrefix__.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useEffect, useState } from 'react'
1+
import { useState } from 'react';
22
import { IgrFinancialChartModule } from 'igniteui-react-charts';
33
import { IgrFinancialChart } from 'igniteui-react-charts';
44
import style from './style.module.css';
@@ -22,11 +22,7 @@ const data: any = [
2222

2323
export default function $(ClassName)() {
2424
const title = 'Financial Chart';
25-
const [chartData, setChartData] = useState([]);
26-
27-
useEffect(() => {
28-
setChartData(data);
29-
}, []);
25+
const [chartData] = useState(data);
3026

3127
return (
3228
<div>

packages/cli/templates/react/igr-ts/pie-chart/default/files/src/app/__path__/__filePrefix__.tsx

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useEffect, useRef, useState } from 'react';
1+
import { useState } from 'react';
22
import { IgrPieChartModule } from 'igniteui-react-charts';
33
import { IgrPieChart } from 'igniteui-react-charts';
44
import { IgrItemLegend } from 'igniteui-react-charts';
@@ -18,13 +18,8 @@ const data: any = [
1818

1919
export default function $(ClassName)() {
2020
const title = 'Pie Chart';
21-
const [chartData, setChartData] = useState([]);
22-
const legendRef: any = useRef(null);
23-
const chartRef: any = useRef(null);
24-
25-
useEffect(() => {
26-
setChartData(data);
27-
}, []);
21+
const [chartData] = useState(data);
22+
const [legend, setLegend] = useState<IgrItemLegend | null>(null);
2823

2924
return (
3025
<div>
@@ -37,17 +32,16 @@ export default function $(ClassName)() {
3732
</div>
3833
<div className={style.container}>
3934
<div className={style.legend}>
40-
<IgrItemLegend ref={legendRef} />
35+
<IgrItemLegend ref={setLegend} />
4136
</div>
4237
<div className={style.chart}>
4338
<IgrPieChart dataSource={chartData}
4439
labelMemberPath="Company"
4540
valueMemberPath="MarketShare"
4641
width="500px"
4742
height="500px"
48-
ref={chartRef}
4943
legendLabelMemberPath="Label"
50-
legend={legendRef.current}
44+
legend={legend}
5145
/>
5246
</div>
5347
</div>

0 commit comments

Comments
 (0)