Strategy11 · AbdiTolesa · Oct 3, 2025 · Oct 3, 2025 · Oct 3, 2025 · Oct 7, 2025
diff --git a/css/admin/frm-settings-components.css b/css/admin/frm-settings-components.css
diff --git a/css/frm_admin.css b/css/frm_admin.css
diff --git a/css/frm_testing_mode.css b/css/frm_testing_mode.css
diff --git a/js/addons-page.js b/js/addons-page.js
diff --git a/js/form-templates.js b/js/form-templates.js
diff --git a/js/form-templates.js.map b/js/form-templates.js.map
diff --git a/js/formidable-settings-components.js b/js/formidable-settings-components.js
diff --git a/js/formidable-settings-components.js.map b/js/formidable-settings-components.js.map
diff --git a/js/formidable_admin.js b/js/formidable_admin.js
diff --git a/js/formidable_admin.js.map b/js/formidable_admin.js.map
diff --git a/js/formidable_blocks.js b/js/formidable_blocks.js
diff --git a/js/formidable_dashboard.js b/js/formidable_dashboard.js
diff --git a/js/formidable_dashboard.js.map b/js/formidable_dashboard.js.map
diff --git a/js/formidable_overlay.js b/js/formidable_overlay.js
diff --git a/js/formidable_styles.js b/js/formidable_styles.js
diff --git a/js/formidable_styles.js.map b/js/formidable_styles.js.map
diff --git a/js/frm_testing_mode.js b/js/frm_testing_mode.js
diff --git a/js/onboarding-wizard.js b/js/onboarding-wizard.js
diff --git a/js/src/admin/admin.js b/js/src/admin/admin.js
@@ -4533,6 +4533,49 @@ window.frmAdminBuildJS = function() {
 		destroyFieldGroupPopup();
 	}
 
+	/**
+	 * Get an array of fields that are selected.
+	 *
+	 * @since x.x
+	 *
+	 * @param {Object}      $firstGroup
+	 * @param {HTMLElement} hoverTarget
+	 *
+	 * @returns {Object}
+	 */
+	function getSelectedRange( $firstGroup, hoverTarget ) {
+		const hoverTargetSection = hoverTarget.closest( '.edit_field_type_divider' );
+		let targetSection, $range, fieldsInSection;
+		if ( hoverTargetSection ) {
+			targetSection = hoverTargetSection.closest( 'ul' ).closest( '.frm_field_box.ui-draggable' );
+			fieldsInSection = [ ...hoverTargetSection.querySelectorAll( '.frm_field_box.ui-draggable' ) ].filter( el => el.classList.length === 2 );
+		}
+		const hoverTargetBox = hoverTarget.closest( 'li' );
+		if ( $firstGroup.parent().index() < jQuery( targetSection || hoverTarget.parentNode ).index() ) {
+			// If field target field is in a section.
+			$range = $firstGroup.parent().nextUntil( targetSection || hoverTarget.parentNode );
+
+			if ( ! fieldsInSection ) {
+				return $range;
+			}
+			$range = $range.add( fieldsInSection.slice( 0, fieldsInSection.indexOf( hoverTargetBox ) + 1 ) );
+			return $range;
+		}
+
+		// Select fields back to the first group.
+		if ( targetSection?.contains( $firstGroup.get( 0 ) ) ) {
+			$range = $firstGroup.parent().prevUntil( hoverTarget.parentNode );
+		} else {
+			$range = $firstGroup.parent().prevUntil( targetSection || hoverTarget.parentNode );
+		}
+		if ( ! fieldsInSection ) {
+			return $range;
+		}
+		$range = $range.add( fieldsInSection.slice( -( fieldsInSection.length - fieldsInSection.indexOf( hoverTargetBox ) ) ) );
+
+		return $range;
+	}
+
 	function fieldGroupClick( e ) {
 		maybeShowFieldGroupMessage();
 
@@ -4577,14 +4620,7 @@ window.frmAdminBuildJS = function() {
 				++numberOfSelectedGroups; // include the one we're selecting right now.
 				const $firstGroup = $selectedFieldGroups.first();
 
-				let $range;
-				if ( $firstGroup.parent().index() < jQuery( hoverTarget.parentNode ).index() ) {
-					$range = $firstGroup.parent().nextUntil( hoverTarget.parentNode );
-				} else {
-					$range = $firstGroup.parent().prevUntil( hoverTarget.parentNode );
-				}
-
-				$range.each(
+				getSelectedRange( $firstGroup, hoverTarget ).each(
 					function() {
 						const $fieldGroup = jQuery( this ).closest( 'li' ).find( 'ul.frm_sorting' );
 						if ( ! $fieldGroup.hasClass( 'frm-selected-field-group' ) ) {