Skip to content

Commit 12cb0dc

Browse files
author
pipeline
committed
v20.2.49 is released
1 parent 60f3d85 commit 12cb0dc

File tree

188 files changed

+4928
-405
lines changed

Some content is hidden

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

188 files changed

+4928
-405
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.2.46",
3+
"version": "20.2.48",
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/charts/CHANGELOG.md

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

33
## [Unreleased]
44

5+
## 20.2.49 (2022-09-13)
6+
7+
### Chart
8+
9+
#### Bug Fixes
10+
11+
- `#I398960` - Now chart axis scrollbar is working properly.
12+
- `#I399859` - Pie chart subtitle is overlapped with datalabel issue has been fixed.
13+
14+
### Stock Chart
15+
16+
#### Bug Fixes
17+
18+
- `#I401042` - Now label stlye is applying properly for stock chart axis labels.
19+
520
## 20.2.48 (2022-09-06)
621

722
### 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.2.46",
3+
"version": "20.2.48",
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/accumulation-chart/accumulation.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1817,6 +1817,7 @@ export class AccumulationChart extends Component<HTMLElement> implements INotify
18171817
titleHeight,
18181818
getAnchor, this.titleCollection, '', 'auto'
18191819
);
1820+
if (!this.subTitle) {
18201821
options.x = parseInt(this.series[0].radius) >= 80 || getAnchor != 'middle' ? options.x : this.accBaseModule.center.x;
18211822
options.y = parseInt(this.series[0].radius) >= 80 ? options.y : (this.accBaseModule.center.y - this.accBaseModule.radius - padding
18221823
- titleHeight - legendHeight - expodeValue);
@@ -1826,7 +1827,7 @@ export class AccumulationChart extends Component<HTMLElement> implements INotify
18261827
(this.accBaseModule.center.x + (titleSize.width / 2)) > (this.initialClipRect.x + this.initialClipRect.width) ?
18271828
(this.initialClipRect.x + this.initialClipRect.width) - (titleSize.width / 2) - this.initialClipRect.x : options.x;
18281829
options.y = options.y < (this.initialClipRect.y - legendHeight) ? (this.initialClipRect.y - legendHeight) : options.y;
1829-
}
1830+
}}
18301831
const element: Element = textElement(
18311832
this.renderer, options, this.titleStyle, this.titleStyle.color || this.themeStyle.chartTitle, this.svgObject, false, this.redraw
18321833
);

