@contentful/field-editor-rich-text 2.0.0-next.23 → 2.0.0-next.26

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

@@ -420,10 +420,12 @@ function isBlockSelected(editor, type) {
 function isRootLevel(path) {
   return path.length === 1;
 }
-function getNodeEntryFromSelection(editor, nodeTypeOrTypes) {
-  if (!editor.selection) return [];
+function getNodeEntryFromSelection(editor, nodeTypeOrTypes, path) {
+  var _path, _editor$selection;
+
+  path = (_path = path) != null ? _path : (_editor$selection = editor.selection) == null ? void 0 : _editor$selection.focus.path;
+  if (!path) return [];
   var nodeTypes = Array.isArray(nodeTypeOrTypes) ? nodeTypeOrTypes : [nodeTypeOrTypes];
-  var path = editor.selection.focus.path;
 
   for (var i = 0; i < path.length; i++) {
     var nodeEntry = Editor.node(editor, path.slice(0, i + 1));
@@ -582,18 +584,18 @@ function getAncestorPathFromSelection(editor) {
   });
 }
 var isAtEndOfTextSelection = function isAtEndOfTextSelection(editor) {
-  var _editor$selection, _editor$selection2;
+  var _editor$selection2, _editor$selection3;
 
-  return ((_editor$selection = editor.selection) == null ? void 0 : _editor$selection.focus.offset) === getText(editor, (_editor$selection2 = editor.selection) == null ? void 0 : _editor$selection2.focus.path).length;
+  return ((_editor$selection2 = editor.selection) == null ? void 0 : _editor$selection2.focus.offset) === getText(editor, (_editor$selection3 = editor.selection) == null ? void 0 : _editor$selection3.focus.path).length;
 };
 function currentSelectionStartsTableCell(editor) {
-  var _editor$selection3;
+  var _editor$selection4;
 
   var _getNodeEntryFromSele2 = getNodeEntryFromSelection(editor, [BLOCKS.TABLE_CELL, BLOCKS.TABLE_HEADER_CELL]),
       tableCellNode = _getNodeEntryFromSele2[0],
       path = _getNodeEntryFromSele2[1];
 
-  return !!tableCellNode && (!getText(editor, path) || ((_editor$selection3 = editor.selection) == null ? void 0 : _editor$selection3.focus.offset) === 0);
+  return !!tableCellNode && (!getText(editor, path) || ((_editor$selection4 = editor.selection) == null ? void 0 : _editor$selection4.focus.offset) === 0);
 }
 /**
  * This traversal strategy is unfortunately necessary because Slate doesn't
@@ -1056,6 +1058,9 @@ function FetchingWrappedEntryCard(props) {
 var styles$3 = {
   root: /*#__PURE__*/css({
     marginBottom: '1.25rem !important',
+    display: 'block'
+  }),
+  container: /*#__PURE__*/css({
     // The next 2 properties ensure Entity card won't be aligned above
     // a list item marker (i.e. bullet)
     display: 'inline-block',
@@ -1100,7 +1105,8 @@ function LinkedEntityBlock(props) {
   }), /*#__PURE__*/React__default.createElement("div", {
     // COMPAT: This makes copy & paste work for Chromium/Blink browsers and Safari
     contentEditable: HAS_BEFORE_INPUT_SUPPORT ? false : undefined,
-    draggable: HAS_BEFORE_INPUT_SUPPORT ? true : undefined
+    draggable: HAS_BEFORE_INPUT_SUPPORT ? true : undefined,
+    className: styles$3.container
   }, entityType === 'Entry' && /*#__PURE__*/React__default.createElement(FetchingWrappedEntryCard, {
     sdk: sdk,
     entryId: entityId,
@@ -3203,29 +3209,31 @@ function HyperlinkModal(props) {
     testId: "confirm-cta"
   }, props.linkType ? 'Update' : 'Insert'))));
 }
-function addOrEditLink(_x, _x2, _x3) {
+function addOrEditLink(_x, _x2, _x3, _x4) {
   return _addOrEditLink.apply(this, arguments);
 }
 
 function _addOrEditLink() {
-  _addOrEditLink = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(editor, sdk, logAction) {
+  _addOrEditLink = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(editor, sdk, logAction, targetPath) {
     var _target$sys$linkType;
 
-    var linkType, linkText, linkTarget, linkEntity, _getNodeEntryFromSele, node, path, selectionBeforeBlur, currentLinkText, isEditing, data, text, url, type, target;
+    var selectionBeforeBlur, linkType, linkText, linkTarget, linkEntity, _getNodeEntryFromSele, node, path, selectionAfterFocus, currentLinkText, isEditing, data, text, url, type, target;
 
     return runtime_1.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            if (editor.selection) {
-              _context3.next = 2;
+            selectionBeforeBlur = editor.selection ? _extends({}, editor.selection) : undefined;
+
+            if (!(!targetPath && !selectionBeforeBlur)) {
+              _context3.next = 3;
               break;
             }
 
             return _context3.abrupt("return");
 
-          case 2:
-            _getNodeEntryFromSele = getNodeEntryFromSelection(editor, LINK_TYPES), node = _getNodeEntryFromSele[0], path = _getNodeEntryFromSele[1];
+          case 3:
+            _getNodeEntryFromSele = getNodeEntryFromSelection(editor, LINK_TYPES, targetPath), node = _getNodeEntryFromSele[0], path = _getNodeEntryFromSele[1];
 
             if (node && path) {
               linkType = node.type;
@@ -3234,11 +3242,11 @@ function _addOrEditLink() {
               linkEntity = node.data.target;
             }
 
-            selectionBeforeBlur = _extends({}, editor.selection);
-            currentLinkText = linkText || Editor.string(editor, editor.selection);
+            selectionAfterFocus = targetPath != null ? targetPath : selectionBeforeBlur;
+            currentLinkText = linkText || (editor.selection ? Editor.string(editor, editor.selection) : '');
             isEditing = Boolean(node && path);
             logAction(isEditing ? 'openEditHyperlinkDialog' : 'openCreateHyperlinkDialog');
-            _context3.next = 10;
+            _context3.next = 11;
             return ModalDialogLauncher.openDialog({
               title: isEditing ? 'Edit hyperlink' : 'Insert hyperlink',
               width: 'large',
@@ -3257,20 +3265,21 @@ function _addOrEditLink() {
               });
             });
 
-          case 10:
+          case 11:
             data = _context3.sent;
+            Transforms.select(editor, selectionAfterFocus);
 
             if (data) {
-              _context3.next = 14;
+              _context3.next = 17;
               break;
             }
 
+            focus(editor);
             logAction(isEditing ? 'cancelEditHyperlinkDialog' : 'cancelCreateHyperlinkDialog');
             return _context3.abrupt("return");
 
-          case 14:
+          case 17:
             text = data.linkText, url = data.linkTarget, type = data.linkType, target = data.linkEntity;
-            Transforms.select(editor, selectionBeforeBlur);
             Editor.withoutNormalizing(editor, function () {
               insertLink(editor, {
                 text: text,
@@ -3286,7 +3295,7 @@ function _addOrEditLink() {
             });
             focus(editor);
 
-          case 19:
+          case 21:
           case "end":
             return _context3.stop();
         }
@@ -3540,7 +3549,11 @@ function EntityHyperlink(props) {
     event.preventDefault();
     event.stopPropagation();
     if (!editor) return;
-    addOrEditLink(editor, sdk, editor.tracking.onViewportAction);
+    var p = ReactEditor.toSlatePoint(editor, [event.target, 0], {
+      exactMatch: false,
+      suppressThrow: false
+    });
+    addOrEditLink(editor, sdk, editor.tracking.onViewportAction, p.path);
   }
 
   return /*#__PURE__*/createElement(Tooltip, {
@@ -3568,7 +3581,11 @@ function UrlHyperlink(props) {
     event.preventDefault();
     event.stopPropagation();
     if (!editor) return;
-    addOrEditLink(editor, sdk, editor.tracking.onViewportAction);
+    var p = ReactEditor.toSlatePoint(editor, [event.target, 0], {
+      exactMatch: false,
+      suppressThrow: false
+    });
+    addOrEditLink(editor, sdk, editor.tracking.onViewportAction, p.path);
   }
 
   return /*#__PURE__*/createElement(Tooltip, {
@@ -3844,37 +3861,44 @@ var moveListItems = function moveListItems(editor, _temp) {
  * Credit: Modified version of Plate's list plugin
  * See: https://github.com/udecode/plate/blob/main/packages/nodes/list
  */
-var listTypes = [BLOCKS.UL_LIST, BLOCKS.OL_LIST];
+
+function hasUnliftedListItems(editor, at) {
+  return Editor.nodes(editor, {
+    at: at,
+    match: function match(node, path) {
+      return Element.isElement(node) && node.type === BLOCKS.LIST_ITEM && path.length >= 2;
+    }
+  }).next().done;
+}
+
 var unwrapList = function unwrapList(editor, _temp) {
   var _ref = _temp === void 0 ? {} : _temp,
       at = _ref.at;
 
   Editor.withoutNormalizing(editor, function () {
     do {
-      unwrapNodes(editor, {
+      // lift list items to the root level
+      Transforms.liftNodes(editor, {
         at: at,
-        match: {
-          type: BLOCKS.LIST_ITEM
+        match: function match(node) {
+          return Element.isElement(node) && node.type === BLOCKS.LIST_ITEM;
         },
-        split: true
+        mode: 'lowest'
       });
-      unwrapNodes(editor, {
-        at: at,
-        match: {
-          type: listTypes
-        },
-        split: true
-      });
-    } while (getAbove(editor, {
+    } while (!hasUnliftedListItems(editor, at)); // finally unwrap all lifted items
+
+
+    unwrapNodes(editor, {
+      at: at,
       match: {
-        type: listTypes,
-        at: at
-      }
-    }));
+        type: BLOCKS.LIST_ITEM
+      },
+      split: false
+    });
   });
 };
 
-var listTypes$1 = [BLOCKS.UL_LIST, BLOCKS.OL_LIST];
+var listTypes = [BLOCKS.UL_LIST, BLOCKS.OL_LIST];
 var toggleList = function toggleList(editor, _ref) {
   var type = _ref.type;
   return Editor.withoutNormalizing(editor, function () {
@@ -3895,7 +3919,7 @@ var toggleList = function toggleList(editor, _ref) {
           }, {
             at: editor.selection,
             match: function match(n) {
-              return listTypes$1.includes(n.type);
+              return listTypes.includes(n.type);
             },
             mode: 'lowest'
           });
@@ -3936,19 +3960,25 @@ var toggleList = function toggleList(editor, _ref) {
 
       var commonEntry = Node.common(editor, startPoint.path, endPoint.path);
 
-      if (listTypes$1.includes(commonEntry[0].type) || commonEntry[0].type === BLOCKS.LIST_ITEM) {
-        if (commonEntry[0].type !== type) {
+      if (listTypes.includes(commonEntry[0].type) || commonEntry[0].type === BLOCKS.LIST_ITEM) {
+        var listType = commonEntry[0].type;
+
+        if (commonEntry[0].type === BLOCKS.LIST_ITEM) {
+          listType = Editor.parent(editor, commonEntry[1])[0].type;
+        }
+
+        if (listType !== type) {
           var startList = findNode(editor, {
             at: Range.start(editor.selection),
             match: {
-              type: listTypes$1
+              type: listTypes
             },
             mode: 'lowest'
           });
           var endList = findNode(editor, {
             at: Range.end(editor.selection),
             match: {
-              type: listTypes$1
+              type: listTypes
             },
             mode: 'lowest'
           });
@@ -3963,7 +3993,7 @@ var toggleList = function toggleList(editor, _ref) {
           }, {
             at: editor.selection,
             match: function match(n, path) {
-              return listTypes$1.includes(n.type) && path.length >= rangeLength;
+              return listTypes.includes(n.type) && path.length >= rangeLength;
             },
             mode: 'all'
           });
@@ -3981,7 +4011,7 @@ var toggleList = function toggleList(editor, _ref) {
         }).reverse();
 
         _nodes.forEach(function (n) {
-          if (listTypes$1.includes(n[0].type)) {
+          if (listTypes.includes(n[0].type)) {
             setNodes(editor, {
               type: type
             }, {
@@ -4132,7 +4162,25 @@ var replaceNodeWithListItems = function replaceNodeWithListItems(editor, entry)
   });
 };
 var isListTypeActive = function isListTypeActive(editor, type) {
-  // Lists can be nested. Here, we take the list type at the lowest level
+  var selection = editor.selection;
+
+  if (!selection) {
+    return false;
+  }
+
+  if (Range.isExpanded(selection)) {
+    var _Range$edges = Range.edges(selection),
+        start = _Range$edges[0],
+        end = _Range$edges[1];
+
+    var node = Node.common(editor, start.path, end.path);
+
+    if (node[0].type === type) {
+      return true;
+    }
+  } // Lists can be nested. Here, we take the list type at the lowest level
+
+
   var listNode = getBlockAbove(editor, {
     match: {
       type: [BLOCKS.OL_LIST, BLOCKS.UL_LIST]
@@ -5179,9 +5227,9 @@ var sanitizeHTML = function sanitizeHTML(html) {
   // Parse the HTML string and pipe it through our transformers
   var doc = transformers.reduce(function (value, cb) {
     return cb(value);
-  }, new DOMParser().parseFromString(html, 'text/html')); // Remove whitespace between tags
-
-  return doc.body.innerHTML.replace(/>\s+</g, '><');
+  }, new DOMParser().parseFromString(html, 'text/html'));
+  return doc.body.innerHTML.replace(/>\s+</g, '><') // Remove whitespace between tags
+  .replace(/(.*)<div.*>(<table.*<\/table>)<\/div>(.*)/g, '$1$2$3'); // remove div containers from tables
 };
 
 /**
@@ -5722,6 +5770,9 @@ var isNotEmpty = function isNotEmpty(editor, _ref4) {
   var path = _ref4[1];
   return Array.from(Node.children(editor, path)).length !== 0;
 };
+var isTable = function isTable(node) {
+  return Element.isElement(node) && node.type === BLOCKS.TABLE;
+};
 
 var styles$i = {
   topRight: /*#__PURE__*/css({
@@ -5899,13 +5950,19 @@ var createTablePlugin = function createTablePlugin() {
       var insertFragment = editor.insertFragment;
 
       editor.insertFragment = function (fragments) {
+        var _editor$selection;
+
         // We need to make sure we have a new, empty and clean paragraph in order to paste tables as-is due to how Slate behaves
         // More info: https://github.com/ianstormtaylor/slate/pull/4489 and https://github.com/ianstormtaylor/slate/issues/4542
-        var fragmentHasTable = fragments.some(function (fragment) {
-          return fragment.type === BLOCKS.TABLE;
+        var isInsertingTable = fragments.some(function (fragment) {
+          return isTable(fragment);
         });
+        var isTableFirstFragment = fragments.findIndex(function (fragment) {
+          return isTable(fragment);
+        }) === 0;
+        var currentLineHasText = getText(editor, (_editor$selection = editor.selection) == null ? void 0 : _editor$selection.focus.path) !== '';
 
-        if (fragmentHasTable) {
+        if (isInsertingTable && isTableFirstFragment && currentLineHasText) {
           insertEmptyParagraph(editor);
         }