Rock: Field Settings Refresh Lite

.eslintignore

@@ -6,6 +6,7 @@
 **/formidable_dashboard.js
 **/formidable-templates.js
 **/formidable_styles.js
+**/formidable-settings-components.js
 
 **/node_modules/**
 **/vendor/**

.stylelintrc.json

@@ -6,6 +6,7 @@
 		"selector-id-pattern": null,
 		"font-family-name-quotes": null,
 		"function-url-quotes": null,
+		"no-duplicate-selectors": null,
 		"value-keyword-case": [
 			"lower",
 			{

classes/controllers/FrmAppController.php

@@ -671,6 +671,7 @@ public static function admin_js() {
 
 		wp_register_style( 'formidable-admin', $plugin_url . '/css/frm_admin.css', array(), $version );
 		wp_register_style( 'formidable-grids', $plugin_url . '/css/frm_grids.css', array(), $version );
+		wp_register_style( 'formidable-settings-components', $plugin_url . '/css/admin/frm-settings-components.css', array( 'formidable-admin', 'formidable-grids' ), $version );
 
 		wp_register_script( 'formidable_dom', $plugin_url . '/js/admin/dom.js', array( 'jquery', 'jquery-ui-dialog', 'wp-i18n' ), $version, true );
 		wp_register_script( 'formidable_embed', $plugin_url . '/js/admin/embed.js', array( 'formidable_dom', 'jquery-ui-autocomplete' ), $version, true );
@@ -708,6 +709,7 @@ public static function admin_js() {
 		}
 
 		wp_register_script( 'formidable_admin', $plugin_url . '/js/formidable_admin.js', $dependencies, $version, true );
+		wp_register_script( 'formidable-settings-components', $plugin_url . '/js/formidable-settings-components.js', array( 'formidable_admin' ), $version, true );
 
 		if ( FrmAppHelper::on_form_listing_page() ) {
 			// For the existing page dropdown in the Form embed modal.
@@ -737,12 +739,16 @@ public static function admin_js() {
 			self::maybe_deregister_popper2();
 			wp_enqueue_script( 'formidable_admin' );
 			wp_set_script_translations( 'formidable_admin', 'formidable' );
+			// TODO: Add condition.
+			wp_enqueue_script( 'formidable-settings-components' );
 			wp_enqueue_script( 'formidable_embed' );
 			wp_set_script_translations( 'formidable_embed', 'formidable' );
 			FrmAppHelper::localize_script( 'admin' );
 
 			wp_enqueue_style( 'formidable-animations' );
 			wp_enqueue_style( 'formidable-admin' );
+			// TODO: Add condition.
+			wp_enqueue_style( 'formidable-settings-components' );
 			if ( 'formidable-styles' !== $page && 'formidable-styles2' !== $page ) {
 				wp_enqueue_style( 'formidable-grids' );
 				self::maybe_enqueue_dropzone_css( $page );

classes/controllers/FrmFieldsController.php

@@ -374,28 +374,30 @@ private static function default_value_types( $field, $atts ) {
 			'default_value'    => array(
 				'class' => '',
 				'icon'  => 'frm_icon_font frm_text2_icon',
-				'title' => __( 'Default Value (Text)', 'formidable' ),
+				'title' => __( 'Default Value', 'formidable' ),
 				'data'  => array(
 					'frmshow' => '#default-value-for-',
 				),
 			),
 			'calc'             => array(
-				'class' => 'frm_show_upgrade frm_noallow',
-				'title' => __( 'Default Value (Calculation)', 'formidable' ),
-				'icon'  => 'frm_icon_font frm_calculator_icon',
-				'data'  => array(
+				'class'   => 'frm_show_upgrade frm_noallow',
+				'title'   => __( 'Calculate Value', 'formidable' ),
+				'icon'    => 'frm_icon_font frm_calculator_icon',
+				'data'    => array(
 					'medium'  => 'calculations',
 					'upgrade' => __( 'Calculator forms', 'formidable' ),
 				),
+				'tooltip' => __( 'TODO: Add a tooltip', 'formidable' ),
 			),
 			'get_values_field' => array(
-				'class' => 'frm_show_upgrade frm_noallow',
-				'title' => __( 'Default Value (Lookup)', 'formidable' ),
-				'icon'  => 'frm_icon_font frm_search_icon',
-				'data'  => array(
+				'class'   => 'frm_show_upgrade frm_noallow',
+				'title'   => __( 'Lookup', 'formidable' ),
+				'icon'    => 'frm_icon_font frm_search_icon',
+				'data'    => array(
 					'medium'  => 'lookup',
 					'upgrade' => __( 'Lookup fields', 'formidable' ),
 				),
+				'tooltip' => __( 'Dynamically retrieve the value of this field from a lookup field.', 'formidable' ),
 			),
 		);
 

classes/controllers/FrmFormsController.php

@@ -68,7 +68,7 @@ public static function logic_tip() {
 		$data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . '[email protected] 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
 		echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">';
 		esc_html_e( 'Conditional Logic', 'formidable' );
-		FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
+		FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon frm_svg13', array( 'aria-hidden' => 'true' ) );
 		echo '</a>';
 	}
 

classes/controllers/FrmStylesController.php

@@ -1266,13 +1266,11 @@ public static function do_accordion_sections( $screen, $context, $data_object )
 						<li class="control-section accordion-section <?php echo esc_attr( $open_class ); ?> <?php echo esc_attr( $box['id'] ); ?>" id="<?php echo esc_attr( $box['id'] ); ?>">
 							<h3 class="accordion-section-title hndle">
 								<?php
-								FrmAppHelper::icon_by_class( 'frmfont ' . $icon_id );
+								FrmAppHelper::icon_by_class( 'frmfont ' . $icon_id . ' frm_svg24' );
 								echo esc_html( $box['title'] );
 								?>
 								<button type="button" aria-expanded="<?php echo esc_attr( 'open' === $open_class ? 'true' : 'false' ); ?>" aria-controls="<?php echo esc_attr( $accordion_content_id ); ?>" aria-label="<?php echo esc_attr( $box['title'] ); ?>">
-									<?php
-									FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon' );
-									?>
+									<?php FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon frm_svg13' ); ?>
 								</button>
 							</h3>
 							<div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>" id="<?php echo esc_attr( $accordion_content_id ); ?>">

classes/helpers/FrmAppHelper.php

@@ -1578,7 +1578,7 @@ public static function show_search_box( $atts ) {
 			<label class="screen-reader-text" for="<?php echo esc_attr( $input_id ); ?>">
 				<?php echo esc_html( $atts['text'] ); ?>:
 			</label>
-			<span class="frmfont frm_search_icon"></span>
+			<?php self::icon_by_class( 'frm_icon_font frm_search_icon frm_svg20' ); ?>
 			<input <?php self::array_to_html_params( $input_atts, true ); ?> />
 			<?php
 			if ( empty( $atts['tosearch'] ) ) {
@@ -3908,12 +3908,6 @@ private static function fill_default_images_dropdown_args( $args ) {
 		$new_args['options']     = (array) $new_args['options'];
 		$new_args['input_attrs'] = (array) $new_args['input_attrs'];
 
-		// Set the number of columns.
-		$new_args['col_class'] = ceil( 12 / count( $new_args['options'] ) );
-		if ( $new_args['col_class'] > 6 ) {
-			$new_args['col_class'] = ceil( $new_args['col_class'] / 2 );
-		}
-
 		/**
 		 * Allows modifying the arguments of images_dropdown() method.
 		 *

classes/helpers/FrmFieldsHelper.php

@@ -601,7 +601,8 @@ public static function show_single_option( $field ) {
 		$base_name = 'default_value_' . $field['id'];
 		$html_id   = isset( $field['html_id'] ) ? $field['html_id'] : self::get_html_id( $field );
 
-		$default_type = self::get_default_value_type( $field );
+		$default_type  = self::get_default_value_type( $field );
+		$options_count = count( $field['options'] );
 
 		foreach ( $field['options'] as $opt_key => $opt ) {
 			$field_val = self::get_value_from_array( $opt, $opt_key, $field );
@@ -693,6 +694,7 @@ public static function inline_modal( $args ) {
 			'args'         => array(),
 			'title'        => '',
 			'inside_class' => 'inside',
+			'close-icon'   => true,
 		);
 		$args     = array_merge( $defaults, $args );
 

classes/models/FrmField.php

@@ -28,15 +28,15 @@ public static function field_selection() {
 			),
 			'select'                       => array(
 				'name' => __( 'Dropdown', 'formidable' ),
-				'icon' => 'frm_icon_font frm_caret_square_down_icon',
+				'icon' => 'frm_icon_font frm_dropdown_icon',
 			),
 			'email'                        => array(
 				'name' => __( 'Email', 'formidable' ),
-				'icon' => 'frm_icon_font frm_email_icon',
+				'icon' => 'frm_icon_font frm_email2_icon',
 			),
 			'url'                          => array(
 				'name' => __( 'Website/URL', 'formidable' ),
-				'icon' => 'frm_icon_font frm_link_icon',
+				'icon' => 'frm_icon_font frm_link2_icon',
 			),
 			'number'                       => array(
 				'name' => __( 'Number', 'formidable' ),
@@ -52,23 +52,23 @@ public static function field_selection() {
 			),
 			'html'                         => array(
 				'name' => __( 'HTML', 'formidable' ),
-				'icon' => 'frm_icon_font frm_code_icon',
+				'icon' => 'frm_icon_font frm_code2_icon',
 			),
 			'hidden'                       => array(
 				'name' => __( 'Hidden', 'formidable' ),
-				'icon' => 'frm_icon_font frm_eye_slash_icon',
+				'icon' => 'frm_icon_font frm_eye_slash2_icon',
 			),
 			'user_id'                      => array(
 				'name' => __( 'User ID', 'formidable' ),
-				'icon' => 'frm_icon_font frm_user_icon',
+				'icon' => 'frm_icon_font frm_user2_icon',
 			),
 			'captcha'                      => array(
 				'name' => self::get_captcha_field_name(),
-				'icon' => 'frm_icon_font frm_shield_check_icon',
+				'icon' => 'frm_icon_font frm_shield_check2_icon',
 			),
 			'credit_card'                  => array(
 				'name' => __( 'Payment', 'formidable' ),
-				'icon' => 'frm_icon_font frm_credit_card_icon',
+				'icon' => 'frm_icon_font frm_credit_card2_icon',
 			),
 			FrmSubmitHelper::FIELD_TYPE    => array(
 				'name' => __( 'Submit', 'formidable' ),
@@ -101,7 +101,7 @@ public static function pro_field_selection() {
 		$fields     = array(
 			'file'            => array(
 				'name'    => __( 'File Upload', 'formidable' ),
-				'icon'    => 'frm_icon_font frm_upload_icon',
+				'icon'    => 'frm_icon_font frm_upload3_icon',
 				'message' => __( 'Add file uploads to save time and cut down on back-and-forth. Upgrade to Pro to get Upload fields and more.', 'formidable' ),
 			),
 			'ranking'         => array(),
@@ -111,7 +111,7 @@ public static function pro_field_selection() {
 			),
 			'date'            => array(
 				'name' => __( 'Date', 'formidable' ),
-				'icon' => 'frm_icon_font frm_calendar_icon',
+				'icon' => 'frm_icon_font frm_calendar2_icon',
 			),
 			'time'            => array(
 				'name' => __( 'Time', 'formidable' ),
@@ -124,7 +124,7 @@ public static function pro_field_selection() {
 			),
 			'star'            => array(
 				'name' => __( 'Star Rating', 'formidable' ),
-				'icon' => 'frm_icon_font frm_star_icon',
+				'icon' => 'frm_icon_font frm_star2_icon',
 			),
 			'range'           => array(
 				'name' => __( 'Slider', 'formidable' ),
@@ -136,7 +136,7 @@ public static function pro_field_selection() {
 			),
 			'data'            => array(
 				'name'    => __( 'Dynamic', 'formidable' ),
-				'icon'    => 'frm_icon_font frm_sitemap_icon',
+				'icon'    => 'frm_icon_font frm_dynamic_icon',
 				'message' => __( 'Create relationships between multiple forms. You can link a member to a team, a rating to a product, a comment to a submission, and much more.', 'formidable' ),
 			),
 			'lookup'          => array(
@@ -146,7 +146,7 @@ public static function pro_field_selection() {
 			),
 			'divider|repeat'  => array(
 				'name'    => __( 'Repeater', 'formidable' ),
-				'icon'    => 'frm_icon_font frm_repeater_icon',
+				'icon'    => 'frm_icon_font frm_refresh_icon',
 				'message' => esc_html__( 'Allow your visitors to add new sets of fields while filling out forms. Increase conversions while saving building time and server resources.', 'formidable' ) . ' <img src="' . esc_url( $images_url ) . 'repeatable-section_frontend.gif" alt="' . esc_attr__( 'Dynamically Add Form Fields with repeatable sections', 'formidable' ) . '" />',
 			),
 			'end_divider'     => array(
@@ -164,7 +164,7 @@ public static function pro_field_selection() {
 			),
 			'form'            => array(
 				'name' => __( 'Embed Form', 'formidable' ),
-				'icon' => 'frm_icon_font frm_file_text_icon',
+				'icon' => 'frm_icon_font frm_file_text2_icon',
 			),
 			'likert'          => array(
 				'name'  => __( 'Likert Scale', 'formidable' ),
@@ -178,11 +178,11 @@ public static function pro_field_selection() {
 			),
 			'password'        => array(
 				'name' => __( 'Password', 'formidable' ),
-				'icon' => 'frm_icon_font frm_lock_open_icon',
+				'icon' => 'frm_icon_font frm_lock_closed2_icon',
 			),
 			'tag'             => array(
 				'name' => __( 'Tags', 'formidable' ),
-				'icon' => 'frm_icon_font frm_price_tags_icon',
+				'icon' => 'frm_icon_font frm_price_tags2_icon',
 			),
 			// This is no longer a Pro field, but without this here, Pro triggers "undefined index" notices.
 			// Right now it leaves a gap. Maybe we can skip anything without a name or something.
@@ -192,11 +192,11 @@ public static function pro_field_selection() {
 			),
 			'address'         => array(
 				'name' => __( 'Address', 'formidable' ),
-				'icon' => 'frm_icon_font frm_location_icon',
+				'icon' => 'frm_icon_font frm_location2_icon',
 			),
 			'summary'         => array(
 				'name'    => __( 'Summary', 'formidable' ),
-				'icon'    => 'frm_icon_font frm_file_text_icon',
+				'icon'    => 'frm_icon_font frm_file_text3_icon',
 				'message' => __( 'Allow visitors to review their responses before a form is submitted. Upgrade to Pro to get Summary fields and more.', 'formidable' ),
 			),
 			'signature'       => array(
@@ -206,13 +206,13 @@ public static function pro_field_selection() {
 			),
 			'ai'              => array(
 				'name'    => __( 'AI', 'formidable' ),
-				'icon'    => 'frm_icon_font frm_eye_icon frm_show_upgrade',
+				'icon'    => 'frm_icon_font frm-ai-icon frm_show_upgrade',
 				'addon'   => 'ai',
 				'message' => __( 'Streamline workflows and reclaim valuable time with the power of AI. You can effortlessly respond to your visitors in real-time with ChatGPT as your automated assistant. Upgrade to Pro and unlock AI-powered fields.', 'formidable' ),
 			),
 			'ssa-appointment' => array(
 				'name'    => __( 'Appointment', 'formidable' ),
-				'icon'    => 'frm_icon_font frm_calendar_icon frm_show_upgrade',
+				'icon'    => 'frm_icon_font frm_schedule_icon frm_show_upgrade',
 				'require' => 'Simply Schedule Appointments',
 				'message' => sprintf(
 					/* translators: %1$s: Link opening HTML, %2$s: Link tag closing */
