Merge pull request #6 from theideabureau/main

Added compatibility with whitecube/nova-flexible-content
YieldStudio · Jul 9, 2023 · 242c06e · 242c06e
2 parents 03970f8 + 26c1ed6
commit 242c06e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/dist/js/field.js b/dist/js/field.js
diff --git a/dist/js/field.js.LICENSE.txt b/dist/js/field.js.LICENSE.txt
@@ -1,5 +1,5 @@
 /*!
- * vuex v4.0.2
- * (c) 2021 Evan You
+ * vuex v4.1.0
+ * (c) 2022 Evan You
  * @license MIT
  */
diff --git a/resources/js/components/AddressMetadata/FormField.vue b/resources/js/components/AddressMetadata/FormField.vue
@@ -48,6 +48,10 @@ export default {
             } while (match !== null);
 
             Nova.$on('address-metadata-update', locationObject => {
+                if (this.checkIfFlexibleField(locationObject.attribute)) {
+                    return;
+                }
+
                 let addressValue = this.field.addressValue;
 
                 for (let i = 0; i < addressParts.length; i++) {
@@ -64,6 +68,10 @@ export default {
             });
         } else {
             Nova.$on('address-metadata-update', locationObject => {
+                if (this.checkIfFlexibleField(locationObject.attribute)) {
+                    return;
+                }
+
                 this.value = locationObject[this.field.addressValue];
             });
         }
@@ -78,6 +86,13 @@ export default {
         handleChange(value) {
             this.value = value;
         },
+        checkIfFlexibleField(attributeName) {
+            const flexibleFieldKey = this.field.attribute.match(/((.{16})__)/);
+
+            // if the flexible field key exists but doesn't match the first 16 characters
+            // of the location object attribute, return to not set the value on this field
+            return flexibleFieldKey && attributeName.indexOf(flexibleFieldKey[0]) === -1;
+        },
     },
 };
 </script>

diff --git a/resources/js/components/GoogleAutocomplete/FormField.vue b/resources/js/components/GoogleAutocomplete/FormField.vue
@@ -67,7 +67,10 @@ export default {
                 }
             });
 
-            Nova.$emit('address-metadata-update', { ...retrievedAddress });
+            Nova.$emit('address-metadata-update', {
+                attribute: this.field.attribute,
+                ...retrievedAddress
+            });
         },
         setInitialValue() {
             this.value = this.field.value || '';