@redsift/charts 11.0.0 → 11.0.1

package/index.js

@@ -2120,21 +2120,23 @@ const RenderedLinearBarChart = /*#__PURE__*/forwardRef((props, ref) => {
     if (xScaleType === 'number') {
       if (currentKeyA < currentKeyB) return -1;
       if (currentKeyA > currentKeyB) return 1;
-      return hasCategory ? a.key[1] < b.key[1] ? 1 : -1 : 0;
     } else if (xScaleType === 'dateString') {
       if (Date.parse(currentKeyA) < Date.parse(currentKeyB)) return -1;
       if (Date.parse(currentKeyA) > Date.parse(currentKeyB)) return 1;
-      return hasCategory ? a.key[1] < b.key[1] ? 1 : -1 : 0;
     } else if (xScaleType === 'Date') {
       if (currentKeyA.valueOf() < currentKeyB.valueOf()) return -1;
       if (currentKeyA.valueOf() > currentKeyB.valueOf()) return 1;
-      return hasCategory ? a.key[1] < b.key[1] ? 1 : -1 : 0;
     } else if (xScaleType === 'string' && xAxisTickValues && Array.isArray(xAxisTickValues)) {
       if (xAxisTickValues.indexOf(currentKeyA) < xAxisTickValues.indexOf(currentKeyB)) return -1;
       if (xAxisTickValues.indexOf(currentKeyA) > xAxisTickValues.indexOf(currentKeyB)) return 1;
-      return hasCategory ? a.key[1] < b.key[1] ? 1 : -1 : 0;
     }
-    return hasCategory ? a.key[1] < b.key[1] ? 1 : -1 : 0;
+    return hasCategory ? getSortingMethod(sortingMethod !== null && sortingMethod !== void 0 ? sortingMethod : 'asc-key')({
+      key: a.key[1],
+      value: a.value
+    }, {
+      key: b.key[1],
+      value: b.value
+    }) : 0;
   }), d => d.value !== null), (previousValue, currentValue, currentIndex) => {
     var _key$;
     const currentKeyD = hasCategory ? currentValue.key[0] : currentValue.key;
@@ -2164,7 +2166,7 @@ const RenderedLinearBarChart = /*#__PURE__*/forwardRef((props, ref) => {
     const minimalGap = Math.min(...bars.map((bar, i) => i > 0 ? Math.abs(bar.key - bars[i - 1].key) : undefined).filter(k => k)) * 0.9;
     barWidth = Math.min(barWidth, chartWidth / ((scaleX.domain()[1] - scaleX.domain()[0]) / minimalGap), chartWidth / (xAxisTickValues && typeof xAxisTickValues !== 'string' ? typeof xAxisTickValues === 'number' ? xAxisTickValues : Array.isArray(xAxisTickValues) ? xAxisTickValues.length : xAxisTickValues.range(scaleX.domain()[0], scaleX.domain()[1]).length : 1));
   }
-  const categories = [];
+  const categories = sortingMethod && Array.isArray(sortingMethod) ? sortingMethod : [];
   const pivotedTable = bars.reduce((acc, item) => {
     const {
       key,