@eeacms/volto-group-block 6.1.2 → 6.2.1

package/CHANGELOG.md

@@ -4,6 +4,28 @@ 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).
 
+### [6.2.1](https://github.com/eea/volto-group-block/compare/6.2.0...6.2.1) - 18 August 2023
+
+#### :bug: Bug Fixes
+
+- fix: ignoreSpaces on char counter - refs #256525 [rexalex - [`8d1ad2c`](https://github.com/eea/volto-group-block/commit/8d1ad2cfdf972b88f02f9efc4b7ef55b1e4b3592)]
+
+#### :house: Documentation changes
+
+- docs: Cleanup Makefile, update DEVELOP documentation, i18n - refs #254894 [valentinab25 - [`94b58f7`](https://github.com/eea/volto-group-block/commit/94b58f7c0390bfcac24adbfbea61577137c91e2b)]
+
+#### :hammer_and_wrench: Others
+
+- test: increase test coverage - refs #254313 [ana-oprea - [`5facade`](https://github.com/eea/volto-group-block/commit/5facadec2f866a066ca836f8247a5e58ea44d176)]
+### [6.2.0](https://github.com/eea/volto-group-block/compare/6.1.2...6.2.0) - 20 July 2023
+
+#### :nail_care: Enhancements
+
+- refactor: char-count component refs #253801 [Nilesh - [`1a54719`](https://github.com/eea/volto-group-block/commit/1a54719af523663314190741417bb06142967f68)]
+
+#### :hammer_and_wrench: Others
+
+- Release 6.2.0 [Alin Voinea - [`e4e254d`](https://github.com/eea/volto-group-block/commit/e4e254da4c109ee1c8c8a9ce42821eeabfae06ef)]
 ### [6.1.2](https://github.com/eea/volto-group-block/compare/6.1.1...6.1.2) - 12 June 2023
 
 #### :house: Internal changes

package/DEVELOP.md

@@ -2,6 +2,28 @@
 
 ## Develop
 
+1. Make sure you have `docker` and `docker compose` installed and running on your machine:
+
+    ```Bash
+    git clone https://github.com/eea/volto-group-block.git
+    cd volto-group-block
+    git checkout -b bugfix-123456 develop
+    make
+    make start
+    ```
+
+1. Wait for `Volto started at 0.0.0.0:3000` meesage
+
+1. Go to http://localhost:3000
+
+1.  Happy hacking!
+
+    ```Bash
+    cd src/addons/volto-group-block/
+    ```
+
+### Or add @eeacms/volto-group-block to your Volto project
+
 Before starting make sure your development environment is properly set. See [Volto Developer Documentation](https://docs.voltocms.com/getting-started/install/)
 
 1.  Make sure you have installed `yo`, `@plone/generator-volto` and `mrs-developer`
@@ -48,3 +70,37 @@ Before starting make sure your development environment is properly set. See [Vol
 1.  Happy hacking!
 
         cd src/addons/volto-group-block/
+
+## Cypress
+
+To run cypress locally, first make sure you don't have any Volto/Plone running on ports `8080` and `3000`.
+
+You don't have to be in a `clean-volto-project`, you can be in any Volto Frontend
+project where you added `volto-group-block` to `mrs.developer.json`
+
+Go to:
+
+  ```BASH
+  cd src/addons/volto-group-block/
+  ```
+
+Start:
+
+  ```Bash
+  make
+  make start
+  ```
+
+This will build and start with Docker a clean `Plone backend` and `Volto Frontend` with `volto-group-block` block installed.
+
+Open Cypress Interface:
+
+  ```Bash
+  make cypress-open
+  ```
+
+Or run it:
+
+  ```Bash
+  make cypress-run
+  ```

package/README.md

@@ -51,6 +51,10 @@
 
 1. Make sure you have a [Plone backend](https://plone.org/download) up-and-running at http://localhost:8080/Plone
 
+   ```Bash
+   docker compose up backend
+   ```
+
 1. Start Volto frontend
 
 - If you already have a volto project, just update `package.json`:

package/docker-compose.yml

@@ -0,0 +1,28 @@
+version: "3"
+services:
+  backend:
+    image: plone/plone-backend:${PLONE_VERSION:-6}
+    ports:
+      - "8080:8080"
+    environment:
+      SITE: "Plone"
+
+  frontend: 
+    build:
+      context: ./
+      dockerfile: ./Dockerfile
+      args:
+        ADDON_NAME: "${ADDON_NAME}"
+        ADDON_PATH: "${ADDON_PATH}"
+        VOLTO_VERSION: ${VOLTO_VERSION:-16}
+    ports:
+    - "3000:3000"
+    - "3001:3001"
+    depends_on:
+      - backend
+    volumes:
+      - ./:/app/src/addons/${ADDON_PATH}
+    environment:
+      RAZZLE_INTERNAL_API_PATH: "http://backend:8080/Plone"
+      RAZZLE_DEV_PROXY_API_PATH: "http://backend:8080/Plone"
+      HOST: "0.0.0.0"

package/locales/de/LC_MESSAGES/volto.po

@@ -0,0 +1,14 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language: \n"
+"Language-Team: \n"
+"Content-Type: \n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+

package/locales/it/LC_MESSAGES/volto.po

@@ -0,0 +1,14 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language: \n"
+"Language-Team: \n"
+"Content-Type: \n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+

package/locales/ro/LC_MESSAGES/volto.po

@@ -0,0 +1,14 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language: \n"
+"Language-Team: \n"
+"Content-Type: \n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+

package/locales/volto.pot

@@ -0,0 +1,16 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Plone\n"
+"POT-Creation-Date: 2023-06-28T10:48:22.678Z\n"
+"Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
+"Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Language-Code: en\n"
+"Language-Name: English\n"
+"Preferred-Encodings: utf-8\n"
+"Domain: volto\n"
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-group-block",
-  "version": "6.1.2",
+  "version": "6.2.1",
   "description": "volto-group-block: Volto block to be used to group other blocks",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/manage/Blocks/Group/CounterComponent.jsx

@@ -0,0 +1,91 @@
+import cx from 'classnames';
+import isString from 'lodash/isString';
+import isArray from 'lodash/isArray';
+import { Icon } from '@plone/volto/components';
+import config from '@plone/volto/registry';
+import { visitBlocks } from '@plone/volto/helpers/Blocks/Blocks';
+import { serializeNodesToText } from '@plone/volto-slate/editor/render';
+import delightedSVG from '@plone/volto/icons/delighted.svg';
+import dissatisfiedSVG from '@plone/volto/icons/dissatisfied.svg';
+
+const countCharsWithoutSpaces = (paragraph) => {
+  const regex = /[^\s\\]/g;
+  return (paragraph.match(regex) || []).length;
+};
+
+const countCharsWithSpaces = (paragraph) => {
+  return paragraph?.length || 0;
+};
+
+const countTextInEachBlock = (countTextIn, ignoreSpaces, groupCharCount) => ([
+  id,
+  blockData,
+]) => {
+  const foundText =
+    blockData && countTextIn?.includes(blockData?.['@type'])
+      ? isString(blockData?.plaintext)
+        ? blockData?.plaintext
+        : isArray(blockData?.value) && blockData?.value !== null
+        ? serializeNodesToText(blockData?.value)
+        : ''
+      : '';
+
+  groupCharCount.value += ignoreSpaces
+    ? countCharsWithoutSpaces(foundText)
+    : countCharsWithSpaces(foundText);
+};
+
+const countTextInBlocks = (blocksObject, ignoreSpaces, maxChars) => {
+  const { countTextIn } = config.blocks?.blocksConfig?.group;
+  // use obj ref to update value - if you send number it will not be updated
+  const groupCharCount = { value: 0 };
+
+  if (!maxChars || !blocksObject) {
+    return groupCharCount.value;
+  }
+
+  visitBlocks(
+    blocksObject,
+    countTextInEachBlock(countTextIn, ignoreSpaces, groupCharCount),
+  );
+
+  return groupCharCount.value;
+};
+
+const CounterComponent = ({ data, setSidebarTab, setSelectedBlock }) => {
+  const { maxChars, ignoreSpaces } = data;
+  const charCount = countTextInBlocks(data?.data, ignoreSpaces, maxChars);
+  const counterClass =
+    charCount < Math.ceil(maxChars / 1.05)
+      ? 'info'
+      : charCount < maxChars
+      ? 'warning'
+      : 'danger';
+
+  return (
+    <p
+      className={cx('counter', counterClass)}
+      onClick={() => {
+        setSelectedBlock();
+        setSidebarTab(1);
+      }}
+      aria-hidden="true"
+    >
+      {maxChars - charCount < 0 ? (
+        <>
+          <span>{`${charCount - maxChars} characters over the limit`}</span>
+          <Icon name={dissatisfiedSVG} size="24px" />
+        </>
+      ) : (
+        <>
+          <span>{`${
+            maxChars - charCount
+          } characters remaining out of ${maxChars}`}</span>
+          <Icon name={delightedSVG} size="24px" />
+        </>
+      )}
+    </p>
+  );
+};
+
+export default CounterComponent;

package/src/components/manage/Blocks/Group/CounterComponent.test.jsx

@@ -0,0 +1,234 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import CounterComponent from './CounterComponent';
+import '@testing-library/jest-dom/extend-expect';
+
+jest.mock('@plone/volto/registry', () => ({
+  blocks: {
+    blocksConfig: {
+      group: {
+        countTextIn: ['text'],
+      },
+    },
+  },
+}));
+
+jest.mock('@plone/volto-slate/editor/render', () => ({
+  serializeNodesToText: jest.fn((nodes) =>
+    nodes.map((node) => node.text).join(' '),
+  ),
+}));
+
+describe('CounterComponent', () => {
+  const setSidebarTab = jest.fn();
+  const setSelectedBlock = jest.fn();
+
+  it('should render info class when character count is less than 95% of maxChars', () => {
+    const { container, getByText } = render(
+      <CounterComponent
+        data={{
+          maxChars: 100,
+          data: {
+            blocks: {
+              block1: { '@type': 'text', plaintext: 'test' },
+            },
+            blocks_layout: {
+              items: ['block1'],
+            },
+          },
+        }}
+        setSidebarTab={setSidebarTab}
+        setSelectedBlock={setSelectedBlock}
+      />,
+    );
+    expect(getByText('96 characters remaining out of 100')).toBeInTheDocument();
+    expect(container.querySelector('.counter.info')).toBeInTheDocument();
+  });
+
+  it('should render warning class when character count is between 95% and 100% of maxChars', () => {
+    const { container, getByText } = render(
+      <CounterComponent
+        data={{
+          maxChars: 100,
+          data: {
+            blocks: {
+              block1: { '@type': 'text', plaintext: 'test'.repeat(24) },
+            },
+            blocks_layout: {
+              items: ['block1'],
+            },
+          },
+        }}
+        setSidebarTab={setSidebarTab}
+        setSelectedBlock={setSelectedBlock}
+      />,
+    );
+    expect(getByText('4 characters remaining out of 100')).toBeInTheDocument();
+    expect(container.querySelector('.counter.warning')).toBeInTheDocument();
+  });
+
+  it('should render warning class when character count is over the maxChars', () => {
+    const { container, getByText } = render(
+      <CounterComponent
+        data={{
+          maxChars: 100,
+          data: {
+            blocks: {
+              block1: { '@type': 'text', plaintext: 'test'.repeat(26) },
+            },
+            blocks_layout: {
+              items: ['block1'],
+            },
+          },
+        }}
+        setSidebarTab={setSidebarTab}
+        setSelectedBlock={setSelectedBlock}
+      />,
+    );
+    expect(getByText('4 characters over the limit')).toBeInTheDocument();
+    expect(container.querySelector('.counter.danger')).toBeInTheDocument();
+  });
+
+  it('should handle click event', () => {
+    const { container } = render(
+      <CounterComponent
+        data={{
+          maxChars: 100,
+          data: {
+            blocks: {
+              block1: {
+                '@type': 'text',
+                plaintext: 'test'.repeat(24),
+                ignoreSpaces: true,
+              },
+            },
+            blocks_layout: {
+              items: ['block1'],
+            },
+          },
+        }}
+        setSidebarTab={setSidebarTab}
+        setSelectedBlock={setSelectedBlock}
+      />,
+    );
+    container.querySelector('.counter').click();
+    expect(setSidebarTab).toHaveBeenCalledWith(1);
+    expect(setSelectedBlock).toHaveBeenCalled();
+  });
+
+  it('should handle click event with maxChar undefined', () => {
+    const { container } = render(
+      <CounterComponent
+        data={{
+          maxChars: undefined,
+          data: undefined,
+        }}
+        setSidebarTab={setSidebarTab}
+        setSelectedBlock={setSelectedBlock}
+      />,
+    );
+    container.querySelector('.counter').click();
+    expect(setSidebarTab).toHaveBeenCalledWith(1);
+    expect(setSelectedBlock).toHaveBeenCalled();
+  });
+
+  it('should handle click event with data undefined', () => {
+    const { container } = render(
+      <CounterComponent
+        data={{
+          maxChars: 100,
+          data: undefined,
+        }}
+        setSidebarTab={setSidebarTab}
+        setSelectedBlock={setSelectedBlock}
+      />,
+    );
+    container.querySelector('.counter').click();
+    expect(setSidebarTab).toHaveBeenCalledWith(1);
+    expect(setSelectedBlock).toHaveBeenCalled();
+  });
+
+  it('should handle click event with plaintext undefined, but values present', () => {
+    const { container } = render(
+      <CounterComponent
+        data={{
+          maxChars: 100,
+          data: {
+            blocks: {
+              block1: {
+                '@type': 'text',
+                plaintext: undefined,
+                value: [
+                  { text: 'test' },
+                  { children: [{ text: 'more text' }] },
+                ],
+              },
+            },
+            blocks_layout: {
+              items: ['block1'],
+            },
+          },
+        }}
+        setSidebarTab={setSidebarTab}
+        setSelectedBlock={setSelectedBlock}
+      />,
+    );
+    container.querySelector('.counter').click();
+    expect(setSidebarTab).toHaveBeenCalledWith(1);
+    expect(setSelectedBlock).toHaveBeenCalled();
+  });
+
+  it('should handle click event with plaintext undefined and values is not an array and the type is in countTextIn', () => {
+    const { container } = render(
+      <CounterComponent
+        data={{
+          maxChars: 100,
+          data: {
+            blocks: {
+              block1: {
+                '@type': 'text',
+                plaintext: undefined,
+                value: {},
+              },
+            },
+            blocks_layout: {
+              items: ['block1'],
+            },
+          },
+        }}
+        setSidebarTab={setSidebarTab}
+        setSelectedBlock={setSelectedBlock}
+      />,
+    );
+    container.querySelector('.counter').click();
+    expect(setSidebarTab).toHaveBeenCalledWith(1);
+    expect(setSelectedBlock).toHaveBeenCalled();
+  });
+
+  it('should handle click event with plaintext undefined and values is not an array and the type is not in countTextIn', () => {
+    const { container } = render(
+      <CounterComponent
+        data={{
+          maxChars: 100,
+          data: {
+            blocks: {
+              block1: {
+                '@type': 'test',
+                plaintext: undefined,
+                value: {},
+              },
+            },
+            blocks_layout: {
+              items: ['block1'],
+            },
+          },
+        }}
+        setSidebarTab={setSidebarTab}
+        setSelectedBlock={setSelectedBlock}
+      />,
+    );
+    container.querySelector('.counter').click();
+    expect(setSidebarTab).toHaveBeenCalledWith(1);
+    expect(setSelectedBlock).toHaveBeenCalled();
+  });
+});

package/src/components/manage/Blocks/Group/Edit.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useCallback } from 'react';
 import { isEmpty, without } from 'lodash';
 import config from '@plone/volto/registry';
 import {
@@ -12,14 +12,12 @@ import {
   emptyBlocksForm,
   getBlocksLayoutFieldname,
 } from '@plone/volto/helpers';
-import delightedSVG from '@plone/volto/icons/delighted.svg';
-import dissatisfiedSVG from '@plone/volto/icons/dissatisfied.svg';
 import PropTypes from 'prop-types';
 import { Button, Segment } from 'semantic-ui-react';
 import EditBlockWrapper from './EditBlockWrapper';
 import EditSchema from './EditSchema';
+import CounterComponent from './CounterComponent';
 import helpSVG from '@plone/volto/icons/help.svg';
-import cx from 'classnames';
 import './editor.less';
 
 const Edit = (props) => {
@@ -43,8 +41,6 @@ const Edit = (props) => {
   );
 
   const blockState = {};
-  let charCount = 0;
-
   const handleKeyDown = (
     e,
     index,
@@ -71,47 +67,48 @@ const Edit = (props) => {
     }
   };
 
-  const onSelectBlock = (id, isMultipleSelection, event, activeBlock) => {
-    let newMultiSelected = [];
-    let selected = id;
+  const onSelectBlock = useCallback(
+    (id, isMultipleSelection, event, activeBlock) => {
+      let newMultiSelected = [];
+      let selected = id;
 
-    if (isMultipleSelection) {
-      selected = null;
-      const blocksLayoutFieldname = getBlocksLayoutFieldname(data?.data);
-      const blocks_layout = data?.data[blocksLayoutFieldname].items;
-      if (event.shiftKey) {
-        const anchor =
-          multiSelected.length > 0
-            ? blocks_layout.indexOf(multiSelected[0])
-            : blocks_layout.indexOf(activeBlock);
-        const focus = blocks_layout.indexOf(id);
-        if (anchor === focus) {
-          newMultiSelected = [id];
-        } else if (focus > anchor) {
-          newMultiSelected = [...blocks_layout.slice(anchor, focus + 1)];
-        } else {
-          newMultiSelected = [...blocks_layout.slice(focus, anchor + 1)];
+      if (isMultipleSelection) {
+        selected = null;
+        const blocksLayoutFieldname = getBlocksLayoutFieldname(data?.data);
+        const blocks_layout = data?.data[blocksLayoutFieldname].items;
+        if (event.shiftKey) {
+          const anchor =
+            multiSelected.length > 0
+              ? blocks_layout.indexOf(multiSelected[0])
+              : blocks_layout.indexOf(activeBlock);
+          const focus = blocks_layout.indexOf(id);
+          if (anchor === focus) {
+            newMultiSelected = [id];
+          } else if (focus > anchor) {
+            newMultiSelected = [...blocks_layout.slice(anchor, focus + 1)];
+          } else {
+            newMultiSelected = [...blocks_layout.slice(focus, anchor + 1)];
+          }
         }
-      }
-      if ((event.ctrlKey || event.metaKey) && !event.shiftKey) {
-        if (multiSelected.includes(id)) {
-          selected = null;
-          newMultiSelected = without(multiSelected, id);
-        } else {
-          newMultiSelected = [...(multiSelected || []), id];
+        if ((event.ctrlKey || event.metaKey) && !event.shiftKey) {
+          if (multiSelected.includes(id)) {
+            selected = null;
+            newMultiSelected = without(multiSelected, id);
+          } else {
+            newMultiSelected = [...(multiSelected || []), id];
+          }
         }
       }
-    }
 
-    setSelectedBlock(selected);
-    setMultiSelected(newMultiSelected);
-  };
+      setSelectedBlock(selected);
+      setMultiSelected(newMultiSelected);
+    },
+    [data.data, multiSelected],
+  );
 
   const changeBlockData = (newBlockData) => {
     let pastedBlocks = newBlockData.blocks_layout.items.filter((blockID) => {
-      if (data?.data?.blocks_layout.items.find((x) => x === blockID))
-        return false;
-      return true;
+      return !data?.data?.blocks_layout.items.find((x) => x === blockID);
     });
     const selectedIndex =
       data.data.blocks_layout.items.indexOf(selectedBlock) + 1;
@@ -144,101 +141,6 @@ const Edit = (props) => {
     }
   }, [onChangeBlock, properties, selectedBlock, block, data, data_blocks]);
 
-  /**
-   * Count the number of characters that are anything except using Regex
-   * @param {string} paragraph
-   * @returns
-   */
-  const countCharsWithoutSpaces = (paragraph) => {
-    const regex = /[^\s\\]/g;
-
-    return (paragraph.match(regex) || []).length;
-  };
-
-  /**
-   * Count the number of characters
-   * @param {string} paragraph
-   * @returns
-   */
-  const countCharsWithSpaces = (paragraph) => {
-    return paragraph?.length || 0;
-  };
-
-  /**
-   * Recursively look for any block that contains text or plaintext
-   * @param {Object} blocksObject
-   * @returns
-   */
-  const countTextInBlocks = (blocksObject) => {
-    let groupCharCount = 0;
-    if (!props.data.maxChars) {
-      return groupCharCount;
-    }
-
-    Object.keys(blocksObject).forEach((blockId) => {
-      const foundText = blocksObject[blockId]?.plaintext
-        ? blocksObject[blockId]?.plaintext
-        : blocksObject[blockId]?.text?.blocks[0]?.text
-        ? blocksObject[blockId].text.blocks[0].text
-        : blocksObject[blockId]?.data?.blocks
-        ? countTextInBlocks(blocksObject[blockId]?.data?.blocks)
-        : blocksObject[blockId]?.blocks
-        ? countTextInBlocks(blocksObject[blockId]?.blocks)
-        : '';
-      const resultText =
-        typeof foundText === 'string' || foundText instanceof String
-          ? foundText
-          : '';
-
-      groupCharCount += props.data.ignoreSpaces
-        ? countCharsWithoutSpaces(resultText)
-        : countCharsWithSpaces(resultText);
-    });
-
-    return groupCharCount;
-  };
-
-  const showCharCounter = () => {
-    if (data_blocks) {
-      charCount = countTextInBlocks(data_blocks);
-    }
-  };
-  showCharCounter();
-
-  const counterClass =
-    charCount < Math.ceil(props.data.maxChars / 1.05)
-      ? 'info'
-      : charCount < props.data.maxChars
-      ? 'warning'
-      : 'danger';
-
-  const counterComponent = props.data.maxChars ? (
-    <p
-      className={cx('counter', counterClass)}
-      onClick={() => {
-        setSelectedBlock();
-        props.setSidebarTab(1);
-      }}
-      aria-hidden="true"
-    >
-      {props.data.maxChars - charCount < 0 ? (
-        <>
-          <span>{`${
-            charCount - props.data.maxChars
-          } characters over the limit`}</span>
-          <Icon name={dissatisfiedSVG} size="24px" />
-        </>
-      ) : (
-        <>
-          <span>{`${
-            props.data.maxChars - charCount
-          } characters remaining out of ${props.data.maxChars}`}</span>
-          <Icon name={delightedSVG} size="24px" />
-        </>
-      )}
-    </p>
-  ) : null;
-
   // Get editing instructions from block settings or props
   let instructions = data?.instructions?.data || data?.instructions;
   if (!instructions || instructions === '<p><br/></p>') {
@@ -355,7 +257,9 @@ const Edit = (props) => {
         )}
       </BlocksForm>
 
-      {counterComponent}
+      {props.data.maxChars && (
+        <CounterComponent {...props} setSelectedBlock={setSelectedBlock} />
+      )}
       <SidebarPortal selected={selected && !selectedBlock}>
         {instructions && (
           <Segment attached>

package/src/components/manage/Blocks/Group/Edit.test.jsx

@@ -76,4 +76,111 @@ describe('Edit', () => {
     );
     fireEvent.keyDown(getByRole('presentation'), { key: 'ArrowUp', code: 38 });
   });
+
+  it('should call ArrowUp keydown', () => {
+    const props = {
+      block: 'testBlock',
+      data: {
+        instructions: 'test',
+        data: {
+          blocks: {
+            block1: {
+              type: 'test',
+              data: {
+                value: 'Test',
+              },
+            },
+          },
+          blocks_layout: {
+            items: [undefined],
+          },
+        },
+      },
+      onChangeBlock,
+      onChangeField,
+      pathname: '/',
+      selected: true,
+      manage: true,
+    };
+    const mockOnFocusPreviousBlock = jest.fn();
+    const mockOnFocusNextBlock = jest.fn();
+    const mockOnAddBlock = jest.fn();
+    const mockSidebarTab = jest.fn();
+
+    const { container } = render(
+      <Provider store={store}>
+        <Edit
+          {...props}
+          onFocusPreviousBlock={mockOnFocusPreviousBlock}
+          onFocusNextBlock={mockOnFocusNextBlock}
+          onAddBlock={mockOnAddBlock}
+          blockNode={mockBlockNode}
+          setSidebarTab={mockSidebarTab}
+        />
+      </Provider>,
+    );
+
+    fireEvent.keyDown(container.querySelector('.section-block'), {
+      key: 'ArrowUp',
+      code: 38,
+    });
+    fireEvent.keyDown(container.querySelector('.section-block'), {
+      key: 'ArrowDown',
+      code: 40,
+    });
+    fireEvent.keyDown(container.querySelector('.section-block'), {
+      key: 'Enter',
+      code: 13,
+    });
+
+    fireEvent.click(container.querySelector('.blocks-form'), {
+      shiftKey: true,
+    });
+    fireEvent.click(container.querySelector('.section-block legend'));
+  });
+
+  it('should call ArrowUp keydown', () => {
+    const props = {
+      block: 'testBlock',
+      data: {
+        instructions: 'test',
+        data: {
+          blocks: {
+            block1: {
+              type: 'test',
+              data: {
+                value: 'Test',
+              },
+            },
+          },
+          blocks_layout: {
+            items: [undefined],
+          },
+        },
+      },
+      onChangeBlock,
+      onChangeField,
+      pathname: '/',
+      selected: true,
+      manage: true,
+    };
+    const mockOnFocusPreviousBlock = jest.fn();
+    const mockOnFocusNextBlock = jest.fn();
+    const mockOnAddBlock = jest.fn();
+    const mockSidebarTab = jest.fn();
+    const { container } = render(
+      <Provider store={store}>
+        <Edit
+          {...props}
+          onFocusPreviousBlock={mockOnFocusPreviousBlock}
+          onFocusNextBlock={mockOnFocusNextBlock}
+          onAddBlock={mockOnAddBlock}
+          setSidebarTab={mockSidebarTab}
+          blockNode={mockBlockNode}
+        />
+      </Provider>,
+    );
+
+    fireEvent.click(container.querySelector('.section-block legend'));
+  });
 });

package/src/index.js

@@ -59,6 +59,7 @@ const applyConfig = (config) => {
       });
       return entries;
     },
+    countTextIn: ['slate', 'description'], //id of the block whose text should be counted
   };
 
   return config;

package/src/index.test.js

@@ -0,0 +1,101 @@
+import applyConfig from './index';
+
+describe('applyConfig', () => {
+  it('should add group block configuration', () => {
+    const config = {
+      blocks: {
+        blocksConfig: {
+          text: { title: 'Text', restricted: false },
+          image: { title: 'Image', restricted: true },
+        },
+      },
+    };
+
+    const newConfig = applyConfig(config);
+
+    expect(newConfig.blocks.blocksConfig.group).toBeDefined();
+    expect(newConfig.blocks.blocksConfig.group.id).toEqual('group');
+    expect(newConfig.blocks.blocksConfig.group.title).toEqual(
+      'Section (Group)',
+    );
+    expect(newConfig.blocks.blocksConfig.group.icon).toBeDefined();
+    expect(newConfig.blocks.blocksConfig.group.view).toBeDefined();
+    expect(newConfig.blocks.blocksConfig.group.edit).toBeDefined();
+    expect(newConfig.blocks.blocksConfig.group.schema).toBeDefined();
+    expect(newConfig.blocks.blocksConfig.group.restricted).toEqual(false);
+  });
+
+  it('should include allowed blocks in schema', () => {
+    const config = {
+      blocks: {
+        blocksConfig: {
+          text: { title: 'Text', restricted: false },
+          image: { restricted: false },
+          image_test: { title: 'Image', restricted: true },
+        },
+      },
+    };
+
+    const newConfig = applyConfig(config);
+
+    expect(
+      newConfig.blocks.blocksConfig.group.schema.properties.allowedBlocks.items
+        .choices,
+    ).toEqual([
+      ['text', 'Text'],
+      ['image', 'image'],
+      ['group', 'Group'],
+    ]);
+  });
+
+  it('should generate tocEntries correctly', () => {
+    const config = {
+      blocks: {
+        blocksConfig: {},
+      },
+    };
+
+    const block = {
+      data: {
+        blocks: {
+          block1: { value: [{ type: 'h1' }], plaintext: 'Heading 1' },
+          block2: { value: [{ type: 'h2' }], plaintext: 'Heading 2' },
+          block3: { value: [{ type: 'h3' }], plaintext: 'Heading 3' }, // This should be ignored
+        },
+        blocks_layout: {
+          items: ['block1', 'block2', 'block3'],
+        },
+      },
+    };
+    const tocData = {
+      levels: ['h1', 'h2'],
+    };
+    const newConfig = applyConfig(config);
+    const entries = newConfig.blocks.blocksConfig.group.tocEntries(
+      block,
+      tocData,
+    );
+    expect(entries).toEqual([
+      [1, 'Heading 1', 'block1'],
+      [2, 'Heading 2', 'block2'],
+    ]);
+  });
+
+  it('should generate no entries', () => {
+    const config = {
+      blocks: {
+        blocksConfig: {},
+      },
+    };
+    const block = undefined;
+    const tocData = {
+      levels: undefined,
+    };
+    const newConfig = applyConfig(config);
+    const entries = newConfig.blocks.blocksConfig.group.tocEntries(
+      block,
+      tocData,
+    );
+    expect(entries).toEqual([]);
+  });
+});

package/.i18n.babel.config.js

@@ -1 +0,0 @@
-module.exports = require('@plone/volto/babel');