From 1ce3fb1c2c89f30be12318128c6c8784ae992956 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Mon, 11 Mar 2019 19:34:43 +0300 Subject: [PATCH 1/5] Fix placeholder position of block appender --- .../default-block-appender/index.native.js | 12 +++++------- .../default-block-appender/style.native.scss | 13 ------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/packages/editor/src/components/default-block-appender/index.native.js b/packages/editor/src/components/default-block-appender/index.native.js index 8255afc3cd8fc7..ee7418dca25d2d 100644 --- a/packages/editor/src/components/default-block-appender/index.native.js +++ b/packages/editor/src/components/default-block-appender/index.native.js @@ -10,6 +10,7 @@ import { __ } from '@wordpress/i18n'; import { compose } from '@wordpress/compose'; import { decodeEntities } from '@wordpress/html-entities'; import { withSelect, withDispatch } from '@wordpress/data'; +import { RichText } from '@wordpress/editor'; /** * Internal dependencies @@ -21,6 +22,7 @@ export function DefaultBlockAppender( { isVisible, onAppend, placeholder, + containerStyle, } ) { if ( isLocked || ! isVisible ) { return null; @@ -33,13 +35,9 @@ export function DefaultBlockAppender( { onPress={ onAppend } > - - + diff --git a/packages/editor/src/components/default-block-appender/style.native.scss b/packages/editor/src/components/default-block-appender/style.native.scss index fd3cd2f9afefb3..00c1b2d649fc66 100644 --- a/packages/editor/src/components/default-block-appender/style.native.scss +++ b/packages/editor/src/components/default-block-appender/style.native.scss @@ -6,16 +6,3 @@ .blockHolder { flex: 1 1 auto; } - -.blockContainer { - background-color: $white; - padding-top: 0; - padding-left: 16px; - padding-right: 16px; -} - -.textView { - color: $gray; - font-size: 16px; - font-family: $default-regular-font; -} From f5ee874f3a0686801ae51c36dd8350f46827a5ad Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Tue, 12 Mar 2019 12:16:19 +0300 Subject: [PATCH 2/5] Remove unused import --- .../src/components/default-block-appender/index.native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/editor/src/components/default-block-appender/index.native.js b/packages/editor/src/components/default-block-appender/index.native.js index ee7418dca25d2d..f06fdc9c041185 100644 --- a/packages/editor/src/components/default-block-appender/index.native.js +++ b/packages/editor/src/components/default-block-appender/index.native.js @@ -1,7 +1,7 @@ /** * External dependencies */ -import { TextInput, TouchableWithoutFeedback, View } from 'react-native'; +import { TouchableWithoutFeedback, View } from 'react-native'; /** * WordPress dependencies From ed832e494d5f1e1eebe30efc8d73f6902e79ae3b Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Tue, 12 Mar 2019 14:47:52 +0300 Subject: [PATCH 3/5] Change import position --- .../src/components/default-block-appender/index.native.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/editor/src/components/default-block-appender/index.native.js b/packages/editor/src/components/default-block-appender/index.native.js index f06fdc9c041185..3f2ddd600207f2 100644 --- a/packages/editor/src/components/default-block-appender/index.native.js +++ b/packages/editor/src/components/default-block-appender/index.native.js @@ -7,10 +7,10 @@ import { TouchableWithoutFeedback, View } from 'react-native'; * WordPress dependencies */ import { __ } from '@wordpress/i18n'; +import { RichText } from '@wordpress/editor'; import { compose } from '@wordpress/compose'; import { decodeEntities } from '@wordpress/html-entities'; import { withSelect, withDispatch } from '@wordpress/data'; -import { RichText } from '@wordpress/editor'; /** * Internal dependencies From 56cc17250d8a31ab9a5d6fb4a7bc394c39942705 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Tue, 12 Mar 2019 15:19:03 +0300 Subject: [PATCH 4/5] Remove unused import in css file --- .../src/components/default-block-appender/style.native.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/editor/src/components/default-block-appender/style.native.scss b/packages/editor/src/components/default-block-appender/style.native.scss index 00c1b2d649fc66..d2b8753111990f 100644 --- a/packages/editor/src/components/default-block-appender/style.native.scss +++ b/packages/editor/src/components/default-block-appender/style.native.scss @@ -1,8 +1,5 @@ // @format -@import "variables.scss"; -@import "colors.scss"; - .blockHolder { flex: 1 1 auto; } From 8786d8b828eb17781958b58e5a8190f7da54a39d Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Tue, 12 Mar 2019 15:22:56 +0300 Subject: [PATCH 5/5] Remove extra container view --- .../components/default-block-appender/index.native.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/editor/src/components/default-block-appender/index.native.js b/packages/editor/src/components/default-block-appender/index.native.js index 3f2ddd600207f2..3b1ec907898854 100644 --- a/packages/editor/src/components/default-block-appender/index.native.js +++ b/packages/editor/src/components/default-block-appender/index.native.js @@ -34,12 +34,10 @@ export function DefaultBlockAppender( { - - - - + + );