From e5d8890cb2144b0b9178b0b12f8482708a442c0e Mon Sep 17 00:00:00 2001
From: Andrew Duthie <aduthie7@gmail.com>
Date: Mon, 6 Nov 2017 21:24:06 -0500
Subject: [PATCH] Revert "Add label elements to scheduler and visibility
 (#3317)"

This reverts commit 9c011c6ae214611f5aafeafdf73cfea838590aa4.
---
 editor/sidebar/post-schedule/index.js   | 26 ++++++++-----------------
 editor/sidebar/post-visibility/index.js | 26 ++++++++-----------------
 2 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/editor/sidebar/post-schedule/index.js b/editor/sidebar/post-schedule/index.js
index ef35b175764e2..317184bbef4ab 100644
--- a/editor/sidebar/post-schedule/index.js
+++ b/editor/sidebar/post-schedule/index.js
@@ -1,13 +1,8 @@
-/**
- * External dependencies
- */
-import { flowRight } from 'lodash';
-
 /**
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { PanelRow, Dropdown, withAPIData, withInstanceId } from '@wordpress/components';
+import { PanelRow, Dropdown, withAPIData } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -16,21 +11,19 @@ import './style.scss';
 import PostScheduleLabel from '../../post-schedule/label';
 import PostScheduleForm from '../../post-schedule';
 
-export function PostSchedule( { user, instanceId } ) {
+export function PostSchedule( { user } ) {
 	if ( ! user.data || ! user.data.capabilities.publish_posts ) {
 		return null;
 	}
-	const postScheduleSelectorId = 'post-schedule-selector-' + instanceId;
 
 	return (
 		<PanelRow className="editor-post-schedule">
-			<label htmlFor={ postScheduleSelectorId }>{ __( 'Publish' ) }</label>
+			<span>{ __( 'Publish' ) }</span>
 			<Dropdown
 				position="bottom left"
 				contentClassName="editor-post-schedule__dialog"
 				renderToggle={ ( { onToggle, isOpen } ) => (
 					<button
-						id={ postScheduleSelectorId }
 						type="button"
 						className="editor-post-schedule__toggle button-link"
 						onClick={ onToggle }
@@ -45,11 +38,8 @@ export function PostSchedule( { user, instanceId } ) {
 	);
 }
 
-const applyWithAPIData = withAPIData( () => ( {
-	user: '/wp/v2/users/me?context=edit',
-} ) );
-
-export default flowRight( [
-	applyWithAPIData,
-	withInstanceId,
-] )( PostSchedule );
+export default withAPIData( () => {
+	return {
+		user: '/wp/v2/users/me?context=edit',
+	};
+} )( PostSchedule );
diff --git a/editor/sidebar/post-visibility/index.js b/editor/sidebar/post-visibility/index.js
index 35b4eaa322083..cb21c996354b4 100644
--- a/editor/sidebar/post-visibility/index.js
+++ b/editor/sidebar/post-visibility/index.js
@@ -1,13 +1,8 @@
-/**
- * External dependencies
- */
-import { flowRight } from 'lodash';
-
 /**
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { PanelRow, Dropdown, withAPIData, withInstanceId } from '@wordpress/components';
+import { PanelRow, Dropdown, withAPIData } from '@wordpress/components';
 
 /**
  * Internal Dependencies
@@ -16,13 +11,12 @@ import './style.scss';
 import PostVisibilityLabel from '../../post-visibility/label';
 import PostVisibilityForm from '../../post-visibility';
 
-export function PostVisibility( { user, instanceId } ) {
+export function PostVisibility( { user } ) {
 	const canEdit = user.data && user.data.capabilities.publish_posts;
-	const postVisibilitySelectorId = 'post-visibility-selector-' + instanceId;
 
 	return (
 		<PanelRow className="editor-post-visibility">
-			<label htmlFor={ postVisibilitySelectorId }>{ __( 'Visibility' ) }</label>
+			<span>{ __( 'Visibility' ) }</span>
 			{ ! canEdit && <span><PostVisibilityLabel /></span> }
 			{ canEdit && (
 				<Dropdown
@@ -30,7 +24,6 @@ export function PostVisibility( { user, instanceId } ) {
 					contentClassName="editor-post-visibility__dialog"
 					renderToggle={ ( { isOpen, onToggle } ) => (
 						<button
-							id={ postVisibilitySelectorId }
 							type="button"
 							aria-expanded={ isOpen }
 							className="editor-post-visibility__toggle button-link"
@@ -46,11 +39,8 @@ export function PostVisibility( { user, instanceId } ) {
 	);
 }
 
-const applyWithAPIData = withAPIData( () => ( {
-	user: '/wp/v2/users/me?context=edit',
-} ) );
-
-export default flowRight( [
-	applyWithAPIData,
-	withInstanceId,
-] )( PostVisibility );
+export default withAPIData( () => {
+	return {
+		user: '/wp/v2/users/me?context=edit',
+	};
+} )( PostVisibility );