@eeacms/volto-eea-website-theme 2.4.0 → 3.1.0

package/CHANGELOG.md

@@ -4,6 +4,24 @@ 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).
 
+### [3.1.0](https://github.com/eea/volto-eea-website-theme/compare/3.0.0...3.1.0) - 5 November 2024
+
+#### :hammer_and_wrench: Others
+
+- fix Grid conversion, ref #278618 [Miu Razvan - [`f80b786`](https://github.com/eea/volto-eea-website-theme/commit/f80b7869b4ac060bf35250cf5045ab930a0003de)]
+## [3.0.0](https://github.com/eea/volto-eea-website-theme/compare/2.4.0...3.0.0) - 21 October 2024
+
+#### :nail_care: Enhancements
+
+- refactor: Require Volto 17.20.0+ - Move Volto Core customizations from our add-ons to Volto Core - refs #277684 [Teodor Voicu - [`cece189`](https://github.com/eea/volto-eea-website-theme/commit/cece189b8fedd7a5107ce22c9e2c8536a38e772c)]
+
+#### :house: Internal changes
+
+- chore: package.json [alin - [`7c6e23b`](https://github.com/eea/volto-eea-website-theme/commit/7c6e23bad1c69aa81185c2bceb2bf1797d202dc5)]
+
+#### :hammer_and_wrench: Others
+
+- Breaking release 3.0.0 [alin - [`02e9f64`](https://github.com/eea/volto-eea-website-theme/commit/02e9f6452e147108bc7340d28f82c0a7b015b57d)]
 ### [2.4.0](https://github.com/eea/volto-eea-website-theme/compare/2.3.0...2.4.0) - 11 October 2024
 
 #### :bug: Bug Fixes

package/README.md

@@ -16,6 +16,12 @@
 
 EEA Website [Volto](https://github.com/plone/volto) Theme
 
+## Upgrade
+
+### Upgrading to 3.x.x
+
+* This version removes some Volto customizations and it requires **Volto 17.20.0+**. See [CHANGELOG.md](https://github.com/eea/volto-eea-website-theme/blob/master/CHANGELOG.md)
+
 ## Demo
 
 - https://www.eea.europa.eu

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-theme",
-  "version": "2.4.0",
+  "version": "3.1.0",
   "description": "@eeacms/volto-eea-website-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -24,8 +24,8 @@
     "url": "git@github.com:eea/volto-eea-website-theme.git"
   },
   "dependencies": {
-    "@eeacms/volto-block-toc": "*",
     "@eeacms/volto-block-style": "*",
+    "@eeacms/volto-block-toc": "*",
     "@eeacms/volto-eea-design-system": "*",
     "@eeacms/volto-group-block": "*",
     "volto-subsites": "*"

package/src/customizations/volto/components/manage/Blocks/Grid/View.jsx

@@ -13,7 +13,7 @@ const convertTeaserToGridIfNecessaryAndTransformEmptyBlocksToSlate = (data) => {
       blocks: data?.columns?.reduce((acc, current) => {
         return {
           ...acc,
-          [current?.id]: { current, '@type': current['@type'] || 'slate' },
+          [current?.id]: { ...current, '@type': current['@type'] || 'slate' },
         };
       }, {}),
     };

package/src/customizations/volto/components/manage/Blocks/Block/BlocksForm.diff

@@ -1,12 +0,0 @@
-3c3
-< import EditBlock from './Edit';
----
-> import EditBlock from '@plone/volto/components/manage/Blocks/Block/Edit.jsx';
-20c20
-< import EditBlockWrapper from './EditBlockWrapper';
----
-> import EditBlockWrapper from '@plone/volto/components/manage/Blocks/Block/EditBlockWrapper.jsx';
-41a42
->     errors,
-261a263
->               errors,

package/src/customizations/volto/components/manage/Blocks/Block/BlocksForm.jsx

@@ -1,289 +0,0 @@
-import React from 'react';
-import { useIntl } from 'react-intl';
-import EditBlock from '@plone/volto/components/manage/Blocks/Block/Edit.jsx';
-import { DragDropList } from '@plone/volto/components';
-import {
-  getBlocks,
-  getBlocksFieldname,
-  applyBlockDefaults,
-} from '@plone/volto/helpers';
-import {
-  addBlock,
-  insertBlock,
-  changeBlock,
-  deleteBlock,
-  moveBlock,
-  mutateBlock,
-  nextBlockId,
-  previousBlockId,
-} from '@plone/volto/helpers';
-import EditBlockWrapper from '@plone/volto/components/manage/Blocks/Block/EditBlockWrapper.jsx';
-import { setSidebarTab } from '@plone/volto/actions';
-import { useDispatch } from 'react-redux';
-import { useDetectClickOutside, useEvent } from '@plone/volto/helpers';
-import config from '@plone/volto/registry';
-
-const BlocksForm = (props) => {
-  const {
-    pathname,
-    onChangeField,
-    properties,
-    type,
-    navRoot,
-    onChangeFormData,
-    selectedBlock,
-    multiSelected,
-    onSelectBlock,
-    allowedBlocks,
-    showRestricted,
-    title,
-    description,
-    metadata,
-    errors,
-    manage,
-    children,
-    isMainForm = true,
-    isContainer,
-    stopPropagation,
-    disableAddBlockOnEnterKey,
-    blocksConfig = config.blocks.blocksConfig,
-    editable = true,
-    direction = 'vertical',
-  } = props;
-
-  const blockList = getBlocks(properties);
-
-  const dispatch = useDispatch();
-  const intl = useIntl();
-
-  const ClickOutsideListener = () => {
-    onSelectBlock(null);
-    dispatch(setSidebarTab(0));
-  };
-
-  const ref = useDetectClickOutside({
-    onTriggered: ClickOutsideListener,
-    triggerKeys: ['Escape'],
-    // Disabled feature for now https://github.com/plone/volto/pull/2389#issuecomment-830027413
-    disableClick: true,
-    disableKeys: !isMainForm,
-  });
-
-  const handleKeyDown = (
-    e,
-    index,
-    block,
-    node,
-    {
-      disableEnter = false,
-      disableArrowUp = false,
-      disableArrowDown = false,
-    } = {},
-  ) => {
-    const isMultipleSelection = e.shiftKey;
-    if (e.key === 'ArrowUp' && !disableArrowUp) {
-      onFocusPreviousBlock(block, node, isMultipleSelection);
-      e.preventDefault();
-    }
-    if (e.key === 'ArrowDown' && !disableArrowDown) {
-      onFocusNextBlock(block, node, isMultipleSelection);
-      e.preventDefault();
-    }
-    if (e.key === 'Enter' && !disableEnter) {
-      if (!disableAddBlockOnEnterKey) {
-        onSelectBlock(onAddBlock(config.settings.defaultBlockType, index + 1));
-      }
-      e.preventDefault();
-    }
-  };
-
-  const onFocusPreviousBlock = (
-    currentBlock,
-    blockNode,
-    isMultipleSelection,
-  ) => {
-    const prev = previousBlockId(properties, currentBlock);
-    if (prev === null) return;
-
-    blockNode.blur();
-
-    onSelectBlock(prev, isMultipleSelection);
-  };
-
-  const onFocusNextBlock = (currentBlock, blockNode, isMultipleSelection) => {
-    const next = nextBlockId(properties, currentBlock);
-    if (next === null) return;
-
-    blockNode.blur();
-
-    onSelectBlock(next, isMultipleSelection);
-  };
-
-  const onMutateBlock = (id, value) => {
-    const newFormData = mutateBlock(properties, id, value);
-    onChangeFormData(newFormData);
-  };
-
-  const onInsertBlock = (id, value, current) => {
-    const [newId, newFormData] = insertBlock(
-      properties,
-      id,
-      value,
-      current,
-      config.experimental.addBlockButton.enabled ? 1 : 0,
-    );
-
-    const blocksFieldname = getBlocksFieldname(newFormData);
-    const blockData = newFormData[blocksFieldname][newId];
-    newFormData[blocksFieldname][newId] = applyBlockDefaults({
-      data: blockData,
-      intl,
-      metadata,
-      properties,
-    });
-
-    onChangeFormData(newFormData);
-    return newId;
-  };
-
-  const onAddBlock = (type, index) => {
-    if (editable) {
-      const [id, newFormData] = addBlock(properties, type, index);
-      const blocksFieldname = getBlocksFieldname(newFormData);
-      const blockData = newFormData[blocksFieldname][id];
-      newFormData[blocksFieldname][id] = applyBlockDefaults({
-        data: blockData,
-        intl,
-        metadata,
-        properties,
-      });
-      onChangeFormData(newFormData);
-      return id;
-    }
-  };
-
-  const onChangeBlock = (id, value) => {
-    const newFormData = changeBlock(properties, id, value);
-    onChangeFormData(newFormData);
-  };
-
-  const onDeleteBlock = (id, selectPrev) => {
-    const previous = previousBlockId(properties, id);
-
-    const newFormData = deleteBlock(properties, id);
-    onChangeFormData(newFormData);
-
-    onSelectBlock(selectPrev ? previous : null);
-  };
-
-  const onMoveBlock = (dragIndex, hoverIndex) => {
-    const newFormData = moveBlock(properties, dragIndex, hoverIndex);
-    onChangeFormData(newFormData);
-  };
-
-  const defaultBlockWrapper = ({ draginfo }, editBlock, blockProps) => (
-    <EditBlockWrapper draginfo={draginfo} blockProps={blockProps}>
-      {editBlock}
-    </EditBlockWrapper>
-  );
-
-  const editBlockWrapper = children || defaultBlockWrapper;
-
-  // Remove invalid blocks on saving
-  // Note they are alreaady filtered by DragDropList, but we also want them
-  // to be removed when the user saves the page next. Otherwise the invalid
-  // blocks would linger for ever.
-  for (const [n, v] of blockList) {
-    if (!v) {
-      const newFormData = deleteBlock(properties, n);
-      onChangeFormData(newFormData);
-    }
-  }
-
-  useEvent('voltoClickBelowContent', () => {
-    if (!config.experimental.addBlockButton.enabled || !isMainForm) return;
-    onSelectBlock(
-      onAddBlock(config.settings.defaultBlockType, blockList.length),
-    );
-  });
-
-  return (
-    <div
-      className="blocks-form"
-      role="presentation"
-      ref={ref}
-      onKeyDown={(e) => {
-        if (stopPropagation) {
-          e.stopPropagation();
-        }
-      }}
-    >
-      <fieldset className="invisible" disabled={!editable}>
-        <DragDropList
-          childList={blockList}
-          onMoveItem={(result) => {
-            const { source, destination } = result;
-            if (!destination) {
-              return;
-            }
-            const newFormData = moveBlock(
-              properties,
-              source.index,
-              destination.index,
-            );
-            onChangeFormData(newFormData);
-            return true;
-          }}
-          direction={direction}
-        >
-          {(dragProps) => {
-            const { child, childId, index } = dragProps;
-            const blockProps = {
-              allowedBlocks,
-              showRestricted,
-              block: childId,
-              data: child,
-              handleKeyDown,
-              id: childId,
-              formTitle: title,
-              formDescription: description,
-              index,
-              manage,
-              onAddBlock,
-              onInsertBlock,
-              onChangeBlock,
-              onChangeField,
-              onChangeFormData,
-              onDeleteBlock,
-              onFocusNextBlock,
-              onFocusPreviousBlock,
-              onMoveBlock,
-              onMutateBlock,
-              onSelectBlock,
-              errors,
-              pathname,
-              metadata,
-              properties,
-              contentType: type,
-              navRoot,
-              blocksConfig,
-              selected: selectedBlock === childId,
-              multiSelected: multiSelected?.includes(childId),
-              type: child['@type'],
-              editable,
-              showBlockChooser: selectedBlock === childId,
-              detached: isContainer,
-            };
-            return editBlockWrapper(
-              dragProps,
-              <EditBlock key={childId} {...blockProps} />,
-              blockProps,
-            );
-          }}
-        </DragDropList>
-      </fieldset>
-    </div>
-  );
-};
-
-export default BlocksForm;

package/src/customizations/volto/components/manage/Blocks/Block/BlocksForm.txt

@@ -1,2 +0,0 @@
-Customize from @plone/volto 17.18.2 - refs https://taskman.eionet.europa.eu/issues/269086
-Should be safe to remove with @plone/volto 18.x - https://github.com/plone/volto/pull/6181