Skip to content

Commit 053953e

Browse files
author
pipeline
committed
v20.3.52 is released
1 parent 8f48bde commit 053953e

File tree

112 files changed

+5349
-3925
lines changed

Some content is hidden

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

112 files changed

+5349
-3925
lines changed

‎controls/base/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-base",
3-
"version": "20.3.49",
3+
"version": "20.3.50",
44
"description": "A common package of Essential JS 2 base libraries, methods and class definitions",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

‎controls/buttons/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 20.3.50 (2022-10-18)
5+
## 20.3.52 (2022-10-26)
66

77
### Checkbox
88

‎controls/calendars/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 20.3.50 (2022-10-18)
5+
## 20.3.52 (2022-10-26)
66

77
### Calendar
88

‎controls/charts/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
## [Unreleased]
44

5+
## 20.3.52 (2022-10-26)
6+
7+
### Chart
8+
9+
#### Bug Fixes
10+
11+
- `#I412377` - Axis labels are now rendering properly inside the chart.
12+
- `#F171844` - Console error while using shared tooltip has been fixed.
13+
514
## 20.3.50 (2022-10-18)
615

716
### Chart

‎controls/charts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-charts",
3-
"version": "20.3.49",
3+
"version": "20.3.50",
44
"description": "Feature-rich chart control with built-in support for over 25 chart types, technical indictors, trendline, zooming, tooltip, selection, crosshair and trackball.",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

