@contentful/field-editor-rich-text 0.26.0-next → 0.26.4-next

package/dist/field-editor-rich-text.esm.js

@@ -1,4 +1,4 @@
-import React__default, { useState, useEffect, createElement, useMemo, Fragment, useCallback } from 'react';
+import React__default, { createElement, useMemo, useState, useEffect, Fragment, useCallback } from 'react';
 import noop from 'lodash-es/noop';
 import { toContentfulDocument, toSlatejsDocument } from '@contentful/contentful-slatejs-adapter';
 import { TOP_LEVEL_BLOCKS, BLOCKS, CONTAINERS, VOID_BLOCKS, INLINES, LIST_ITEM_BLOCKS, MARKS, EMPTY_DOCUMENT } from '@contentful/rich-text-types';
@@ -544,25 +544,9 @@ function getContentfulEditorId(sdk) {
 }
 
 function useContentfulEditorHook(_ref) {
-  var _editor$selection;
-
   var sdk = _ref.sdk;
   var editorId = getContentfulEditorId(sdk);
   var editor = useStoreEditorRef(editorId);
-
-  var _React$useState = useState((_editor$selection = editor == null ? void 0 : editor.selection) != null ? _editor$selection : null),
-      selection = _React$useState[0],
-      setSelection = _React$useState[1];
-
-  useEffect(function () {
-    if (!(editor != null && editor.selection)) return;
-    setSelection(editor.selection);
-  }, [editor == null ? void 0 : editor.selection]);
-
-  if (editor && !(editor != null && editor.selection) && selection) {
-    editor.selection = selection;
-  }
-
   return editor;
 }
 
@@ -673,6 +657,7 @@ var VALIDATIONS = {
   ENABLED_MARKS: 'enabledMarks',
   ENABLED_NODE_TYPES: 'enabledNodeTypes'
 };
+var DEFAULT_ENABLED_NODE_TYPES = [BLOCKS.DOCUMENT, BLOCKS.PARAGRAPH, 'text'];
 
 var getRichTextValidation = function getRichTextValidation(field, validationType) {
   return flow(function (v) {
@@ -683,13 +668,14 @@ var getRichTextValidation = function getRichTextValidation(field, validationType
 };
 
 var isFormattingOptionEnabled = function isFormattingOptionEnabled(field, validationType, nodeTypeOrMark) {
-  var enabledFormattings = getRichTextValidation(field, validationType);
+  var enabledFormattings = getRichTextValidation(field, validationType); // TODO: In the future, validations will always be opt-in. In that case
+  // we don't need this step.
 
   if (enabledFormattings === undefined) {
     return true;
   }
 
-  return enabledFormattings.includes(nodeTypeOrMark);
+  return DEFAULT_ENABLED_NODE_TYPES.concat(enabledFormattings).includes(nodeTypeOrMark);
 };
 
 var isNodeTypeEnabled = function isNodeTypeEnabled(field, nodeType) {
@@ -2528,11 +2514,10 @@ function AssetDropdownMenu(_ref) {
       onRemove = _ref.onRemove,
       isDisabled = _ref.isDisabled,
       entityFile = _ref.entityFile;
-  var fileName = entityFile.fileName,
-      mimeType = entityFile.contentType,
-      details = entityFile.details;
-  var fileSize = details.size,
-      image = details.image;
+  var fileName = get(entityFile, 'fileName');
+  var fileSize = get(entityFile, 'details.size');
+  var image = get(entityFile, 'details.image');
+  var mimeType = get(entityFile, 'contentType');
 
   function downloadAsset() {
     if (!entityFile) return;
@@ -3705,6 +3690,8 @@ function addTableTrackingEvents(editor, _ref) {
           });
         }
       }, 1);
+    } else {
+      insertData(data);
     }
   };
 }
@@ -4111,29 +4098,11 @@ function EmbeddedEntityBlockToolbarIcon(_ref) {
   var editor = useContentfulEditor();
   var sdk = useSdkContext();
 
-  var handleClick = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(event) {
-      return runtime_1.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              event.preventDefault();
-              onClose();
-              _context.next = 4;
-              return selectEntityAndInsert(nodeType, sdk, editor, logAction || noop);
-
-            case 4:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee);
-    }));
-
-    return function handleClick(_x) {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+  var handleClick = function handleClick(event) {
+    event.preventDefault();
+    onClose();
+    selectEntityAndInsert(nodeType, sdk, editor, logAction || noop);
+  };
 
   var type = getEntityTypeFromNodeType(nodeType);
   var baseClass = "rich-text__" + nodeType;
@@ -4751,12 +4720,18 @@ var StickyToolbarWrapper = function StickyToolbarWrapper(_ref) {
   }, children);
 };
 
