Prepare for 6.24

.gitattributes

@@ -41,3 +41,5 @@ webpack.config.js export-ignore
 rector.php export-ignore
 _typos.toml export-ignore
 /resources/ export-ignore
+webpack.dev.js export-ignore
+.browserslistrc export-ignore

bin/zip-plugin.sh

@@ -95,7 +95,9 @@ zip -r $zipname $destination \
 	-x "*/.sonar_lock" \
 	-x "*/report-task.txt" \
 	-x "*/cypress.config.js" \
-	-x "*/_typos.toml"
+	-x "*/_typos.toml" \
+	-x "formidable-ai/resources/*" \
+	-x "*/webpack.dev.js"
 
 if [ ! -z "$3" ]; then
 	rm -rf $destination

changelog.txt

@@ -1,4 +1,14 @@
 == Changelog ==
+= 6.24 =
+* New: Field settings have been redesigned.
+* Fix: A section ID would not properly get set when dragging a field into a field group within a section or repeater. This could cause issues with fields unexpectedly appearing outside of a repeater.
+* Fix: Conditional logic field IDs would not properly update after importing an XML.
+* Fix: Line breaks used in Quiz Outcome actions would not properly import.
+* Fix: In some cases, a field group would not be draggable after a field was added beside another field.
+* Fix: In some cases, field shape settings would not work if another setting was blank or matched the default.
+* Fix: JS errors would occur in some cases after deleting a field group or section.
+* Fix: The line height style setting is no longer applied to the label in the visual styler preview.
+
 = 6.23 =
 * New: The GDPR field agreement text can now be translated using the WPML or Polylang add-ons.
 * New: GDPR agreement text will no longer strip a few additional HTML tag types including b, br, div, em, i, p, span, and strong.

classes/controllers/FrmAppController.php

@@ -791,7 +791,7 @@ public static function admin_js() {
 	/**
 	 * Enqueue the Form Builder assets.
 	 *
-	 * @since x.x
+	 * @since 6.24
 	 *
 	 * @param string $plugin_url The plugin URL.
 	 * @param string $version    The plugin version.

classes/helpers/FrmAppHelper.php

@@ -29,7 +29,7 @@ class FrmAppHelper {
 	 *
 	 * @var string
 	 */
-	public static $plug_version = '6.23';
+	public static $plug_version = '6.24';
 
 	/**
 	 * @var bool
@@ -4603,7 +4603,7 @@ public static function no_gdpr_cookies() {
 	/**
 	 * Check if a string is valid UTF-8.
 	 *
-	 * @since x.x
+	 * @since 6.24
 	 *
 	 * @param string $string The string to check.
 	 * @return bool

classes/helpers/FrmFieldsHelper.php

@@ -2431,7 +2431,7 @@ public static function get_all_draft_field_ids( $form_id ) {
 	/**
 	 * Render AI generate options button.
 	 *
-	 * @since x.x
+	 * @since 6.24
 	 *
 	 * @param array $args Field arguments.
 	 * @param bool  $should_hide_bulk_edit Whether to hide bulk edit.
@@ -2455,7 +2455,7 @@ public static function render_ai_generate_options_button( $args, $should_hide_bu
 		);
 
 		if ( in_array( FrmAddonsController::license_type(), array( 'elite', 'business' ), true ) && 'active' === $data['plugin-status'] ) {
-			// Backwards compatibility "@since x.x".
+			// Backwards compatibility "@since 6.24".
 			if ( ! method_exists( 'FrmAIAppController', 'get_ai_generated_options_summary' ) ) {
 				$data = array(
 					'modal-title'   => __( 'Generate options with AI', 'formidable' ),
@@ -2480,7 +2480,7 @@ public static function render_ai_generate_options_button( $args, $should_hide_bu
 	/**
 	 * Get AI generate options button class.
 	 *
-	 * @since x.x
+	 * @since 6.24
 	 *
 	 * @return string Button class.
 	 */

classes/helpers/FrmHtmlHelper.php

@@ -59,7 +59,7 @@ public static function echo_dropdown_option( $option, $selected, $params = array
 	/**
 	 * Renders a number input with unit selector.
 	 *
-	 * @since x.x
+	 * @since 6.24
 	 *
 	 * @param array $args {
 	 *     Optional. Arguments to customize the unit input.

classes/helpers/FrmStylesHelper.php

@@ -454,7 +454,7 @@ public static function output_vars( $settings, $defaults = array(), $vars = arra
 	/**
 	 * Check if a CSS variable setting is not blank, doesn't match the default, and doesn't include invalid substrings.
 	 *
-	 * @since x.x
+	 * @since 6.24
 	 *
 	 * @param array  $settings       Array of setting values.
 	 * @param array  $defaults       Array of default values.

classes/models/fields/FrmFieldType.php

@@ -1832,10 +1832,10 @@ protected function get_select_atributes( $values ) {
 
 	/**
 	 * @since 4.04
-	 * @deprecated x.x
+	 * @deprecated 6.24
 	 */
 	protected function get_add_option_string() {
-		_deprecated_function( __METHOD__, 'x.x' );
+		_deprecated_function( __METHOD__, '6.24' );
 		return __( 'Add Option', 'formidable' );
 	}
 }

classes/views/frm-fields/back-end/settings.php

@@ -210,7 +210,7 @@
 							continue;
 						}
 
-						// Backwards compatibility "@since x.x".
+						// Backwards compatibility "@since 6.24".
 						if ( FrmAppHelper::pro_is_connected() && ! is_callable( array( 'FrmProHtmlHelper', 'echo_radio_group' ) ) ) {
 							switch ( $type ) {
 								case 'calc':

classes/views/styles/components/FrmTextToggleStyleComponent.php

@@ -8,7 +8,7 @@ class FrmTextToggleStyleComponent extends FrmStyleComponent {
 	/**
 	 * The view file name.
 	 *
-	 * @since x.x
+	 * @since 6.24
 	 *
 	 * @var string
 	 */
@@ -17,7 +17,7 @@ class FrmTextToggleStyleComponent extends FrmStyleComponent {
 	/**
 	 * Construct FrmTextToggleStyleComponent.
 	 *
-	 * @since x.x
+	 * @since 6.24
 	 */
 	public function __construct( $field_name, $field_value, $data ) {
 		$this->init( $data, $field_name, $field_value );

formidable.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Formidable Forms
  * Description: Quickly and easily create drag-and-drop forms
- * Version: 6.23
+ * Version: 6.24
  * Plugin URI: https://formidableforms.com/
  * Author URI: https://formidableforms.com/
  * Author: Strategy11 Form Builder Team

js/src/admin/admin.js

@@ -1027,7 +1027,7 @@ function frmAdminBuildJS() {
 	/**
 	 * When a field is moved into a field group, make sure the field group is draggable.
 	 *
-	 * @since x.x
+	 * @since 6.24
 	 *
 	 * @param {HTMLElement} placeholderParent
 	 * @return {void}
@@ -10163,7 +10163,7 @@ function frmAdminBuildJS() {
 	/**
 	 * Enforce the maximum number of entries list columns dynamically.
 	 *
-	 * @since x.x
+	 * @since 6.24
 	 *
 	 * @return {void}
 	 */