@@ -224,7 +224,7 @@ public static function pro_field_selection() {
 			),
 			'product'         => array(
 				'name'    => __( 'Product', 'formidable' ),
-				'icon'    => 'frm_icon_font frm_product_icon',
+				'icon'    => 'frm_icon_font frm_product2_icon',
 				'section' => 'pricing',
 			),
 			'quantity'        => array(
@@ -234,7 +234,7 @@ public static function pro_field_selection() {
 			),
 			'total'           => array(
 				'name'    => __( 'Total', 'formidable' ),
-				'icon'    => 'frm_icon_font frm_total_icon',
+				'icon'    => 'frm_icon_font frm_total2_icon',
 				'section' => 'pricing',
 			),
 		);

classes/models/fields/FrmFieldType.php

@@ -576,13 +576,6 @@ protected function get_bulk_edit_string() {
 		return __( 'Bulk Edit Options', 'formidable' );
 	}
 
-	/**
-	 * @since 4.04
-	 */
-	protected function get_add_option_string() {
-		return __( 'Add Option', 'formidable' );
-	}
-
 	/**
 	 * @since 4.04
 	 */
@@ -639,7 +632,7 @@ protected function field_choices_heading( $args ) {
 				esc_html__( '%s Options', 'formidable' ),
 				esc_html( $all_field_types[ $args['display']['type'] ]['name'] )
 			);
