From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Fri, 2 Apr 2021 20:13:36 +0000 (+0300)
Subject: Patch: option scope might not be an object (#8789)
X-Git-Tag: v3.0.1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98e890cc7b29b582de4320ff56f38e04807f7409;p=thirdparty%2FChart.js.git

Patch: option scope might not be an object (#8789)
---

diff --git a/package-lock.json b/package-lock.json
index 8896edf84..0b5e946e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "chart.js",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e6def1374..7a8fec31a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "chart.js",
   "homepage": "https://www.chartjs.org",
   "description": "Simple HTML5 charts using the canvas element.",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "license": "MIT",
   "jsdelivr": "dist/chart.min.js",
   "unpkg": "dist/chart.min.js",
diff --git a/src/helpers/helpers.config.js b/src/helpers/helpers.config.js
index 2b22d17f6..3c3e33c46 100644
--- a/src/helpers/helpers.config.js
+++ b/src/helpers/helpers.config.js
@@ -276,9 +276,10 @@ function createSubResolver(parentScopes, resolver, prop, value) {
   const fallback = resolveFallback(resolver._fallback, prop, value);
   const allScopes = [...parentScopes, ...rootScopes];
   const set = new Set();
-  if (!(prop in parentScopes[0])) {
+  const firstParent = parentScopes[0];
+  if (isObject(firstParent) && !(prop in firstParent)) {
     // create an empty scope for possible stored values, so we always set the values in top scope.
-    set.add(parentScopes[0][prop] = {});
+    set.add(firstParent[prop] = {});
   }
   set.add(value);
   let key = addScopesFromKey(set, allScopes, prop, fallback || prop);