Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix block appender placeholder not matching the paragraph placeholder issue #732

Merged
merged 8 commits into from
Mar 12, 2019
Merged

Fix block appender placeholder not matching the paragraph placeholder issue #732

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f6f0c37
Fix placeholder position of block appender
pinarol Mar 11, 2019
ff4e7d0
Fix lint issue
pinarol Mar 11, 2019
3ea14a9
Update gutenberg ref
pinarol Mar 12, 2019
fcd279e
Update gutenberg ref
pinarol Mar 12, 2019
deb2ce6
Update gutenberg ref
pinarol Mar 12, 2019
32d7ef0
Update gutenberg ref
pinarol Mar 12, 2019
4f56318
Update gutenberg repo to show rnmobile/develop
pinarol Mar 12, 2019
f454f3c
Merge branch 'develop' into issues/637-placeholder-match
pinarol Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gutenberg
Open in desktop
Submodule gutenberg updated 2 files
+7 −11 packages/editor/src/components/default-block-appender/index.native.js
+0 −16 packages/editor/src/components/default-block-appender/style.native.scss
10 changes: 9 additions & 1 deletion src/block-management/block-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { Text, View, Keyboard, LayoutChangeEvent, SafeAreaView, Dimensions } fro
import BlockHolder from './block-holder';
import type { BlockType } from '../store/types';
import styles from './block-manager.scss';
import blockHolderStyles from './block-holder.scss';
import inlineToolbarStyles from './inline-toolbar/style.scss';
import toolbarStyles from './block-toolbar.scss';
import BlockPicker from './block-picker';
Expand Down Expand Up @@ -182,7 +183,14 @@ export class BlockManager extends React.Component<PropsType, StateType> {

renderDefaultBlockAppender() {
return (
<DefaultBlockAppender rootClientId={ this.props.rootClientId } />
<DefaultBlockAppender
rootClientId={ this.props.rootClientId }
containerStyle={ [
blockHolderStyles.blockContainerFocused,
this.blockHolderBorderStyle(),
{ borderColor: 'transparent' },
] }
/>
);
}

Expand Down