remove debugging code & make color picker check for themes in config

kitconcept · Nov 14, 2024 · 2879abe · 2879abe
1 parent 13b2b14
commit 2879abe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/volto-light-theme/src/components/Widgets/ColorPickerWidget.tsx b/packages/volto-light-theme/src/components/Widgets/ColorPickerWidget.tsx
@@ -1,6 +1,7 @@
 import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
 import { Button } from '@plone/components';
 import cx from 'classnames';
+import config from '@plone/volto/registry';
 
 type Color =
   | {
@@ -29,7 +30,7 @@ export type ColorPickerWidgetProps = {
 
 const ColorPickerWidget = (props: ColorPickerWidgetProps) => {
   const { id, value, onChange } = props;
-  const colors = props.themes || props.colors || [];
+  const colors = config.blocks.themes || props.themes || props.colors || [];
 
   return colors.length > 0 ? (
     <FormFieldWrapper {...props} className="theme-picker-widget">

diff --git a/...-light-theme/src/customizations/volto/components/manage/Blocks/Block/EditBlockWrapper.jsx b/...-light-theme/src/customizations/volto/components/manage/Blocks/Block/EditBlockWrapper.jsx
@@ -15,6 +15,7 @@ import {
   getBlocksFieldname,
   blockHasValue,
   buildStyleClassNamesFromData,
+  findStyleByName,
   buildStyleClassNamesExtenders,
 } from '@plone/volto/helpers/Blocks/Blocks';
 import dragSVG from '@plone/volto/icons/drag.svg';
@@ -80,12 +81,11 @@ const EditBlockWrapper = (props) => {
     classNames,
   });
 
-  // // START CUSTOMIZATION
-  // const style = data.theme
-  //   ? findStyleByName(config.blocks.themes, data.theme)
-  //   : findStyleByName(config.blocks.themes, config.blocks.themes[0].name);
-  // // END CUSTOMIZATION
-  const style = {};
+  // START CUSTOMIZATION
+  const style = data.theme
+    ? findStyleByName(config.blocks.themes, data.theme)
+    : findStyleByName(config.blocks.themes, config.blocks.themes[0].name);
+  // END CUSTOMIZATION
 
   // We need to merge the StyleWrapper styles with the draggable props from b-D&D
   const styleMergedWithDragProps = {