‎controls/charts/src/chart/axis/axis.ts

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,22 @@ export class Row extends ChildProperty<Row> {
6161
public nearSizes: number[] = [];
6262
/** @private */
6363
public farSizes: number[] = [];
64+
/** @private */
65+
public insideFarSizes: number[] = [];
66+
/** @private */
67+
public insideNearSizes: number[] = [];
6468
/**
6569
* Measure the row size
6670
*
6771
* @returns {void}
6872
* @private
6973
*/
70-
public computeSize(axis: Axis, scrollBarHeight: number): void {
74+
public computeSize(axis: Axis, scrollBarHeight: number, definition: Row | Column): void {
7175
let width: number = 0;
7276
const innerPadding: number = 5;
7377
if (axis.visible && axis.internalVisibility) {
7478
width += (axis.findTickSize(axis.crossInAxis) + scrollBarHeight +
75-
axis.findLabelSize(axis.crossInAxis, innerPadding) + axis.lineStyle.width * 0.5);
79+
axis.findLabelSize(axis.crossInAxis, innerPadding, definition) + axis.lineStyle.width * 0.5);
7680
}
7781

7882
if (axis.isAxisOpposedPosition) {
@@ -116,6 +120,10 @@ export class Column extends ChildProperty<Column> {
116120
/** @private */
117121
public farSizes: number[] = [];
118122
/** @private */
123+
public insideFarSizes: number[] = [];
124+
/** @private */
125+
public insideNearSizes: number[] = [];
126+
/** @private */
119127
private padding: number = 0;
120128

121129
/**
@@ -125,12 +133,12 @@ export class Column extends ChildProperty<Column> {
125133
* @private
126134
*/
127135

128-
public computeSize(axis: Axis, scrollBarHeight: number ): void {
136+
public computeSize(axis: Axis, scrollBarHeight: number, definition: Row | Column): void {
129137
let height: number = 0;
130138
const innerPadding: number = 5;
131139
if (axis.visible && axis.internalVisibility) {
132140
height += (axis.findTickSize(axis.crossInAxis) + scrollBarHeight +
133-
axis.findLabelSize(axis.crossInAxis, innerPadding) + axis.lineStyle.width * 0.5);
141+
axis.findLabelSize(axis.crossInAxis, innerPadding, definition) + axis.lineStyle.width * 0.5);
134142
}
135143
if (axis.isAxisOpposedPosition) {
136144
this.farSizes.push(height);
@@ -1045,7 +1053,7 @@ export class Axis extends ChildProperty<Axis> {
10451053
* @returns {number} labelSize
10461054
* @private
10471055
*/
1048-
public findLabelSize(crossAxis: Axis, innerPadding: number): number {
1056+
public findLabelSize(crossAxis: Axis, innerPadding: number, definition: Row | Column): number {
10491057
let titleSize: number = 0; const isHorizontal: boolean = this.orientation === 'Horizontal';
10501058
if (this.title) {
10511059
this.titleSize = measureText(this.title, this.titleStyle);
@@ -1056,9 +1064,6 @@ export class Axis extends ChildProperty<Axis> {
10561064
titleSize = (titleSize * this.titleCollection.length);
10571065
}
10581066
}
1059-
if (this.labelPosition === 'Inside') {
1060-
return titleSize + innerPadding;
1061-
}
10621067
let diff: number;
10631068
let value: number;
10641069
let labelSize: number = titleSize + innerPadding + this.titlePadding + this.labelPadding +
@@ -1075,6 +1080,15 @@ export class Axis extends ChildProperty<Axis> {
10751080
labelSize = (diff < labelSize) ? (labelSize - diff) : 0;
10761081
}
10771082
}
1083+
if (this.isAxisOpposedPosition) {
1084+
definition.insideFarSizes.push(labelSize);
1085+
}
1086+
else {
1087+
definition.insideNearSizes.push(labelSize);
1088+
}
1089+
if (this.labelPosition === 'Inside') {
1090+
return titleSize + innerPadding;
1091+
}
10781092
return labelSize;
10791093
}
10801094
/**

‎controls/charts/src/chart/axis/cartesian-panel.ts

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ export class CartesianAxisLayoutPanel {
118118
row = <Row>item;
119119
row.nearSizes = [];
120120
row.farSizes = [];
121+
row.insideNearSizes = [];
122+
row.insideFarSizes = [];
121123
this.arrangeAxis(row);
122124
this.measureDefinition(row, chart, new Size(chart.availableSize.width, row.computedHeight));
123125
if (this.leftSize < sum(row.nearSizes)) {
@@ -136,6 +138,8 @@ export class CartesianAxisLayoutPanel {
136138
column = <Column>item;
137139
column.farSizes = [];
138140
column.nearSizes = [];
141+
column.insideNearSizes = [];
142+
column.insideFarSizes = [];
139143
this.arrangeAxis(column);
140144
this.measureDefinition(column, chart, new Size(column.computedWidth, chart.availableSize.height));
141145
if (this.bottomSize < sum(column.nearSizes)) {
@@ -164,7 +168,7 @@ export class CartesianAxisLayoutPanel {
164168
|| axis.scrollbarSettings.enable) ? ele : 0;
165169
axis.getModule(chart);
166170
axis.baseModule.calculateRangeAndInterval(size, axis);
167-
definition.computeSize(axis, axis.scrollBarHeight);
171+
definition.computeSize(axis, axis.scrollBarHeight, definition);
168172
}
169173
if (definition.farSizes.length > 0) {
170174
definition.farSizes[definition.farSizes.length - 1] -= axisPadding;
@@ -222,11 +226,21 @@ export class CartesianAxisLayoutPanel {
222226
axis.rect.width = 0;
223227
}
224228
if (axis.isAxisOpposedPosition) {
225-
x = rect.x + rect.width + sum(subArray(row.farSizes, farCount));
229+
if (axis.labelPosition === 'Inside' && axis.orientation === "Vertical") {
230+
x = rect.x + rect.width - sum(subArray(row.insideFarSizes, farCount));
231+
}
232+
else {
233+
x = rect.x + rect.width + sum(subArray(row.farSizes, farCount));
234+
}
226235
axis.rect.x = axis.rect.x >= x ? axis.rect.x : x;
227236
farCount++;
228237
} else {
229-
x = rect.x - sum(subArray(row.nearSizes, nearCount));
238+
if (axis.labelPosition === 'Inside' && axis.orientation === "Vertical") {
239+
x = rect.x + sum(subArray(row.insideNearSizes, nearCount));
240+
}
241+
else{
242+
x = rect.x - sum(subArray(row.nearSizes, nearCount));
243+
}
230244
axis.rect.x = axis.rect.x <= x ? axis.rect.x : x;
231245
nearCount++;
232246
}
@@ -253,11 +267,21 @@ export class CartesianAxisLayoutPanel {
253267
axis.rect.height = 0;
254268
}
255269
if (axis.isAxisOpposedPosition) {
256-
y = rect.y - sum(subArray(column.farSizes, farCount));
270+
if (axis.labelPosition === 'Inside' && axis.orientation === "Horizontal") {
271+
y = rect.y + sum(subArray(column.insideFarSizes, farCount));
272+
}
273+
else {
274+
y = rect.y - sum(subArray(column.farSizes, farCount));
275+
}
257276
axis.rect.y = axis.rect.y <= y ? axis.rect.y : y;
258277
farCount++;
259278
} else {
260-
y = rect.y + rect.height + sum(subArray(column.nearSizes, nearCount));
279+
if (axis.labelPosition === 'Inside' && axis.orientation === "Horizontal") {
280+
y = rect.y + rect.height - sum(subArray(column.insideNearSizes, nearCount));
281+
}
282+
else {
283+
y = rect.y + rect.height + sum(subArray(column.nearSizes, nearCount));
284+
}
261285
axis.rect.y = axis.rect.y >= y ? axis.rect.y : y;
262286
nearCount++;
263287
}

‎controls/charts/src/common/user-interaction/tooltip.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ export class BaseTooltip extends ChartData {
333333
const isTemplateRendered: boolean = tooltipTemplate && tooltipTemplate.innerHTML !== '<div></div>';
334334
this.stopAnimation();
335335
// eslint-disable-next-line @typescript-eslint/no-explicit-any
336-
if ((this.chart as any).isReact && isTemplateRendered) { (this.chart as any).clearTemplate([tooltipTemplate.id], [0]); }
337336
if (tooltipElement && this.previousPoints.length > 0) {
338337
this.toolTipInterval = +setTimeout(
339338
(): void => {

‎controls/circulargauge/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## [Unreleased]
66

7-
## 20.3.50 (2022-10-18)
7+
## 20.3.52 (2022-10-26)
88

99
### Circular Gauge
1010

‎controls/data/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## [Unreleased]
44

5+
## 20.3.50 (2022-10-18)
6+
7+
### DataManager
8+
9+
#### Bug Fixes
10+
11+
- `#F176305` - DataManager causes memory leak when doing multiple server side actions issue has been fixed.
12+
513
## 19.4.52 (2022-02-15)
614

715
### DataManager

0 commit comments

Comments
 (0)