@contentful/field-editor-rich-text 3.2.2 → 3.3.0

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

@@ -20,7 +20,7 @@ import find from 'lodash-es/find';
 import flow from 'lodash-es/flow';
 import get from 'lodash-es/get';
 import tokens from '@contentful/f36-tokens';
-import { AssetIcon, EmbeddedEntryBlockIcon, ClockIcon, EmbeddedEntryInlineIcon, ChevronDownIcon, HorizontalRuleIcon, LinkIcon, ListBulletedIcon, ListNumberedIcon, FormatBoldIcon, CodeIcon, FormatItalicIcon, FormatUnderlinedIcon, SuperscriptIcon, SubscriptIcon, QuoteIcon, TableIcon, PlusIcon } from '@contentful/f36-icons';
+import { AssetIcon, EmbeddedEntryBlockIcon, ClockIcon, EmbeddedEntryInlineIcon, ChevronDownIcon, HorizontalRuleIcon, LinkIcon, ListBulletedIcon, ListNumberedIcon, FormatBoldIcon, CodeIcon, FormatItalicIcon, FormatUnderlinedIcon, SuperscriptIcon, SubscriptIcon, QuoteIcon, TableIcon, PlusIcon, MoreHorizontalIcon } from '@contentful/f36-icons';
 import { getListTypes, ELEMENT_LIC, getListItemEntry, isListNested, moveListItemUp, ELEMENT_LI, unwrapList as unwrapList$1, removeFirstListItem, removeListItem, deleteForwardList, deleteFragmentList, normalizeList, createListPlugin as createListPlugin$1, ELEMENT_UL, ELEMENT_OL } from '@udecode/plate-list';
 import castArray from 'lodash-es/castArray';
 import { createBoldPlugin as createBoldPlugin$1, createCodePlugin as createCodePlugin$1, createItalicPlugin as createItalicPlugin$1, createUnderlinePlugin as createUnderlinePlugin$1, createSuperscriptPlugin as createSuperscriptPlugin$1, createSubscriptPlugin as createSubscriptPlugin$1 } from '@udecode/plate-basic-marks';
@@ -5113,6 +5113,12 @@ var buildMarkEventHandler = function buildMarkEventHandler(type) {
   };
 };
 
+var styles$c = {
+  isActive: /*#__PURE__*/css({
+    backgroundColor: tokens.blue100,
+    color: tokens.blue600
+  })
+};
 var createMarkToolbarButton = function createMarkToolbarButton(_ref) {
   var mark = _ref.mark,
       title = _ref.title,
@@ -5131,6 +5137,18 @@ var createMarkToolbarButton = function createMarkToolbarButton(_ref) {
       focus(editor);
     }, [editor]);
     if (!editor) return null;
