@pie-lib/editable-html 10.0.0-beta.6 → 10.0.0

package/src/plugins/toolbar/toolbar.jsx

@@ -1,22 +1,23 @@
-import React, { useEffect } from 'react';
-import { Change, Editor, Element as SlateElement, Text, Node } from 'slate';
-import { useSlate, useSlateSelection } from "slate-react";
+import React from 'react';
+import { Change } from 'slate';
 import Delete from '@material-ui/icons/Delete';
 import IconButton from '@material-ui/core/IconButton';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import debug from 'debug';
+import SlatePropTypes from 'slate-prop-types';
 import debounce from 'lodash/debounce';
 
 import { DoneButton } from './done-button';
 
+import { findSingleNode, findParentNode } from '../utils';
 import { withStyles } from '@material-ui/core/styles';
 import DefaultToolbar from './default-toolbar';
 import { removeDialogs as removeCharacterDialogs } from '../characters';
 
 const log = debug('@pie-lib:editable-html:plugins:toolbar');
 
-const getCustomToolbar = (plugin, node, nodePath, editor, handleDone) => {
+const getCustomToolbar = (plugin, node, value, handleDone, onDataChange) => {
   if (!plugin) {
     return;
   }
@@ -33,74 +34,58 @@ const getCustomToolbar = (plugin, node, nodePath, editor, handleDone) => {
     return plugin.toolbar.CustomToolbarComp;
   } else if (typeof plugin.toolbar.customToolbar === 'function') {
     log('deprecated - use CustomToolbarComp');
-    return plugin.toolbar.customToolbar(node, nodePath, editor, handleDone);
+    return plugin.toolbar.customToolbar(node, value, handleDone, onDataChange);
   }
 };
 
-const style = {
-  toolbar: {
-    position: 'absolute',
-    zIndex: 10,
-    cursor: 'pointer',
-    justifyContent: 'space-between',
-    background: 'var(--editable-html-toolbar-bg, #efefef)',
-    minWidth: '280px',
-    margin: '5px 0 0 0',
-    padding: '2px',
-    boxShadow:
-      '0px 1px 5px 0px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 3px 1px -2px rgba(0, 0, 0, 0.12)',
-    boxSizing: 'border-box',
-    display: 'none'
-  },
-  toolbarWithNoDone: {
-    minWidth: '265px'
-  },
-  toolbarTop: {
-    top: '-45px'
-  },
-  toolbarRight: {
-    right: 0
-  },
-  fullWidth: {
-    width: '100%'
-  },
-  autoWidth: {
-    width: 'auto'
-  },
-  focused: {
-    display: 'flex'
-  },
-  iconRoot: {
-    width: '28px',
-    height: '28px',
-    padding: '4px',
-    verticalAlign: 'top'
-  },
-  label: {
-    color: 'var(--editable-html-toolbar-check, #00bb00)'
-  },
-  shared: {
-    display: 'flex'
+export class Toolbar extends React.Component {
+  static propTypes = {
+    zIndex: PropTypes.number,
+    value: SlatePropTypes.value.isRequired,
+    plugins: PropTypes.array,
+    plugin: PropTypes.object,
+    onImageClick: PropTypes.func,
+    onDone: PropTypes.func.isRequired,
+    toolbarRef: PropTypes.func.isRequired,
+    classes: PropTypes.object.isRequired,
+    isFocused: PropTypes.bool,
+    autoWidth: PropTypes.bool,
+    onChange: PropTypes.func.isRequired,
+    getFocusedValue: PropTypes.func.isRequired,
+    pluginProps: PropTypes.object,
+    toolbarOpts: PropTypes.shape({
+      position: PropTypes.oneOf(['bottom', 'top']),
+      alignment: PropTypes.oneOf(['left', 'right']),
+      alwaysVisible: PropTypes.bool,
+      ref: PropTypes.func,
+      showDone: PropTypes.bool,
+    }),
+    onDataChange: PropTypes.func,
+  };
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      change: null,
+    };
   }
-};
 
-export const Toolbar = props => {
-  useEffect(() => {
-    return () => removeCharacterDialogs();
-  }, []);
+  componentWillUnmount() {
+    removeCharacterDialogs();
+  }
 
-  const hasMark = type => {
-    const { value } = props;
-    return value.marks.some(mark => mark.type === type);
+  hasMark = (type) => {
+    const { value } = this.props;
+    return value.marks.some((mark) => mark.type == type);
   };
 
-  const hasBlock = type => {
-    const { value } = props;
-    return value.blocks.some(node => node.type === type);
+  hasBlock = (type) => {
+    const { value } = this.props;
+    return value.blocks.some((node) => node.type == type);
   };
 
-  const onToggle = plugin => {
-    const { value, onChange } = props;
+  onToggle = (plugin) => {
+    const { value, onChange } = this.props;
 
     if (!plugin.onToggle) return;
 
@@ -108,24 +93,25 @@ export const Toolbar = props => {
     onChange(change);
   };
 
-  const onClick = e => {
+  onClick = (e) => {
     log('[onClick]');
     e.preventDefault();
   };
 
-  const onButtonClick = fn => {
-    return e => {
+  onButtonClick = (fn) => {
+    return (e) => {
       e.preventDefault();
       fn();
     };
   };
 
-  const onToolbarDone = (editor, finishEditing) => {
-    log('[onToolbarDone] change: ', editor, 'finishEditing: ', finishEditing);
-    const { onChange, onDone } = props;
+  onToolbarDone = (change, finishEditing) => {
+    log('[onToolbarDone] change: ', change, 'finishEditing: ', finishEditing);
+    const { onChange, onDone } = this.props;
 
-    if (editor) {
-      onChange(editor, () => {
+    // use handler only if this is an actual Slate Change
+    if (change instanceof Change) {
+      onChange(change, () => {
         if (finishEditing) {
           onDone();
         }
@@ -138,212 +124,192 @@ export const Toolbar = props => {
     }
   };
 
-  const onDeleteClick = debounce(
-    (e, plugin, node, nodePath, editor, onChange) => plugin.deleteNode(e, node, nodePath, editor, onChange),
-    500
-  );
+  onDeleteClick = debounce((e, plugin, node, value, onChange) => plugin.deleteNode(e, node, value, onChange), 500);
 
-  const onDeleteMouseDown = e => {
+  onDeleteMouseDown = (e, plugin, node, value, onChange) => {
     e.persist();
-    onDeleteClick(e, plugin, node, nodePath, editor, onChange);
+    this.onDeleteClick(e, plugin, node, value, onChange);
   };
 
-  const {
-    classes,
-    plugins,
-    pluginProps,
-    toolbarOpts,
-    value,
-    autoWidth,
-    onChange,
-    getFocusedValue,
-    isFocused,
-    onDone,
-    toolbarRef
-  } = props;
-
-  const editor = useSlate();
-  const selection = useSlateSelection();
-  const getNode = (editor, selection, depth) => {
-    if (!selection) {
-      return null;
-    }
-
-    // this means we have selected text
-    if (selection.anchor.offset !== selection.focus.offset) {
-      return null;
-    }
-
-    const [node, path] = Editor.node(editor, selection, depth ? { depth } : undefined);
-
-    if (!node) {
-      return null;
-    }
-
-    if (!Text.isText(node)) {
-      return [node, path];
-    }
-
-    return getNode(editor, selection, path.length - 1);
-  };
-  const getParentNode = (editor, path) => Array.isArray(path) && path.length > 0 && Editor.parent(editor, path);
-
-  const [node, nodePath] = getNode(editor, selection) || [];
-  const [parentNode] = getParentNode(editor, nodePath) || [];
+  render() {
+    const {
+      classes,
+      plugins,
+      pluginProps,
+      toolbarOpts,
+      value,
+      autoWidth,
+      onChange,
+      getFocusedValue,
+      isFocused,
+      onDone,
+      toolbarRef,
+    } = this.props;
+
+    const node = findSingleNode(value);
+    const parentNode = findParentNode(value, node);
+
+    log(' --------------> [render] node: ', node);
+    log('[render] node: ', node);
+
+    const plugin = plugins.find((p) => {
+      if (!node) {
+        return;
+      }
 
-  log(' --------------> [render] node: ', node);
-  log('[render] node: ', node);
+      if (p.toolbar) {
+        return p.toolbar.supports && p.toolbar.supports(node, value);
+      }
+    });
+    const parentPlugin = plugins.find((p) => {
+      if (!parentNode) {
+        return;
+      }
 
-  const plugin = plugins.find(p => {
-    if (!node) {
-      return;
-    }
+      if (p.toolbar) {
+        return p.toolbar.supports && p.toolbar.supports(parentNode, value);
+      }
+    });
 
-    if (p.toolbar) {
-      return p.supports && p.supports(node, editor, value);
-    }
-  });
-  const parentPlugin = plugins.find(p => {
-    if (!parentNode) {
-      return;
-    }
+    log('[render] plugin: ', plugin);
 
-    if (p.toolbar) {
-      return p.supports && p.supports(parentNode, editor, value);
-    }
-  });
+    const handleDone = (change, done) => {
+      let handler = onDone;
 
-  log('[render] plugin: ', plugin);
+      if (plugin && plugin.toolbar && plugin.toolbar.customToolbar) {
+        handler = this.onToolbarDone;
+      }
 
-  const handleDone = done => {
-    const isDone = done ? editor : null;
-    let handler = onDone;
+      handler(change, done);
 
-    if (plugin && plugin.toolbar && plugin.toolbar.customToolbar) {
-      handler = onToolbarDone;
-    }
+      if (parentPlugin && parentPlugin.handleDone) {
+        parentPlugin.handleDone(value, node, plugin, onChange);
+      }
+    };
 
-    if (isDone) {
-      editor.selection = null;
-    }
+    const handleDataChange = (key, data) => {
+      this.props.onDataChange(key, data);
+    };
 
-    handler(isDone);
+    const CustomToolbar = getCustomToolbar(plugin, node, value, handleDone, this.props.onDataChange);
 
-    if (parentPlugin && parentPlugin.handleDone) {
-      parentPlugin.handleDone(isDone, node, plugin);
-    }
-  };
+    const filteredPlugins = plugin && plugin.filterPlugins ? plugin.filterPlugins(node, plugins) : plugins;
 
-  const CustomToolbar =
-    getCustomToolbar(plugin, node, nodePath, editor, handleDone) ||
-    getCustomToolbar(parentPlugin, node, nodePath, editor, handleDone);
-
-  const filteredPlugins =
-    plugin && plugin.filterPlugins ? plugin.filterPlugins(node, plugins) : plugins;
-
-  log('[render] CustomToolbar: ', CustomToolbar);
-  const parentExtraStyles =
-    parentPlugin && parentPlugin.pluginStyles
-      ? parentPlugin.pluginStyles(node, parentNode, plugin)
-      : {};
-  const pluginExtraStyles =
-    plugin && plugin.pluginStyles ? plugin.pluginStyles(node, parentNode, plugin) : {};
-  const extraStyles = {
-    ...pluginExtraStyles,
-    ...parentExtraStyles
-  };
+    log('[render] CustomToolbar: ', CustomToolbar);
+    const parentExtraStyles =
+      parentPlugin && parentPlugin.pluginStyles ? parentPlugin.pluginStyles(node, parentNode, plugin) : {};
+    const pluginExtraStyles = plugin && plugin.pluginStyles ? plugin.pluginStyles(node, parentNode, plugin) : {};
+    const extraStyles = {
+      ...pluginExtraStyles,
+      ...parentExtraStyles,
+    };
 
-  const deletable = node && plugin && typeof plugin.deleteNode === 'function';
-  const customToolbarShowDone =
-    node && plugin && plugin.toolbar && plugin.toolbar.showDone && !toolbarOpts.alwaysVisible;
-
-  // If there is a toolbarOpts we check if the showDone is not equal to false
-  const defaultToolbarShowDone = !toolbarOpts || toolbarOpts.showDone !== false;
-
-  const hasDoneButton = defaultToolbarShowDone || customToolbarShowDone;
-
-  const names = classNames(classes.toolbar, {
-    [classes.toolbarWithNoDone]: !hasDoneButton,
-    [classes.toolbarTop]: toolbarOpts.position === 'top',
-    [classes.toolbarRight]: toolbarOpts.alignment === 'right',
-    [classes.focused]: toolbarOpts.alwaysVisible || isFocused,
-    [classes.autoWidth]: autoWidth,
-    [classes.fullWidth]: !autoWidth,
-  });
-
-  return (
-    <div className={names} style={extraStyles} onClick={onClick} ref={toolbarRef}>
-      {CustomToolbar ? (
-        <CustomToolbar
-          editor={editor}
-          node={node}
-          nodePath={nodePath}
-          value={value}
-          onToolbarDone={onToolbarDone}
-          pluginProps={pluginProps}
-        />
-      ) : (
-        <DefaultToolbar
-          editor={editor}
-          nodePath={nodePath}
-          plugins={filteredPlugins}
-          pluginProps={pluginProps}
-          value={value}
-          onChange={onChange}
-          getFocusedValue={getFocusedValue}
-          showDone={defaultToolbarShowDone}
-          onDone={handleDone}
-          deletable={deletable}
-        />
-      )}
-
-      <div className={classes.shared}>
-        {deletable && (
-          <IconButton
-            aria-label="Delete"
-            className={classes.iconRoot}
-            onMouseDown={e => onDeleteMouseDown(e)}
-            classes={{
-              root: classes.iconRoot
-            }}
-          >
-            <Delete />
-          </IconButton>
+    const deletable = node && plugin && plugin.deleteNode;
+    const customToolbarShowDone =
+      node && plugin && plugin.toolbar && plugin.toolbar.showDone && !toolbarOpts.alwaysVisible;
+
+    // If there is a toolbarOpts we check if the showDone is not equal to false
+    const defaultToolbarShowDone = !toolbarOpts || toolbarOpts.showDone !== false;
+
+    const hasDoneButton = defaultToolbarShowDone || customToolbarShowDone;
+
+    const names = classNames(classes.toolbar, {
+      [classes.toolbarWithNoDone]: !hasDoneButton,
+      [classes.toolbarTop]: toolbarOpts.position === 'top',
+      [classes.toolbarRight]: toolbarOpts.alignment === 'right',
+      [classes.focused]: toolbarOpts.alwaysVisible || isFocused,
+      [classes.autoWidth]: autoWidth,
+      [classes.fullWidth]: !autoWidth,
+    });
+
+    return (
+      <div className={names} style={extraStyles} onClick={this.onClick} ref={toolbarRef}>
+        {CustomToolbar ? (
+          <CustomToolbar
+            node={node}
+            value={value}
+            onToolbarDone={this.onToolbarDone}
+            onDataChange={handleDataChange}
+            pluginProps={pluginProps}
+          />
+        ) : (
+          <DefaultToolbar
+            plugins={filteredPlugins}
+            pluginProps={pluginProps}
+            value={value}
+            onChange={onChange}
+            getFocusedValue={getFocusedValue}
+            showDone={defaultToolbarShowDone}
+            onDone={handleDone}
+            deletable={deletable}
+            isHtmlMode={toolbarOpts.isHtmlMode}
+          />
         )}
-        {customToolbarShowDone && <DoneButton onClick={handleDone} />}
+
+        <div className={classes.shared}>
+          {deletable && (
+            <IconButton
+              aria-label="Delete"
+              className={classes.iconRoot}
+              onMouseDown={(e) => this.onDeleteMouseDown(e, plugin, node, value, onChange)}
+              classes={{
+                root: classes.iconRoot,
+              }}
+            >
+              <Delete />
+            </IconButton>
+          )}
+          {customToolbarShowDone && <DoneButton onClick={handleDone} />}
+        </div>
       </div>
-    </div>
-  );
-};
+    );
+  }
+}
 
-Toolbar.propTypes = {
-  editor: PropTypes.object.isRequired,
-  zIndex: PropTypes.number,
-  value: PropTypes.arrayOf(
-    PropTypes.shape({
-      type: PropTypes.string,
-      children: PropTypes.array,
-      data: PropTypes.object
-    })
-  ),
-  plugins: PropTypes.array,
-  plugin: PropTypes.object,
-  onImageClick: PropTypes.func,
-  onDone: PropTypes.func.isRequired,
-  toolbarRef: PropTypes.func.isRequired,
-  classes: PropTypes.object.isRequired,
-  isFocused: PropTypes.bool,
-  autoWidth: PropTypes.bool,
-  onChange: PropTypes.func.isRequired,
-  getFocusedValue: PropTypes.func.isRequired,
-  pluginProps: PropTypes.object,
-  toolbarOpts: PropTypes.shape({
-    position: PropTypes.oneOf(['bottom', 'top']),
-    alignment: PropTypes.oneOf(['left', 'right']),
-    alwaysVisible: PropTypes.bool,
-    ref: PropTypes.func,
-    showDone: PropTypes.bool
-  })
+const style = {
+  toolbar: {
+    position: 'absolute',
+    zIndex: 10,
+    cursor: 'pointer',
+    justifyContent: 'space-between',
+    background: 'var(--editable-html-toolbar-bg, #efefef)',
+    minWidth: '280px',
+    margin: '5px 0 0 0',
+    padding: '2px',
+    boxShadow:
+      '0px 1px 5px 0px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 3px 1px -2px rgba(0, 0, 0, 0.12)',
+    boxSizing: 'border-box',
+    display: 'none',
+  },
+  toolbarWithNoDone: {
+    minWidth: '265px',
+  },
+  toolbarTop: {
+    top: '-45px',
+  },
+  toolbarRight: {
+    right: 0,
+  },
+  fullWidth: {
+    width: '100%',
+  },
+  autoWidth: {
+    width: 'auto',
+  },
+  focused: {
+    display: 'flex',
+  },
+  iconRoot: {
+    width: '28px',
+    height: '28px',
+    padding: '4px',
+    verticalAlign: 'top',
+  },
+  label: {
+    color: 'var(--editable-html-toolbar-check, #00bb00)',
+  },
+  shared: {
+    display: 'flex',
+  },
 };
-
 export default withStyles(style, { index: 1000 })(Toolbar);

package/src/plugins/utils.js

@@ -1,6 +1,4 @@
-import { Editor, Element as SlateElement } from "slate";
-
-export const findSingleNode = value => {
+export const findSingleNode = (value) => {
   if (!value || !value.isCollapsed || !value.startKey) {
     return;
   }
@@ -30,19 +28,4 @@ export const hasMark = (value, type) => value && value.marks.some((mark) => mark
 
 export const hasBlock = (value, type) => value && value.blocks.some((node) => node.type == type);
 
-export const isBlockActive = (editor, format, blockType = 'type') => {
-  const { selection } = editor;
-  if (!selection) return false;
-
-  const [match] = Array.from(
-    Editor.nodes(editor, {
-      at: Editor.unhangRange(editor, selection),
-      match: n => !Editor.isEditor(n) && SlateElement.isElement(n) && n[blockType] === format
-    })
-  );
-
-  return !!match;
-};
-
-export const hasNode = ({ document }, type) =>
-  document && document.nodes.some(node => node.type == type);
+export const hasNode = ({ document }, type) => document && document.nodes.some((node) => node.type == type);

package/src/serialization.jsx

@@ -119,7 +119,7 @@ const blocks = {
   serialize: (object, children) => {
     if (object.object !== 'block') return;
 
-    const jsonData = object.data;
+    const jsonData = object.data.toJSON();
 
     log('[blocks:serialize] object: ', object, children);
     let key;