Skip to content

Commit 42205be

Browse files
klishevichklishevich
authored
Merge pull request #148 from ABTSoftware/dev_v2.x
Dev v2.x
2 parents 8d55936 + 9d0537b commit 42205be

File tree

101 files changed

+397
-186
lines changed

Some content is hidden

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

101 files changed

+397
-186
lines changed

‎Examples/src/components/Examples/BuilderApi/ChartFromJSON/GENERATED_SRC.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ export default function ChartFromJSON() {
208208
<div>
209209
<div className={classes.FormControl}>
210210
<ButtonGroup size="medium" color="primary" aria-label="small outlined button group">
211-
<Button id="buildChart" onClick={handleBuild}>Build</Button>
212211
<Button id="eg1" onClick={loadMinimal}>Simple example</Button>
213212
<Button id="eg2" onClick={loadFull}>Full example</Button>
214213
<Button id="eg3" onClick={loadCentral}>Central Axes</Button>
@@ -235,6 +234,11 @@ export default function ChartFromJSON() {
235234
onChange={handleChangeJSON}
236235
/>
237236
</div>
237+
<div className={[classes.FormControl, classes.AlignRight].join(' ')}>
238+
<ButtonGroup size="medium" color="primary" aria-label="small outlined button group">
239+
<Button className={classes.ButtonFilled} id="buildChart" onClick={handleBuild}>Apply</Button>
240+
</ButtonGroup>
241+
</div>
238242
</>
239243
);
240244
}

‎Examples/src/components/Examples/BuilderApi/ChartFromJSON/index.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ export default function ChartFromJSON() {
208208
<div>
209209
<div className={classes.FormControl}>
210210
<ButtonGroup size="medium" color="primary" aria-label="small outlined button group">
211-
<Button id="buildChart" onClick={handleBuild}>Build</Button>
212211
<Button id="eg1" onClick={loadMinimal}>Simple example</Button>
213212
<Button id="eg2" onClick={loadFull}>Full example</Button>
214213
<Button id="eg3" onClick={loadCentral}>Central Axes</Button>
@@ -235,6 +234,11 @@ export default function ChartFromJSON() {
235234
onChange={handleChangeJSON}
236235
/>
237236
</div>
237+
<div className={[classes.FormControl, classes.AlignRight].join(' ')}>
238+
<ButtonGroup size="medium" color="primary" aria-label="small outlined button group">
239+
<Button className={classes.ButtonFilled} id="buildChart" onClick={handleBuild}>Apply</Button>
240+
</ButtonGroup>
241+
</div>
238242
</>
239243
);
240244
}

‎Examples/src/components/Examples/Charts2D/CreateStockCharts/MultiPaneStockCharts/GENERATED_SRC.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ const drawExample = async () => {
221221
// XDirection for ZoomExtendsModifier does not work
222222
sciChartSurface.chartModifiers.add(new ZoomExtentsModifier({ xyDirection: EXyDirection.XDirection }));
223223
sciChartSurface.chartModifiers.add(new MouseWheelZoomModifier({ xyDirection: EXyDirection.XDirection }));
224-
sciChartSurface.chartModifiers.add(new RolloverModifier({ modifierGroup: "first" }));
224+
sciChartSurface.chartModifiers.add(new RolloverModifier({ modifierGroup: "first", showTooltip: false }));
225225
226226
verticalGroup.addSurfaceToGroup(sciChartSurface);
227227

‎Examples/src/components/Examples/Charts2D/CreateStockCharts/MultiPaneStockCharts/index.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ const drawExample = async () => {
221221
// XDirection for ZoomExtendsModifier does not work
222222
sciChartSurface.chartModifiers.add(new ZoomExtentsModifier({ xyDirection: EXyDirection.XDirection }));
223223
sciChartSurface.chartModifiers.add(new MouseWheelZoomModifier({ xyDirection: EXyDirection.XDirection }));
224-
sciChartSurface.chartModifiers.add(new RolloverModifier({ modifierGroup: "first" }));
224+
sciChartSurface.chartModifiers.add(new RolloverModifier({ modifierGroup: "first", showTooltip: false }));
225225

226226
verticalGroup.addSurfaceToGroup(sciChartSurface);
227227

@@ -324,9 +324,9 @@ class VolumePaletteProvider implements IStrokePaletteProvider, IFillPaletteProvi
324324
this.volumnDownArgb = parseColorToUIntArgb(volumeDownColor);
325325
}
326326

327-
onAttached(parentSeries: IRenderableSeries): void {}
327+
onAttached(parentSeries: IRenderableSeries): void { }
328328

329-
onDetached(): void {}
329+
onDetached(): void { }
330330

331331
overrideFillArgb(xValue: number, yValue: number, index: number): number {
332332
const open = this.priceData.getNativeOpenValues().get(index);
@@ -351,9 +351,9 @@ class MacdHistogramPaletteProvider implements IStrokePaletteProvider, IFillPalet
351351
this.belowZeroArgb = parseColorToUIntArgb(belowZeroColor);
352352
}
353353

354-
onAttached(parentSeries: IRenderableSeries): void {}
354+
onAttached(parentSeries: IRenderableSeries): void { }
355355

356-
onDetached(): void {}
356+
onDetached(): void { }
357357

358358
overrideFillArgb(xValue: number, yValue: number, index: number): number {
359359
return yValue >= 0 ? this.aboveZeroArgb : this.belowZeroArgb;

‎Examples/src/components/Examples/Examples.module.scss‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,13 @@
6060
min-width: 142;
6161
}
6262

63+
.AlignRight {
64+
display: flex;
65+
justify-content: flex-end;
66+
margin-left: 0;
67+
margin-right: 0;
68+
}
69+
6370
.Notification {
6471
margin-bottom: $default-spacing * 2;
6572
}
@@ -261,6 +268,7 @@
261268
}
262269
}
263270
}
271+
264272
.SelectWrapper {
265273
display: flex;
266274
margin-top: 10px;

‎Sandbox/CustomerExamples/AnimateXyValuesOnSeries/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"author": "",
1212
"license": "MIT",
1313
"dependencies": {
14-
"scichart": "2.0.2115",
14+
"scichart": "2.1.0-beta.40",
1515
"typescript": "^4.0.5"
1616
},
1717
"devDependencies": {

‎Sandbox/CustomerExamples/Annotations/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"author": "",
1212
"license": "ISC",
1313
"dependencies": {
14-
"scichart": "2.0.2115"
14+
"scichart": "2.1.0-beta.40"
1515
},
1616
"devDependencies": {
1717
"copy-webpack-plugin": "^9.0.1",

‎Sandbox/CustomerExamples/AsyncDataLoad/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"author": "",
1212
"license": "MIT",
1313
"dependencies": {
14-
"scichart": "2.0.2115"
14+
"scichart": "2.1.0-beta.40"
1515
},
1616
"devDependencies": {
1717
"copy-webpack-plugin": "^6.0.3",

‎Sandbox/CustomerExamples/CreateAnnotationsDynamically/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"author": "",
1212
"license": "MIT",
1313
"dependencies": {
14-
"scichart": "2.0.2115",
14+
"scichart": "2.1.0-beta.40",
1515
"typescript": "^4.0.5"
1616
},
1717
"devDependencies": {

‎Sandbox/CustomerExamples/CustomFilterIHS/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"author": "",
1111
"license": "MIT",
1212
"dependencies": {
13-
"scichart": "^2.0.0-beta.2084"
13+
"scichart": "2.1.0-beta.40"
1414
},
1515
"devDependencies": {
1616
"copy-webpack-plugin": "^6.0.3",

0 commit comments

Comments
 (0)