controls/charts/src/common/scrollbar/scrollbar.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,11 @@ export class ScrollBar {
270270
const circleWidth: number = 1;
271271
const currentScrollWidth: number = currentX + currentWidth + circleRadius + circleWidth;
272272
const currentZPWidth: number = circleRadius + (circleWidth / 2);
273-
this.zoomPosition = (currentX - (currentX - currentZPWidth <= 0 ? currentZPWidth : 0)) / (this.isVertical
274-
? axis.rect.height : this.width);
275-
this.zoomFactor = (currentWidth + (currentScrollWidth >= this.width ? circleRadius + circleWidth : 0)) / (this.isVertical
276-
? axis.rect.height : this.width);
277-
axis.zoomPosition = this.zoomPosition < 0 ? 0 : this.zoomPosition > 0.9 ? 1 : this.zoomPosition;
273+
let axisSize = this.isVertical ? axis.rect.height : this.width;
274+
this.zoomFactor = (currentWidth + (currentScrollWidth >= this.width ? circleRadius + circleWidth : 0)) / axisSize;
278275
axis.zoomFactor = isRequire ? this.zoomFactor : axis.zoomFactor;
276+
this.zoomPosition = currentScrollWidth > axisSize ? (1 - axis.zoomFactor) : currentX < (circleRadius + circleWidth) ? 0 : (currentX - (currentX - currentZPWidth <= 0 ? currentZPWidth : 0)) / axisSize;
277+
axis.zoomPosition = this.zoomPosition < 0 ? 0 : this.zoomPosition > 0.9 ? 1 : this.zoomPosition;
279278
}
280279
/**
281280
* Handles the mouse move on scrollbar

controls/charts/src/stock-chart/model/base-model.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ChildProperty, Property, Complex, Collection } from '@syncfusion/ej2-base';import { DataManager, Query} from '@syncfusion/ej2-data';import { MarkerSettings, Series, Trendline } from '../../chart/series/chart-series';import { MarkerSettingsModel, TrendlineModel } from '../../chart/series/chart-series-model';import { StockChart } from '../stock-chart';import { ChartSeriesType, EmptyPointMode, TechnicalIndicators, MacdType, FinancialDataFields, ChartTheme, ChartShape } from '../../chart/utils/enum';import { Anchor, ZIndex, SizeType, LabelIntersectAction, LabelPlacement, AxisPosition, IntervalType } from '../../chart/utils/enum';import { SkeletonType, ChartRangePadding, EdgeLabelPlacement, ValueType, LegendShape, TrendlineTypes } from '../../chart/utils/enum';import { MajorGridLinesModel, MajorTickLinesModel, CrosshairTooltipModel, AxisLineModel } from '../../chart/axis/axis-model';import { MinorGridLinesModel, MinorTickLinesModel } from '../../chart/axis/axis-model';import { MajorGridLines, MajorTickLines, MinorTickLines, MinorGridLines, CrosshairTooltip, AxisLine } from '../../chart/axis/axis';import { ConnectorType } from '../../accumulation-chart/model/enum';import { TextOverflow, Alignment, Regions, Units, Position, FlagType } from '../../common/utils/enum';import { Theme } from '../../common/model/theme';import { AnimationModel, CornerRadiusModel, EmptyPointSettingsModel, ConnectorModel, IChartEventArgs } from '../../chart/index';
1+
import { ChildProperty, Property, Complex, Collection } from '@syncfusion/ej2-base';import { DataManager, Query} from '@syncfusion/ej2-data';import { MarkerSettings, Series, Trendline } from '../../chart/series/chart-series';import { MarkerSettingsModel, TrendlineModel } from '../../chart/series/chart-series-model';import { StockChart } from '../stock-chart';import { ChartSeriesType, EmptyPointMode, TechnicalIndicators, MacdType, FinancialDataFields, ChartTheme, ChartShape } from '../../chart/utils/enum';import { Anchor, ZIndex, SizeType, LabelIntersectAction, LabelPlacement, AxisPosition, IntervalType } from '../../chart/utils/enum';import { SkeletonType, ChartRangePadding, EdgeLabelPlacement, ValueType, LegendShape, TrendlineTypes } from '../../chart/utils/enum';import { MajorGridLinesModel, MajorTickLinesModel, CrosshairTooltipModel, AxisLineModel } from '../../chart/axis/axis-model';import { MinorGridLinesModel, MinorTickLinesModel } from '../../chart/axis/axis-model';import { MajorGridLines, MajorTickLines, MinorTickLines, MinorGridLines, CrosshairTooltip, AxisLine } from '../../chart/axis/axis';import { ConnectorType } from '../../accumulation-chart/model/enum';import { TextOverflow, Alignment, Regions, Units, Position, FlagType } from '../../common/utils/enum';import { Theme } from '../../common/model/theme';import { AnimationModel, CornerRadiusModel, EmptyPointSettingsModel, ConnectorModel, IChartEventArgs, Font, FontModel } from '../../chart/index';
22

33
/**
44
* Interface for a class StockChartFont
@@ -1040,7 +1040,7 @@ export interface StockChartAxisModel {
10401040
* Options to customize the axis label.
10411041
*/
10421042

1043-
labelStyle?: StockChartFontModel;
1043+
labelStyle?: FontModel;
10441044

10451045
/**
10461046
* Specifies the title of an axis.

controls/charts/src/stock-chart/model/base.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { ConnectorType } from '../../accumulation-chart/model/enum';
1414
import { CornerRadius } from '../../common/model/base';
1515
import { TextOverflow, Alignment, Regions, Units, Position, FlagType } from '../../common/utils/enum';
1616
import { Theme } from '../../common/model/theme';
17-
import { AnimationModel, CornerRadiusModel, EmptyPointSettingsModel, ConnectorModel, IChartEventArgs } from '../../chart/index';
17+
import { AnimationModel, CornerRadiusModel, EmptyPointSettingsModel, ConnectorModel, IChartEventArgs, Font, FontModel } from '../../chart/index';
1818
import { StockChartBorderModel, StockChartConnectorModel, StockChartStripLineSettingsModel, StockSeriesModel } from './base-model';
1919
import { StockChartFontModel } from './base-model';
2020

@@ -1246,8 +1246,8 @@ export class StockChartAxis extends ChildProperty<StockChartAxis> {
12461246
* Options to customize the axis label.
12471247
*/
12481248

