@fluentui/react-charting 5.24.27 → 5.24.29

package/lib/components/DeclarativeChart/PlotlySchemaAdapter.js

@@ -1068,6 +1068,17 @@ var formatValue = function (value, colIndex, cells) {
     }
     return "".concat(prefix !== null && prefix !== void 0 ? prefix : '').concat(formatted).concat(suffix !== null && suffix !== void 0 ? suffix : '');
 };
+function resolveCellStyle(raw, rowIndex, colIndex) {
+    var _a, _b;
+    if (Array.isArray(raw)) {
+        var rowEntry = (_a = raw[colIndex]) !== null && _a !== void 0 ? _a : raw[0];
+        if (Array.isArray(rowEntry)) {
+            return (_b = rowEntry[rowIndex]) !== null && _b !== void 0 ? _b : rowEntry[0];
+        }
+        return rowEntry;
+    }
+    return raw;
+}
 export var transformPlotlyJsonToChartTableProps = function (input, isMultiPlot, colorMap, colorwayType, isDarkTheme) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     var tableData = input.data[0];
@@ -1081,41 +1092,13 @@ export var transformPlotlyJsonToChartTableProps = function (input, isMultiPlot,
             })
             : values.map(function (cell) { return cleanText(cell); });
         return cleanedValues.map(function (value, colIndex) {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            var fontColorRaw = (_a = header === null || header === void 0 ? void 0 : header.font) === null || _a === void 0 ? void 0 : _a.color;
-            var fontColor;
-            if (Array.isArray(fontColorRaw)) {
-                var colorEntry = (_b = fontColorRaw[colIndex]) !== null && _b !== void 0 ? _b : fontColorRaw[0];
-                if (Array.isArray(colorEntry)) {
-                    fontColor = typeof colorEntry[0] === 'string' ? colorEntry[0] : undefined;
-                }
-                else if (typeof colorEntry === 'string') {
-                    fontColor = colorEntry;
-                }
-            }
-            else if (typeof fontColorRaw === 'string') {
-                fontColor = fontColorRaw;
-            }
-            var fontSizeRaw = (_c = header === null || header === void 0 ? void 0 : header.font) === null || _c === void 0 ? void 0 : _c.size;
-            var fontSize;
-            if (Array.isArray(fontSizeRaw)) {
-                var fontSizeEntry = (_d = fontSizeRaw[colIndex]) !== null && _d !== void 0 ? _d : fontSizeRaw[0];
-                fontSize = Array.isArray(fontSizeRaw[0])
-                    ? (_e = fontSizeRaw[0][colIndex]) !== null && _e !== void 0 ? _e : fontSizeRaw[0][0]
-                    : typeof fontSizeEntry === 'number'
-                        ? fontSizeEntry
-                        : undefined;
-            }
-            else if (typeof fontSizeRaw === 'number') {
-                fontSize = fontSizeRaw;
-            }
-            var updatedColIndex = colIndex >= 1 ? 1 : 0;
-            var fillColorRaw = (_f = header === null || header === void 0 ? void 0 : header.fill) === null || _f === void 0 ? void 0 : _f.color;
-            var backgroundColor = Array.isArray(fillColorRaw)
-                ? (_g = fillColorRaw[updatedColIndex]) !== null && _g !== void 0 ? _g : fillColorRaw[0]
-                : fillColorRaw;
-            var textAlignRaw = header === null || header === void 0 ? void 0 : header.align;
-            var textAlign = Array.isArray(textAlignRaw) ? (_h = textAlignRaw[colIndex]) !== null && _h !== void 0 ? _h : textAlignRaw[0] : textAlignRaw;
+            var _a, _b, _c;
+            //headers are at first row only
+            var rowIndex = 0;
+            var fontColor = resolveCellStyle((_a = header === null || header === void 0 ? void 0 : header.font) === null || _a === void 0 ? void 0 : _a.color, rowIndex, colIndex);
+            var fontSize = resolveCellStyle((_b = header === null || header === void 0 ? void 0 : header.font) === null || _b === void 0 ? void 0 : _b.size, rowIndex, colIndex);
+            var backgroundColor = resolveCellStyle((_c = header === null || header === void 0 ? void 0 : header.fill) === null || _c === void 0 ? void 0 : _c.color, rowIndex, colIndex);
+            var textAlign = resolveCellStyle(header === null || header === void 0 ? void 0 : header.align, rowIndex, colIndex);
             var style = __assign(__assign(__assign(__assign({}, (typeof fontColor === 'string' ? { color: fontColor } : {})), (typeof fontSize === 'number' ? { fontSize: fontSize } : {})), (typeof backgroundColor === 'string' ? { backgroundColor: backgroundColor } : {})), (textAlign ? { textAlign: textAlign } : {}));
             return { value: value, style: style };
         });