-			FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
+			FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon frm_svg13', array( 'aria-hidden' => 'true' ) );
 			?>
 		</h3>
 		<?php
@@ -1206,7 +1199,7 @@ private function include_hidden_values_for_single_opt( $args, $opt ) {
 
 		return $hidden;
 	}
-	
+
 	/**
 	 * When the field is read only, does it need it include hidden fields?
 	 * Checkboxes and dropdowns need this
@@ -1816,4 +1809,12 @@ protected function get_select_atributes( $values ) {
 		_deprecated_function( __METHOD__, '6.11.2', 'FrmFieldType::get_select_attributes' );
 		return $this->get_select_attributes( $values );
 	}
+
+	/**
+	 * @since 4.04
+	 * @deprecated x.x
+	 */
+	protected function get_add_option_string() {
+		return __( 'Add Option', 'formidable' );
+	}
 }

classes/views/frm-fields/back-end/default-value-setting.php

@@ -4,12 +4,15 @@
 }
 ?>
 <p
-class="frm-has-modal frm-default-value-wrapper default-value-section-<?php echo esc_attr( $field['id'] . ( isset( $default_value_types['default_value']['current'] ) ? '' : ' frm_hidden' ) ); ?>"
-<?php $field_obj->echo_field_default_setting_attributes( $field ); ?>
-id="default-value-for-<?php echo esc_attr( $field['id'] ); ?>">
-	<label for="frm_default_value_<?php echo esc_attr( $field['id'] ); ?>">
-		<?php esc_html_e( 'Default Value', 'formidable' ); ?>
+	class="frm-has-modal frm-default-value-wrapper default-value-section-<?php echo esc_attr( $field['id'] ); ?>"
+	<?php $field_obj->echo_field_default_setting_attributes( $field ); ?>
+	id="default-value-for-<?php echo esc_attr( $field['id'] ); ?>"
+>
+	<label class="frm-flex! frm-gap-xs frm-items-center" for="frm_default_value_<?php echo esc_attr( $field['id'] ); ?>">
+		<span><?php esc_html_e( 'Default Value', 'formidable' ); ?></span>
+		<?php FrmAppHelper::tooltip_icon( __( 'TODO: Add a tooltip', 'formidable' ), array( 'class' => 'frm-flex' ) ); ?>
 	</label>
+
 	<span class="frm-with-right-icon">
 		<?php
 		$field_obj->display_smart_values_modal_trigger_icon( $field );