Merge pull request #77 from HardeepAsrani/development

Add HTML Anchor to Section Block.
Change Default Section setting.
Fix resizer styles.
Add Link Component.
Add Marker button to Map.
Remove Padding Resizer.
Better UI for Sizing Control.
Fix Dynamic CSS not rendering on reusable blocks.
Validate blocks before importing.

Author: HardeepAsrani

build/build.css

@@ -70,6 +70,10 @@ public function load_gutenberg_blocks() {
 		if ( class_exists( '\ThemeIsle\GutenbergCSS' ) && get_option( 'themeisle_blocks_settings_css_module', true ) ) {
 			\ThemeIsle\GutenbergCSS::instance();
 		}
+
+		if ( class_exists( '\ThemeIsle\GutenbergAnimation' ) && get_option( 'themeisle_blocks_settings_blocks_animation', true ) ) {
+			\ThemeIsle\GutenbergAnimation::instance();
+		}
 	}
 
 	/**
@@ -129,6 +133,17 @@ public function register_settings() {
 				'default'           => true,
 			)
 		);
+
+		register_setting(
+			'themeisle_blocks_settings',
+			'themeisle_blocks_settings_blocks_animation',
+			array(
+				'type'              => 'boolean',
+				'description'       => __( 'Blocks Animation module allows to add CSS animations to each block in Block Editor.', 'otter-blocks' ),
+				'show_in_rest'      => true,
+				'default'           => true,
+			)
+		);
 	}
 
 	/**

build/build.js

@@ -5,6 +5,7 @@
     "require": {
         "codeinwp/gutenberg-blocks": "dev-master",
         "codeinwp/gutenberg-css": "dev-master",
+        "codeinwp/gutenberg-animation": "dev-master",
         "codeinwp/themeisle-sdk": "dev-master"
     },
     "license": "GPL-2.0+",

class-otter-blocks.php

@@ -16,7 +16,7 @@ module.exports = {
 	        prefix: 'Version\\:\.*\\s'
         },
         src: [
-            'otter.php',
+            'otter-blocks.php',
         ]
     }
 };

composer.json

@@ -3,7 +3,7 @@
  * Plugin Name:       Gutenberg Blocks and Template Library by Otter
  * Plugin URI:        https://themeisle.com/plugins/otter-blocks
  * Description:       Create beautiful and attracting posts, pages, and landing pages with Gutenberg Blocks and Template Library by Otter. Otter comes with dozens of Gutenberg blocks that are all you need to build beautiful pages.
- * Version:           1.2.1
+ * Version:           1.2.2
  * Author:            ThemeIsle
  * Author URI:        https://themeisle.com
  * License:           GPL-2.0+
@@ -22,7 +22,7 @@
 define( 'OTTER_BLOCKS_BASEFILE', __FILE__ );
 define( 'OTTER_BLOCKS_URL', plugins_url( '/', __FILE__ ) );
 define( 'OTTER_BLOCKS_PATH', dirname( __FILE__ ) );
-define( 'OTTER_BLOCKS_VERSION', '1.2.1' );
+define( 'OTTER_BLOCKS_VERSION', '1.2.2' );
 define( 'OTTER_BLOCKS_DEV', false );
 
 $vendor_file = OTTER_BLOCKS_PATH . '/vendor/autoload.php';

grunt/version.js

@@ -1,6 +1,6 @@
 {
   "name": "otter-blocks",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Gutenberg Blocks and Template Library by Otter",
   "scripts": {
     "build": "cross-env BABEL_ENV=default NODE_ENV=production webpack",

otter-blocks.php

@@ -47,7 +47,8 @@ It has:
 ## Changelog ##
 ### 1.2.1 - 2019-04-20  ###
 
-* Update version
+* Fixed issue with constant not being checked in Otter
+* Added error handling in Backbone functions
 
 
 ### 1.2.0 - 2019-04-18  ###

package.json

@@ -47,8 +47,8 @@ It has:
 == Changelog ==
 = 1.2.1 - 2019-04-20  = 
 
-* Update version
-
+* Fixed issue with constant not being checked in Otter
+* Added error handling in Backbone functions
 
 = 1.2.0 - 2019-04-18  = 
 

readme.md

@@ -39,6 +39,7 @@ class Main extends Component {
 			isAPISaving: false,
 			notification: null,
 			cssModule: false,
+			blocksAnimation: false,
 			isDefaultSection: true,
 			googleMapsAPI: ''
 		};
@@ -52,6 +53,7 @@ class Main extends Component {
 				this.settings.fetch().then( response => {
 					this.setState({
 						cssModule: Boolean( response.themeisle_blocks_settings_css_module ),
+						blocksAnimation: Boolean( response.themeisle_blocks_settings_blocks_animation ),
 						isDefaultSection: Boolean( response.themeisle_blocks_settings_default_block ),
 						googleMapsAPI: response.themeisle_google_map_block_api_key,
 						isAPILoaded: true
@@ -151,6 +153,15 @@ class Main extends Component {
 									onChange={ () => this.changeOptions( 'themeisle_blocks_settings_css_module', 'cssModule', ! this.state.cssModule ) }
 								/>
 							</PanelRow>
+
+							<PanelRow>
+								<ToggleControl
+									label={ __( 'Enable Blocks Animation Module' ) }
+									help={ 'Blocks Animation module allows to add CSS animations to each block in Block Editor.' }
+									checked={ this.state.blocksAnimation }
+									onChange={ () => this.changeOptions( 'themeisle_blocks_settings_blocks_animation', 'blocksAnimation', ! this.state.blocksAnimation ) }
+								/>
+							</PanelRow>
 						</PanelBody>
 					</div>
 

readme.txt

@@ -34,7 +34,7 @@ class Onboarding extends Component {
 				},
 				{
 					target: '.otter-step-two',
-					content: __( 'Jazz up your blocks with some sparkly custom CSS right inside the block. CSS Modules allow you to add custom CSS to your blocks in the Block Editor.' )
+					content: __( 'Jazz up your blocks with some sparkly custom CSS or Blocks Animation right inside the block. Here you can enable modules to enhance your experience with Block Editor.' )
 				},
 				{
 					target: '.otter-step-three',

src/Components/Main.js

@@ -76,6 +76,7 @@
 
 			.components-panel__row {
 				padding: 20px 10px 10px;
+				margin: 0;
 
 				.components-base-control {
 

src/Components/Onboarding.js

@@ -19,13 +19,13 @@
  * Manually load the plugin being tested.
  */
 function _manually_load_plugin() {
-	require dirname( dirname( __FILE__ ) ) . '/otter.php';
+	require dirname( dirname( __FILE__ ) ) . '/otter-blocks.php';
 }
 
 tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
 // Start up the WP testing environment.
 require $_tests_dir . '/includes/bootstrap.php';
-activate_plugin( 'otter-blocks/otter.php' );
+activate_plugin( 'otter-blocks/otter-blocks.php' );
 global $current_user;
 $current_user = new WP_User( 1 );
 $current_user->set_role( 'administrator' );

src/style.scss

@@ -1 +1 @@
-{"class-otter-blocks.php":"956ba187f214a15c4ce9f593eb3bbcad","otter.php":"31b2a344a3d85775f2d60af46b3f5f2d","webpack.config.js":"c2c576307763cb6907cc0baa3eba3c1a"}
+{"class-otter-blocks.php":"d695cc3e89079f6208aa86a62b0b4755","otter-blocks.php":"31b2a344a3d85775f2d60af46b3f5f2d","webpack.config.js":"c2c576307763cb6907cc0baa3eba3c1a"}