Merge d28eaab into d8cf5cd

CHANGELOG.md

@@ -30,6 +30,7 @@
 * Refactor actions and reducers to match restapi docs naming @robgietema
 * Fix site root api calls @robgietema
 * Change visual editor to use the new tiles api @robgietema
+* Fix bug with wrong order input @robgietema
 
 ## 0.5.0 (2018-03-23)
 

src/components/manage/Tiles/Description/Edit.jsx

@@ -79,6 +79,7 @@ export default class Edit extends Component {
    */
   componentWillReceiveProps(nextProps) {
     if (
+      nextProps.properties.description &&
       this.props.properties.description !== nextProps.properties.description &&
       !this.props.selected
     ) {

src/components/manage/Tiles/Text/Edit.jsx

@@ -25,6 +25,7 @@ import {
 } from 'draft-js-buttons';
 import createBlockStyleButton from 'draft-js-buttons/lib/utils/createBlockStyleButton';
 import createLinkPlugin from 'draft-js-anchor-plugin';
+import createBlockBreakoutPlugin from 'draft-js-block-breakout-plugin';
 import { defineMessages, injectIntl, intlShape } from 'react-intl';
 
 const messages = defineMessages({
@@ -50,6 +51,7 @@ const CalloutButton = createBlockStyleButton({
   children: <span>!</span>,
 });
 const linkPlugin = createLinkPlugin();
+const blockBreakoutPlugin = createBlockBreakoutPlugin();
 const inlineToolbarPlugin = createInlineToolbarPlugin({
   structure: [
     BoldButton,
@@ -179,7 +181,7 @@ export default class Edit extends Component {
         <Editor
           onChange={this.onChange}
           editorState={this.state.editorState}
-          plugins={[inlineToolbarPlugin, linkPlugin]}
+          plugins={[inlineToolbarPlugin, linkPlugin, blockBreakoutPlugin]}
           blockRenderMap={extendedBlockRenderMap}
           blockStyleFn={contentBlock => {
             const type = contentBlock.getType();

src/components/manage/Tiles/Title/Edit.jsx

@@ -79,6 +79,7 @@ export default class Edit extends Component {
    */
   componentWillReceiveProps(nextProps) {
     if (
+      nextProps.properties.title &&
       this.props.properties.title !== nextProps.properties.title &&
       !this.props.selected
     ) {

theme/themes/pastanaga/globals/site.overrides

@@ -35,9 +35,38 @@ body {
   outline-width: 1px;
 }
 
-.tile .public-DraftEditorPlaceholder-inner {
+.DraftEditor-editorContainer,
+.DraftEditor-root,
+.public-DraftEditor-content {
+  height: inherit;
+  text-align: initial;
+}
+
+.public-DraftEditor-content[contenteditable='true'] {
+  -webkit-user-modify: read-write-plaintext-only;
+}
+
+.DraftEditor-root {
+  position: relative;
+}
+
+.DraftEditor-editorContainer {
+  position: relative;
+  z-index: 1;
+}
+
+.public-DraftEditor-block {
+  position: relative;
+}
+
+.public-DraftEditorPlaceholder-root {
   position: absolute;
   color: #aaaaaa;
+  z-index: 1;
+}
+
+.DraftEditorPlaceholder-hidden {
+  display: none;
 }
 
 .tile.align.left {