pace-chart-lib 1.0.32 → 1.0.33

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

@@ -10854,7 +10854,7 @@
     Custom: "Custom"
   };
   var commonColors = /* @__PURE__ */ ((commonColors2) => {
-    commonColors2["white"] = "#ffffff";
+    commonColors2["white"] = "#FFFFFF";
     commonColors2["black"] = "#000000";
     commonColors2["transparent"] = "#FFFFFF00";
     return commonColors2;
@@ -10865,14 +10865,6 @@
     tornadoEntryName2["default"] = "defaultEntry";
     return tornadoEntryName2;
   })(tornadoEntryName || {});
-  var waterfallKeys = /* @__PURE__ */ ((waterfallKeys2) => {
-    waterfallKeys2["total"] = "Total";
-    waterfallKeys2["base"] = "base";
-    waterfallKeys2["dimensionTotal"] = "dimensionTotal";
-    waterfallKeys2["up"] = "up";
-    waterfallKeys2["down"] = "down";
-    return waterfallKeys2;
-  })(waterfallKeys || {});
   const defaultChartFormatOptions = {
     chartDescription: {
       chartDescriptionVisibility: false,
@@ -10925,9 +10917,7 @@
       hideZeroValues: false,
       xAxisSortBy: "0",
       customSort: [],
-      labelTextWrap: true,
-      multiLineLabelWrap: false,
-      maxXAxisLabelWidth: 100
+      labelTextWrap: true
     },
     xAxisScale: {
       absoluteXAxisScale: false,
@@ -11448,8 +11438,7 @@
       dataTableNumberFormat: ",",
       dataTableDecimalPrecision: "2",
       dataTableDisplayUnits: "None",
-      dataTableLabelColor: commonColors.black,
-      dataTableAxisLabel: true
+      dataTableLabelColor: commonColors.black
     },
     dataTableOuterBorder: {
       borderButtonVisibility: true,
@@ -11559,7 +11548,6 @@
     div.style.fontSize = fontSize == void 0 ? "" : fontSize + "px";
     div.style.fontFamily = fontFamily == void 0 ? "" : fontFamily;
     div.style.margin = "0";
-    div.style.padding = "1px";
     div.style.border = "none";
     if (fixedWidth) {
       div.style.width = fixedWidth + "px";
@@ -11622,16 +11610,6 @@
     );
     let actualDimesionWidth = dimensionHeightWidthArray[0] + 5;
     let maxDimensionWidth = dimensionHeightWidthArray[3] + 10;
-    let dimensionLength;
-    if (formatOptions.xAxisLabel.labelTextWrap) {
-      if (formatOptions.xAxisLabel.multiLineLabelWrap) {
-        dimensionLength = formatOptions.xAxisLabel.maxXAxisLabelWidth;
-      } else {
-        dimensionLength = maxDimensionWidth < height * 0.15 ? maxDimensionWidth : height * 0.15;
-      }
-    } else {
-      dimensionLength = maxDimensionWidth;
-    }
     let xTitle = formatOptions.xAxisTitle.xAxisTitleVisibility ? formatOptions.xAxisTitle.xAxisDynamicTitleText.length !== 0 ? calculateWidthHeightDynamically(
       formatOptions.xAxisTitle.xAxisTitleHTML,
       void 0,
@@ -11642,7 +11620,7 @@
       "Helvetica"
     )[1] : isDataTableDrawnWithAxis ? 5 : 0;
     xTitle = xTitle > height * 0.1 ? height * 0.1 : xTitle;
-    let xLabel = isDataTableDrawnWithAxis ? 0 : formatOptions.xAxisLabel.xAxisLabelVisibility ? dimensionLength : 0;
+    let xLabel = isDataTableDrawnWithAxis ? 0 : formatOptions.xAxisLabel.xAxisLabelVisibility ? formatOptions.xAxisLabel.labelTextWrap ? maxDimensionWidth < height * 0.15 ? maxDimensionWidth : height * 0.15 : maxDimensionWidth : 0;
     let yTitle = formatOptions.yAxisTitle.yAxisTitleVisibility ? formatOptions.yAxisTitle.yAxisDynamicTitleText.length !== 0 ? calculateWidthHeightDynamically(
       formatOptions.yAxisTitle.yAxisTitleHTML,
       void 0,
@@ -11653,9 +11631,7 @@
       "Helvetica"
     )[1] : 0;
     yTitle = yTitle > width * 0.1 ? width * 0.1 : yTitle;
-    const updatedMaxNumberForPrimaryAxis = maxNumberForPrimaryAxis * 1.1;
-    const updatedYMaxLeft = yMaxLeft * 1.1;
-    let yLabel = formatOptions.yAxisLabel.yAxisLabelVisibility ? responsiveYaxisMargin(updatedMaxNumberForPrimaryAxis, updatedYMaxLeft, formatOptions, false, isNormalizedChart) + 5 : getYAxisLabel(formatOptions, max$2(legendList, (d) => d?.length || 0) || 0) + 10;
+    let yLabel = formatOptions.yAxisLabel.yAxisLabelVisibility ? responsiveYaxisMargin(maxNumberForPrimaryAxis, yMaxLeft, formatOptions, false, isNormalizedChart) + 5 : getYAxisLabel(formatOptions, max$2(legendList, (d) => d?.length || 0) || 0) + 10;
     let secondaryYLabel = formatOptions.secondaryYAxisLabel.secondaryYAxisLabelVisibility ? responsiveYaxisMargin(
       maxNumberForSecondaryAxis,
       yMaxRight,
@@ -11803,7 +11779,7 @@
           bottom2 = xAxisRelatedMargin + 5 + scrollHeightConstant;
           break;
         case staticLegendPosition.bottom:
-          bottom2 = 30 + xAxisRelatedMargin + scrollHeightConstant;
+          bottom2 = 40 + xAxisRelatedMargin + scrollHeightConstant;
           top2 = metrics.chartTitleHeight + 5 + (isNormalizedChart ? 12 : 0);
           break;
         case staticLegendPosition.left:
@@ -12121,45 +12097,21 @@
           return format(formatter)(measureValue) + displayUnitsPostFix;
         case staticNumberUnits.currency_USD:
           formatter = `,.${decimalValues}f`;
-          if (measureValue < 0) {
-            const number2 = Math.abs(measureValue);
-            return "-$" + format(formatter)(number2) + displayUnitsPostFix;
-          }
           return "$" + format(formatter)(measureValue) + displayUnitsPostFix;
         case staticNumberUnits.currency_CAD:
           formatter = `,.${decimalValues}f`;
-          if (measureValue < 0) {
-            const number2 = Math.abs(measureValue);
-            return "-$" + format(formatter)(number2) + displayUnitsPostFix;
-          }
           return "C$" + format(formatter)(measureValue) + displayUnitsPostFix;
         case staticNumberUnits.currency_EUR:
           formatter = `,.${decimalValues}f`;
-          if (measureValue < 0) {
-            const number2 = Math.abs(measureValue);
-            return "-$" + format(formatter)(number2) + displayUnitsPostFix;
-          }
           return "€" + format(formatter)(measureValue) + displayUnitsPostFix;
         case staticNumberUnits.currency_CHF:
           formatter = `,.${decimalValues}f`;
-          if (measureValue < 0) {
-            const number2 = Math.abs(measureValue);
-            return "-$" + format(formatter)(number2) + displayUnitsPostFix;
-          }
           return "CHF" + format(formatter)(measureValue) + displayUnitsPostFix;
         case staticNumberUnits.currency_UK:
           formatter = `,.${decimalValues}f`;
-          if (measureValue < 0) {
-            const number2 = Math.abs(measureValue);
-            return "-$" + format(formatter)(number2) + displayUnitsPostFix;
-          }
           return "£" + format(formatter)(measureValue) + displayUnitsPostFix;
         case staticNumberUnits.currency_INR:
           formatter = `,.${decimalValues}f`;
-          if (measureValue < 0) {
-            const number2 = Math.abs(measureValue);
-            return "-$" + format(formatter)(number2) + displayUnitsPostFix;
-          }
           return "₹" + format(formatter)(measureValue) + displayUnitsPostFix;
         case staticNumberUnits.commaSeparated:
           formatter = `,.${decimalValues}f`;
@@ -12338,9 +12290,10 @@
   }
   function responsiveYaxisLabel$1(Ymax, Ymin, innerHeight2, formatOptions, chartJSON, customYaxisMinValue, customYaxisMaxValue, barChart, innerWidth2) {
     try {
-      let yAxisIntervalsVisibility = formatOptions.yAxisLabel.yAxisIntervalsVisibility;
       let autoLabelFlag = false;
-      let customYaxisIntervalValue = yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisIntervalText) : void 0;
+      let customYaxisIntervalValue = parseFloat(
+        formatOptions.yAxisLabel.yAxisIntervalText
+      );
       let yAxisLabelArray = [];
       let customTickValue;
       const isTornadoChart = chartJSON.chartType === chartTypes.TornadoChart;
@@ -12564,13 +12517,14 @@
       throw error;
     }
   }
-  function initXaxis$1(gTag, chartJSON, xLabel, formatOptions, dataTableHeight, yScaleLeft, xAxis, dimensionHeightWidthArray, height, barWidth, isDateType, innerWidth2, innerHeight2, filteredDimensionList, xScale) {
+  function initXaxis$1(gTag, chartJSON, xLabel, formatOptions, dataTableHeight, yScaleLeft, xAxis, dimensionHeightWidthArray, height, barWidth, isDateType, innerWidth2, innerHeight2, filteredDimensionList) {
     try {
       let responsiveDimList = chartJSON.chartType !== chartTypes.ColumnHistogramChart ? responsiveXaxisLabel(
         filteredDimensionList,
         innerWidth2
       ) : [];
       let formatedResponsiveDimList = [];
+      let actualDimesionWidth = dimensionHeightWidthArray[0] + 5;
       let maxDimensionWidth = dimensionHeightWidthArray[3] + 10;
       if (chartJSON.chartType != chartTypes.ColumnHistogramChart) {
         formatedResponsiveDimList = isDateType ? setDateFormats(
@@ -12607,26 +12561,11 @@
         `translate(0,${xaxisLabelPosition == "0" ? dataTableHeight > 0 ? innerHeight2 - dataTableHeight : innerHeight2 : xaxisLabelPosition == "1" ? 0 : yScaleLeft(0)})`
       ).call(xAxis);
       let dx = xaxisLabelPosition === "1" ? "5" : "0";
-      let dimensionWidthUpdated;
-      if (formatOptions.xAxisLabel.labelTextWrap) {
-        if (formatOptions.xAxisLabel.multiLineLabelWrap) {
-          dimensionWidthUpdated = formatOptions.xAxisLabel.maxXAxisLabelWidth;
-        } else {
-          dimensionWidthUpdated = maxDimensionWidth < height * 0.15 ? maxDimensionWidth : height * 0.15;
-        }
-      } else {
-        dimensionWidthUpdated = formatOptions.xAxisLabel.xAxisLabelRotation == 0 ? barWidth : maxDimensionWidth;
-      }
-      const dimHeight = xScale.step();
-      const lineHeight = parseInt(formatOptions.xAxisLabel.xAxisLabelFontSize) * 1.2;
-      const maxLines = Math.floor(dimHeight / lineHeight);
-      let foreignObject = XaxisG.selectAll("g").append("foreignObject").attr("class", "testingoverflowing").style("width", Math.round(dimensionWidthUpdated)).style("height", dimHeight + "px").attr(
+      let width = formatOptions.xAxisLabel.labelTextWrap ? maxDimensionWidth < height * 0.125 ? maxDimensionWidth : height * 0.125 : formatOptions.xAxisLabel.xAxisLabelRotation == 0 ? barWidth : actualDimesionWidth;
+      let foreignObject = XaxisG.selectAll("g").append("foreignObject").attr("class", "testingoverflowing").style("width", Math.round(width)).style("height", "20px").attr(
         "transform",
-        (d, i) => `rotate(${xaxisLabelPosition === "1" ? -formatOptions.xAxisLabel.xAxisLabelRotation : formatOptions.xAxisLabel.xAxisLabelRotation != 0 ? 180 - formatOptions.xAxisLabel.xAxisLabelRotation : 0}) translate (${formatOptions.xAxisLabel.xAxisLabelRotation != 0 ? dx + `, -${i == 0 && isAreaTypeChartAndNotFitChart ? 15 : dimHeight / 2}` : -dimensionWidthUpdated / 2 + " , " + (xaxisLabelPosition === "1" ? "-15" : "8")})`
+        (d, i) => `rotate(${xaxisLabelPosition === "1" ? -formatOptions.xAxisLabel.xAxisLabelRotation : formatOptions.xAxisLabel.xAxisLabelRotation != 0 ? 180 - formatOptions.xAxisLabel.xAxisLabelRotation : 0}) translate (${formatOptions.xAxisLabel.xAxisLabelRotation != 0 ? dx + `, -${i == 0 && isAreaTypeChartAndNotFitChart ? 15 : 5}` : -width / 2 + " , " + (xaxisLabelPosition === "1" ? "-15" : "8")})`
       );
-      if (formatOptions.xAxisLabel.xAxisLabelRotation != 0) {
-        foreignObject.style("align-content", "center");
-      }
       if (detectBrowserName() === "safari") {
         foreignObject.attr(
           "width",
@@ -12636,17 +12575,10 @@
       let xLabelsObj = foreignObject.append("xhtml:h3").style(
         "transform",
         detectBrowserName() === "safari" ? "" : xaxisLabelPosition === "1" ? "" : formatOptions.xAxisLabel.xAxisLabelRotation != 0 ? "rotate(180deg)" : "0"
-      );
-      if (formatOptions.xAxisLabel.labelTextWrap && !formatOptions.xAxisLabel.multiLineLabelWrap || !formatOptions.xAxisLabel.labelTextWrap) {
-        xLabelsObj.style("white-space", "pre").style("text-overflow", "ellipsis").style("overflow", "hidden");
-      }
-      if (formatOptions.xAxisLabel.labelTextWrap && formatOptions.xAxisLabel.multiLineLabelWrap) {
-        xLabelsObj.style("-webkit-line-clamp", maxLines.toString()).style("display", "-webkit-box").style("-webkit-box-orient", "vertical").style("overflow", "hidden").style("word-break", "break-word").style("white-space", "normal");
-      }
-      xLabelsObj.style(
+      ).style("white-space", "pre").style("text-overflow", "ellipsis").style(
         "text-align",
         formatOptions.xAxisLabel.xAxisLabelRotation != 0 ? "start" : "center"
-      ).style("user-select", "none").style("margin", 0).style("padding", "0 1px").style("font-family", formatOptions.xAxisLabel.xAxisLabelFontFamily).style("color", formatOptions.xAxisLabel.xAxisLabelColor).style("font-size", formatOptions.xAxisLabel.xAxisLabelFontSize + "px").style("font-style", fontStyle.includes("Italic") ? "Italic" : "").style(
+      ).style("user-select", "none").style("margin", 0).style("padding", "0 1px").style("overflow", "hidden").style("font-family", formatOptions.xAxisLabel.xAxisLabelFontFamily).style("color", formatOptions.xAxisLabel.xAxisLabelColor).style("font-size", formatOptions.xAxisLabel.xAxisLabelFontSize + "px").style("font-style", fontStyle.includes("Italic") ? "Italic" : "").style(
         "text-decoration",
         fontStyle.includes("Underline") ? "Underline" : ""
       ).style("font-weight", fontStyle.includes("Bold") ? "Bold" : "").style(
@@ -12797,7 +12729,7 @@
     }
   }
   function getTransformStringForXaxisLabelPosition(barChart, margin, formatOptions, innerHeight2, xLabel, yLabel) {
-    return barChart ? `rotate(-90) translate(-${margin.top + innerHeight2},${margin.left - 20 - xLabel})` : `translate(${margin.left},${margin.top + innerHeight2 + (formatOptions?.xAxisLabel?.xAxisPosition == "1" ? 0 : barChart ? yLabel : xLabel)})`;
+    return barChart ? `rotate(-90) translate(-${margin.top + innerHeight2},${margin.left - 15 - xLabel})` : `translate(${margin.left},${margin.top + innerHeight2 + (formatOptions?.xAxisLabel?.xAxisPosition == "1" ? 0 : barChart ? yLabel : xLabel)})`;
   }
   function setXaxistitle$1(formatOptions, barChart, svg, margin, xLabel, height, xTitle, chartType, yLabel, innerWidth2, innerHeight2) {
     try {
@@ -12816,7 +12748,7 @@
           formatOptions.xAxisTitle.xAxisTitleHTML ? formatOptions.xAxisTitle.xAxisTitleHTML : formatOptions.xAxisTitle.xAxisTitleText
         );
       } else {
-        object2.append("xhtml:h3").style("white-space", "pre").style("text-overflow", "ellipsis").style("user-select", "none").style("margin", 0).style("padding", 0).style("text-align", "center").style("overflow", "hidden").attr("class", "xAxisTitle").style("text-anchor", "middle").style("color", "rgba(119,119,119)").style("font-size", "12px").style("font-size", formatOptions.xAxisTitle.xAxisTitleFontSize).style("font-family", formatOptions.xAxisTitle.xAxisTitleFontFamily).style("font-style", formatOptions.xAxisTitle.xAxisTitleFontStyle).attr(
+        object2.append("xhtml:h3").style("white-space", "pre").style("text-overflow", "ellipsis").style("user-select", "none").style("margin", 0).style("padding", 0).style("text-align", "center").style("overflow", "hidden").attr("class", "xAxisTitle").style("padding-top", "5px").style("text-anchor", "middle").style("color", "rgba(119,119,119)").style("font-size", "12px").style("font-size", formatOptions.xAxisTitle.xAxisTitleFontSize).style("font-family", formatOptions.xAxisTitle.xAxisTitleFontFamily).style("font-style", formatOptions.xAxisTitle.xAxisTitleFontStyle).attr(
           "title",
           formatOptions.xAxisTitle.xAxisTitleText !== "~$~Dimension" ? formatOptions.xAxisTitle.xAxisTitleText : ""
         ).html(
@@ -12877,15 +12809,8 @@
       "visibility",
       formatOptions.chartTitle.chartTitleVisibility ? "visible" : "hidden"
     ).attr("transform", `translate(2,2)`).attr("class", "chartTitle").attr("width", width).attr("height", chartTitleHeight + "px");
-    const parseHTMLText = (html) => {
-      const temp = document.createElement("div");
-      temp.innerHTML = html;
-      return temp.textContent || temp.innerText || "";
-    };
-    const hasHTML = !!formatOptions.chartTitle.chartTitleHTML;
-    const titleText = hasHTML ? parseHTMLText(formatOptions.chartTitle.chartTitleHTML) : formatOptions.chartTitle.chartTitleText;
     if (formatOptions.chartTitle.dynamicTitleText.length !== 0) {
-      object2.append("xhtml:div").style("color", "rgba(119,119,119)").attr("title", titleText).style("white-space", "pre").style("text-overflow", "ellipsis").html(
+      object2.append("xhtml:div").style("color", "rgba(119,119,119)").attr("title", formatOptions.chartTitle.chartTitleText).style("white-space", "pre").style("text-overflow", "ellipsis").html(
         formatOptions.chartTitle.chartTitleHTML ? formatOptions.chartTitle.chartTitleHTML : formatOptions.chartTitle.chartTitleText
       );
     } else {
@@ -12912,13 +12837,11 @@
     if (index2 == -1) return legend;
     return legend.slice(index2 + 3);
   }
-  const getHoverText = (d, isAATornado) => isAATornado ? d?.legend?.split(" - ")[0] : d?.properties?.alias || d?.properties?.name || "Legend";
-  function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d3Annotation2, labelExcludeList, individualLabelColor, oldAnnotationList, formatOptions, chartType, height, width, innerWidth2, dimensionList, innerHeight2, widgetId, svg, xScaleForLegends, columnWidth, isReportEditable, isSensitivityChart, barChart, isAATornado) {
+  function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d3Annotation2, labelExcludeList, individualLabelColor, oldAnnotationList, formatOptions, chartType, height, width, innerWidth2, dimensionList, innerHeight2, widgetId, svg, xScaleForLegends, columnWidth, isReportEditable, isSensitivityChart, barChart) {
     try {
       const isTornadoChart = chartType === chartTypes.TornadoChart;
       let annotationType = formatOptions.annotation.annotationType ?? "1";
       let annotationPosition = formatOptions.annotation.annotationPosition.toString() != "4" ? formatOptions.annotation.annotationPosition : null;
-      let dataLabelColor = formatOptions?.annotation?.annotationSetLabelColor == "2" ? "color" : "labelColor";
       if (formatOptions.annotation.annotationVisibility) {
         let Disable = [annotationType == "1" ? "connector" : ""];
         let labelData = [];
@@ -12952,8 +12875,7 @@
                     Measure: d.data[0].value,
                     Legend: d.data[0].legend,
                     LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
-                    Labelcolor: d.properties[dataLabelColor],
-                    hoverText: getHoverText(d, isAATornado),
+                    Labelcolor: d.properties.labelColor,
                     Axis: d.properties.axis
                   });
               }
@@ -12968,8 +12890,7 @@
                     Measure: d.data[d.data.length - 1].value,
                     Legend: d.data[d.data.length - 1].legend,
                     LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
-                    Labelcolor: d.properties[dataLabelColor],
-                    hoverText: getHoverText(d, isAATornado),
+                    Labelcolor: d.properties.labelColor,
                     Axis: d.properties.axis
                   });
                 }
@@ -12985,8 +12906,7 @@
                     Measure: d.data[0].value,
                     Legend: d.data[0].legend,
                     LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
-                    Labelcolor: d.properties[dataLabelColor],
-                    hoverText: getHoverText(d, isAATornado),
+                    Labelcolor: d.properties.labelColor,
                     Axis: d.properties.axis
                   });
               }
@@ -12999,8 +12919,7 @@
                     Measure: d.data[d.data.length - 1].value,
                     Legend: d.data[d.data.length - 1].legend,
                     LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
-                    Labelcolor: d.properties[dataLabelColor],
-                    hoverText: getHoverText(d, isAATornado),
+                    Labelcolor: d.properties.labelColor,
                     Axis: d.properties.axis
                   });
               }
