@progress/kendo-charts 1.33.0-dev.202311231312 → 1.33.0-dev.202312010652

package/dist/es/chart/categorical-chart.js

@@ -335,7 +335,7 @@ var CategoricalChart = (function (ChartElement) {
             excluded: [
                 "data", "aggregate", "_events", "tooltip", "content", "template",
                 "visual", "toggle", "_outOfRangeMinPoint", "_outOfRangeMaxPoint",
-                "drilldownSeriesFactory", "ariaTemplate"
+                "drilldownSeriesFactory", "ariaTemplate", "ariaContent"
             ]
         };
 

package/dist/es/chart/chart.js

@@ -37,6 +37,7 @@ import './register-charts';
 
 var AXIS_NAMES = [ CATEGORY, VALUE, X, Y ];
 
+var MOUSEDOWN = "mousedown";
 var MOUSEMOVE = "mousemove";
 var CONTEXTMENU = "contextmenu";
 var MOUSELEAVE = "mouseleave";
@@ -570,6 +571,7 @@ var Chart = (function (Class) {
         this._keydownHandler = this._keydown.bind(this);
         this._focusHandler = this._focus.bind(this);
         this._blurHandler = this._blur.bind(this);
+        this._mousedownHandler = this._mousedown.bind(this);
         this._mousewheelHandler = this._mousewheel.bind(this);
         this._mouseleaveHandler = this._mouseleave.bind(this);
         this._surfaceMouseenterHandler = this._mouseover.bind(this);
@@ -639,7 +641,7 @@ var Chart = (function (Class) {
 
         this._touchAction = element.style.touchAction;
 
-        bindEvents(element, ( obj = {}, obj[ CONTEXTMENU ] = this._clickHandler, obj[ MOUSEWHEEL ] = this._mousewheelHandler, obj[ MOUSELEAVE ] = this._mouseleaveHandler, obj[ KEYDOWN ] = this._keydownHandler, obj[ FOCUS ] = this._focusHandler, obj[ BLUR] = this._blurHandler, obj ));
+        bindEvents(element, ( obj = {}, obj[ CONTEXTMENU ] = this._clickHandler, obj[ MOUSEWHEEL ] = this._mousewheelHandler, obj[ MOUSELEAVE ] = this._mouseleaveHandler, obj[ KEYDOWN ] = this._keydownHandler, obj[ MOUSEDOWN ] = this._mousedownHandler, obj[ FOCUS ] = this._focusHandler, obj[ BLUR] = this._blurHandler, obj ));
 
         if (this._shouldAttachMouseMove()) {
             bindEvents(element, ( obj$1 = {}, obj$1[ MOUSEMOVE ] = this._mousemove, obj$1 ));
@@ -1115,6 +1117,8 @@ var Chart = (function (Class) {
                 this._focusFirstPoint();
             }
         }
+
+        this._preventInitialPointFocus = false;
     };
 
     Chart.prototype._keydown = function _keydown (e) {
@@ -1229,11 +1233,20 @@ var Chart = (function (Class) {
         }
     };
 
+    Chart.prototype._hasFocus = function _hasFocus () {
+        return this.element.ownerDocument.activeElement === this.element;
+    };
+
+    Chart.prototype._mousedown = function _mousedown () {
+        if (!this._hasFocus()) {
+            this._preventInitialPointFocus = true;
+        }
+    };
+
     Chart.prototype._focusChart = function _focusChart () {
-        if (document.activeElement !== this.element) {
+        if (!this._hasFocus()) {
             this._preventInitialPointFocus = true;
             this.element.focus();
-            this._preventInitialPointFocus = false;
         }
     };
 

package/dist/es/chart/funnel-chart/funnel-chart.js

@@ -87,7 +87,10 @@ var FunnelChart = (function (ChartElement) {
             series: series,
             dataItem: fields.dataItem,
             index: fields.index
-        }, { defaults: series._defaults, excluded: [ "data", "content", "template", "toggle", "visual", "ariaTemplate" ] });
+        }, { defaults: series._defaults, excluded: [
+            "data", "content", "template", "toggle", "visual",
+            "ariaTemplate", "ariaContent"
+        ] });
     };
 
     FunnelChart.prototype.createSegment = function createSegment (value, fields) {

package/dist/es/chart/heatmap-chart/heatmap-chart.js

@@ -72,7 +72,7 @@ var HeatmapChart = (function (ChartElement) {
             excluded: [
                 "data", "tooltip", "content", "template",
                 "visual", "toggle", "drilldownSeriesFactory",
-                "ariaTemplate"
+                "ariaTemplate", "ariaContent"
             ]
         };
 

package/dist/es/chart/line-chart/line-point.js

@@ -7,8 +7,7 @@ import NoteMixin from '../mixins/note-mixin';
 import { LINE_MARKER_SIZE, FADEIN, INITIAL_ANIMATION_DURATION, BORDER_BRIGHTNESS, TOOLTIP_OFFSET, ABOVE, BELOW, CHART_POINT_ROLE, CHART_POINT_CLASSNAME, CHART_POINT_ROLE_DESCRIPTION } from '../constants';
 
 import { WHITE, CIRCLE, CENTER, TOP, BOTTOM, LEFT, HIGHLIGHT_ZINDEX } from '../../common/constants';
-import { deepExtend, defined, getTemplate, valueOrDefault, getSpacing } from '../../common';
-import TemplateService from '../../services/template-service';
+import { deepExtend, defined, getTemplate, getAriaTemplate, valueOrDefault, getSpacing } from '../../common';
 import guid from '../../core/utils/guid';
 
 var LinePoint = (function (ChartElement) {
@@ -87,9 +86,10 @@ var LinePoint = (function (ChartElement) {
 
     LinePoint.prototype.getAriaLabelText = function getAriaLabelText () {
         var labels = this.options.labels;
+        var ariaTemplate = getAriaTemplate(labels);
 
-        if (labels.ariaTemplate) {
-            return TemplateService.compile(labels.ariaTemplate)(this.pointData());
+        if (ariaTemplate) {
+            return ariaTemplate(this.pointData());
         }
 
         return this.getLabelText(labels);

package/dist/es/chart/mixins/accessibility-attributes-mixin.js

@@ -1,7 +1,6 @@
 import addAccessibilityAttributesToVisual from "../../core/utils/add-accessibility-attributes-to-visual";
-import { deepExtend } from "../../common";
+import { deepExtend, getAriaTemplate } from "../../common";
 import guid from '../../core/utils/guid';
-import TemplateService from "../../services/template-service";
 
 var AccessibilityAttributesMixin = {
     addAccessibilityAttributesToVisual: function() {
@@ -12,9 +11,10 @@ var AccessibilityAttributesMixin = {
 
     getAriaLabelText: function getAriaLabelText() {
         var labels = this.options.labels;
+        var ariaTemplate = getAriaTemplate(labels);
 
-        if (labels.ariaTemplate) {
-            return TemplateService.compile(labels.ariaTemplate)(this.pointData());
+        if (ariaTemplate) {
+            return ariaTemplate(this.pointData());
         }
 
         return this.getLabelText(labels);
@@ -33,4 +33,4 @@ var AccessibilityAttributesMixin = {
     }
 };
 
-export default AccessibilityAttributesMixin;
+export default AccessibilityAttributesMixin;

package/dist/es/chart/pie-chart/pie-chart.js

@@ -114,7 +114,10 @@ var PieChart = (function (ChartElement) {
             dataItem: fields.dataItem,
             category: fields.category,
             percentage: fields.percentage
-        }, { defaults: series._defaults, excluded: [ "data", "content", "template", "visual", "toggle", "ariaTemplate" ] });
+        }, { defaults: series._defaults, excluded: [
+            "data", "content", "template", "visual", "toggle",
+            "ariaTemplate", "ariaContent"
+        ] });
     };
 
     PieChart.prototype.addValue = function addValue (value, sector, fields) {

package/dist/es/chart/scatter-charts/scatter-chart.js

@@ -172,7 +172,7 @@ var ScatterChart = (function (ChartElement) {
             excluded: [
                 "data", "tooltip", "content", "template", "visual", "toggle",
                 "_outOfRangeMinPoint", "_outOfRangeMaxPoint",
-                "drilldownSeriesFactory", "ariaTemplate"
+                "drilldownSeriesFactory", "ariaTemplate", "ariaContent"
             ]
         };
 

package/dist/es/common/get-aria-template.js

@@ -0,0 +1,15 @@
+import TemplateService from '../services/template-service';
+import isFunction from './is-function';
+
+export default function getTemplate(options) {
+    if ( options === void 0 ) options = {};
+
+    var ariaTemplate;
+    if (options.ariaTemplate) {
+        options.ariaTemplate = ariaTemplate = TemplateService.compile(options.ariaTemplate);
+    } else if (isFunction(options.ariaContent)) {
+        ariaTemplate = options.ariaContent;
+    }
+
+    return ariaTemplate;
+}

package/dist/es/common.js

@@ -10,6 +10,7 @@ export { default as deepExtend } from './common/deep-extend';
 export { default as elementStyles } from './common/element-styles';
 export { default as getSpacing } from './common/get-spacing';
 export { default as getTemplate } from './common/get-template';
+export { default as getAriaTemplate } from './common/get-aria-template';
 export { default as getter } from './common/getter';
 export { default as grep } from './common/grep';
 export { default as hasClasses } from './common/has-classes';

package/dist/es2015/chart/categorical-chart.js

@@ -316,7 +316,7 @@ class CategoricalChart extends ChartElement {
             excluded: [
                 "data", "aggregate", "_events", "tooltip", "content", "template",
                 "visual", "toggle", "_outOfRangeMinPoint", "_outOfRangeMaxPoint",
-                "drilldownSeriesFactory", "ariaTemplate"
+                "drilldownSeriesFactory", "ariaTemplate", "ariaContent"
             ]
         };
 

package/dist/es2015/chart/chart.js

@@ -37,6 +37,7 @@ import './register-charts';
 
 const AXIS_NAMES = [ CATEGORY, VALUE, X, Y ];
 
+const MOUSEDOWN = "mousedown";
 const MOUSEMOVE = "mousemove";
 const CONTEXTMENU = "contextmenu";
 const MOUSELEAVE = "mouseleave";
@@ -557,6 +558,7 @@ class Chart extends Class {
         this._keydownHandler = this._keydown.bind(this);
         this._focusHandler = this._focus.bind(this);
         this._blurHandler = this._blur.bind(this);
+        this._mousedownHandler = this._mousedown.bind(this);
         this._mousewheelHandler = this._mousewheel.bind(this);
         this._mouseleaveHandler = this._mouseleave.bind(this);
         this._surfaceMouseenterHandler = this._mouseover.bind(this);
@@ -627,6 +629,7 @@ class Chart extends Class {
             [ MOUSEWHEEL ]: this._mousewheelHandler,
             [ MOUSELEAVE ]: this._mouseleaveHandler,
             [ KEYDOWN ]: this._keydownHandler,
+            [ MOUSEDOWN ]: this._mousedownHandler,
             [ FOCUS ]: this._focusHandler,
             [ BLUR]: this._blurHandler
         });
@@ -1093,6 +1096,8 @@ class Chart extends Class {
                 this._focusFirstPoint();
             }
         }
+
+        this._preventInitialPointFocus = false;
     }
 
     _keydown(e) {
@@ -1197,11 +1202,20 @@ class Chart extends Class {
         }
     }
 
+    _hasFocus() {
+        return this.element.ownerDocument.activeElement === this.element;
+    }
+
+    _mousedown() {
+        if (!this._hasFocus()) {
+            this._preventInitialPointFocus = true;
+        }
+    }
+
     _focusChart() {
-        if (document.activeElement !== this.element) {
+        if (!this._hasFocus()) {
             this._preventInitialPointFocus = true;
             this.element.focus();
-            this._preventInitialPointFocus = false;
         }
     }
 

package/dist/es2015/chart/funnel-chart/funnel-chart.js

@@ -77,7 +77,10 @@ class FunnelChart extends ChartElement {
             series: series,
             dataItem: fields.dataItem,
             index: fields.index
-        }, { defaults: series._defaults, excluded: [ "data", "content", "template", "toggle", "visual", "ariaTemplate" ] });
+        }, { defaults: series._defaults, excluded: [
+            "data", "content", "template", "toggle", "visual",
+            "ariaTemplate", "ariaContent"
+        ] });
     }
 
     createSegment(value, fields) {

package/dist/es2015/chart/heatmap-chart/heatmap-chart.js

@@ -63,7 +63,7 @@ class HeatmapChart extends ChartElement {
             excluded: [
                 "data", "tooltip", "content", "template",
                 "visual", "toggle", "drilldownSeriesFactory",
-                "ariaTemplate"
+                "ariaTemplate", "ariaContent"
             ]
         };
 

package/dist/es2015/chart/line-chart/line-point.js

@@ -7,8 +7,7 @@ import NoteMixin from '../mixins/note-mixin';
 import { LINE_MARKER_SIZE, FADEIN, INITIAL_ANIMATION_DURATION, BORDER_BRIGHTNESS, TOOLTIP_OFFSET, ABOVE, BELOW, CHART_POINT_ROLE, CHART_POINT_CLASSNAME, CHART_POINT_ROLE_DESCRIPTION } from '../constants';
 
 import { WHITE, CIRCLE, CENTER, TOP, BOTTOM, LEFT, HIGHLIGHT_ZINDEX } from '../../common/constants';
-import { deepExtend, defined, getTemplate, valueOrDefault, getSpacing } from '../../common';
-import TemplateService from '../../services/template-service';
+import { deepExtend, defined, getTemplate, getAriaTemplate, valueOrDefault, getSpacing } from '../../common';
 import guid from '../../core/utils/guid';
 
 class LinePoint extends ChartElement {
@@ -82,9 +81,10 @@ class LinePoint extends ChartElement {
 
     getAriaLabelText() {
         const labels = this.options.labels;
+        const ariaTemplate = getAriaTemplate(labels);
 
-        if (labels.ariaTemplate) {
-            return TemplateService.compile(labels.ariaTemplate)(this.pointData());
+        if (ariaTemplate) {
+            return ariaTemplate(this.pointData());
         }
 
         return this.getLabelText(labels);

package/dist/es2015/chart/mixins/accessibility-attributes-mixin.js

@@ -1,7 +1,6 @@
 import addAccessibilityAttributesToVisual from "../../core/utils/add-accessibility-attributes-to-visual";
-import { deepExtend } from "../../common";
+import { deepExtend, getAriaTemplate } from "../../common";
 import guid from '../../core/utils/guid';
-import TemplateService from "../../services/template-service";
 
 const AccessibilityAttributesMixin = {
     addAccessibilityAttributesToVisual: function() {
@@ -12,9 +11,10 @@ const AccessibilityAttributesMixin = {
 
     getAriaLabelText() {
         const labels = this.options.labels;
+        const ariaTemplate = getAriaTemplate(labels);
 
-        if (labels.ariaTemplate) {
-            return TemplateService.compile(labels.ariaTemplate)(this.pointData());
+        if (ariaTemplate) {
+            return ariaTemplate(this.pointData());
         }
 
         return this.getLabelText(labels);
@@ -33,4 +33,4 @@ const AccessibilityAttributesMixin = {
     }
 };
 
-export default AccessibilityAttributesMixin;
+export default AccessibilityAttributesMixin;

package/dist/es2015/chart/pie-chart/pie-chart.js

@@ -101,7 +101,10 @@ class PieChart extends ChartElement {
             dataItem: fields.dataItem,
             category: fields.category,
             percentage: fields.percentage
-        }, { defaults: series._defaults, excluded: [ "data", "content", "template", "visual", "toggle", "ariaTemplate" ] });
+        }, { defaults: series._defaults, excluded: [
+            "data", "content", "template", "visual", "toggle",
+            "ariaTemplate", "ariaContent"
+        ] });
     }
 
     addValue(value, sector, fields) {

package/dist/es2015/chart/scatter-charts/scatter-chart.js

@@ -161,7 +161,7 @@ class ScatterChart extends ChartElement {
             excluded: [
                 "data", "tooltip", "content", "template", "visual", "toggle",
                 "_outOfRangeMinPoint", "_outOfRangeMaxPoint",
-                "drilldownSeriesFactory", "ariaTemplate"
+                "drilldownSeriesFactory", "ariaTemplate", "ariaContent"
             ]
         };
 

package/dist/es2015/common/get-aria-template.js

@@ -0,0 +1,13 @@
+import TemplateService from '../services/template-service';
+import isFunction from './is-function';
+
+export default function getTemplate(options = {}) {
+    let ariaTemplate;
+    if (options.ariaTemplate) {
+        options.ariaTemplate = ariaTemplate = TemplateService.compile(options.ariaTemplate);
+    } else if (isFunction(options.ariaContent)) {
+        ariaTemplate = options.ariaContent;
+    }
+
+    return ariaTemplate;
+}

package/dist/es2015/common.js

@@ -10,6 +10,7 @@ export { default as deepExtend } from './common/deep-extend';
 export { default as elementStyles } from './common/element-styles';
 export { default as getSpacing } from './common/get-spacing';
 export { default as getTemplate } from './common/get-template';
+export { default as getAriaTemplate } from './common/get-aria-template';
 export { default as getter } from './common/getter';
 export { default as grep } from './common/grep';
 export { default as hasClasses } from './common/has-classes';