@pie-lib/editable-html 7.17.4-next.50 → 7.17.4-next.501

package/src/index.jsx

@@ -17,6 +17,17 @@ export { htmlToValue, valueToHtml, Editor, DEFAULT_PLUGINS, ALL_PLUGINS };
  * compare it. TODO: This is an interim fix, we'll need to strip back `Editor` and look how best to maintain the
  * `markup` api whilst avoiding the serialization mismatch. We should be making better use of schemas w/ normalize.
  */
+
+const reduceMultipleBrs = markup => {
+  try {
+    return markup.replace(/(<br\s*\/?>){3,}/gi, '<br>');
+  } catch (e) {
+    console.log("Couldn't remove <br/> tags: ", e);
+  }
+
+  return markup;
+};
+
 export default class EditableHtml extends React.Component {
   static propTypes = {
     onChange: PropTypes.func.isRequired,
@@ -44,10 +55,10 @@ export default class EditableHtml extends React.Component {
       return;
     }
 
-    const v = htmlToValue(props.markup);
-    const current = htmlToValue(this.props.markup);
+    const v = htmlToValue(reduceMultipleBrs(props.markup));
+    const current = htmlToValue(reduceMultipleBrs(this.props.markup));
 
-    if (!v.equals(current)) {
+    if (v.equals && !v.equals(current)) {
       this.setState({ value: v });
     }
   }
@@ -84,9 +95,9 @@ export default class EditableHtml extends React.Component {
         c.focus();
 
         if (position === 'end' && lastText) {
-          c.moveFocusTo(lastText.key, lastText.text.length).moveAnchorTo(
+          c.moveFocusTo(lastText.key, lastText.text?.length).moveAnchorTo(
             lastText.key,
-            lastText.text.length
+            lastText.text?.length
           );
         }
 
@@ -105,6 +116,12 @@ export default class EditableHtml extends React.Component {
 
   render() {
     const { value } = this.state;
+    const { toolbarOpts, error } = this.props;
+
+    if (toolbarOpts) {
+      toolbarOpts.error = error;
+    }
+
     const props = {
       ...this.props,
       markup: null,

package/src/plugins/characters/custom-popper.js

@@ -0,0 +1,48 @@
+import React from 'react';
+import { withStyles } from '@material-ui/core/styles';
+import Popper from '@material-ui/core/Popper';
+import Typography from '@material-ui/core/Typography';
+
+const styles = () => ({
+  popover: {
+    background: '#fff',
+    padding: '10px',
+    pointerEvents: 'none',
+    zIndex: 99999
+  },
+  paper: {
+    padding: 20,
+    height: 'auto',
+    width: 'auto'
+  },
+  typography: {
+    fontSize: 50,
+    textAlign: 'center'
+  }
+});
+
+const CustomPopper = withStyles(styles)(({ classes, children, ...props }) => (
+  <Popper
+    id="mouse-over-popover"
+    open
+    className={classes.popover}
+    classes={{
+      paper: classes.paper
+    }}
+    anchorOrigin={{
+      vertical: 'bottom',
+      horizontal: 'left'
+    }}
+    transformOrigin={{
+      vertical: 'top',
+      horizontal: 'left'
+    }}
+    disableRestoreFocus
+    disableAutoFocus
+    {...props}
+  >
+    <Typography classes={{ root: classes.typography }}>{children}</Typography>
+  </Popper>
+));
+
+export default CustomPopper;

package/src/plugins/characters/index.jsx

@@ -0,0 +1,268 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import debug from 'debug';
+import get from 'lodash/get';
+
+import { PureToolbar } from '@pie-lib/math-toolbar';
+
+import CustomPopper from './custom-popper';
+import { insertSnackBar } from '../respArea/utils';
+import { characterIcons, spanishConfig, specialConfig } from './utils';
+const log = debug('@pie-lib:editable-html:plugins:characters');
+
+const removePopOvers = () => {
+  const prevPopOvers = document.querySelectorAll('#mouse-over-popover');
+
+  log('[characters:removePopOvers]');
+  prevPopOvers.forEach(s => s.remove());
+};
+
+export const removeDialogs = () => {
+  const prevDialogs = document.querySelectorAll('.insert-character-dialog');
+
+  log('[characters:removeDialogs]');
+  prevDialogs.forEach(s => s.remove());
+  removePopOvers();
+};
+
+const insertDialog = ({ editorDOM, value, callback, opts }) => {
+  const newEl = document.createElement('div');
+
+  log('[characters:insertDialog]');
+
+  removeDialogs();
+
+  newEl.className = 'insert-character-dialog';
+
+  let configToUse;
+
+  switch (true) {
+    case opts.language === 'spanish':
+      configToUse = spanishConfig;
+      break;
+    case opts.language === 'special':
+      configToUse = specialConfig;
+      break;
+    default:
+      configToUse = opts;
+  }
+
+  if (!configToUse.characters) {
+    insertSnackBar('No characters provided or language not recognized');
+    return;
+  }
+
+  const layoutForCharacters = configToUse.characters.reduce(
+    (obj, arr) => {
+      if (arr.length >= obj.columns) {
+        obj.columns = arr.length;
+      }
+
+      return obj;
+    },
+    { rows: configToUse.characters.length, columns: 0 }
+  );
+
+  let popoverEl;
+
+  const closePopOver = () => {
+    if (popoverEl) {
+      popoverEl.remove();
+    }
+
+    removePopOvers();
+  };
+
+  const renderPopOver = (event, el) => {
+    if (!event) {
+      return;
+    }
+
+    const infoStyle = { fontSize: '20px', lineHeight: '20px' };
+
+    closePopOver();
+
+    popoverEl = document.createElement('div');
+    ReactDOM.render(
+      <CustomPopper onClose={closePopOver} anchorEl={event.currentTarget}>
+        <div>{el.label}</div>
+
+        <div style={infoStyle}>{el.description}</div>
+
+        <div style={infoStyle}>{el.unicode}</div>
+      </CustomPopper>,
+      popoverEl
+    );
+
+    document.body.appendChild(newEl);
+  };
+
+  let firstCallMade = false;
+
+  const listener = e => {
+    // this will be triggered right after setting it because
+    // this toolbar is added on the mousedown event
+    // so right after mouseup, the click will be triggered
+    if (firstCallMade) {
+      const focusIsInModals =
+        newEl.contains(e.target) || (popoverEl && popoverEl.contains(e.target));
+      const focusIsInEditor = editorDOM.contains(e.target);
+
+      if (!(focusIsInModals || focusIsInEditor)) {
+        handleClose();
+      }
+    } else {
+      firstCallMade = true;
+    }
+  };
+
+  const handleClose = () => {
+    callback(undefined, true);
+    newEl.remove();
+    closePopOver();
+    document.body.removeEventListener('click', listener);
+  };
+
+  const handleChange = val => {
+    if (typeof val === 'string') {
+      callback(val, true);
+    }
+  };
+
+  const el = (
+    <PureToolbar
+      autoFocus
+      noDecimal
+      hideInput
+      noLatexHandling
+      layoutForKeyPad={layoutForCharacters}
+      additionalKeys={configToUse.characters.reduce((arr, n) => {
+        arr = [
+          ...arr,
+          ...n.map(k => ({
+            name: get(k, 'name') || k,
+            write: get(k, 'write') || k,
+            label: get(k, 'label') || k,
+            category: 'character',
+            extraClass: 'character',
+            extraProps: {
+              ...(k.extraProps || {}),
+              style: {
+                ...(k.extraProps || {}).style,
+                border: '1px solid #000'
+              }
+            },
+            ...(configToUse.hasPreview
+              ? {
+                  actions: { onMouseEnter: ev => renderPopOver(ev, k), onMouseLeave: closePopOver }
+                }
+              : {})
+          }))
+        ];
+
+        return arr;
+      }, [])}
+      keypadMode="language"
+      onChange={handleChange}
+      onDone={handleClose}
+    />
+  );
+
+  ReactDOM.render(el, newEl, () => {
+    const cursorItem = document.querySelector(`[data-key="${value.anchorKey}"]`);
+
+    if (cursorItem) {
+      const bodyRect = document.body.getBoundingClientRect();
+      const boundRect = cursorItem.getBoundingClientRect();
+
+      document.body.appendChild(newEl);
+      newEl.style.position = 'absolute';
+      newEl.style.top = `${boundRect.top + Math.abs(bodyRect.top) - newEl.offsetHeight - 10}px`;
+      newEl.style.zIndex = 99999;
+
+      const leftValue = `${boundRect.left +
+        Math.abs(bodyRect.left) +
+        cursorItem.offsetWidth +
+        10}px`;
+
+      const rightValue = `${boundRect.x}px`;
+
+      newEl.style.left = leftValue;
+
+      const leftAlignedWidth = newEl.offsetWidth;
+
+      newEl.style.left = 'unset';
+      newEl.style.right = rightValue;
+
+      const rightAlignedWidth = newEl.offsetWidth;
+
+      newEl.style.left = 'unset';
+      newEl.style.right = 'unset';
+
+      if (leftAlignedWidth >= rightAlignedWidth) {
+        newEl.style.left = leftValue;
+      } else {
+        newEl.style.right = rightValue;
+      }
+
+      document.body.addEventListener('click', listener);
+    }
+  });
+};
+
+const CharacterIcon = ({ letter }) => (
+  <div
+    style={{
+      fontSize: '25px',
+      lineHeight: '15px'
+    }}
+  >
+    {letter}
+  </div>
+);
+
+export default function CharactersPlugin(opts) {
+  removeDialogs();
+  return {
+    name: 'characters',
+    toolbar: {
+      icon: <CharacterIcon letter={opts.characterIcon || characterIcons[opts.language] || 'ñ'} />,
+      onClick: (value, onChange, getFocusedValue) => {
+        const editorDOM = document.querySelector(`[data-key="${value.document.key}"]`);
+        let valueToUse = value;
+        const callback = (char, focus) => {
+          valueToUse = getFocusedValue();
+
+          if (char) {
+            const change = valueToUse
+              .change()
+              .insertTextByKey(valueToUse.anchorKey, valueToUse.anchorOffset, char);
+
+            valueToUse = change.value;
+            log('[characters:insert]: ', value);
+            onChange(change);
+          }
+
+          log('[characters:click]');
+
+          if (focus) {
+            if (editorDOM) {
+              editorDOM.focus();
+            }
+          }
+        };
+
+        insertDialog({ editorDOM, value: valueToUse, callback, opts });
+      }
+    },
+
+    pluginStyles: (node, parentNode, p) => {
+      if (p) {
+        return {
+          position: 'absolute',
+          top: 'initial'
+        };
+      }
+    }
+  };
+}