Skip to content

Commit 15867b0

Browse files
HUSSAR-mtrelatishko0dkamburovMarielaTihovaskrustev
authored
merging vnext into master (#661)
* added grid and hgrid remote paging samples * docs(grid): initial implementation excel style editing * docs(grid): initial excel style editing sample * docs(grid): updated sample * docs(grid): added numpads to case * docs(grid): fixed column targeting on enter nav * chore(grid): fixed type missed warning * Add default separator the clipboard operations samples. * Reorder avatar size sample to match the wc one. * Fixed console errors for Hgrid remote paging * Adding Divider Samples * Resolving key errors in browser console * Correcting the duplicate key * chore(divider-samples): format tsx files * Adding changes from build igniteui-xplat-examples-output+PRs_2024.9.13.1 * Fix missing gridRef current argument use. * docs(grid): removed old sample * docs(grid): removed perPage from constructor * Renaming the sample so it doesn't cause build error (#652) Co-authored-by: Ivan Kitanov <[email protected]> * fix(grid): updated excel style to navigate on single enter click if in edit mode * fix(grid): removed extra sample to avoid confusion * chore(*): update ig to 18.7.2-beta.0 * chore(*): update ig to 18.7.3 * Adding changes from build igniteui-xplat-examples-output+PRs_2024.10.21.1 (#656) Co-authored-by: tfsbuild <[email protected]> * add map selection (#660) * add "react-icons * fix styling in Map Selection --------- Co-authored-by: ttonev <[email protected]> Co-authored-by: Deyan Kamburov <[email protected]> Co-authored-by: Mariela Tihova <[email protected]> Co-authored-by: skrustev <[email protected]> Co-authored-by: Ivan Kitanov <[email protected]> Co-authored-by: ddaribo <[email protected]> Co-authored-by: tfsbuild <[email protected]> Co-authored-by: Vasya Kacheshmarova <[email protected]> Co-authored-by: Ivan Kitanov <[email protected]> Co-authored-by: Deyan Kamburov <[email protected]> Co-authored-by: IMinchev64 <[email protected]> Co-authored-by: azure-pipelines[bot] <36771401+azure-pipelines[bot]@users.noreply.github.com>
1 parent 57f13c9 commit 15867b0

File tree

84 files changed

+17938
-248
lines changed

Some content is hidden

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

84 files changed

+17938
-248
lines changed

browser/package-lock.json

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

browser/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"react": "^18.2.0",
4343
"react-dom": "^18.2.0",
4444
"react-loadable": "5.5.0",
45+
"react-icons": "^5.3.0",
4546
"react-router": "4.3.1",
4647
"react-router-dom": "^5.2.0",
4748
"react-transition-group": "4.4.2",

samples/charts/data-chart/data-legend/src/index.tsx

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom/client';
33
import './index.css';
44

55
import { IgrLegendModule, IgrNumberAbbreviatorModule, IgrDataChartCoreModule, IgrDataChartScatterModule, IgrDataChartScatterCoreModule, IgrDataChartInteractivityModule, IgrDataLegendModule, IgrDataChartAnnotationModule } from 'igniteui-react-charts';
6-
import { IgrDataLegend, IgrDataChart, IgrNumericXAxis, IgrNumericYAxis, IgrBubbleSeries, IgrSizeScale, IgrCrosshairLayer } from 'igniteui-react-charts';
6+
import { IgrDataLegend, IgrDataChart, IgrNumericYAxis, IgrNumericXAxis, IgrBubbleSeries, IgrSizeScale, IgrCrosshairLayer } from 'igniteui-react-charts';
77
import { CountryDemographicAfricanItem, CountryDemographicAfrican } from './CountryDemographicAfrican';
88
import { CountryDemographicEuropeItem, CountryDemographicEurope } from './CountryDemographicEurope';
99

@@ -30,8 +30,8 @@ export default class Sample extends React.Component<any, any> {
3030
this.chart = r;
3131
this.setState({});
3232
}
33-
private xAxis: IgrNumericXAxis
3433
private yAxis: IgrNumericYAxis
34+
private xAxis: IgrNumericXAxis
3535
private bubbleSeries1: IgrBubbleSeries
3636
private _sizeScale1: IgrSizeScale | null = null;
3737
public get sizeScale1(): IgrSizeScale {
@@ -80,27 +80,29 @@ export default class Sample extends React.Component<any, any> {
8080
<div className="legend">
8181
<IgrDataLegend
8282
ref={this.legendRef}
83-
target={this.chart}>
83+
target={this.chart}
84+
unitsText="%"
85+
includedColumns={["BirthRate", "DeathRate"]}>
8486
</IgrDataLegend>
8587
</div>
8688

8789
<div className="container fill">
8890
<IgrDataChart
8991
ref={this.chartRef}>
90-
<IgrNumericXAxis
91-
name="xAxis"
92-
title="Death Rate"
93-
interval="1"
94-
minimumValue="4"
95-
maximumValue="16">
96-
</IgrNumericXAxis>
9792
<IgrNumericYAxis
9893
name="yAxis"
9994
title="Birth Rate"
10095
interval="10"
10196
minimumValue="0"
10297
maximumValue="60">
10398
</IgrNumericYAxis>
99+
<IgrNumericXAxis
100+
name="xAxis"
101+
title="Death Rate"
102+
interval="1"
103+
minimumValue="4"
104+
maximumValue="16">
105+
</IgrNumericXAxis>
104106
<IgrBubbleSeries
105107
name="bubbleSeries1"
106108
xAxisName="xAxis"

0 commit comments

Comments
 (0)