Merge branch 'master' into add/2793-user-autocompletion

WordPress · Oct 24, 2017 · 79712b8 · 79712b8
2 parents 8791dd3 + 653e555
commit 79712b8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/blocks/editable/tinymce.js b/blocks/editable/tinymce.js
@@ -46,6 +46,10 @@ export default class TinyMCE extends Component {
 			return;
 		}
 
+		// This hack prevents TinyMCE from trying to remove the container node
+		// while cleaning for destroy, since removal is handled by React. It
+		// does so by substituting the container to be removed.
+		this.editor.container = document.createDocumentFragment();
 		this.editor.destroy();
 		delete this.editor;
 	}

diff --git a/blocks/inspector-controls/textarea-control/index.js b/blocks/inspector-controls/textarea-control/index.js
@@ -21,10 +21,9 @@ function TextareaControl( { label, value, help, instanceId, onChange, rows = 4,
 				rows={ rows }
 				onChange={ onChangeValue }
 				aria-describedby={ !! help ? id + '__help' : undefined }
+				value={ value }
 				{ ...props }
-			>
-				{ value }
-			</textarea>
+			/>
 		</BaseControl>
 	);
 }

diff --git a/blocks/library/paragraph/index.js b/blocks/library/paragraph/index.js
@@ -135,7 +135,6 @@ registerBlockType( 'core/paragraph', {
 						<ColorPalette
 							value={ backgroundColor }
 							onChange={ ( colorValue ) => setAttributes( { backgroundColor: colorValue } ) }
-							withTransparentOption
 						/>
 					</PanelBody>
 					<PanelBody title={ __( 'Text Color' ) }>

diff --git a/editor/header/style.scss b/editor/header/style.scss
@@ -46,7 +46,11 @@
 
 /* Sidebar manually collapsed */
 .folded .editor-header {
-	left: $admin-sidebar-width-collapsed;
+	left: 0;
+
+	@include break-medium() {
+		left: $admin-sidebar-width-collapsed;
+	}
 }
 
 /* Mobile menu opened */