Remove default list id.

Author: iamdharmesh

includes/blocks/class-mailchimp-list-subscribe-form-blocks.php

@@ -66,27 +66,25 @@ public function register_blocks() {
 			),
 			'list_id'                     => array(
 				'type'    => 'string',
-				'default' => get_option( 'mc_list_id', '' ),
 			),
 			'submit_text'                 => array(
 				'type'    => 'string',
-				'default' => get_option( 'mc_submit_text', esc_html__( 'Subscribe', 'mailchimp' ) ),
+				'default' => esc_html__( 'Subscribe', 'mailchimp' ),
 			),
 			'interest_groups_visibility'  => array(
 				'type'    => 'object',
-				'default' => $interest_groups_visibility,
 			),
 			'double_opt_in'               => array(
 				'type'    => 'boolean',
-				'default' => (bool) get_option( 'mc_double_optin', true ),
+				'default' => true,
 			),
 			'update_existing_subscribers' => array(
 				'type'    => 'boolean',
-				'default' => (bool) get_option( 'mc_update_existing', true ),
+				'default' => true,
 			),
 			'show_unsubscribe_link'       => array(
 				'type'    => 'boolean',
-				'default' => (bool) get_option( 'mc_use_unsub_link', 'off' ) === 'on',
+				'default' => false,
 			),
 			'unsubscribe_link_text'       => array(
 				'type'    => 'string',
@@ -120,6 +118,7 @@ public function register_blocks() {
 		$data = array(
 			'admin_settings_url'      => esc_url_raw( admin_url( 'admin.php?page=mailchimp_sf_options' ) ),
 			'lists'                   => $this->get_lists(),
+			'list_id'                 => get_option( 'mc_list_id', '' ),
 			'merge_fields_visibility' => $merge_fields_visibility,
 		);
 		$data = 'window.mailchimp_sf_block_data = ' . wp_json_encode( $data );

includes/blocks/mailchimp/edit.js

@@ -36,10 +36,13 @@ const SelectListPlaceholder = () => {
 
 export const BlockEdit = (props) => {
 	const { clientId, attributes, setAttributes } = props;
+	const { mailchimp_sf_block_data } = window;
+	const { lists, merge_fields_visibility, list_id: listId } = mailchimp_sf_block_data;
+
 	const {
 		header,
 		sub_header,
-		list_id,
+		list_id = listId,
 		submit_text,
 		double_opt_in,
 		update_existing_subscribers,
@@ -48,12 +51,10 @@ export const BlockEdit = (props) => {
 		interest_groups_visibility,
 		show_required_indicator = true,
 	} = attributes;
+
 	const blockProps = useBlockProps();
 	const { replaceInnerBlocks } = useDispatch(blockEditorStore);
 
-	const { mailchimp_sf_block_data } = window;
-	const { lists, merge_fields_visibility } = mailchimp_sf_block_data;
-
 	const listOptions = [];
 	// Check if selected list is not in the list of available lists.
 	const listIds = lists?.map((list) => list.id) || [];
@@ -184,6 +185,11 @@ export const BlockEdit = (props) => {
 		setIsLoading(true);
 
 		updateList(list_id, false);
+
+		// Set list_id attribute initially, if it's already not set.
+		if (attributes.list_id === undefined) {
+			setAttributes({ list_id: listId });
+		}
 	}, []); // eslint-disable-line react-hooks/exhaustive-deps -- Only run on initial render.
 
 	if (isLoading) {

includes/blocks/mailchimp/markup.php

@@ -13,7 +13,19 @@
 		return;
 	}
 
+	// Backwards compatibility for old block.
+	$block_instance = $block->parsed_block;
+	$inner_blocks   = $block_instance['innerBlocks'] ?? [];
+	if ( empty( $inner_blocks ) ) {
+		mailchimp_sf_signup_form();
+		?>
+		</div>
+		<?php
+		return;
+	}
+
 	// Make sure we have a list ID and it's valid.
+	$list_id  = $attributes['list_id'] ?? '';
 	$lists    = ( new Mailchimp_List_Subscribe_Form_Blocks() )->get_lists();
 	$list_ids = array_map(
 		function ( $single_list ) {
@@ -22,22 +34,10 @@ function ( $single_list ) {
 		$lists
 	);
 
-	if ( ! in_array( $attributes['list_id'], $list_ids, true ) ) {
-		return;
-	}
-
-	// Backwards compatibility for old block.
-	$block_instance = $block->parsed_block;
-	$inner_blocks   = $block_instance['innerBlocks'] ?? [];
-	if ( empty( $inner_blocks ) ) {
-		mailchimp_sf_signup_form();
-		?>
-		</div>
-		<?php
+	if ( ! in_array( $list_id, $list_ids, true ) ) {
 		return;
 	}
 
-	$list_id                     = $attributes['list_id'] ?? '';
 	$header                      = $attributes['header'] ?? '';
 	$sub_heading                 = $attributes['sub_header'] ?? '';
 	$submit_text                 = $attributes['submit_text'] ?? __( 'Subscribe', 'mailchimp' );