+var isHTMLElement = function isHTMLElement(node) {
+  return node.nodeType === Node.ELEMENT_NODE;
+};
 var removeChildNodes = function removeChildNodes(node, predicate) {
+  if (predicate === void 0) {
+    predicate = Boolean;
+  }
+
   return Array.from(node.childNodes).filter(predicate).forEach(function (table) {
     return node.removeChild(table);
   });
 };
-
 var removeChildNodesUsingPredicate = function removeChildNodesUsingPredicate(predicate) {
   return function (nodeList) {
     var nodes = Array.from(nodeList);
@@ -4791,10 +4766,6 @@ var TAG_NAME_TABLE = 'TABLE';
 var TAG_NAME_TABLE_CAPTION = 'CAPTION';
 var DISALLOWED_TABLE_CHILD_ELEMENTS = [TAG_NAME_TABLE_CAPTION];
 
-var isHTMLElement = function isHTMLElement(node) {
-  return node.nodeType === Node.ELEMENT_NODE;
-};
-
 var isTableElement = function isTableElement(node) {
   return isHTMLElement(node) && node.tagName === TAG_NAME_TABLE;
 };
@@ -4843,12 +4814,40 @@ var sanitizeTables = function sanitizeTables(_ref) {
   return [doc, editor];
 };
 
+/**
+ * Ensures the text selection from entity block elements is
+ * not included in the paste buffer.
+ */
+
+var sanitizeEntityBlocks = function sanitizeEntityBlocks(_ref) {
+  var doc = _ref[0],
+      editor = _ref[1];
+  var nodes = Array.from(doc.childNodes);
+
+  while (nodes.length > 0) {
+    var node = nodes.pop();
+
+    if (isHTMLElement(node) && node.getAttribute('data-entity-type')) {
+      removeChildNodes(node);
+      continue;
+    }
+
+    for (var _i = 0, _Array$from = Array.from(node.childNodes); _i < _Array$from.length; _i++) {
+      var childNode = _Array$from[_i];
+      nodes.push(childNode);
+    }
+  }
+
+  return [doc, editor];
+};
+
 
 
 var sanitizers = {
   __proto__: null,
   removeComments: removeComments,
-  sanitizeTables: sanitizeTables
+  sanitizeTables: sanitizeTables,
+  sanitizeEntityBlocks: sanitizeEntityBlocks
 };
 
 var MIME_TYPE_HTML = 'text/html'; // TODO: Upgrade tslib so we can just flow(...sanitizers);
@@ -4883,6 +4882,8 @@ function withPasteHandling(editor) {
         var sanitized = sanitizeHtml(html, editor);
         var newData = htmlToDataTransfer(sanitized);
         insertData(newData);
+      } else {
+        insertData(data);
       }
     };
   };
@@ -4907,23 +4908,9 @@ function createParagraphPlugin() {
     renderElement: getRenderElement(elementKeys),
     pluginKeys: elementKeys,
     onKeyDown: getToggleElementOnKeyDown(BLOCKS.PARAGRAPH),
-    deserialize: function deserialize(editor) {
-      var options = getPlatePluginOptions(editor, BLOCKS.PARAGRAPH);
-      return {
-        element: [_extends({
-          type: BLOCKS.PARAGRAPH,
-          deserialize: function deserialize(element) {
-            var isParagraphText = element.nodeName === 'P';
-            var isNotEmpty = element.textContent !== '';
-            var isText = isParagraphText && isNotEmpty;
-            if (!isText) return;
-            return {
-              type: BLOCKS.PARAGRAPH
-            };
-          }
-        }, options.deserialize)]
-      };
-    }
+    deserialize: deserializeElement(BLOCKS.PARAGRAPH, [{
+      nodeNames: ['P']
+    }])
   };
 }
 var withParagraphOptions = (_withParagraphOptions = {}, _withParagraphOptions[ELEMENT_PARAGRAPH] = {