| @@ -56,11 +56,52 @@ | ||
| 56 | 56 | add_filter( 'frm_run_honeypot', '__return_false' ); |
| 57 | 57 | $this->hide_captcha_fields(); |
| 58 | 58 | $this->disable_javascript_validation(); |
| 59 | 59 | $this->add_a_div_class_for_default_label_positions(); |
| 60 | + $this->add_a_div_class_for_style_driven_alignment(); | |
| 60 | 61 | } |
| 61 | 62 | |
| 62 | 63 | /** |
| 64 | + * Add a marker class to radio and checkbox fields that use the style's option | |
| 65 | + * alignment setting rather than a field level override. | |
| 66 | + * | |
| 67 | + * Only fields with this class change when the radio or checkbox alignment style | |
| 68 | + * setting is updated in the styler preview. Fields with their own alignment | |
| 69 | + * override are left untouched. | |
| 70 | + * | |
| 71 | + * @since 6.32 | |
| 72 | + * | |
| 73 | + * @return void | |
| 74 | + */ | |
| 75 | + private function add_a_div_class_for_style_driven_alignment() { | |
| 76 | + add_filter( | |
| 77 | + 'frm_field_div_classes', | |
| 78 | + /** | |
| 79 | + * @param string $classes | |
| 80 | + * @param array|object $field | |
| 81 | + * | |
| 82 | + * @return string | |
| 83 | + */ | |
| 84 | + function ( $classes, $field ) { | |
| 85 | + if ( ! FrmField::is_radio( $field ) && ! FrmField::is_checkbox( $field ) ) { | |
| 86 | + return $classes; | |
| 87 | + } | |
| 88 | + | |
| 89 | + // Mirror FrmFieldType::get_container_class(): an override only exists in Pro. | |
| 90 | + $align = FrmAppHelper::pro_is_installed() ? FrmField::get_option( $field, 'align' ) : ''; | |
| 91 | + | |
| 92 | + if ( ! $align ) { | |
| 93 | + $classes .= ' frm-default-option-align'; | |
| 94 | + } | |
| 95 | + | |
| 96 | + return $classes; | |
| 97 | + }, | |
| 98 | + 10, | |
| 99 | + 2 | |
| 100 | + ); | |
| 101 | + } | |
| 102 | + | |
| 103 | + /** | |
| 63 | 104 | * Add a frm-default-label-position class to any field with a default label position. |
| 64 | 105 | * A field with a custom label position shouldn't ever change in the styler preview. |
| 65 | 106 | * |
| 66 | 107 | * @since 6.0.1 |
| @@ -123,12 +164,9 @@ | ||
| 123 | 164 | * |
| 124 | 165 | * @return bool |
| 125 | 166 | */ |
| 126 | 167 | function ( $show, $field_type ) { |
| 127 | - if ( 'captcha' === $field_type ) { | |
| 128 | - $show = false; | |
| 129 | - } | |
| 130 | - return $show; | |
| 168 | + return 'captcha' === $field_type ? false : $show; | |
| 131 | 169 | }, |
| 132 | 170 | 10, |
| 133 | 171 | 2 |
| 134 | 172 | ); |