pace-table-lib 1.0.10 → 1.0.12

package/dist/pace-table-lib.umd.js

@@ -8781,27 +8781,48 @@
       if (rowIndex < fixedRowCount || columnIndex < fixedColCount) return null;
       const rowIdxHeat = rowIndex - fixedRowCount;
       const colIdxHeat = columnIndex - fixedColCount;
-      const isPercentageMode = DataField?.percentageBy?.toLowerCase?.() && DataField.percentageBy.toLowerCase() !== "absolute";
+      let pct;
+      let innerDivBg = "none";
+      if (isDataBarOn) {
+        if (showDataBarValOnTooltip) {
+          const val = dataBarMatrix[rowIdxHeat]?.[colIdxHeat];
+          if (val !== void 0) pct = `${(val * 100).toFixed(2)}%`;
+        }
+        innerDivBg = getBgColorForDataBar(rowIdxHeat, colIdxHeat);
+      }
+      const parent = measuresBySlice[rowIdxHeat]?.sliceMark?.[0];
+      const parentBg = parent ? parentBandColorMap[parent] : void 0;
+      let outerDivBg = "none";
+      if (ShowHeatMap) {
+        outerDivBg = getBgColorForHetMap(rowIdxHeat, colIdxHeat);
+      } else {
+        outerDivBg = parentBg ?? dataColors.evenColor;
+      }
+      const baseStyle = {
+        ...style,
+        ...dataCellFont,
+        background: outerDivBg
+      };
       const isLastRow = rowIndex === rowCount - 1;
       const isLastCol = columnIndex === columnCount - 1;
-      const val = dataBarMatrix[rowIdxHeat]?.[colIdxHeat];
-      const pct = isDataBarOn && showDataBarValOnTooltip && val !== void 0 ? `${(val * 100).toFixed(2)}%` : void 0;
-      const innerDivBg = isDataBarOn ? getBgColorForDataBar(rowIdxHeat, colIdxHeat) : "none";
-      const parent = measuresBySlice[rowIdxHeat]?.sliceMark?.[0];
-      const outerDivBg = ShowHeatMap ? getBgColorForHetMap(rowIdxHeat, colIdxHeat) : parent ? parentBandColorMap[parent] : dataColors.evenColor;
-      const baseStyle = { ...style, ...dataCellFont, background: outerDivBg };
       let rawValue;
       let isBold = true;
       const bgColorForTotals = getBgColorForCell(rowCount - fixedRowCount, dataColors);
       if (isColTotalOn && isRowTotalOn && !headerAtStart && isLastRow && isLastCol) {
         baseStyle.background = bgColorForTotals;
-        rawValue = isPercentageMode ? 1 : grandTotal;
+        rawValue = grandTotal;
+        if (DataField.hasOwnProperty("percentageBy") && DataField.percentageBy && DataField.percentageBy?.toLowerCase() !== "absolute") {
+          rawValue = 1;
+        }
       } else if (isColTotalOn && !headerAtStart && isLastRow) {
         baseStyle.background = bgColorForTotals;
-        rawValue = isPercentageMode ? 1 : columnTotalRow[colIdxHeat]?.columnTotal;
+        rawValue = columnTotalRow[colIdxHeat]?.columnTotal;
+        if (DataField.hasOwnProperty("percentageBy") && DataField.percentageBy && DataField.percentageBy?.toLowerCase() !== "absolute") {
+          rawValue = 1;
+        }
       } else if (isRowTotalOn && !headerAtStart && isLastCol) {
         rawValue = 1;
-      } else if (isPercentageMode) {
+      } else if (DataField.hasOwnProperty("percentageBy") && DataField?.percentageBy && DataField.percentageBy?.toLowerCase() !== "absolute") {
         if (DataField?.percentageBy === "Row-wise") {
           rawValue = getPercentageBy(measuresBySlice[rowIdxHeat]?.measures?.[colIdxHeat], measuresBySlice[rowIdxHeat].rowTotal);
         } else {
@@ -8813,23 +8834,39 @@
         isBold = false;
       }
       if (rawValue === void 0) return null;
-      const dimName = dimensionMarks[colIdxHeat]?.[fixedRowCount - 1];
+      const dimName = dimensionMarks[colIdxHeat]?.[fixedRowCount - 1] ?? void 0;
       const formattingObj = getMeasureFormattingObj(dimName);
       const conditionalFormatObj = getConditionalFormat(rawValue, CONDITIONAL_FORMAT_FOR.VALUE);
       const numberFormat = conditionalFormatObj?.numberFormat ?? formattingObj.numberFormat;
       const decimalPrecision = conditionalFormatObj?.decimalPrecision ?? formattingObj.decimalPrecision;
       const displayUnits = conditionalFormatObj?.displayUnits ?? formattingObj.displayUnits;
-      let formattedValue = formatValue(rawValue, numberFormat, decimalPrecision, displayUnits);
-      if (isPercentageMode) formattedValue = formatValue(rawValue, VALUE_FORMAT_OBJ.PERCENT_SHORT);
-      const finalStyle = {
+      let formattedValue = formatValue(
+        rawValue,
+        numberFormat,
+        decimalPrecision,
+        displayUnits
+      );
+      if (DataField.hasOwnProperty("percentageBy") && DataField?.percentageBy && DataField.percentageBy?.toLowerCase() !== "absolute") {
+        formattedValue = formatValue(rawValue, VALUE_FORMAT_OBJ.PERCENT_SHORT);
+      }
+      let finalStyle = {
         ...baseStyle,
-        fontWeight: isBold ? "bold" : "normal",
-        ...conditionalFormatObj?.fontFamily && { fontFamily: conditionalFormatObj.fontFamily },
-        ...conditionalFormatObj?.fontSize && { fontSize: conditionalFormatObj.fontSize },
-        ...conditionalFormatObj?.backgroundColor && { background: conditionalFormatObj.backgroundColor },
-        ...conditionalFormatObj?.color && { color: conditionalFormatObj.color }
+        fontWeight: isBold ? "bold" : "normal"
       };
-      return renderDataCell(formattedValue, finalStyle, "data_div", "data_label_div", pct, innerDivBg);
+      if (conditionalFormatObj) {
+        if (conditionalFormatObj.fontFamily) finalStyle.fontFamily = conditionalFormatObj.fontFamily;
+        if (conditionalFormatObj.fontSize) finalStyle.fontSize = conditionalFormatObj.fontSize;
+        if (conditionalFormatObj.backgroundColor) finalStyle.background = conditionalFormatObj.backgroundColor;
+        if (conditionalFormatObj.color) finalStyle.color = conditionalFormatObj.color;
+      }
+      return renderDataCell(
+        formattedValue,
+        finalStyle,
+        "data_div",
+        "data_label_div",
+        pct,
+        innerDivBg
+      );
     };
     function getBgColorForHetMap(rowIdx, colIdx) {
       return heatColorMatrix[rowIdx][colIdx];