pace-chart-lib 1.0.34 → 1.0.36

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

@@ -12752,9 +12752,11 @@ const MONTH_NAMES = {
   ]
 };
 const getDateFromDimension = (dimension) => {
-  const utc_days = Math.floor(Number(dimension) - 25569);
-  const utc_value = utc_days * 86400;
-  const date2 = new Date(utc_value * 1e3);
+  const serial = Number(dimension);
+  if (!Number.isFinite(serial)) return null;
+  const utcDays = Math.floor(serial - 25569);
+  const date2 = new Date(utcDays * 86400 * 1e3);
+  if (Number.isNaN(date2.getTime())) return null;
   return {
     day: date2.getUTCDate(),
     month: date2.getUTCMonth(),
@@ -12813,8 +12815,9 @@ const formatDate = (day, month, year, format2) => {
 const setDateFormats = (format2, dimensionmarks) => {
   try {
     return dimensionmarks.map((dim) => {
-      const { day, month, year } = getDateFromDimension(dim);
-      if (day == null || month == null || year == null) return dim;
+      const date2 = getDateFromDimension(dim);
+      if (!date2) return dim;
+      const { day, month, year } = date2;
       return formatDate(day, month, year, format2);
     });
   } catch (error) {
@@ -12966,9 +12969,10 @@ function getSlicedLegendForTornado(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, formatOptions, chartType, height, width, innerWidth2, dimensionList, innerHeight2, widgetId, svg, onDataLabelCoordinatesChange, xScaleForLegends, columnWidth, isReportEditable, isSensitivityChart, barChart, isAATornado) {
   try {
     const isTornadoChart = chartType === chartTypes.TornadoChart;
+    let oldMap = /* @__PURE__ */ new Map();
     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";
@@ -12979,6 +12983,7 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
       let connector = formatOptions.annotation.connectorType;
       let labelType = formatOptions.annotation.annotationVisibility;
       let fontStyle = formatOptions.annotation.annotationFontStyle;
+      let oldAnnotationList = JSON.parse(JSON.stringify(formatOptions.plotArea.dataLabelsCoordinates));
       let connectorType = formatOptions.annotation.connectorType ? formatOptions.annotation.connectorType.toLowerCase() : "None";
       oldAnnotationList = conditionallyResetOldAnnotations(
         oldAnnotationList,
@@ -12997,74 +13002,89 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
       }
       switch (labelType) {
         case "2":
-          chartData.forEach((d) => {
-            if (d.data[0])
-              labelData.push({
-                Dimension: d.data[0].dimension,
-                Measure: d.data[0].value,
-                Legend: d.data[0].legend,
-                LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
-                Labelcolor: d.properties[dataLabelColor],
-                hoverText: getHoverText(d, isAATornado),
-                Axis: d.properties.axis
-              });
-          });
+          chartData.forEach(
+            (d) => {
+              if (d.data[0])
+                labelData.push({
+                  Dimension: d.data[0].dimension,
+                  Measure: d.data[0].value,
+                  Legend: d.data[0].legend,
+                  LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
+                  Labelcolor: d.properties[dataLabelColor],
+                  hoverText: getHoverText(d, isAATornado),
+                  Axis: d.properties.axis,
+                  LegendUniqueId: d.properties.legendUniqueId
+                });
+            }
+          );
           break;
         case "3":
-          chartData.forEach((d) => {
-            if (d.data[d.data.length - 1]) {
-              labelData.push({
-                Dimension: d.data[d.data.length - 1].dimension,
-                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),
-                Axis: d.properties.axis
-              });
+          chartData.forEach(
+            (d) => {
+              if (d.data[d.data.length - 1]) {
+                labelData.push({
+                  Dimension: d.data[d.data.length - 1].dimension,
+                  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),
+                  Axis: d.properties.axis,
+                  LegendUniqueId: d.properties.legendUniqueId
+                });
+              }
             }
-          });
+          );
           break;
         case "4":
-          chartData.forEach((d) => {
-            if (d.data[0])
-              labelData.push({
-                Dimension: d.data[0].dimension,
-                Measure: d.data[0].value,
-                Legend: d.data[0].legend,
-                LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
-                Labelcolor: d.properties[dataLabelColor],
-                hoverText: getHoverText(d, isAATornado),
-                Axis: d.properties.axis
-              });
-          });
-          chartData.forEach((d) => {
-            if (d.data[d.data.length - 1])
-              labelData.push({
-                Dimension: d.data[d.data.length - 1].dimension,
-                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),
-                Axis: d.properties.axis
-              });
-          });
-          break;
-        case "1":
-          for (let i = 0; i < chartData[0].data.length; i++) {
-            chartData.forEach((d) => {
-              if (d.data[i])
+          chartData.forEach(
+            (d) => {
+              if (d.data[0])
                 labelData.push({
-                  Dimension: d.data[i].dimension,
-                  Measure: d.data[i].value,
-                  Legend: d.data[i].legend,
+                  Dimension: d.data[0].dimension,
+                  Measure: d.data[0].value,
+                  Legend: d.data[0].legend,
                   LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
                   Labelcolor: d.properties[dataLabelColor],
                   hoverText: getHoverText(d, isAATornado),
-                  Axis: d.properties.axis
+                  Axis: d.properties.axis,
+                  LegendUniqueId: d.properties.legendUniqueId
                 });
-            });
+            }
+          );
+          chartData.forEach(
+            (d) => {
+              if (d.data[d.data.length - 1])
+                labelData.push({
+                  Dimension: d.data[d.data.length - 1].dimension,
+                  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),
+                  Axis: d.properties.axis,
+                  LegendUniqueId: d.properties.legendUniqueId
+                });
+            }
+          );
+          break;
+        case "1":
+          for (let i = 0; i < chartData[0].data.length; i++) {
+            chartData.forEach(
+              (d) => {
+                if (d.data[i])
+                  labelData.push({
+                    Dimension: d.data[i].dimension,
+                    Measure: d.data[i].value,
+                    Legend: d.data[i].legend,
+                    LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
+                    Labelcolor: d.properties[dataLabelColor],
+                    hoverText: getHoverText(d, isAATornado),
+                    Axis: d.properties.axis,
+                    LegendUniqueId: d.properties.legendUniqueId
+                  });
+              }
+            );
           }
           break;
         case "5":
@@ -13084,7 +13104,8 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
                       LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
                       Labelcolor: d.properties[dataLabelColor],
                       hoverText: getHoverText(d, isAATornado),
-                      Axis: d.properties.axis
+                      Axis: d.properties.axis,
+                      LegendUniqueId: d.properties.legendUniqueId
                     });
                 }
                 break;
@@ -13100,7 +13121,8 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
                     LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
                     Labelcolor: d.properties[dataLabelColor],
                     hoverText: getHoverText(d, isAATornado),
-                    Axis: d.properties.axis
+                    Axis: d.properties.axis,
+                    LegendUniqueId: d.properties.legendUniqueId
                   });
                 break;
               case "4":
@@ -13112,7 +13134,8 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
                     LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
                     Labelcolor: d.properties[dataLabelColor],
                     hoverText: getHoverText(d, isAATornado),
-                    Axis: d.properties.axis
+                    Axis: d.properties.axis,
+                    LegendUniqueId: d.properties.legendUniqueId
                   });
                 break;
               case "5":
@@ -13124,7 +13147,8 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
                     LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
                     Labelcolor: d.properties[dataLabelColor],
                     hoverText: getHoverText(d, isAATornado),
-                    Axis: d.properties.axis
+                    Axis: d.properties.axis,
+                    LegendUniqueId: d.properties.legendUniqueId
                   });
                 if (d.data[d.data.length - 1])
                   labelData.push({
@@ -13134,7 +13158,8 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
                     LabelPosition: annotationPosition ? annotationPosition : d.properties.annotationPosition,
                     Labelcolor: d.properties[dataLabelColor],
                     hoverText: getHoverText(d, isAATornado),
-                    Axis: d.properties.axis
+                    Axis: d.properties.axis,
+                    LegendUniqueId: d.properties.legendUniqueId
                   });
                 break;
             }
@@ -13166,13 +13191,16 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
             currentLegend: d.Legend,
             //d.Legend.replaceAll(" ", "-"), need to check for this case by space replaced with -
             isVisible: true,
-            hoverId: d.hoverText.replace(/\s+/g, "-")
+            hoverId: d.hoverText.replace(/\s+/g, "-"),
+            legendUniqueId: d.LegendUniqueId + "~$~" + d.Dimension + "~$~" + d.Measure
           } : {
             x: d.Dimension,
             y: { measure: d.Measure, axis: d.Axis },
             position: parseInt(d.LabelPosition),
             currentLegend: d.Legend,
-            isVisible: true
+            isVisible: true,
+            hoverId: d.hoverText.replace(/\s+/g, "-"),
+            legendUniqueId: d.LegendUniqueId + "~$~" + d.Dimension + "~$~" + d.Measure
           },
           dx: 0,
           dy: 0,
@@ -13186,65 +13214,71 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
             width: 15
           },
           color: d.Labelcolor,
-          type: annotationTypeforCharts(
-            d3Annotation2,
-            parseFloat(annotationType)
-          ),
+          type: annotationTypeforCharts(d3Annotation2, parseFloat(annotationType)),
           height,
           width
         };
         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, innerHeight2).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;
+          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;
         }
       });
