@contentful/field-editor-rich-text 2.0.0-next.14 → 2.0.0-next.17

package/dist/field-editor-rich-text.cjs.development.js

@@ -539,17 +539,6 @@ function getAncestorPathFromSelection(editor) {
     return level.length === 1;
   });
 }
-function shouldUnwrapBlockquote(editor, type) {
-  var isQuoteSelected = isBlockSelected(editor, Contentful.BLOCKS.QUOTE);
-  var isValidType = [].concat(Contentful.HEADINGS, [Contentful.BLOCKS.OL_LIST, Contentful.BLOCKS.UL_LIST, Contentful.BLOCKS.HR]).includes(type);
-  return isQuoteSelected && isValidType;
-}
-function unwrapFromRoot(editor) {
-  var ancestorPath = getAncestorPathFromSelection(editor);
-  slate.Transforms.unwrapNodes(editor, {
-    at: ancestorPath
-  });
-}
 var isAtEndOfTextSelection = function isAtEndOfTextSelection(editor) {
   var _editor$selection, _editor$selection2;
 
@@ -2506,11 +2495,6 @@ function ToolbarHeadingButton(props) {
       if (!(editor != null && editor.selection)) return;
       setSelected(type);
       setOpen(false);
-
-      if (shouldUnwrapBlockquote(editor, type)) {
-        unwrapFromRoot(editor);
-      }
-
       var prevOnChange = editor.onChange;
       /*
        The focus might happen at point in time when
@@ -2800,10 +2784,6 @@ function withHrEvents(editor) {
         pathToSelectedHr = _getNodeEntryFromSele[1];
 
     if (pathToSelectedHr) {
-      if (shouldUnwrapBlockquote(editor, Contentful.BLOCKS.HR)) {
-        unwrapFromRoot(editor);
-      }
-
       var isBackspace = event.key === 'Backspace';
       var isDelete = event.key === 'Delete';
 
@@ -2821,11 +2801,6 @@ function ToolbarHrButton(props) {
 
   function handleOnClick() {
     if (!(editor != null && editor.selection)) return;
-
-    if (shouldUnwrapBlockquote(editor, Contentful.BLOCKS.HR)) {
-      unwrapFromRoot(editor);
-    }
-
     var hr = {
       type: Contentful.BLOCKS.HR,
       data: {},
@@ -3735,6 +3710,16 @@ var replaceNodeWithListItems = function replaceNodeWithListItems(editor, entry)
     at: path
   });
 };
+var isListTypeActive = function isListTypeActive(editor, type) {
+  // Lists can be nested. Here, we take the list type at the lowest level
+  var listNode = plateCore.getBlockAbove(editor, {
+    match: {
+      type: [Contentful.BLOCKS.OL_LIST, Contentful.BLOCKS.UL_LIST]
+    },
+    mode: 'lowest'
+  });
+  return (listNode == null ? void 0 : listNode[0].type) === type;
+};
 
 /**
  * Build a new list item node while preserving marks
@@ -4111,11 +4096,6 @@ function ToolbarListButton(props) {
   function handleClick(type) {
     return function () {
       if (!(editor != null && editor.selection)) return;
-
-      if (shouldUnwrapBlockquote(editor, type)) {
-        unwrapFromRoot(editor);
-      }
-
       plateList.toggleList(editor, {
         type: type
       });
@@ -4128,13 +4108,13 @@ function ToolbarListButton(props) {
     title: "UL",
     testId: "ul-toolbar-button",
     onClick: handleClick(Contentful.BLOCKS.UL_LIST),
-    isActive: isBlockSelected(editor, Contentful.BLOCKS.UL_LIST),
+    isActive: isListTypeActive(editor, Contentful.BLOCKS.UL_LIST),
     isDisabled: props.isDisabled
   }, /*#__PURE__*/React.createElement(f36Icons.ListBulletedIcon, null)), isNodeTypeEnabled(sdk.field, Contentful.BLOCKS.OL_LIST) && /*#__PURE__*/React.createElement(ToolbarButton, {
     title: "OL",
     testId: "ol-toolbar-button",
     onClick: handleClick(Contentful.BLOCKS.OL_LIST),
-    isActive: isBlockSelected(editor, Contentful.BLOCKS.OL_LIST),
+    isActive: isListTypeActive(editor, Contentful.BLOCKS.OL_LIST),
     isDisabled: props.isDisabled
   }, /*#__PURE__*/React.createElement(f36Icons.ListNumberedIcon, null)));
 }
