@plone/volto 18.0.0-alpha.8 → 18.0.0

package/src/components/manage/AnchorPlugin/components/LinkButton/AddLinkForm.jsx

@@ -23,6 +23,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import clearSVG from '@plone/volto/icons/clear.svg';
 import navTreeSVG from '@plone/volto/icons/nav.svg';
 import aheadSVG from '@plone/volto/icons/ahead.svg';
+import linkSVG from '@plone/volto/icons/link.svg';
 
 import withObjectBrowser from '@plone/volto/components/manage/Sidebar/ObjectBrowser';
 import { withRouter } from 'react-router';
@@ -34,6 +35,18 @@ const messages = defineMessages({
     id: 'Enter URL or select an item',
     defaultMessage: 'Enter URL or select an item',
   },
+  clear: {
+    id: 'Clear',
+    defaultMessage: 'Clear',
+  },
+  openObjectBrowser: {
+    id: 'Open object browser',
+    defaultMessage: 'Open object browser',
+  },
+  submit: {
+    id: 'Submit',
+    defaultMessage: 'Submit',
+  },
 });
 
 /**
@@ -51,6 +64,7 @@ class AddLinkForm extends Component {
   };
 
   static defaultProps = {
+    objectBrowserPickerType: 'link',
     placeholder: 'Enter URL or select an item',
   };
 
@@ -228,88 +242,80 @@ class AddLinkForm extends Component {
 
     return (
       <div className="link-form-container" ref={this.linkFormContainer}>
-        <div
-          style={{ marginLeft: '5px', display: 'flex', alignItems: 'center' }}
-        >
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            width="24"
-            height="24"
-            viewBox="0 0 36 36"
-            fill="#B8B2C8"
-          >
-            <g fillRule="evenodd">
-              <path d="M27.1318,7.333 C24.4028,4.604 19.9618,4.604 17.2328,7.333 L12.9898,11.576 C11.8428,12.723 11.1288,14.248 10.9778,15.871 C10.8228,17.541 11.2708,19.211 12.2378,20.576 C12.4818,20.919 12.7278,21.213 12.9888,21.475 C13.7848,22.271 14.7778,22.868 15.8608,23.202 C16.5498,23.415 17.2548,23.519 17.9518,23.518 C19.7808,23.518 21.5598,22.804 22.8888,21.475 L23.9498,20.414 L22.5358,19 L21.4748,20.061 C20.1648,21.371 18.2388,21.842 16.4498,21.291 C15.6668,21.049 14.9778,20.635 14.4038,20.061 C14.2218,19.879 14.0478,19.668 13.8698,19.418 C13.1778,18.443 12.8588,17.249 12.9688,16.056 C13.0768,14.896 13.5868,13.808 14.4038,12.99 L18.6468,8.747 C20.5958,6.798 23.7688,6.798 25.7178,8.747 C26.6568,9.687 27.1748,10.942 27.1748,12.283 C27.1748,13.623 26.6568,14.878 25.7178,15.818 L27.1318,17.232 C28.4488,15.915 29.1748,14.157 29.1748,12.283 C29.1748,10.408 28.4488,8.65 27.1318,7.333" />
-              <path d="M25.0107,16.5254 C24.2147,15.7294 23.2217,15.1324 22.1387,14.7984 C19.6417,14.0284 16.9477,14.6894 15.1107,16.5254 L14.0507,17.5864 L15.4647,19.0004 L16.5247,17.9394 C17.8357,16.6294 19.7587,16.1554 21.5497,16.7094 C22.3337,16.9514 23.0217,17.3644 23.5957,17.9394 C23.7777,18.1214 23.9527,18.3314 24.1307,18.5824 C24.8217,19.5564 25.1417,20.7514 25.0317,21.9444 C24.9237,23.1034 24.4137,24.1924 23.5957,25.0104 L19.3537,29.2534 C17.4047,31.2024 14.2317,31.2024 12.2817,29.2534 C11.3427,28.3134 10.8247,27.0574 10.8247,25.7174 C10.8247,24.3774 11.3427,23.1214 12.2817,22.1824 L10.8677,20.7684 C9.5507,22.0854 8.8247,23.8424 8.8247,25.7174 C8.8247,27.5924 9.5507,29.3504 10.8677,30.6674 C12.2327,32.0314 14.0257,32.7134 15.8177,32.7134 C17.6107,32.7134 19.4027,32.0314 20.7677,30.6674 L25.0107,26.4244 C26.1567,25.2774 26.8717,23.7524 27.0227,22.1294 C27.1777,20.4594 26.7297,18.7894 25.7617,17.4244 C25.5177,17.0814 25.2717,16.7874 25.0107,16.5254" />
-            </g>
-          </svg>
-          <Form.Field inline>
-            <div className="wrapper">
-              <Input
-                className={className}
-                id={`field-link`}
-                name="link"
-                value={value || ''}
-                onChange={({ target }) => this.onChange(target.value)}
-                placeholder={this.props.intl.formatMessage(
-                  messages.placeholder,
-                )}
-                onKeyDown={this.onKeyDown}
-                ref={this.onRef}
-              />
-              {value.length > 0 ? (
-                <Button.Group>
-                  <Button
-                    basic
-                    className="cancel"
-                    onClick={(e) => {
-                      e.preventDefault();
-                      e.stopPropagation();
-                      this.clear();
-                    }}
-                  >
-                    <Icon name={clearSVG} size="24px" />
-                  </Button>
-                </Button.Group>
-              ) : (
-                <Button.Group>
-                  <Button
-                    basic
-                    icon
-                    onClick={(e) => {
-                      e.preventDefault();
-                      e.stopPropagation();
-                      this.props.openObjectBrowser({
-                        mode: 'link',
-                        overlay: true,
-                        onSelectItem: (url) => {
-                          this.onChange(url);
-                          this.onSubmit();
-                        },
-                      });
-                    }}
-                  >
-                    <Icon name={navTreeSVG} size="24px" />
-                  </Button>
-                </Button.Group>
-              )}
+        <Icon name={linkSVG} color="#B8B2C8" size="20px" />
+        <Form.Field inline>
+          <div className="wrapper">
+            <Input
+              className={className}
+              name="link"
+              value={value || ''}
+              onChange={({ target }) => this.onChange(target.value)}
+              placeholder={
+                this.props.placeholder ||
+                this.props.intl.formatMessage(messages.placeholder)
+              }
+              onKeyDown={this.onKeyDown}
+              ref={this.onRef}
+            />
+            {value.length > 0 ? (
+              <Button.Group>
+                <Button
+                  basic
+                  className="cancel"
+                  aria-label={this.props.intl.formatMessage(messages.clear)}
+                  onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    this.clear();
+                    this.input.focus();
+                  }}
+                >
+                  <Icon name={clearSVG} size="24px" />
+                </Button>
+              </Button.Group>
+            ) : this.props.objectBrowserPickerType === 'link' ? (
               <Button.Group>
                 <Button
                   basic
-                  primary
-                  disabled={!value.length > 0}
+                  icon
+                  aria-label={this.props.intl.formatMessage(
+                    messages.openObjectBrowser,
+                  )}
                   onClick={(e) => {
                     e.preventDefault();
                     e.stopPropagation();
-                    this.onSubmit();
+                    this.props.openObjectBrowser({
+                      mode: this.props.objectBrowserPickerType,
+                      overlay: true,
+                      onSelectItem: (url) => {
+                        this.onChange(url);
+                        this.onSubmit();
+                      },
+                    });
                   }}
                 >
-                  <Icon name={aheadSVG} size="24px" />
+                  <Icon name={navTreeSVG} size="24px" />
                 </Button>
               </Button.Group>
-            </div>
-          </Form.Field>
-        </div>
+            ) : null}
+
+            <Button.Group>
+              <Button
+                basic
+                primary
+                disabled={!value.length > 0}
+                aria-label={this.props.intl.formatMessage(messages.submit)}
+                onClick={(e) => {
+                  e.preventDefault();
+                  e.stopPropagation();
+                  this.onSubmit();
+                }}
+              >
+                <Icon name={aheadSVG} size="24px" />
+              </Button>
+            </Button.Group>
+          </div>
+        </Form.Field>
       </div>
     );
   }

package/src/components/manage/AnchorPlugin/useLinkEditor.jsx

@@ -0,0 +1,79 @@
+/***
+ * A hook that makes it easy to use the AddLinkForm link editing component.
+ *
+ * To use it, in your component, do something like:
+ *
+ * const linkEditor = useLinkEditor();
+ *
+ * return (<>
+ * <button ref={linkEditor.anchorNode} onClick={() => linkEditor.show()}>btn</button>
+ * {linkEditor.anchorNode && <linkEditor.LinkEditor value={value} id={id} onChange={onChange} />}
+ * </>);
+ *
+ */
+
+import React from 'react';
+import { PositionedToolbar } from '@plone/volto-slate/editor/ui';
+import AddLinkForm from '@plone/volto/components/manage/AnchorPlugin/components/LinkButton/AddLinkForm';
+
+function getPositionStyle(position) {
+  return (
+    position || {
+      style: {
+        opacity: 1,
+        top: -5,
+        left: 55,
+      },
+    }
+  );
+}
+
+const useLinkEditor = () => {
+  const [showLinkEditor, setShowLinkEditor] = React.useState(false);
+  const show = React.useCallback(() => setShowLinkEditor(true), []);
+  const anchorNode = React.useRef();
+
+  const LinkEditor = React.useCallback(
+    (props) => {
+      const {
+        id,
+        value,
+        onChange,
+        placeholder,
+        objectBrowserPickerType,
+        position,
+      } = props;
+      return showLinkEditor && anchorNode.current ? (
+        <PositionedToolbar
+          className="add-link"
+          toggleButton={anchorNode.current}
+          position={getPositionStyle(position)}
+        >
+          <AddLinkForm
+            placeholder={placeholder}
+            data={{ url: value || '' }}
+            theme={{}}
+            objectBrowserPickerType={objectBrowserPickerType}
+            onChangeValue={(url) => {
+              setShowLinkEditor(false);
+              onChange(id, url);
+            }}
+            onClear={() => {}}
+            onOverrideContent={(c) => {
+              setShowLinkEditor(false);
+            }}
+          />
+        </PositionedToolbar>
+      ) : null;
+    },
+    [showLinkEditor],
+  );
+
+  return {
+    anchorNode,
+    show,
+    LinkEditor,
+  };
+};
+
+export default useLinkEditor;

