@progress/kendo-charts 2.3.0-dev.202403191229 → 2.3.0-dev.202403211054

package/dist/es/sankey/legend.js

@@ -5,6 +5,13 @@ import { nodeColor } from "./node";
 import { BOTTOM, CENTER, POINTER } from "../common/constants";
 import { AREA } from "../chart/constants";
 
+var sortData = function (a, b) {
+    if (a.node.x0 - b.node.x0 !== 0) {
+        return a.node.x0 - b.node.x0;
+    }
+    return a.node.y0 - b.node.y0;
+};
+
 export var Legend = (function (SankeyElement) {
     function Legend () {
         SankeyElement.apply(this, arguments);
@@ -30,6 +37,8 @@ export var Legend = (function (SankeyElement) {
             node: node,
         }); });
 
+        data.sort(sortData);
+
         var legend = new ChartLegend(Object.assign({}, options, {data: data}));
         legend.reflow(drawingRect);
 

package/dist/es/sankey/node.js

@@ -28,6 +28,10 @@ export var Node = (function (SankeyElement) {
                 opacity: options.opacity
             },
             stroke: { width: 0 },
+            className: 'k-sankey-node',
+            role: 'graphics-symbol',
+            ariaRoleDescription: 'Node',
+            ariaLabel: options.node.label.text
         };
     };
 

package/dist/es/sankey/sankey.js

