@syncfusion/ej2-charts
Advanced tools
Comparing version 16.4.44 to 16.4.45
@@ -1,2 +0,1 @@ | ||
# Changelog | ||
@@ -6,2 +5,10 @@ | ||
### Chart | ||
#### Bug Fixes | ||
- Duplicates of scrollbar id in multiple chart is fixed | ||
## 16.4.44 (2018-12-24) | ||
### Stock Chart | ||
@@ -8,0 +15,0 @@ |
/*! | ||
* filename: index.d.ts | ||
* version : 16.4.44 | ||
* version : 16.4.45 | ||
* Copyright Syncfusion Inc. 2001 - 2018. All rights reserved. | ||
@@ -5,0 +5,0 @@ * Use of this code is subject to the terms of our license. |
{ | ||
"name": "@syncfusion/ej2-charts", | ||
"version": "16.4.44", | ||
"version": "16.4.45", | ||
"description": "Feature-rich chart control with built-in support for over 25 chart types, technical indictors, trendline, zooming, tooltip, selection, crosshair and trackball.", | ||
@@ -9,3 +9,3 @@ "author": "Syncfusion Inc.", | ||
"@syncfusion/ej2-base": "~16.4.42", | ||
"@syncfusion/ej2-data": "~16.4.42", | ||
"@syncfusion/ej2-data": "~16.4.45", | ||
"@syncfusion/ej2-svg-base": "~16.4.44", | ||
@@ -15,4 +15,4 @@ "@syncfusion/ej2-pdf-export": "~16.4.42", | ||
"@syncfusion/ej2-compression": "~16.4.42", | ||
"@syncfusion/ej2-navigations": "~16.4.44", | ||
"@syncfusion/ej2-calendars": "~16.4.44" | ||
"@syncfusion/ej2-navigations": "~16.4.45", | ||
"@syncfusion/ej2-calendars": "~16.4.45" | ||
}, | ||
@@ -19,0 +19,0 @@ "devDependencies": { |
import { ScrollBar } from './scrollbar'; | ||
import { Chart } from '../../chart/chart'; | ||
import { SvgRenderer } from '@syncfusion/ej2-base'; | ||
@@ -28,2 +29,4 @@ /** | ||
slider: Element; | ||
/** @private */ | ||
chartId: string; | ||
/** | ||
@@ -33,3 +36,3 @@ * Constructor for scroll elements | ||
*/ | ||
constructor(); | ||
constructor(chart: Chart); | ||
/** | ||
@@ -36,0 +39,0 @@ * Render scrollbar elements. |
@@ -10,3 +10,3 @@ import { Rect, PathOption, RectOption, CircleOption } from '../utils/helper'; | ||
scrollbar.svgObject = renderer.createSvg({ | ||
id: 'scrollBar_svg' + scrollbar.axis.name, | ||
id: scrollbar.component.element.id + '_' + 'scrollBar_svg' + scrollbar.axis.name, | ||
width: scrollbar.isVertical ? scrollbar.height : scrollbar.width, | ||
@@ -28,4 +28,4 @@ height: scrollbar.isVertical ? scrollbar.width : scrollbar.height, | ||
*/ | ||
function ScrollElements() { | ||
// Constructor Called here | ||
function ScrollElements(chart) { | ||
this.chartId = chart.element.id + '_'; | ||
} | ||
@@ -39,3 +39,3 @@ /** | ||
var scrollGroup = renderer.createGroup({ | ||
id: 'scrollBar_' + scroll.axis.name, | ||
id: this.chartId + 'scrollBar_' + scroll.axis.name, | ||
transform: 'translate(' + ((scroll.isVertical && scroll.axis.isInversed) ? scroll.height : scroll.axis.isInversed ? | ||
@@ -47,6 +47,6 @@ scroll.width : '0') + ',' + (scroll.isVertical && scroll.axis.isInversed ? '0' : scroll.axis.isInversed ? | ||
var backRectGroup = renderer.createGroup({ | ||
id: 'scrollBar_backRect_' + scroll.axis.name | ||
id: this.chartId + 'scrollBar_backRect_' + scroll.axis.name | ||
}); | ||
var thumbGroup = renderer.createGroup({ | ||
id: 'scrollBar_thumb_' + scroll.axis.name, | ||
id: this.chartId + 'scrollBar_thumb_' + scroll.axis.name, | ||
transform: 'translate(0,0)' | ||
@@ -69,3 +69,3 @@ }); | ||
var style = scroll.scrollbarThemeStyle; | ||
var backRectEle = renderer.drawRectangle(new RectOption('scrollBarBackRect_' + scroll.axis.name, style.backRect, { width: 1, color: style.backRect }, 1, new Rect(0, 0, scroll.width, scroll.height), 0, 0)); | ||
var backRectEle = renderer.drawRectangle(new RectOption(this.chartId + 'scrollBarBackRect_' + scroll.axis.name, style.backRect, { width: 1, color: style.backRect }, 1, new Rect(0, 0, scroll.width, scroll.height), 0, 0)); | ||
parent.appendChild(backRectEle); | ||
@@ -79,5 +79,5 @@ }; | ||
var style = scroll.scrollbarThemeStyle; | ||
var option = new PathOption('scrollBar_leftArrow_' + scroll.axis.name, style.arrow, 1, style.arrow, 1, '', ''); | ||
var option = new PathOption(this.chartId + 'scrollBar_leftArrow_' + scroll.axis.name, style.arrow, 1, style.arrow, 1, '', ''); | ||
this.leftArrowEle = renderer.drawPath(option); | ||
option.id = 'scrollBar_rightArrow_' + scroll.axis.name; | ||
option.id = this.chartId + 'scrollBar_rightArrow_' + scroll.axis.name; | ||
this.rightArrowEle = renderer.drawPath(option); | ||
@@ -113,3 +113,3 @@ this.setArrowDirection(this.thumbRectX, this.thumbRectWidth, scroll.height); | ||
var style = scroll.scrollbarThemeStyle; | ||
this.slider = renderer.drawRectangle(new RectOption('scrollBarThumb_' + scroll.axis.name, style.thumb, { width: 1, color: '' }, 1, new Rect(this.thumbRectX, 0, this.thumbRectWidth, scroll.height))); | ||
this.slider = renderer.drawRectangle(new RectOption(this.chartId + 'scrollBarThumb_' + scroll.axis.name, style.thumb, { width: 1, color: '' }, 1, new Rect(this.thumbRectX, 0, this.thumbRectWidth, scroll.height))); | ||
parent.appendChild(this.slider); | ||
@@ -125,3 +125,3 @@ }; | ||
var style = scroll.scrollbarThemeStyle; | ||
var option = new CircleOption('scrollBar_leftCircle_' + scroll.axis.name, style.circle, { width: 1, color: style.circle }, 1, this.thumbRectX, scroll.height / 2, 8); | ||
var option = new CircleOption(this.chartId + 'scrollBar_leftCircle_' + scroll.axis.name, style.circle, { width: 1, color: style.circle }, 1, this.thumbRectX, scroll.height / 2, 8); | ||
var scrollShadowEle = '<filter x="-25.0%" y="-20.0%" width="150.0%" height="150.0%" filterUnits="objectBoundingBox"' + | ||
@@ -136,9 +136,10 @@ 'id="scrollbar_shadow"><feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>' + | ||
var shadowGroup = renderer.createGroup({ | ||
id: scroll.axis.name + '_thumb_shadow' | ||
id: this.chartId + scroll.axis.name + '_thumb_shadow' | ||
}); | ||
shadowGroup.innerHTML = '<use fill="black" fill-opacity="1" filter="url(#scrollbar_shadow)" xlink:href="#' + 'scrollBar_leftCircle_' | ||
+ scroll.axis.name + '"></use><use fill="black" fill-opacity="1" filter="url(#scrollbar_shadow)" xlink:href="#' | ||
+ 'scrollBar_rightCircle_' + scroll.axis.name + '"></use>'; | ||
shadowGroup.innerHTML = '<use fill="black" fill-opacity="1" filter="url(#scrollbar_shadow)" xlink:href="#' + | ||
this.chartId + 'scrollBar_leftCircle_' + | ||
scroll.axis.name + '"></use><use fill="black" fill-opacity="1" filter="url(#scrollbar_shadow)" xlink:href="#' + | ||
this.chartId + 'scrollBar_rightCircle_' + scroll.axis.name + '"></use>'; | ||
this.leftCircleEle = renderer.drawCircle(option); | ||
option.id = 'scrollBar_rightCircle_' + scroll.axis.name; | ||
option.id = this.chartId + 'scrollBar_rightCircle_' + scroll.axis.name; | ||
option.cx = this.thumbRectX + this.thumbRectWidth; | ||
@@ -164,5 +165,5 @@ this.rightCircleEle = renderer.drawCircle(option); | ||
var style = scroll.scrollbarThemeStyle; | ||
var option = new CircleOption('scrollBar_gripCircle0' + '_' + scroll.axis.name, style.grip, { width: 1, color: style.grip }, 1, 0, 0, 1); | ||
var option = new CircleOption(this.chartId + 'scrollBar_gripCircle0' + '_' + scroll.axis.name, style.grip, { width: 1, color: style.grip }, 1, 0, 0, 1); | ||
this.gripCircle = renderer.createGroup({ | ||
id: 'scrollBar_gripCircle_' + scroll.axis.name, | ||
id: this.chartId + 'scrollBar_gripCircle_' + scroll.axis.name, | ||
transform: 'translate(' + ((this.thumbRectX + this.thumbRectWidth / 2) + ((scroll.isVertical ? 1 : -1) * padding)) + | ||
@@ -172,3 +173,3 @@ ',' + (scroll.isVertical ? '10' : '5') + ') rotate(' + (scroll.isVertical ? '180' : '0') + ')' | ||
for (var i = 1; i <= 6; i++) { | ||
option.id = 'scrollBar_gripCircle' + i + '_' + scroll.axis.name; | ||
option.id = this.chartId + 'scrollBar_gripCircle' + i + '_' + scroll.axis.name; | ||
option.cx = sidePadding; | ||
@@ -175,0 +176,0 @@ option.cy = topPadding; |
@@ -22,3 +22,3 @@ import { EventHandler, Browser, remove } from '@syncfusion/ej2-base'; | ||
this.elements = []; | ||
this.scrollElements = new ScrollElements(); | ||
this.scrollElements = new ScrollElements(component); | ||
this.axis = axis; | ||
@@ -48,3 +48,3 @@ this.mouseMoveListener = this.scrollMouseMove.bind(this); | ||
} | ||
var svgRect = getElement('scrollBar_svg' + this.axis.name).getBoundingClientRect(); | ||
var svgRect = getElement(this.component.element.id + '_scrollBar_svg' + this.axis.name).getBoundingClientRect(); | ||
this.mouseX = pageX - Math.max(svgRect.left, 0); | ||
@@ -213,3 +213,3 @@ this.mouseY = pageY - Math.max(svgRect.top, 0); | ||
ScrollBar.prototype.scrollMouseWheel = function (e) { | ||
var svgRect = getElement('scrollBar_svg' + this.axis.name).getBoundingClientRect(); | ||
var svgRect = getElement(this.component.element.id + '_scrollBar_svg' + this.axis.name).getBoundingClientRect(); | ||
this.mouseX = e.clientX - Math.max(svgRect.left, 0); | ||
@@ -420,4 +420,4 @@ this.mouseY = e.clientY - Math.max(svgRect.top, 0); | ||
ScrollBar.prototype.removeScrollSvg = function () { | ||
if (document.getElementById('scrollBar_svg' + this.axis.name)) { | ||
remove(document.getElementById('scrollBar_svg' + this.axis.name)); | ||
if (document.getElementById(this.component.element.id + '_scrollBar_svg' + this.axis.name)) { | ||
remove(document.getElementById(this.component.element.id + '_scrollBar_svg' + this.axis.name)); | ||
} | ||
@@ -424,0 +424,0 @@ }; |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
18004785
139057