-      annotationsList = annotationsList.filter((d) => d.data.y.measure != 0);
-      oldAnnotationList = oldAnnotationList.length == 0 ? annotationsList : oldAnnotationList;
+      if (formatOptions.annotation.annotationHideZeroValues) {
+        annotationsList = annotationsList.filter((d) => d.data.y.measure != 0);
+      }
+      if (oldAnnotationList.length === 0) {
+        oldAnnotationList = annotationsList;
+        oldMap = new Map(
+          oldAnnotationList.map((d) => [
+            d.data.legendUniqueId,
+            {
+              measure: barChart ? d.data.x.measure : d.data.y.measure,
+              dimension: barChart ? d.data.y : d.data.x,
+              legendUniqueId: d.data.legendUniqueId,
+              dx: d.dx,
+              dy: d.dy,
+              connectorPoints: d.connector?.points || [],
+              isVisible: d.data.isVisible ?? true,
+              width: d.width,
+              height: d.height
+            }
+          ])
+        );
+      } else {
+        oldMap = new Map(
+          oldAnnotationList.map((d) => [
+            d.legendUniqueId,
+            d
+          ])
+        );
+      }
       annotationsList.forEach((newAnnotation) => {
-        let newLegend = newAnnotation.data.x + "-" + newAnnotation.data.y.measure;
+        const legendKey = newAnnotation.data.legendUniqueId;
         if (oldAnnotationList.length != 0) {
-          oldAnnotationList.forEach((oldAnnotation) => {
-            let oldLegend = oldAnnotation.data.x + "-" + oldAnnotation.data.y.measure;
-            if (newLegend == oldLegend) {
-              newAnnotation.dx = oldAnnotation.dx;
-              newAnnotation.dy = oldAnnotation.dy;
-              newAnnotation.data.isVisible = oldAnnotation.data.isVisible ?? true;
-              newAnnotation.connector.points = oldAnnotation.connector.points;
-              if (formatOptions.annotation.annotationType == "5" && newAnnotation.dx == 0 && newAnnotation.dy == 0) {
-                newAnnotation.connector["points"] = [
-                  [0, 0],
-                  [0, 0]
-                ];
-              }
+          const old = oldMap.get(legendKey);
+          if (old) {
+            newAnnotation.dx = old.dx;
+            newAnnotation.dy = old.dy;
+            newAnnotation.data.isVisible = old.isVisible ?? true;
+            newAnnotation.connector.points = old.connectorPoints?.length ? old.connectorPoints : [[0, 0], [0, 0]];
+            if (formatOptions.annotation.annotationType == "5" && newAnnotation.dx == 0 && newAnnotation.dy == 0) {
+              newAnnotation.connector["points"] = [
+                [0, 0],
+                [0, 0]
+              ];
             }
-          });
+          }
         }
         finalAnnotationList.push(newAnnotation);
       });
-      makeAnnotations.editMode(
-        formatOptions.annotation.annotationDraggable && isReportEditable
-      ).accessors({
+      makeAnnotations.editMode(formatOptions.annotation.annotationDraggable && isReportEditable).accessors({
         x: function(d) {
           if (barChart) {
             let requiredXScale = d.x.axis === axisTypes.primary ? yScaleLeft : yScaleRight;
             let axis2 = d.x.axis;
-            return dataLabelsPositionForBarChartFamily(
-              formatOptions,
-              d.x.measure ? d.x.measure : 0,
-              d.position,
-              requiredXScale,
-              minValue,
-              void 0,
-              chartType,
-              isSensitivityChart,
-              axis2
-            );
+            return dataLabelsPositionForBarChartFamily(formatOptions, d.x.measure ? d.x.measure : 0, d.position, requiredXScale, minValue, void 0, chartType, isSensitivityChart, axis2);
           } else if (chartType === chartTypes.ColumnChart) {
             const legend = xScaleForLegends(d.currentLegend);
             const x2 = legend != null ? xScale(d.x) + legend - (columnWidth - xScaleForLegends.bandwidth()) / 2 : xScale(d.x);
@@ -13254,7 +13288,7 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
           }
         },
         y: function(d) {
-          if (d.y.axis == axisTypes.primary) {
+          if (d.y?.axis == axisTypes.primary) {
             return dataLabelsPosition(
               d.y.measure,
               parseFloat(d.position),
@@ -13265,7 +13299,8 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
             );
           } else {
             if (barChart) {
-              return isTornadoChart ? xScaleForLegends(d.y) + xScaleForLegends.bandwidth() / 2 : xScaleForLegends ? xScale(d.y) + xScaleForLegends(d.currentLegend) - (columnWidth - xScaleForLegends.bandwidth()) / 2 - 5 : xScale(d.y) - 5;
+              const legendUniqueId = d.legendUniqueId.includes("~$~") ? d.legendUniqueId.split("~$~")[0] : d.legendUniqueId;
+              return isTornadoChart ? xScaleForLegends(d.y) + xScaleForLegends.bandwidth() / 2 : xScaleForLegends ? xScale(d.y) + xScaleForLegends(legendUniqueId) - (columnWidth - xScaleForLegends.bandwidth()) / 2 - 5 : xScale(d.y) - 5;
             } else
               return dataLabelsPosition(
                 d.y.measure,
@@ -13290,17 +13325,32 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
           });
         }
         oldAnnotationList.forEach((d) => {
-          if (d.data.x == annotation2.data.x && d.data.y.measure == annotation2.data.y.measure) {
+          if (d.data?.legendUniqueId == annotation2.data.legendUniqueId || d.legendUniqueId == annotation2.data.legendUniqueId) {
             d.dx = annotation2._dx * width / d.width;
             d.dy = annotation2._dy * height / d.height;
-            d.connector["points"] = annotation2.connector.points;
+            d.connectorPoints = annotation2.connector.points;
           }
         });
+        if (onDataLabelCoordinatesChange) {
+          const cleaned = oldAnnotationList.map((d) => ({
+            legendUniqueId: d.data?.legendUniqueId || d.legendUniqueId,
+            dx: d.dx,
+            dy: d.dy,
+            connectorPoints: d.connectorPoints || [],
+            isVisible: (d.data?.isVisible || d.isVisible) ?? true,
+            width: d.width,
+            height: d.height
+          }));
+          onDataLabelCoordinatesChange(cleaned);
+        }
         annotations.selectAll(".connector").attr("hoverId", (d) => d.data.currentLegend).style("stroke", formatOptions.annotation.connectorColor || "#ccc").attr(
           "stroke-dasharray",
           connectedStyle[formatOptions.annotation.connectorStyle.toLowerCase()]
         );
-        annotations.selectAll(`.connector-${connectorType}`).attr("fill", formatOptions.annotation.connectorColor || "#ccc").style("stroke", formatOptions.annotation.connectorColor || "#ccc");
+        annotations.selectAll(`.connector-${connectorType}`).attr("fill", formatOptions.annotation.connectorColor || "#ccc").style(
+          "stroke",
+          formatOptions.annotation.connectorColor || "#ccc"
+        );
         annotations.selectAll(".note-line").attr("hoverId", (d) => d.data.currentLegend).style("stroke", formatOptions.annotation.connectorColor || "#ccc").attr(
           "stroke-dasharray",
           connectedStyle[formatOptions.annotation.connectorStyle.toLowerCase()]
@@ -13339,12 +13389,13 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
     throw error;
   }
 }
-function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRight, margin, d3Annotation2, stackColumnData, stackAreaData, labelExcludeList, individualLabelColor, columnWidth, oldAnnotationList, formatOptions, height, width, innerWidth2, dimensionList, innerHeight2, widgetId, svg, xScaleForLegends, isReportEditable) {
+function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRight, margin, d3Annotation2, stackColumnData, stackAreaData, labelExcludeList, individualLabelColor, columnWidth, formatOptions, height, width, innerWidth2, dimensionList, innerHeight2, widgetId, svg, onDataLabelCoordinatesChange, xScaleForLegends, isReportEditable) {
   try {
     let annotationType = formatOptions.annotation.annotationType ?? "1";
     if (formatOptions.annotation.annotationVisibility) {
       let Disable = [annotationType == "1" ? "connector" : ""];
       let labelData = [];
+      let oldMap = /* @__PURE__ */ new Map();
       let makeAnnotations = d3Annotation2.annotation();
       let connector = formatOptions.annotation.connectorType;
       let labelType = formatOptions.annotation.annotationVisibility;
@@ -13352,11 +13403,8 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
       let stackData = [];
       let getChartType = [];
       let connectorType = formatOptions.annotation.connectorType ? formatOptions.annotation.connectorType.toLowerCase() : "None";
-      oldAnnotationList = conditionallyResetOldAnnotations(
-        oldAnnotationList,
-        formatOptions,
-        chartTypes.CustomColumnChart
-      );
+      let oldAnnotationList = JSON.parse(JSON.stringify(formatOptions.plotArea.dataLabelsCoordinates));
+      oldAnnotationList = conditionallyResetOldAnnotations(oldAnnotationList, formatOptions, chartTypes.CustomColumnChart);
       let annotationsList = [];
       let finalAnnotationList = [];
       if (oldAnnotationList.length != 0) {
@@ -13380,7 +13428,7 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
               case chartTypes.ColumnChart:
               case chartTypes.LineChart:
               case chartTypes.AreaChart:
-                labelData.push(d.data[0]);
+                labelData.push({ ...d.data[0], alias: d.properties?.alias });
                 break;
               case chartTypes.StackColumnChart:
                 stackColumnData.forEach((dta) => labelData.push(dta[0]));
@@ -13397,7 +13445,7 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
               case chartTypes.ColumnChart:
               case chartTypes.LineChart:
               case chartTypes.AreaChart:
-                labelData.push(d.data[d.data.length - 1]);
+                labelData.push({ ...d.data[d.data.length - 1], alias: d.properties?.alias });
                 break;
               case chartTypes.StackColumnChart:
                 stackColumnData.forEach(
@@ -13418,7 +13466,7 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
               case chartTypes.ColumnChart:
               case chartTypes.LineChart:
               case chartTypes.AreaChart:
-                labelData.push(d.data[0]);
+                labelData.push({ ...d.data[0], alias: d.properties?.alias });
                 break;
               case chartTypes.StackColumnChart:
                 stackColumnData.forEach((dta) => labelData.push(dta[0]));
@@ -13433,7 +13481,9 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
               case chartTypes.ColumnChart:
               case chartTypes.LineChart:
               case chartTypes.AreaChart:
-                labelData.push(d.data[d.data.length - 1]);
+                labelData.push(
+                  { ...d.data[d.data.length - 1], alias: d.properties?.alias }
+                );
                 break;
               case chartTypes.StackColumnChart:
                 stackColumnData.forEach(
@@ -13454,26 +13504,18 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
               case chartTypes.ColumnChart:
               case chartTypes.LineChart:
               case chartTypes.AreaChart:
-                d.data.forEach((j) => labelData.push(j));
+                d.data.forEach((j) => labelData.push({ ...j, alias: d.properties?.alias }));
                 break;
               case chartTypes.StackColumnChart:
-                let stackColumnIndex = stackColumnData.findIndex(
-                  (id2) => id2.key === d.properties.legend
-                );
+                let stackColumnIndex = stackColumnData.findIndex((id2) => id2.key === d.properties.legend);
                 if (stackColumnIndex !== -1) {
-                  stackColumnData[stackColumnIndex].forEach(
-                    (dta) => labelData.push(dta)
-                  );
+                  stackColumnData[stackColumnIndex].forEach((dta) => labelData.push(dta));
                 }
                 break;
               case chartTypes.StackAreaChart:
-                let stackAreaIndex = stackAreaData.findIndex(
-                  (id2) => id2.key === d.properties.legend
-                );
+                let stackAreaIndex = stackAreaData.findIndex((id2) => id2.key === d.properties.legend);
                 if (stackAreaIndex !== -1) {
-                  stackAreaData[stackAreaIndex].forEach(
-                    (dta) => labelData.push(dta)
-                  );
+                  stackAreaData[stackAreaIndex].forEach((dta) => labelData.push(dta));
                 }
                 break;
             }
@@ -13513,72 +13555,83 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
                 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
-                      });
+                      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,
+                          alias: d.properties?.alias
+                        }
+                      );
                     }
                     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
-                    });
+                    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,
+                        alias: d.properties?.alias
+                      }
+                    );
                     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
-                    });
+                    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,
+                        alias: d.properties?.alias
+                      }
+                    );
                     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
-                    });
+                    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,
+                        alias: d.properties?.alias
+                      }
+                    );
+                    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,
+                        alias: d.properties?.alias
+                      }
+                    );
                     break;
                 }
                 break;
               case chartTypes.StackColumnChart:
