pace-chart-lib 1.0.36 → 1.0.38

package/dist/Components/Charts/ChartsWithAxis/ChartsWithAxisFunctions.d.ts

@@ -624,3 +624,4 @@ export declare const clamp: (v: any, a: any, b: any) => number;
 export declare const horizontalScrollBar: (seriesData: any, height: any, width: any, svg: any, margin: any, innerWidth: any, scrollbarVisible: any, visibleBars: any, chartJSON: any, scrollPosition: any, isStackedChart: any, setAndUpdateChartData: any, isBarChart?: boolean) => void;
 export declare function addTotalValue(totalValueMap: Map<string, number>, xScale: any, yScale: any, margin: TMargin, d3Annotation: any, oldAnnotationList: any[], formatOptions: TDefaultChartFormatOptionsType, chartType: string, height: number, width: number, svg: any, isReportEditable?: boolean, isBarChart?: boolean): void;
 export declare function createTotalMeasureValueMap(data: TData, totalValueMap: Map<string, number>, filteredDimension: string[]): void;
+export declare function getVerticalGridLinesTickSize(formatOptions: TDefaultChartFormatOptionsType, innerHeight: number, dataTableHeight: number, shouldAdjustForAxisPosition?: boolean): number;

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

@@ -12682,7 +12682,7 @@ function initXaxis$1(gTag, chartJSON, xLabel, formatOptions, dataTableHeight, yS
     XaxisG.select(".domain").style("stroke", formatOptions.xAxisLabel.xAxisColor).attr(
       "stroke-width",
       formatOptions.xAxisLabel.xAxisWidth ? formatOptions.xAxisLabel.xAxisWidth : formatOptions.plotArea.plotAreaBorderThickness
-    ).style("shape-rendering", "crispEdges");
+    ).style("shape-rendering", "crispEdges").raise();
     return gTag;
   } catch (error) {
     throw error;
@@ -13226,7 +13226,7 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
         }
       });
       if (formatOptions.annotation.annotationHideZeroValues) {
-        annotationsList = annotationsList.filter((d) => d.data.y.measure != 0);
+        annotationsList = annotationsList.filter((d) => barChart ? d.data.x.measure != 0 : d.data.y.measure != 0);
       }
       if (oldAnnotationList.length === 0) {
         oldAnnotationList = annotationsList;
@@ -13799,7 +13799,7 @@ function commonAnnotationsForCustomChart(chartData, xScale, yScaleLeft, yScaleRi
             }
           }
         }
-        finalAnnotationList.push(newAnnotation);
+        newAnnotation.data.labelPosition != 4 && finalAnnotationList.push(newAnnotation);
       });
       makeAnnotations.editMode(formatOptions.annotation.annotationDraggable && isReportEditable).accessors({
         x: function(d) {
@@ -15757,6 +15757,13 @@ function createTotalMeasureValueMap(data, totalValueMap, filteredDimension) {
     });
   }
 }
