Merge pull request #35 from eea/develop

Fix project built due to running react in the index file
eea · Jul 31, 2022 · c9a1b92 · c9a1b92
2 parents 6eaac71 + 44c37e9
commit c9a1b92
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [0.6.5](https://github.com/eea/volto-block-image-cards/compare/0.6.4...0.6.5)
+
+- removed debug header [`b37bc34`](https://github.com/eea/volto-block-image-cards/commit/b37bc34d792bba4f901caac1cde18091d7b01765)
+- fix view and edit views by passing the props also to the style wrapper [`0c9222a`](https://github.com/eea/volto-block-image-cards/commit/0c9222abfcd3087a2a4fa241431a2284bf8c2b7e)
+- eslint fix [`82284dc`](https://github.com/eea/volto-block-image-cards/commit/82284dc46aa0a0630e6722b643e800d47dd24e37)
+- change(view): wrap views in their files avoiding parse error for other projects [`dddcf21`](https://github.com/eea/volto-block-image-cards/commit/dddcf21cebf019ceb5ef39c940bc482adf067917)
+
 #### [0.6.4](https://github.com/eea/volto-block-image-cards/compare/0.6.3...0.6.4)
 
+> 30 June 2022
+
+- develop [`#34`](https://github.com/eea/volto-block-image-cards/pull/34)
 
 #### [0.6.3](https://github.com/eea/volto-block-image-cards/compare/0.6.2...0.6.3)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-block-image-cards",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "volto-block-image-cards: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/ImageCards/ImageCardsEdit.jsx b/src/ImageCards/ImageCardsEdit.jsx
@@ -6,6 +6,8 @@ import config from '@plone/volto/registry';
 import ImageCardsView from './ImageCardsView';
 import ImageCardSchema from './schema';
 
+import { BlockStyleWrapperEdit } from '@eeacms/volto-block-style/BlockStyleWrapper';
+
 const tweakSchema = (schema, data) => {
   const { blockRenderers } = config.blocks.blocksConfig.imagecards;
   const extension = data.display
@@ -14,7 +16,7 @@ const tweakSchema = (schema, data) => {
   return extension ? extension(schema, data) : schema;
 };
 
-const ImageCardsEdit = (props) => {
+const CardsEdit = (props) => {
   const { selected, onChangeBlock, data = {}, block } = props;
   const basicSchema = ImageCardSchema(props);
   const schema = tweakSchema(basicSchema, props.data, props.intl);
@@ -41,4 +43,12 @@ const ImageCardsEdit = (props) => {
   );
 };
 
+const ImageCardsEdit = (props) => {
+  return (
+    <BlockStyleWrapperEdit {...props}>
+      <CardsEdit {...props} />
+    </BlockStyleWrapperEdit>
+  );
+};
+
 export default ImageCardsEdit;
diff --git a/src/ImageCards/ImageCardsView.jsx b/src/ImageCards/ImageCardsView.jsx
@@ -1,7 +1,9 @@
 import React from 'react';
 import config from '@plone/volto/registry';
 
-const ImageCardView = (props) => {
+import { BlockStyleWrapperView } from '@eeacms/volto-block-style/BlockStyleWrapper';
+
+const CardsView = (props) => {
   const byDisplayType = {};
   const blockRenderers = config.blocks.blocksConfig.imagecards.blockRenderers;
   const block_renderers_ids = Object.keys(blockRenderers);
@@ -13,4 +15,12 @@ const ImageCardView = (props) => {
   return Impl ? <Impl {...props} /> : '';
 };
 
-export default ImageCardView;
+const ImageCardsView = (props) => {
+  return (
+    <BlockStyleWrapperView {...props}>
+      <CardsView {...props} />
+    </BlockStyleWrapperView>
+  );
+};
+
+export default ImageCardsView;
diff --git a/src/index.js b/src/index.js
@@ -1,10 +1,5 @@
 import iconSVG from '@plone/volto/icons/images.svg';
-import React from 'react';
 import { ImageCardsView, ImageCardsEdit } from './ImageCards';
-import {
-  BlockStyleWrapperEdit,
-  BlockStyleWrapperView,
-} from '@eeacms/volto-block-style/BlockStyleWrapper';
 import {
   Cards,
   Carousel,
@@ -18,16 +13,8 @@ export default (config) => {
     title: 'Image Cards',
     icon: iconSVG,
     group: 'common',
-    view: (props) => (
-      <BlockStyleWrapperView {...props}>
-        <ImageCardsView {...props} />
-      </BlockStyleWrapperView>
-    ),
-    edit: (props) => (
-      <BlockStyleWrapperEdit {...props}>
-        <ImageCardsEdit {...props} />
-      </BlockStyleWrapperEdit>
-    ),
+    view: ImageCardsView,
+    edit: ImageCardsEdit,
     restricted: false,
     mostUsed: false,
     sidebarTab: 1,