Skip to content

Commit c186492

Browse files
author
tfsbuild
committed
Adding changes from build igniteui-xplat-examples-output+PRs_2024.12.11.4
1 parent 36947d8 commit c186492

File tree

3 files changed

+44
-23
lines changed

3 files changed

+44
-23
lines changed

samples/charts/category-chart/axis-gridlines/src/index.tsx

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ export default class Sample extends React.Component<any, any> {
2929
this.propertyEditorPanel1 = r;
3030
this.setState({});
3131
}
32+
private xAxisStroke: IgrPropertyEditorPropertyDescription
33+
private xAxisMajorStroke: IgrPropertyEditorPropertyDescription
3234
private yAxisStroke: IgrPropertyEditorPropertyDescription
3335
private yAxisMajorStroke: IgrPropertyEditorPropertyDescription
3436
private yAxisMinorStroke: IgrPropertyEditorPropertyDescription
@@ -57,6 +59,26 @@ export default class Sample extends React.Component<any, any> {
5759
isHorizontal="true"
5860
isWrappingEnabled="true"
5961
ref={this.propertyEditorPanel1Ref}>
62+
<IgrPropertyEditorPropertyDescription
63+
propertyPath="XAxisStroke"
64+
name="XAxisStroke"
65+
label="X Axis Stroke"
66+
shouldOverrideDefaultEditor="true"
67+
valueType="EnumValue"
68+
dropDownNames={["gray", "darkslategray", "salmon", "cornflowerblue", "darkgreen"]}
69+
dropDownValues={["gray", "darkslategray", "salmon", "cornflowerblue", "darkgreen"]}
70+
primitiveValue="gray">
71+
</IgrPropertyEditorPropertyDescription>
72+
<IgrPropertyEditorPropertyDescription
73+
propertyPath="XAxisMajorStroke"
74+
name="XAxisMajorStroke"
75+
label="X Axis Major Stroke"
76+
shouldOverrideDefaultEditor="true"
77+
valueType="EnumValue"
78+
dropDownNames={["gray", "darkslategray", "salmon", "cornflowerblue", "darkgreen"]}
79+
dropDownValues={["gray", "darkslategray", "salmon", "cornflowerblue", "darkgreen"]}
80+
primitiveValue="darkslategray">
81+
</IgrPropertyEditorPropertyDescription>
6082
<IgrPropertyEditorPropertyDescription
6183
propertyPath="YAxisStroke"
6284
name="YAxisStroke"

samples/charts/toolbar/custom-tool/src/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export default class Sample extends React.Component<any, any> {
2828
this.toolbar = r;
2929
this.setState({});
3030
}
31+
private customIconName: IgrToolActionLabel
3132
private chart: IgrCategoryChart
3233
private chartRef(r: IgrCategoryChart) {
3334
this.chart = r;
@@ -63,7 +64,8 @@ export default class Sample extends React.Component<any, any> {
6364
<IgrToolActionLabel
6465
title="Custom Icon"
6566
iconName="CustomIcon"
66-
iconCollectionName="CustomCollection">
67+
iconCollectionName="CustomCollection"
68+
name="CustomIconName">
6769
</IgrToolActionLabel>
6870
</IgrToolbar>
6971
</div>

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

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -62,28 +62,25 @@ export default class Sample extends React.Component<any, any> {
6262
igrPivotValue1.member = "AmountofSale";
6363
igrPivotValue1.displayName = "Amount of Sale";
6464
igrPivotValue1.enabled = true;
65-
var igrPivotAggregator1 = new IgrPivotAggregator();
66-
igrPivotAggregator1.key = "SUM";
67-
igrPivotAggregator1.label = "Sum of Sale";
68-
igrPivotAggregator1.aggregator = this.pivotDataFlatAggregateSumSale;
69-
70-
igrPivotValue1.aggregate = igrPivotAggregator1;
71-
var igrPivotAggregator2 = new IgrPivotAggregator();
72-
igrPivotAggregator2.key = "SUM";
73-
igrPivotAggregator2.label = "Sum of Sale";
74-
igrPivotAggregator2.aggregator = this.pivotDataFlatAggregateSumSale;
75-
76-
var igrPivotAggregator3 = new IgrPivotAggregator();
77-
igrPivotAggregator3.key = "MIN";
78-
igrPivotAggregator3.label = "Minimum of Sale";
79-
igrPivotAggregator3.aggregator = this.pivotDataFlatAggregateMinSale;
80-
81-
var igrPivotAggregator4 = new IgrPivotAggregator();
82-
igrPivotAggregator4.key = "MAX";
83-
igrPivotAggregator4.label = "Maximum of Sale";
84-
igrPivotAggregator4.aggregator = this.pivotDataFlatAggregateMaxSale;
85-
86-
igrPivotValue1.aggregateList = [igrPivotAggregator2,igrPivotAggregator3,igrPivotAggregator4];
65+
var SumOfSale = new IgrPivotAggregator();
66+
SumOfSale.key = "SUM";
67+
SumOfSale.label = "Sum of Sale";
68+
SumOfSale.aggregator = this.pivotDataFlatAggregateSumSale;
69+
SumOfSale.aggregatorName = "SUM";
70+
71+
var MinOfSale = new IgrPivotAggregator();
72+
MinOfSale.key = "MIN";
73+
MinOfSale.label = "Minimum of Sale";
74+
MinOfSale.aggregator = this.pivotDataFlatAggregateMinSale;
75+
MinOfSale.aggregatorName = "MIN";
76+
77+
var MaxOfSale = new IgrPivotAggregator();
78+
MaxOfSale.key = "MAX";
79+
MaxOfSale.label = "Maximum of Sale";
80+
MaxOfSale.aggregatorName = "MAX";
81+
MaxOfSale.aggregator = this.pivotDataFlatAggregateMaxSale;
82+
83+
igrPivotValue1.aggregateList = [SumOfSale,MinOfSale,MaxOfSale];
8784

8885
pivotConfiguration1.values = [igrPivotValue1];
8986

0 commit comments

Comments
 (0)