remove colorPicker Widget

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

Hide file tree

Showing 8 changed files with 8 additions and 127 deletions.
diff --git a/src/components/index.js b/src/components/index.js
@@ -2,6 +2,5 @@ export AccordionBlockEdit from './manage/Blocks/Accordion/Edit';
 export AccordionBlockView from './manage/Blocks/Accordion/View';
 export AccordionBlockSchema from './manage/Blocks/Accordion/Schema';
 export PanelWidget from './manage/Widgets/PanelWidget';
-export ColorPickerWidget from './manage/Widgets/ColorPickerWidget';
 
 export { options } from './manage/Blocks/Accordion/panels';
diff --git a/src/components/manage/Blocks/Accordion/AccordionEdit.jsx b/src/components/manage/Blocks/Accordion/AccordionEdit.jsx
@@ -1,10 +1,7 @@
 import React from 'react';
 import { Accordion, Input } from 'semantic-ui-react';
 
-import {
-  applyBgColor,
-  applyTitleSize,
-} from '@eeacms/volto-accordion-block/components/manage/Styles';
+import { applyTitleSize } from '@eeacms/volto-accordion-block/components/manage/Styles';
 import cx from 'classnames';
 import { Icon } from '@plone/volto/components';
 import rightSVG from '@plone/volto/icons/right-key.svg';
@@ -61,10 +58,7 @@ export default ({
           </Accordion.Title>
           <div>
             <Accordion.Content active={activeIndex === 0}>
-              <div
-                style={{ margin: '1em' }}
-                {...applyBgColor(data?.data?.blocks?.settings || {})}
-              >
+              <div style={{ margin: '1em' }}>
                 <AnimateHeight
                   animateOpacity
                   duration={500}

diff --git a/src/components/manage/Blocks/Accordion/Edit.jsx b/src/components/manage/Blocks/Accordion/Edit.jsx
@@ -12,7 +12,7 @@ import Panels from './Panels.jsx';
 import { empty, getColumns } from './util';
 import { options } from './panels';
 import { blocks } from '~/config';
-import { makeStyleSchema } from '@eeacms/volto-accordion-block/components/manage/Styles';
+import { StyleSchema } from '@eeacms/volto-accordion-block/components/manage/Styles/schema';
 import './editor.less';
 import upSVG from '@plone/volto/icons/up.svg';
 import tuneSVG from '@plone/volto/icons/tune.svg';
@@ -78,8 +78,6 @@ const Edit = (props) => {
       },
     });
   };
-  const { available_colors } = blocks.blocksConfig['accordion'];
-  const AccodionStyleSchema = makeStyleSchema({ available_colors });
 
   return (
     <section className="section-block">
@@ -201,7 +199,7 @@ const Edit = (props) => {
                 </Button>
               </Segment>
               <InlineForm
-                schema={AccodionStyleSchema}
+                schema={StyleSchema()}
                 title="Panels"
                 onChangeField={onChangeColumnSettings}
                 formData={data?.data?.blocks?.settings || {}}

diff --git a/src/components/manage/Blocks/Accordion/View.jsx b/src/components/manage/Blocks/Accordion/View.jsx
@@ -2,10 +2,7 @@ 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,
-  applyTitleSize,
-} from '@eeacms/volto-accordion-block/components/manage/Styles';
+import { applyTitleSize } from '@eeacms/volto-accordion-block/components/manage/Styles';
 
 import cx from 'classnames';
 import { Icon } from '@plone/volto/components';
@@ -57,7 +54,7 @@ const View = (props) => {
               </Accordion.Title>
               <div>
                 <Accordion.Content active={activeIndex === index}>
-                  <div {...applyBgColor(data?.blocks?.settings || {})}>
+                  <div>
                     <AnimateHeight
                       animateOpacity
                       duration={500}

diff --git a/src/components/manage/Styles/index.js b/src/components/manage/Styles/index.js
@@ -1,19 +1,3 @@
-import { StyleSchema } from './schema';
-
-export function makeStyleSchema({ available_colors }) {
-  const schema = StyleSchema();
-  schema.properties.backgroundColor.available_colors = available_colors;
-  return schema;
-}
-
-export function applyBgColor(props) {
-  return {
-    style: {
-      backgroundColor: props.backgroundColor,
-    },
-  };
-}
-
 export function applyTitleSize(props) {
   return {
     style: {

diff --git a/src/components/manage/Styles/schema.js b/src/components/manage/Styles/schema.js
@@ -4,15 +4,10 @@ export const StyleSchema = () => ({
     {
       id: 'default',
       title: 'Style',
-      fields: ['backgroundColor', 'title_size', 'arrow_select'],
+      fields: ['title_size', 'arrow_select'],
     },
   ],
   properties: {
-    backgroundColor: {
-      title: 'Background color',
-      type: 'color',
-      widget: 'color_picker',
-    },
     title_size: {
       title: 'Title size',
       description: 'Size of accordion Title in a Panel',

diff --git a/src/components/manage/Widgets/ColorPickerWidget.jsx b/src/components/manage/Widgets/ColorPickerWidget.jsx
diff --git a/src/index.js b/src/index.js
@@ -4,10 +4,7 @@ import {
   AccordionBlockView,
   AccordionBlockSchema,
 } from './components';
-import {
-  PanelWidget,
-  ColorPickerWidget,
-} from '@eeacms/volto-accordion-block/components';
+import { PanelWidget } from '@eeacms/volto-accordion-block/components';
 import { options } from '@eeacms/volto-accordion-block/components';
 
 const applyConfig = (config) => {
@@ -53,28 +50,8 @@ const applyConfig = (config) => {
       addPermission: [],
       view: [],
     },
-    available_colors: [
-      // '#B80000',
-      // '#DB3E00',
-      // '#FCCB00',
-      // '#008B02',
-      // '#006B76',
-      // '#1273DE',
-      // '#004DCF',
-      // '#5300EB',
-      '#EFEFEF',
-      '#EB9694',
-      '#FAD0C3',
-      '#FEF3BD',
-      '#C1E1C5',
-      '#BEDADC',
-      '#C4DEF6',
-      '#BED3F3',
-      '#D4C4FB',
-    ],
   };
   config.widgets.type.panels = PanelWidget;
-  config.widgets.widget.color_picker = ColorPickerWidget;
   return config;
 };