@@ -1126,45 +1109,16 @@ export var transformPlotlyJsonToChartTableProps = function (input, isMultiPlot,
         : (_g = (_f = (_e = (_d = (_c = input.layout) === null || _c === void 0 ? void 0 : _c.template) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.table) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.cells;
     var rows = columns[0].map(function (_, rowIndex) {
         return columns.map(function (col, colIndex) {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c;
             var cellValue = col[rowIndex];
             var cleanValue = typeof cellValue === 'string' ? cleanText(cellValue) : cellValue;
             var formattedValue = typeof cleanValue === 'string' || typeof cleanValue === 'number'
                 ? formatValue(cleanValue, colIndex, cells)
                 : cleanValue;
-            var rawFontColor = (_a = cells === null || cells === void 0 ? void 0 : cells.font) === null || _a === void 0 ? void 0 : _a.color;
-            var fontColor;
-            if (Array.isArray(rawFontColor)) {
-                var entry = (_b = rawFontColor[colIndex]) !== null && _b !== void 0 ? _b : rawFontColor[0];
-                var colorValue = Array.isArray(entry) ? entry[rowIndex] : entry;
-                fontColor = typeof colorValue === 'string' ? colorValue : undefined;
-            }
-            else if (typeof rawFontColor === 'string') {
-                fontColor = rawFontColor;
-            }
-            var rawFontSize = (_c = cells === null || cells === void 0 ? void 0 : cells.font) === null || _c === void 0 ? void 0 : _c.size;
-            var fontSize;
-            if (Array.isArray(rawFontSize)) {
-                var entry = (_d = rawFontSize[colIndex]) !== null && _d !== void 0 ? _d : rawFontSize[0];
-                var fontSizeValue = Array.isArray(entry) ? entry[rowIndex] : entry;
-                fontSize = typeof fontSizeValue === 'number' ? fontSizeValue : undefined;
-            }
-            else if (typeof rawFontSize === 'number') {
-                fontSize = rawFontSize;
-            }
-            var updatedColIndex = colIndex >= 1 ? 1 : 0;
-            var rawBackgroundColor = (_e = cells === null || cells === void 0 ? void 0 : cells.fill) === null || _e === void 0 ? void 0 : _e.color;
-            var backgroundColor;
-            if (Array.isArray(rawBackgroundColor)) {
-                var entry = (_f = rawBackgroundColor[updatedColIndex]) !== null && _f !== void 0 ? _f : rawBackgroundColor[0];
-                var colorValue = Array.isArray(entry) ? entry[rowIndex] : entry;
-                backgroundColor = typeof colorValue === 'string' ? colorValue : undefined;
-            }
-            else if (typeof rawBackgroundColor === 'string') {
-                backgroundColor = rawBackgroundColor;
-            }
-            var rawTextAlign = Array.isArray(cells === null || cells === void 0 ? void 0 : cells.align) ? (_g = cells.align[colIndex]) !== null && _g !== void 0 ? _g : cells.align[0] : cells === null || cells === void 0 ? void 0 : cells.align;
-            var textAlign = rawTextAlign;
+            var fontColor = resolveCellStyle((_a = cells === null || cells === void 0 ? void 0 : cells.font) === null || _a === void 0 ? void 0 : _a.color, rowIndex, colIndex);
+            var fontSize = resolveCellStyle((_b = cells === null || cells === void 0 ? void 0 : cells.font) === null || _b === void 0 ? void 0 : _b.size, rowIndex, colIndex);
+            var backgroundColor = resolveCellStyle((_c = cells === null || cells === void 0 ? void 0 : cells.fill) === null || _c === void 0 ? void 0 : _c.color, rowIndex, colIndex);
+            var textAlign = resolveCellStyle(cells === null || cells === void 0 ? void 0 : cells.align, rowIndex, colIndex);
             var style = __assign(__assign(__assign(__assign({}, (fontColor ? { color: fontColor } : {})), (typeof fontSize === 'number' ? { fontSize: fontSize } : {})), (backgroundColor ? { backgroundColor: backgroundColor } : {})), (textAlign ? { textAlign: textAlign } : {}));
             return {
                 value: formattedValue,