Skip to content

Commit 469a990

Browse files
iamdharmeshiamdharmesh
committed
Hide Header and subheader if it is blank and block is not selected.
1 parent 44d2566 commit 469a990

File tree

3 files changed

+82
-64
lines changed

3 files changed

+82
-64
lines changed

‎includes/blocks/mailchimp/edit.js

Lines changed: 57 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -243,68 +243,74 @@ export const BlockEdit = (props) => {
243243
{list_id && (
244244
<>
245245
<RichText
246-
className="mailchimp-block__header"
246+
className="mailchimp-block__header mc_custom_border_hdr"
247247
tagName="h2"
248-
placeholder={__('Please enter a header text.', 'mailchimp')}
248+
placeholder={__('Enter a header.', 'mailchimp')}
249249
value={header}
250250
onChange={(header) => setAttributes({ header })}
251251
/>
252-
<RichText
253-
className="mailchimp-block__sub-header"
254-
tagName="h3"
255-
placeholder={__('Please enter a sub header text.', 'mailchimp')}
256-
value={sub_header}
257-
onChange={(sub_header) => setAttributes({ sub_header })}
258-
/>
259-
{error && (
260-
<Placeholder>
261-
{sprintf(
262-
// translators: %s: error message describing the problem
263-
__('Error fetching list data: %s'),
264-
error,
265-
)}
266-
</Placeholder>
267-
)}
268-
<div id="mc_signup_form">
269-
<div className="mc_form_inside">
270-
<InnerBlocks
271-
allowedBlocks={['mailchimp/mailchimp-form-field']}
272-
orientation="vertical"
273-
template={template}
274-
templateLock="insert"
275-
/>
276-
{show_required_indicator && (
277-
<div id="mc-indicates-required">
278-
{__('* = required field', 'mailchimp')}
279-
</div>
280-
)}
281-
<Disabled>
282-
<InterestGroups
283-
listData={listData}
284-
visibility={interest_groups_visibility}
285-
/>
286-
</Disabled>
287-
<div className="mc_signup_submit">
252+
<div id="mc_signup">
253+
<div id="mc_signup_form">
254+
<div id="mc_subheader">
288255
<RichText
289-
id="mc_signup_submit"
290-
className="button"
291-
tagName="button"
292-
placeholder={__('Enter button text.', 'mailchimp')}
293-
value={submit_text}
294-
onChange={(submit_text) => setAttributes({ submit_text })}
256+
className="mailchimp-block__sub-header"
257+
tagName="h3"
258+
placeholder={__('Enter a sub header.', 'mailchimp')}
259+
value={sub_header}
260+
onChange={(sub_header) => setAttributes({ sub_header })}
295261
/>
296262
</div>
297-
{!!show_unsubscribe_link && (
298-
<div id="mc_unsub_link">
263+
{error && (
264+
<Placeholder>
265+
{sprintf(
266+
// translators: %s: error message describing the problem
267+
__('Error fetching list data: %s'),
268+
error,
269+
)}
270+
</Placeholder>
271+
)}
272+
<div className="mc_form_inside">
273+
<InnerBlocks
274+
allowedBlocks={['mailchimp/mailchimp-form-field']}
275+
orientation="vertical"
276+
template={template}
277+
templateLock="insert"
278+
/>
279+
{show_required_indicator && (
280+
<div id="mc-indicates-required">
281+
{__('* = required field', 'mailchimp')}
282+
</div>
283+
)}
284+
<Disabled>
285+
<InterestGroups
286+
listData={listData}
287+
visibility={interest_groups_visibility}
288+
/>
289+
</Disabled>
290+
<div className="mc_signup_submit">
299291
<RichText
300-
tagName="a"
301-
value={unsubscribe_link_text}
302-
onChange={(unsubscribe_link_text) =>
303-
setAttributes({ unsubscribe_link_text })
292+
id="mc_signup_submit"
293+
className="button"
294+
tagName="button"
295+
placeholder={__('Enter a button text.', 'mailchimp')}
296+
value={submit_text}
297+
onChange={(submit_text) =>
298+
setAttributes({ submit_text })
304299
}
305300
/>
306301
</div>
307-
)}
302+
{!!show_unsubscribe_link && (
303+
<div id="mc_unsub_link">
304+
<RichText
305+
tagName="a"
306+
value={unsubscribe_link_text}
307+
onChange={(unsubscribe_link_text) =>
308+
setAttributes({ unsubscribe_link_text })
309+
}
310+
/>
311+
</div>
312+
)}
313+
</div>
308314
</div>
309315
</div>
310316
</>

‎includes/blocks/mailchimp/editor.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,18 @@
2323
margin: 8px 0px;
2424
}
2525

26+
h2.mailchimp-block__header:has(span:empty),
27+
div#mc_subheader:has(h3 span:empty) {
28+
display: none;
29+
}
30+
31+
.is-selected div#mc_subheader:has(h3 span:empty),
32+
.has-child-selected div#mc_subheader:has(h3 span:empty),
33+
.is-selected h2.mailchimp-block__header:has(span:empty),
34+
.has-child-selected h2.mailchimp-block__header:has(span:empty) {
35+
display: block;
36+
}
37+
2638
#mc_signup_form .mailchimp_merge_field_hidden .mc_var_label {
2739
padding: 0.25em 0.5em;
2840
margin: 0px;

‎includes/blocks/mailchimp/markup.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -170,32 +170,32 @@ function ( $single_list ) {
170170
// See if we have custom header content
171171
if ( ! empty( $header ) ) {
172172
?>
173-
<h2>
173+
<h2 class="mc_custom_border_hdr">
174174
<?php echo wp_kses_post( $header ); ?>
175175
</h2>
176176
<?php
177177
}
178178
?>
179179
<div id="mc_signup">
180-
<?php
181-
if ( $sub_heading ) {
182-
?>
183-
<div id="mc_subheader">
184-
<h3>
185-
<?php echo wp_kses_post( $sub_heading ); ?>
186-
</h3>
187-
</div><!-- /mc_subheader -->
188-
<?php
189-
}
190-
?>
191180
<form method="post" action="#mc_signup" id="mc_signup_form">
192181
<input type="hidden" id="mc_submit_type" name="mc_submit_type" value="html" />
193182
<input type="hidden" name="mcsf_action" value="mc_submit_signup_form" />
194183
<input type="hidden" name="mailchimp_sf_list_id" value="<?php echo esc_attr( $list_id ); ?>" />
195184
<input type="hidden" name="mailchimp_sf_update_existing_subscribers" value="<?php echo esc_attr( $update_existing_subscribers ); ?>" />
196185
<input type="hidden" name="mailchimp_sf_double_opt_in" value="<?php echo esc_attr( $double_opt_in ); ?>" />
197186
<input type="hidden" name="mailchimp_sf_hash" value="<?php echo esc_attr( $hash ); ?>" />
198-
<?php wp_nonce_field( 'mc_submit_signup_form', '_mc_submit_signup_form_nonce', false ); ?>
187+
<?php
188+
wp_nonce_field( 'mc_submit_signup_form', '_mc_submit_signup_form_nonce', false );
189+
if ( $sub_heading ) {
190+
?>
191+
<div id="mc_subheader">
192+
<h3>
193+
<?php echo wp_kses_post( $sub_heading ); ?>
194+
</h3>
195+
</div><!-- /mc_subheader -->
196+
<?php
197+
}
198+
?>
199199
<div class="mc_form_inside">
200200
<div id="mc_message">
201201
<?php echo wp_kses_post( mailchimp_sf_global_msg() ); ?>

0 commit comments

Comments
 (0)