@@ -4701,11 +4681,54 @@ var sanitizeHTML = function sanitizeHTML(html) {
   return doc.body.innerHTML.replace(/>\s+</g, '><');
 };
 
+/**
+ * Get x-slate-fragment attribute from data-slate-fragment
+ */
+
+var catchSlateFragment = /data-slate-fragment="(.+?)"/m;
+var getSlateFragmentAttribute = function getSlateFragmentAttribute(dataTransfer) {
+  var htmlData = dataTransfer.getData('text/html');
+
+  var _ref = htmlData.match(catchSlateFragment) || [],
+      fragment = _ref[1];
+
+  return fragment;
+};
+/**
+ * Get the x-slate-fragment attribute that exist in text/html data
+ * and append it to the DataTransfer object
+ */
+
+var ensureXSlateFragment = function ensureXSlateFragment(dataTransfer) {
+  if (!dataTransfer.getData('application/x-slate-fragment')) {
+    var fragment = getSlateFragmentAttribute(dataTransfer);
+
+    if (fragment) {
+      var clipboardData = new DataTransfer();
+      dataTransfer.types.forEach(function (type) {
+        clipboardData.setData(type, dataTransfer.getData(type));
+      });
+      clipboardData.setData('application/x-slate-fragment', fragment);
+      return clipboardData;
+    }
+  }
+
+  return dataTransfer;
+};
 var createPasteHTMLPlugin = function createPasteHTMLPlugin() {
   var _pluginsByKey;
 
   return {
     key: 'PasteHTMLPlugin',
+    withOverrides: function withOverrides(editor) {
+      var insertData = editor.insertData;
+
+      editor.insertData = function (data) {
+        return insertData(ensureXSlateFragment(data));
+      };
+
+      return editor;
+    },
     inject: {
       pluginsByKey: (_pluginsByKey = {}, _pluginsByKey[plateCore.KEY_DESERIALIZE_HTML] = {
         editor: {
@@ -4724,10 +4747,7 @@ var style$1 = /*#__PURE__*/emotion.css({
   margin: '0 0 1.3125rem',
   borderLeft: "6px solid " + tokens.gray200,
   paddingLeft: '0.875rem',
-  fontStyle: 'normal',
-  '& a': {
-    color: 'inherit'
-  }
+  fontStyle: 'normal'
 });
 function Quote(props) {
   return /*#__PURE__*/React.createElement("blockquote", Object.assign({}, props.attributes, {
@@ -4798,7 +4818,7 @@ function createQuotePlugin() {
     },
     normalizer: [{
       validChildren: Contentful.CONTAINERS[Contentful.BLOCKS.QUOTE],
-      transform: (_transform = {}, _transform[Contentful.BLOCKS.QUOTE] = transformUnwrap, _transform[Contentful.BLOCKS.HEADING_1] = transformUnwrap, _transform[Contentful.BLOCKS.HEADING_2] = transformUnwrap, _transform[Contentful.BLOCKS.HEADING_3] = transformUnwrap, _transform[Contentful.BLOCKS.HEADING_4] = transformUnwrap, _transform[Contentful.BLOCKS.HEADING_5] = transformUnwrap, _transform[Contentful.BLOCKS.HEADING_6] = transformUnwrap, _transform["default"] = transformLift, _transform)
+      transform: (_transform = {}, _transform[Contentful.BLOCKS.QUOTE] = transformUnwrap, _transform["default"] = transformLift, _transform)
     }],
     withOverrides: function withOverrides(editor) {
       var insertFragment = editor.insertFragment;