From 2d3175a832421cdf11d8c306e5f8bc12eb2de22a Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Thu, 13 Jun 2024 11:43:13 -0400
Subject: [PATCH 01/12] fix margins in editor

---
 scss/editor/editor.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scss/editor/editor.scss b/scss/editor/editor.scss
index 6bdcf832..9255e83b 100644
--- a/scss/editor/editor.scss
+++ b/scss/editor/editor.scss
@@ -16,6 +16,12 @@
       font-family: Georgia, serif;
     }
 
+    // Reset this style so that the editor matches the email client output.
+    // stylelint-disable-next-line selector-max-compound-selectors
+    :where(body .is-layout-flow) > * {
+      margin-block-start: 0;
+    }
+
     // Some blocks require extra specificity.
     .block-editor-block-list__layout.is-root-container {
       @import '@/scss/core-blocks/heading';

From a610a732e1543820f46b912b78efbb6385d6b17a Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Fri, 14 Jun 2024 16:28:43 -0400
Subject: [PATCH 02/12] revise styles for read more button

---
 blocks/post-read-more/edit.tsx   |  2 +-
 blocks/post-read-more/render.php |  2 +-
 scss/core-blocks/button.scss     | 39 ++++++++++++++++++++++++--------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/blocks/post-read-more/edit.tsx b/blocks/post-read-more/edit.tsx
index 2998127b..1398d993 100644
--- a/blocks/post-read-more/edit.tsx
+++ b/blocks/post-read-more/edit.tsx
@@ -32,7 +32,7 @@ export default function Edit({
     <div {...useBlockProps({ className: 'newsletter-read-more has-text-align-center' })}>
       <RichText
         tagName="span"
-        className="wp-element-button"
+        className="read-more-button"
         value={buttonText}
         onChange={(value) => setAttributes({ readMoreText: value })}
       />
diff --git a/blocks/post-read-more/render.php b/blocks/post-read-more/render.php
index 34ff2a23..8b02396a 100644
--- a/blocks/post-read-more/render.php
+++ b/blocks/post-read-more/render.php
@@ -27,7 +27,7 @@
 		<w:anchorlock/>
 		<center>
 	<![endif]-->
-	<a class="wp-element-button" href="<?php echo esc_url( $wp_newsletter_builder_post_permalink ); ?>">
+	<a class="read-more-button" href="<?php echo esc_url( $wp_newsletter_builder_post_permalink ); ?>">
 		<?php echo esc_html( $wp_newsletter_builder_read_more_text ); ?>
 	</a>
 	<!--[if mso]>
diff --git a/scss/core-blocks/button.scss b/scss/core-blocks/button.scss
index 87317bfd..7bef3cc1 100644
--- a/scss/core-blocks/button.scss
+++ b/scss/core-blocks/button.scss
@@ -1,8 +1,17 @@
 .wp-block-button {
-  font-weight: bold;
   margin: 0 auto;
-  max-width: 50%;
-  width: max-content;
+  padding: 10px 14px;
+  text-align: center;
+
+  a {
+    font-size: 14px;
+    padding: 0;
+    text-decoration: none;
+  }
+
+  a.read-more-button {
+    padding: 10px 14px;
+  }
 
   // Footer subscribe button.
   &.wp-newsletter-builder__subscribe {
@@ -16,18 +25,28 @@
   }
 }
 
-.wp-element-button {
-  background-color: #D62827;
+.wp-element-button,
+.wp-block-button__link {
+  background-color: inherit;
+  color: inherit;
+  font-size: 14px;
+  padding: 0;
+  /* stylelint-disable-next-line property-no-vendor-prefix */
+  -webkit-text-size-adjust:none;
+}
+
+// Read More button does not use the Newsletter Button block, so it needs to be styled separately.
+.read-more-button {
+  background-color: #0279af;
   border-radius: 4px;
-  color: #FFF;
-  display: inline-block;
-  font-family: Verdana, sans-serif;
+  color: #fff;
   font-size: 14px;
-  font-weight: bold;
   line-height: 24px;
-  padding: 12px;
+  padding: 10px 14px;
   text-align: center;
   text-decoration: none;
   /* stylelint-disable-next-line property-no-vendor-prefix */
   -webkit-text-size-adjust:none;
 }
+
+

From 5f2c2841559b2160f9ed502fb5c6a884320802b5 Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Fri, 14 Jun 2024 16:33:39 -0400
Subject: [PATCH 03/12] lint

---
 scss/core-blocks/button.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scss/core-blocks/button.scss b/scss/core-blocks/button.scss
index 7bef3cc1..412ad90d 100644
--- a/scss/core-blocks/button.scss
+++ b/scss/core-blocks/button.scss
@@ -48,5 +48,3 @@
   /* stylelint-disable-next-line property-no-vendor-prefix */
   -webkit-text-size-adjust:none;
 }
-
-

From 6ed38392f6cb7aec8dc2263349ca48f75f0eb902 Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Fri, 14 Jun 2024 16:37:23 -0400
Subject: [PATCH 04/12] add block filter for button and buttons blocks

---
 block-filters/button/index.php | 36 ++++++++++++++++++
 block-filters/button/index.tsx | 67 ++++++++++++++++++++++++++++++++++
 plugin.php                     |  5 ++-
 webpack.config.js              |  5 ++-
 4 files changed, 109 insertions(+), 4 deletions(-)
 create mode 100644 block-filters/button/index.php
 create mode 100644 block-filters/button/index.tsx

diff --git a/block-filters/button/index.php b/block-filters/button/index.php
new file mode 100644
index 00000000..66869cda
--- /dev/null
+++ b/block-filters/button/index.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Core button block modifications.
+ *
+ * @package wp-newsletter-builder
+ */
+
+namespace WP_Newsletter_Builder;
+
+/**
+ * Registers assets so that they can be enqueued through Gutenberg in
+ * the corresponding context.
+ */
+function register_button_scripts(): void {
+	wp_register_script(
+		'plugin-newsletter-button',
+		get_entry_asset_url( 'wp-newsletter-builder-button' ),
+		get_asset_dependency_array( 'wp-newsletter-builder-button' ),
+		get_asset_version( 'wp-newsletter-builder-button' ),
+		true
+	);
+	wp_set_script_translations( 'plugin-newsletter-button' );
+}
+add_action( 'init', __NAMESPACE__ . '\register_button_scripts' );
+
+/**
+ * Enqueue block editor assets for button.
+ */
+function action_enqueue_button_assets(): void {
+	$post_type = get_edit_post_type();
+	if ( ( 'nb_newsletter' !== $post_type ) && ( 'nb_template' !== $post_type ) ) {
+		return;
+	}
+	wp_enqueue_script( 'plugin-newsletter-button' );
+}
+add_action( 'enqueue_block_editor_assets', __NAMESPACE__ . '\action_enqueue_button_assets' );
diff --git a/block-filters/button/index.tsx b/block-filters/button/index.tsx
new file mode 100644
index 00000000..c2f58ab8
--- /dev/null
+++ b/block-filters/button/index.tsx
@@ -0,0 +1,67 @@
+import { addFilter } from '@wordpress/hooks';
+
+/**
+ * Modifies supports for Heading block.
+ *
+ * @param {Object} settings - The original block settings.
+ * @param {string} name - The name of the block.
+ *
+ * @returns {Object} The modified block settings.
+ */
+// @ts-ignore
+function modifyHeadingSupports(settings, name) {
+  // Bail early if the block does not have supports.
+  if (!settings?.supports) {
+    return settings;
+  }
+  // Only apply to Button blocks.
+  if (
+    (name === 'core/button') || (name === 'core/buttons')
+  ) {
+    return {
+      ...settings,
+      supports: Object.assign(settings.supports, {
+        anchor: false,
+        color: {
+          background: false,
+          text: false,
+        },
+        customClassName: false,
+        inserter: false,
+        layout: false,
+        shadow: false,
+        spacing: false,
+        styles: [],
+        typography: {
+          __experimentalFontSize: false,
+          __experimentalLineHeight: false,
+          __experimentalLetterSpacing: true,
+          __experimentalFontFamily: false,
+          __experimentalFontWeight: false,
+          __experimentalFontStyle: false,
+          __experimentalTextTransform: true,
+        },
+        __experimentalBorder: {
+          color: false,
+          radius: true,
+          style: true,
+          width: false,
+          __experimentalSkipSerialization: true,
+          __experimentalDefaultControls: {
+            color: false,
+            radius: true,
+            style: true,
+            width: false,
+          },
+        },
+      }),
+    };
+  }
+  return settings;
+}
+
+addFilter(
+  'blocks.registerBlockType',
+  'wp-newsletter-builder/heading',
+  modifyHeadingSupports,
+);
diff --git a/plugin.php b/plugin.php
index 5297e9e2..c8ea6951 100644
--- a/plugin.php
+++ b/plugin.php
@@ -49,10 +49,11 @@ function () {
 require_once __DIR__ . '/src/assets.php';
 require_once __DIR__ . '/src/meta.php';
 require_once __DIR__ . '/src/utils.php';
-require_once __DIR__ . '/block-filters/separator/index.php';
+require_once __DIR__ . '/block-filters/button/index.php';
 require_once __DIR__ . '/block-filters/heading/index.php';
-require_once __DIR__ . '/block-filters/paragraph/index.php';
 require_once __DIR__ . '/block-filters/list/index.php';
+require_once __DIR__ . '/block-filters/paragraph/index.php';
+require_once __DIR__ . '/block-filters/separator/index.php';
 require_once __DIR__ . '/plugins/newsletter-from-post/index.php';
 require_once __DIR__ . '/plugins/newsletter-status/index.php';
 
diff --git a/webpack.config.js b/webpack.config.js
index 828cd8c1..363cd84e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -24,10 +24,11 @@ module.exports = (env, { mode }) => ({
           return acc;
         }, {
           // All other custom entry points can be included here.
-          'wp-newsletter-builder-separator/index': './block-filters/separator',
+          'wp-newsletter-builder-button/index': './block-filters/button',
           'wp-newsletter-builder-heading/index': './block-filters/heading',
-          'wp-newsletter-builder-paragraph/index': './block-filters/paragraph',
           'wp-newsletter-builder-list/index': './block-filters/list',
+          'wp-newsletter-builder-paragraph/index': './block-filters/paragraph',
+          'wp-newsletter-builder-separator/index': './block-filters/separator',
           'wp-newsletter-builder-from-post/index': './plugins/newsletter-from-post',
           'newsletter-status/index': './plugins/newsletter-status',
         }),

From 824fb43a0a0748277c8c8a49a80e84fb0fbc001d Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Fri, 14 Jun 2024 16:37:55 -0400
Subject: [PATCH 05/12] add newsletter button block

---
 blocks/button/block.json | 36 ++++++++++++++++
 blocks/button/edit.tsx   | 92 ++++++++++++++++++++++++++++++++++++++++
 blocks/button/index.php  | 22 ++++++++++
 blocks/button/index.tsx  | 47 ++++++++++++++++++++
 blocks/button/render.php | 20 +++++++++
 5 files changed, 217 insertions(+)
 create mode 100644 blocks/button/block.json
 create mode 100644 blocks/button/edit.tsx
 create mode 100644 blocks/button/index.php
 create mode 100644 blocks/button/index.tsx
 create mode 100644 blocks/button/render.php

diff --git a/blocks/button/block.json b/blocks/button/block.json
new file mode 100644
index 00000000..7406f793
--- /dev/null
+++ b/blocks/button/block.json
@@ -0,0 +1,36 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 3,
+	"name": "wp-newsletter-builder/button",
+	"version": "0.1.0",
+	"title": "Newsletter Button",
+	"allowedBlocks": ["core/button"],
+	"category": "design",
+	"icon": "button",
+	"description": "Button wrapper that provides email-friendly enhancements",
+	"textdomain": "button",
+	"editorScript": "file:index.ts",
+	"editorStyle": "file:index.css",
+	"style": [
+		"file:style-index.css"
+	],
+	"render": "file:render.php",
+	"attributes": {
+		"textColor": {
+			"type": "string",
+			"default": "#fff"
+		},
+		"bgColor": {
+			"type": "string",
+			"default": "#0279af"
+		},
+		"radius": {
+			"type": "string",
+			"default": "0"
+		},
+		"btnWidth": {
+			"type": "string",
+			"default": "max-content"
+		}
+	}
+}
\ No newline at end of file
diff --git a/blocks/button/edit.tsx b/blocks/button/edit.tsx
new file mode 100644
index 00000000..42717fed
--- /dev/null
+++ b/blocks/button/edit.tsx
@@ -0,0 +1,92 @@
+import { useEffect } from 'react';
+import { __ } from '@wordpress/i18n';
+import { useBlockProps, InspectorControls, InnerBlocks } from '@wordpress/block-editor';
+import { ColorPicker, PanelBody } from '@wordpress/components';
+import useInnerBlockAttributes from '@/hooks/use-inner-blocks-attributes';
+
+/**
+ * Lets webpack process CSS, SASS or SCSS files referenced in JavaScript files.
+ * Those files can contain any CSS code that gets applied to the editor.
+ *
+ * @see https://www.npmjs.com/package/@wordpress/scripts#using-css
+ */
+// Uncomment this line if you want to import a CSS file for this block.
+// import './index.scss';
+
+/**
+ * The edit function describes the structure of your block in the context of the
+ * editor. This represents what the editor will render when the block is used.
+ *
+ * @see https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#edit
+ *
+ * @return {WPElement} Element to render.
+ */
+interface EditProps {
+  attributes: {
+    align?: 'center' | 'left' | 'right';
+    bgColor?: string;
+    btnWidth?: string,
+    radius?: string,
+    textColor?: string,
+  };
+  setAttributes: (attributes: {}) => void;
+  clientId: string,
+}
+
+export default function Edit({
+  attributes: {
+    bgColor = '#0279af',
+    btnWidth = 'max-content',
+    radius = '0',
+    textColor = '#fff',
+  },
+  setAttributes,
+  clientId,
+}: EditProps) {
+  const TEMPLATE = [['core/button']];
+  const innerBlockAttributes = useInnerBlockAttributes(clientId);
+  const innerBorderRadius = innerBlockAttributes[0]?.style?.border?.radius || '0';
+  const innerWidth = innerBlockAttributes[0]?.width;
+  const buttonStyles = {
+    backgroundColor: bgColor,
+    color: textColor,
+    borderRadius: radius,
+    width: btnWidth,
+    margin: '0 auto',
+  };
+
+  useEffect(() => {
+    setAttributes({
+      radius: innerBorderRadius,
+      btnWidth: innerWidth !== undefined ? `${innerWidth}%` : 'max-content',
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [innerBorderRadius, innerWidth]);
+
+  return (
+    <>
+      <InspectorControls>
+        <PanelBody title="Button Color">
+          <h3>{__('Background color', 'wp-newsletter-builder')}</h3>
+          {/* Using ColorPicker instead of ColorPalette to ensure email-friendly values. */}
+          <ColorPicker
+            color={bgColor}
+            onChange={(color) => setAttributes({ bgColor: color })}
+          />
+          <h3>{__('Text color', 'wp-newsletter-builder')}</h3>
+          <ColorPicker
+            color={textColor}
+            onChange={(color) => setAttributes({ textColor: color })}
+          />
+        </PanelBody>
+      </InspectorControls>
+      <div {...useBlockProps({ style: buttonStyles })}>
+        <InnerBlocks
+          // @ts-ignore
+          template={TEMPLATE}
+          templateLock="all"
+        />
+      </div>
+    </>
+  );
+}
diff --git a/blocks/button/index.php b/blocks/button/index.php
new file mode 100644
index 00000000..fe71592e
--- /dev/null
+++ b/blocks/button/index.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Block Name: Newsletter Button.
+ *
+ * @package wp-newsletter-builder
+ */
+
+/**
+ * Registers the block using the metadata loaded from the `block.json` file.
+ * Behind the scenes, it registers also all assets so they can be enqueued
+ * through the block editor in the corresponding context.
+ *
+ * @see https://developer.wordpress.org/reference/functions/register_block_type/
+ */
+function wp_newsletter_builder_button_block_init() {
+	// Register the block by passing the location of block.json.
+	register_block_type(
+		__DIR__
+	);
+
+}
+add_action( 'init', 'wp_newsletter_builder_button_block_init' );
diff --git a/blocks/button/index.tsx b/blocks/button/index.tsx
new file mode 100644
index 00000000..284b92ac
--- /dev/null
+++ b/blocks/button/index.tsx
@@ -0,0 +1,47 @@
+/**
+ * Registers a new block provided a unique name and an object defining its behavior.
+ *
+ * @see https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/
+ */
+import { registerBlockType } from '@wordpress/blocks';
+import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
+
+/**
+ * Lets webpack process CSS, SASS or SCSS files referenced in JavaScript files.
+ * All files containing `style` keyword are bundled together. The code used
+ * gets applied both to the front of your site and to the editor.
+ *
+ * @see https://www.npmjs.com/package/@wordpress/scripts#using-css
+ */
+// Uncomment this line if you want to import a CSS file for this block.
+// import './style.scss';
+
+/**
+ * Internal dependencies
+ */
+import edit from './edit';
+import metadata from './block.json';
+
+/**
+ * Every block starts by registering a new block type definition.
+ *
+ * @see https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/
+ */
+registerBlockType(
+  /* @ts-expect-error Provided types are inaccurate to the actual plugin API. */
+  metadata,
+  {
+    apiVersion: 2,
+    edit,
+    save: () => {
+      const blockProps = useBlockProps.save();
+      return (
+        <div {...blockProps}>
+          {/* @ts-ignore */}
+          <InnerBlocks.Content />
+        </div>
+      );
+    },
+    title: metadata.title,
+  },
+);
diff --git a/blocks/button/render.php b/blocks/button/render.php
new file mode 100644
index 00000000..4d399152
--- /dev/null
+++ b/blocks/button/render.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * All of the parameters passed to the function where this file is being required are accessible in this scope:
+ *
+ * @param array    $attributes     The array of attributes for this block.
+ * @param string   $content        Rendered block output. ie. <InnerBlocks.Content />.
+ * @param WP_Block $block_instance The instance of the WP_Block class that represents the block being rendered.
+ *
+ * @package wp-newsletter-builder
+ */
+
+$wp_newsletter_builder_button_color    = $attributes['textColor'] ?? '';
+$wp_newsletter_builder_button_bg_color = $attributes['bgColor'] ?? '';
+$wp_newsletter_builder_button_radius   = $attributes['radius'] ?? '';
+$wp_newsletter_builder_button_width    = $attributes['btnWidth'] ?? '';
+?>
+
+<div style="margin: 0 auto; width: <?php echo esc_attr( $wp_newsletter_builder_button_width ); ?>; color: <?php echo esc_attr( $wp_newsletter_builder_button_color ); ?>; background-color: <?php echo esc_attr( $wp_newsletter_builder_button_bg_color ); ?>; border-radius: <?php echo esc_attr( $wp_newsletter_builder_button_radius ); ?>">	
+	<?php echo wp_kses_post( $content ?? '' ); ?>
+</div>

From 60273211232a1b035c08956b065117e179ec9518 Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Fri, 14 Jun 2024 16:40:11 -0400
Subject: [PATCH 06/12] add custom hooks to use innner block attributes

---
 blocks/button/edit.tsx                   |  2 +-
 hooks/useInnerBlocks/README.md           | 15 +++++++++++++++
 hooks/useInnerBlocks/index.js            | 15 +++++++++++++++
 hooks/useInnerBlocksAttributes/README.md | 15 +++++++++++++++
 hooks/useInnerBlocksAttributes/index.js  | 12 ++++++++++++
 5 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 hooks/useInnerBlocks/README.md
 create mode 100644 hooks/useInnerBlocks/index.js
 create mode 100644 hooks/useInnerBlocksAttributes/README.md
 create mode 100644 hooks/useInnerBlocksAttributes/index.js

diff --git a/blocks/button/edit.tsx b/blocks/button/edit.tsx
index 42717fed..d507d693 100644
--- a/blocks/button/edit.tsx
+++ b/blocks/button/edit.tsx
@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 import { __ } from '@wordpress/i18n';
 import { useBlockProps, InspectorControls, InnerBlocks } from '@wordpress/block-editor';
 import { ColorPicker, PanelBody } from '@wordpress/components';
-import useInnerBlockAttributes from '@/hooks/use-inner-blocks-attributes';
+import useInnerBlockAttributes from '@/hooks/useInnerBlocksAttributes';
 
 /**
  * Lets webpack process CSS, SASS or SCSS files referenced in JavaScript files.
diff --git a/hooks/useInnerBlocks/README.md b/hooks/useInnerBlocks/README.md
new file mode 100644
index 00000000..b11d8149
--- /dev/null
+++ b/hooks/useInnerBlocks/README.md
@@ -0,0 +1,15 @@
+# Custom Hooks: useInnerBlocks
+
+A custom React hook that returns the current block's inner blocks.
+
+## Usage
+
+```jsx
+const MyBlock = ({
+	clientId
+}) => {
+  const blocks = useInnerBlocks(clientId);
+
+  ...
+};
+```
diff --git a/hooks/useInnerBlocks/index.js b/hooks/useInnerBlocks/index.js
new file mode 100644
index 00000000..174d36fa
--- /dev/null
+++ b/hooks/useInnerBlocks/index.js
@@ -0,0 +1,15 @@
+import { store } from '@wordpress/block-editor';
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Get all children blocks of any given block.
+ *
+ * @param {string} clientId The block client ID.
+ * @returns {Array} An array of child blocks.
+ */
+const useInnerBlocks = (clientId) => useSelect(
+  (select) => select(store).getBlocks(clientId),
+  [clientId],
+);
+
+export default useInnerBlocks;
diff --git a/hooks/useInnerBlocksAttributes/README.md b/hooks/useInnerBlocksAttributes/README.md
new file mode 100644
index 00000000..74cc09bb
--- /dev/null
+++ b/hooks/useInnerBlocksAttributes/README.md
@@ -0,0 +1,15 @@
+# Custom Hooks: useInnerBlocksAttributes
+
+A custom React hook that returns the current blocks' inner block's attributes.
+
+## Usage
+
+```jsx
+const MyBlock = ({
+	clientId
+}) => {
+  const innerBlockAttributes = useInnerBlocksAttributes(clientId);
+
+  ...
+};
+```
diff --git a/hooks/useInnerBlocksAttributes/index.js b/hooks/useInnerBlocksAttributes/index.js
new file mode 100644
index 00000000..3eafb9ca
--- /dev/null
+++ b/hooks/useInnerBlocksAttributes/index.js
@@ -0,0 +1,12 @@
+import useInnerBlocks from '../useInnerBlocks';
+
+/**
+ * Gets all child block attributes for a specific block.
+ *
+ * @param {string} clientId The block client ID.
+ * @returns {Array} An array of child block attributes.
+ */
+const useInnerBlocksAttributes = (clientId) => useInnerBlocks(clientId)
+  .map((block) => block.attributes);
+
+export default useInnerBlocksAttributes;

From 0514825d0c50fd602dedbd591d542a5f8b25a532 Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Fri, 14 Jun 2024 16:41:22 -0400
Subject: [PATCH 07/12] version bump

---
 plugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.php b/plugin.php
index c8ea6951..bd8890d1 100644
--- a/plugin.php
+++ b/plugin.php
@@ -3,7 +3,7 @@
  * Plugin Name: Newsletter Builder
  * Plugin URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Description: Interface to manage email newsletters
- * Version: 0.3.21
+ * Version: 0.3.23
  * Author: Alley Interactive
  * Author URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Requires at least: 6.2

From 9670e591be98a031dcd800965a0679fce0c421ca Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Fri, 14 Jun 2024 16:47:31 -0400
Subject: [PATCH 08/12] lint

---
 block-filters/button/index.tsx | 2 +-
 blocks/button/edit.tsx         | 1 -
 blocks/button/render.php       | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/block-filters/button/index.tsx b/block-filters/button/index.tsx
index c2f58ab8..210df950 100644
--- a/block-filters/button/index.tsx
+++ b/block-filters/button/index.tsx
@@ -1,7 +1,7 @@
 import { addFilter } from '@wordpress/hooks';
 
 /**
- * Modifies supports for Heading block.
+ * Modifies supports for Button and Buttons blocks.
  *
  * @param {Object} settings - The original block settings.
  * @param {string} name - The name of the block.
diff --git a/blocks/button/edit.tsx b/blocks/button/edit.tsx
index d507d693..6a408456 100644
--- a/blocks/button/edit.tsx
+++ b/blocks/button/edit.tsx
@@ -23,7 +23,6 @@ import useInnerBlockAttributes from '@/hooks/useInnerBlocksAttributes';
  */
 interface EditProps {
   attributes: {
-    align?: 'center' | 'left' | 'right';
     bgColor?: string;
     btnWidth?: string,
     radius?: string,
diff --git a/blocks/button/render.php b/blocks/button/render.php
index 4d399152..245dfebf 100644
--- a/blocks/button/render.php
+++ b/blocks/button/render.php
@@ -15,6 +15,6 @@
 $wp_newsletter_builder_button_width    = $attributes['btnWidth'] ?? '';
 ?>
 
-<div style="margin: 0 auto; width: <?php echo esc_attr( $wp_newsletter_builder_button_width ); ?>; color: <?php echo esc_attr( $wp_newsletter_builder_button_color ); ?>; background-color: <?php echo esc_attr( $wp_newsletter_builder_button_bg_color ); ?>; border-radius: <?php echo esc_attr( $wp_newsletter_builder_button_radius ); ?>">	
+<div style="margin: 0 auto; width: <?php echo esc_attr( $wp_newsletter_builder_button_width ); ?>; color: <?php echo esc_attr( $wp_newsletter_builder_button_color ); ?>; background-color: <?php echo esc_attr( $wp_newsletter_builder_button_bg_color ); ?>; border-radius: <?php echo esc_attr( $wp_newsletter_builder_button_radius ); ?>">
 	<?php echo wp_kses_post( $content ?? '' ); ?>
 </div>

From 50b9032b3cc3acfe329b861848706e75dd4c105d Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Fri, 14 Jun 2024 16:51:40 -0400
Subject: [PATCH 09/12] lint

---
 blocks/button/block.json | 2 +-
 blocks/button/edit.tsx   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/blocks/button/block.json b/blocks/button/block.json
index 7406f793..35134481 100644
--- a/blocks/button/block.json
+++ b/blocks/button/block.json
@@ -33,4 +33,4 @@
 			"default": "max-content"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/blocks/button/edit.tsx b/blocks/button/edit.tsx
index 6a408456..e642884a 100644
--- a/blocks/button/edit.tsx
+++ b/blocks/button/edit.tsx
@@ -48,10 +48,10 @@ export default function Edit({
   const innerWidth = innerBlockAttributes[0]?.width;
   const buttonStyles = {
     backgroundColor: bgColor,
-    color: textColor,
     borderRadius: radius,
-    width: btnWidth,
+    color: textColor,
     margin: '0 auto',
+    width: btnWidth,
   };
 
   useEffect(() => {

From d990781d558a274da0658b8b0864c1bb19629727 Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Fri, 14 Jun 2024 16:56:03 -0400
Subject: [PATCH 10/12] lint

---
 block-filters/button/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/block-filters/button/index.tsx b/block-filters/button/index.tsx
index 210df950..a272d90c 100644
--- a/block-filters/button/index.tsx
+++ b/block-filters/button/index.tsx
@@ -9,7 +9,7 @@ import { addFilter } from '@wordpress/hooks';
  * @returns {Object} The modified block settings.
  */
 // @ts-ignore
-function modifyHeadingSupports(settings, name) {
+function modifyButtonSupports(settings, name) {
   // Bail early if the block does not have supports.
   if (!settings?.supports) {
     return settings;
@@ -62,6 +62,6 @@ function modifyHeadingSupports(settings, name) {
 
 addFilter(
   'blocks.registerBlockType',
-  'wp-newsletter-builder/heading',
-  modifyHeadingSupports,
+  'wp-newsletter-builder/button',
+  modifyButtonSupports,
 );

From 93eb2a60040321992501a720cfa19fb6c1b69ce0 Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Fri, 14 Jun 2024 17:00:17 -0400
Subject: [PATCH 11/12] lint

---
 blocks/button/index.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/blocks/button/index.php b/blocks/button/index.php
index fe71592e..78ee2fc9 100644
--- a/blocks/button/index.php
+++ b/blocks/button/index.php
@@ -17,6 +17,5 @@ function wp_newsletter_builder_button_block_init() {
 	register_block_type(
 		__DIR__
 	);
-
 }
 add_action( 'init', 'wp_newsletter_builder_button_block_init' );

From bbcd20410713d5aa40d65db67db34b1c0d2c3b1e Mon Sep 17 00:00:00 2001
From: cahdeemer <christina@joinlede.com>
Date: Mon, 17 Jun 2024 09:31:30 -0400
Subject: [PATCH 12/12] unregister block styles

---
 block-filters/button/index.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/block-filters/button/index.tsx b/block-filters/button/index.tsx
index a272d90c..0671c885 100644
--- a/block-filters/button/index.tsx
+++ b/block-filters/button/index.tsx
@@ -1,4 +1,6 @@
 import { addFilter } from '@wordpress/hooks';
+import domReady from '@wordpress/dom-ready';
+import { unregisterBlockStyle } from '@wordpress/blocks';
 
 /**
  * Modifies supports for Button and Buttons blocks.
@@ -65,3 +67,6 @@ addFilter(
   'wp-newsletter-builder/button',
   modifyButtonSupports,
 );
+
+// @ts-ignore
+domReady(() => { unregisterBlockStyle('core/button', ['fill', 'outline']); });