@datarailsshared/dr_renderer 1.5.90 → 1.5.94

package/package.json

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

package/src/highcharts_renderer.js

@@ -9536,7 +9536,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 lodash.forEach(values, (value, key) => {
                     const formatInfo = pivotData[type][key] || {};
                     const valueToFloat = parseFloat(value);
-                    const isDate = formatInfo.type === 'Date' && (moment_lib(valueToFloat).isValid() || moment_lib(value).isValid());
+                    const isDate = formatInfo.type === 'Date' && (moment_lib(valueToFloat).isValid() || moment_lib(value, formatInfo.format).isValid());
                     const isDateFormatting = isDate && highchartsRenderer.isFormattingDatesAsOtherAxisTypes();
                     const isNumberFormatting = !isDate && formatInfo.format && highchartsRenderer.isFormattingNumberAxis(pivotData);
 

package/tests/highcharts_renderer.test.js

@@ -5160,6 +5160,17 @@ describe('highcharts_renderer', () => {
                 const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
                 expect(formattedKey).toEqual(initialKey);
             });
+
+            it('should return formatted value when type is Date and value is a valid moment date (with valid format)', () => {
+                const initialKey = ['Q4-20'];
+                const pivotData = {
+                    colFormats: [{ format: "[Q]Q-YY", name: "Date", type: "Date" }],
+                    isFormattingAxisLabels: true,
+                };
+                const type = 'colFormats';
+                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
+                expect(formattedKey).toEqual(initialKey);
+            });
         });
     });