@@ -13016,8 +12935,7 @@
                       Measure: d.data[i].value,
                       Legend: d.data[i].legend,
                       LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
-                      Labelcolor: d.properties[dataLabelColor],
-                      hoverText: getHoverText(d, isAATornado),
+                      Labelcolor: d.properties.labelColor,
                       Axis: d.properties.axis
                     });
                 }
@@ -13039,8 +12957,7 @@
                         Measure: d.data[i].value,
                         Legend: d.data[i].legend,
                         LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
-                        Labelcolor: d.properties[dataLabelColor],
-                        hoverText: getHoverText(d, isAATornado),
+                        Labelcolor: d.properties.labelColor,
                         Axis: d.properties.axis
                       });
                   }
@@ -13055,8 +12972,7 @@
                       Measure: d.data[0].value,
                       Legend: d.data[0].legend,
                       LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
-                      Labelcolor: d.properties[dataLabelColor],
-                      hoverText: getHoverText(d, isAATornado),
+                      Labelcolor: d.properties.labelColor,
                       Axis: d.properties.axis
                     });
                   break;
@@ -13067,8 +12983,7 @@
                       Measure: d.data[d.data.length - 1].value,
                       Legend: d.data[d.data.length - 1].legend,
                       LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
-                      Labelcolor: d.properties[dataLabelColor],
-                      hoverText: getHoverText(d, isAATornado),
+                      Labelcolor: d.properties.labelColor,
                       Axis: d.properties.axis
                     });
                   break;
@@ -13079,8 +12994,7 @@
                       Measure: d.data[0].value,
                       Legend: d.data[0].legend,
                       LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
-                      Labelcolor: d.properties[dataLabelColor],
-                      hoverText: getHoverText(d, isAATornado),
+                      Labelcolor: d.properties.labelColor,
                       Axis: d.properties.axis
                     });
                   if (d.data[d.data.length - 1])
@@ -13089,8 +13003,7 @@
                       Measure: d.data[d.data.length - 1].value,
                       Legend: d.data[d.data.length - 1].legend,
                       LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
-                      Labelcolor: d.properties[dataLabelColor],
-                      hoverText: getHoverText(d, isAATornado),
+                      Labelcolor: d.properties.labelColor,
                       Axis: d.properties.axis
                     });
                   break;
@@ -13122,8 +13035,7 @@
               position: parseInt(d.LabelPosition),
               currentLegend: d.Legend,
               //d.Legend.replaceAll(" ", "-"), need to check for this case by space replaced with -
-              isVisible: true,
-              hoverId: d.hoverText.replace(/\s+/g, "-")
+              isVisible: true
             } : {
               x: d.Dimension,
               y: { measure: d.Measure, axis: d.Axis },
@@ -13149,7 +13061,7 @@
           };
           if (barChart) {
             let requiredXScale = d.Axis === axisTypes.primary ? yScaleLeft : yScaleRight;
-            (responsiveXaxisLabel(dimensionList, innerHeight2).includes(d.Dimension) || chartType === chartTypes.TornadoChart) && !labelExcludeList.includes(d.Legend) && requiredXScale(d.Measure) <= innerWidth2 && requiredXScale(d.Measure) >= 0 ? annotationsList.push(singleAnnotation) : null;
+            (responsiveXaxisLabel(dimensionList, innerWidth2).includes(d.Dimension) || chartType === chartTypes.TornadoChart) && !labelExcludeList.includes(d.Legend) && requiredXScale(d.Measure) <= innerWidth2 && requiredXScale(d.Measure) >= 0 ? annotationsList.push(singleAnnotation) : null;
           } else {
             responsiveXaxisLabel(dimensionList, innerWidth2).includes(d.Dimension) && !labelExcludeList.includes(d.Legend) && (d.Axis == axisTypes.primary ? yScaleLeft(d.Measure) <= innerHeight2 && yScaleLeft(d.Measure) >= 0 : yScaleRight(d.Measure) <= innerHeight2 && yScaleRight(d.Measure) >= 0) ? annotationsList.push(singleAnnotation) : null;
           }
@@ -13297,7 +13209,7 @@
         }
         for (let i = 0; i < chartData.length; i++) {
           chartData.forEach((d) => {
-            if (d.properties.type && d.properties.type != chartTypes.ColumnChart && !getChartType.includes(d.properties.type))
+            if (d.properties.type && d.properties.type != "Column" && !getChartType.includes(d.properties.type))
               getChartType.push(d.properties.type);
           });
         }
@@ -13405,168 +13317,6 @@
             labelData;
             break;
           case "6":
