MInor code tweaks.

Author: iamdharmesh

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

@@ -101,7 +101,7 @@ public function get_lists() {
 			return array();
 		}
 
-		// we *could* support paging, but few users have that many lists (and shouldn't)
+		// we *could* support paging, but 100 is more than enough for now.
 		$lists = $api->get( 'lists', 100, array( 'fields' => 'lists.id,lists.name,lists.email_type_option' ) );
 		if ( is_wp_error( $lists ) ) {
 			return array();

includes/blocks/mailchimp-form-field/block.json

@@ -1,13 +1,13 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 3,
-	"name": "mailchimp/mailchimp-form-field",
+  "$schema": "https://schemas.wp.org/trunk/block.json",
+  "apiVersion": 3,
+  "name": "mailchimp/mailchimp-form-field",
   "title": "Form Field",
   "category": "widgets",
-	"attributes": {
-		"tag": {
-			"type": "string"
-		},
+  "attributes": {
+    "tag": {
+      "type": "string"
+    },
     "label": {
       "type": "string"
     },
@@ -17,20 +17,20 @@
     "type": {
       "type": "string"
     }
-	},
-	"supports": {
-		"html": false,
-		"reusable": true,
+  },
+  "supports": {
+    "html": false,
+    "reusable": true,
     "lock": false,
-		"typography": {
+    "typography": {
       "fontSize": true,
       "lineHeight": true
     }
-	},
+  },
   "parent": [
-		"mailchimp/mailchimp"
-	],
+    "mailchimp/mailchimp"
+  ],
   "usesContext": ["mailchimp/list_id","mailchimp/show_required_indicator"],
   "editorScript": "file:./index.js",
-	"render": "file:./field-markup.php"
+  "render": "file:./field-markup.php"
 }

includes/blocks/mailchimp-form-field/edit.js

@@ -316,7 +316,7 @@ export const BlockEdit = (props) => {
 	} = props;
 	const { visible, tag } = attributes;
 	const { mailchimpListData } = window;
-	const isPublic = mailchimpListData?.[listId]?.[tag]?.public || true;
+	const isPublic = mailchimpListData?.[listId]?.[tag]?.public;
 	const isRequired = mailchimpListData?.[listId]?.[tag]?.required || false;
 
 	return (

includes/blocks/mailchimp-form-field/index.js

@@ -108,7 +108,6 @@ variations.forEach((variation, index) => {
 });
 
 registerBlockType(metadata, {
-	icon: 'feedback',
 	edit: BlockEdit,
 	save: () => null,
 	variations,

includes/blocks/mailchimp/block.json

@@ -1,11 +1,11 @@
 {
-	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 3,
-	"name": "mailchimp/mailchimp",
-	"title": "Mailchimp List Subscribe Form",
-	"category": "widgets",
-	"description": "Mailchimp List Subscribe Form",
-	"attributes": {
+  "$schema": "https://schemas.wp.org/trunk/block.json",
+  "apiVersion": 3,
+  "name": "mailchimp/mailchimp",
+  "title": "Mailchimp List Subscribe Form",
+  "category": "widgets",
+  "description": "Mailchimp List Subscribe Form",
+  "attributes": {
     "list_id": {
       "type": "string"
     },
@@ -43,46 +43,46 @@
       "default": true
     }
   },
-	"supports": {
-		"html": false,
-		"multiple": false,
-		"reusable": true,
-		"align": [ "wide", "full" ],
-		"__experimentalBorder": {
-			"color": true,
-			"radius": true,
-			"style": true,
-			"width": true,
-			"__experimentalDefaultControls": {
-				"radius": true,
-				"style": true,
-				"width": true
-			}
-		},
-		"spacing": {
-			"margin": true,
-			"padding": true
-		},
-		"color": {
-			"background": true,
-			"text": true,
-			"border": true
-		},
-		"typography": {
-			"fontSize": true,
-			"lineHeight": true,
-			"textAlign": true
-		}
-	},
-	"allowedBlocks": [
-		"mailchimp/mailchimp-form-field"
-	],
-	"providesContext": {
-		"mailchimp/list_id": "list_id",
-		"mailchimp/show_required_indicator": "show_required_indicator"
-	},
-	"textdomain": "mailchimp",
-	"editorScript": "file:./index.js",
-	"render": "file:./markup.php",
-	"editorStyle": "file:./editor.css"
+  "supports": {
+    "html": false,
+    "multiple": false,
+    "reusable": true,
+    "align": [ "wide", "full" ],
+    "__experimentalBorder": {
+      "color": true,
+      "radius": true,
+      "style": true,
+      "width": true,
+      "__experimentalDefaultControls": {
+        "radius": true,
+        "style": true,
+        "width": true
+      }
+    },
+    "spacing": {
+      "margin": true,
+      "padding": true
+    },
+    "color": {
+      "background": true,
+      "text": true,
+      "border": true
+    },
+    "typography": {
+      "fontSize": true,
+      "lineHeight": true,
+      "textAlign": true
+    }
+  },
+  "allowedBlocks": [
+    "mailchimp/mailchimp-form-field"
+  ],
+  "providesContext": {
+    "mailchimp/list_id": "list_id",
+    "mailchimp/show_required_indicator": "show_required_indicator"
+  },
+  "textdomain": "mailchimp",
+  "editorScript": "file:./index.js",
+  "render": "file:./markup.php",
+  "editorStyle": "file:./editor.css"
 }

includes/blocks/mailchimp/edit.js

@@ -58,9 +58,20 @@ export const BlockEdit = (props) => {
 		show_required_indicator = true,
 	} = attributes;
 
+	const [listData, setListData] = useState({});
+	const [isLoading, setIsLoading] = useState(true);
+	const [error, setError] = useState('');
 	const blockProps = useBlockProps();
 	const { replaceInnerBlocks } = useDispatch(blockEditorStore);
 
+	// Select current innerBlocks
+	const innerBlocks = useSelect(
+		(select) => select(blockEditorStore).getBlocksByClientId(clientId)?.[0]?.innerBlocks || [],
+		[clientId],
+	);
+	const exisingTags = innerBlocks.map((block) => block?.attributes?.tag);
+	const visibleFieldsCount = innerBlocks.filter((block) => block?.attributes?.visible).length;
+
 	const listOptions = [];
 	// Check if selected list is not in the list of available lists.
 	const listIds = lists?.map((list) => list.id) || [];
@@ -79,18 +90,7 @@ export const BlockEdit = (props) => {
 		})) || []),
 	);
 