@@ -19,9 +19,9 @@ export var Sankey = (function (Observable) {
     function Sankey(element, options, theme) {
         Observable.call(this);
 
-        this._initElement(element);
         this._initTheme(theme);
         this._setOptions(options);
+        this._initElement(element);
         this._initSurface();
 
         if (options && options.data) {
@@ -43,7 +43,16 @@ export var Sankey = (function (Observable) {
 
     Sankey.prototype._initElement = function _initElement (element) {
         this.element = element;
-        addClass(this.element, [ "k-chart", "k-sankey" ]);
+        addClass(element, [ "k-chart", "k-sankey" ]);
+        element.setAttribute('role', 'graphics-document');
+        element.tabIndex = element.getAttribute("tabindex") || 0;
+
+        var ref = this.options;
+        var title = ref.title;
+
+        if (title.text) {
+            element.setAttribute('aria-label', title.text);
+        }
     };
 
     Sankey.prototype._initSurface = function _initSurface () {
@@ -81,6 +90,7 @@ export var Sankey = (function (Observable) {
             mouseenter: this._mouseenter.bind(this),
             mouseleave: this._mouseleave.bind(this),
             mousemove: this._mousemove.bind(this),
+            click: this._click.bind(this)
         });
     };
 
@@ -105,6 +115,7 @@ export var Sankey = (function (Observable) {
     Sankey.prototype.trigger = function trigger (name, ev) {
         var event = Object.assign({}, ev,
             {type: name,
+            targetType: ev.element.type,
             dataItem: ev.element.dataItem});
 
         return Observable.prototype.trigger.call(this, name, event);
@@ -218,6 +229,18 @@ export var Sankey = (function (Observable) {
         }, delay);
     };
 
+    Sankey.prototype._click = function _click (ev) {
+        var element = ev.element;
+        var isLink = element.type === LINK;
+        var isNode = element.type === NODE;
+
+        if (isNode) {
+            this.trigger('nodeClick', ev);
+        } else if (isLink) {
+            this.trigger('linkClick', ev);
+        }
+    };
+
     Sankey.prototype.highlightLinks = function highlightLinks (node, highlight) {
         var this$1 = this;
 
@@ -466,12 +489,6 @@ export var Sankey = (function (Observable) {
             visual.append(titleVisual);
         }
 
-        if (legendBox) {
-            var legendElement = new Legend(Object.assign({}, legend, {drawingRect: legendBox, nodes: nodes, colors: nodesColors}));
-            var legendVisual = legendElement.exportVisual();
-            visual.append(legendVisual);
-        }
-
         var visualNodes = new Map();
         sankeyContext.nodesVisuals = visualNodes;
 
@@ -532,6 +549,12 @@ export var Sankey = (function (Observable) {
             }
         });
 
+        if (legendBox) {
+            var legendElement = new Legend(Object.assign({}, legend, {drawingRect: legendBox, nodes: nodes, colors: nodesColors}));
+            var legendVisual = legendElement.exportVisual();
+            visual.append(legendVisual);
+        }
+
         return visual;
     };
 

package/dist/es2015/sankey/legend.js

@@ -5,6 +5,13 @@ import { nodeColor } from "./node";
 import { BOTTOM, CENTER, POINTER } from "../common/constants";
 import { AREA } from "../chart/constants";
 
+const sortData = (a, b) => {
+    if (a.node.x0 - b.node.x0 !== 0) {
+        return a.node.x0 - b.node.x0;
+    }
+    return a.node.y0 - b.node.y0;
+};
+
 export class Legend extends SankeyElement {
     getElement() {
         const options = this.options;
@@ -20,6 +27,8 @@ export class Legend extends SankeyElement {
             node: node,
         }));
 
+        data.sort(sortData);
+
         const legend = new ChartLegend(Object.assign({}, options, {data}));
         legend.reflow(drawingRect);
 

package/dist/es2015/sankey/node.js

@@ -20,6 +20,10 @@ export class Node extends SankeyElement {
                 opacity: options.opacity
             },
             stroke: { width: 0 },
+            className: 'k-sankey-node',
+            role: 'graphics-symbol',
+            ariaRoleDescription: 'Node',
+            ariaLabel: options.node.label.text
         };
     }
 }

package/dist/es2015/sankey/sankey.js

@@ -19,9 +19,9 @@ export class Sankey extends Observable {
     constructor(element, options, theme) {
         super();
 
-        this._initElement(element);
         this._initTheme(theme);
         this._setOptions(options);
+        this._initElement(element);
         this._initSurface();
 
         if (options && options.data) {
@@ -39,7 +39,15 @@ export class Sankey extends Observable {
 
     _initElement(element) {
         this.element = element;
-        addClass(this.element, [ "k-chart", "k-sankey" ]);
+        addClass(element, [ "k-chart", "k-sankey" ]);
+        element.setAttribute('role', 'graphics-document');
+        element.tabIndex = element.getAttribute("tabindex") || 0;
+
+        const { title } = this.options;
+
+        if (title.text) {
+            element.setAttribute('aria-label', title.text);
+        }
     }
 
     _initSurface() {
@@ -73,6 +81,7 @@ export class Sankey extends Observable {
             mouseenter: this._mouseenter.bind(this),
             mouseleave: this._mouseleave.bind(this),
             mousemove: this._mousemove.bind(this),
+            click: this._click.bind(this)
         });
     }
 
@@ -95,6 +104,7 @@ export class Sankey extends Observable {
     trigger(name, ev) {
         const event = Object.assign({}, ev,
             {type: name,
+            targetType: ev.element.type,
             dataItem: ev.element.dataItem});
 
         return super.trigger(name, event);
@@ -200,6 +210,18 @@ export class Sankey extends Observable {
         }, delay);
     }
 
+    _click(ev) {
+        const element = ev.element;
+        const isLink = element.type === LINK;
+        const isNode = element.type === NODE;
+
+        if (isNode) {
+            this.trigger('nodeClick', ev);
+        } else if (isLink) {
+            this.trigger('linkClick', ev);
+        }
+    }
+
     highlightLinks(node, highlight) {
         if (node) {
             this.setLinksOpacity(highlight.inactiveOpacity);
@@ -426,12 +448,6 @@ export class Sankey extends Observable {
             visual.append(titleVisual);
         }
 
-        if (legendBox) {
-            const legendElement = new Legend(Object.assign({}, legend, {drawingRect: legendBox, nodes, colors: nodesColors}));
-            const legendVisual = legendElement.exportVisual();
-            visual.append(legendVisual);
-        }
-
         const visualNodes = new Map();
         sankeyContext.nodesVisuals = visualNodes;
 
@@ -491,6 +507,12 @@ export class Sankey extends Observable {
             }
         });
 
+        if (legendBox) {
+            const legendElement = new Legend(Object.assign({}, legend, {drawingRect: legendBox, nodes, colors: nodesColors}));
+            const legendVisual = legendElement.exportVisual();
+            visual.append(legendVisual);
+        }
+
         return visual;
     }