fix(annotations): Do not erase apex_config manually defined xaxis and points annotations

Fixes #932

Author: RomRider

src/apexcharts-card.ts

@@ -1042,63 +1042,62 @@ class ChartsCard extends LitElement {
       start.getFullYear() === end.getFullYear() &&
       start.getMonth() === end.getMonth() &&
       start.getDate() === end.getDate();
-    return {
-      points: this._config?.series_in_graph.flatMap((serie, index) => {
-        if (serie.show.extremas) {
-          const { min, max } = this._graphs?.[serie.index]?.minMaxWithTimestamp(
-            this._seriesOffset[serie.index]
-              ? new Date(start.getTime() + this._seriesOffset[serie.index]).getTime()
-              : start.getTime(),
-            this._seriesOffset[serie.index]
-              ? new Date(end.getTime() + this._seriesOffset[serie.index]).getTime()
-              : end.getTime(),
-            this._serverTimeOffset - (this._seriesTimeDelta[serie.index] || 0),
-          ) || {
-            min: [0, null],
-            max: [0, null],
-          };
-          const bgColor = computeColor(this._colors[index]);
-          const txtColor = computeTextColor(bgColor);
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          const extremas: any = [];
-          if (min[0] && ['min', 'min+time', true, 'time'].includes(serie.show.extremas)) {
-            const withTime = serie.show.extremas === 'time' || serie.show.extremas === 'min+time';
-            extremas.push(
-              ...this._getPointAnnotationStyle(
-                min,
-                this._seriesOffset[serie.index],
-                bgColor,
-                txtColor,
-                serie,
-                index,
-                serie.invert,
-                sameDay,
-                withTime,
-              ),
-            );
-          }
-          if (max[0] && ['max', 'max+time', true, 'time'].includes(serie.show.extremas)) {
-            const withTime = serie.show.extremas === 'time' || serie.show.extremas === 'max+time';
-            extremas.push(
-              ...this._getPointAnnotationStyle(
-                max,
-                this._seriesOffset[serie.index],
-                bgColor,
-                txtColor,
-                serie,
-                index,
-                serie.invert,
-                sameDay,
-                withTime,
-              ),
-            );
-          }
-          return extremas;
-        } else {
-          return [];
+    const minMaxPoints = this._config?.series_in_graph.flatMap((serie, index) => {
+      if (serie.show.extremas) {
+        const { min, max } = this._graphs?.[serie.index]?.minMaxWithTimestamp(
+          this._seriesOffset[serie.index]
+            ? new Date(start.getTime() + this._seriesOffset[serie.index]).getTime()
+            : start.getTime(),
+          this._seriesOffset[serie.index]
+            ? new Date(end.getTime() + this._seriesOffset[serie.index]).getTime()
+            : end.getTime(),
+          this._serverTimeOffset - (this._seriesTimeDelta[serie.index] || 0),
+        ) || {
+          min: [0, null],
+          max: [0, null],
+        };
+        const bgColor = computeColor(this._colors[index]);
+        const txtColor = computeTextColor(bgColor);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const extremas: any = [];
+        if (min[0] && ['min', 'min+time', true, 'time'].includes(serie.show.extremas)) {
+          const withTime = serie.show.extremas === 'time' || serie.show.extremas === 'min+time';
+          extremas.push(
+            ...this._getPointAnnotationStyle(
+              min,
+              this._seriesOffset[serie.index],
+              bgColor,
+              txtColor,
+              serie,
+              index,
+              serie.invert,
+              sameDay,
+              withTime,
+            ),
+          );
         }
-      }),
-    };
+        if (max[0] && ['max', 'max+time', true, 'time'].includes(serie.show.extremas)) {
+          const withTime = serie.show.extremas === 'time' || serie.show.extremas === 'max+time';
+          extremas.push(
+            ...this._getPointAnnotationStyle(
+              max,
+              this._seriesOffset[serie.index],
+              bgColor,
+              txtColor,
+              serie,
+              index,
+              serie.invert,
+              sameDay,
+              withTime,
+            ),
+          );
+        }
+        return extremas;
+      } else {
+        return [];
+      }
+    });
+    return { points: [...(minMaxPoints || []), ...(this._config?.apex_config?.annotations?.points || [])] };
   }
 
   private _getPointAnnotationStyle(
@@ -1193,6 +1192,7 @@ class ChartsCard extends LitElement {
             },
             borderColor: color,
           },
+          ...(this._config?.apex_config?.annotations?.xaxis || []),
         ],
       };
     }