Revert "Add global settings for card and text field"

Author: PatelUtkarsh

plugin/assets/css/src/customize-controls.css

@@ -50,7 +50,7 @@
 		content: "\f460" !important;
 	}
 
-	& .customize-section-description-container .customize-section-title {
+	& .customize-section-description-container {
 		display: none;
 	}
 }

plugin/assets/src/block-editor/blocks/card/index.js

@@ -27,8 +27,7 @@ import edit from './edit';
 import save from './save';
 import metadata from './block.json';
 import { example } from './example';
-import { isDefaultCardStyleOutlined } from '../../utils';
-metadata.attributes.outlined.default = isDefaultCardStyleOutlined();
+
 const { name } = metadata;
 
 export { metadata, name };

plugin/assets/src/block-editor/blocks/cards-collection/index.js

@@ -27,11 +27,9 @@ import edit from './edit';
 import save from './save';
 import { example } from './example';
 import metadata from './block.json';
-import { isDefaultCardStyleOutlined } from '../../utils';
 
 const { name } = metadata;
 
-metadata.attributes.outlined.default = isDefaultCardStyleOutlined();
 export { metadata, name };
 
 /**

plugin/assets/src/block-editor/blocks/contact-form/index.js

@@ -25,9 +25,6 @@ import { __ } from '@wordpress/i18n';
 import edit from './edit';
 import save from './save';
 import metadata from './block.json';
-import { isDefaultTextFieldStyleOutlined } from '../../utils';
-
-metadata.attributes.outlined.default = isDefaultTextFieldStyleOutlined();
 
 const { name } = metadata;
 

plugin/assets/src/block-editor/blocks/hand-picked-posts/index.js

@@ -27,8 +27,6 @@ import metadata from './block.json';
 
 const { name } = metadata;
 
-import { isDefaultCardStyleOutlined } from '../../utils';
-metadata.attributes.outlined.default = isDefaultCardStyleOutlined();
 export { metadata, name };
 
 /**

plugin/assets/src/block-editor/blocks/recent-posts/index.js

@@ -25,10 +25,9 @@ import { __ } from '@wordpress/i18n';
 import edit from './edit';
 import metadata from './block.json';
 import { example } from './example';
-import { isDefaultCardStyleOutlined } from '../../utils';
 
 const { name } = metadata;
-metadata.attributes.outlined.default = isDefaultCardStyleOutlined();
+
 export { metadata, name };
 
 /**

plugin/assets/src/block-editor/utils/index.js

@@ -17,5 +17,3 @@
 export { default as findIcon } from './find-icon';
 export { default as getConfig } from './get-config';
 export { default as getIconName } from './get-icon-name';
-export { default as isDefaultCardStyleOutlined } from './is-default-card-style-outlined';
-export { default as isDefaultTextFieldStyleOutlined } from './is-default-text-field-outlined';

plugin/assets/src/block-editor/utils/is-default-card-style-outlined.js

@@ -86,27 +86,19 @@ public function register_blocks() {
 
 		$blocks_dir    = $this->plugin->dir_path . '/assets/js/blocks/';
 		$block_folders = [
-			'button'            => [],
-			'card'              => [
-				'outlined' => [ $this, 'is_default_card_style_outlined' ],
-			],
-			'cards-collection'  => [
-				'outlined' => [ $this, 'is_default_card_style_outlined' ],
-			],
-			'contact-form'      => [
-				'outlined' => [ $this, 'is_default_text_field_style_outlined' ],
-			],
-			'data-table'        => [],
-			'hand-picked-posts' => [],
-			'image-list'        => [],
-			'list'              => [],
-			'recent-posts'      => [
-				'outlined' => [ $this, 'is_default_card_style_outlined' ],
-			],
-			'tab-bar'           => [],
+			'button',
+			'card',
+			'cards-collection',
+			'contact-form',
+			'data-table',
+			'hand-picked-posts',
+			'image-list',
+			'list',
+			'recent-posts',
+			'tab-bar',
 		];
 
-		foreach ( $block_folders as $block_name => $override_attributes ) {
+		foreach ( $block_folders as $block_name ) {
 			$block_json_file = $blocks_dir . $block_name . '/block.json';
 			if ( ! file_exists( $block_json_file ) ) {
 				continue;
@@ -117,10 +109,6 @@ public function register_blocks() {
 				continue;
 			}
 
-			foreach ( $override_attributes as $attr_key => $attr ) {
-				$metadata['attributes'][ $attr_key ]['default'] = call_user_func( $attr );
-			}
-
 			$metadata['editor_script'] = 'material-block-editor-js';
 			$metadata['editor_style']  = 'material-block-editor-css';
 
@@ -225,9 +213,8 @@ public function enqueue_block_editor_assets() {
 			'tab_bar_preview'          => $this->plugin->asset_url( 'assets/images/preview/tab-bar.jpg' ),
 			'contact_form_preview'     => $this->plugin->asset_url( 'assets/images/preview/contact-form.jpg' ),
 			'defaults'                 => [
-				'blocks'      => $this->get_block_defaults(),
-				'colors'      => $this->get_color_defaults(),
-				'globalStyle' => $this->get_global_styles(),
+				'blocks' => $this->get_block_defaults(),
+				'colors' => $this->get_color_defaults(),
 			],
 			'customizerUrls'           => [
 				'colors' => add_query_arg( 'autofocus[section]', $slug . '_colors', $customizer_url ),
@@ -321,51 +308,6 @@ public function get_color_defaults() {
 		return $defaults;
 	}
 
-	/**
-	 * Get global style configs.
-	 *
-	 * @param string $key get single value.
-	 *
-	 * @return array|string
-	 */
-	public function get_global_styles( $key = null ) {
-		$defaults = [];
-		$controls = $this->plugin->customizer_controls;
-
-		foreach ( $controls->get_global_style_controls() as $control ) {
-			$value = $controls->get_option( $control['id'] );
-			if ( ! empty( $value ) ) {
-				$defaults[ $control['id'] ] = $value;
-			}
-		}
-
-		return ( $key ? ( isset( $defaults[ $key ] ) ? $defaults[ $key ] : '' ) : $defaults );
-	}
-
-	/**
-	 * Whether default card style is outlined.
-	 *
-	 * @return bool
-	 */
-	public function is_default_card_style_outlined() {
-		$style = $this->get_global_styles();
-		$style = isset( $style['card_style'] ) ? $style['card_style'] : '';
-
-		return 'outlined' === $style;
-	}
-
-	/**
-	 * Whether default text field style is outlined.
-	 *
-	 * @return bool
-	 */
-	public function is_default_text_field_style_outlined() {
-		$style = $this->get_global_styles();
-		$style = isset( $style['text_field_style'] ) ? $style['text_field_style'] : '';
-
-		return 'outlined' === $style;
-	}
-
 	/**
 	 * Gets the REST API controller for a post type.
 	 *