add condtional for columns block

eea · Nov 7, 2020 · 72d849d · 72d849d
1 parent eca7c7e
commit 72d849d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/src/components/manage/Blocks/Accordion/AccordionEdit.jsx b/src/components/manage/Blocks/Accordion/AccordionEdit.jsx
@@ -4,7 +4,7 @@ import { Icon } from '@plone/volto/components';
 import upSVG from '@plone/volto/icons/up-key.svg';
 import downSVG from '@plone/volto/icons/down-key.svg';
 import AnimateHeight from 'react-animate-height';
-export default ({ children, isEditForm }) => {
+export default ({ children }) => {
   const [activeIndex, setActiveIndex] = React.useState(0);
 
   function handleClick(e, titleProps) {
@@ -16,7 +16,7 @@ export default ({ children, isEditForm }) => {
 
   return (
     <div>
-      <Accordion fluid styled={!isEditForm}>
+      <Accordion fluid styled>
         <React.Fragment>
           <Accordion.Title
             active={activeIndex === 0}

diff --git a/src/components/manage/Blocks/Accordion/Edit.jsx b/src/components/manage/Blocks/Accordion/Edit.jsx
@@ -9,7 +9,15 @@ import { options } from './layout';
 import './editor.less';
 
 const Edit = (props) => {
-  const { block, data, onChangeBlock, pathname, selected, manage } = props;
+  const {
+    block,
+    data,
+    onChangeBlock,
+    pathname,
+    selected,
+    manage,
+    data: { display },
+  } = props;
 
   const metadata = props.metadata || props.properties;
   const properties = isEmpty(data?.data?.blocks)
@@ -31,7 +39,18 @@ const Edit = (props) => {
 
   return (
     <section className="section-block">
-      {Object.keys(data).length === 1 ? (
+      {!display && Object.keys(data).length === 1 ? (
+        <Layout
+          variants={options}
+          data={data}
+          onChange={(initialData) => {
+            onChangeBlock(block, {
+              ...data,
+              ...createPanes(initialData),
+            });
+          }}
+        />
+      ) : display && Object.keys(data).length === 2 ? (
         <Layout
           variants={options}
           data={data}
@@ -45,7 +64,7 @@ const Edit = (props) => {
       ) : (
         <div>
           {columnList.map(([colId, column], index) => (
-            <AccordionEdit isEditForm={pathname.includes('edit')}>
+            <AccordionEdit>
               <BlocksForm
                 key={colId}
                 metadata={metadata}