2.12.1

prisma-cms · Sep 19, 2019 · 4d5d5e9 · 4d5d5e9
1 parent 9a7888c
commit 4d5d5e9
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 46 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,7 @@
+2.12.1
+=================================
+- Added ContentEditor::render_toolbar
+
 2.12.0
 =================================
 - Added EditableObject::create_as_a_child_of

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@prisma-cms/front-editor",
-  "version": "2.12.0",
+  "version": "2.12.1",
   "private": false,
   "main": "lib/App.js",
   "scripts": {

diff --git a/src/components/App/components/public/Connectors/Connector/ListView/Iterable/index.js b/src/components/App/components/public/Connectors/Connector/ListView/Iterable/index.js
@@ -1,10 +1,10 @@
-import React, { Component, Fragment, createContext } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 
 // import ViewIcon from "material-ui-icons/ViewModule";
 
 import EditorComponent from '../../../../..';
-import ListView from '..';
+// import ListView from '..';
 import DefaultValue from '../../Fields/NamedField/DefaultValue';
 
 
@@ -14,16 +14,17 @@ class Iterable extends EditorComponent {
   static Name = "Iterable"
 
   static propTypes = {
+    // eslint-disable-next-line react/forbid-foreign-prop-types
     ...EditorComponent.propTypes,
     items: PropTypes.array,
     ObjectContext: PropTypes.object,
   }
 
 
-  constructor(props) {
+  // constructor(props) {
 
-    super(props);
-  }
+  //   super(props);
+  // }
 
 
   renderPanelView(content) {

diff --git a/src/components/App/components/public/Connectors/Connector/ListView/index.js b/src/components/App/components/public/Connectors/Connector/ListView/index.js
@@ -1,5 +1,5 @@
-import React, { Component, Fragment, createContext, Children } from 'react';
-import PropTypes from 'prop-types';
+import React, { createContext } from 'react';
+// import PropTypes from 'prop-types';
 
 import ViewIcon from "material-ui-icons/ViewModule";
 import Connector, { ConnectorContext } from '..';
@@ -100,17 +100,17 @@ class ListView extends EditorComponent {
 
   renderChildren() {
 
-    const {
-      style,
-      ...other
-      // } = this.getRenderProps();
-    } = this.getComponentProps(this);
+    // const {
+    //   style,
+    //   ...other
+    //   // } = this.getRenderProps();
+    // } = this.getComponentProps(this);
 
 
 
-    const {
-      Grid,
-    } = this.context;
+    // const {
+    //   Grid,
+    // } = this.context;
 
 
 
@@ -146,8 +146,8 @@ class ListView extends EditorComponent {
         Так как в некоторых случаях нам надо вывести полученные данные без лишних оберток,
         проверяем является ли дочерний элемент производным от Iterable.
         Если является таковым, то рендерим в него все полученные объекты
+        if (children.length === 1 && children[0].__proto__.isPrototypeOf(Iterable))
          */
-        {/* if (children.length === 1 && children[0].__proto__.isPrototypeOf(Iterable)) { */ }
         if (children.length === 1 && children[0]
           && (
             Iterable.isPrototypeOf(children[0].type)
@@ -199,15 +199,6 @@ class ListView extends EditorComponent {
             output = children.filter(n => n && n.type === DefaultValue);
           }
 
-
-          {/* output = <Grid
-            container
-            {...other}
-          >
-
-            {}
-
-          </Grid>; */}
         }
 
         return output;

diff --git a/src/components/App/components/public/ContentEditor/index.js b/src/components/App/components/public/ContentEditor/index.js
@@ -4,7 +4,6 @@ import PropTypes from "prop-types";
 
 import { HtmlTag } from '../Tag';
 import EditorComponent from '../..';
-import EditableObject from '../form/EditableObject';
 
 import withStyles from 'material-ui/styles/withStyles';
 import IconButton from 'material-ui/IconButton';
@@ -424,6 +423,7 @@ export class TagEditor extends HtmlTag {
 
     const {
       classes,
+      render_toolbar,
     } = this.props;
 
     const buttons = this.getToolbarButtons();
@@ -432,7 +432,7 @@ export class TagEditor extends HtmlTag {
       return null;
     }
 
-    return <div
+    return render_toolbar ? <div
       className={classes.toolbar}
     >
       <Grid
@@ -443,7 +443,7 @@ export class TagEditor extends HtmlTag {
         {this.renderToolbarButtons(buttons)}
 
       </Grid>
-    </div>
+    </div> : null
 
   }
 
@@ -652,6 +652,7 @@ export class ContentEditor extends EditorComponent {
       components: PropTypes.array.isRequired,
     })),
     TagEditor: PropTypes.func.isRequired,
+    render_toolbar: PropTypes.bool.isRequired,
   }
 
   static defaultProps = {
@@ -684,6 +685,8 @@ export class ContentEditor extends EditorComponent {
     }],
 
     TagEditor,
+    hide_wrapper_in_default_mode: true,
+    render_toolbar: true,
   }
 
 
@@ -719,10 +722,10 @@ export class ContentEditor extends EditorComponent {
   }
 
 
-  canBeParent(parent) {
+  // canBeParent(parent) {
 
-    return super.canBeParent(parent) && this.findInParent(parent, parent => parent instanceof EditableObject);
-  }
+  //   return super.canBeParent(parent) && this.findInParent(parent, parent => parent instanceof EditableObject);
+  // }
 
 
   canBeChild(child) {
@@ -757,6 +760,7 @@ export class ContentEditor extends EditorComponent {
       initialContent,
       read_only,
       TagEditor,
+      render_toolbar,
     } = this.getComponentProps(this);
 
 
@@ -767,20 +771,25 @@ export class ContentEditor extends EditorComponent {
 
     const editable = inEditMode && !read_only ? true : false;
 
-    return <ContentProxyStyled
-      key={editable.toString()}
-      updateObject={(data) => {
-
-        // console.log("components", components);
-
-        this.updateObject(data);
-
-      }}
-      components={components}
-      editable={editable}
-      initialContent={initialContent}
-      TagEditor={TagEditor}
-    />;
+    return editable
+      ?
+      <ContentProxyStyled
+        key={editable.toString()}
+        updateObject={(data) => {
+
+          // console.log("components", components);
+
+          this.updateObject(data);
+
+        }}
+        components={components}
+        editable={editable}
+        initialContent={initialContent}
+        TagEditor={TagEditor}
+        render_toolbar={render_toolbar}
+      />
+      :
+      super.renderChildren();
   }
 
 }