+function getVerticalGridLinesTickSize(formatOptions, innerHeight2, dataTableHeight, shouldAdjustForAxisPosition = false) {
+  const axisPositionMultiplier = shouldAdjustForAxisPosition ? formatOptions.xAxisLabel.xAxisPosition == "1" ? -1 : 1 : 1;
+  const dataTableHeightIfPreset = dataTableHeight > 0 ? dataTableHeight : 0;
+  const tickHeightPercentage = parseFloat(formatOptions.plotArea.ticksHeight) || 100;
+  const actualTickHeight = (innerHeight2 - dataTableHeightIfPreset) * tickHeightPercentage / 100;
+  return formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesVertical ? -actualTickHeight * axisPositionMultiplier : 0 : 0;
+}
 const chartProperties = {
   color: "defaultColor",
   name: "",
@@ -17368,7 +17375,7 @@ const ColumnChart = ({
   const getXAxis = () => {
     let xaxisLabelPosition = parseInt(formatOptions.xAxisLabel.xAxisPosition);
     xAxis = (xaxisLabelPosition == 1 ? axisTop(xScale) : axisBottom(xScale)).tickSize(
-      formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesVertical ? formatOptions.plotArea.gridLinesVertical ? -(dataTableHeight > 0 ? innerHeight2 - dataTableHeight : innerHeight2) : -formatOptions.plotArea.ticksHeight * ((dataTableHeight > 0 ? innerHeight2 - dataTableHeight : innerHeight2) / 100) : 0 : 0
+      getVerticalGridLinesTickSize(formatOptions, innerHeight2, dataTableHeight)
     ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(filteredDimension, innerWidth2));
   };
   const getChartType = (lineData) => {
@@ -17849,7 +17856,7 @@ const CustomColumnChart = ({
           ...point2,
           type: series.properties.type,
           axis: series.properties.axis,
-          labelPosition: formatOptions?.annotation?.annotationPosition.toString() === "4" ? series.properties.dataLabelPosition.toString() : formatOptions?.annotation?.annotationPosition.toString(),
+          labelPosition: formatOptions?.annotation?.annotationPosition.toString() === "4" ? series.properties.annotationPosition.toString() : formatOptions?.annotation?.annotationPosition.toString(),
           labelColor: series.properties.labelColor,
           legendUniqueId: series.properties.legendUniqueId
         };
@@ -18572,7 +18579,7 @@ const CustomColumnChart = ({
         stackData["individualAnnotationVisibility"] = JSON.parse(
           JSON.stringify(requiredStackChatData.data[j].properties.annotation)
         );
-        d.data.labelPosition = formatOptions?.annotation?.annotationPosition.toString() === "4" ? requiredStackChatData.data[j].properties.dataLabelPosition.toString() : formatOptions?.annotation?.annotationPosition.toString();
+        d.data.labelPosition = formatOptions?.annotation?.annotationPosition.toString() === "4" ? requiredStackChatData.data[j].properties.annotationPosition.toString() : formatOptions?.annotation?.annotationPosition.toString();
         d.data["labelColor"] = seriesColor == "2" ? JSON.parse(
           JSON.stringify(requiredStackChatData.data[j].properties.color)
         ) : JSON.parse(
@@ -19459,7 +19466,7 @@ const StackColumnChart = ({
   };
   const getXAxis = () => {
     xAxis = axisBottom(xScale).tickSize(
-      formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesVertical ? formatOptions.plotArea.gridLinesVertical ? -(dataTableHeight > 0 ? innerHeight2 - dataTableHeight : innerHeight2) : parseFloat(formatOptions.plotArea.ticksHeight) * ((dataTableHeight > 0 ? innerHeight2 - dataTableHeight : innerHeight2) / 100) * (formatOptions.xAxisLabel.xAxisPosition == "1" ? 1 : -1) : 0 : 0
+      getVerticalGridLinesTickSize(formatOptions, innerHeight2, dataTableHeight, true)
     ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(filteredDimension, innerWidth2));
   };
   const getChartType = (lineData) => {
@@ -25056,6 +25063,7 @@ const LayeredHorizontalBarChart = ({
       lData.data.forEach((cData) => {
         cData.hideZero = lData.properties.hideZeroValues;
         cData.axis = lData.properties.axis;
+        cData["properties"] = lData.properties;
       });
     });
     lineData.forEach((data2, index2) => {
@@ -26384,23 +26392,6 @@ const AreaChart = ({
   const drawAreaChart = () => {
     getXScale();
     getXAxis();
-    initXaxis$1(
-      gTag,
-      chartJSON,
-      xLabel,
-      formatOptions,
-      dataTableHeight,
-      yScaleLeft,
-      xAxis,
-      dimensionHeightWidthArray,
-      height,
-      barWidth,
-      isDateType,
-      innerWidth2,
-      innerHeight2,
-      filteredDimension,
-      xScale
-    );
     commonAnnotations(
       seriesData,
       xScale,
@@ -26437,6 +26428,23 @@ const AreaChart = ({
       isSecondaryAxisDrawn
     ).labelArray;
     getChartType(filteredData);
+    initXaxis$1(
+      gTag,
+      chartJSON,
+      xLabel,
+      formatOptions,
+      dataTableHeight,
+      yScaleLeft,
+      xAxis,
+      dimensionHeightWidthArray,
+      height,
+      barWidth,
+      isDateType,
+      innerWidth2,
+      innerHeight2,
+      filteredDimension,
+      xScale
+    );
     drawSeriesLabels(formatOptions, gTag, newSeriesLabelArray);
     if (formatOptions.dataTableProperties && formatOptions.dataTableProperties.dataTable) {
       if (formatOptions.xAxisLabel.xAxisPosition != "1")
@@ -26935,6 +26943,7 @@ const StackAreaChart = ({
   const drawLineChart = () => {
     getXScale();
     getXAxis();
+    getChartType(filteredData);
     initXaxis$1(
       gTag,
       chartJSON,
@@ -26952,7 +26961,6 @@ const StackAreaChart = ({
       filteredDimension,
       xScale
     );
-    getChartType(filteredData);
     stacklineAnnotations(
       stackChartData,
       xScale,
@@ -54742,7 +54750,8 @@ const WaterfallChart = ({
   };
   const preProcessChartData = () => {
     if (isAdvancedWaterfall) {
-      const tempWaterfallChartData2 = mapAdvancedWaterfallData(data);
+      let tempWaterfallChartData2 = mapAdvancedWaterfallData(data);
+      tempWaterfallChartData2 = tempWaterfallChartData2.filter((d) => d.up + d.down + d.base != 0);
       chartJSON.dimensionList = tempWaterfallChartData2.map((d) => d.xKey);
       chartJSON.legendList = chartJSON.dimensionList;
       waterFallData = stack().keys(["base", "dimensionTotal", "up", "down"])(

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

@@ -12685,7 +12685,7 @@
       XaxisG.select(".domain").style("stroke", formatOptions.xAxisLabel.xAxisColor).attr(
         "stroke-width",
         formatOptions.xAxisLabel.xAxisWidth ? formatOptions.xAxisLabel.xAxisWidth : formatOptions.plotArea.plotAreaBorderThickness
-      ).style("shape-rendering", "crispEdges");
+      ).style("shape-rendering", "crispEdges").raise();
       return gTag;
     } catch (error) {
       throw error;
@@ -13229,7 +13229,7 @@
           }
         });
         if (formatOptions.annotation.annotationHideZeroValues) {
-          annotationsList = annotationsList.filter((d) => d.data.y.measure != 0);
+          annotationsList = annotationsList.filter((d) => barChart ? d.data.x.measure != 0 : d.data.y.measure != 0);
         }
         if (oldAnnotationList.length === 0) {
           oldAnnotationList = annotationsList;
@@ -13802,7 +13802,7 @@
               }
             }
           }
-          finalAnnotationList.push(newAnnotation);
+          newAnnotation.data.labelPosition != 4 && finalAnnotationList.push(newAnnotation);
         });
         makeAnnotations.editMode(formatOptions.annotation.annotationDraggable && isReportEditable).accessors({
           x: function(d) {
@@ -15760,6 +15760,13 @@
       });
     }
   }
+  function getVerticalGridLinesTickSize(formatOptions, innerHeight2, dataTableHeight, shouldAdjustForAxisPosition = false) {
+    const axisPositionMultiplier = shouldAdjustForAxisPosition ? formatOptions.xAxisLabel.xAxisPosition == "1" ? -1 : 1 : 1;
+    const dataTableHeightIfPreset = dataTableHeight > 0 ? dataTableHeight : 0;
+    const tickHeightPercentage = parseFloat(formatOptions.plotArea.ticksHeight) || 100;
+    const actualTickHeight = (innerHeight2 - dataTableHeightIfPreset) * tickHeightPercentage / 100;
+    return formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesVertical ? -actualTickHeight * axisPositionMultiplier : 0 : 0;
+  }
   const chartProperties = {
     color: "defaultColor",
     name: "",
@@ -17371,7 +17378,7 @@
     const getXAxis = () => {
       let xaxisLabelPosition = parseInt(formatOptions.xAxisLabel.xAxisPosition);
       xAxis = (xaxisLabelPosition == 1 ? axisTop(xScale) : axisBottom(xScale)).tickSize(
-        formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesVertical ? formatOptions.plotArea.gridLinesVertical ? -(dataTableHeight > 0 ? innerHeight2 - dataTableHeight : innerHeight2) : -formatOptions.plotArea.ticksHeight * ((dataTableHeight > 0 ? innerHeight2 - dataTableHeight : innerHeight2) / 100) : 0 : 0
+        getVerticalGridLinesTickSize(formatOptions, innerHeight2, dataTableHeight)
       ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(filteredDimension, innerWidth2));
     };
     const getChartType = (lineData) => {
@@ -17852,7 +17859,7 @@
             ...point2,
             type: series.properties.type,
             axis: series.properties.axis,
-            labelPosition: formatOptions?.annotation?.annotationPosition.toString() === "4" ? series.properties.dataLabelPosition.toString() : formatOptions?.annotation?.annotationPosition.toString(),
+            labelPosition: formatOptions?.annotation?.annotationPosition.toString() === "4" ? series.properties.annotationPosition.toString() : formatOptions?.annotation?.annotationPosition.toString(),
             labelColor: series.properties.labelColor,
             legendUniqueId: series.properties.legendUniqueId
           };
@@ -18575,7 +18582,7 @@
           stackData["individualAnnotationVisibility"] = JSON.parse(
             JSON.stringify(requiredStackChatData.data[j].properties.annotation)
           );
-          d.data.labelPosition = formatOptions?.annotation?.annotationPosition.toString() === "4" ? requiredStackChatData.data[j].properties.dataLabelPosition.toString() : formatOptions?.annotation?.annotationPosition.toString();
+          d.data.labelPosition = formatOptions?.annotation?.annotationPosition.toString() === "4" ? requiredStackChatData.data[j].properties.annotationPosition.toString() : formatOptions?.annotation?.annotationPosition.toString();
           d.data["labelColor"] = seriesColor == "2" ? JSON.parse(
             JSON.stringify(requiredStackChatData.data[j].properties.color)
           ) : JSON.parse(
@@ -19462,7 +19469,7 @@
     };
     const getXAxis = () => {
       xAxis = axisBottom(xScale).tickSize(
-        formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesVertical ? formatOptions.plotArea.gridLinesVertical ? -(dataTableHeight > 0 ? innerHeight2 - dataTableHeight : innerHeight2) : parseFloat(formatOptions.plotArea.ticksHeight) * ((dataTableHeight > 0 ? innerHeight2 - dataTableHeight : innerHeight2) / 100) * (formatOptions.xAxisLabel.xAxisPosition == "1" ? 1 : -1) : 0 : 0
+        getVerticalGridLinesTickSize(formatOptions, innerHeight2, dataTableHeight, true)
       ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(filteredDimension, innerWidth2));
     };
     const getChartType = (lineData) => {
@@ -25059,6 +25066,7 @@
         lData.data.forEach((cData) => {
           cData.hideZero = lData.properties.hideZeroValues;
           cData.axis = lData.properties.axis;
+          cData["properties"] = lData.properties;
         });
       });
       lineData.forEach((data2, index2) => {
@@ -26387,23 +26395,6 @@
     const drawAreaChart = () => {
       getXScale();
       getXAxis();
-      initXaxis$1(
-        gTag,
-        chartJSON,
-        xLabel,
-        formatOptions,
-        dataTableHeight,
-        yScaleLeft,
-        xAxis,
-        dimensionHeightWidthArray,
-        height,
-        barWidth,
-        isDateType,
-        innerWidth2,
-        innerHeight2,
-        filteredDimension,
-        xScale
-      );
       commonAnnotations(
         seriesData,
         xScale,
@@ -26440,6 +26431,23 @@
         isSecondaryAxisDrawn
       ).labelArray;
       getChartType(filteredData);
+      initXaxis$1(
+        gTag,
+        chartJSON,
+        xLabel,
+        formatOptions,
+        dataTableHeight,
+        yScaleLeft,
+        xAxis,
+        dimensionHeightWidthArray,
+        height,
+        barWidth,
+        isDateType,
+        innerWidth2,
+        innerHeight2,
+        filteredDimension,
+        xScale
+      );
       drawSeriesLabels(formatOptions, gTag, newSeriesLabelArray);
       if (formatOptions.dataTableProperties && formatOptions.dataTableProperties.dataTable) {
         if (formatOptions.xAxisLabel.xAxisPosition != "1")
@@ -26938,6 +26946,7 @@
     const drawLineChart = () => {
       getXScale();
       getXAxis();
+      getChartType(filteredData);
       initXaxis$1(
         gTag,
         chartJSON,
@@ -26955,7 +26964,6 @@
         filteredDimension,
         xScale
       );
-      getChartType(filteredData);
       stacklineAnnotations(
         stackChartData,
         xScale,
@@ -54745,7 +54753,8 @@
     };
     const preProcessChartData = () => {
       if (isAdvancedWaterfall) {
-        const tempWaterfallChartData2 = mapAdvancedWaterfallData(data);
+        let tempWaterfallChartData2 = mapAdvancedWaterfallData(data);
+        tempWaterfallChartData2 = tempWaterfallChartData2.filter((d) => d.up + d.down + d.base != 0);
         chartJSON.dimensionList = tempWaterfallChartData2.map((d) => d.xKey);
         chartJSON.legendList = chartJSON.dimensionList;
         waterFallData = stack().keys(["base", "dimensionTotal", "up", "down"])(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pace-chart-lib",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "A simple React + Vite + TS UI library with a Button using custom fonts via SCSS.",
   "license": "MIT",
   "type": "module",