move title to one level up in the panel layout

eea · Nov 24, 2020 · 0eb32d3 · 0eb32d3
1 parent 7dca60c
commit 0eb32d3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/src/components/manage/Blocks/Accordion/AccordionEdit.jsx b/src/components/manage/Blocks/Accordion/AccordionEdit.jsx
@@ -54,7 +54,7 @@ export default ({
                 className="input-accordion-title"
                 transparent
                 placeholder="Enter Title"
-                value={column?.blocks_layout?.title}
+                value={column?.title}
                 onClick={(e) => e.stopPropagation()}
                 onChange={(e) => handleTitleChange(e, [colId, column])}
               />

diff --git a/src/components/manage/Blocks/Accordion/Edit.jsx b/src/components/manage/Blocks/Accordion/Edit.jsx
@@ -41,10 +41,7 @@ const Edit = (props) => {
     const [colId, column] = value;
     const modifiedBlock = {
       ...column,
-      blocks_layout: {
-        ...column.blocks_layout,
-        title: e.target.value,
-      },
+      title: e.target.value,
     };
     onChangeBlock(block, {
       ...data,

diff --git a/src/components/manage/Blocks/Accordion/View.jsx b/src/components/manage/Blocks/Accordion/View.jsx
@@ -55,7 +55,7 @@ const View = (props) => {
                     />
                   )}
                   <p {...applyTitleSize(props?.data?.title_size || {})}>
-                    {column?.blocks_layout?.title}
+                    {column?.title}
                   </p>
                 </div>
               </Accordion.Title>

diff --git a/src/components/manage/Blocks/Accordion/util.js b/src/components/manage/Blocks/Accordion/util.js
@@ -39,11 +39,7 @@ export const AccordionblockHasValue = (content) => {
     const blockData = content[blocksFieldname]?.[block];
     return blockHasValue(blockData);
   });
-  if (
-    content[blocksLayoutFieldname].hasOwnProperty('title') &&
-    content[blocksLayoutFieldname]?.title.length > 0
-  )
-    return true;
+  if (content.hasOwnProperty('title') && content?.title.length > 0) return true;
   return blockValue.some((item) => item === true);
 };