Fix function support on _fallback (#8545)

diff --git a/src/helpers/helpers.config.js b/src/helpers/helpers.config.js
index 96c0f8c93049024028a1800df6baeb0106925e57..ad005bff176ba8569c84fde63bdc811ab3f3a7c7 100644 (file)
--- a/src/helpers/helpers.config.js
+++ b/src/helpers/helpers.config.js
@@ -245,14 +245,15 @@ function resolveFallback(fallback, prop, value) {
   return isFunction(fallback) ? fallback(prop, value) : fallback;
 }
 
-const getScope = (key, parent) => key === true ? parent : resolveObjectKey(parent, key);
+const getScope = (key, parent) => key === true ? parent
+  : typeof key === 'string' ? resolveObjectKey(parent, key) : undefined;
 
 function addScopes(set, parentScopes, key, parentFallback) {
   for (const parent of parentScopes) {
     const scope = getScope(key, parent);
     if (scope) {
       set.add(scope);
-      const fallback = scope._fallback;
+      const fallback = resolveFallback(scope._fallback, key, scope);
       if (defined(fallback) && fallback !== key && fallback !== parentFallback) {
         // When we reach the descriptor that defines a new _fallback, return that.
         // The fallback will resume to that new scope.

diff --git a/test/specs/helpers.config.tests.js b/test/specs/helpers.config.tests.js
index 48e046a90c2537595a9000b53fdd517d333b8b59..e3ace633570ec331d6a7b8af2d350240008b29b4 100644 (file)
--- a/test/specs/helpers.config.tests.js
+++ b/test/specs/helpers.config.tests.js
@@ -128,6 +128,37 @@ describe('Chart.helpers.config', function() {
         });
       });
 
+      it('should support _fallback as function', function() {
+        const descriptors = {
+          _fallback: (prop, value) => prop === 'hover' && value.shouldFall && 'interaction',
+        };
+        const defaults = {
+          interaction: {
+            mode: 'test',
+            priority: 'fall'
+          },
+          hover: {
+            priority: 'main'
+          }
+        };
+        const options = {
+          interaction: {
+            a: 1
+          },
+          hover: {
+            shouldFall: true,
+            b: 2
+          }
+        };
+        const resolver = _createResolver([options, defaults, descriptors]);
+        expect(resolver.hover).toEqualOptions({
+          mode: 'test',
+          priority: 'main',
+          a: 1,
+          b: 2
+        });
+      });
+
       it('should not fallback by default', function() {
         const defaults = {
           hover: {