package/src/components/manage/BlockChooser/BlockChooser.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useUser } from '@plone/volto/hooks';
 import PropTypes from 'prop-types';
 import { filter, map, groupBy, isEmpty } from 'lodash';
 import { Accordion, Button } from 'semantic-ui-react';
@@ -35,6 +36,7 @@ const BlockChooser = ({
   contentType,
 }) => {
   const intl = useIntl();
+  const user = useUser();
   const hasAllowedBlocks = !isEmpty(allowedBlocks);
 
   const filteredBlocksConfig = filter(blocksConfig, (item) => {
@@ -57,7 +59,13 @@ const BlockChooser = ({
         // depending on this function, given properties (current present blocks) and the
         // block being evaluated
         return typeof item.restricted === 'function'
-          ? !item.restricted({ properties, block: item, navRoot, contentType })
+          ? !item.restricted({
+              properties,
+              block: item,
+              navRoot,
+              contentType,
+              user,
+            })
           : !item.restricted;
       }
     }

package/src/components/manage/BlockChooser/BlockChooser.test.jsx

@@ -1,10 +1,10 @@
 import React from 'react';
-import '@testing-library/jest-dom/extend-expect';
 import { render, screen } from '@testing-library/react';
 import { Provider } from 'react-intl-redux';
 import configureStore from 'redux-mock-store';
 import BlockChooser from './BlockChooser';
 import config from '@plone/volto/registry';
+import jwt from 'jsonwebtoken';
 
 const blockSVG = {};
 
@@ -122,6 +122,9 @@ const store = mockStore({
     locale: 'en',
     messages: {},
   },
+  userSession: {
+    token: jwt.sign({ fullname: 'John Doe' }, 'secret'),
+  },
 });
 
 describe('BlocksChooser', () => {

package/src/components/manage/BlockChooser/BlockChooserButton.jsx

@@ -7,7 +7,7 @@ import config from '@plone/volto/registry';
 import { Button, Ref } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
 import { usePopper } from 'react-popper';
-import { Portal } from 'react-portal';
+import { createPortal } from 'react-dom';
 
 const messages = defineMessages({
   addBlock: {
@@ -115,8 +115,8 @@ const BlockChooserButton = (props) => {
             />
           </Ref>
         )}
-      {addNewBlockOpened && (
-        <Portal node={document.getElementById('body')}>
+      {addNewBlockOpened &&
+        createPortal(
           <div
             ref={setPopperElement}
             style={styles.popper}
@@ -148,9 +148,9 @@ const BlockChooserButton = (props) => {
               navRoot={navRoot}
               contentType={contentType}
             />
-          </div>
-        </Portal>
-      )}
+          </div>,
+          document.body,
+        )}
     </>
   );
 };

package/src/components/manage/BlockChooser/BlockChooserSearch.test.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import '@testing-library/jest-dom/extend-expect';
 import { render } from '@testing-library/react';
 import BlockChooserSearch from './BlockChooserSearch';
 import { Provider } from 'react-intl-redux';

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

@@ -1,11 +1,14 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
+import { cloneDeep, map } from 'lodash';
 import EditBlock from './Edit';
 import { DragDropList } from '@plone/volto/components';
 import {
   getBlocks,
   getBlocksFieldname,
+  getBlocksLayoutFieldname,
   applyBlockDefaults,
+  getBlocksHierarchy,
 } from '@plone/volto/helpers';
 import {
   addBlock,
@@ -13,15 +16,19 @@ import {
   changeBlock,
   deleteBlock,
   moveBlock,
+  moveBlockEnhanced,
   mutateBlock,
   nextBlockId,
   previousBlockId,
 } from '@plone/volto/helpers';
 import EditBlockWrapper from './EditBlockWrapper';
-import { setSidebarTab } from '@plone/volto/actions';
+import { setSidebarTab, setUIState } from '@plone/volto/actions';
 import { useDispatch } from 'react-redux';
 import { useDetectClickOutside, useEvent } from '@plone/volto/helpers';
 import config from '@plone/volto/registry';
+import { createPortal } from 'react-dom';
+
+import Order from './Order/Order';
 
 const BlocksForm = (props) => {
   const {
@@ -48,8 +55,19 @@ const BlocksForm = (props) => {
     blocksConfig = config.blocks.blocksConfig,
     editable = true,
     direction = 'vertical',
+    history,
+    location,
+    token,
+    errors,
+    blocksErrors,
   } = props;
 
+  const [isClient, setIsClient] = useState(false);
+
+  useEffect(() => {
+    setIsClient(true);
+  }, []);
+
   const blockList = getBlocks(properties);
 
   const dispatch = useDispatch();
@@ -180,6 +198,52 @@ const BlocksForm = (props) => {
     onChangeFormData(newFormData);
   };
 
+  const onMoveBlockEnhanced = ({ source, destination }) => {
+    const newFormData = moveBlockEnhanced(cloneDeep(properties), {
+      source,
+      destination,
+    });
+    const blocksFieldname = getBlocksFieldname(newFormData);
+    const blocksLayoutFieldname = getBlocksLayoutFieldname(newFormData);
+    let error = false;
+
+    const allowedBlocks = Object.keys(blocksConfig);
+
+    map(newFormData[blocksLayoutFieldname].items, (id) => {
+      const block = newFormData[blocksFieldname][id];
+      if (!allowedBlocks.includes(block['@type'])) {
+        error = true;
+      }
+      if (Array.isArray(block[blocksLayoutFieldname]?.items)) {
+        const size = block[blocksLayoutFieldname].items.length;
+        const allowedSubBlocks = [
+          ...(blocksConfig[block['@type']].allowedBlocks || allowedBlocks),
+          'empty',
+        ] || ['empty'];
+        if (size < 1 || size > (blocksConfig[block['@type']].maxLength || 4)) {
+          error = true;
+        }
+        map(block[blocksLayoutFieldname].items, (subId) => {
+          const subBlock = block[blocksFieldname][subId];
+          if (!allowedSubBlocks.includes(subBlock['@type'])) {
+            error = true;
+          }
+        });
+      }
+    });
+
+    if (!error) {
+      onChangeFormData(newFormData);
+      dispatch(
+        setUIState({
+          selected: null,
+          multiSelected: [],
+          gridSelected: null,
+        }),
+      );
+    }
+  };
+
   const defaultBlockWrapper = ({ draginfo }, editBlock, blockProps) => (
     <EditBlockWrapper draginfo={draginfo} blockProps={blockProps}>
       {editBlock}
@@ -192,6 +256,7 @@ const BlocksForm = (props) => {
   // 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);
@@ -207,80 +272,104 @@ const BlocksForm = (props) => {
   });
 
   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,
-              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>
+    <>
+      {isMainForm &&
+        isClient &&
+        createPortal(
+          <div>
+            <Order
+              items={getBlocksHierarchy(properties)}
+              onMoveBlock={onMoveBlockEnhanced}
+              onDeleteBlock={onDeleteBlock}
+              onSelectBlock={onSelectBlock}
+              removable
+              errors={blocksErrors}
+            />
+          </div>,
+          document.getElementById('sidebar-order'),
+        )}
+      <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,
+                pathname,
+                metadata,
+                properties,
+                contentType: type,
+                navRoot,
+                blocksConfig,
+                selected: selectedBlock === childId,
+                multiSelected: multiSelected?.includes(childId),
+                type: child['@type'],
+                editable,
+                showBlockChooser: selectedBlock === childId,
+                detached: isContainer,
+                // Properties to pass to the BlocksForm to match the View ones
+                content: properties,
+                history,
+                location,
+                token,
+                errors,
+                blocksErrors,
+              };
+              return editBlockWrapper(
+                dragProps,
+                <EditBlock key={childId} {...blockProps} />,
+                blockProps,
+              );
+            }}
+          </DragDropList>
+        </fieldset>
+      </div>
+    </>
   );
 };