1249-
@Complex<StockChartFontModel>(Theme.axisLabelFont, StockChartFont)
1250-
public labelStyle: StockChartFontModel;
1249+
@Complex<FontModel>(Theme.axisLabelFont, Font)
1250+
public labelStyle: FontModel;
12511251

12521252
/**
12531253
* Specifies the title of an axis.

controls/diagrams/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.2.49 (2022-09-13)
6+
7+
### Diagram
8+
9+
#### Bug fixes
10+
11+
- `#I399417` - Now, fit to page is working properly when we call it multiple times.
12+
513
## 20.2.45 (2022-08-23)
614

715
### Diagram

controls/diagrams/spec/diagram/interaction/scroller.spec.ts

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,4 +495,41 @@ describe('Diagram Control', () => {
495495
done();
496496
});
497497
});
498+
499+
describe('FitToPage not working when we call it multiple times ', () => {
500+
let diagram: Diagram;
501+
let ele: HTMLElement;
502+
503+
beforeAll((): void => {
504+
ele = createElement('div', { id: 'diagram_fitToPageIssue' });
505+
ele.style.width = '100%';
506+
document.body.appendChild(ele);
507+
let node: NodeModel = { id: 'node1', width: 100, height: 100, offsetX: 350, offsetY: 350 };
508+
diagram = new Diagram({
509+
width: '500px',
510+
height: '500px',created:created,
511+
nodes: [node],
512+
scrollSettings: { padding: { right: 50, bottom: 50 } }
513+
});
514+
diagram.appendTo('#diagram_fitToPageIssue');
515+
function created(){
516+
diagram.fitToPage();
517+
}
518+
});
519+
520+
afterAll((): void => {
521+
diagram.destroy();
522+
ele.remove();
523+
});
524+
it('Calling fit to page at runtime', (done: Function) => {
525+
let scrollX = diagram.scrollSettings.horizontalOffset;
526+
let scrollY = diagram.scrollSettings.verticalOffset;
527+
diagram.fitToPage();
528+
diagram.fitToPage();
529+
expect(scrollX === diagram.scrollSettings.horizontalOffset && scrollY === diagram.scrollSettings.verticalOffset).toBe(true);
530+
done();
531+
console.log(scrollX);
532+
console.log(scrollY);
533+
});
534+
});
498535
});

controls/diagrams/src/diagram/interaction/scroller.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -751,16 +751,13 @@ export class DiagramScroller {
751751
break;
752752
}
753753
/**
754-
* In applyScrollLimit method the sign of deltaX and deltaY
755-
* will be changed ,so here we change the sign.
756-
* similarly for bringIntoView and bringToCenter.
754+
* EJ2-62912 - fitToPage is not working when we call it multiple times.
757755
*/
758-
if(factor === 1){deltaX*=-1;deltaY*=-1};
759-
this.zoom(factor, deltaX, deltaY, { x: 0, y: 0 });
756+
this.zoom(factor, deltaX, deltaY, { x: 0, y: 0 },true);
760757
} else {
761758
factor = 1 / this.currentZoom;
762-
if(factor === 1){deltaX*=-1;deltaY*=-1};
763-
this.zoom(factor, deltaX, deltaY, { x: 0, y: 0 });
759+
760+
this.zoom(factor, deltaX, deltaY, { x: 0, y: 0 },true);
764761
}
765762
}
766763
/**
@@ -813,6 +810,11 @@ export class DiagramScroller {
813810
const actualbounds: Rect = new Rect(bounds.x * scale, bounds.y * scale, bounds.width * scale, bounds.height * scale);
814811
let hoffset: number = actualbounds.x + actualbounds.width / 2 - this.viewPortWidth / 2;
815812
let voffset: number = actualbounds.y + actualbounds.height / 2 - this.viewPortHeight / 2;
813+
/**
814+
* In applyScrollLimit method the sign of deltaX and deltaY
815+
* will be changed ,so here we change the sign.
816+
* similarly for bringIntoView.
817+
*/
816818
hoffset*=-1;voffset*=-1;
817819
this.zoom(1, -this.horizontalOffset - hoffset, -this.verticalOffset - voffset, null);
818820
}

