decorate, stlying edit,View

eea · Nov 23, 2020 · dc521e5 · dc521e5
1 parent ba33d9a
commit dc521e5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 32 deletions.
diff --git a/src/components/manage/Blocks/Accordion/AccordionEdit.jsx b/src/components/manage/Blocks/Accordion/AccordionEdit.jsx
@@ -39,7 +39,7 @@ export default ({
           >
             <div
               className={cx('align-arrow-left', {
-                'align-arrow-right': data.arrow_select,
+                'align-arrow-right': data?.data?.blocks?.settings?.arrow_select,
               })}
             >
               {activeIndex === 0 ? (

diff --git a/src/components/manage/Blocks/Accordion/Schema.js b/src/components/manage/Blocks/Accordion/Schema.js
@@ -98,7 +98,7 @@ export const accordionBlockSchema = () => ({
     {
       id: 'default',
       title: 'Default',
-      fields: ['data', 'arrow_select'], //  'nrColumns', 'block_title'
+      fields: ['data'], //  'nrColumns', 'block_title'
     },
   ],
   properties: {
@@ -111,10 +111,6 @@ export const accordionBlockSchema = () => ({
       type: 'panels',
       schema: AccordionSchema,
     },
-    arrow_select: {
-      title: 'Align arrow to right',
-      type: 'boolean',
-    },
   },
   required: ['title'],
 });

diff --git a/src/components/manage/Blocks/Accordion/View.jsx b/src/components/manage/Blocks/Accordion/View.jsx
@@ -2,7 +2,10 @@ import React from 'react';
 import { RenderBlocks } from '@eeacms/volto-blocks-form/components';
 import { getColumns, GroupblockHasValue } from './util';
 import { Accordion } from 'semantic-ui-react';
-import { applyBgColor } from '@eeacms/volto-accordion-block/components/manage/Styles';
+import {
+  applyBgColor,
+  applyTitleSize,
+} from '@eeacms/volto-accordion-block/components/manage/Styles';
 
 import cx from 'classnames';
 import { Icon } from '@plone/volto/components';
@@ -39,15 +42,17 @@ const View = (props) => {
               >
                 <div
                   className={cx('align-arrow-left', {
-                    'align-arrow-right': props.data.arrow_select,
+                    'align-arrow-right': data?.blocks?.settings?.arrow_select,
                   })}
                 >
                   {activeIndex === index ? (
                     <Icon name={downSVG} size="20px" />
                   ) : (
                     <Icon name={rightSVG} size="20px" />
                   )}
-                  <p>{column?.blocks?.acc_title}</p>
+                  <p {...applyTitleSize(data?.blocks?.settings || {})}>
+                    {column?.blocks?.acc_title}
+                  </p>
                 </div>
               </Accordion.Title>
               <div>

diff --git a/src/components/manage/Styles/schema.js b/src/components/manage/Styles/schema.js
@@ -4,7 +4,7 @@ export const StyleSchema = () => ({
     {
       id: 'default',
       title: 'Style',
-      fields: ['backgroundColor', 'title_size'],
+      fields: ['backgroundColor', 'title_size', 'arrow_select'],
     },
   ],
   properties: {
@@ -27,28 +27,11 @@ export const StyleSchema = () => ({
         ['xxx-large', 'xxx-large'],
       ],
     },
-  },
-  required: [],
-});
-
-export const TextSettingsSchema = {
-  title: 'Text settings',
-  fieldsets: [
-    {
-      id: 'text_settings',
-      title: 'Text settings',
-      fields: ['grid_column_align_text', 'grid_column_text_color'],
-    },
-  ],
-  properties: {
-    grid_column_align_text: {
-      title: 'Text align',
-      widget: 'align',
-    },
-    grid_column_text_color: {
-      title: 'Text color',
-      widget: 'color_picker',
+    arrow_select: {
+      title: 'Toggle arrows',
+      type: 'boolean',
+      default: false,
     },
   },
   required: [],
-};
+});