From 894c06b95521bc605c765908a5f4ac8f31d94bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20M=C3=BCller?= <jacob.mueller.elz@gmail.com>
Date: Fri, 24 Apr 2020 10:58:56 +0200
Subject: [PATCH] fix: nested form options normalization

---
 .../form-select/helpers/mixin-options.js      |  8 +++---
 src/mixins/form-options.js                    | 28 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/components/form-select/helpers/mixin-options.js b/src/components/form-select/helpers/mixin-options.js
index b188edeb944..95b1fa4d44a 100644
--- a/src/components/form-select/helpers/mixin-options.js
+++ b/src/components/form-select/helpers/mixin-options.js
@@ -1,5 +1,5 @@
 import get from '../../../utils/get'
-import { isArray, isPlainObject, isUndefined } from '../../../utils/inspect'
+import { isNull, isPlainObject, isUndefined } from '../../../utils/inspect'
 import formOptionsMixin from '../../../mixins/form-options'
 
 // @vue/component
@@ -21,12 +21,12 @@ export default {
       if (isPlainObject(option)) {
         const value = get(option, this.valueField)
         const text = get(option, this.textField)
-        const options = get(option, this.optionsField)
+        const options = get(option, this.optionsField, null)
         // When it has options, create an `<optgroup>` object
-        if (isArray(options)) {
+        if (!isNull(options)) {
           return {
             label: String(get(option, this.labelField) || text),
-            options
+            options: this.normalizeOptions(options)
           }
         }
         // Otherwise create an `<option>` object
diff --git a/src/mixins/form-options.js b/src/mixins/form-options.js
index 2ca1e5a4f8c..a4234d6ebe5 100644
--- a/src/mixins/form-options.js
+++ b/src/mixins/form-options.js
@@ -33,19 +33,7 @@ export default {
   },
   computed: {
     formOptions() {
-      const options = this.options
-      // Normalize the given options array
-      if (isArray(options)) {
-        return options.map(option => this.normalizeOption(option))
-      } else if (isPlainObject(options)) {
-        // Deprecate the object options format
-        warn(OPTIONS_OBJECT_DEPRECATED_MSG, this.$options.name)
-        // Normalize a `options` object to an array of options
-        return keys(options).map(key => this.normalizeOption(options[key] || {}, key))
-      }
-      // If not an array or object, return an empty array
-      /* istanbul ignore next */
-      return []
+      return this.normalizeOptions(this.options)
     }
   },
   methods: {
@@ -67,6 +55,20 @@ export default {
         text: stripTags(String(option)),
         disabled: false
       }
+    },
+    normalizeOptions(options) {
+      // Normalize the given options array
+      if (isArray(options)) {
+        return options.map(option => this.normalizeOption(option))
+      } else if (isPlainObject(options)) {
+        // Deprecate the object options format
+        warn(OPTIONS_OBJECT_DEPRECATED_MSG, this.$options.name)
+        // Normalize a `options` object to an array of options
+        return keys(options).map(key => this.normalizeOption(options[key] || {}, key))
+      }
+      // If not an array or object, return an empty array
+      /* istanbul ignore next */
+      return []
     }
   }
 }