Skip to content

Commit ec3b3a2

Browse files
azure-pipelines[bot]tfsbuild
andauthored
Adding changes from build igniteui-xplat-examples-output+PRs_2024.12.18.1 (#708)
Co-authored-by: tfsbuild <[email protected]>
1 parent 035e4c8 commit ec3b3a2

File tree

5 files changed

+58
-27
lines changed
  • samples
    • charts/data-chart
      • scatter-bubble-chart-fill-scale/src
      • scatter-bubble-chart-multiple-sources/src
      • scatter-bubble-chart-single-source/src
      • scatter-bubble-chart-styling/src
    • grids/pivot-grid/features/src

5 files changed

+58
-27
lines changed

samples/charts/data-chart/scatter-bubble-chart-fill-scale/src/index.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ export default class Sample extends React.Component<any, any> {
4646
var valueBrushScale1 = new IgrValueBrushScale({});
4747
valueBrushScale1.isLogarithmic = false;
4848
valueBrushScale1.minimumValue = 0;
49-
valueBrushScale1.maximumValue = 100000;
50-
valueBrushScale1.brushes = ["rgba(26, 161, 226, 1)", "rgba(24, 154, 217, 1)", "rgba(22, 146, 206, 1)", "rgba(19, 133, 188, 1)", "rgba(15, 121, 171, 1)", "rgba(12, 107, 153, 1)", "rgba(9, 94, 136, 1)", "rgba(5, 82, 119, 1)", "rgba(2, 70, 105, 1)", "rgba(0, 63, 94, 1)"];
49+
valueBrushScale1.maximumValue = 260000;
50+
valueBrushScale1.brushes = ["rgba(137, 181, 250, 1)", "rgba(20, 108, 247, 1)", "rgba(82, 144, 242, 1)"];
5151

5252
this._valueBrushScale1 = valueBrushScale1;
5353
}
@@ -81,9 +81,10 @@ export default class Sample extends React.Component<any, any> {
8181
</IgrNumericXAxis>
8282
<IgrNumericYAxis
8383
name="yAxis"
84-
isLogarithmic="true"
85-
logarithmBase="10"
86-
title="Public Debt per GDP">
84+
title="Public Debt per GDP (%)"
85+
titleLeftMargin="5"
86+
isLogarithmic="false"
87+
maximumValue="120">
8788
</IgrNumericYAxis>
8889
<IgrBubbleSeries
8990
name="bubbleSeries1"

samples/charts/data-chart/scatter-bubble-chart-multiple-sources/src/index.tsx

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,22 @@ export default class Sample extends React.Component<any, any> {
9393
</IgrNumericXAxis>
9494
<IgrNumericYAxis
9595
name="yAxis"
96-
title="GDP per Capita"
97-
isLogarithmic="true"
98-
abbreviateLargeNumbers="true">
96+
title="Public Debt per GDP (%)"
97+
titleLeftMargin="5"
98+
isLogarithmic="false"
99+
maximumValue="120">
99100
</IgrNumericYAxis>
100101
<IgrBubbleSeries
101102
name="bubbleSeries1"
102103
title="African Countries"
103104
xAxisName="xAxis"
104105
yAxisName="yAxis"
105106
xMemberPath="population"
106-
yMemberPath="gDP"
107-
radiusMemberPath="population"
107+
yMemberPath="publicDebt"
108+
radiusMemberPath="gdpPerPerson"
109+
xMemberAsLegendLabel="Population"
110+
yMemberAsLegendLabel="Debt"
111+
radiusMemberAsLegendLabel="GDP"
108112
dataSource={this.countryStatsAfrica}
109113
markerType="Circle"
110114
showDefaultTooltip="true"
@@ -116,8 +120,11 @@ export default class Sample extends React.Component<any, any> {
116120
xAxisName="xAxis"
117121
yAxisName="yAxis"
118122
xMemberPath="population"
119-
yMemberPath="gDP"
120-
radiusMemberPath="population"
123+
yMemberPath="publicDebt"
124+
radiusMemberPath="gdpPerPerson"
125+
xMemberAsLegendLabel="Population"
126+
yMemberAsLegendLabel="Debt"
127+
radiusMemberAsLegendLabel="GDP"
121128
dataSource={this.countryStatsEurope}
122129
markerType="Circle"
123130
showDefaultTooltip="true"

samples/charts/data-chart/scatter-bubble-chart-single-source/src/index.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ export default class Sample extends React.Component<any, any> {
6565
</IgrNumericXAxis>
6666
<IgrNumericYAxis
6767
name="yAxis"
68-
title="Public Debt"
68+
title="Public Debt per GDP (%)"
69+
titleLeftMargin="5"
6970
isLogarithmic="false"
70-
abbreviateLargeNumbers="true"
7171
maximumValue="120">
7272
</IgrNumericYAxis>
7373
<IgrBubbleSeries
@@ -77,6 +77,9 @@ export default class Sample extends React.Component<any, any> {
7777
radiusMemberPath="gdpPerPerson"
7878
radiusScale={this.sizeScale1}
7979
fillMemberPath="gdpPerPerson"
80+
xMemberAsLegendLabel="Population"
81+
yMemberAsLegendLabel="Debt"
82+
radiusMemberAsLegendLabel="GDP"
8083
xAxisName="xAxis"
8184
yAxisName="yAxis"
8285
dataSource={this.worldStats}

samples/charts/data-chart/scatter-bubble-chart-styling/src/index.tsx

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ export default class Sample extends React.Component<any, any> {
9696
<IgrNumericYAxis
9797
name="yAxis"
9898
title="GDP per Capita"
99+
titleLeftMargin="5"
99100
isLogarithmic="true"
100101
abbreviateLargeNumbers="true">
101102
</IgrNumericYAxis>
@@ -106,13 +107,16 @@ export default class Sample extends React.Component<any, any> {
106107
yAxisName="yAxis"
107108
xMemberPath="population"
108109
yMemberPath="gDP"
109-
radiusMemberPath="population"
110+
radiusMemberPath="workedHours"
111+
xMemberAsLegendLabel="Population"
112+
yMemberAsLegendLabel="GDP"
113+
radiusMemberAsLegendLabel="Worked Hours"
110114
dataSource={this.countryStatsAfrica}
111115
markerType="Circle"
112-
markerOutline="rgba(62, 202, 62, 1)"
113-
markerBrush="rgba(69, 179, 224, 1)"
116+
markerOutline="rgba(2, 158, 30, 1)"
117+
markerBrush="rgba(2, 158, 30, 1)"
114118
markerFillOpacity="0.5"
115-
markerThickness="2"
119+
markerThickness="1"
116120
showDefaultTooltip="true"
117121
radiusScale={this.sizeScale1}>
118122
</IgrBubbleSeries>
@@ -123,18 +127,34 @@ export default class Sample extends React.Component<any, any> {
123127
yAxisName="yAxis"
124128
xMemberPath="population"
125129
yMemberPath="gDP"
126-
radiusMemberPath="population"
130+
radiusMemberPath="workedHours"
131+
xMemberAsLegendLabel="Population"
132+
yMemberAsLegendLabel="GDP"
133+
radiusMemberAsLegendLabel="Worked Hours"
127134
dataSource={this.countryStatsEurope}
128135
markerType="Circle"
129-
markerOutline="rgba(171, 6, 221, 1)"
130-
markerBrush="rgba(135, 156, 235, 1)"
136+
markerOutline="rgba(95, 2, 171, 1)"
137+
markerBrush="rgba(95, 2, 171, 1)"
131138
markerFillOpacity="0.5"
132-
markerThickness="2"
139+
markerThickness="1"
133140
showDefaultTooltip="true"
134141
radiusScale={this.sizeScale2}>
135142
</IgrBubbleSeries>
136143
<IgrDataToolTipLayer
137-
name="dataToolTipLayer">
144+
name="dataToolTipLayer"
145+
valueRowMarginTop="1"
146+
labelTextMarginTop="1"
147+
titleTextMarginTop="1"
148+
unitsTextMarginTop="1"
149+
valueRowMarginBottom="1"
150+
labelTextMarginBottom="1"
151+
titleTextMarginBottom="1"
152+
unitsTextMarginBottom="1"
153+
unitsTextMarginRight="5"
154+
valueTextMarginLeft="10"
155+
labelTextMarginLeft="5"
156+
groupingMode="Grouped"
157+
layoutMode="Vertical">
138158
</IgrDataToolTipLayer>
139159
</IgrDataChart>
140160
</div>

samples/grids/pivot-grid/features/src/index.tsx

Lines changed: 4 additions & 4 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 { IgrPivotGridModule } from 'igniteui-react-grids';
6-
import { IgrPivotGrid, IgrPivotConfiguration, IgrPivotDateDimension, IgrPivotDimension, IgrPivotDateDimensionOptions, SortingDirection, IgrPivotValue, IgrPivotAggregator, PivotAggregationType} from 'igniteui-react-grids';
6+
import { IgrPivotGrid, IgrPivotConfiguration, IgrPivotDateDimension, IgrPivotDimension, IgrPivotDateDimensionOptions, SortingDirection, IgrPivotValue, IgrPivotAggregator } from 'igniteui-react-grids';
77
import { PivotDataFlatItem, PivotDataFlat } from './PivotDataFlat';
88

99
import 'igniteui-react-grids/grids/combined';
@@ -66,18 +66,18 @@ export default class Sample extends React.Component<any, any> {
6666
SumOfSale.key = "SUM";
6767
SumOfSale.label = "Sum of Sale";
6868
SumOfSale.aggregator = this.pivotDataFlatAggregateSumSale;
69-
SumOfSale.aggregatorName = PivotAggregationType.SUM;
69+
SumOfSale.aggregatorName = "SUM";
7070

7171
var MinOfSale = new IgrPivotAggregator();
7272
MinOfSale.key = "MIN";
7373
MinOfSale.label = "Minimum of Sale";
7474
MinOfSale.aggregator = this.pivotDataFlatAggregateMinSale;
75-
MinOfSale.aggregatorName = PivotAggregationType.MIN;
75+
MinOfSale.aggregatorName = "MIN";
7676

7777
var MaxOfSale = new IgrPivotAggregator();
7878
MaxOfSale.key = "MAX";
7979
MaxOfSale.label = "Maximum of Sale";
80-
MaxOfSale.aggregatorName = PivotAggregationType.MAX;
80+
MaxOfSale.aggregatorName = "MAX";
8181
MaxOfSale.aggregator = this.pivotDataFlatAggregateMaxSale;
8282

8383
igrPivotValue1.aggregateList = [SumOfSale,MinOfSale,MaxOfSale];

0 commit comments

Comments
 (0)