BlockEditor: Do not show InlineTips by default

WordPress · Aug 2, 2019 · 609a09c · 609a09c
1 parent bdd6473
commit 609a09c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 13 deletions.
diff --git a/packages/block-editor/README.md b/packages/block-editor/README.md
@@ -370,7 +370,8 @@ The default editor settings
  bodyPlaceholder                        string        Empty post placeholder
  titlePlaceholder                       string        Empty title placeholder
  codeEditingEnabled                     string        Whether or not the user can switch to the code editor
- \_\_experimentalCanUserUseUnfilteredHTML string        Whether the user should be able to use unfiltered HTML or the HTML should be filtered e.g., to remove elements considered insecure like iframes.
+ **experimentalCanUserUseUnfilteredHTML string        Whether the user should be able to use unfiltered HTML or the HTML should be filtered e.g., to remove elements considered insecure like iframes.
+ **experimentalEnableTips               boolean       Whether or not tips aimed at new users should appear in the UI.
 
 <a name="SkipToSelectedBlock" href="#SkipToSelectedBlock">#</a> **SkipToSelectedBlock**
 

diff --git a/packages/block-editor/src/components/block-inspector/index.js b/packages/block-editor/src/components/block-inspector/index.js
@@ -28,6 +28,7 @@ const BlockInspector = ( {
 	selectedBlockClientId,
 	selectedBlockName,
 	showNoBlockSelectedMessage = true,
+	enableTips,
 } ) => {
 	if ( count > 1 ) {
 		return <MultiSelectionInspector />;
@@ -52,9 +53,11 @@ const BlockInspector = ( {
 
 	return (
 		<>
-			<InlineTip tipId="core/editor.blockInspector" className="block-editor-block-inspector__tip">
-				{ __( 'The block tab contains additional settings for the selected block.' ) }
-			</InlineTip>
+			{ enableTips && (
+				<InlineTip tipId="core/editor.blockInspector" className="block-editor-block-inspector__tip">
+					{ __( 'The block tab contains additional settings for the selected block.' ) }
+				</InlineTip>
+			) }
 			<div className="editor-block-inspector__card block-editor-block-inspector__card">
 				<BlockIcon icon={ blockType.icon } showColors />
 				<div className="editor-block-inspector__card-content block-editor-block-inspector__card-content">
@@ -95,18 +98,20 @@ const BlockInspector = ( {
 
 export default withSelect(
 	( select ) => {
-		const { getSelectedBlockClientId, getSelectedBlockCount, getBlockName } = select( 'core/block-editor' );
+		const { getSelectedBlockClientId, getSelectedBlockCount, getBlockName, getSettings } = select( 'core/block-editor' );
 		const { getBlockStyles } = select( 'core/blocks' );
 		const selectedBlockClientId = getSelectedBlockClientId();
 		const selectedBlockName = selectedBlockClientId && getBlockName( selectedBlockClientId );
 		const blockType = selectedBlockClientId && getBlockType( selectedBlockName );
 		const blockStyles = selectedBlockClientId && getBlockStyles( selectedBlockName );
+		const { __experimentalEnableTips: enableTips } = getSettings();
 		return {
 			count: getSelectedBlockCount(),
 			hasBlockStyles: blockStyles && blockStyles.length > 0,
 			selectedBlockName,
 			selectedBlockClientId,
 			blockType,
+			enableTips,
 		};
 	}
 )( BlockInspector );
diff --git a/packages/block-editor/src/components/inserter/menu.js b/packages/block-editor/src/components/inserter/menu.js
@@ -248,7 +248,7 @@ export class InserterMenu extends Component {
 	}
 
 	render() {
-		const { instanceId, onSelect, rootClientId } = this.props;
+		const { instanceId, onSelect, rootClientId, enableTips } = this.props;
 		const {
 			childItems,
 			hoveredItem,
@@ -291,13 +291,15 @@ export class InserterMenu extends Component {
 					aria-label={ __( 'Available block types' ) }
 				>
 
-					<InlineTip tipId="core/editor.inserter" className="block-editor-inserter__tip">
-						{ __( 'There are Blocks for most types of content: text, headings, images, lists, and lots more!' ) }
-						{ ' ' }
-						<ExternalLink href="https://wordpress.org/support/article/wordpress-editor/#blocks">
-							{ __( 'Learn more' ) }
-						</ExternalLink>
-					</InlineTip>
+					{ enableTips && (
+						<InlineTip tipId="core/editor.inserter" className="block-editor-inserter__tip">
+							{ __( 'There are Blocks for most types of content: text, headings, images, lists, and lots more!' ) }
+							{ ' ' }
+							<ExternalLink href="https://wordpress.org/support/article/wordpress-editor/#blocks">
+								{ __( 'Learn more' ) }
+							</ExternalLink>
+						</InlineTip>
+					) }
 
 					<ChildBlocks
 						rootClientId={ rootClientId }
@@ -375,6 +377,7 @@ export default compose(
 			getBlockName,
 			getBlockRootClientId,
 			getBlockSelectionEnd,
+			getSettings,
 		} = select( 'core/block-editor' );
 		const {
 			getChildBlockNames,
@@ -388,11 +391,13 @@ export default compose(
 			}
 		}
 		const destinationRootBlockName = getBlockName( destinationRootClientId );
+		const { __experimentalEnableTips: enableTips } = getSettings();
 
 		return {
 			rootChildBlocks: getChildBlockNames( destinationRootBlockName ),
 			items: getInserterItems( destinationRootClientId ),
 			destinationRootClientId,
+			enableTips,
 		};
 	} ),
 	withDispatch( ( dispatch, ownProps, { select } ) => {

diff --git a/packages/block-editor/src/store/defaults.js b/packages/block-editor/src/store/defaults.js
@@ -28,9 +28,11 @@ export const PREFERENCES_DEFAULTS = {
  *  titlePlaceholder                       string        Empty title placeholder
  *  codeEditingEnabled                     string        Whether or not the user can switch to the code editor
  *  __experimentalCanUserUseUnfilteredHTML string        Whether the user should be able to use unfiltered HTML or the HTML should be filtered e.g., to remove elements considered insecure like iframes.
+ *  __experimentalEnableTips               boolean       Whether or not tips aimed at new users should appear in the UI.
  */
 export const SETTINGS_DEFAULTS = {
 	alignWide: false,
+
 	colors: [
 		{
 			name: __( 'Pale pink' ),
@@ -142,7 +144,11 @@ export const SETTINGS_DEFAULTS = {
 	allowedMimeTypes: null,
 
 	availableLegacyWidgets: {},
+
 	hasPermissionsToManageWidgets: false,
+
 	__experimentalCanUserUseUnfilteredHTML: false,
+
+	__experimentalEnableTips: false,
 };
 
diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
@@ -104,6 +104,7 @@ class EditorProvider extends Component {
 			__experimentalMediaUpload: hasUploadPermissions ? mediaUpload : undefined,
 			__experimentalFetchLinkSuggestions: fetchLinkSuggestions,
 			__experimentalCanUserUseUnfilteredHTML: canUserUseUnfilteredHTML,
+			__experimentalEnableTips: true,
 		};
 	}