Tags panel: control visibility

Do not show it if post has some tag assigned.
WordPress · Aug 1, 2018 · e927c9a · e927c9a
1 parent 1236a76
commit e927c9a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/packages/editor/src/components/post-publish-panel/maybe-tags-panel.js b/packages/editor/src/components/post-publish-panel/maybe-tags-panel.js
@@ -18,8 +18,8 @@ const TagsPanel = () => <PanelBody initialOpen={ true } title={ [
 	<FlatTermSelector slug={ 'post_tag' } />
 </PanelBody>;
 
-const MaybeTagsPanel = ( { hasTags } ) => {
-	if ( ! hasTags ) {
+const MaybeTagsPanel = ( { isPostTypeSupported, hasTags } ) => {
+	if ( ! isPostTypeSupported || hasTags ) {
 		return null;
 	}
 	return ( <TagsPanel /> );
@@ -29,8 +29,10 @@ export default compose( [
 	withSelect( ( select ) => {
 		const postType = select( 'core/editor' ).getCurrentPostType();
 		const tags = select( 'core' ).getTaxonomy( 'post_tag' );
+		const terms = select( 'core/editor' ).getEditedPostAttribute( tags.rest_base );
 		return {
-			hasTags: tags && tags.types.some( ( type ) => type === postType ),
+			hasTags: tags && terms && terms.length > 0,
+			isPostTypeSupported: tags && tags.types.some( ( type ) => type === postType ),
 		};
 	} ),
 ] )( MaybeTagsPanel );