Merge pull request #189 from tomusborne/release/1.4.1

Release 1.4.1
tomusborne · Jan 17, 2022 · 46f1533 · 46f1533
2 parents 74cfd3c + 3a953d9
commit 46f1533
Show file tree

Hide file tree

Showing 12 changed files with 20,120 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,6 @@ node_modules
 vendor
 .DS_Store
 *.zip
-package-lock.json
 composer.lock
 ## Uncomment line below if you prefer to
 ## keep compiled files out of version control

diff --git a/dist/blocks.asset.php b/dist/blocks.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => 'abd3bfade39adca2eab3e5e23b36a2ed');
+<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => 'aefbe130c6a5e0b06c160b0b4d0eaee1');
diff --git a/dist/blocks.css b/dist/blocks.css
diff --git a/dist/blocks.js b/dist/blocks.js
diff --git a/includes/class-rest.php b/includes/class-rest.php
@@ -131,7 +131,7 @@ public function update_settings( WP_REST_Request $request ) {
 
 		foreach ( $new_settings as $name => $value ) {
 			// Skip if the option hasn't changed.
-			if ( $current_settings[ $name ] === $new_settings[ $name ] ) {
+			if ( isset( $current_settings[ $name ] ) && $current_settings[ $name ] === $new_settings[ $name ] ) {
 				unset( $new_settings[ $name ] );
 				continue;
 			}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "generateblocks",
-	"version": "1.4.0",
+	"version": "1.4.1",
 	"private": true,
 	"description": "A small collection of lightweight WordPress blocks that can accomplish nearly anything.",
 	"author": "Tom Usborne",

diff --git a/plugin.php b/plugin.php
@@ -5,7 +5,7 @@
  * Description: A small collection of lightweight WordPress blocks that can accomplish nearly anything.
  * Author: Tom Usborne
  * Author URI: https://tomusborne.com
- * Version: 1.4.0
+ * Version: 1.4.1
  * Requires at least: 5.4
  * Requires PHP: 5.6
  * License: GPL2+
@@ -19,7 +19,7 @@
 	exit; // Exit if accessed directly.
 }
 
-define( 'GENERATEBLOCKS_VERSION', '1.4.0' );
+define( 'GENERATEBLOCKS_VERSION', '1.4.1' );
 define( 'GENERATEBLOCKS_DIR', plugin_dir_path( __FILE__ ) );
 define( 'GENERATEBLOCKS_DIR_URL', plugin_dir_url( __FILE__ ) );
 

diff --git a/readme.txt b/readme.txt
@@ -3,9 +3,9 @@ Contributors: edge22
 Donate link: https://generateblocks.com
 Tags: blocks, gutenberg, container, headline, grid, columns, page builder, wysiwyg, block editor
 Requires at least: 5.4
-Tested up to: 5.8
+Tested up to: 5.9
 Requires PHP: 5.6
-Stable tag: 1.4.0
+Stable tag: 1.4.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -77,6 +77,11 @@ GenerateBlocks was built to work hand-in-hand with [GeneratePress](https://gener
 
 == Changelog ==
 
+= 1.4.1 =
+* Fix: Color picker UI in WP 5.9
+* Fix: PHP notice when first saving Dashboard settings
+* Tweak: Make Container appender relative positioned in WP 5.9
+
 = 1.4.0 =
 * New: Add flex (flex-grow, flex-shrink, flex-basis) options to grid item containers
 * New: Add "auto" width option to grid item containers on tablet and mobile

diff --git a/src/blocks/container/editor.scss b/src/blocks/container/editor.scss
@@ -325,17 +325,21 @@ body .gb-container .wp-block {
 	}
 }
 
-.gb-container > .gb-inside-container > .block-editor-inner-blocks > .block-editor-block-list__layout > .block-list-appender .block-editor-button-block-appender {
-	background: unset;
-	color: #000;
-	box-shadow: inset 0 0 0 1px #fff;
-	border: 1px solid #000;
-	padding: 5px 12px;
-
-	svg path {
-		fill: #000;
-		stroke: #fff;
-		stroke-width: 2px;
-		paint-order: stroke;
+.gb-container > .gb-inside-container > .block-editor-inner-blocks > .block-editor-block-list__layout > .block-list-appender {
+	position: relative;
+
+	.block-editor-button-block-appender {
+		background: unset;
+		color: #000;
+		box-shadow: inset 0 0 0 1px #fff;
+		border: 1px solid #000;
+		padding: 5px 12px;
+
+		svg path {
+			fill: #000;
+			stroke: #fff;
+			stroke-width: 2px;
+			paint-order: stroke;
+		}
 	}
 }
diff --git a/src/components/color-picker/editor.scss b/src/components/color-picker/editor.scss
@@ -16,6 +16,23 @@
 		display: none;
 	}
 
+	.react-colorful {
+		width: 100% !important;
+
+		.react-colorful__saturation {
+			height: 150px;
+		}
+
+		.react-colorful__hue,
+		.react-colorful__alpha {
+			width: calc(100% - 40px);
+		}
+
+		& + div {
+			display: none;
+		}
+	}
+
 	.gblocks-color-input-wrapper {
 		display: flex;
 		padding: 16px 16px 0;
@@ -44,8 +61,14 @@
 		    display: flex;
 		    flex-wrap: wrap;
 
-			.components-circular-option-picker__option-wrapper {
-				margin: 0 8px 8px 0;
+			.components-circular-option-picker__swatches {
+				display: flex;
+				flex-wrap: wrap;
+				gap: 6px;
+
+				.components-circular-option-picker__option-wrapper {
+					margin: 0;
+				}
 			}
 		}
     }
@@ -56,6 +79,7 @@
 
 	.components-color-picker {
 		padding: 5px;
+		width: 100%;
 	}
 
 	.components-color-picker__body {

diff --git a/src/components/color-picker/index.js b/src/components/color-picker/index.js
@@ -1,4 +1,3 @@
-import classnames from 'classnames';
 import hexToRGBA from '../../utils/hex-to-rgba';
 import getIcon from '../../utils/get-icon';
 
@@ -98,7 +97,7 @@ export default class GenerateBlocksColorPicker extends Component {
 
 				<div className="gblocks-color-picker-area">
 					{ ! this.state.isVisible &&
-						<div className={ classnames( 'components-color-palette__item-wrapper components-circular-option-picker__option-wrapper', value ? '' : 'components-color-palette__custom-color' ) }>
+						<div className="components-circular-option-picker__option-wrapper">
 							<Tooltip text={ __( 'Choose Color', 'generateblocks' ) }>
 								<button
 									type="button"
@@ -115,7 +114,7 @@ export default class GenerateBlocksColorPicker extends Component {
 					}
 
 					{ this.state.isVisible &&
-						<div className={ classnames( 'components-color-palette__item-wrapper components-circular-option-picker__option-wrapper', value ? '' : 'components-color-palette__custom-color' ) }>
+						<div className="components-circular-option-picker__option-wrapper">
 							<Tooltip text={ __( 'Choose Color', 'generateblocks' ) }>
 								<button
 									type="button"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => 'abd3bfade39adca2eab3e5e23b36a2ed');
		<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => 'aefbe130c6a5e0b06c160b0b4d0eaee1');