@datarailsshared/dr_renderer 1.2.306-dragons → 1.2.307-dragons

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.306-dragons",
+  "version": "1.2.307-dragons",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/dr_pivottable.js

@@ -105,11 +105,16 @@ let initDRPivotTable = function($, window, document) {
             return function(a, b) {
                 var comparison, i, sorter;
                 for (i in sortersArr) {
-                    sorter = sortersArr[i];
-                    if (sortByValueAttrs.indexOf(attrs[parseInt(i)]) !== -1) {
-                        comparison = sorter(a.slice(0, parseInt(i) + 1).join(','), b.slice(0, parseInt(i) + 1).join(','));
+                    const index = parseInt(i);
+                    sorter = sortersArr[index];
+                    if (sortByValueAttrs.indexOf(attrs[index]) !== -1) {
+
+                        // For case current Field attrs[index] is sorted by value we are concatenating values passed to sorter function
+                        // Concatenation is done from first field in a block (first axis or first series) until current field index.
+                        // Cause for this case sorting will be as list of these concatenated strings (which is prepared in getSortingByValueOrderList)
+                        comparison = sorter(a.slice(0, index + 1).join(','), b.slice(0, index + 1).join(','));
                     } else {
-                        comparison = sorter(a[i], b[i]);
+                        comparison = sorter(a[index], b[index]);
                     }
                     if (comparison !== 0) {
                         return comparison;

package/src/highcharts_renderer.js

@@ -4442,7 +4442,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
             }
 
-            if (typeof valueForComparison !== 'undefined') {
+            if (!lodash.isNil(valueForComparison)) {
                 if (sortingOptions && sortingOptions.is_absolute && !isNaN(parseFloat(valueForComparison))) {
                     valueForComparison = Math.abs(valueForComparison);
                 }