@contentful/field-editor-rich-text 2.0.0-next.15 → 2.0.0-next.16

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

@@ -1,8 +1,8 @@
 import React__default, { useContext, createContext, useMemo, createElement, useEffect, useState, memo, Fragment, useCallback } from 'react';
 import { useEntities, ScheduledIconWithTooltip, MissingEntityCard, AssetThumbnail, getScheduleTooltipContent, EntityProvider } from '@contentful/field-editor-reference';
 import { entityHelpers, shortenStorageUnit, isValidImage, ModalDialogLauncher, FieldConnector } from '@contentful/field-editor-shared';
-import { BLOCKS, INLINES, TABLE_BLOCKS, HEADINGS, TEXT_CONTAINERS, LIST_ITEM_BLOCKS, MARKS, CONTAINERS, TOP_LEVEL_BLOCKS, VOID_BLOCKS, EMPTY_DOCUMENT } from '@contentful/rich-text-types';
-import { usePlateEditorState, usePlateEditorRef, getNodes, getText, toggleNodeType, getAbove, setNodes, isAncestorEmpty, getParent, isSelectionAtBlockStart, isSelectionAtBlockEnd, isFirstChild, insertNodes, moveChildren, isBlockAboveEmpty, mockPlugin, getPluginType, ELEMENT_DEFAULT, findNode, isMarkActive, toggleMark, someHtmlElement, match, KEY_DESERIALIZE_HTML, someNode, getChildren as getChildren$1, getBlockAbove, getLastChildPath, createDeserializeHtmlPlugin, createDeserializeAstPlugin, createPlateEditor, Plate } from '@udecode/plate-core';
+import { BLOCKS, INLINES, TABLE_BLOCKS, TEXT_CONTAINERS, HEADINGS, LIST_ITEM_BLOCKS, MARKS, CONTAINERS, TOP_LEVEL_BLOCKS, VOID_BLOCKS, EMPTY_DOCUMENT } from '@contentful/rich-text-types';
+import { usePlateEditorState, usePlateEditorRef, getNodes, getText, toggleNodeType, getAbove, setNodes, isAncestorEmpty, getParent, getBlockAbove, isSelectionAtBlockStart, isSelectionAtBlockEnd, isFirstChild, insertNodes, moveChildren, isBlockAboveEmpty, mockPlugin, getPluginType, ELEMENT_DEFAULT, findNode, isMarkActive, toggleMark, someHtmlElement, match, KEY_DESERIALIZE_HTML, someNode, getChildren as getChildren$1, getLastChildPath, createDeserializeHtmlPlugin, createDeserializeAstPlugin, createPlateEditor, Plate } from '@udecode/plate-core';
 import { css, cx } from 'emotion';
 import deepEquals from 'fast-deep-equal';
 import noop from 'lodash-es/noop';
@@ -532,17 +532,6 @@ function getAncestorPathFromSelection(editor) {
     return level.length === 1;
   });
 }
-function shouldUnwrapBlockquote(editor, type) {
-  var isQuoteSelected = isBlockSelected(editor, BLOCKS.QUOTE);
-  var isValidType = [].concat(HEADINGS, [BLOCKS.OL_LIST, BLOCKS.UL_LIST, BLOCKS.HR]).includes(type);
-  return isQuoteSelected && isValidType;
-}
-function unwrapFromRoot(editor) {
-  var ancestorPath = getAncestorPathFromSelection(editor);
-  Transforms.unwrapNodes(editor, {
-    at: ancestorPath
-  });
-}
 var isAtEndOfTextSelection = function isAtEndOfTextSelection(editor) {
   var _editor$selection, _editor$selection2;
 
@@ -2499,11 +2488,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
@@ -3719,6 +3703,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 = getBlockAbove(editor, {
+    match: {
+      type: [BLOCKS.OL_LIST, BLOCKS.UL_LIST]
+    },
+    mode: 'lowest'
+  });
+  return (listNode == null ? void 0 : listNode[0].type) === type;
+};
 
 /**
  * Build a new list item node while preserving marks
@@ -4095,11 +4089,6 @@ function ToolbarListButton(props) {
   function handleClick(type) {
     return function () {
       if (!(editor != null && editor.selection)) return;
-
-      if (shouldUnwrapBlockquote(editor, type)) {
-        unwrapFromRoot(editor);
-      }
-
       toggleList(editor, {
         type: type
       });
@@ -4112,13 +4101,13 @@ function ToolbarListButton(props) {
     title: "UL",
     testId: "ul-toolbar-button",
     onClick: handleClick(BLOCKS.UL_LIST),
-    isActive: isBlockSelected(editor, BLOCKS.UL_LIST),
+    isActive: isListTypeActive(editor, BLOCKS.UL_LIST),
     isDisabled: props.isDisabled
   }, /*#__PURE__*/createElement(ListBulletedIcon, null)), isNodeTypeEnabled(sdk.field, BLOCKS.OL_LIST) && /*#__PURE__*/createElement(ToolbarButton, {
     title: "OL",
     testId: "ol-toolbar-button",
     onClick: handleClick(BLOCKS.OL_LIST),
-    isActive: isBlockSelected(editor, BLOCKS.OL_LIST),
+    isActive: isListTypeActive(editor, BLOCKS.OL_LIST),
     isDisabled: props.isDisabled
   }, /*#__PURE__*/createElement(ListNumberedIcon, null)));
 }
@@ -4751,10 +4740,7 @@ var style$1 = /*#__PURE__*/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__*/createElement("blockquote", Object.assign({}, props.attributes, {
@@ -4825,7 +4811,7 @@ function createQuotePlugin() {
     },
     normalizer: [{
       validChildren: CONTAINERS[BLOCKS.QUOTE],
-      transform: (_transform = {}, _transform[BLOCKS.QUOTE] = transformUnwrap, _transform[BLOCKS.HEADING_1] = transformUnwrap, _transform[BLOCKS.HEADING_2] = transformUnwrap, _transform[BLOCKS.HEADING_3] = transformUnwrap, _transform[BLOCKS.HEADING_4] = transformUnwrap, _transform[BLOCKS.HEADING_5] = transformUnwrap, _transform[BLOCKS.HEADING_6] = transformUnwrap, _transform["default"] = transformLift, _transform)
+      transform: (_transform = {}, _transform[BLOCKS.QUOTE] = transformUnwrap, _transform["default"] = transformLift, _transform)
     }],
     withOverrides: function withOverrides(editor) {
       var insertFragment = editor.insertFragment;