Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merging vnext into master #661

Merged
merged 50 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
76a2bba
added grid and hgrid remote paging samples
tishko0 May 21, 2024
75800be
Merge branch 'vnext' of https://github.com/IgniteUI/igniteui-react-ex…
tishko0 May 30, 2024
b5f7c7d
docs(grid): initial implementation excel style editing
tishko0 Jul 21, 2024
8d7dca9
docs(grid): initial excel style editing sample
tishko0 Jul 23, 2024
3618842
docs(grid): updated sample
tishko0 Jul 23, 2024
c58c6e9
Merge branch 'vnext' into ttonev/excel-style-editing
tishko0 Jul 23, 2024
5f1fa42
docs(grid): added numpads to case
tishko0 Aug 20, 2024
28ee41e
Merge branch 'ttonev/excel-style-editing' of https://github.com/Ignit…
tishko0 Aug 20, 2024
fee8043
Merge branch 'vnext' into ttonev/excel-style-editing
tishko0 Aug 20, 2024
5bfecd6
docs(grid): fixed column targeting on enter nav
tishko0 Aug 20, 2024
be9d0c3
Merge branch 'ttonev/excel-style-editing' of https://github.com/Ignit…
tishko0 Aug 20, 2024
dfc9f9a
Merge branch 'vnext' into ttonev/remote-paging-samples
tishko0 Aug 22, 2024
8bb9c36
Merge branch 'ttonev/remote-paging-samples' of https://github.com/Ign…
tishko0 Aug 22, 2024
81c8377
chore(grid): fixed type missed warning
tishko0 Sep 4, 2024
33f6efd
Merge branch 'vnext' into ttonev/excel-style-editing
dkamburov Sep 4, 2024
a833031
Merge branch 'vnext' into ttonev/remote-paging-samples
MarielaTihova Sep 9, 2024
b3cb40d
Add default separator the clipboard operations samples.
skrustev Sep 10, 2024
ba2120c
Reorder avatar size sample to match the wc one.
skrustev Sep 10, 2024
a2e3f4c
Fixed console errors for Hgrid remote paging
MarielaTihova Sep 10, 2024
85de108
Adding Divider Samples
Sep 11, 2024
06ebce2
Resolving key errors in browser console
Sep 12, 2024
4491c7c
Correcting the duplicate key
Sep 12, 2024
a5033af
chore(divider-samples): format tsx files
ddaribo Sep 13, 2024
104dc6d
Adding changes from build igniteui-xplat-examples-output+PRs_2024.9.13.1
Sep 13, 2024
7133249
Merge pull request #650 from IgniteUI/ikitanov/divider-samples-#1369
kacheshmarova Sep 16, 2024
6f469dd
Merge branch 'vnext' into ttonev/excel-style-editing
dkamburov Sep 16, 2024
b1641aa
Fix missing gridRef current argument use.
skrustev Sep 16, 2024
4b64f90
Merge pull request #651 from IgniteUI/ESShared/XPlaform_examples_igni…
dkamburov Sep 17, 2024
39cdf45
Merge pull request #649 from IgniteUI/skrastev/clipboard-fix
dkamburov Sep 17, 2024
43e3304
docs(grid): removed old sample
tishko0 Sep 20, 2024
584eb73
docs(grid): removed perPage from constructor
tishko0 Sep 24, 2024
b218462
Merge remote-tracking branch 'origin' into ttonev/remote-paging-samples
tishko0 Sep 26, 2024
a64908f
Renaming the sample so it doesn't cause build error (#652)
IvanKitanov17 Sep 26, 2024
e10e628
Merge remote-tracking branch 'origin' into ttonev/excel-style-editing
tishko0 Oct 3, 2024
4528ce6
fix(grid): updated excel style to navigate on single enter click if i…
tishko0 Oct 4, 2024
226d33d
Merge branch 'ttonev/excel-style-editing' of https://github.com/Ignit…
tishko0 Oct 4, 2024
04a2f3c
fix(grid): removed extra sample to avoid confusion
tishko0 Oct 4, 2024
2f38a58
Merge pull request #605 from IgniteUI/ttonev/excel-style-editing
dkamburov Oct 7, 2024
aea9a66
chore(*): update ig to 18.7.2-beta.0
dkamburov Oct 10, 2024
07ea538
Merge pull request #653 from IgniteUI/dkamburov/update-18.7.2-beta.0
dkamburov Oct 10, 2024
79bdf27
Merge branch 'vnext' into ttonev/remote-paging-samples
IMinchev64 Oct 11, 2024
0d59b07
chore(*): update ig to 18.7.3
dkamburov Oct 11, 2024
1112739
Merge pull request #557 from IgniteUI/ttonev/remote-paging-samples
dkamburov Oct 11, 2024
986fd06
Merge remote-tracking branch 'origin' into dkamburov/update-18.7.3
dkamburov Oct 11, 2024
cef6e52
Merge pull request #654 from IgniteUI/dkamburov/update-18.7.3
dkamburov Oct 11, 2024
e54cd4c
Adding changes from build igniteui-xplat-examples-output+PRs_2024.10.…
azure-pipelines[bot] Oct 28, 2024
ae6023b
add map selection (#660)
HUSSAR-mtrela Nov 4, 2024
2b13c30
add "react-icons
HUSSAR-mtrela Nov 4, 2024
ac9acc5
Merge branch 'master' of https://github.com/IgniteUI/igniteui-react-e…
HUSSAR-mtrela Nov 4, 2024
fe001d9
fix styling in Map Selection
HUSSAR-mtrela Nov 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions browser/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-loadable": "5.5.0",
"react-icons": "^5.3.0",
"react-router": "4.3.1",
"react-router-dom": "^5.2.0",
"react-transition-group": "4.4.2",
Expand Down
22 changes: 12 additions & 10 deletions samples/charts/data-chart/data-legend/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ReactDOM from 'react-dom/client';
import './index.css';

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

Expand All @@ -30,8 +30,8 @@ export default class Sample extends React.Component<any, any> {
this.chart = r;
this.setState({});
}
private xAxis: IgrNumericXAxis
private yAxis: IgrNumericYAxis
private xAxis: IgrNumericXAxis
private bubbleSeries1: IgrBubbleSeries
private _sizeScale1: IgrSizeScale | null = null;
public get sizeScale1(): IgrSizeScale {
Expand Down Expand Up @@ -80,27 +80,29 @@ export default class Sample extends React.Component<any, any> {
<div className="legend">
<IgrDataLegend
ref={this.legendRef}
target={this.chart}>
target={this.chart}
unitsText="%"
includedColumns={["BirthRate", "DeathRate"]}>
</IgrDataLegend>
</div>

<div className="container fill">
<IgrDataChart
ref={this.chartRef}>
<IgrNumericXAxis
name="xAxis"
title="Death Rate"
interval="1"
minimumValue="4"
maximumValue="16">
</IgrNumericXAxis>
<IgrNumericYAxis
name="yAxis"
title="Birth Rate"
interval="10"
minimumValue="0"
maximumValue="60">
</IgrNumericYAxis>
<IgrNumericXAxis
name="xAxis"
title="Death Rate"
interval="1"
minimumValue="4"
maximumValue="16">
</IgrNumericXAxis>
<IgrBubbleSeries
name="bubbleSeries1"
xAxisName="xAxis"
Expand Down
Loading