-            chartData.forEach((d, k2) => {
-              let annotationVisibility = d.properties.annotation.toString();
-              switch (d.properties.type) {
-                case chartTypes.ColumnChart:
-                  switch (annotationVisibility) {
-                    case "1":
-                      for (let i = 0; i < chartData[k2].data.length; i++) {
-                        labelData.push(d.data[i]);
-                      }
-                      break;
-                    case "2":
-                      labelData;
-                      break;
-                    case "3":
-                      labelData.push(d.data[0]);
-                      break;
-                    case "4":
-                      labelData.push(d.data[d.data.length - 1]);
-                      break;
-                    case "5":
-                      labelData.push(d.data[0]);
-                      labelData.push(d.data[d.data.length - 1]);
-                      break;
-                  }
-                  break;
-                case chartTypes.AreaChart:
-                case chartTypes.LineChart:
-                  switch (annotationVisibility) {
-                    case "1":
-                      for (let i = 0; i < chartData[k2].data.length; i++) {
-                        labelData.push(
-                          {
-                            dimension: d.data[i].dimension,
-                            value: d.data[i].value,
-                            legend: d.data[i].legend,
-                            labelPosition: d.data[i].labelPosition,
-                            labelColor: d.data[i].labelColor,
-                            axis: d.data[i].axis,
-                            type: chartTypes.LineChart
-                          }
-                        );
-                      }
-                      break;
-                    case "2":
-                      labelData;
-                      break;
-                    case "3":
-                      labelData.push(
-                        {
-                          dimension: d.data[0].dimension,
-                          value: d.data[0].value,
-                          legend: d.data[0].legend,
-                          labelPosition: d.data[0].labelPosition,
-                          labelcolor: d.data[0].labelColor,
-                          axis: d.data[0].axis,
-                          type: chartTypes.LineChart
-                        }
-                      );
-                      break;
-                    case "4":
-                      labelData.push(
-                        {
-                          dimension: d.data[d.data.length - 1].dimension,
-                          value: d.data[d.data.length - 1].value,
-                          legend: d.data[d.data.length - 1].legend,
-                          labelPosition: d.data[d.data.length - 1].labelPosition,
-                          labelcolor: d.data[d.data.length - 1].labelColor,
-                          axis: d.data[d.data.length - 1].axis,
-                          type: chartTypes.LineChart
-                        }
-                      );
-                      break;
-                    case "5":
-                      labelData.push(
-                        {
-                          dimension: d.data[0].dimension,
-                          value: d.data[0].value,
-                          legend: d.data[0].legend,
-                          labelPosition: d.data[0].labelPosition,
-                          labelcolor: d.data[0].labelColor,
-                          axis: d.data[0].axis,
-                          type: chartTypes.LineChart
-                        }
-                      );
-                      labelData.push(
-                        {
-                          dimension: d.data[d.data.length - 1].dimension,
-                          value: d.data[d.data.length - 1].value,
-                          legend: d.data[d.data.length - 1].legend,
-                          labelPosition: d.data[d.data.length - 1].labelPosition,
-                          labelcolor: d.data[d.data.length - 1].labelColor,
-                          axis: d.data[d.data.length - 1].axis,
-                          type: chartTypes.LineChart
-                        }
-                      );
-                      break;
-                  }
-                  break;
-                case chartTypes.StackColumnChart:
-                  const stackColumnIndex = stackColumnData.findIndex((id2) => id2.key === d.properties.legend);
-                  stackColumnIndex !== -1 && stackColumnData[stackColumnIndex].forEach((dta, j) => {
-                    switch (String(stackColumnData[stackColumnIndex].individualAnnotationVisibility)) {
-                      case "1":
-                        labelData.push(stackColumnData[stackColumnIndex][j]);
-                        break;
-                      case "2":
-                        labelData;
-                        break;
-                      case "3":
-                        let label3 = stackColumnData[stackColumnIndex][0];
-                        if (!labelData.find((data) => data.key == label3.key))
-                          labelData.push(label3);
-                        break;
-                      case "4":
-                        let label4 = stackColumnData[stackColumnIndex][stackColumnData[0].length - 1];
-                        if (!labelData.find((data) => data.key == label4.key))
-                          labelData.push(label4);
-                        break;
-                      case "5":
-                        let label5 = stackColumnData[stackColumnIndex][0];
-                        let label6 = stackColumnData[stackColumnIndex][stackColumnData[0].length - 1];
-                        if (!labelData.find((data) => data.key == label5.key || data.key == label6.key)) {
-                          labelData.push(stackColumnData[stackColumnIndex][0]);
-                          labelData.push(stackColumnData[stackColumnIndex][stackColumnData[0].length - 1]);
-                          break;
-                        }
-                    }
-                  });
-                  break;
-                case chartTypes.StackAreaChart:
-                  const stackIndex = stackAreaData.findIndex((id2) => id2.key === d.properties.legend);
-                  stackIndex != -1 && stackAreaData[stackIndex].forEach((dta, j) => {
-                    switch (String(stackAreaData[stackIndex].individualAnnotationVisibility)) {
-                      case "1":
-                        labelData.push(stackAreaData[stackIndex][j]);
-                        break;
-                      case "2":
-                        labelData;
-                        break;
-                      case "3":
-                        let label3 = stackAreaData[stackIndex][0];
-                        if (!labelData.find((data) => data.key == label3.key))
-                          labelData.push(label3);
-                        break;
-                      case "4":
-                        let label4 = stackAreaData[stackIndex][stackAreaData[0].length - 1];
-                        if (!labelData.find((data) => data.key == label4.key))
-                          labelData.push(label4);
-                        break;
-                      case "5":
-                        let label5 = stackAreaData[stackIndex][0];
-                        let label6 = stackAreaData[stackIndex][stackAreaData[0].length - 1];
-                        if (!labelData.find((data) => data.key == label5.key || data.key == label6.key)) {
-                          labelData.push(label5);
-                          labelData.push(label6);
-                          break;
-                        }
-                    }
-                  });
-                  break;
-              }
-            });
             break;
         }
         let maxValue = 0;
@@ -13599,7 +13349,7 @@
               y: d.value || d.value == 0 ? d.value : d.data.type != chartTypes.StackColumnChart ? d[1] ? d[1] : 0 : d[1] > 0 ? d[1] : d[0],
               prevValue: d[0] >= 0 ? d[0] : d[1],
               position: parseInt(d.labelPosition) ? parseInt(d.labelPosition) : parseInt(d.data.labelPosition),
-              type: d.type,
+              type: d.dimension && d.legend ? d.type : d.data.type,
               currentLegend: d.legend?.includes("~$~") ? d.legend.split("~$~")[1] : d.key?.includes("~$~") ? d.key.split("~$~")[1] : d.legend ?? d.key,
               isVisible: true
             },
