From 1a4a2b1530cb3d7c2cbfdf23cf9ccd9702042650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= <adam@adamziel.com>
Date: Fri, 28 Aug 2020 18:17:06 +0200
Subject: [PATCH 1/3] Use textarea instead of block preview

---
 lib/class-wp-widget-block.php | 14 +-------------
 lib/widgets-page.php          |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/lib/class-wp-widget-block.php b/lib/class-wp-widget-block.php
index 97b44eaa287e56..99a99ca0312fbd 100644
--- a/lib/class-wp-widget-block.php
+++ b/lib/class-wp-widget-block.php
@@ -175,20 +175,8 @@ public function update( $new_instance, $old_instance ) {
 	 */
 	public function form( $instance ) {
 		$instance = wp_parse_args( (array) $instance, $this->default_instance );
-		echo do_blocks( $instance['content'] );
-		$textarea_id = $this->get_field_id( 'content' );
 		?>
-		<br/>
-		<textarea id="<?php echo $textarea_id; ?>" name="<?php echo $this->get_field_name( 'content' ); ?>"
-				class="content sync-input" hidden><?php echo esc_textarea( $instance['content'] ); ?></textarea>
-		<script>
-			(function() {
-				var link = "<?php echo esc_js( admin_url( 'themes.php?page=gutenberg-widgets' ) ); ?>";
-				var container = jQuery('#<?php echo $textarea_id; ?>').closest(".form").find('.widget-control-actions .alignleft');
-				container.prepend(jQuery('<span> |</span>'));
-				container.prepend(jQuery('<a href="'+link+'" class="button-link">Edit</a>'));
-			})();
-		</script>
+		<textarea id="<?php echo $this->get_field_id( 'content' ); ?>" name="<?php echo $this->get_field_name( 'content' ); ?>" class="widefat text wp-block-textarea"><?php echo esc_textarea( $instance['content'] ); ?></textarea>
 		<?php
 	}
 
diff --git a/lib/widgets-page.php b/lib/widgets-page.php
index 931013502c7ffc..2cbfc3f4111270 100644
--- a/lib/widgets-page.php
+++ b/lib/widgets-page.php
@@ -33,7 +33,7 @@ function gutenberg_widgets_init( $hook ) {
 		wp_enqueue_style( 'wp-block-library-theme' );
 		wp_add_inline_style(
 			'wp-block-library-theme',
-			'.block-widget-form .widget-control-save { display: none; }'
+			'.wp-block-textarea { width: 100%; min-height: 5em; margin: 8px 0 16px 0; }'
 		);
 		return;
 	}

From e45e9229de7447bdaebf481bbfeea899b78e6b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= <adam@adamziel.com>
Date: Tue, 15 Sep 2020 13:13:36 +0200
Subject: [PATCH 2/3] Set rows and cols on <textarea>

---
 lib/class-wp-widget-block.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/class-wp-widget-block.php b/lib/class-wp-widget-block.php
index 99a99ca0312fbd..2e5d78546e21f2 100644
--- a/lib/class-wp-widget-block.php
+++ b/lib/class-wp-widget-block.php
@@ -176,7 +176,7 @@ public function update( $new_instance, $old_instance ) {
 	public function form( $instance ) {
 		$instance = wp_parse_args( (array) $instance, $this->default_instance );
 		?>
-		<textarea id="<?php echo $this->get_field_id( 'content' ); ?>" name="<?php echo $this->get_field_name( 'content' ); ?>" class="widefat text wp-block-textarea"><?php echo esc_textarea( $instance['content'] ); ?></textarea>
+		<textarea id="<?php echo $this->get_field_id( 'content' ); ?>" name="<?php echo $this->get_field_name( 'content' ); ?>" rows="6" cols="50" class="widefat text wp-block-textarea"><?php echo esc_textarea( $instance['content'] ); ?></textarea>
 		<?php
 	}
 

From 62d4efa10d37be86dd85fa1293e809075196350c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= <adam@adamziel.com>
Date: Tue, 15 Sep 2020 13:16:59 +0200
Subject: [PATCH 3/3] Use wp-block-widget-textarea class

---
 lib/class-wp-widget-block.php | 2 +-
 lib/widgets-page.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/class-wp-widget-block.php b/lib/class-wp-widget-block.php
index 2e5d78546e21f2..b5fbe90c2162ef 100644
--- a/lib/class-wp-widget-block.php
+++ b/lib/class-wp-widget-block.php
@@ -176,7 +176,7 @@ public function update( $new_instance, $old_instance ) {
 	public function form( $instance ) {
 		$instance = wp_parse_args( (array) $instance, $this->default_instance );
 		?>
-		<textarea id="<?php echo $this->get_field_id( 'content' ); ?>" name="<?php echo $this->get_field_name( 'content' ); ?>" rows="6" cols="50" class="widefat text wp-block-textarea"><?php echo esc_textarea( $instance['content'] ); ?></textarea>
+		<textarea id="<?php echo $this->get_field_id( 'content' ); ?>" name="<?php echo $this->get_field_name( 'content' ); ?>" rows="6" cols="50" class="widefat text wp-block-widget-textarea"><?php echo esc_textarea( $instance['content'] ); ?></textarea>
 		<?php
 	}
 
diff --git a/lib/widgets-page.php b/lib/widgets-page.php
index 2cbfc3f4111270..6815bf5b75b7a7 100644
--- a/lib/widgets-page.php
+++ b/lib/widgets-page.php
@@ -33,7 +33,7 @@ function gutenberg_widgets_init( $hook ) {
 		wp_enqueue_style( 'wp-block-library-theme' );
 		wp_add_inline_style(
 			'wp-block-library-theme',
-			'.wp-block-textarea { width: 100%; min-height: 5em; margin: 8px 0 16px 0; }'
+			'.wp-block-widget-textarea { width: 100%; min-height: 5em; margin: 8px 0 16px 0; }'
 		);
 		return;
 	}