-                const stackColumnIndex = stackColumnData.findIndex(
-                  (id2) => id2.key === d.properties.legend
-                );
+                const stackColumnIndex = stackColumnData.findIndex((id2) => id2.key === d.properties.legend);
                 stackColumnIndex !== -1 && stackColumnData[stackColumnIndex].forEach((dta, j) => {
-                  switch (String(
-                    stackColumnData[stackColumnIndex].individualAnnotationVisibility
-                  )) {
+                  switch (String(stackColumnData[stackColumnIndex].individualAnnotationVisibility)) {
                     case "1":
                       labelData.push(stackColumnData[stackColumnIndex][j]);
                       break;
@@ -13598,26 +13651,18 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
                     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
-                      )) {
+                      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]
-                        );
+                        labelData.push(stackColumnData[stackColumnIndex][stackColumnData[0].length - 1]);
                         break;
                       }
                   }
                 });
                 break;
               case chartTypes.StackAreaChart:
-                const stackIndex = stackAreaData.findIndex(
-                  (id2) => id2.key === d.properties.legend
-                );
+                const stackIndex = stackAreaData.findIndex((id2) => id2.key === d.properties.legend);
                 stackIndex != -1 && stackAreaData[stackIndex].forEach((dta, j) => {
-                  switch (String(
-                    stackAreaData[stackIndex].individualAnnotationVisibility
-                  )) {
+                  switch (String(stackAreaData[stackIndex].individualAnnotationVisibility)) {
                     case "1":
                       labelData.push(stackAreaData[stackIndex][j]);
                       break;
@@ -13637,9 +13682,7 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
                     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
-                      )) {
+                      if (!labelData.find((data) => data.key == label5.key || data.key == label6.key)) {
                         labelData.push(label5);
                         labelData.push(label6);
                         break;
@@ -13656,6 +13699,7 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
         if (maxValue < d.value) {
           maxValue = d.value;
         }
+        ;
       });
       let minValue = maxValue * 0.1;
       labelData.forEach((d, i) => {
@@ -13676,24 +13720,15 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
             align: "middle"
           },
           data: {
-            x: d.dimension && d.legend ? {
-              dimension: d.dimension,
-              legend: d.legend,
-              type: d.type,
-              axis: d.axis || d.data.axis
-            } : {
-              dimension: d.data.dimension,
-              legend: d.key,
-              type: d.data.type,
-              stacklegend: d.data.legend,
-              axis: d.data.axis
-            },
+            x: d.dimension && d.legend ? { dimension: d.dimension, legend: d.legend, type: d.type, axis: d.axis || d.data.axis } : { dimension: d.data.dimension, legend: d.key, type: d.data.type, stacklegend: d.data.legend, axis: d.data.axis },
             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,
             currentLegend: d.legend?.includes("~$~") ? d.legend.split("~$~")[1] : d.key?.includes("~$~") ? d.key.split("~$~")[1] : d.legend ?? d.key,
-            isVisible: true
+            isVisible: true,
+            hoverId: d?.alias?.replaceAll(" ", "-"),
+            legendUniqueId: d.legendUniqueId + "~$~" + (d.dimension ?? d.data.dimension) + "~$~" + (d.value || d.value == 0 ? d.value : d.data.type != chartTypes.StackColumnChart ? d[1] ? d[1] : 0 : d[1] > 0 ? d[1] : d[0])
           },
           dx: 0,
           dy: 0,
@@ -13707,50 +13742,66 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
             width: 15
           },
           color: d.labelColor || d.data.labelColor,
-          type: annotationTypeforCharts(
-            d3Annotation2,
-            parseFloat(annotationType)
-          ),
+          type: annotationTypeforCharts(d3Annotation2, parseFloat(annotationType)),
           height,
           width
         };
         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"]) &&
           !labelExcludeList.includes(d["key"]) && (d.data.axis == axisTypes.primary ? yScaleLeft(d[1]) <= innerHeight2 && yScaleLeft(d[1]) >= 0 : yScaleRight(d[1]) <= innerHeight2 && yScaleRight(d[1]) >= 0) ? annotationsList.push(singleAnnotation) : null
         );
       });
-      oldAnnotationList = oldAnnotationList.length == 0 ? annotationsList : oldAnnotationList;
+      if (oldAnnotationList.length === 0) {
+        oldAnnotationList = annotationsList;
+        oldMap = new Map(
+          oldAnnotationList.map((d) => [
+            d.data.legendUniqueId,
+            {
+              measure: d.data.y,
+              dimension: d.data.x.dimension,
+              legendUniqueId: d.data.legendUniqueId,
+              dx: d.dx,
+              dy: d.dy,
+              connectorPoints: d.connector?.points || [],
+              isVisible: d.data.isVisible ?? true,
+              width: d.width,
+              height: d.height
+            }
+          ])
+        );
+      } else {
+        oldMap = new Map(
+          oldAnnotationList.map((d) => [
+            d.legendUniqueId,
+            d
+          ])
+        );
+      }
       annotationsList.forEach((newAnnotation) => {
-        let newLegend = newAnnotation.data.x.dimension + newAnnotation.data.x.legend + newAnnotation.data.x.type + "-" + newAnnotation.data.prevValue;
+        const legendKey = newAnnotation.data.legendUniqueId;
         if (oldAnnotationList.length != 0) {
-          oldAnnotationList.forEach((oldAnnotation) => {
-            let oldLegend = oldAnnotation.data.x.dimension + oldAnnotation.data.x.legend + oldAnnotation.data.x.type + "-" + oldAnnotation.data.prevValue;
-            if (newLegend == oldLegend) {
-              newAnnotation.dx = oldAnnotation.dx;
-              newAnnotation.dy = oldAnnotation.dy;
-              newAnnotation.data.isVisible = oldAnnotation.data.isVisible ?? true;
-              newAnnotation.connector.points = oldAnnotation.connector.points;
-              if (formatOptions.annotation.annotationType == "5" && newAnnotation.dx == 0 && newAnnotation.dy == 0) {
-                newAnnotation.connector["points"] = [
-                  [0, 0],
-                  [0, 0]
-                ];
-              }
+          const old = oldMap.get(legendKey);
+          if (old) {
+            newAnnotation.dx = old.dx;
+            newAnnotation.dy = old.dy;
+            newAnnotation.data.isVisible = old.isVisible ?? true;
+            newAnnotation.connector.points = old.connectorPoints?.length ? old.connectorPoints : [[0, 0], [0, 0]];
+            if (formatOptions.annotation.annotationType == "5" && newAnnotation.dx == 0 && newAnnotation.dy == 0) {
+              newAnnotation.connector["points"] = [
+                [0, 0],
+                [0, 0]
+              ];
             }
-          });
+          }
         }
         finalAnnotationList.push(newAnnotation);
       });
-      makeAnnotations.editMode(
-        formatOptions.annotation.annotationDraggable && isReportEditable
-      ).accessors({
+      makeAnnotations.editMode(formatOptions.annotation.annotationDraggable && isReportEditable).accessors({
         x: function(d) {
           const chartType = d.x.type || d.type;
           if (getChartType.includes(chartType)) {
@@ -13764,7 +13815,8 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
             }
           } else {
             if (d.x.legend) {
-              return xScale(d.x.dimension) + xScaleForLegends(d.x.legend) - (columnWidth - xScaleForLegends.bandwidth()) / 2;
+              const legendUniqueId = d.legendUniqueId.includes("~$~") ? d.legendUniqueId.split("~$~")[0] : d.legendUniqueId;
+              return xScale(d.x.dimension) + xScaleForLegends(legendUniqueId) - (columnWidth - xScaleForLegends.bandwidth()) / 2;
             }
             return xScale(d.x.dimension);
           }
@@ -13772,23 +13824,9 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
         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, chartType);
           } else {
-            return dataLabelsPosition(
-              d.y,
-              parseFloat(d.position),
-              yScaleRight,
-              minValue,
-              d.prevValue,
-              chartType
-            );
+            return dataLabelsPosition(d.y, parseFloat(d.position), yScaleRight, minValue, d.prevValue, chartType);
           }
         }
       }).on("dragend", function(annotation2) {
@@ -13796,38 +13834,41 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
           annotation2.data.isVisible = true;
           oldAnnotationList.forEach((d) => {
             if (d.data.x.dimension == annotation2.data.x.dimension && d.data.x.legend == annotation2.data.x.legend && d.data.x.type == annotation2.data.x.type && d.data.prevValue == annotation2.data.prevValue) {
-              annotations.selectAll(".annotation-note-label").filter(
-                (d2) => d2.data.x.dimension == annotation2.data.x.dimension && d2.data.x.legend == annotation2.data.x.legend && d2.data.x.type == annotation2.data.x.type && d2.data.prevValue == annotation2.data.prevValue
-              ).attr("display", "block");
+              annotations.selectAll(".annotation-note-label").filter((d2) => d2.data.x.dimension == annotation2.data.x.dimension && d2.data.x.legend == annotation2.data.x.legend && d2.data.x.type == annotation2.data.x.type && d2.data.prevValue == annotation2.data.prevValue).attr("display", "block");
               d.data.isVisible = true;
             }
           });
         }
+        ;
         oldAnnotationList.forEach((d) => {
-          if (d.data.x.dimension == annotation2.data.x.dimension && d.data.x.legend == annotation2.data.x.legend && d.data.x.type == annotation2.data.x.type && d.data.prevValue == annotation2.data.prevValue) {
+          if (d.data?.legendUniqueId == annotation2.data.legendUniqueId || d.legendUniqueId == annotation2.data.legendUniqueId) {
             d.dx = annotation2._dx * width / d.width;
             d.dy = annotation2._dy * height / d.height;
-            d.connector["points"] = annotation2.connector.points;
+            d.connectorPoints = annotation2.connector.points;
           }
         });
-        annotations.selectAll(".connector").attr("hoverId", (d) => d.data.currentLegend).style("stroke", formatOptions.annotation.connectorColor || "#ccc").attr(
-          "stroke-dasharray",
-          connectedStyle[formatOptions.annotation.connectorStyle]
-        );
+        if (onDataLabelCoordinatesChange) {
+          const cleaned = oldAnnotationList.map((d) => ({
+            legendUniqueId: d.data?.legendUniqueId || d.legendUniqueId,
+            dx: d.dx,
+            dy: d.dy,
+            connectorPoints: d.connector.points || d.connectorPoints || [],
+            isVisible: (d.data?.isVisible || d.isVisible) ?? true,
+            width: d.width,
+            height: d.height
+          }));
+          onDataLabelCoordinatesChange(cleaned);
+        }
+        annotations.selectAll(".connector").attr("hoverId", (d) => d.data.currentLegend).style("stroke", formatOptions.annotation.connectorColor || "#ccc").attr("stroke-dasharray", connectedStyle[formatOptions.annotation.connectorStyle.toLowerCase()]);
         annotations.selectAll(`.connector-${connectorType}`).attr("fill", formatOptions.annotation.connectorColor || "#ccc").style("stroke", formatOptions.annotation.connectorColor || "#ccc");
-        annotations.selectAll(".note-line").attr("hoverId", (d) => d.data.currentLegend).style("stroke", formatOptions.annotation.connectorColor || "#ccc").attr(
-          "stroke-dasharray",
-          connectedStyle[formatOptions.annotation.connectorStyle]
-        ).filter((d) => d._dx == 0 && d._dy == 0).remove();
+        annotations.selectAll(".note-line").attr("hoverId", (d) => d.data.currentLegend).style("stroke", formatOptions.annotation.connectorColor || "#ccc").attr("stroke-dasharray", connectedStyle[formatOptions.annotation.connectorStyle.toLowerCase()]).filter((d) => d._dx == 0 && d._dy == 0).remove();
         annotations.selectAll(".annotation-note-label").filter((d) => d.data && d.data.isVisible).style("display", "block");
       }).on("noteclick", function(annotation2) {
         if (formatOptions.annotation.annotationDraggable && isReportEditable) {
           annotation2.data.isVisible = false;
           oldAnnotationList.forEach((d) => {
             if (d.data.x.dimension == annotation2.data.x.dimension && d.data.x.legend == annotation2.data.x.legend && d.data.x.type == annotation2.data.x.type && d.data.prevValue == annotation2.data.prevValue) {
-              annotations.selectAll(".annotation-note-label").filter(
-                (d2) => d2.data.x.dimension == annotation2.data.x.dimension && d2.data.x.legend == annotation2.data.x.legend && d2.data.x.type == annotation2.data.x.type && d2.data.prevValue == annotation2.data.prevValue
-              ).attr("display", "none");
+              annotations.selectAll(".annotation-note-label").filter((d2) => d2.data.x.dimension == annotation2.data.x.dimension && d2.data.x.legend == annotation2.data.x.legend && d2.data.x.type == annotation2.data.x.type && d2.data.prevValue == annotation2.data.prevValue).attr("display", "none");
               d.data.isVisible = false;
             }
           });
@@ -13837,17 +13878,8 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
         x: (d) => xScale.invert(d.x),
         y: (d) => d.x.axis == axisTypes.primary ? yScaleLeft.invert(d.y) : yScaleRight.invert(d.y)
       }).notePadding(0).annotations(finalAnnotationList);
-      if (!formatOptions.plotArea.fitChart)
-        svg.selectAll(".annotation-group").remove();
-      let annotations = appendAnnotations(
-        svg,
-        formatOptions,
-        margin,
-        fontStyle,
-        makeAnnotations,
-        connectorType,
-        false
-      );
+      if (!formatOptions.plotArea.fitChart) svg.selectAll(".annotation-group").remove();
+      let annotations = appendAnnotations(svg, formatOptions, margin, fontStyle, makeAnnotations, connectorType, false);
     }
   } catch (error) {
     throw error;
@@ -14973,24 +15005,21 @@ function prepareDataForSeriesLabel(innerWidth2, yScaleLeft, formatOptions, filte
     throw error;
   }
 }