@@ -13622,7 +13372,7 @@
           d["legend"] && d.dimension ? (
             // ? finalLegendseries.includes(d.Legend.includes("~$~") ? d.Legend.split("~$~")[1] : d.Legend) &&
             //     filteredDimensionList.includes(d.Dimension) &&
-            !labelExcludeList.includes(d.legend.includes("~$~") ? d.legend.split("~$~")[1] : d.legend) && (d.axis == axisTypes.primary ? yScaleLeft(d.value) <= innerHeight2 && yScaleLeft(d.value) >= 0 : yScaleRight(d.value) <= innerHeight2 && yScaleRight(d.value) >= 0) ? annotationsList.push(singleAnnotation) : null
+            !labelExcludeList.includes(d.legend.includes("~$~") ? d.legend.split("~$~")[1] : d.legend) && (d.Axis == axisTypes.primary ? yScaleLeft(d.value) <= innerHeight2 && yScaleLeft(d.value) >= 0 : yScaleRight(d.value) <= innerHeight2 && yScaleRight(d.value) >= 0) ? annotationsList.push(singleAnnotation) : null
           ) : (
             // finalLegendseries.includes(d["key"].includes("~$~") ? d["key"].split("~$~")[1] : d["key"]) &&
             //     this.filteredDimensionList.includes(d.data["Dimension"]) &&
@@ -13650,15 +13400,17 @@
         });
         makeAnnotations.editMode(formatOptions.annotation.annotationDraggable && isReportEditable).accessors({
           x: function(d) {
-            const chartType = d.x.type || d.type;
-            if (getChartType.includes(chartType)) {
+            if (getChartType.includes(d.x.type) || getChartType.includes(d.type)) {
+              let chartType = d.x.type || d.type;
               switch (chartType) {
-                case chartTypes.StackColumnChart:
+                case "StackColumn":
                   return xScale(d.x.dimension) + xScaleForLegends(d.x.stacklegend) - (columnWidth - xScaleForLegends.bandwidth()) / 2;
-                case chartTypes.StackAreaChart:
-                case chartTypes.LineChart:
-                case chartTypes.AreaChart:
+                  break;
+                case "StackArea":
+                case "Line":
+                case "Area":
                   return xScale(d.x.dimension);
+                  break;
               }
             } else {
               if (d.x.legend) {
@@ -13668,11 +13420,10 @@
             }
           },
           y: function(d) {
-            const chartType = d.type ?? d.x.type;
             if (d.x.axis == axisTypes.primary) {
-              return dataLabelsPosition(d.y, parseFloat(d.position), yScaleLeft, minValue, d.prevValue, chartType);
+              return dataLabelsPosition(d.y, parseFloat(d.position), yScaleLeft, minValue, d.prevValue, d.type);
             } else {
-              return dataLabelsPosition(d.y, parseFloat(d.position), yScaleRight, minValue, d.prevValue, chartType);
+              return dataLabelsPosition(d.y, parseFloat(d.position), yScaleRight, minValue, d.prevValue, d.type);
             }
           }
         }).on("dragend", function(annotation2) {
@@ -13803,7 +13554,7 @@
       let dataTableHeight = 20;
       if (formatOptions.dataTableProperties && formatOptions.dataTableProperties.dataTable) {
         formatOptions.xAxisLabel.xAxisLabelVisibility = false;
-        let exactAvailableWidth = yLabel + yTitle;
+        let exactAvailableWidth = yLabel + yTitle - 36;
         seriesData.forEach((data, i) => {
           let tempObj = {
             "data": data.data.filter((data2) => dimensionList.includes(data2.dimension)),
@@ -13895,14 +13646,14 @@
       selectAll("#dataTableG" + chartId).remove();
       let tag = currentTag.append("g").attr("id", "dataTableG" + chartId);
       dataTable.forEach((data, i) => {
-        yCordinate = yCordinate + (!formatOptions.dataTableProperties.dataTableAxisLabel && i === 0 ? 0 : cellHeight);
+        yCordinate = yCordinate + cellHeight;
         cellHeight = data.properties.height;
         getLegendsAppended(tag, i, data, cellHeight);
         let parentTag = tag.append("g").attr("class", "dataTableBorder").selectAll("#scaling-svg" + chartId + " .foreignObject").data((d, pos) => data["data"]).enter().filter((d) => xAxis(d.dimension)).append("g").attr("fill", commonColors.transparent).attr(
           "transform",
           (d, index2) => `translate(${index2 === 0 ? 0 : xAxis(d.dimension) - cellWidth / 2},0)`
         );
-        if (i == 0 && formatOptions.dataTableProperties.dataTableAxisLabel) {
+        if (i == 0) {
           parentTag.append("foreignObject").attr("class", "dataTableColHeaders").attr("x", 0).attr("y", tableStartY).attr("id", (d, index2) => index2).attr("width", (d, index2) => index2 === 0 ? cellWidth + outerPadding + calWidthForSeriesNames / 2 : index2 === dimensionCount - 1 ? cellWidth + outerPadding - calWidthForSeriesNames / 2 : cellWidth).attr("height", "20px").append("xhtml:div").style("width", (d, index2) => index2 === 0 ? cellWidth + outerPadding + calWidthForSeriesNames / 2 : index2 === dimensionCount - 1 ? cellWidth + outerPadding - calWidthForSeriesNames / 2 : cellWidth).style("height", `${20}px`).style("border-width", (d, index2) => getBorderStyle(formatOptions, index2, void 0, dimensionCount, legendsCount, "width", "colHeaders")).style("border-style", (d, index2) => getBorderStyle(formatOptions, index2, void 0, dimensionCount, legendsCount, "style", "colHeaders")).style("border-color", (d, index2) => getBorderStyle(formatOptions, index2, void 0, dimensionCount, legendsCount, "color", "colHeaders")).style("text-align", "center").style("white-space", "nowrap").style("text-overflow", "ellipsis").style("overflow", "hidden").style("padding-left", "3px").style("font-size", formatOptions.dataTableProperties.dataTableFontSize + "px").style("font-family", formatOptions.dataTableProperties.dataTableFontFamily).style("font-style", fontStyle.includes("Italic") ? "Italic" : "").style(
             "text-decoration",
             fontStyle.includes("Underline") ? "Underline" : ""
@@ -14677,7 +14428,6 @@
         let makeAnnotations = d3Annotation2.annotation();
         let connector = formatOptions.annotation.connectorType;
         let labelType = formatOptions.annotation.annotationVisibility;
-        let dataLabelColor = formatOptions?.annotation?.annotationSetLabelColor == "2" ? "color" : "labelColor";
         let fontStyle = formatOptions.annotation.annotationFontStyle;
         let connectorType = formatOptions.annotation.connectorType ? formatOptions.annotation.connectorType.toLowerCase() : "None";
         oldAnnotationList = conditionallyResetOldAnnotations(oldAnnotationList, formatOptions, chartType);
@@ -14785,7 +14535,7 @@
               height: 15,
               width: 15
             },
-            color: d.properties[dataLabelColor],
+            color: d.properties.labelColor,
             type: annotationTypeforCharts(d3Annotation2, parseFloat(annotationType)),
             height,
             width
@@ -14918,67 +14668,54 @@
         "visibility",
         formatOptions.yAxisLabel.yAxisLabelVisibility ? "visible" : "hidden"
       );
-      xAxisG.select(".domain").style("shape-rendering", "crispEdges").style(
+      xAxisG.select(".domain").attr(
+        "visibility",
+        formatOptions.yAxisLabel.yAxisLabelVisibility ? "visible" : "hidden"
+      ).style("shape-rendering", "crispEdges").style(
         "stroke",
-        formatOptions.yAxisLabel.yAxisColor
+        formatOptions.yAxisLabel.yAxisColorInverted
       ).attr("stroke-width", formatOptions.yAxisLabel.yAxisWidth ? formatOptions.yAxisLabel.yAxisWidth : formatOptions.plotArea.plotAreaBorderThickness);
     } catch (error) {
       throw error;
     }
   };
-  function getTransformStringForYaxisLabels(isTornadoChart, xaxisLabelPosition, formatOptions, xScaleBottom, yMaxLeft, xLabelMargin, labelWidth, dimHeight) {
+  function getTransformStringForYaxisLabels(isTornadoChart, xaxisLabelPosition, formatOptions, xScaleBottom, yMaxLeft, xLabelMargin, labelWidth) {
     return isTornadoChart ? `rotate(${90 - formatOptions.xAxisLabel.xAxisLabelRotation})
-          translate(${-(xScaleBottom(yMaxLeft * 0.01) + xLabelMargin)} ,${-dimHeight / 2})` : `rotate(${90 - formatOptions.xAxisLabel.xAxisLabelRotation})
-          translate(${formatOptions.xAxisLabel.xAxisLabelRotation != 0 ? `${xaxisLabelPosition === 1 ? 10 : -xLabelMargin},${-dimHeight / 2}` : -labelWidth / 2 + " ,2"})`;
+          translate(${-(xScaleBottom(yMaxLeft * 0.01) + xLabelMargin)} ,-8)` : `rotate(${90 - formatOptions.xAxisLabel.xAxisLabelRotation})
+          translate(${formatOptions.xAxisLabel.xAxisLabelRotation != 0 ? `${xaxisLabelPosition === 1 ? 10 : -xLabelMargin},${-10}` : -labelWidth / 2 + " ,2"})`;
   }
-  const initYaxisBar = (formatOptions, gTag, xLabel, innerHeight2, innerWidth2, yAxis, xAxisTop, xScaleBottom, yMaxLeft, dimensionList, chartType, isDateType, width, dimensionHeightWidthArray, columnWidth, xScale) => {
+  const initYaxisBar = (formatOptions, gTag, xLabel, innerHeight2, innerWidth2, yAxis, xAxisTop, xScaleBottom, yMaxLeft, dimensionList, chartType, isDateType, width, dimensionHeightWidthArray, columnWidth) => {
     try {
       const isTornadoChart = chartType === chartTypes.TornadoChart;
       let fontStyle = formatOptions.xAxisLabel.xAxisLabelFontStyle;
       let xaxisLabelPosition = parseInt(formatOptions.xAxisLabel.xAxisPosition);
       let responsiveDimList = responsiveXaxisLabel(dimensionList, innerHeight2);
+      let labelWidth = formatOptions.xAxisLabel.labelTextWrap ? dimensionHeightWidthArray[3] + 10 < width * 0.1 ? dimensionHeightWidthArray[3] + 10 : width * 0.1 : formatOptions.xAxisLabel.xAxisLabelRotation == 0 ? columnWidth : dimensionHeightWidthArray[0] + 5;
+      let xLabelMargin = formatOptions.xAxisLabel.labelTextWrap ? labelWidth : xLabel;
       let formatedResponsiveDimList = isDateType ? setDateFormats(
         formatOptions.xAxisLabel.xAxisNumberFormat,
         responsiveDimList.map((d) => d)
       ).map((d) => d) : responsiveDimList;
       gTag.selectAll("#yAxisRect").remove();
       gTag.selectAll("#yAxisG").remove();
-      let xLabelMargin;
-      if (formatOptions.xAxisLabel.labelTextWrap) {
-        if (formatOptions.xAxisLabel.multiLineLabelWrap) {
-          xLabelMargin = formatOptions.xAxisLabel.maxXAxisLabelWidth;
-        } else {
-          xLabelMargin = xLabel;
-        }
-      } else {
-        xLabelMargin = xLabel;
-      }
-      let dimHeight = xScale.step();
-      const lineHeight = parseInt(formatOptions.xAxisLabel.xAxisLabelFontSize) * 1.2;
-      const maxLines = Math.floor(dimHeight / lineHeight);
       let yRect = gTag.append("rect").attr("id", "yAxisRect").attr("transform", chartType === chartTypes.TornadoChart ? `translate(${-xLabelMargin + 10},0)` : `translate(${xaxisLabelPosition === 0 ? -xLabelMargin - 5 : xaxisLabelPosition === 1 ? innerWidth2 : xScaleBottom(0) + (-xLabelMargin - 5)},0)`).attr("height", innerHeight2).attr("width", chartType === chartTypes.TornadoChart ? xLabelMargin + 20 : xLabelMargin + 5).attr(
         "fill",
         formatOptions.xAxisLabel.xAxisLabelVisibility ? formatOptions.xAxisLabel.xAxisBackgroundColor ? formatOptions.xAxisLabel.xAxisBackgroundColor !== commonColors.white ? formatOptions.xAxisLabel.xAxisBackgroundColor : "none" : formatOptions.chartArea.chartAreaColor : formatOptions.chartArea.chartAreaColor
       );
       const YaxisG = gTag.append("g").attr("id", "yAxisG").attr("transform", isTornadoChart ? `translate(${xScaleBottom(0)},0)` : `translate(${xaxisLabelPosition === 0 ? 0 : xaxisLabelPosition === 1 ? innerWidth2 : xScaleBottom(0)},0)`).call(yAxis);
-      let foreignObject = YaxisG.selectAll("g").append("foreignObject").attr("class", "testingoverflowing").style("align-content", "center").attr("width", xLabelMargin).attr("height", dimHeight + "px").attr(
-        "transform",
-        getTransformStringForYaxisLabels(isTornadoChart, xaxisLabelPosition, formatOptions, xScaleBottom, yMaxLeft, xLabelMargin, xLabel, dimHeight)
-      );
-      let xLabelh3 = foreignObject.append("xhtml:h3").style("text-align", formatOptions.xAxisLabel.xAxisLabelRotation == 0 ? "center" : "start").style("user-select", "none").style("margin", 0);
-      if (formatOptions.xAxisLabel.labelTextWrap && !formatOptions.xAxisLabel.multiLineLabelWrap || !formatOptions.xAxisLabel.labelTextWrap) {
-        xLabelh3.style("white-space", "pre").style("text-overflow", "ellipsis").style("overflow", "hidden");
-      }
-      if (formatOptions.xAxisLabel.labelTextWrap && formatOptions.xAxisLabel.multiLineLabelWrap) {
-        xLabelh3.style("-webkit-line-clamp", maxLines.toString()).style("display", "-webkit-box").style("-webkit-box-orient", "vertical").style("overflow", "hidden").style("word-break", "break-word").style("white-space", "normal");
+      if (true) {
+        let foreignObject = YaxisG.selectAll("g").append("foreignObject").attr("class", "testingoverflowing").attr("width", xLabelMargin).attr("height", "20px").attr(
+          "transform",
+          getTransformStringForYaxisLabels(isTornadoChart, xaxisLabelPosition, formatOptions, xScaleBottom, yMaxLeft, xLabelMargin, labelWidth)
+        );
+        foreignObject.append("xhtml:h3").style("white-space", "pre").style("text-overflow", "ellipsis").style("text-align", formatOptions.xAxisLabel.xAxisLabelRotation == 0 ? "center" : "start").style("user-select", "none").style("margin", 0).style("padding", 0).style("overflow", "hidden").style("font-family", formatOptions.xAxisLabel.xAxisLabelFontFamily).style("font-style", formatOptions.xAxisLabel.xAxisLabelFontStyle).style("color", formatOptions.xAxisLabel.xAxisLabelColor).style("font-size", formatOptions.xAxisLabel.xAxisLabelFontSize + "px").style("font-style", fontStyle.includes("Italic") ? "Italic" : "").style(
+          "text-decoration",
+          fontStyle.includes("Underline") ? "Underline" : ""
+        ).style("font-weight", fontStyle.includes("Bold") ? "Bold" : "").style(
+          "visibility",
+          formatOptions.xAxisLabel.xAxisLabelVisibility ? "visible" : "hidden"
+        ).attr("title", (d, i) => formatedResponsiveDimList[i]).html((d, i) => formatedResponsiveDimList[i]);
       }
-      xLabelh3.style("padding", 0).style("font-family", formatOptions.xAxisLabel.xAxisLabelFontFamily).style("font-style", formatOptions.xAxisLabel.xAxisLabelFontStyle).style("color", formatOptions.xAxisLabel.xAxisLabelColor).style("font-size", formatOptions.xAxisLabel.xAxisLabelFontSize + "px").style("font-style", fontStyle.includes("Italic") ? "Italic" : "").style(
-        "text-decoration",
-        fontStyle.includes("Underline") ? "Underline" : ""
-      ).style("font-weight", fontStyle.includes("Bold") ? "Bold" : "").style(
-        "visibility",
-        formatOptions.xAxisLabel.xAxisLabelVisibility ? "visible" : "hidden"
-      ).attr("title", (d, i) => formatedResponsiveDimList[i]).html((d, i) => formatedResponsiveDimList[i]);
       if (chartType === chartTypes.TornadoChart) {
         if (xAxisTop) {
           const YaxisRightG = gTag.append("g").attr("transform", `translate(${xScaleBottom(0)},0)`).call(xAxisTop);
@@ -15009,12 +14746,9 @@
         "visibility",
         formatOptions.yAxisLabel.yAxisLabelVisibility ? "visible" : formatOptions.plotArea.gridLinesVertical ? "visible" : "hidden"
       );
-      YaxisG.select(".domain").style("shape-rendering", "crispEdges").attr(
-        "stroke-width",
-        formatOptions.xAxisLabel.xAxisWidth ?? formatOptions.plotArea.plotAreaBorderThickness
-      ).style(
+      YaxisG.select(".domain").style("shape-rendering", "crispEdges").style(
         "stroke",
-        formatOptions.xAxisLabel.xAxisColor
+        formatOptions.xAxisLabel.xAxisColorInverted
       );
     } catch (e) {
       throw e;
@@ -15103,8 +14837,8 @@
   const barWidthFromBand = (gapFraction, bandWidth) => bandWidth / (1 + gapFraction);
   function calculateVisibleBars(innerWidth2, formatOptions, chartJSON) {
     const plotAreaWidthPx = innerWidth2 > 0 ? innerWidth2 : 0;
-    const minBarWidthPx = parseFloat(formatOptions?.plotArea?.plotAreaBarWidth) ?? 25;
-    const gapFraction = !isNaN(parseFloat(formatOptions?.plotArea?.plotAreaGapWidth ?? "0")) ? parseFloat(formatOptions?.plotArea?.plotAreaGapWidth) / 100 : 0;
+    const minBarWidthPx = 25;
+    const gapFraction = !isNaN(parseFloat(formatOptions?.plotArea?.plotAreaGapWidth ?? "0")) ? parseFloat(formatOptions.plotArea.plotAreaGapWidth) / 100 : 0;
     const totalCategories = Array.isArray(chartJSON?.dimensionList) ? chartJSON.dimensionList.length : 0;
     let visibleBars = 0;
     let columnWidth = 0;
@@ -15510,7 +15244,7 @@
               svg,
               seriesData,
               7,
-              height - 35,
+              height - 25,
               width - 10,
               30,
               position,
@@ -15571,7 +15305,7 @@
           return Symbol$1().type(Markershapes(d.markerShape)).size(d.markerSize * 50)();
         }).attr("visibility", (d) => {
           const hideByX = !xScale(d.dimension) && xScale(d.dimension) !== 0;
-          const visible = formatOptions.marker.markerVisibility ? checkVisibleConditions(chartData, d, type, hideZeroValues, yScaleRight, customYaxisMinValue, customYaxisMaxValue) ? visibilityCondition.hidden : [chartTypes.NormalizedStackLineChart, chartTypes.CombinationLine, chartTypes.CombinationArea].includes(type) ? formatOptions.plotArea.plotAreaHideLineAndMarkers ? visibilityCondition.visible : visibilityCondition.hidden : [chartTypes.StackAreaChart, chartTypes.AreaChart, chartTypes.CombinationStackArea].includes(type) ? formatOptions.plotArea.plotAreaHideLineAndMarkers ? visibilityCondition.visible : visibilityCondition.hidden : visibilityCondition.visible : [chartTypes.CombinationLine, chartTypes.CombinationArea].includes(type) ? visibilityCondition.visible : ["Area"].includes(type) ? formatOptions.plotArea.plotAreaHideLineAndMarkers ? visibilityCondition.visible : visibilityCondition.hidden : visibilityCondition.hidden;
+          const visible = formatOptions.marker.markerVisibility ? checkVisibleConditions(chartData, d, type, hideZeroValues, secondaryCustomYaxisMaxValue, secondaryCustomYaxisMinValue, customYaxisMinValue, customYaxisMaxValue) ? visibilityCondition.hidden : [chartTypes.NormalizedStackLineChart, chartTypes.CombinationLine, chartTypes.CombinationArea].includes(type) ? formatOptions.plotArea.plotAreaHideLineAndMarkers ? visibilityCondition.visible : visibilityCondition.hidden : [chartTypes.StackAreaChart, chartTypes.AreaChart, chartTypes.CombinationStackArea].includes(type) ? formatOptions.plotArea.plotAreaHideLineAndMarkers ? visibilityCondition.visible : visibilityCondition.hidden : visibilityCondition.visible : [chartTypes.CombinationLine, chartTypes.CombinationArea].includes(type) ? visibilityCondition.visible : ["Area"].includes(type) ? formatOptions.plotArea.plotAreaHideLineAndMarkers ? visibilityCondition.visible : visibilityCondition.hidden : visibilityCondition.hidden;
           return hideByX ? visibilityCondition.hidden : visible;
         }).attr("transform", (d) => {
           let requiredYScale = d.axis == axisTypes.primary ? yScale : yScaleRight;
@@ -15640,10 +15374,10 @@
       logError$2(fileName$b, "lineMarkers", error);
     }
   }
-  const checkVisibleConditions = (chartData, d, type, hideZeroValues, yScaleRight, customYaxisMinValue, customYaxisMaxValue) => {
+  const checkVisibleConditions = (chartData, d, type, hideZeroValues, secondaryCustomYaxisMaxValue, secondaryCustomYaxisMinValue, customYaxisMinValue, customYaxisMaxValue) => {
     try {
       if (chartData[0].properties.axis && chartData[0].properties.axis === "Secondary") {
-        return hideZeroValues && d.value == 0 || d.value > yScaleRight.domain()[1] || d.value < yScaleRight.domain()[0];
+        return hideZeroValues && d.value == 0 || d.value > secondaryCustomYaxisMaxValue || d.value < secondaryCustomYaxisMinValue;
       } else if (type.includes("Stack")) {
         return d.value > 0 ? hideZeroValues && d[1] == 0 || d[1] < customYaxisMinValue || d[1] > customYaxisMaxValue : hideZeroValues && d[0] == 0 || d[0] < customYaxisMinValue || d[0] > customYaxisMaxValue;
       } else return hideZeroValues && d.value == 0 || d.value < customYaxisMinValue || d.value > customYaxisMaxValue;
@@ -15651,7 +15385,7 @@
       logError$2(fileName$b, "checkVisibleConditions", error);
     }
   };
-  function onHoverMarkerForAreaChartFamily(formatOptions, areas, focus, filteredDimension, lineData, xScale, yScaleLeft, chartType, isStackChart) {
+  function onHoverMarkerForAreaChartFamily(formatOptions, areas, focus, filteredDimension, lineData, xScale, yScaleLeft, chartType) {
     try {
       let mousemove = function(event2) {
         try {
@@ -15665,14 +15399,13 @@
           }
           let mindiff = 1e99;
           for (let k2 = 0; k2 < lineData.length; k2++) {
-            const requiredValue = isStackChart ? lineData[k2].data[dimensionIndex].value > 0 ? lineData[k2].data[dimensionIndex][1] : lineData[k2].data[dimensionIndex][0] : lineData[k2].data[dimensionIndex].value;
-            let diff1 = Math.abs(m[1] - yScaleLeft(requiredValue));
+            let diff1 = Math.abs(m[1] - yScaleLeft(lineData[k2].data[dimensionIndex].value));
             if (diff1 < mindiff) {
               mindiff = diff1;
               legendIndex = k2;
             }
           }
-          focus.attr("transform", getCoordinates(lineData[legendIndex], dimensionIndex, xScale, yScaleLeft, isStackChart)).append("circle").attr("r", lineData[legendIndex].properties.markerSize * 2.5).attr("id", "tooltip").attr("fill", lineData[legendIndex].properties.markerColor).text(showTooltipOnMouseMove([
+          focus.attr("transform", getCoordinates(lineData[legendIndex], dimensionIndex, xScale, yScaleLeft)).append("circle").attr("r", lineData[legendIndex].properties.markerSize * 2.5).attr("id", "tooltip").attr("fill", lineData[legendIndex].properties.markerColor).text(showTooltipOnMouseMove([
             { key: formatOptions.xAxisTitle.xAxisTitleText, value: lineData[legendIndex].data[dimensionIndex].dimension },
             {
               key: lineData[legendIndex].properties.currentMeasure ? lineData[legendIndex].properties.currentMeasure : this.basestyle.YAxisTitle.YAxisTitleText,
@@ -15680,7 +15413,7 @@
             },
             { key: "Legend", value: lineData[legendIndex].data[dimensionIndex].legend.includes("~$~") ? lineData[legendIndex].data[dimensionIndex].legend.split("~$~")[1] : lineData[legendIndex].data[dimensionIndex].legend }
             // { key: "Calculated Tooltip", value: lineData[legendIndex].data[dimensionIndex]. },
-          ], formatOptions, void 0, lineData[legendIndex].properties));
+          ], formatOptions));
         } catch (error) {
           logError$2(fileName$b, "onHoverMarkerForAreaChartFamily.mousemove", error);
         }
@@ -15698,10 +15431,9 @@
       logError$2(fileName$b, "onHoverMarkerForAreaChartFamily", error);
     }
   }
-  const getCoordinates = (chartData, pos, xScale, yScaleLeft, isStackChart) => {
+  const getCoordinates = (chartData, pos, xScale, yScaleLeft) => {
     try {
-      const requiredValue = isStackChart ? chartData.data[pos].value > 0 ? chartData.data[pos][1] : chartData.data[pos][0] : chartData.data[pos].value;
-      return `translate(${xScale(chartData.data[pos].dimension)},${yScaleLeft(requiredValue)})`;
+      return `translate(${xScale(chartData.data[pos].dimension)},${yScaleLeft(chartData.data[pos].value)})`;
     } catch (error) {
       logError$2(fileName$b, "getCoordinates", error);
     }
@@ -16066,10 +15798,7 @@
           }
           let vennSaparator = isVennChart && (legendPosition == staticLegendPosition.bottom || legendPosition == staticLegendPosition.top) ? i != seriesData.length - 1 ? " |" : "" : "";
           let legendColor = isVennChart ? chartFormatOptions.legends.legendSelectedUnicolor : chartFormatOptions.legends.legendColorMode == legendColorMode.multiColor ? d.properties.color ? d.properties.color : commonColors.black : chartFormatOptions.legends.legendSelectedUnicolor;
-          innerdiv.append("div").style("margin-left", "5px").style("color", legendColor).style(
-            "background",
-            d.properties.axis == axisTypes.secondary && chartFormatOptions.secondaryYAxisLabel.secondaryYAxisBackgroundColor
-          ).style("font-size", (!isVennChart ? d.properties.fontSize : chartFormatOptions.legends.legendFontSize) + "px").style("font-family", !isVennChart ? d.properties.fontFamily : chartFormatOptions.legends.legendFontFamily).style(
+          innerdiv.append("div").style("margin-left", "5px").style("color", legendColor).style("font-size", (!isVennChart ? d.properties.fontSize : chartFormatOptions.legends.legendFontSize) + "px").style("font-family", !isVennChart ? d.properties.fontFamily : chartFormatOptions.legends.legendFontFamily).style(
             "font-style",
             () => {
               let style = !isVennChart ? d.properties.fontStyle : chartFormatOptions.legends.legendFontStyle;
@@ -16110,8 +15839,7 @@
   }
   function getLineShape(d, innerDiv, formatOptions) {
     try {
-      const lineStyle = d.properties?.lineStyle?.toLowerCase() || "solid";
-      let shape = innerDiv.append("div").style("height", "2px").style("width", lineStyle == "dashed" ? "25px" : "20px").style("background", commonColors.transparent).style("position", "relative").style("border-top", lineStyle == "none" ? "unset" : lineStyle == "dotted" ? "2px dotted " + d.properties.color : lineStyle == "dashed" ? "2px dashed " + d.properties.color : "2px solid " + d.properties.color);
+      let shape = innerDiv.append("div").style("height", "2px").style("width", "20px").style("background", d.properties?.lineStyle?.toLowerCase() == "solid" ? d.properties.color : commonColors.transparent).style("position", "relative").style("border-top", d.properties.lineStyle == "None" ? "unset" : d.properties.lineStyle == "dotted" ? "2px dotted " + d.properties.color : "2px dashed " + d.properties.color);
       if (formatOptions.marker.markerVisibility) {
         switch (d.properties.markerShape.toLowerCase()) {
           case "circle":
@@ -16567,26 +16295,6 @@
       return inputText;
     }
   };
-  function modifySeriesDataForTornadoChart(seriesData, data, isAdvanceAnalyticsChart) {
-    try {
-      let splitLengend = function(legend) {
-        const parts = legend.split(" - ");
-        return parts.length > 1 ? parts[0] : legend;
-      };
-      const measureMap = /* @__PURE__ */ new Map();
-      data?.LegendList?.forEach((legend) => {
-        measureMap.set(splitLengend(legend?.name), legend);
-      });
-      return seriesData.map((series) => {
-        return {
-          ...series,
-          properties: measureMap.get(isAdvanceAnalyticsChart ? splitLengend(series.legend) : series.properties.currentMeasure) ?? series.properties
-        };
-      }).filter((series) => series.data[0].value !== 0);
-    } catch (_) {
-      return seriesData;
-    }
-  }
   const ColumnChart = ({
     isDateType,
     formatOptions,
@@ -16606,14 +16314,14 @@
     const barChart = false;
     let isSecondaryAxisDrawn = false;
     const isNormalizedChart = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
-    let secondaryCustomYaxisMinValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    let secondaryCustomYaxisMinValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
-    ) : void 0;
-    let secondaryCustomYaxisMaxValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    );
+    let secondaryCustomYaxisMaxValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
-    ) : void 0;
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -17008,10 +16716,10 @@
           return yScale(0);
         }).attr("height", 0).attr("fill", data2.properties.color).attr(
           "stroke-dasharray",
-          (d) => data2.properties.stackBorderStyle == 2 ? "5,3" : "0"
-        ).attr("stroke-width", (d) => `${data2.properties.stackBorderWidth}px`).attr(
+          (d) => d.stackBorderStyle === 2 ? "5,3" : "0"
+        ).attr("stroke-width", (d) => `${d.stackBorderWidth}px`).attr(
           "stroke",
-          (d) => data2.properties.stackBorderStyle == 0 ? "none" : formatOptions.column.stackBorderVisibility ? data2.properties.stackBorderColor : "none"
+          (d) => data2.properties.stackBorderStyle === 0 ? "none" : formatOptions.column.stackBorderVisibility ? data2.properties.stackBorderStyle : "none"
         ).style("clip-path", "inset(0px) fill-box").style("shape-rendering", "crispEdges").attr(
           "visibility",
           (d) => d.value === 0 && formatOptions.xAxisLabel.hideZeroValues ? "hidden" : "visible"
@@ -17093,8 +16801,7 @@
         isDateType,
         innerWidth2,
         innerHeight2,
-        filteredDimension,
-        xScale
+        filteredDimension
       );
       commonAnnotations(
         seriesData,
@@ -17179,14 +16886,14 @@
     const barChart = false;
     let isSecondaryAxisDrawn = false;
     const isNormalizedChart = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
-    let secondaryCustomYaxisMinValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    let secondaryCustomYaxisMinValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
-    ) : void 0;
-    let secondaryCustomYaxisMaxValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    );
+    let secondaryCustomYaxisMaxValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
-    ) : void 0;
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -17223,7 +16930,6 @@
     let yAxisLeft;
     let xAxis;
     let yAxisRight;
-    let totalValueMap = /* @__PURE__ */ new Map();
     let filteredDimension;
     let filteredData = [];
     let requiredData = [];
@@ -17256,7 +16962,6 @@
         formatOptions
       ));
       preProcessChartData();
-      updateStackAxisExtremes();
       ({ maxNumberForPrimaryAxis, maxNumberForSecondaryAxis } = customYscaleLabelFormatting$1(
         // for calculating primary/secondary axis max number so that we can calculate margin accordinglt
         formatOptions,
@@ -17321,6 +17026,7 @@
         innerHeight2,
         chartType
       );
+      updateStackAxisExtremes();
       initScale();
       initAxis();
       initYaxis$1(
@@ -17416,13 +17122,9 @@
       seriesData.forEach((series, i) => {
         if (![chartTypes.StackColumnChart, chartTypes.StackAreaChart].includes(series.properties.type)) {
           tempChartData.push(series);
-          series.properties.type !== chartTypes.LineChart && series.properties.type !== chartTypes.AreaChart && legendList.push(series.legend);
-        } else {
-          if (chartTypes.StackColumnChart === series.properties.type) {
-            if (!legendList.includes(chartTypes.StackColumnChart)) {
-              legendList.push(chartTypes.StackColumnChart);
-            }
-          }
+          series.properties.type !== chartTypes.LineChart && legendList.push(series.legend);
+        } else if (!legendList.includes("stackLegend")) {
+          legendList.push(`stackLegend`);
         }
         if (series.properties.axis === "Secondary") {
           secondaryStackAxisData.push(series);
@@ -17442,15 +17144,15 @@
             primaryStackAreaAxisData.push(series);
           }
         }
-        series.data = series.data.map((point2) => {
+        series.data.forEach((point2) => {
           const newPoint = {
             ...point2,
             type: series.properties.type,
             axis: series.properties.axis,
-            labelPosition: formatOptions?.annotation?.annotationPosition.toString() === "4" ? series.properties.dataLabelPosition.toString() : formatOptions?.annotation?.annotationPosition.toString(),
+            labelPosition: series.properties.dataLabelPosition,
             labelColor: series.properties.labelColor
           };
-          if (newPoint.axis === "Secondary") {
+          if (series.properties.axis === "Secondary") {
             isSecondaryAxisDrawn = true;
             yMaxRight = Math.max(yMaxRight, newPoint.value);
             yMinRight = Math.min(yMinRight, newPoint.value);
@@ -17458,7 +17160,6 @@
             yMaxLeft = Math.max(yMaxLeft, newPoint.value);
             yMinLeft = Math.min(yMinLeft, newPoint.value);
           }
-          return newPoint;
         });
       });
       filteredData = JSON.parse(JSON.stringify(seriesData));
@@ -17522,8 +17223,7 @@
           properties: {
             axis: d.properties.axis,
             type: d.properties.type,
-            legend: d.properties.legend,
-            annotation: d.properties.annotation
+            legend: d.properties.legend
           },
           stackData: tempStackAreaChartDataForPrimaryAxis,
           data: primaryStackAreaAxisData2
@@ -17534,8 +17234,7 @@
           properties: {
             axis: d.properties.axis,
             type: d.properties.type,
-            legend: d.properties.legend,
-            annotation: d.properties.annotation
+            legend: d.properties.legend
           },
           stackData: tempStackAreaChartDataForSecondaryAxis,
           data: secondaryStackAreaAxisData2
@@ -17546,8 +17245,7 @@
           properties: {
             axis: d.properties.axis,
             type: d.properties.type,
-            legend: d.properties.legend,
-            annotation: d.properties.annotation
+            legend: d.properties.legend
           },
           stackData: tempStackColumnChartDataForPrimaryAxis,
           data: primaryStackColumnAxisData2
@@ -17558,8 +17256,7 @@
           properties: {
             axis: d.properties.axis,
             type: d.properties.type,
-            legend: d.properties.legend,
-            annotation: d.properties.annotation
+            legend: d.properties.legend
           },
           stackData: tempStackColumnChartDataForSecondaryAxis,
           data: secondaryStackColumnAxisData2
@@ -17581,6 +17278,17 @@
       }
     };
     const initScale = () => {
+      let yAxisLabelArray = responsiveYaxisLabel$1(
+        customYaxisMaxValue ? customYaxisMaxValue : chartJSON.yMaxLeft,
+        chartJSON.yMinLeft,
+        innerHeight2,
+        formatOptions,
+        chartJSON,
+        customYaxisMinValue,
+        customYaxisMaxValue
+      ).yAxisLabelArray;
+      chartJSON.yMaxLeft = yAxisLabelArray[yAxisLabelArray.length - 1];
+      chartJSON.yMinLeft = yAxisLabelArray[0];
       {
         yScaleLeft = linear$1().domain([
           chartJSON.yMinLeft >= 0 ? customYaxisMinValue !== void 0 && !Number.isNaN(customYaxisMinValue) ? customYaxisMinValue : 0 : chartJSON.yMinLeft < 0 ? chartJSON.yMinLeft * 1.1 : chartJSON.yMinLeft * 0.9,
@@ -17610,7 +17318,7 @@
       calculatedRange = [0, innerWidth2];
     };
     const getXScale = () => {
-      xScaleForLegends = band().domain(chartJSON.legendList).range([0, columnWidth]).paddingInner(
+      xScaleForLegends = band().domain(chartJSON.legendList.reverse()).range([0, columnWidth]).paddingInner(
         chartJSON.legendList.length > 1 ? 0.3 * parseFloat(formatOptions.plotArea.plotAreaSeriesWidth) / 100 : 0
       );
       xScale = point$7().domain(filteredDimension).range(calculatedRange).padding(0.5);
@@ -17708,7 +17416,7 @@
       let columnGroups = column.selectAll(".column-group").data(data2.data, (d) => d.legend + d.dimension);
       let columnGroupsEnter = columnGroups.enter().append("g").attr("class", "column-group").attr(
         "hoverId",
-        (d) => (data2.properties.alias || data2.properties.name).includes("-") ? (data2.properties.alias || data2.properties.name).replace("-", "`").split("`")[1].replace(/ /g, "-") : (data2.properties.alias || data2.properties.name).replace(/ /g, "-")
+        (d) => d.legend.includes("-") ? d.legend.replace("-", "`").split("`")[1].replace(/ /g, "-") : d.legend.replace(/ /g, "-")
       ).attr("transform", (d) => `translate(${xScale(d.dimension)}, 0)`);
       columnGroupsEnter.merge(columnGroups).attr(
         "transform",
@@ -17720,9 +17428,9 @@
       }).attr("height", (d) => {
         const yScale = data2.properties.axis === axisTypes.primary ? yScaleLeft : yScaleRight;
         return Math.abs(yScale(d.value) - yScale(0));
-      }).attr("fill", data2.properties.color).attr("stroke-dasharray", (d) => data2.properties.stackBorderStyle == 2 ? "5,3" : "0").attr("stroke-width", (d) => `${data2.properties.stackBorderWidth}px`).attr(
+      }).attr("fill", data2.properties.color).attr("stroke-dasharray", (d) => d.stackBorderStyle === 2 ? "5,3" : "0").attr("stroke-width", (d) => `${d.stackBorderWidth}px`).attr(
         "stroke",
-        (d) => data2.properties.stackBorderStyle == 0 ? "none" : formatOptions.column.stackBorderVisibility ? data2.properties.stackBorderColor : "none"
+        (d) => data2.properties.stackBorderStyle === 0 ? "none" : formatOptions.column.stackBorderVisibility ? data2.properties.stackBorderStyle : "none"
       ).style("clip-path", "inset(0px) fill-box").style("shape-rendering", "crispEdges").attr(
         "visibility",
         (d) => d.value === 0 && formatOptions.xAxisLabel.hideZeroValues ? "hidden" : "visible"
@@ -17968,7 +17676,7 @@
       ).merge(rects).attr(
         "hoverId",
         (d) => d.key.includes("~$~") ? d.key.split("~$~")[1].replace(/ /g, "-") : d.key.replace(/ /g, "-")
-      ).attr("x", (d) => xScaleForLegends(chartTypes.StackColumnChart)).attr(
+      ).attr("x", (d) => xScaleForLegends("stackLegend")).attr(
         "y",
         (d) => d.data.axis === axisTypes.primary ? yScaleLeft(d[1]) : yScaleRight(d[1])
       ).attr(
@@ -17984,12 +17692,12 @@
           (sdata) => sdata.legend === d.key
         );
         const props = seriesData[seriesIndex]?.properties;
-        return props?.stackBorderStyle == 0 ? "none" : formatOptions.column.stackBorderVisibility ? props.stackBorderColor : "none";
+        return props?.stackBorderStyle === 0 ? "none" : formatOptions.column.stackBorderVisibility ? props.stackBorderColor : "none";
       }).attr("stroke-dasharray", (d, i, nodes) => {
         const seriesIndex = Array.from(seriesData).findIndex(
           (sdata) => sdata.legend === d.key
         );
-        return seriesData[seriesIndex]?.properties.stackBorderStyle == 2 ? "5,3" : "0";
+        return seriesData[seriesIndex]?.properties.stackBorderStyle === 2 ? "5,3" : "0";
       }).attr("stroke-width", (d, i, nodes) => {
         const seriesIndex = Array.from(seriesData).findIndex(
           (sdata) => sdata.legend === d.key
@@ -18031,7 +17739,6 @@
       filteredData = fData;
       filteredDimension = fDimension;
       visibleBars = fVisibleBars;
-      createTotalMeasureValueMapForCustomColumChart(data, totalValueMap, filteredDimension);
       checkAndupdateInputData(
         primaryStackAreaAxisData,
         primaryStackColumnAxisData,
@@ -18055,28 +17762,6 @@
       });
       drawCustomChart();
     };
-    function createTotalMeasureValueMapForCustomColumChart(data2, totalValueMap2, filteredDimension2) {
-      totalValueMap2.clear();
-      if (filteredDimension2 && filteredDimension2.length > 0) {
-        filteredDimension2.forEach((dimension) => {
-          let totalMeasureValue = 0;
-          totalValueMap2.set(dimension, totalMeasureValue);
-        });
-      }
-      if (data2.ChartData && data2.ChartData.length > 0) {
-        data2.ChartData.forEach((series) => {
-          if (series.properties.type.includes("Stack")) {
-            series.data.forEach((dataPoint, index2) => {
-              if (totalValueMap2.has(dataPoint.dimension)) {
-                let existingTotal = totalValueMap2.get(dataPoint.dimension) || 0;
-                existingTotal += dataPoint.value || 0;
-                totalValueMap2.set(dataPoint.dimension, existingTotal);
-              }
-            });
-          }
-        });
-      }
-    }
     const drawCustomChart = () => {
       getXScale();
       getXAxis();
@@ -18095,8 +17780,7 @@
         isDateType,
         innerWidth2,
         innerHeight2,
-        filteredDimension,
-        xScale
+        filteredDimension
       );
       commonAnnotationsForCustomChart(
         filteredData,
@@ -18126,24 +17810,10 @@
         xScaleForLegends,
         isReportEditable
       );
-      addTotalValue(
-        totalValueMap,
-        xScale,
-        yScaleLeft,
-        margin,
-        d3Annotation,
-        [],
-        formatOptions,
-        chartType,
-        height,
-        width,
-        svg,
-        isReportEditable
-      );
     };
     const createStackData = (requiredStackChatData) => {
       let legendList = requiredStackChatData.data.map((d) => d.legend);
-      stackChartData = stack().keys(legendList).offset(none$3)(requiredStackChatData.stackData);
+      stackChartData = stack().keys(legendList).offset(diverging)(requiredStackChatData.stackData);
       requiredStackChatData.data.forEach(
         (data2, index2) => data2.data.forEach((axisData, position) => {
           axisData["0"] = stackChartData[index2][position][0];
@@ -18157,10 +17827,7 @@
           stackData["color"] = JSON.parse(
             JSON.stringify(requiredStackChatData.data[j].properties.color)
           );
-          stackData["individualAnnotationVisibility"] = JSON.parse(
-            JSON.stringify(requiredStackChatData.data[j].properties.annotation)
-          );
-          d.data.labelPosition = formatOptions?.annotation?.annotationPosition.toString() === "4" ? requiredStackChatData.data[j].properties.dataLabelPosition.toString() : formatOptions?.annotation?.annotationPosition.toString();
+          d.data.labelPosition = requiredStackChatData.data[j].properties.dataLabelPosition;
           d.data["labelColor"] = seriesColor == "2" ? JSON.parse(
             JSON.stringify(requiredStackChatData.data[j].properties.color)
           ) : JSON.parse(
@@ -18179,7 +17846,7 @@
           d.data["color"] = JSON.parse(
             JSON.stringify(requiredStackChatData.data[j].properties.color)
           );
-          d.data["legend"] = requiredStackChatData.properties.type;
+          d.data["legend"] = `stackLegend`;
           d.data["type"] = JSON.parse(
             JSON.stringify(requiredStackChatData.data[j].properties.type)
           );
@@ -18195,15 +17862,7 @@
         chartJSON.yMinLeft = Math.min(chartJSON.yMinLeft, ...totals);
       }
       if (secondaryStackAxisData.length > 0) {
-        const stackData = secondaryStackColumnAxisData.length > 0 ? getStackedData(
-          filteredDimension,
-          secondaryStackColumnAxisData,
-          false
-        ) : getStackedData(
-          filteredDimension,
-          secondaryStackAreaAxisData,
-          false
-        );
+        const stackData = secondaryStackColumnAxisData.length > 0 ? getStackedData(filteredDimension, secondaryStackColumnAxisData, false) : getStackedData(filteredDimension, secondaryStackAreaAxisData, false);
         const totals = stackData.map((d) => d.total);
         chartJSON.yMaxRight = Math.max(chartJSON.yMaxRight, ...totals);
         chartJSON.yMinRight = Math.min(chartJSON.yMinRight, ...totals);
@@ -18237,14 +17896,14 @@
     const barChart = false;
     const isSecondaryAxisDrawn = false;
     const isNormalizedChart = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
-    formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
-    ) : void 0;
-    formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    );
+    parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
-    ) : void 0;
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -18594,10 +18253,10 @@
           return Math.abs(yScale(d.value) - yScale(0));
         }).attr("fill", data2.properties.color).attr(
           "stroke-dasharray",
-          (d) => data2.properties.stackBorderStyle == 2 ? "5,3" : "0"
-        ).attr("stroke-width", () => `${data2.properties.stackBorderWidth}px`).attr(
+          (d) => d.stackBorderStyle === 2 ? "5,3" : "0"
+        ).attr("stroke-width", (d) => `${d.stackBorderWidth}px`).attr(
           "stroke",
-          () => data2.properties.stackBorderStyle == 0 ? "none" : formatOptions.column.stackBorderVisibility ? data2.properties.stackBorderColor : "none"
+          (d) => data2.properties.stackBorderStyle === 0 ? "none" : formatOptions.column.stackBorderVisibility ? data2.properties.stackBorderStyle : "none"
         ).style("clip-path", "inset(0px) fill-box").style("shape-rendering", "crispEdges").attr("opacity", 0.7).attr(
           "visibility",
           (d) => d.value === 0 && formatOptions.xAxisLabel.hideZeroValues ? "hidden" : "visible"
@@ -18666,8 +18325,7 @@
         isDateType,
         innerWidth2,
         innerHeight2,
-        filteredDimension,
-        xScale
+        filteredDimension
       );
       commonAnnotations(
         seriesData,
@@ -18756,14 +18414,14 @@
     const seriesData = (generalizedChartData(data.ChartData, data.DimensionList) || []).reverse();
     const barChart = false;
     const isSecondaryAxisDrawn = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
-    formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
-    ) : void 0;
-    formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    );
+    parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
-    ) : void 0;
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -19078,16 +18736,16 @@
         return props?.color || "gray";
       }).attr("stroke", (d, i, nodes) => {
         const { props } = getPropsForRect(nodes, i);
-        return props?.stackBorderStyle == 0 ? "none" : formatOptions.column.stackBorderVisibility ? props.stackBorderColor : "none";
+        return props?.stackBorderStyle === 0 ? "none" : formatOptions.column.stackBorderVisibility ? props.stackBorderColor : "none";
       }).attr("stroke-dasharray", (d, i, nodes) => {
         const { props } = getPropsForRect(nodes, i);
-        return props?.stackBorderStyle == 2 ? "5,3" : "0";
+        return props?.stackBorderStyle === 2 ? "5,3" : "0";
       }).attr("stroke-width", (d, i, nodes) => {
         const { props } = getPropsForRect(nodes, i);
         return (props?.stackBorderWidth || 0) + "px";
       }).style("clip-path", "inset(0px) fill-box").style("shape-rendering", "crispEdges").attr("visibility", (d, i, nodes) => {
         const { props } = getPropsForRect(nodes, i);
-        return d.data[d.key] == 0 && props?.hideZeroValues ? "hidden" : "visible";
+        return d.data[d.key] === 0 && props?.hideZeroValues ? "hidden" : "visible";
       }).on("mousemove", (event2, d) => {
         showTooltipOnMouseMove(
           [
@@ -19149,8 +18807,7 @@
         isDateType,
         innerWidth2,
         innerHeight2,
-        filteredDimension,
-        xScale
+        filteredDimension
       );
       createStackLineData();
       getChartType(filteredData);
@@ -19475,8 +19132,14 @@
     const dimensionList = data.DimensionList;
     const barChart = false;
     const isSecondaryAxisDrawn = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
+    );
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -19881,8 +19544,7 @@
         isDateType,
         innerWidth2,
         innerHeight2,
-        filteredDimension,
-        xScale
+        filteredDimension
       );
       getChartType(filteredData);
       stacklineAnnotations(
@@ -20497,10 +20159,16 @@
     const barChart = false;
     const isSecondaryAxisDrawn = false;
     const isNormalizedChart = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
-    let customXaxisMinValue = formatOptions.xAxisLabel.xAxisIntervalsVisibility ? parseFloat(formatOptions.xAxisLabel.xAxisMinText) : void 0;
-    let customXaxisMaxValue = formatOptions.xAxisLabel.xAxisIntervalsVisibility ? parseFloat(formatOptions.xAxisLabel.xAxisMaxText) : void 0;
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    let customXaxisMinValue = parseFloat(formatOptions.xAxisLabel.xAxisMinText);
+    let customXaxisMaxValue = parseFloat(formatOptions.xAxisLabel.xAxisMaxText);
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
+    );
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -20976,8 +20644,7 @@
         isDateType,
         innerWidth2,
         innerHeight2,
-        filteredDimension,
-        xScale
+        filteredDimension
       );
       getChartType();
     };
@@ -21009,14 +20676,14 @@
     const barChart = false;
     let isSecondaryAxisDrawn = false;
     const isNormalizedChart = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
-    let secondaryCustomYaxisMinValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    let secondaryCustomYaxisMinValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
-    ) : void 0;
-    let secondaryCustomYaxisMaxValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    );
+    let secondaryCustomYaxisMaxValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
-    ) : void 0;
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -21460,12 +21127,11 @@
         xAxis,
         dimensionHeightWidthArray,
         height,
-        innerWidth2 / xScale.length,
+        barWidth,
         isDateType,
         innerWidth2,
         innerHeight2,
-        filteredDimension,
-        xScale
+        filteredDimension
       );
       getChartType(filteredData);
       commonAnnotations(
@@ -21556,14 +21222,14 @@
     const barChart = false;
     const totalValueMap = /* @__PURE__ */ new Map();
     const isSecondaryAxisDrawn = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
-    let secondaryCustomYaxisMinValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    let secondaryCustomYaxisMinValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
-    ) : void 0;
-    let secondaryCustomYaxisMaxValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    );
+    let secondaryCustomYaxisMaxValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
-    ) : void 0;
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -21998,8 +21664,7 @@
         isDateType,
         innerWidth2,
         innerHeight2,
-        filteredDimension,
-        xScale
+        filteredDimension
       );
       createStackLineData();
       getChartType(filteredData);
@@ -22130,14 +21795,14 @@
     const dimensionList = data.DimensionList;
     const barChart = false;
     const isSecondaryAxisDrawn = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
-    let secondaryCustomYaxisMinValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    let secondaryCustomYaxisMinValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
-    ) : void 0;
-    let secondaryCustomYaxisMaxValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    );
+    let secondaryCustomYaxisMaxValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
-    ) : void 0;
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -22525,8 +22190,7 @@
         isDateType,
         innerWidth2,
         innerHeight2,
-        filteredDimension,
-        xScale
+        filteredDimension
       );
       getChartType(filteredData);
       stacklineAnnotations(
@@ -22648,14 +22312,14 @@
     const barChart = true;
     let isSecondaryAxisDrawn = false;
     const isNormalizedChart = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
-    let secondaryCustomYaxisMinValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    let secondaryCustomYaxisMinValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
-    ) : void 0;
-    let secondaryCustomYaxisMaxValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    );
+    let secondaryCustomYaxisMaxValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
-    ) : void 0;
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -22898,9 +22562,7 @@
         formatOptions,
         chartJSON,
         customYaxisMinValue,
-        customYaxisMaxValue,
-        barChart,
-        innerWidth2
+        customYaxisMaxValue
       ).yAxisLabelArray;
       chartJSON.yMaxLeft = yAxisLabelArray[yAxisLabelArray.length - 1];
       chartJSON.yMinLeft = yAxisLabelArray[0];
@@ -22979,7 +22641,7 @@
     };
     const getYAxis = () => {
       yAxis = axisLeft(yScale).tickSize(
-        formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesHorizontal ? parseFloat(formatOptions.plotArea.ticksHeight) * innerWidth2 * (formatOptions.xAxisLabel.xAxisPosition == "1" ? 1 : -1) * 0.01 : 0 : 0
+        formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesVertical ? -innerWidth2 : parseFloat(formatOptions.plotArea.ticksHeight) * innerWidth2 * (formatOptions.xAxisLabel.xAxisPosition == "1" ? 1 : -1) : 0
       ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(filteredDimension, innerHeight2));
     };
     const getChartType = (lineData) => {
@@ -22995,10 +22657,7 @@
       lineData.forEach((data2) => {
         let column = gTag.selectAll(".parentGroup").data([data2], (d) => d.legend);
         column = column.enter().append("g").attr("class", "column parentGroup").merge(column);
-        let columnGroups = column.selectAll(".column-group").data(
-          data2.data.map((d) => ({ ...d, properties: data2.properties })),
-          (d) => d.legend + d.dimension
-        );
+        let columnGroups = column.selectAll(".column-group").data(data2.data, (d) => d.legend + d.dimension);
         let columnGroupsEnter = columnGroups.enter().append("g").attr("class", "column-group").attr(
           "hoverId",
           (data2.properties.alias || data2.properties.name || "Legend").replace(
@@ -23068,7 +22727,7 @@
               },
               {
                 key: "Legend",
-                value: d.properties.alias
+                value: d.legend.includes("~$~") ? d.legend.split("~$~")[1] : d.legend
               }
             ],
             formatOptions,
@@ -23092,14 +22751,12 @@
       filteredDimension = fDimension;
       visibleBars = fVisibleBars;
       createTotalMeasureValueMap(data, totalValueMap, filteredDimension);
-      if (formatOptions.xAxisLabel.hideZeroValues) {
-        filteredDimension = filteredDimension.filter((d) => totalValueMap.get(d) !== 0);
-      }
       drawColumnChart();
     };
     const drawColumnChart = () => {
       getYScale();
       getYAxis();
+      getChartType(filteredData);
       initYaxisBar(
         formatOptions,
         gTag,
@@ -23115,10 +22772,8 @@
         isDateType,
         width,
         dimensionHeightWidthArray,
-        columnWidth,
-        yScale
+        columnWidth
       );
-      getChartType(filteredData);
       commonAnnotations(
         filteredData,
         yScale,
@@ -23176,8 +22831,14 @@
     const dimensionList = data.DimensionList;
     const barChart = true;
     const isSecondaryAxisDrawn = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
+    );
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -23461,7 +23122,7 @@
     };
     const getYAxis = () => {
       yAxis = axisLeft(yScale).tickSize(
-        formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesHorizontal ? parseFloat(formatOptions.plotArea.ticksHeight) * innerWidth2 * (formatOptions.xAxisLabel.xAxisPosition == "1" ? 1 : -1) * 0.01 : 0 : 0
+        formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesVertical ? -innerWidth2 : parseFloat(formatOptions.plotArea.ticksHeight) * innerWidth2 * (formatOptions.xAxisLabel.xAxisPosition == "1" ? 1 : -1) : 0
       ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(filteredDimension, innerHeight2));
     };
     const getChartType = (lineData) => {
@@ -23548,7 +23209,7 @@
       filteredData = fData;
       filteredDimension = fDimension;
       visibleBars = fVisibleBars;
-      createTotalMeasureValueMap(fData, totalValueMap, filteredDimension);
+      createTotalMeasureValueMap(data, totalValueMap, filteredDimension);
       createStackLineData();
       drawLineChart();
     };
@@ -23570,8 +23231,7 @@
         isDateType,
         width,
         dimensionHeightWidthArray,
-        columnWidth,
-        yScale
+        columnWidth
       );
       getChartType(filteredData);
       stacklineAnnotations(
@@ -23880,8 +23540,14 @@
     const dimensionList = data.DimensionList;
     const barChart = true;
     const isSecondaryAxisDrawn = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
+    );
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -24128,9 +23794,13 @@
       calculatedRange = [innerHeight2, 0];
     };
     const getYScale = () => {
-      yScale = point$7().domain(filteredDimension).range(calculatedRange).padding(0.5);
+      columnWidth = (0.51 + 0.61 * (100 - parseFloat(formatOptions.plotArea.plotAreaGapWidth)) / 100) * (innerHeight2 / filteredDimension.length);
+      yScale = band().domain(filteredDimension).range(calculatedRange).padding(
+        0.3 * parseFloat(formatOptions.plotArea.plotAreaGapWidth) / 100
+      );
     };
     const initAxis = () => {
+      getYAxis();
       {
         xAxisBottom = axisBottom(xScaleBottom).tickSize(
           formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesVertical ? -innerHeight2 : 0 : 0
@@ -24139,7 +23809,7 @@
     };
     const getYAxis = () => {
       yAxis = axisLeft(yScale).tickSize(
-        formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesHorizontal ? parseFloat(formatOptions.plotArea.ticksHeight) * innerWidth2 * (formatOptions.xAxisLabel.xAxisPosition == "1" ? 1 : -1) * 0.01 : 0 : 0
+        formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesVertical ? -innerWidth2 : parseFloat(formatOptions.plotArea.ticksHeight) * innerWidth2 * (formatOptions.xAxisLabel.xAxisPosition == "1" ? 1 : -1) : 0
       ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(filteredDimension, innerHeight2));
     };
     const getChartType = (lineData) => {
@@ -24173,7 +23843,7 @@
         );
         return { props: seriesData[groupIndex]?.properties, groupIndex };
       };
-      const baseRects = rects.enter().append("rect").merge(rects).attr("y", (d) => yScale(d.data.dimension) - columnWidth / 2).attr("height", columnWidth).attr(
+      const baseRects = rects.enter().append("rect").merge(rects).attr("y", (d) => yScale(d.data.dimension) - yScale.bandwidth() / 2).attr("height", yScale.bandwidth()).attr(
         "fill",
         (d, i, nodes) => getPropsForRect(nodes, i).props?.color || "gray"
       ).attr("stroke", (d, i, nodes) => {
@@ -24247,8 +23917,7 @@
         isDateType,
         width,
         dimensionHeightWidthArray,
-        columnWidth,
-        yScale
+        columnWidth
       );
       getChartType(filteredData);
       stacklineAnnotations(
@@ -24340,8 +24009,14 @@
     const dimensionList = data.DimensionList;
     const barChart = true;
     const isSecondaryAxisDrawn = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
+    );
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -24621,7 +24296,7 @@
     };
     const getYAxis = () => {
       yAxis = axisLeft(yScale).tickSize(
-        formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesHorizontal ? parseFloat(formatOptions.plotArea.ticksHeight) * innerWidth2 * (formatOptions.xAxisLabel.xAxisPosition == "1" ? 1 : -1) * 0.01 : 0 : 0
+        formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesVertical ? -innerWidth2 : parseFloat(formatOptions.plotArea.ticksHeight) * innerWidth2 * (formatOptions.xAxisLabel.xAxisPosition == "1" ? 1 : -1) : 0
       ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(filteredDimension, innerHeight2));
     };
     const getChartType = (lineData) => {
@@ -24739,8 +24414,7 @@
         isDateType,
         width,
         dimensionHeightWidthArray,
-        columnWidth,
-        yScale
+        columnWidth
       );
       createStackLineData();
       getChartType(filteredData);
@@ -25019,10 +24693,16 @@
     const barChart = false;
     const isSecondaryAxisDrawn = false;
     const isNormalizedChart = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
-    let customXaxisMinValue = formatOptions.xAxisLabel.xAxisIntervalsVisibility ? parseFloat(formatOptions.xAxisLabel.xAxisMinText) : void 0;
-    let customXaxisMaxValue = formatOptions.xAxisLabel.xAxisIntervalsVisibility ? parseFloat(formatOptions.xAxisLabel.xAxisMaxText) : void 0;
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    let customXaxisMinValue = parseFloat(formatOptions.xAxisLabel.xAxisMinText);
+    let customXaxisMaxValue = parseFloat(formatOptions.xAxisLabel.xAxisMaxText);
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
+    );
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -25153,8 +24833,7 @@
         isDateType,
         innerWidth2,
         innerHeight2,
-        filteredDimension,
-        yScaleLeft
+        filteredDimension
       );
       initYaxis$1(
         gTag,
@@ -25533,14 +25212,14 @@
     const barChart = false;
     const isSecondaryAxisDrawn = false;
     const isNormalizedChart = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
-    let secondaryCustomYaxisMinValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    let secondaryCustomYaxisMinValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
-    ) : void 0;
-    let secondaryCustomYaxisMaxValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    );
+    let secondaryCustomYaxisMaxValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
-    ) : void 0;
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -25858,7 +25537,6 @@
       ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(filteredDimension, innerWidth2));
     };
     const getChartType = (lineData) => {
-      const isLinesAndMarkersVisible = formatOptions.plotArea.plotAreaHideLineAndMarkers;
       lineData.forEach((lData) => {
         lData.data.forEach((cData) => {
           cData.hideZero = lData.properties.hideZeroValues;
@@ -25910,7 +25588,7 @@
           (d2) => d2.properties.lineStyle === staticLineStyle.dotted ? strokeLineCap.round : strokeLineCap.butt
         ).attr(
           "stroke-width",
-          (d2) => !isLinesAndMarkersVisible ? 0 : d2.properties.lineStyle !== staticLineStyle.none && formatOptions.plotArea.plotAreaHideLineAndMarkers ? d2.properties.lineWidth : "0"
+          (d2) => d2.properties.lineStyle !== staticLineStyle.none && formatOptions.plotArea.plotAreaHideLineAndMarkers ? d2.properties.lineWidth : "0"
         ).attr("fill", "none");
         g.selectAll("path.hoverLine").data([d]).join("path").attr("class", "hoverLine").attr("d", (d2) => areaGenerator(d2.data)).attr("fill", commonColors.transparent).attr("stroke", "none").style("pointer-events", "all").raise();
         onHoverMarkerForAreaChartFamily(
@@ -25970,8 +25648,7 @@
         isDateType,
         innerWidth2,
         innerHeight2,
-        filteredDimension,
-        xScale
+        filteredDimension
       );
       commonAnnotations(
         seriesData,
@@ -26061,14 +25738,14 @@
     const dimensionList = data.DimensionList;
     const barChart = false;
     const isSecondaryAxisDrawn = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
-    let secondaryCustomYaxisMinValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    let secondaryCustomYaxisMinValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
-    ) : void 0;
-    let secondaryCustomYaxisMaxValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    );
+    let secondaryCustomYaxisMaxValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
-    ) : void 0;
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -26400,7 +26077,6 @@
       ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(filteredDimension, innerWidth2));
     };
     const getChartType = (lineData) => {
-      const isLinesAndMarkersVisible = formatOptions.plotArea.plotAreaHideLineAndMarkers;
       lineData.forEach((lData) => {
         lData.data.forEach((cData) => {
           cData.hideZero = lData.properties.hideZeroValues;
@@ -26434,7 +26110,7 @@
         const g = select$2(this);
         g.selectAll("path.visibleLine").data([d]).join("path").attr("class", "visibleLine parentGroup").attr("d", (d2) => areaGenerator(d2)).attr(
           "stroke",
-          (d2) => d2.color !== commonColors.white ? seriesData[i].properties.areaBorderColor : "none"
+          (d2) => d2.color !== commonColors.white ? d2.color : "none"
         ).attr("stroke-dasharray", (d2) => {
           const lineWidth = parseInt(
             seriesData[i].properties.lineWidth.toString()
@@ -26452,7 +26128,7 @@
           () => seriesData[i]?.properties?.lineStyle.toLowerCase() === staticLineStyle.dotted ? strokeLineCap.round : ""
         ).attr(
           "stroke-width",
-          () => !isLinesAndMarkersVisible ? 0 : seriesData[i].properties.lineStyle !== staticLineStyle.none ? seriesData[i].properties.lineWidth : "0"
+          (d2, i2) => seriesData[i2].properties.lineStyle !== staticLineStyle.none ? seriesData[i2].properties.lineWidth : "0"
         ).attr("fill", "none").style("pointer-events", "none");
         g.selectAll("path.hoverLine").data([d]).join("path").attr("class", "hoverLine").attr("d", (d2) => areaGenerator(d2)).attr("fill", commonColors.transparent).attr("stroke", "none").style("pointer-events", "all").raise();
         svg.selectAll(
@@ -26468,8 +26144,7 @@
         lineData,
         xScale,
         yScaleLeft,
-        chartType,
-        true
+        chartType
       );
       lineMarkers(
         areas,
@@ -26518,8 +26193,7 @@
         isDateType,
         innerWidth2,
         innerHeight2,
-        filteredDimension,
-        xScale
+        filteredDimension
       );
       getChartType(filteredData);
       stacklineAnnotations(
@@ -26652,14 +26326,14 @@
     const dimensionList = data.DimensionList;
     const barChart = false;
     const isSecondaryAxisDrawn = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
-    let secondaryCustomYaxisMinValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    let secondaryCustomYaxisMinValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
-    ) : void 0;
-    let secondaryCustomYaxisMaxValue = formatOptions.secondaryYAxisLabel.secondaryYAxisIntervalsVisibility ? parseFloat(
+    );
+    let secondaryCustomYaxisMaxValue = parseFloat(
       formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
-    ) : void 0;
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -26950,7 +26624,6 @@
       ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(filteredDimension, innerWidth2));
     };
     const getChartType = (lineData) => {
-      const isLinesAndMarkersVisible = formatOptions.plotArea.plotAreaHideLineAndMarkers;
       stackChartData.forEach(
         (data2, i) => data2.forEach((item, position) => {
           const total = item.data.total;
@@ -26992,7 +26665,7 @@
         const g = select$2(this);
         g.selectAll("path.visibleLine").data([d]).join("path").attr("class", "visibleLine parentGroup").attr("d", (d2) => columnGenerator(d2)).attr(
           "stroke",
-          (d2) => d2.color !== commonColors.white ? seriesData[i].properties.areaBorderColor : "none"
+          (d2) => d2.color !== commonColors.white ? d2.color : "none"
         ).attr("stroke-dasharray", (d2) => {
           const lineWidth = parseInt(
             seriesData[i].properties.lineWidth.toString()
@@ -27010,7 +26683,7 @@
           () => seriesData[i]?.properties?.lineStyle.toLowerCase() === staticLineStyle.dotted ? strokeLineCap.round : ""
         ).attr(
           "stroke-width",
-          () => !isLinesAndMarkersVisible ? 0 : seriesData[i].properties.lineStyle !== staticLineStyle.none ? seriesData[i].properties.lineWidth : "0"
+          (d2, i2) => seriesData[i2].properties.lineStyle !== staticLineStyle.none ? seriesData[i2].properties.lineWidth : "0"
         ).attr("fill", "none").style("pointer-events", "none");
         g.selectAll("path.hoverLine").data([d]).join("path").attr("class", "hoverLine").attr("d", (d2) => columnGenerator(d2)).attr("fill", commonColors.transparent).style("pointer-events", "all").raise();
         svg.selectAll(
@@ -27028,8 +26701,7 @@
         lineData,
         xScale,
         yScaleLeft,
-        chartType,
-        true
+        chartType
       );
       gTag.selectAll(".parentGroup").raise();
       gTag.selectAll(".hoverLine").raise();
@@ -27105,8 +26777,7 @@
         isDateType,
         innerWidth2,
         innerHeight2,
-        filteredDimension,
-        xScale
+        filteredDimension
       );
       getChartType(filteredData);
       stacklineAnnotations(
@@ -27399,7 +27070,7 @@
       try {
         const arc2 = arc$1().innerRadius(0).outerRadius(radius);
         const arcOver = arc$1().innerRadius(0).outerRadius(radius + 10);
-        chartAreaTagG.append("g").attr("class", "parentGroup").attr("fill-opacity", chartFormatOptions.plotArea.opacity).attr("transform", `${getPiePosition()}`).selectAll("path").data(pieChartData).enter().append("path").attr("class", (d) => "path").attr(
+        chartAreaTagG.append("g").attr("class", "parentGroup").attr("fill-opacity", chartFormatOptions.plotArea.opacity).attr("transform", `${getPiePosition()}`).selectAll("path").data(pieChartData).enter().append("path").attr("class", (d) => "path " + d.data.legend).attr(
           "hoverId",
           (d) => (d.data?.properties?.alias || d.data?.properties?.name || "Legend").replace(/\s+/g, "-")
         ).attr(
@@ -27793,7 +27464,7 @@
         const arc2 = arc$1().innerRadius(innerRadius).outerRadius(radius);
         const arcOver = arc$1().innerRadius(innerRadius).outerRadius(radius + 10);
         const parentGroup = chartAreaTagG.append("g").attr("class", "parentGroup").attr("fill-opacity", chartFormatOptions.plotArea.opacity).attr("transform", `${getPiePosition()}`);
-        const paths = parentGroup.selectAll("path").data(pieChartData).enter().append("path").attr("class", (d) => "path").attr(
+        const paths = parentGroup.selectAll("path").data(pieChartData).enter().append("path").attr("class", (d) => "path " + d.data.legend).attr(
           "hoverId",
           (d) => (d.data?.properties?.alias || d.data?.properties?.name || "Legend").replace(/\s+/g, "-")
         ).attr(
@@ -29149,8 +28820,6 @@
     let legendListWidth;
     let radius;
     let innerRadius;
-    const arcIndex = 1;
-    const progressIndex = 0;
     require$$0$1.useEffect(() => {
       drawChart();
     }, [formatOptions]);
@@ -29210,22 +28879,23 @@
     };
     const initProgressChartData = () => {
       try {
-        totalValue = ChartData[arcIndex].data[0].value + ChartData[progressIndex].data[0].value;
+        seriesData = seriesData.sort((a2, b) => b.data[0].value - a2.data[0].value);
+        totalValue = ChartData[0].data[0].value + ChartData[1].data[0].value;
       } catch (error) {
         logError$2(fileName$3, "initProgressChartData", error);
       }
     };
     const drawProgressChart = () => {
       try {
-        let maxValue = ChartData[arcIndex].data[0].value;
-        let progressValue = ChartData[progressIndex].data[0].value;
+        let maxValue = ChartData[0].data[0].value;
+        let progressValue = ChartData[1].data[0].value;
         let completeAngle = Math.PI * 2;
         let progressAngle = progressValue / maxValue * Math.PI * 2;
         let valuefontStyle = chartFormatOptions.plotArea.dataLabelValueFontStyle;
         const arc2 = arc$1().innerRadius(innerRadius).outerRadius(radius).startAngle(0).cornerRadius(
           convertStringToNumber(chartFormatOptions.plotArea.cornerRadius)
         );
-        chartAreaTagG.append("path").attr("class", "secondary-circle").attr("fill", ChartData[arcIndex].properties.color).attr(
+        chartAreaTagG.append("path").attr("class", "secondary-circle").attr("fill", ChartData[0].properties.color).attr(
           "fill-opacity",
           chartFormatOptions.plotArea.opacityforProgressScale
         ).attr("d", arc2({ endAngle: completeAngle })).on("mousemove", (d) => {
@@ -29233,7 +28903,7 @@
             showTooltipOnMouseMove(
               [
                 {
-                  key: ChartData[arcIndex].properties.alias,
+                  key: ChartData[0].properties.alias,
                   value: chartFormatOptions.toolTip.toolTipNumberFormatProgress == ",.0%" ? "100 %" : getNumberWithFormatFunction(
                     chartFormatOptions.toolTip.toolTipDisplayUnits,
                     chartFormatOptions.toolTip.toolTipNumberFormatProgress,
@@ -29243,7 +28913,7 @@
               ],
               chartFormatOptions,
               void 0,
-              ChartData[arcIndex].properties
+              ChartData[0].properties
             );
           } catch (error) {
             logError$2(
@@ -29263,7 +28933,7 @@
             );
           }
         }).attr("transform", getTransformString());
-        chartAreaTagG.append("path").attr("class", "progress-circle").attr("fill", ChartData[progressIndex].properties.color).attr(
+        chartAreaTagG.append("path").attr("class", "progress-circle").attr("fill", ChartData[1].properties.color).attr(
           "fill-opacity",
           chartFormatOptions.plotArea.opacityforProgressGoal
         ).attr("d", arc2({ endAngle: progressAngle })).on("mousemove", (d) => {
@@ -29271,7 +28941,7 @@
             showTooltipOnMouseMove(
               [
                 {
-                  key: ChartData[progressIndex].properties.alias,
+                  key: ChartData[1].properties.alias,
                   value: chartFormatOptions.toolTip.toolTipNumberFormatProgress == ",.0%" ? Math.round(progressValue / maxValue * 100) + "%" : getNumberWithFormatFunction(
                     chartFormatOptions.toolTip.toolTipDisplayUnits,
                     chartFormatOptions.toolTip.toolTipDecimalPrecision,
@@ -29279,7 +28949,7 @@
                   )(maxValue)
                 },
                 {
-                  key: ChartData[arcIndex].properties.alias,
+                  key: ChartData[0].properties.alias,
                   value: chartFormatOptions.toolTip.toolTipNumberFormatProgress == ",.0%" ? "100 %" : getNumberWithFormatFunction(
                     chartFormatOptions.toolTip.toolTipDisplayUnits,
                     chartFormatOptions.toolTip.toolTipDecimalPrecision,
@@ -29289,7 +28959,7 @@
               ],
               chartFormatOptions,
               void 0,
-              ChartData[progressIndex].properties
+              ChartData[1].properties
             );
           } catch (error) {
             logError$2(
@@ -54089,22 +53759,27 @@
   const WaterfallChart = ({
     isDateType,
     formatOptions,
-    data,
-    isAdvancedAnalyticsWaterFall = false
+    data
   }) => {
     const chartId = crypto.randomUUID?.();
     let columnWidth = 0;
     let colorScale;
     const chartType = chartTypes.WaterfallChart;
     const svgRef = require$$0$1.useRef();
-    const isAdvancedWaterfall = isAdvancedAnalyticsWaterFall ?? false;
+    const isAdvancedWaterfall = Array.isArray(data) && data.length > 0 && data[0]?.hasOwnProperty("Column1") && data[0]?.hasOwnProperty("Column6");
     const seriesData = isAdvancedWaterfall ? [] : generalizedChartData(data.ChartData, data.DimensionList);
     const dimensionList = data.DimensionList;
     const barChart = false;
     const isSecondaryAxisDrawn = false;
     const isNormalizedChart = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
+    );
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -54530,17 +54205,16 @@
             "visibility",
             (d) => k2 === 0 && d.data.dimension && stackTotalData ? "hidden" : "visible"
           ).style("shape-rendering", "crispEdges").on("mousemove", (event2, d) => {
-            const key = !isAdvancedWaterfall ? waterfallKeys.dimensionTotal : waterfallKeys.base;
             const markerInfo = {
               markerShape: "square",
-              markerColor: d.key === key ? formatOptions.plotArea.totalColor : d.key === waterfallKeys.down ? formatOptions.plotArea.negativeColor : formatOptions.plotArea.positiveColor
+              markerColor: d.key === "dimensionTotal" ? formatOptions.plotArea.totalColor : d.key === "down" ? formatOptions.plotArea.negativeColor : formatOptions.plotArea.positiveColor
             };
             showTooltipOnMouseMove(
               [
                 {
                   key: formatOptions.yAxisTitle.yAxisTitleText,
-                  value: (d.key === waterfallKeys.up ? "+" : d.key === waterfallKeys.down ? "-" : "") + getNumberWithFormat(
-                    d.key === waterfallKeys.dimensionTotal ? d.data.dimensionTotal : d[1] - d[0],
+                  value: (d.key === "up" ? "+" : d.key === "down" ? "-" : "") + getNumberWithFormat(
+                    d.key === "dimensionTotal" ? d.data.dimensionTotal : d[1] - d[0],
                     formatOptions.toolTip.toolTipDisplayUnits,
                     formatOptions.toolTip.toolTipNumberFormat,
                     formatOptions.toolTip.toolTipDecimalPrecision
@@ -54548,7 +54222,7 @@
                 },
                 {
                   key: "Legend",
-                  value: !isAdvancedWaterfall ? d.Key ? d.Key.includes("~$~") ? d.Key.split("~$~")[1] : d.Key : d.data.legend ? d.data.legend.includes("~$~") ? d.data.legend.split("~$~")[1] : d.data.legend : waterfallKeys.total : d.key !== waterfallKeys.base ? d.data.xKey : waterfallKeys.total
+                  value: d.Key ? d.Key.includes("~$~") ? d.Key.split("~$~")[1] : d.Key : d.data.legend ? d.data.legend.includes("~$~") ? d.data.legend.split("~$~")[1] : d.data.legend : "Total"
                 }
               ],
               formatOptions,
@@ -54666,8 +54340,7 @@
         isDateType,
         innerWidth2,
         innerHeight2,
-        chartJSON.legendList,
-        xScale
+        chartJSON.legendList
       );
     };
     const generateWaterFallData = () => {
@@ -54754,14 +54427,13 @@
     };
     const toNumber = (v) => v === null || v === void 0 || v === "" ? 0 : Number(v);
     const mapAdvancedWaterfallData = (rawData) => {
-      const tempRawDataForAAWaterfallChart = rawData[0].Column1 == "" ? rawData.filter((d) => d.Column1 && d.Column1 !== "*") : rawData;
-      return tempRawDataForAAWaterfallChart.map((d) => ({
-        xKey: d.Column1 || (d.Dimension || d.Legend),
-        base: toNumber(d.Column3 || d.Total),
-        up: toNumber(d.Column4 || d.Up),
-        down: toNumber(d.Column5 || d.Down),
-        total: toNumber(d.Column6 || d.total),
-        dimensionTotal: toNumber(d.Column2 || d.Base)
+      return rawData.filter((d) => d.Column1 && d.Column1 !== "*").map((d) => ({
+        xKey: d.Column1,
+        base: toNumber(d.Column3),
+        up: toNumber(d.Column4),
+        down: toNumber(d.Column5),
+        total: toNumber(d.Column6),
+        dimensionTotal: toNumber(d.Column2)
       }));
     };
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -54785,18 +54457,23 @@
     const chartType = chartTypes.TornadoChart;
     const isAdvanceAnalyticsChart = data.IsadvanceanalyticsChart;
     const svgRef = require$$0$1.useRef();
-    let seriesData = generalizedChartData(
+    const seriesData = generalizedChartData(
       data.ChartData,
       data.DimensionList,
       true
     );
-    seriesData = modifySeriesDataForTornadoChart(seriesData, data, isAdvanceAnalyticsChart);
     const dimensionList = data.DimensionList;
     const barChart = true;
     const isSecondaryAxisDrawn = false;
     const isNormalizedChart = false;
-    let customYaxisMinValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMinText) : void 0;
-    let customYaxisMaxValue = formatOptions.yAxisLabel.yAxisIntervalsVisibility ? parseFloat(formatOptions.yAxisLabel.yAxisMaxText) : void 0;
+    let customYaxisMinValue = parseFloat(formatOptions.yAxisLabel.yAxisMinText);
+    let customYaxisMaxValue = parseFloat(formatOptions.yAxisLabel.yAxisMaxText);
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMinText
+    );
+    parseFloat(
+      formatOptions.secondaryYAxisLabel.secondaryYAxisMaxText
+    );
     let margin;
     let yLabel;
     let xLabel;
@@ -54827,8 +54504,7 @@
     let filteredDimension;
     let filteredData = [];
     let scrollPosition = 0;
-    let visibleBars = 2;
-    let scrollbarVisible = false;
+    const visibleBars = 2;
     let chartJSON = {
       dimensionList,
       chartType,
@@ -54856,7 +54532,6 @@
         formatOptions
       ));
       formatOptions.xAxisLabel.labelTextWrap = false;
-      formatOptions.xAxisLabel.xAxisLabelRotation = 90;
       preProcessChartData();
       ({ maxNumberForPrimaryAxis, maxNumberForSecondaryAxis } = customYscaleLabelFormatting$1(
         // for calculating primary/secondary axis max number so that we can calculate margin accordinglt
@@ -54876,10 +54551,7 @@
         chartTitleHeight,
         secondaryAxisTitleWidth,
         legendMargin,
-        secondaryYLabel,
-        visibleBars,
-        columnWidth,
-        scrollbarVisible
+        secondaryYLabel
       } = marginCalculation(
         // for all margin related calculations
         width,
@@ -54894,8 +54566,7 @@
         isSecondaryAxisDrawn,
         isNormalizedChart,
         isDateType,
-        true,
-        chartJSON
+        true
       ));
       setSVGContainer(margin);
       ({ dataTable, dataTableHeight } = dataTablePreCalculation(
@@ -54939,8 +54610,7 @@
         isDateType,
         width,
         dimensionHeightWidthArray,
-        columnWidth,
-        yScaleLeft
+        columnWidth
       );
       horizontalScrollBar2(seriesData, height, svg, margin, innerWidth2);
       if (formatOptions.dataTableProperties && formatOptions.dataTableProperties.dataTable) {
@@ -55105,6 +54775,7 @@
       }
     };
     const initScale = () => {
+      columnWidth = (0.51 + 0.61 * (100 - parseFloat(formatOptions.plotArea.plotAreaGapWidth)) / 100) * (innerHeight2 / filteredDimension.length);
       let right2 = false;
       let left2 = false;
       let maxValue;
@@ -55127,7 +54798,7 @@
       getXScale();
     };
     const getXScale = () => {
-      yScaleLeft = point$7().domain(chartJSON.dimensionList).range([innerHeight2, 0]).padding(0.5);
+      yScaleLeft = band().domain(chartJSON.dimensionList).range([innerHeight2, 0]).padding(0.35);
     };
     const initAxis = () => {
       getXAxis();
@@ -55190,8 +54861,8 @@
         )
       ).enter().append("rect").attr("class", "rect").attr(
         "y",
-        (d) => (d.legendText ? yScaleLeft(d.legendText) : yScaleLeft(chartTypes.TornadoDefaultEntry)) - columnWidth / 2
-      ).attr("height", columnWidth).attr("x", (d) => d.value >= 0 ? xScale(0) : xScale(d.value)).attr("width", (d) => Math.abs(xScale(d.value) - xScale(0))).style("shape-rendering", "crispEdges").attr(
+        (d) => d.legendText ? yScaleLeft(d.legendText) : yScaleLeft(chartTypes.TornadoDefaultEntry)
+      ).attr("height", yScaleLeft.bandwidth()).attr("x", (d) => d.value >= 0 ? xScale(0) : xScale(d.value)).attr("width", (d) => Math.abs(xScale(d.value) - xScale(0))).style("shape-rendering", "crispEdges").attr(
         "stroke-dasharray",
         (d) => d.properties.stackBorderStyle == 2 ? "5,3" : "0"
       ).attr("stroke-width", (d) => `${d.properties.stackBorderWidth}px`).attr(
@@ -55320,10 +54991,9 @@
         svg,
         yScaleLeft,
         columnWidth,
-        isReportEditable,
         isAdvanceAnalyticsChart,
-        barChart,
-        isAdvanceAnalyticsChart
+        isReportEditable,
+        barChart
       );
     };
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ jsxRuntimeExports.jsx(