controls/diagrams/themestudio/styles/calendars/datepicker/_layout.scss

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@
9696
top:0 !important;
9797
left: 0 !important;
9898
}
99+
100+
.e-datepicker.e-popup-wrapper.e-popup-expand.e-lib.e-popup.e-control.e-popup-open {
101+
min-width: 100%;
102+
min-height:100%;
103+
}
104+
99105
}
100106

101107
.e-content-placeholder.e-datepicker.e-placeholder-datepicker {
@@ -109,6 +115,62 @@
109115
min-height: 40px;
110116
}
111117

118+
.e-datepick-mob-popup-wrap {
119+
120+
121+
#{if(&, '&', '*')} .e-datepicker.e-popup-expand {
122+
123+
#{if(&, '&', '*')} .e-model-header {
124+
125+
height:15%;
126+
127+
#{if(&, '&', '*')} .e-popup-close {
128+
float: right;
129+
margin-right: 10px;
130+
padding: 5px;
131+
}
132+
133+
#{if(&, '&', '*')} .e-popup-close::before {
134+
content: "\e932";
135+
font-family: "e-icons";
136+
color: rgba(255,255,255);
137+
}
138+
}
139+
140+
#{if(&, '&', '*')} .e-calendar {
141+
min-width: 100%;
142+
min-height:100%;
143+
height:100%;
144+
145+
#{if(&, '&', '*')} .e-header.e-month {
146+
height: 10%;
147+
}
148+
149+
}
150+
151+
#{if(&, '&', '*')} .e-calendar-cell-container {
152+
height:85%;
153+
}
154+
155+
.e-footer-container
156+
{
157+
height: 10%;
158+
}
159+
160+
#{if(&, '&', '*')} .e-content.e-month
161+
{
162+
height: 80%;
163+
table
164+
{
165+
height:100%;
166+
}
167+
168+
}
169+
170+
}
171+
}
172+
173+
112174
// sass-lint:enable-all
113175

114176

@@ -121,3 +183,64 @@
121183
}
122184
}
123185

186+
@media screen and (orientation: landscape) {
187+
.e-datepick-mob-popup-wrap {
188+
189+
#{if(&, '&', '*')} .e-datepicker.e-popup-expand {
190+
#{if(&, '&', '*')} .e-model-header {
191+
192+
float: left;
193+
height: 100%;
194+
width: 30%;
195+
196+
.e-popup-close {
197+
float: left;
198+
padding: 5px;
199+
}
200+
201+
.e-model-year {
202+
font-size: 35px;
203+
margin-top: 35%;
204+
}
205+
206+
}
207+
208+
#{if(&, '&', '*')} .e-model-month ,
209+
#{if(&, '&', '*')} .e-model-day {
210+
display: block;
211+
font-size: 40px;
212+
margin-top: 10%;
213+
}
214+
215+
#{if(&, '&', '*')} .e-header.e-month ,
216+
#{if(&, '&', '*')} .e-footer-container {
217+
height: 10%;
218+
}
219+
220+
.e-content.e-month {
221+
height: 75%;
222+
}
223+
224+
.e-calendar {
225+
display: flex;
226+
}
227+
228+
.e-calendar-cell-container {
229+
float: right;
230+
height: 90%;
231+
width: 70%;
232+
}
233+
234+
.e-calendar.e-device .e-month table tbody {
235+
display: table-row-group;
236+
}
237+
238+
#{if(&, '&', '*')} .e-content.e-month table ,
239+
#{if(&, '&', '*')} .e-content.e-decade table ,
240+
#{if(&, '&', '*')} .e-content.e-year table {
241+
height: 100%;
242+
}
243+
}
244+
}
245+
}
246+

0 commit comments

Comments
 (0)