+
+    if (!icon) {
+      var _cx;
+
+      return /*#__PURE__*/createElement(Menu.Item, {
+        onClick: handleClick,
+        disabled: isDisabled,
+        className: cx((_cx = {}, _cx[styles$c.isActive] = isMarkActive(editor, mark), _cx)),
+        testId: mark + "-toolbar-button"
+      }, title);
+    }
+
     return /*#__PURE__*/createElement(ToolbarButton, {
       title: title,
       testId: mark + "-toolbar-button",
@@ -5149,14 +5167,14 @@ var ToolbarBoldButton = /*#__PURE__*/createMarkToolbarButton({
   mark: MARKS.BOLD,
   icon: /*#__PURE__*/createElement(FormatBoldIcon, null)
 });
-var styles$c = {
+var styles$d = {
   bold: /*#__PURE__*/css({
     fontWeight: 600
   })
 };
 function Bold(props) {
   return /*#__PURE__*/createElement("strong", _extends({}, props.attributes, {
-    className: styles$c.bold
+    className: styles$d.bold
   }), props.children);
 }
 
@@ -5196,7 +5214,11 @@ var ToolbarCodeButton = /*#__PURE__*/createMarkToolbarButton({
   mark: MARKS.CODE,
   icon: /*#__PURE__*/createElement(CodeIcon, null)
 });
-var styles$d = {
+var ToolbarDropdownCodeButton = /*#__PURE__*/createMarkToolbarButton({
+  title: 'Code',
+  mark: MARKS.CODE
+});
+var styles$e = {
   code: /*#__PURE__*/css({
     fontFamily: 'monospace',
     fontSize: '.9em'
@@ -5204,7 +5226,7 @@ var styles$d = {
 };
 function Code(props) {
   return /*#__PURE__*/createElement("code", _extends({}, props.attributes, {
-    className: styles$d.code
+    className: styles$e.code
   }), props.children);
 }
 var createCodePlugin = function createCodePlugin() {
@@ -5234,14 +5256,14 @@ var ToolbarItalicButton = /*#__PURE__*/createMarkToolbarButton({
   mark: MARKS.ITALIC,
   icon: /*#__PURE__*/createElement(FormatItalicIcon, null)
 });
-var styles$e = {
+var styles$f = {
   italic: /*#__PURE__*/css({
     fontStyle: 'italic'
   })
 };
 function Italic(props) {
   return /*#__PURE__*/createElement("em", _extends({}, props.attributes, {
-    className: styles$e.italic
+    className: styles$f.italic
   }), props.children);
 }
 var createItalicPlugin = function createItalicPlugin() {
@@ -5306,7 +5328,7 @@ var createUnderlinePlugin = function createUnderlinePlugin() {
   });
 };
 
-var styles$f = {
+var styles$g = {
   superscript: /*#__PURE__*/css({
     verticalAlign: 'super',
     fontSize: 'smaller'
@@ -5317,9 +5339,13 @@ var ToolbarSuperscriptButton = /*#__PURE__*/createMarkToolbarButton({
   mark: MARKS.SUPERSCRIPT,
   icon: /*#__PURE__*/createElement(SuperscriptIcon, null)
 });
+var ToolbarDropdownSuperscriptButton = /*#__PURE__*/createMarkToolbarButton({
+  title: 'Superscript',
+  mark: MARKS.SUPERSCRIPT
+});
 function Superscript(props) {
   return /*#__PURE__*/createElement("sup", _extends({}, props.attributes, {
-    className: styles$f.superscript
+    className: styles$g.superscript
   }), props.children);
 }
 var createSuperscriptPlugin = function createSuperscriptPlugin() {
@@ -5337,7 +5363,7 @@ var createSuperscriptPlugin = function createSuperscriptPlugin() {
   });
 };
 
-var styles$g = {
+var styles$h = {
   subscript: /*#__PURE__*/css({
     verticalAlign: 'sub',
     fontSize: 'smaller'
@@ -5350,9 +5376,13 @@ var ToolbarSubscriptButton = /*#__PURE__*/createMarkToolbarButton({
     viewBox: "0 0 23 18"
   })
 });
+var ToolbarDropdownSubscriptButton = /*#__PURE__*/createMarkToolbarButton({
+  title: 'Subscript',
+  mark: MARKS.SUBSCRIPT
+});
 function Subscript(props) {
   return /*#__PURE__*/createElement("sub", _extends({}, props.attributes, {
-    className: styles$g.subscript
+    className: styles$h.subscript
   }), props.children);
 }
 var createSubscriptPlugin = function createSubscriptPlugin() {
@@ -5581,10 +5611,10 @@ var createNormalizerPlugin = function createNormalizerPlugin() {
 };
 
 var _templateObject$6, _styles$1;
-var styles$h = (_styles$1 = {}, _styles$1[BLOCKS.PARAGRAPH] = /*#__PURE__*/css(_templateObject$6 || (_templateObject$6 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n    line-height: ", ";\n    margin-bottom: 1.5em;\n  "])), tokens.lineHeightDefault), _styles$1);
+var styles$i = (_styles$1 = {}, _styles$1[BLOCKS.PARAGRAPH] = /*#__PURE__*/css(_templateObject$6 || (_templateObject$6 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n    line-height: ", ";\n    margin-bottom: 1.5em;\n  "])), tokens.lineHeightDefault), _styles$1);
 function Paragraph(props) {
   return /*#__PURE__*/createElement("div", _extends({}, props.attributes, {
-    className: styles$h[BLOCKS.PARAGRAPH]
+    className: styles$i[BLOCKS.PARAGRAPH]
   }), props.children);
 }
 
@@ -6226,7 +6256,7 @@ var isTable = function isTable(node) {
   return Element.isElement(node) && node.type === BLOCKS.TABLE;
 };
 
-var styles$i = {
+var styles$j = {
   topRight: /*#__PURE__*/css({
     position: 'absolute',
     top: '6px',
@@ -6315,7 +6345,7 @@ var TableActions = function TableActions() {
     size: "small",
     variant: "transparent",
     tabIndex: -1,
-    className: styles$i.topRight,
+    className: styles$j.topRight,
     icon: /*#__PURE__*/React__default.createElement(ChevronDownIcon, null),
     "aria-label": "Open table menu",
     testId: "cf-table-actions-button"
@@ -7264,7 +7294,7 @@ var normalizeEditorValue = function normalizeEditorValue(value, options) {
 };
 
 var STYLE_EDITOR_BORDER = "1px solid " + tokens.gray400;
-var styles$j = {
+var styles$k = {
   root: /*#__PURE__*/css({
     position: 'relative'
   }),
@@ -7381,13 +7411,19 @@ var EmbedEntityWidget = function EmbedEntityWidget(_ref) {
   }, actions) : null;
 };
 
-var styles$k = {
+var styles$l = {
   toolbar: /*#__PURE__*/css({
     border: "1px solid " + tokens.gray400,
     backgroundColor: tokens.gray100,
     padding: tokens.spacingXs,
     borderRadius: tokens.borderRadiusMedium + " " + tokens.borderRadiusMedium + " 0 0"
   }),
+  toolbarBtn: /*#__PURE__*/css({
+    height: '30px',
+    width: '30px',
+    marginLeft: tokens.spacing2Xs,
+    marginRight: tokens.spacing2Xs
+  }),
   divider: /*#__PURE__*/css({
     display: 'inline-block',
     height: '21px',
@@ -7413,8 +7449,30 @@ var styles$k = {
   })
 };
 
-var Toolbar = function Toolbar(_ref) {
-  var isDisabled = _ref.isDisabled;
+var Dropdown = function Dropdown(_ref) {
+  var sdk = _ref.sdk,
+      isDisabled = _ref.isDisabled;
+  var editor = useContentfulEditor();
+  var isActive = isMarkActive(editor, MARKS.SUPERSCRIPT) || isMarkActive(editor, MARKS.SUBSCRIPT) || isMarkActive(editor, MARKS.CODE);
+  return /*#__PURE__*/React__default.createElement(Menu, null, /*#__PURE__*/React__default.createElement(Menu.Trigger, null, /*#__PURE__*/React__default.createElement("span", null, /*#__PURE__*/React__default.createElement(IconButton, {
+    size: "small",
+    className: styles$l.toolbarBtn,
+    variant: isActive ? 'secondary' : 'transparent',
+    icon: /*#__PURE__*/React__default.createElement(MoreHorizontalIcon, null),
+    "aria-label": "toggle menu",
+    isDisabled: isDisabled,
+    testId: "dropdown-toolbar-button"
+  }))), /*#__PURE__*/React__default.createElement(Menu.List, null, isMarkEnabled(sdk.field, MARKS.SUPERSCRIPT) && /*#__PURE__*/React__default.createElement(ToolbarDropdownSuperscriptButton, {
+    isDisabled: isDisabled
+  }), isMarkEnabled(sdk.field, MARKS.SUBSCRIPT) && /*#__PURE__*/React__default.createElement(ToolbarDropdownSubscriptButton, {
+    isDisabled: isDisabled
+  }), isMarkEnabled(sdk.field, MARKS.CODE) && /*#__PURE__*/React__default.createElement(ToolbarDropdownCodeButton, {
+    isDisabled: isDisabled
+  })));
+};
+
+var Toolbar = function Toolbar(_ref2) {
+  var isDisabled = _ref2.isDisabled;
   var sdk = useSdkContext();
   var editor = useContentfulEditor();
   var canInsertBlocks = !isNodeTypeSelected(editor, BLOCKS.TABLE);
@@ -7423,35 +7481,42 @@ var Toolbar = function Toolbar(_ref) {
   }, [sdk.field]);
   var isListSelected = isNodeTypeSelected(editor, BLOCKS.UL_LIST) || isNodeTypeSelected(editor, BLOCKS.OL_LIST);
   var isBlockquoteSelected = isNodeTypeSelected(editor, BLOCKS.QUOTE);
-  var shouldDisableTables = isDisabled || !canInsertBlocks || isListSelected || isBlockquoteSelected;
+  var shouldDisableTables = isDisabled || !canInsertBlocks || isListSelected || isBlockquoteSelected; // We only show the dropdown when: whenever at least bold , italic and underline are available; If nothing that would go inside the dropdown is available, we hide it
+
+  var boldItalicUnderlineAvailable = isMarkEnabled(sdk.field, MARKS.BOLD) || isMarkEnabled(sdk.field, MARKS.ITALIC) || isMarkEnabled(sdk.field, MARKS.UNDERLINE);
+  var dropdownItemsAvailable = isMarkEnabled(sdk.field, MARKS.SUPERSCRIPT) || isMarkEnabled(sdk.field, MARKS.SUBSCRIPT) || isMarkEnabled(sdk.field, MARKS.CODE);
+  var shouldShowDropdown = boldItalicUnderlineAvailable && dropdownItemsAvailable;
   return /*#__PURE__*/React__default.createElement(Flex, {
     testId: "toolbar",
-    className: styles$k.toolbar,
+    className: styles$l.toolbar,
     alignItems: "center"
   }, /*#__PURE__*/React__default.createElement("div", {
-    className: styles$k.formattingOptionsWrapper
+    className: styles$l.formattingOptionsWrapper
   }, /*#__PURE__*/React__default.createElement(ToolbarHeadingButton, {
     isDisabled: isDisabled || !canInsertBlocks
   }), validationInfo.isAnyMarkEnabled && /*#__PURE__*/React__default.createElement("span", {
-    className: styles$k.divider
+    className: styles$l.divider
   }), isMarkEnabled(sdk.field, MARKS.BOLD) && /*#__PURE__*/React__default.createElement(ToolbarBoldButton, {
     isDisabled: isDisabled
   }), isMarkEnabled(sdk.field, MARKS.ITALIC) && /*#__PURE__*/React__default.createElement(ToolbarItalicButton, {
     isDisabled: isDisabled
-  }), isMarkEnabled(sdk.field, MARKS.SUPERSCRIPT) && /*#__PURE__*/React__default.createElement(ToolbarSuperscriptButton, {
+  }), isMarkEnabled(sdk.field, MARKS.UNDERLINE) && /*#__PURE__*/React__default.createElement(ToolbarUnderlineButton, {
     isDisabled: isDisabled
-  }), isMarkEnabled(sdk.field, MARKS.SUBSCRIPT) && /*#__PURE__*/React__default.createElement(ToolbarSubscriptButton, {
+  }), !boldItalicUnderlineAvailable && isMarkEnabled(sdk.field, MARKS.SUPERSCRIPT) && /*#__PURE__*/React__default.createElement(ToolbarSuperscriptButton, {
     isDisabled: isDisabled
-  }), isMarkEnabled(sdk.field, MARKS.UNDERLINE) && /*#__PURE__*/React__default.createElement(ToolbarUnderlineButton, {
+  }), !boldItalicUnderlineAvailable && isMarkEnabled(sdk.field, MARKS.SUBSCRIPT) && /*#__PURE__*/React__default.createElement(ToolbarSubscriptButton, {
     isDisabled: isDisabled
-  }), isMarkEnabled(sdk.field, MARKS.CODE) && /*#__PURE__*/React__default.createElement(ToolbarCodeButton, {
+  }), !boldItalicUnderlineAvailable && isMarkEnabled(sdk.field, MARKS.CODE) && /*#__PURE__*/React__default.createElement(ToolbarCodeButton, {
+    isDisabled: isDisabled
+  }), shouldShowDropdown && /*#__PURE__*/React__default.createElement(Dropdown, {
+    sdk: sdk,
     isDisabled: isDisabled
   }), validationInfo.isAnyHyperlinkEnabled && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("span", {
-    className: styles$k.divider
+    className: styles$l.divider
   }), /*#__PURE__*/React__default.createElement(ToolbarHyperlinkButton, {
     isDisabled: isDisabled
   })), validationInfo.isAnyBlockFormattingEnabled && /*#__PURE__*/React__default.createElement("span", {
-    className: styles$k.divider
+    className: styles$l.divider
   }), /*#__PURE__*/React__default.createElement(ToolbarListButton, {
     isDisabled: isDisabled || !canInsertBlocks
   }), isNodeTypeEnabled(sdk.field, BLOCKS.QUOTE) && /*#__PURE__*/React__default.createElement(ToolbarQuoteButton, {
@@ -7461,7 +7526,7 @@ var Toolbar = function Toolbar(_ref) {
   }), isNodeTypeEnabled(sdk.field, BLOCKS.TABLE) && /*#__PURE__*/React__default.createElement(ToolbarTableButton, {
     isDisabled: shouldDisableTables
   })), /*#__PURE__*/React__default.createElement("div", {
-    className: styles$k.embedActionsWrapper
+    className: styles$l.embedActionsWrapper
   }, /*#__PURE__*/React__default.createElement(EmbedEntityWidget, {
     isDisabled: isDisabled,
     canInsertBlocks: canInsertBlocks
@@ -7486,7 +7551,7 @@ function getValidationInfo(field) {
 }
 
 var _templateObject$b;
-var styles$l = {
+var styles$m = {
   nativeSticky: /*#__PURE__*/css(_templateObject$b || (_templateObject$b = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n    position: -webkit-sticky;\n    position: sticky;\n    top: -1px;\n    z-index: 2;\n  "])))
 };
 
@@ -7494,7 +7559,7 @@ var StickyToolbarWrapper = function StickyToolbarWrapper(_ref) {
   var isDisabled = _ref.isDisabled,
       children = _ref.children;
   return /*#__PURE__*/React__default.createElement("div", {
-    className: isDisabled ? '' : styles$l.nativeSticky
+    className: isDisabled ? '' : styles$m.nativeSticky
   }, children);
 };
 
@@ -7607,9 +7672,9 @@ var ConnectedRichTextEditor = function ConnectedRichTextEditor(props) {
     setPendingExternalUpdate(true);
     setEditorContent(editor, documentToEditorValue(props.value));
   }, [props.value, id]);
-  var classNames = cx(styles$j.editor, props.minHeight !== undefined ? css({
+  var classNames = cx(styles$k.editor, props.minHeight !== undefined ? css({
     minHeight: props.minHeight
-  }) : undefined, props.isDisabled ? styles$j.disabled : styles$j.enabled, props.isToolbarHidden && styles$j.hiddenToolbar);
+  }) : undefined, props.isDisabled ? styles$k.disabled : styles$k.enabled, props.isToolbarHidden && styles$k.hiddenToolbar);
   useEffect(function () {
     if (!isFirstRender) {
       return;
@@ -7625,7 +7690,7 @@ var ConnectedRichTextEditor = function ConnectedRichTextEditor(props) {
   }, /*#__PURE__*/React__default.createElement(ContentfulEditorIdProvider, {
     value: id
   }, /*#__PURE__*/React__default.createElement("div", {
-    className: styles$j.root,
+    className: styles$k.root,
     "data-test-id": "rich-text-editor"
   }, /*#__PURE__*/React__default.createElement(Plate, {
     id: id,