From f27aae21aa890e50d6552a152ca73cce93db88c1 Mon Sep 17 00:00:00 2001
From: kurkle <jukka.kurkela@gmail.com>
Date: Fri, 17 Dec 2021 16:39:03 +0200
Subject: [PATCH 1/2] Workaround for array syntax bug with Chart.js<v3.7

---
 src/annotation.js                  | 10 ++++++++++
 src/types/label.js                 |  2 +-
 test/fixtures/label/borderDash.js  | 10 +++++-----
 test/fixtures/label/calloutSide.js | 12 ++++++------
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/annotation.js b/src/annotation.js
index 7efaa0591..08da28e53 100644
--- a/src/annotation.js
+++ b/src/annotation.js
@@ -5,6 +5,7 @@ import {annotationTypes} from './types';
 import {version} from '../package.json';
 
 const chartStates = new Map();
+const versionParts = Chart.version.split('.');
 
 export default {
   id: 'annotation',
@@ -13,6 +14,15 @@ export default {
 
   afterRegister() {
     Chart.register(annotationTypes);
+
+    if (versionParts[0] === '3' && parseInt(versionParts[1], 10) <= 6) {
+      // Workaround for https://github.com/chartjs/chartjs-plugin-annotation/issues/572
+      Chart.defaults.set('elements.lineAnnotation', {
+        callout: {},
+        font: {},
+        padding: 6
+      });
+    }
   },
 
   afterUnregister() {
diff --git a/src/types/label.js b/src/types/label.js
index 3e14f126b..9ba4a8154 100644
--- a/src/types/label.js
+++ b/src/types/label.js
@@ -118,7 +118,7 @@ function measureRect(point, size, options, padding) {
   };
 }
 
-function calculatePosition(start, size, adjust, position) {
+function calculatePosition(start, size, adjust = 0, position) {
   return start - getRelativePosition(size, position) + adjust;
 }
 
diff --git a/test/fixtures/label/borderDash.js b/test/fixtures/label/borderDash.js
index aaf35243e..8a0d826ac 100644
--- a/test/fixtures/label/borderDash.js
+++ b/test/fixtures/label/borderDash.js
@@ -15,8 +15,8 @@ module.exports = {
       },
       plugins: {
         annotation: {
-          annotations: {
-            text1: {
+          annotations: [
+            {
               type: 'label',
               xScaleID: 'x',
               yScaleID: 'y',
@@ -28,7 +28,7 @@ module.exports = {
               borderWidth: 5,
               content: 'This is my text'
             },
-            text2: {
+            {
               type: 'label',
               xScaleID: 'x',
               yScaleID: 'y',
@@ -40,7 +40,7 @@ module.exports = {
               borderWidth: 4,
               content: 'This is my text'
             },
-            text3: {
+            {
               type: 'label',
               xScaleID: 'x',
               yScaleID: 'y',
@@ -55,7 +55,7 @@ module.exports = {
                 x: 'end'
               }
             }
-          }
+          ]
         }
       }
     }
diff --git a/test/fixtures/label/calloutSide.js b/test/fixtures/label/calloutSide.js
index b8cb69aae..c585d2f78 100644
--- a/test/fixtures/label/calloutSide.js
+++ b/test/fixtures/label/calloutSide.js
@@ -15,8 +15,8 @@ module.exports = {
       },
       plugins: {
         annotation: {
-          annotations: {
-            text1: {
+          annotations: [
+            {
               type: 'label',
               xScaleID: 'x',
               yScaleID: 'y',
@@ -39,7 +39,7 @@ module.exports = {
                 position: 'bottom',
               }
             },
-            point1: {
+            {
               type: 'point',
               xScaleID: 'x',
               yScaleID: 'y',
@@ -47,7 +47,7 @@ module.exports = {
               yValue: 20,
               radius: 3
             },
-            text2: {
+            {
               type: 'label',
               xScaleID: 'x',
               yScaleID: 'y',
@@ -70,7 +70,7 @@ module.exports = {
                 position: 'top',
               }
             },
-            point2: {
+            {
               type: 'point',
               xScaleID: 'x',
               yScaleID: 'y',
@@ -78,7 +78,7 @@ module.exports = {
               yValue: 20,
               radius: 3
             }
-          }
+          ]
         }
       }
     }

From 6bd87634ec93583cedd18e6f2b48db8ae7218819 Mon Sep 17 00:00:00 2001
From: kurkle <jukka.kurkela@gmail.com>
Date: Fri, 17 Dec 2021 17:29:40 +0200
Subject: [PATCH 2/2] Add a todo

---
 src/annotation.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/annotation.js b/src/annotation.js
index 08da28e53..8536a9a8e 100644
--- a/src/annotation.js
+++ b/src/annotation.js
@@ -15,6 +15,7 @@ export default {
   afterRegister() {
     Chart.register(annotationTypes);
 
+    // TODO: Remove this workaround when strictly requiring Chart.js v3.7 or newer
     if (versionParts[0] === '3' && parseInt(versionParts[1], 10) <= 6) {
       // Workaround for https://github.com/chartjs/chartjs-plugin-annotation/issues/572
       Chart.defaults.set('elements.lineAnnotation', {