-function stacklineAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d3Annotation2, labelExcludeList, individualLabelColor, oldAnnotationList, formatOptions, chartType, height, width, innerWidth2, dimensionList, innerHeight2, widgetId, svg, dataTableHeight, isReportEditable, barChart) {
+function stacklineAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d3Annotation2, labelExcludeList, individualLabelColor, formatOptions, chartType, height, width, innerWidth2, dimensionList, innerHeight2, widgetId, svg, onDataLabelCoordinatesChange, dataTableHeight, isReportEditable, barChart) {
   try {
-    let fromReportBuilder = false;
     let annotationType = formatOptions.annotation.annotationType ?? "1";
     if (formatOptions.annotation.annotationVisibility) {
       let Disable = [annotationType == "1" ? "connector" : ""];
       let labelData = [];
+      let oldMap = /* @__PURE__ */ new Map();
       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
-      );
+      let oldAnnotationList = JSON.parse(JSON.stringify(formatOptions.plotArea.dataLabelsCoordinates));
+      oldAnnotationList = conditionallyResetOldAnnotations(oldAnnotationList, formatOptions, chartType);
       let annotationsList = [];
       let finalAnnotationList = [];
       if (oldAnnotationList.length != 0) {
@@ -15022,7 +15051,7 @@ function stacklineAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin
           break;
         case "6":
           chartData.forEach((d) => {
-            let annotationVisibility = d[0].properties.annotation.toString();
+            let annotationVisibility = d[0]?.properties?.annotation?.toString();
             switch (annotationVisibility) {
               case "1":
                 for (let i = 0; i < chartData[0].length; i++) {
@@ -15071,7 +15100,8 @@ function stacklineAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin
             position: formatOptions.annotation.annotationPosition == "4" ? d.data.labelPosition : JSON.parse(formatOptions.annotation.annotationPosition),
             currentLegend: d.key.includes("~$~") ? d.key.split("~$~")[1] : d.key,
             isVisible: true,
-            hoverId: d.properties.alias ? getHoverId(d.properties.alias) : getHoverId(d.key)
+            hoverId: d.properties.alias ? getHoverId(d.properties.alias) : getHoverId(d.key),
+            legendUniqueId: d.properties.legendUniqueId + "~$~" + d.data.dimension + "~$~" + (d.key.includes("~$~") ? d.key.split("~$~")[1] : d.key) + "~$~" + (d[1] > 0 ? d[1] : d[0])
           } : {
             x: d.data.dimension,
             y: d[1] > 0 ? d[1] : d[0],
@@ -15079,7 +15109,8 @@ function stacklineAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin
             position: formatOptions.annotation.annotationPosition == "4" ? d.data.labelPosition : JSON.parse(formatOptions.annotation.annotationPosition),
             currentLegend: d.key.includes("~$~") ? d.key.split("~$~")[1] : d.key,
             isVisible: true,
-            hoverId: d.properties.alias ? getHoverId(d.properties.alias) : getHoverId(d.key)
+            hoverId: d.properties?.alias ? getHoverId(d.properties.alias) : getHoverId(d.key),
+            legendUniqueId: d.properties.legendUniqueId + "~$~" + d.data.dimension + "~$~" + (d.key.includes("~$~") ? d.key.split("~$~")[1] : d.key) + "~$~" + (d[1] > 0 ? d[1] : d[0])
           },
           dx: 0,
           dy: 0,
@@ -15092,54 +15123,64 @@ function stacklineAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin
             height: 15,
             width: 15
           },
-          color: d.properties[dataLabelColor],
-          type: annotationTypeforCharts(
-            d3Annotation2,
-            parseFloat(annotationType)
-          ),
+          color: d.properties && d.properties[dataLabelColor] ? d.properties[dataLabelColor] : d.data.labelColor,
+          type: annotationTypeforCharts(d3Annotation2, parseFloat(annotationType)),
           height,
           width
         };
         dimensionList.includes(d.data.dimension) && // !labelExcludeList.includes(d.key) && (d.data.total > 0 ? (yScaleLeft(d[1]) <= barChart ? innerWidth : innerHeight && yScaleLeft(d[1]) >= 0) : (yScaleLeft(d[0]) < (dataTableHeight > 0 ? barChart ? innerWidth : innerHeight - dataTableHeight : barChart ? innerWidth : innerHeight)))
-        // ?
+        // ? 
         annotationsList.push(singleAnnotation);
       });
-      oldAnnotationList = oldAnnotationList.length == 0 ? annotationsList : oldAnnotationList;
+      if (oldAnnotationList.length === 0) {
+        oldAnnotationList = annotationsList;
+        oldMap = new Map(
+          oldAnnotationList.map((d) => [
+            d.data.legendUniqueId,
+            {
+              measure: barChart ? d.data.x : d.data.y,
+              dimension: barChart ? d.data.y : d.data.x,
+              legendUniqueId: d.data.legendUniqueId,
+              dx: d.dx,
+              dy: d.dy,
+              connectorPoints: d.connector?.points || [],
+              isVisible: d.data.isVisible ?? true,
+              width: d.width,
+              height: d.height
+            }
+          ])
+        );
+      } else {
+        oldMap = new Map(
+          oldAnnotationList.map((d) => [
+            d.legendUniqueId,
+            d
+          ])
+        );
+      }
       annotationsList.forEach((newAnnotation) => {
-        let newLegend = newAnnotation.data.x + "-" + newAnnotation.data.prevValue;
+        const legendKey = newAnnotation.data.legendUniqueId;
         if (oldAnnotationList.length != 0) {
-          oldAnnotationList.forEach((oldAnnotation) => {
-            let oldLegend = oldAnnotation.data.x + "-" + oldAnnotation.data.prevValue;
-            if (newLegend == oldLegend) {
-              newAnnotation.dx = oldAnnotation.dx;
-              newAnnotation.dy = oldAnnotation.dy;
-              newAnnotation.data.isVisible = oldAnnotation.data.isVisible ?? true;
-              newAnnotation.connector.points = oldAnnotation.connector.points;
-              if (formatOptions.annotation.annotationType == "5" && newAnnotation.dx == 0 && newAnnotation.dy == 0) {
-                newAnnotation.connector["points"] = [
-                  [0, 0],
-                  [0, 0]
-                ];
-              }
+          const old = oldMap.get(legendKey);
+          if (old) {
+            newAnnotation.dx = old.dx;
+            newAnnotation.dy = old.dy;
+            newAnnotation.data.isVisible = old.isVisible ?? true;
+            newAnnotation.connector.points = old.connectorPoints?.length ? old.connectorPoints : [[0, 0], [0, 0]];
+            if (formatOptions.annotation.annotationType == "5" && newAnnotation.dx == 0 && newAnnotation.dy == 0) {
+              newAnnotation.connector["points"] = [
+                [0, 0],
+                [0, 0]
+              ];
             }
-          });
+          }
         }
         finalAnnotationList.push(newAnnotation);
       });
-      makeAnnotations.editMode(
-        formatOptions.annotation.annotationDraggable && isReportEditable
-      ).accessors({
+      makeAnnotations.editMode(formatOptions.annotation.annotationDraggable && isReportEditable).accessors({
         x: function(d) {
           if (barChart) {
-            return dataLabelsPositionForBarChartFamily(
-              formatOptions,
-              d.x,
-              parseFloat(d.position),
-              yScaleLeft,
-              minValue,
-              d.prevValue,
-              chartType
-            );
+            return dataLabelsPositionForBarChartFamily(formatOptions, d.x, parseFloat(d.position), yScaleLeft, minValue, d.prevValue, chartType);
           } else {
             return xScale(d.x) + xScale.bandwidth() / 2;
           }
@@ -15148,14 +15189,7 @@ function stacklineAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin
           if (barChart) {
             return xScale(d.y) + xScale.bandwidth() / 2;
           } else {
-            return dataLabelsPosition(
-              d.y,
-              parseFloat(d.position),
-              yScaleLeft,
-              minValue,
-              d.prevValue,
-              chartType
-            );
+            return dataLabelsPosition(d.y, parseFloat(d.position), yScaleLeft, minValue, d.prevValue, chartType);
           }
         }
       }).on("dragend", function(annotation2) {
@@ -15163,32 +15197,41 @@ function stacklineAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin
           annotation2.data.isVisible = true;
           oldAnnotationList.forEach((d) => {
             if (d.data.x == annotation2.data.x && d.data.y == annotation2.data.y) {
-              annotations.selectAll(".annotation-note-label").filter(
-                (d2) => d2.data.x == annotation2.data.x && d2.data.y == annotation2.data.y
-              ).attr("display", "block");
+              annotations.selectAll(".annotation-note-label").filter((d2) => d2.data.x == annotation2.data.x && d2.data.y == annotation2.data.y).attr("display", "block");
               d.data.isVisible = true;
             }
           });
         }
+        ;
         oldAnnotationList.forEach((d) => {
-          if (d.data.x == annotation2.data.x && d.data.y == annotation2.data.y) {
+          if (d.data?.legendUniqueId == annotation2.data.legendUniqueId || d.legendUniqueId == annotation2.data.legendUniqueId) {
             d.dx = annotation2._dx * width / d.width;
             d.dy = annotation2._dy * height / d.height;
-            d.connector["points"] = annotation2.connector.points;
+            d.connectorPoints = annotation2.connector.points;
           }
         });
-        annotations.selectAll(".connector").attr("hoverId", (d) => d.data.currentLegend).style("stroke", formatOptions.annotation.connectorColor || "#ccc");
+        if (onDataLabelCoordinatesChange) {
+          const cleaned = oldAnnotationList.map((d) => ({
+            legendUniqueId: d.data?.legendUniqueId || d.legendUniqueId,
+            dx: d.dx,
+            dy: d.dy,
+            connectorPoints: d.connectorPoints || [],
+            isVisible: (d.data?.isVisible || d.isVisible) ?? true,
+            width: d.width,
+            height: d.height
+          }));
+          onDataLabelCoordinatesChange(cleaned);
+        }
+        annotations.selectAll(".connector").attr("hoverId", (d) => d.data.currentLegend).style("stroke", formatOptions.annotation.connectorColor || "#ccc").attr("stroke-dasharray", connectedStyle[formatOptions.annotation.connectorStyle.toLowerCase()]);
         annotations.selectAll(`.connector-${connectorType}`).attr("fill", formatOptions.annotation.connectorColor || "#ccc").style("stroke", formatOptions.annotation.connectorColor || "#ccc");
-        annotations.selectAll(".note-line").attr("hoverId", (d) => d.data.currentLegend).style("stroke", formatOptions.annotation.connectorColor || "#ccc").filter((d) => d._dx == 0 && d._dy == 0).remove();
+        annotations.selectAll(".note-line").attr("hoverId", (d) => d.data.currentLegend).style("stroke", formatOptions.annotation.connectorColor || "#ccc").attr("stroke-dasharray", connectedStyle[formatOptions.annotation.connectorStyle.toLowerCase()]).filter((d) => d._dx == 0 && d._dy == 0).remove();
         annotations.selectAll(".annotation-note-label").filter((d) => d.data && d.data.isVisible).style("display", "block");
       }).on("noteclick", function(annotation2) {
         if (formatOptions.annotation.annotationDraggable && isReportEditable) {
           annotation2.data.isVisible = false;
           oldAnnotationList.forEach((d) => {
             if (d.data.x == annotation2.data.x && d.data.y == annotation2.data.y) {
-              annotations.selectAll(".annotation-note-label").filter(
-                (d2) => d2.data.x == annotation2.data.x && d2.data.y == annotation2.data.y
-              ).attr("display", "none");
+              annotations.selectAll(".annotation-note-label").filter((d2) => d2.data.x == annotation2.data.x && d2.data.y == annotation2.data.y).attr("display", "none");
               d.data.isVisible = false;
             }
           });
@@ -15199,15 +15242,7 @@ function stacklineAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin
         y: (d) => yScaleLeft.invert(d.y)
       }).notePadding(0).annotations(finalAnnotationList);
       if (true) svg.selectAll(".annotation-group").remove();
-      let annotations = appendAnnotations(
-        svg,
-        formatOptions,
-        margin,
-        fontStyle,
-        makeAnnotations,
-        connectorType,
-        false
-      );
+      let annotations = appendAnnotations(svg, formatOptions, margin, fontStyle, makeAnnotations, connectorType, barChart);
     }
   } catch (error) {
     throw error;
@@ -15221,22 +15256,16 @@ const appendAnnotations = (svg, formatOptions, margin, fontStyle, makeAnnotation
   ).style("font-weight", fontStyle.includes("Bold") ? "Bold" : "").call(makeAnnotations);
   annotations.selectAll("rect").style("visibility", "hidden");
   annotations.selectAll(".annotation-subject").remove();
-  annotations.selectAll(".connector").style("stroke", formatOptions.annotation.connectorColor || "#ccc").attr(
-    "stroke-dasharray",
-    connectedStyle[formatOptions.annotation.connectorStyle]
-  );
-  annotations.selectAll(`.connector-${ConnectorType}`).attr("fill", formatOptions.annotation.connectorColor || "#ccc").style("stroke", formatOptions.annotation.connectorColor || "#ccc");
-  annotations.selectAll(".note-line").style("stroke", formatOptions.annotation.connectorColor || "#ccc").attr(
-    "stroke-dasharray",
-    connectedStyle[formatOptions.annotation.connectorStyle]
-  ).filter((d) => d._dx == 0 && d._dy == 0).remove();
+  annotations.selectAll(".connector").style("stroke", formatOptions.annotation.connectorColor || "#ccc").attr("stroke-dasharray", connectedStyle[formatOptions.annotation.connectorStyle.toLowerCase()]).style("visibility", (d) => (isBarChart ? parseFloat(d.data.x) == 0 : parseFloat(d.data.y) == 0) && formatOptions.annotation.annotationHideZeroValues ? "hidden" : "visible");
+  annotations.selectAll(`.connector-${ConnectorType}`).attr("fill", formatOptions.annotation.connectorColor || "#ccc").style("stroke", formatOptions.annotation.connectorColor || "#ccc").style("visibility", (d) => (isBarChart ? parseFloat(d.data.x) == 0 : parseFloat(d.data.y) == 0) && formatOptions.annotation.annotationHideZeroValues ? "hidden" : "visible");
+  annotations.selectAll(".note-line").style("stroke", formatOptions.annotation.connectorColor || "#ccc").attr("stroke-dasharray", connectedStyle[formatOptions.annotation.connectorStyle.toLowerCase()]).filter((d) => d._dx == 0 && d._dy == 0).remove();
   annotations.selectAll(".connector-end").filter((d) => d.connector.end == "dot" && d._dx == 0 && d._dy == 0).remove();
   annotations.selectAll(".annotation-note-label").filter((d) => d.data && !d.data.isVisible).style("display", "none");
   formatOptions.annotation.annotationType == "1" && annotations.selectAll(".annotation-note-content").attr("transform", function() {
     const transform = select$2(this).attr("transform");
     const translateValues = transform.match(/translate\(([^,]+),([^,]+)\)/);
     if (translateValues) {
-      const currentX = parseFloat(translateValues[1]);
+      const currentX = isBarChart ? 0 : parseFloat(translateValues[1]);
       return `translate(${currentX}, 0)`;
     }
   });
@@ -15693,9 +15722,9 @@ const appendTotalAnnotations = (svg, formatOptions, margin, fontStyle, makeAnnot
   ).style("font-weight", fontStyle.includes("Bold") ? "Bold" : "").call(makeAnnotations);
   annotations.selectAll("rect").style("visibility", "hidden");
   annotations.selectAll(".annotation-subject").remove();
-  annotations.selectAll(".connector").style("stroke", formatOptions.total.connectorColor || "#ccc").attr("stroke-dasharray", connectedStyle[formatOptions.total.connectorStyle]);
+  annotations.selectAll(".connector").style("stroke", formatOptions.total.connectorColor || "#ccc").attr("stroke-dasharray", connectedStyle[formatOptions.total.connectorStyle.toLowerCase()]);
   annotations.selectAll(`.connector-${ConnectorType}`).attr("fill", formatOptions.total.connectorColor || "#ccc").style("stroke", formatOptions.total.connectorColor || "#ccc");
-  annotations.selectAll(".note-line").style("stroke", formatOptions.total.connectorColor || "#ccc").attr("stroke-dasharray", connectedStyle[formatOptions.total.connectorStyle]).filter((d) => d._dx == 0 && d._dy == 0).remove();
+  annotations.selectAll(".note-line").style("stroke", formatOptions.total.connectorColor || "#ccc").attr("stroke-dasharray", connectedStyle[formatOptions.total.connectorStyle.toLowerCase()]).filter((d) => d._dx == 0 && d._dy == 0).remove();
   annotations.selectAll(".connector-end").filter((d) => d.connector.end == "dot" && d._dx == 0 && d._dy == 0).remove();
   formatOptions.total.annotationType == "1" && annotations.selectAll(".annotation-note-content").attr("transform", function() {
     const transform = select$2(this).attr("transform");
@@ -15925,6 +15954,7 @@ function lineMarkers(lines, chartData, type, xScale, yScale, yScaleRight, toolti
           j["markerShape"] = [chartTypes.CombinationLine, chartTypes.CombinationArea].includes(type) && !formatOptions.plotArea.plotAreaHideLineAndMarkers ? "None" : d.properties.markerShape ? d.properties.markerShape : "Circle";
           j["currentMeasure"] = d.properties.currentMeasure;
           j["markerColor"] = d.properties.markerColor ? d.properties.markerColor : "Blue";
+          j["alias"] = d.properties.alias;
           j["markerSize"] = d.properties.markerShape != "None" && d.properties.markerSize && d.properties.markerShape != "None" ? type === "Area" ? formatOptions.plotArea.plotAreaHideLineAndMarkers ? d.properties.markerSize : 0 : d.properties.markerSize : 0;
         }
       )
@@ -15970,7 +16000,7 @@ function lineMarkers(lines, chartData, type, xScale, yScale, yScaleRight, toolti
             },
             {
               key: "Legend",
-              value: legendEntry.legend.includes("~$~") ? legendEntry.legend.split("~$~")[1] : legendEntry.legend
+              value: legendEntry.alias.includes("~$~") ? legendEntry.alias.split("~$~")[1] : legendEntry.alias
             }
             // {
             //     key: "Calculated Tooltip",
@@ -16960,7 +16990,8 @@ const ColumnChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   let columnWidth = 0;
@@ -17199,7 +17230,7 @@ const ColumnChart = ({
     let yMaxRight = -Infinity;
     let yMinRight = Infinity;
     seriesData.forEach((series) => {
-      legendList.push(series.legend);
+      legendList.push(series.properties.legendUniqueId);
       series.data.forEach((point2) => {
         allChartData.push(point2);
         if (series.properties.axis === "Secondary") {
@@ -17345,13 +17376,14 @@ const ColumnChart = ({
       lData.data.forEach((cData) => {
         cData.hideZero = lData.properties.hideZeroValues;
         cData.axis = lData.properties.axis;
+        cData.legendUniqueId = lData.properties.legendUniqueId;
       });
     });
     filteredDimension.forEach((dim) => {
       gTag.append("rect").attr("id", `dim-background-${dim}`).attr("class", "dimension-background").attr("x", xScale(dim) - xScale.step() / 2).attr("width", xScale.step()).attr("y", 0).attr("height", innerHeight2).attr("fill", "#f3f4f6").attr("visibility", "hidden").lower();
     });
     lineData.forEach((data2) => {
-      let column = gTag.selectAll(".parentGroup").data([data2], (d) => d.legend);
+      let column = gTag.selectAll(".parentGroup").data([data2], (d) => d.properties.legendUniqueId);
       column = column.enter().append("g").attr("class", `column parentGroup`).merge(column);
       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(
@@ -17372,7 +17404,7 @@ const ColumnChart = ({
         "transform",
         (d) => `translate(${xScale(d.dimension) - columnWidth / 2}, 0)`
       );
-      const bars = columnGroupsEnter.append("rect").attr("x", (d) => xScaleForLegends(d.legend)).attr("width", xScaleForLegends.bandwidth()).attr("y", (d) => {
+      const bars = columnGroupsEnter.append("rect").attr("x", (d) => xScaleForLegends(d.legendUniqueId)).attr("width", xScaleForLegends.bandwidth()).attr("y", (d) => {
         const yScale = data2.properties.axis === axisTypes.primary ? yScaleLeft : yScaleRight;
         return yScale(0);
       }).attr("height", 0).attr("fill", data2.properties.color).attr(
@@ -17477,8 +17509,7 @@ const ColumnChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -17488,6 +17519,7 @@ const ColumnChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       xScaleForLegends,
       columnWidth,
       isReportEditable
@@ -17532,7 +17564,8 @@ const CustomColumnChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   let columnWidth = 0;
@@ -17785,7 +17818,7 @@ const CustomColumnChart = ({
     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);
+        series.properties.type !== chartTypes.LineChart && series.properties.type !== chartTypes.AreaChart && legendList.push(series.properties.legendUniqueId);
       } else {
         if (chartTypes.StackColumnChart === series.properties.type) {
           if (!legendList.includes(chartTypes.StackColumnChart)) {
@@ -17817,7 +17850,8 @@ const CustomColumnChart = ({
           type: series.properties.type,
           axis: series.properties.axis,
           labelPosition: formatOptions?.annotation?.annotationPosition.toString() === "4" ? series.properties.dataLabelPosition.toString() : formatOptions?.annotation?.annotationPosition.toString(),
-          labelColor: series.properties.labelColor
+          labelColor: series.properties.labelColor,
+          legendUniqueId: series.properties.legendUniqueId
         };
         if (newPoint.axis === "Secondary") {
           isSecondaryAxisDrawn = true;
@@ -17892,7 +17926,8 @@ const CustomColumnChart = ({
           axis: d.properties.axis,
           type: d.properties.type,
           legend: d.properties.legend,
-          annotation: d.properties.annotation
+          annotation: d.properties.annotation,
+          alias: d.properties.alias
         },
         stackData: tempStackAreaChartDataForPrimaryAxis,
         data: primaryStackAreaAxisData2
@@ -17904,7 +17939,8 @@ const CustomColumnChart = ({
           axis: d.properties.axis,
           type: d.properties.type,
           legend: d.properties.legend,
-          annotation: d.properties.annotation
+          annotation: d.properties.annotation,
+          alias: d.properties.alias
         },
         stackData: tempStackAreaChartDataForSecondaryAxis,
         data: secondaryStackAreaAxisData2
@@ -17916,7 +17952,8 @@ const CustomColumnChart = ({
           axis: d.properties.axis,
           type: d.properties.type,
           legend: d.properties.legend,
-          annotation: d.properties.annotation
+          annotation: d.properties.annotation,
+          alias: d.properties.alias
         },
         stackData: tempStackColumnChartDataForPrimaryAxis,
         data: primaryStackColumnAxisData2
@@ -17928,7 +17965,8 @@ const CustomColumnChart = ({
           axis: d.properties.axis,
           type: d.properties.type,
           legend: d.properties.legend,
-          annotation: d.properties.annotation
+          annotation: d.properties.annotation,
+          alias: d.properties.alias
         },
         stackData: tempStackColumnChartDataForSecondaryAxis,
         data: secondaryStackColumnAxisData2
@@ -18072,9 +18110,9 @@ const CustomColumnChart = ({
     gTag.selectAll(".parentGroup").raise();
   };
   const drawColumnChart = (data2) => {
-    let column = gTag.selectAll(".parentGroup").data([data2], (d) => d.legend);
+    let column = gTag.selectAll(".parentGroup").data([data2], (d) => d.properties?.legendUniqueId);
     column = column.enter().append("g").attr("class", `column parentGroup`).merge(column);
-    let columnGroups = column.selectAll(".column-group").data(data2.data, (d) => d.legend + d.dimension);
+    let columnGroups = column.selectAll(".column-group").data(data2.data, (d) => d.legendUniqueId);
     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, "-")
@@ -18083,7 +18121,7 @@ const CustomColumnChart = ({
       "transform",
       (d) => `translate(${xScale(d.dimension) - columnWidth / 2}, 0)`
     );
-    columnGroupsEnter.append("rect").attr("x", (d) => xScaleForLegends(d.legend)).attr("width", xScaleForLegends.bandwidth()).attr("y", (d) => {
+    columnGroupsEnter.append("rect").attr("x", (d) => xScaleForLegends(d.legendUniqueId)).attr("width", xScaleForLegends.bandwidth()).attr("y", (d) => {
       const yScale = data2.properties.axis === axisTypes.primary ? yScaleLeft : yScaleRight;
       return d.value > 0 ? yScale(d.value) : yScale(0);
     }).attr("height", (d) => {
@@ -18134,6 +18172,7 @@ const CustomColumnChart = ({
       lData.data.forEach((cData) => {
         cData.hideZero = lData.properties.hideZeroValues;
         cData.axis = lData.properties.axis;
+        cData.legendUniqueId = lData.properties.legendUniqueId;
       });
     });
     const lineGenerator = line$1().x(
@@ -18143,7 +18182,7 @@ const CustomColumnChart = ({
     ).defined((d) => d.hideZero ? Boolean(d.value) : true).curve(getCurveType(formatOptions));
     let lines = gTag.selectAll(".lines.parentGroup").data([1]);
     lines = lines.enter().append("g").attr("class", "lines parentGroup").merge(lines);
-    let lineGroups = lines.selectAll(".line-group").data(lineData, (d) => d.legend);
+    let lineGroups = lines.selectAll(".line-group").data(lineData, (d) => d.properties.legendUniqueId);
     let lineGroupsEnter = lineGroups.enter().append("g").attr("class", "line-group");
     lineGroupsEnter.attr(
       "hoverId",
@@ -18193,6 +18232,7 @@ const CustomColumnChart = ({
       lData.data.forEach((cData) => {
         cData.hideZero = lData.properties.hideZeroValues;
         cData.axis = lData.properties.axis;
+        cData.legendUniqueId = lData.properties.legendUniqueId;
       });
     });
     const areaGenerator = area().x(
@@ -18215,13 +18255,13 @@ const CustomColumnChart = ({
     areas = areas.enter().append("g").attr("class", "areas parentGroup").merge(areas);
     let areaGroups = areas.selectAll(".area-group").data(lineData, (d) => d.legend);
     let areaGroupsEnter = areaGroups.enter().append("g").attr("class", "area-group");
-    areaGroupsEnter.attr(
+    areaGroupsEnter.append("path").attr(
       "hoverId",
       (d) => (d.properties.alias || d.properties.name || "Legend").replace(
         /\s+/g,
         "-"
       )
-    ).append("path").attr("class", "area").attr(
+    ).attr("class", "area parentGroup").attr(
       "fill",
       (d) => d.properties.color !== commonColors.white ? d.properties.color : "none"
     ).style("fill-opacity", formatOptions.plotArea.fillOpacity);
@@ -18276,6 +18316,7 @@ const CustomColumnChart = ({
       lData.data.forEach((cData) => {
         cData.hideZero = lData.properties.hideZeroValues;
         cData.axis = lData.properties.axis;
+        cData.legendUniqueId = lData.properties.legendUniqueId;
       });
     });
     const areaGenerator = area().x(
@@ -18290,10 +18331,10 @@ const CustomColumnChart = ({
     areas = areas.enter().append("g").attr("class", "areas parentGroup").merge(areas);
     let areaGroups = areas.selectAll(".area-group").data((d) => d);
     let areaGroupsEnter = areaGroups.enter().append("g").attr("class", (d) => "area-group " + d.key.replace(/ /g, "-"));
-    areaGroupsEnter.attr(
+    areaGroupsEnter.append("path").attr(
       "hoverId",
       (d) => (data2.data.filter((e) => e.legend === d.key)[0].properties.alias || data2.data.filter((e) => e.legend === d.key)[0].properties.name || "Legend").replace(/\s+/g, "-")
-    ).append("path").attr("class", "area").attr("fill", (d) => d.color !== commonColors.white ? d.color : "none");
+    ).attr("class", "area parentGroup").attr("fill", (d) => d.color !== commonColors.white ? d.color : "none");
     areaGroupsEnter.merge(areaGroups).select("path").attr("d", (d, i) => areaGenerator(d)).style("opacity", formatOptions.plotArea.fillOpacity).attr(
       "stroke",
       (d) => d.color !== commonColors.white ? d.color : "none"
@@ -18336,7 +18377,7 @@ const CustomColumnChart = ({
       (d) => `translate(${xScale(d.data.dimension) - columnWidth / 2},0)`
     ).merge(rects).attr(
       "hoverId",
-      (d) => d.key.includes("~$~") ? d.key.split("~$~")[1].replace(/ /g, "-") : d.key.replace(/ /g, "-")
+      (d) => d.alias.includes("~$~") ? d.alias.split("~$~")[1].replace(/ /g, "-") : d.alias.replace(/ /g, "-")
     ).attr("x", (d) => xScaleForLegends(chartTypes.StackColumnChart)).attr(
       "y",
       (d) => d.data.axis === axisTypes.primary ? yScaleLeft(d[1]) : yScaleRight(d[1])
@@ -18482,8 +18523,7 @@ const CustomColumnChart = ({
       [],
       // individualLabelColor
       columnWidth,
-      [],
-      //old annotation list
+      // [], //old annotation list
       formatOptions,
       height,
       width,
@@ -18492,6 +18532,7 @@ const CustomColumnChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       xScaleForLegends,
       isReportEditable
     );
@@ -18523,6 +18564,8 @@ const CustomColumnChart = ({
     stackChartData.forEach((stackData, j) => {
       stackData.forEach((d) => {
         d["key"] = stackData.key;
+        d["alias"] = requiredStackChatData.data[j].properties.alias;
+        stackData["alias"] = requiredStackChatData.data[j].properties.alias;
         stackData["color"] = JSON.parse(
           JSON.stringify(requiredStackChatData.data[j].properties.color)
         );
@@ -18592,7 +18635,8 @@ const LayeredColumnChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   let columnWidth = 0;
@@ -18819,7 +18863,7 @@ const LayeredColumnChart = ({
     let yMaxRight = -Infinity;
     let yMinRight = Infinity;
     seriesData.forEach((series) => {
-      legendList.push(series.legend);
+      legendList.push(series.properties.legendUniqueId);
       series.data.forEach((point2) => {
         allChartData.push(point2);
         yMaxLeft = Math.max(yMaxLeft, point2.value);
@@ -18934,9 +18978,9 @@ const LayeredColumnChart = ({
       });
     });
     lineData.forEach((data2, index2) => {
-      let column = gTag.selectAll(".parentGroup").data([data2], (d) => d.legend);
+      let column = gTag.selectAll(".parentGroup").data([data2], (d) => d.properties.legendUniqueId);
       column = column.enter().append("g").attr("class", `column parentGroup`).merge(column);
-      let columnGroups = column.selectAll(".column-group").data(data2.data, (d) => d.legend + d.dimension);
+      let columnGroups = column.selectAll(".column-group").data(data2.data, (d) => d.properties.legendUniqueId);
       let columnGroupsEnter = columnGroups.enter().append("g").attr("class", "column-group").attr(
         "hoverId",
         (data2.properties.alias || data2.properties.name || "Legend").replace(
@@ -19050,8 +19094,7 @@ const LayeredColumnChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -19061,6 +19104,7 @@ const LayeredColumnChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       void 0,
       columnWidth,
       isReportEditable
@@ -19114,7 +19158,8 @@ const StackColumnChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   let columnWidth = 0;
@@ -19535,8 +19580,7 @@ const StackColumnChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -19546,6 +19590,7 @@ const StackColumnChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       dataTableHeight,
       isReportEditable
     );
@@ -19831,7 +19876,8 @@ const NormalizedStackColumnChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   let columnWidth = 0;
@@ -20266,8 +20312,7 @@ const NormalizedStackColumnChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -20277,6 +20322,7 @@ const NormalizedStackColumnChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       dataTableHeight,
       isReportEditable
     );
@@ -21364,7 +21410,8 @@ const LineChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   const barWidth = 0;
@@ -21624,7 +21671,7 @@ const LineChart = ({
     chartJSON.chartData = allChartData;
     chartJSON.legendList = legendList;
     chartJSON.yMaxLeft = yMaxLeft;
-    chartJSON.yMinLeft = yMinLeft > 0 ? 0 : yMinLeft;
+    chartJSON.yMinLeft = yMinLeft;
     chartJSON.yMaxRight = yMaxRight;
     chartJSON.yMinRight = yMinRight;
     formatedDimensionList = isDateType ? setDateFormats(
@@ -21658,7 +21705,7 @@ const LineChart = ({
     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,
+        chartJSON.yMinLeft >= 0 ? customYaxisMinValue !== void 0 && !Number.isNaN(customYaxisMinValue) ? customYaxisMinValue : chartJSON.yMinLeft * 0.9 : chartJSON.yMinLeft < 0 ? chartJSON.yMinLeft * 1.1 : chartJSON.yMinLeft * 0.9,
         chartJSON.yMaxLeft <= 0 ? 0 : customYaxisMaxValue !== void 0 && !Number.isNaN(customYaxisMaxValue) ? customYaxisMaxValue : chartJSON.yMaxLeft * 1.1
       ]).range([
         dataTableHeight > 0 ? innerHeight2 - dataTableHeight : innerHeight2,
@@ -21849,8 +21896,7 @@ const LineChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -21860,6 +21906,9 @@ const LineChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
+      void 0,
+      void 0,
       isReportEditable
     );
     let newSeriesLabelArray = prepareDataForSeriesLabel(
@@ -21914,7 +21963,8 @@ const StackLineChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   const barWidth = 0;
@@ -22384,8 +22434,7 @@ const StackLineChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -22395,6 +22444,7 @@ const StackLineChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       dataTableHeight,
       isReportEditable
     );
@@ -22465,6 +22515,7 @@ const StackLineChart = ({
         d["hideZero"] = JSON.parse(
           JSON.stringify(seriesData[j].properties.hideZeroValues)
         );
+        d["properties"] = seriesData[j].properties;
       })
     );
   };
@@ -22489,7 +22540,8 @@ const NormalisedStackLineChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   const barWidth = 0;
@@ -22910,8 +22962,7 @@ const NormalisedStackLineChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -22921,6 +22972,7 @@ const NormalisedStackLineChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       dataTableHeight,
       isReportEditable
     );
@@ -22986,6 +23038,7 @@ const NormalisedStackLineChart = ({
         d["hideZero"] = JSON.parse(
           JSON.stringify(seriesData[j].properties.hideZeroValues)
         );
+        d["properties"] = seriesData[j].properties;
       })
     );
   };
@@ -23003,7 +23056,8 @@ const HorizontalBarChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   let columnWidth = 0;
@@ -23227,7 +23281,7 @@ const HorizontalBarChart = ({
     let yMaxRight = -Infinity;
     let yMinRight = Infinity;
     seriesData.forEach((series) => {
-      legendList.push(series.legend);
+      legendList.push(series.properties.legendUniqueId);
       series.data.forEach((point2) => {
         allChartData.push(point2);
         if (series.properties.axis === "Secondary") {
@@ -23356,13 +23410,14 @@ const HorizontalBarChart = ({
       lData.data.forEach((cData) => {
         cData.hideZero = lData.properties.hideZeroValues;
         cData.axis = lData.properties.axis;
+        cData.legendUniqueId = lData.properties.legendUniqueId;
       });
     });
     filteredDimension.forEach((dim) => {
       gTag.append("rect").attr("id", `dim-background-${dim}`).attr("class", "dimension-background").attr("y", yScale(dim) - columnWidth / 2).attr("height", columnWidth).attr("x", 0).attr("width", innerWidth2).attr("fill", "#E5E5E5").attr("visibility", "hidden").lower();
     });
     lineData.forEach((data2) => {
-      let column = gTag.selectAll(".parentGroup").data([data2], (d) => d.legend);
+      let column = gTag.selectAll(".parentGroup").data([data2], (d) => d.properties.legendUniqueId);
       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 })),
@@ -23386,7 +23441,7 @@ const HorizontalBarChart = ({
         "transform",
         (d) => `translate(0, ${yScale(d.dimension) - columnWidth / 2})`
       );
-      const bars = columnGroupsEnter.append("rect").attr("y", (d) => yScaleLegends(d.legend)).attr("height", yScaleLegends.bandwidth()).attr("x", (d) => {
+      const bars = columnGroupsEnter.append("rect").attr("y", (d) => yScaleLegends(d.legendUniqueId)).attr("height", yScaleLegends.bandwidth()).attr("x", (d) => {
         const xScaleUsed = data2.properties.axis === axisTypes.primary ? xScaleBottom : xScaleTop;
         return d.value >= 0 ? xScaleUsed(0) : xScaleUsed(0);
       }).attr("width", 0).attr("fill", data2.properties.color).attr(
@@ -23500,8 +23555,7 @@ const HorizontalBarChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -23511,10 +23565,11 @@ const HorizontalBarChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       yScaleLegends,
       columnWidth,
-      false,
       isReportEditable,
+      false,
       barChart
     );
   };
@@ -23532,7 +23587,8 @@ const StackHorizontalChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   let columnWidth = 0;
@@ -23955,8 +24011,7 @@ const StackHorizontalChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -23966,6 +24021,7 @@ const StackHorizontalChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       0,
       isReportEditable,
       barChart
@@ -24236,7 +24292,8 @@ const NormalizedStackHorizontalBarChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   let columnWidth = 0;
@@ -24632,8 +24689,7 @@ const NormalizedStackHorizontalBarChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -24643,6 +24699,7 @@ const NormalizedStackHorizontalBarChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       0,
       isReportEditable,
       barChart
@@ -24696,7 +24753,8 @@ const LayeredHorizontalBarChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   let columnWidth = 0;
@@ -24893,7 +24951,7 @@ const LayeredHorizontalBarChart = ({
     let yMaxRight = -Infinity;
     let yMinRight = Infinity;
     seriesData.forEach((series) => {
-      legendList.push(series.legend);
+      legendList.push(series.properties.legendUniqueId);
       series.data.forEach((point2) => {
         allChartData.push(point2);
         yMaxLeft = Math.max(yMaxLeft, point2.value);
@@ -25001,9 +25059,9 @@ const LayeredHorizontalBarChart = ({
       });
     });
     lineData.forEach((data2, index2) => {
-      let column = gTag.selectAll(".parentGroup").data([data2], (d) => d.legend);
+      let column = gTag.selectAll(".parentGroup").data([data2], (d) => d.properties.legendUniqueId);
       column = column.enter().append("g").attr("class", `column parentGroup`).merge(column);
-      let columnGroups = column.selectAll(".column-group").data(data2.data, (d) => d.legend + d.dimension);
+      let columnGroups = column.selectAll(".column-group").data(data2.data, (d) => d.properties.legendUniqueId);
       let columnGroupsEnter = columnGroups.enter().append("g").attr("class", "column-group").attr(
         "hoverId",
         (data2.properties.alias || data2.properties.name || "Legend").replace(
@@ -25125,8 +25183,7 @@ const LayeredHorizontalBarChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -25136,6 +25193,7 @@ const LayeredHorizontalBarChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       yScale,
       columnWidth,
       false,
@@ -25888,7 +25946,8 @@ const AreaChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   const barWidth = 0;
@@ -26354,8 +26413,7 @@ const AreaChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -26365,6 +26423,9 @@ const AreaChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
+      void 0,
+      void 0,
       isReportEditable
     );
     let newSeriesLabelArray = prepareDataForSeriesLabel(
@@ -26420,7 +26481,8 @@ const StackAreaChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   const barWidth = 0;
@@ -26903,8 +26965,7 @@ const StackAreaChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -26914,6 +26975,7 @@ const StackAreaChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       dataTableHeight,
       isReportEditable
     );
@@ -27011,7 +27073,8 @@ const NormalizedStackAreaChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   const barWidth = 0;
@@ -27490,8 +27553,7 @@ const NormalizedStackAreaChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -27501,8 +27563,10 @@ const NormalizedStackAreaChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       dataTableHeight,
-      isReportEditable
+      isReportEditable,
+      false
     );
     let newSeriesLabelArray = prepareDataForSeriesLabel(
       innerWidth2,
@@ -27540,6 +27604,7 @@ const NormalizedStackAreaChart = ({
         d["hideZero"] = JSON.parse(
           JSON.stringify(seriesData[j].properties.hideZeroValues)
         );
+        d["properties"] = seriesData[j].properties;
       })
     );
   };
@@ -27643,7 +27708,7 @@ const drawTotalValue = (chartFormatOptions, totalValue, chartTitleHeight, chartA
         chartFormatOptions.total.totalDecimalPrecision
       )(totalValue);
       let cords = getTotalValueCords(chartFormatOptions, chartTitleHeight, innerWidth2, innerHeight2);
-      chartAreaTagG.append("g").attr("transform", `translate(${cords.x}, ${cords.y})`).style("user-select", "none").append("text").text(`Total : ${formatedTotalValue}`).style(
+      chartAreaTagG.append("g").attr("transform", `translate(${cords.x}, ${cords.y})`).style("user-select", "none").append("text").text(`${chartFormatOptions.total.editTotalText} : ${formatedTotalValue}`).style(
         "fill",
         chartFormatOptions.total.totalColor !== commonColors.white ? chartFormatOptions.total.totalColor : "none"
       ).style("font-family", chartFormatOptions.total.totalFontFamily).style("font-size", chartFormatOptions.total.totalFontSize).style("font-style", fontStyle.includes(fontStyleOptions.italic) ? fontStyleOptions.italic : "").style(
@@ -27873,7 +27938,7 @@ const PieChart = ({ data, formatOptions, chartId }) => {
         ).attr("dy", "-0.35em").attr("text-anchor", "middle").attr("alignment-baseline", "middle").text((d) => {
           const { plotArea } = chartFormatOptions;
           if (plotArea.dataLabelName) {
-            return d.data.legend;
+            return d.data.properties?.alias || d.data.legend;
           }
           return "";
         });
@@ -27909,7 +27974,7 @@ const PieChart = ({ data, formatOptions, chartId }) => {
           (d) => d.endAngle - d.startAngle < 0.17 ? "hidden" : "visible"
         ).attr("text-anchor", "middle").attr("alignment-baseline", "middle").attr(
           "dy",
-          chartFormatOptions.plotArea.dataLabelName ? "1.00em" : "0"
+          chartFormatOptions.plotArea.dataLabelName ? "1.00em" : "0em"
         ).text((d) => {
           if (chartFormatOptions.plotArea.dataLabelValue) {
             const dataValue = d.data.data[0].value;
@@ -27932,7 +27997,7 @@ const PieChart = ({ data, formatOptions, chartId }) => {
           }
         }).append("tspan").attr("x", 0).attr(
           "y",
-          chartFormatOptions.plotArea.dataLabelValue ? chartFormatOptions.plotArea.dataLabelName ? "2.45em" : "0.1em" : null
+          chartFormatOptions.plotArea.dataLabelValue ? chartFormatOptions.plotArea.dataLabelName ? "2.45em" : "1.65em" : null
         ).attr(
           "font-weight",
           (d) => d.data.properties?.valueFontStyle?.includes(fontStyleOptions.bold) ? fontStyleOptions.bold : "300"
@@ -28278,7 +28343,7 @@ const DonutChart = ({
         ).attr("dy", "-0.35em").attr("text-anchor", "middle").attr("alignment-baseline", "middle").text((d) => {
           const { plotArea } = chartFormatOptions;
           if (plotArea.dataLabelName) {
-            return d.data.legend;
+            return d.data?.properties?.alias || d.data.legend;
           }
           return "";
         });
@@ -28317,7 +28382,7 @@ const DonutChart = ({
           (d) => d.endAngle - d.startAngle < 0.17 ? "hidden" : "visible"
         ).attr("text-anchor", "middle").attr("alignment-baseline", "middle").attr(
           "dy",
-          chartFormatOptions.plotArea.dataLabelName ? "1.00em" : "0"
+          chartFormatOptions.plotArea.dataLabelName ? "1.00em" : "0em"
         ).text((d) => {
           if (chartFormatOptions.plotArea.dataLabelValue) {
             const dataValue = d.data.data[0].value;
@@ -28340,7 +28405,7 @@ const DonutChart = ({
           }
         }).append("tspan").attr("x", 0).attr(
           "y",
-          chartFormatOptions.plotArea.dataLabelValue ? chartFormatOptions.plotArea.dataLabelName ? "2.45em" : "0.1em" : null
+          chartFormatOptions.plotArea.dataLabelValue ? chartFormatOptions.plotArea.dataLabelName ? "2.45em" : "1.65em" : null
         ).attr(
           "font-weight",
           (d) => d.data.properties?.valueFontStyle?.includes(fontStyleOptions.bold) ? fontStyleOptions.bold : "300"
@@ -29249,7 +29314,7 @@ const PyramidChart = ({
           const bottomWidth = pyramidSide * (inversionConstant - stackHeightArray[i + 1] / pyramidHeight);
           const centerX = innerWidth2 / 2;
           const pyramidContainer = chartAreaTagG.append("g").attr("id", "PyramidChart").attr("class", "parentGroup");
-          pyramidContainer.append("polygon").attr("class", "segment").attr("hoverId", d.legend).attr(
+          pyramidContainer.append("polygon").attr("class", "segment").attr("hoverId", d.legend.replace(/\s+/g, "-")).attr(
             "points",
             `
                 ${centerX - topWidth / 2},${yTop}
@@ -29317,7 +29382,7 @@ const PyramidChart = ({
           }
         }).on("dragend", function(annotation2) {
           try {
-            annotations.selectAll(".connector").attr("hoverId", (d) => d.data.legend).style(
+            annotations.selectAll(".connector").attr("hoverId", (d) => d.data.legend.replace(/\s+/g, "-")).style(
               "stroke",
               chartFormatOptions.annotation.connectorColor || "#ccc"
             ).attr(
@@ -29331,7 +29396,7 @@ const PyramidChart = ({
               "stroke",
               chartFormatOptions.annotation.connectorColor || "#ccc"
             );
-            annotations.selectAll(".note-line").attr("hoverId", (d) => d.data.currentLegend).style(
+            annotations.selectAll(".note-line").attr("hoverId", (d) => d.data.currentLegend.replace(/\s+/g, "-")).style(
               "stroke",
               chartFormatOptions.annotation.connectorColor || "#ccc"
             ).attr(
@@ -29382,7 +29447,7 @@ const PyramidChart = ({
         annotations.selectAll(".annotation-note-title").attr("text-anchor", "middle");
         annotations.selectAll(".annotation-note-content").attr("transform", `translate(0,-28)`);
         !chartFormatOptions.plotArea.dataLabelName && annotations.selectAll("tspan").attr("dy", "0");
-        chartFormatOptions.plotArea.dataLabelName && annotations.selectAll(".annotation-note-title").attr("hoverId", (d) => d.data.legend).style("font-size", (d) => d.data.labelFontSize).attr("font-family", (d) => d.data.labelFontFamily).style(
+        chartFormatOptions.plotArea.dataLabelName && annotations.selectAll(".annotation-note-title").attr("hoverId", (d) => d.data.legend.replace(/\s+/g, "-")).style("font-size", (d) => d.data.labelFontSize).attr("font-family", (d) => d.data.labelFontFamily).style(
           "font-style",
           (d) => d.data.labelFontStyle.includes(fontStyleOptions.italic) ? fontStyleOptions.italic : ""
         ).style(
@@ -29392,7 +29457,7 @@ const PyramidChart = ({
           "font-weight",
           (d) => d.data.labelFontStyle.includes(fontStyleOptions.bold) ? fontStyleOptions.bold : "300"
         ).style("fill", (d) => d.data.labelFontColor);
-        chartFormatOptions.plotArea.dataLabelValue && annotations.selectAll(".annotation-note-label").attr("hoverId", (d) => d.data.legend).style("font-size", (d) => d.data.valueFontSize).attr("font-family", (d) => d.data.valueFontFamily).style(
+        chartFormatOptions.plotArea.dataLabelValue && annotations.selectAll(".annotation-note-label").attr("hoverId", (d) => d.data.legend.replace(/\s+/g, "-")).style("font-size", (d) => d.data.valueFontSize).attr("font-family", (d) => d.data.valueFontFamily).style(
           "font-style",
           (d) => d.data.valueFontStyle.includes(fontStyleOptions.italic) ? fontStyleOptions.italic : ""
         ).style(
@@ -29597,6 +29662,9 @@ const ProgressChart = ({
       chartAreaTagG.append("path").attr("class", "secondary-circle").attr("fill", ChartData[arcIndex].properties.color).attr(
         "fill-opacity",
         chartFormatOptions.plotArea.opacityforProgressScale
+      ).attr(
+        "hoverId",
+        (d) => (ChartData[arcIndex]?.properties?.alias || ChartData[arcIndex]?.properties?.name || "Legend").replace(/\s+/g, "-")
       ).attr("d", arc2({ endAngle: completeAngle })).on("mousemove", (d) => {
         try {
           showTooltipOnMouseMove(
@@ -29635,6 +29703,9 @@ const ProgressChart = ({
       chartAreaTagG.append("path").attr("class", "progress-circle").attr("fill", ChartData[progressIndex].properties.color).attr(
         "fill-opacity",
         chartFormatOptions.plotArea.opacityforProgressGoal
+      ).attr(
+        "hoverId",
+        (d) => (ChartData[progressIndex]?.properties?.alias || ChartData[progressIndex]?.properties?.name || "Legend").replace(/\s+/g, "-")
       ).attr("d", arc2({ endAngle: progressAngle })).on("mousemove", (d) => {
         try {
           showTooltipOnMouseMove(
@@ -29643,16 +29714,16 @@ const ProgressChart = ({
                 key: ChartData[progressIndex].properties.alias,
                 value: chartFormatOptions.toolTip.toolTipNumberFormatProgress == ",.0%" ? Math.round(progressValue / maxValue * 100) + "%" : getNumberWithFormatFunction(
                   chartFormatOptions.toolTip.toolTipDisplayUnits,
-                  chartFormatOptions.toolTip.toolTipDecimalPrecision,
-                  chartFormatOptions.toolTip.toolTipNumberFormatProgress
+                  chartFormatOptions.toolTip.toolTipNumberFormatProgress,
+                  chartFormatOptions.toolTip.toolTipDecimalPrecision
                 )(maxValue)
               },
               {
                 key: ChartData[arcIndex].properties.alias,
                 value: chartFormatOptions.toolTip.toolTipNumberFormatProgress == ",.0%" ? "100 %" : getNumberWithFormatFunction(
                   chartFormatOptions.toolTip.toolTipDisplayUnits,
-                  chartFormatOptions.toolTip.toolTipDecimalPrecision,
-                  chartFormatOptions.toolTip.toolTipNumberFormatProgress
+                  chartFormatOptions.toolTip.toolTipNumberFormatProgress,
+                  chartFormatOptions.toolTip.toolTipDecimalPrecision
                 )(progressValue)
               }
             ],
@@ -55147,7 +55218,8 @@ const TornadoChart = ({
   isDateType,
   formatOptions,
   data,
-  isReportEditable
+  isReportEditable,
+  onDataLabelCoordinatesChange
 }) => {
   const chartId = crypto.randomUUID();
   let columnWidth = 0;
@@ -55425,11 +55497,11 @@ const TornadoChart = ({
   const preProcessChartData = () => {
     let processedSeriesData;
     if (!isAdvanceAnalyticsChart) {
-      const firstMeasure = seriesData[0]?.properties.currentMeasure;
+      const firstMeasure = "0~$~" + seriesData[0]?.properties.currentMeasure;
       let yMaxLeft = 0;
       let yMaxRight = -Infinity;
-      processedSeriesData = seriesData.map((series) => {
-        const isFirstMeasure = series.properties.currentMeasure === firstMeasure;
+      processedSeriesData = seriesData.map((series, index2) => {
+        const isFirstMeasure = index2 + "~$~" + series.properties.currentMeasure === firstMeasure;
         const newData = series.data.map((point2) => {
           const newValue = isFirstMeasure ? -Math.abs(point2.value) : Math.abs(point2.value);
           return {
@@ -55676,8 +55748,7 @@ const TornadoChart = ({
       //this.labelExcludeList,
       [],
       //this.individualLabelColor,
-      [],
-      //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
+      // [], //this.attributes.Id ? formatOptions.plotArea.dataLabelsCoordinates : this.parentReference.objService.tempAnnotationArray
       formatOptions,
       chartType,
       height,
@@ -55687,6 +55758,7 @@ const TornadoChart = ({
       innerHeight2,
       chartId,
       svg,
+      onDataLabelCoordinatesChange,
       yScaleLeft,
       columnWidth,
       isReportEditable,