@pie-lib/editable-html 11.1.1 → 11.2.0-beta.1

package/src/plugins/table/index.jsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import EditTable from 'slate-edit-table';
 import { Block } from 'slate';
 import debug from 'debug';
 import GridOn from '@material-ui/icons/GridOn';
@@ -9,6 +8,7 @@ import SlatePropTypes from 'slate-prop-types';
 import { withStyles } from '@material-ui/core/styles';
 import convert from 'react-attr-converter';
 import { object as toStyleObject } from 'to-style';
+import CustomTablePlugin from './CustomTablePlugin';
 
 const log = debug('@pie-lib:editable-html:plugins:table');
 
@@ -93,9 +93,7 @@ export const moveFocusToBeginningOfTable = (change) => {
 };
 
 export default (opts, toolbarPlugins /* :  {toolbar: {}}[] */) => {
-  const core = EditTable({
-    typeContent: 'div',
-  });
+  const core = CustomTablePlugin(opts);
 
   // fix outdated schema
 
@@ -142,7 +140,9 @@ export default (opts, toolbarPlugins /* :  {toolbar: {}}[] */) => {
   };
 
   core.toolbar = {
+    type: 'table',
     icon: <GridOn />,
+    ariaLabel: 'Insert Table',
     onClick: (value, onChange) => {
       log('insert table');
       const change = value.change();
@@ -162,7 +162,7 @@ export default (opts, toolbarPlugins /* :  {toolbar: {}}[] */) => {
     /**
      * Note - the node may not be a table node - it may be a node inside a table.
      */
-    customToolbar: (node, value, onToolbarDone) => {
+    customToolbar: (node, value, onToolbarDone, getFocusedValue) => {
       log('[customToolbar] node.data: ', node.data);
 
       const tableBlock = core.utils.getTableBlock(value.document, node?.key);
@@ -209,6 +209,7 @@ export default (opts, toolbarPlugins /* :  {toolbar: {}}[] */) => {
 
       const Tb = () => (
         <TableToolbar
+          getFocusedValue={getFocusedValue}
           plugins={toolbarPlugins}
           onChange={(c) => onToolbarDone(c, false)}
           value={value}
@@ -222,6 +223,7 @@ export default (opts, toolbarPlugins /* :  {toolbar: {}}[] */) => {
           onDone={onDone}
         />
       );
+
       return Tb;
     },
   };
@@ -243,74 +245,59 @@ export default (opts, toolbarPlugins /* :  {toolbar: {}}[] */) => {
   };
 
   core.normalizeNode = (node) => {
-    if (node.object !== 'document') {
-      return;
-    }
+    const addNodeBeforeArray = [];
 
-    const tableAdded = node.findDescendant((d) => d.data && d.data.get('newTable'));
-
-    if (!tableAdded) {
-      return;
-    }
+    if (node.object !== 'document') return;
 
-    const nodeToSearch = node.getParent(tableAdded.key) || node;
-    let shouldAddTextAfterNode = false;
-    const indexToNotHaveTableOn = nodeToSearch.nodes.size - 1;
-    const indexOfLastTable = nodeToSearch.nodes.findLastIndex((d) => d.type === 'table');
+    node.findDescendant((d) => {
+      if (d.type === 'table') {
+        const tablePath = node.getPath(d.key);
+        const prevNode = node.getPreviousNode(tablePath);
+        const nextNode = node.getNextNode(tablePath);
 
-    // if the last table in the document is of type table, we need to do the change
-    if (indexOfLastTable === indexToNotHaveTableOn) {
-      shouldAddTextAfterNode = true;
-    }
+        if (!prevNode || !nextNode) {
+          addNodeBeforeArray.push({
+            node: d,
+            prevNode,
+            nextNode,
+          });
+        }
+      }
+    });
 
-    if (!shouldAddTextAfterNode) {
+    if (!addNodeBeforeArray.length) {
       return;
     }
 
     return (change) => {
-      if (shouldAddTextAfterNode) {
-        const tableJSON = tableAdded.toJSON();
-
-        // we remove the table node because otherwise we can't add the empty block after it
-        // we need a block that contains text in order to do it
-        change.removeNodeByKey(tableAdded.key);
+      const newBlock = {
+        object: 'block',
+        type: 'div',
+      };
 
-        const newBlock = Block.create({
-          object: 'block',
-          type: 'div',
-        });
-
-        // we add an empty block but that it's going to be normalized
-        // because it will add the empty text to it like it should
-        change.insertBlock(newBlock);
-
-        change.withoutNormalization(() => {
-          // we do these changes without normalization
-
-          // we get the text previous to the new block added
-          const prevText = change.value.document.getPreviousText(newBlock.key);
-
-          if (prevText) {
-            // we move focus to the previous text
-            change.moveFocusTo(prevText.key, prevText.text?.length).moveAnchorTo(prevText.key, prevText.text?.length);
-          }
-
-          // we insert the table block between the first block with text and the last block with text
-          change.insertBlock({
-            ...tableJSON,
-            data: {
-              ...tableJSON.data,
-              newTable: true,
-            },
-          });
+      addNodeBeforeArray.forEach((n) => {
+        const tablePath = change.value.document.getPath(n.node.key).toJSON();
+        // removing tableIndex
+        let indexToAdd = tablePath.splice(-1)[0];
+
+        if (!n.prevNode) {
+          // inserting block key before table
+          change.insertNodeByPath(tablePath, indexToAdd, newBlock);
+          // this will trigger another normalization, which will figure out if there's not
+          // a block after the table and add it, so we exit for now
+          return;
+        }
 
-          moveFocusToBeginningOfTable(change);
-        });
-      }
+        if (!n.nextNode) {
+          // inserting block key after table
+          change.insertNodeByPath(tablePath, indexToAdd + 1, newBlock);
+        }
+      });
     };
   };
 
   core.renderNode = Node;
+  core.name = 'table';
 
   return core;
 };

package/src/plugins/table/table-toolbar.jsx

@@ -41,6 +41,7 @@ export class TableToolbar extends React.Component {
 
   render() {
     const {
+      getFocusedValue,
       plugins,
       value,
       onChange,
@@ -55,6 +56,27 @@ export class TableToolbar extends React.Component {
     } = this.props;
     log('[render] hasBorder:', hasBorder);
 
+    // we're separating the response area plugin because we want to display it next to the done button
+    const filteredPlugins = (plugins || []).reduce(
+      (acc, plugin) => {
+        if (plugin.name === 'response_area') {
+          return {
+            ...acc,
+            respAreaPlugin: plugin,
+          };
+        }
+
+        return {
+          ...acc,
+          otherPlugins: [...acc.otherPlugins, plugin],
+        };
+      },
+      {
+        respAreaPlugin: null,
+        otherPlugins: [],
+      },
+    );
+
     return (
       <div className={classes.tableToolbar}>
         <div className={classes.toolbarButtons}>
@@ -73,13 +95,28 @@ export class TableToolbar extends React.Component {
           <Button onClick={onRemoveTable}>
             <RemoveTable />
           </Button>
-          {plugins.map((p, index) => (
-            <ToolbarButton key={`plugin-${index}`} {...p.toolbar} value={value} onChange={onChange} />
+          {(filteredPlugins.otherPlugins || []).map((p, index) => (
+            <ToolbarButton
+              key={`plugin-${index}`}
+              {...p.toolbar}
+              value={value}
+              onChange={onChange}
+              getFocusedValue={getFocusedValue}
+            />
           ))}
           <Button onClick={onToggleBorder} active={hasBorder}>
             <BorderAll />
           </Button>
         </div>
+        {filteredPlugins.respAreaPlugin && (
+          <ToolbarButton
+            key={'plugin-response-area'}
+            {...filteredPlugins.respAreaPlugin.toolbar}
+            value={value}
+            onChange={onChange}
+            getFocusedValue={getFocusedValue}
+          />
+        )}
         <DoneButton onClick={this.onDone} />
       </div>
     );

package/src/plugins/textAlign/icons/index.jsx

@@ -0,0 +1,139 @@
+import React, { useState } from 'react';
+import Collapse from '@material-ui/core/Collapse';
+import List from '@material-ui/core/List';
+import ListItem from '@material-ui/core/ListItem';
+
+export const AlignLeft = () => (
+  <svg width="20" height="20" viewBox="0 0 66 66" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      d="M42.1875 4.75C42.1875 7.38672 39.9902 9.4375 37.5 9.4375H4.6875C2.05078 9.4375 0 7.38672 0 4.75C0 2.25977 2.05078 0.0625 4.6875 0.0625H37.5C39.9902 0.0625 42.1875 2.25977 42.1875 4.75ZM42.1875 42.25C42.1875 44.8867 39.9902 46.9375 37.5 46.9375H4.6875C2.05078 46.9375 0 44.8867 0 42.25C0 39.7598 2.05078 37.5625 4.6875 37.5625H37.5C39.9902 37.5625 42.1875 39.7598 42.1875 42.25ZM0 23.5C0 21.0098 2.05078 18.8125 4.6875 18.8125H60.9375C63.4277 18.8125 65.625 21.0098 65.625 23.5C65.625 26.1367 63.4277 28.1875 60.9375 28.1875H4.6875C2.05078 28.1875 0 26.1367 0 23.5ZM65.625 61C65.625 63.6367 63.4277 65.6875 60.9375 65.6875H4.6875C2.05078 65.6875 0 63.6367 0 61C0 58.5098 2.05078 56.3125 4.6875 56.3125H60.9375C63.4277 56.3125 65.625 58.5098 65.625 61Z"
+      fill="currentColor"
+    />
+  </svg>
+);
+
+export const AlignRight = () => (
+  <svg width="20" height="20" viewBox="0 0 66 66" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      d="M65.625 4.75C65.625 7.38672 63.4277 9.4375 60.9375 9.4375H28.125C25.4883 9.4375 23.4375 7.38672 23.4375 4.75C23.4375 2.25977 25.4883 0.0625 28.125 0.0625H60.9375C63.4277 0.0625 65.625 2.25977 65.625 4.75ZM65.625 42.25C65.625 44.8867 63.4277 46.9375 60.9375 46.9375H28.125C25.4883 46.9375 23.4375 44.8867 23.4375 42.25C23.4375 39.7598 25.4883 37.5625 28.125 37.5625H60.9375C63.4277 37.5625 65.625 39.7598 65.625 42.25ZM0 23.5C0 21.0098 2.05078 18.8125 4.6875 18.8125H60.9375C63.4277 18.8125 65.625 21.0098 65.625 23.5C65.625 26.1367 63.4277 28.1875 60.9375 28.1875H4.6875C2.05078 28.1875 0 26.1367 0 23.5ZM65.625 61C65.625 63.6367 63.4277 65.6875 60.9375 65.6875H4.6875C2.05078 65.6875 0 63.6367 0 61C0 58.5098 2.05078 56.3125 4.6875 56.3125H60.9375C63.4277 56.3125 65.625 58.5098 65.625 61Z"
+      fill="currentColor"
+    />
+  </svg>
+);
+
+export const AlignCenter = () => (
+  <svg width="20" height="20" viewBox="0 0 66 66" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      d="M51.5625 4.75C51.5625 7.38672 49.3652 9.4375 46.875 9.4375H18.75C16.1133 9.4375 14.0625 7.38672 14.0625 4.75C14.0625 2.25977 16.1133 0.0625 18.75 0.0625H46.875C49.3652 0.0625 51.5625 2.25977 51.5625 4.75ZM65.625 23.5C65.625 26.1367 63.4277 28.1875 60.9375 28.1875H4.6875C2.05078 28.1875 0 26.1367 0 23.5C0 21.0098 2.05078 18.8125 4.6875 18.8125H60.9375C63.4277 18.8125 65.625 21.0098 65.625 23.5ZM0 61C0 58.5098 2.05078 56.3125 4.6875 56.3125H60.9375C63.4277 56.3125 65.625 58.5098 65.625 61C65.625 63.6367 63.4277 65.6875 60.9375 65.6875H4.6875C2.05078 65.6875 0 63.6367 0 61ZM51.5625 42.25C51.5625 44.8867 49.3652 46.9375 46.875 46.9375H18.75C16.1133 46.9375 14.0625 44.8867 14.0625 42.25C14.0625 39.7598 16.1133 37.5625 18.75 37.5625H46.875C49.3652 37.5625 51.5625 39.7598 51.5625 42.25Z"
+      fill="currentColor"
+    />
+  </svg>
+);
+
+export const AlignJustify = () => (
+  <svg width="20" height="20" viewBox="0 0 66 66" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+      d="M65.625 4.75C65.625 7.38672 63.4277 9.4375 60.9375 9.4375H4.6875C2.05078 9.4375 0 7.38672 0 4.75C0 2.25977 2.05078 0.0625 4.6875 0.0625H60.9375C63.4277 0.0625 65.625 2.25977 65.625 4.75ZM65.625 42.25C65.625 44.8867 63.4277 46.9375 60.9375 46.9375H4.6875C2.05078 46.9375 0 44.8867 0 42.25C0 39.7598 2.05078 37.5625 4.6875 37.5625H60.9375C63.4277 37.5625 65.625 39.7598 65.625 42.25ZM0 23.5C0 21.0098 2.05078 18.8125 4.6875 18.8125H60.9375C63.4277 18.8125 65.625 21.0098 65.625 23.5C65.625 26.1367 63.4277 28.1875 60.9375 28.1875H4.6875C2.05078 28.1875 0 26.1367 0 23.5ZM65.625 61C65.625 63.6367 63.4277 65.6875 60.9375 65.6875H4.6875C2.05078 65.6875 0 63.6367 0 61C0 58.5098 2.05078 56.3125 4.6875 56.3125H60.9375C63.4277 56.3125 65.625 58.5098 65.625 61Z"
+      fill="currentColor"
+    />
+  </svg>
+);
+
+export default ({ getValue, onChange }) => {
+  const [open, setOpen] = useState(false);
+  const value = getValue();
+  const text = value.texts.get(0);
+
+  let type;
+
+  if (text) {
+    const blockParent = value.document.getParent(text.key);
+    const data = blockParent.data.toJSON();
+
+    if (data?.attributes?.align) {
+      type = data?.attributes?.align;
+    }
+  }
+
+  let icon;
+
+  switch (type) {
+    case 'right':
+      icon = <AlignRight />;
+      break;
+    case 'center':
+      icon = <AlignCenter />;
+      break;
+    case 'justify':
+      icon = <AlignJustify />;
+      break;
+    default:
+      icon = <AlignLeft />;
+      break;
+  }
+
+  const applyAlignment = (event) => {
+    if (value.texts.size) {
+      const alignType = event.target?.closest('div')?.getAttribute('value');
+
+      if (alignType) {
+        let c = value.change();
+
+        value.texts.forEach((text) => {
+          const blockParent = value.document.getParent(text.key);
+
+          c = c.setNodeByKey(blockParent.key, {
+            data: { ...blockParent.data, attributes: { ...blockParent.data?.attributes, align: alignType } },
+          });
+        });
+
+        onChange(c);
+      }
+    }
+
+    setOpen(false);
+  };
+
+  const onMouseDown = (event) => {
+    event.preventDefault();
+    event.stopPropagation();
+    setOpen(!open);
+  };
+
+  return (
+    <div>
+      <div style={{ display: 'flex', alignItems: 'center' }} onClick={onMouseDown}>
+        {icon}
+        <span style={{ marginLeft: '5px', fontSize: '8px' }}>&#9660;</span>
+      </div>
+      <Collapse in={open} timeout="auto" unmountOnExit style={{ position: 'absolute' }}>
+        <List
+          component="div"
+          disablePadding
+          style={{
+            background: '#fff',
+            display: 'flex',
+            flexDirection: 'row',
+            padding: 0,
+          }}
+        >
+          <ListItem button type="submit" value="left" aria-label="Align text left" onClick={applyAlignment}>
+            <AlignLeft />
+          </ListItem>
+
+          <ListItem button type="submit" value="center" aria-label="Align text center" onClick={applyAlignment}>
+            <AlignCenter />
+          </ListItem>
+
+          <ListItem button type="submit" value="right" aria-label="Align text right" onClick={applyAlignment}>
+            <AlignRight />
+          </ListItem>
+
+          <ListItem button type="submit" value="justify" aria-label="Justify text" onClick={applyAlignment}>
+            <AlignJustify />
+          </ListItem>
+        </List>
+      </Collapse>
+    </div>
+  );
+};

package/src/plugins/textAlign/index.jsx

@@ -0,0 +1,23 @@
+import React from 'react';
+import debug from 'debug';
+import TextAlignIcon from './icons';
+
+const log = debug('@pie-lib:editable-html:plugins:characters');
+
+/**
+ * Plugin in order to be able to change alignment for the selected text(s) element(s).
+ * @param opts
+ * @constructor
+ */
+export default function TextAlign(opts) {
+  const plugin = {
+    name: 'textAlign',
+    toolbar: {
+      icon: <TextAlignIcon {...opts} />,
+      ariaLabel: 'Text Align',
+      onClick: () => {},
+    },
+  };
+
+  return plugin;
+}