-	const [listData, setListData] = useState({});
-	const [isLoading, setIsLoading] = useState(true);
-	const [error, setError] = useState('');
-
-	// Select current innerBlocks
-	const innerBlocks = useSelect(
-		(select) => select(blockEditorStore).getBlocksByClientId(clientId)?.[0]?.innerBlocks || [],
-		[clientId],
-	);
-	const exisingTags = innerBlocks.map((block) => block?.attributes?.tag);
-	const visibleFieldsCount = innerBlocks.filter((block) => block?.attributes?.visible).length;
-
+	// Fetch list data and update innerBlocks if needed.
 	const updateList = (listId, replaceBlocks = false) => {
 		setError('');
 		setIsLoading(true);
@@ -291,7 +291,7 @@ export const BlockEdit = (props) => {
 										<RichText
 											id="mc_signup_submit"
 											className="button"
-											tagName="button"
+											tagName="a"
 											placeholder={__('Enter a button text.', 'mailchimp')}
 											value={submit_text}
 											onChange={(submit_text) =>

includes/blocks/mailchimp/markup.php

@@ -8,12 +8,12 @@
 ?>
 <div <?php echo get_block_wrapper_attributes(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>>
 	<?php
-	// Check if we should display the form. TODO: Add a list ID check.
+	// Check if we should display the form.
 	if ( ! mailchimp_sf_should_display_form() ) {
 		return;
 	}
 
-	// Backwards compatibility for old block.
+	// Backwards compatibility for old block, which didn't have innerBlocks.
 	$block_instance = $block->parsed_block;
 	$inner_blocks   = $block_instance['innerBlocks'] ?? [];
 	if ( empty( $inner_blocks ) ) {

mailchimp.php

@@ -157,9 +157,7 @@ function mailchimp_sf_load_resources() {
 				'ajax_url' => trailingslashit( home_url() ),
 			)
 		);
-	}
 
-	if ( ! is_admin() ) {
 		// Datepicker theme
 		wp_enqueue_style( 'flick', MCSF_URL . 'assets/css/flick/flick.css', array(), MCSF_VER );