Merge pull request #1623 from wpmetabox/feat-osm-inside-group

feat: osm autocomplete inside group
wpmetabox · Dec 13, 2024 · a7353cf · a7353cf
2 parents 390e36b + a7130ba
commit a7353cf
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/js/map.js b/js/map.js
@@ -254,22 +254,26 @@
 
 		// Find address field based on its name attribute. Auto search inside groups when needed.
 		findAddressField: function ( fieldName ) {
-			const selector = `input[name="${ fieldName }"], select[name="${ fieldName }"]`;
+			let selector = `input[name="${ fieldName }"], select[name="${ fieldName }"]`;
 
 			// Not in a group.
 			let $address = $( selector );
 			if ( $address.length ) {
 				return $address;
 			}
 
-			// If map and address is inside a cloneable group.
-			$address = this.$container.closest( '.rwmb-group-clone' ).find( selector );
-			if ( $address.length ) {
-				return $address;
+			let $groupWrapper = this.$container.closest( '.rwmb-group-clone' );
+			if ( ! $groupWrapper.length ) {
+				$groupWrapper = this.$container.closest( '.rwmb-group-wrapper' );
+			}
+
+			if ( ! $groupWrapper.length ) {
+				return null;
 			}
 
-			// If map and address is inside a non-cloneable group.
-			$address = this.$container.closest( '.rwmb-group-wrapper' ).find( selector );
+			selector = `input[name*="${ fieldName }"], select[name*="${ fieldName }"]`;
+
+			$address = $groupWrapper.find( selector );
 			if ( $address.length ) {
 				return $address;
 			}

diff --git a/js/osm.js b/js/osm.js
@@ -240,22 +240,26 @@
 
 		// Find address field based on its name attribute. Auto search inside groups when needed.
 		findAddressField: function ( fieldName ) {
-			const selector = `input[name="${ fieldName }"], select[name="${ fieldName }"]`;
+			let selector = `input[name="${ fieldName }"], select[name="${ fieldName }"]`;
 
 			// Not in a group.
 			let $address = $( selector );
 			if ( $address.length ) {
 				return $address;
 			}
 
-			// If map and address is inside a cloneable group.
-			$address = this.$container.closest( '.rwmb-group-clone' ).find( selector );
-			if ( $address.length ) {
-				return $address;
+			let $groupWrapper = this.$container.closest( '.rwmb-group-clone' );
+			if ( ! $groupWrapper.length ) {
+				$groupWrapper = this.$container.closest( '.rwmb-group-wrapper' );
+			}
+
+			if ( ! $groupWrapper.length ) {
+				return null;
 			}
 
-			// If map and address is inside a non-cloneable group.
-			$address = this.$container.closest( '.rwmb-group-wrapper' ).find( selector );
+			selector = `input[name*="${ fieldName }"], select[name*="${ fieldName }"]`;
+
+			$address = $groupWrapper.find( selector );
 			if ( $address.length ) {
 				return $address;
 			}