From c3147d90982152dd8faff6eb628897e1b9e7f860 Mon Sep 17 00:00:00 2001
From: Tan Nguyen <hi@tan.ng>
Date: Fri, 10 Jan 2025 14:21:40 +0700
Subject: [PATCH] Fix validation for dash ids (#1624)

* fix: validation for fields contains dash in id

* fix: asterisk in cloneable field
---
 js/validation/validation.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/validation/validation.js b/js/validation/validation.js
index b8ffbd94..83eb1aa0 100644
--- a/js/validation/validation.js
+++ b/js/validation/validation.js
@@ -38,7 +38,7 @@
 
 		if ( parts[ 1 ] && isNaN( parts[ 1 ] ) ) {
 			// Remove []
-			let words = name.match( /(\w+)|(\[\w+\])/g );
+			let words = name.match( /([\w-]+)|(\[\w+\])/g );
 			let resultArray = [ words.join( "" ) ];
 
 			// Remove characters "[" and "]".
@@ -179,6 +179,10 @@
 					if ( !$el.length ) {
 						$el = $( '[name*="[' + k + ']"]' ); // Subfields in groups.
 					}
+					if ( !$el.length ) {
+						$el = $( '[name*="' + k + '"]' ); // contains field ID.
+					}
+
 					if ( $el.length ) {
 						$el.closest( '.rwmb-input' ).siblings( '.rwmb-label' ).find( 'label' ).append( '<span class="rwmb-required">*</span>' );
 					}