From 8be6df24b3c1abafbdee5a62ea3620cc4027d908 Mon Sep 17 00:00:00 2001
From: cyril lopez <cyril.lpz@gmail.com>
Date: Fri, 23 Mar 2018 17:11:10 +0100
Subject: [PATCH] Fix PR feedback

---
 .../lib/src/components/ImgPreview/index.js           |  1 -
 .../lib/src/components/Wysiwyg/styles.scss           | 12 ++++++++----
 .../lib/src/components/WysiwygDropUpload/index.js    |  5 +----
 .../admin/src/containers/EditPage/index.js           |  2 --
 .../admin/src/containers/EditPage/saga.js            |  9 ++++-----
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/packages/strapi-helper-plugin/lib/src/components/ImgPreview/index.js b/packages/strapi-helper-plugin/lib/src/components/ImgPreview/index.js
index 0bcc242e08..24dd9d5178 100644
--- a/packages/strapi-helper-plugin/lib/src/components/ImgPreview/index.js
+++ b/packages/strapi-helper-plugin/lib/src/components/ImgPreview/index.js
@@ -136,7 +136,6 @@ class ImgPreview extends React.Component {
   isPictureType = (fileName) => /\.(jpe?g|png|gif)$/i.test(fileName);
 
   updateFilePosition = (newPosition) => {
-    // this.setState({ position: newPosition });
     this.props.updateFilePosition(newPosition);
   }
 
diff --git a/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/styles.scss b/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/styles.scss
index 065eeb4861..f748f607e9 100644
--- a/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/styles.scss
+++ b/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/styles.scss
@@ -23,19 +23,20 @@
 
 .editor {
   min-height: 303px;
-  padding: 0px 10px 0 10px;
+  padding: 10px 20px 0 20px;
   font-size: 16px;
   margin-top: 10px;
   background-color: #fff;
   line-height: 18px !important;
   cursor: text;
+  // TODO define rules for header's margin
   h1, h2, h3, h4, h5, h6 {
     margin: 0;
     line-height: 18px !important;
   }
   h1 {
-    margin-top: -3px !important;
-    margin-bottom: 3px;
+    margin-top: 13px !important;
+    margin-bottom: 22px;
   }
   > div {
     > div {
@@ -50,6 +51,9 @@
   ul, ol {
     margin-bottom: 18px;
   }
+  span {
+    white-space: pre-line;
+  }
 }
 
 .editorFocus {
@@ -165,7 +169,7 @@
 
 .fullscreenPreviewEditor {
   margin-top: 9px;
-  padding: 0px 8px;
+  padding: 10px 20px;
 }
 
 .toggleModeButton {
diff --git a/packages/strapi-helper-plugin/lib/src/components/WysiwygDropUpload/index.js b/packages/strapi-helper-plugin/lib/src/components/WysiwygDropUpload/index.js
index 1babfcb9ce..e7abcec3c9 100644
--- a/packages/strapi-helper-plugin/lib/src/components/WysiwygDropUpload/index.js
+++ b/packages/strapi-helper-plugin/lib/src/components/WysiwygDropUpload/index.js
@@ -5,13 +5,10 @@
  */
 
 import React from 'react';
-/* eslint-disable jsx-a11y/label-has-for */
-// import PropTypes from 'prop-types';
-
 import styles from './styles.scss';
 
+/* eslint-disable jsx-a11y/label-has-for */
 const WysiwygDropUpload = (props) => {
-  // console.log(props);
   return (
     <label
       {...props}
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/EditPage/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/EditPage/index.js
index 9903d408ef..f77a73e9f5 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/EditPage/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/EditPage/index.js
@@ -171,8 +171,6 @@ export class EditPage extends React.Component {
     this.props.setFormErrors(formErrors);
   }
 
-  // layout = bindLayout.call(this, layout);
-
   componentDidCatch(error, info) {
     console.log('err', error);
     console.log('info', info);
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/EditPage/saga.js b/packages/strapi-plugin-content-manager/admin/src/containers/EditPage/saga.js
index d6d648579b..b68f1747f9 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/EditPage/saga.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/EditPage/saga.js
@@ -36,14 +36,13 @@ function* dataGet(action) {
   try {
     const modelName = yield select(makeSelectModelName());
     const params = { source: action.source };
-    const response = yield [
+    const [response, layout] = yield [
       call(request, `/content-manager/explorer/${modelName}/${action.id}`, { method: 'GET', params }),
       call(request, '/content-manager/layout', { method: 'GET', params }),
     ];
-
-    const pluginHeaderTitle = yield call(templateObject, { mainField: action.mainField }, response[0]);
-    yield put(getDataSucceeded(action.id, response[0], pluginHeaderTitle.mainField));
-    yield put(getLayoutSucceeded(response[1]));
+    const pluginHeaderTitle = yield call(templateObject, { mainField: action.mainField }, response);
+    yield put(getDataSucceeded(action.id, response, pluginHeaderTitle.mainField));
+    yield put(getLayoutSucceeded(layout));
   } catch(err) {
     strapi.notification.error('content-manager.error.record.fetch');
   }