@contentful/field-editor-rich-text 2.3.19 → 3.0.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0](https://github.com/contentful/field-editors/compare/@contentful/field-editor-rich-text@2.3.20...@contentful/field-editor-rich-text@3.0.0) (2022-08-18)
+
+### Features
+
+- moving new entity store in [TOL-282] ([#1214](https://github.com/contentful/field-editors/issues/1214)) ([2ad4f64](https://github.com/contentful/field-editors/commit/2ad4f643296dbf48802410382a9a055de18a15de))
+
+### BREAKING CHANGES
+
+- useEntities is no longer export from the reference editor package. Use useEntity or useEntityLoader instead
+
+Co-authored-by: Ahmed T. Ali <ah.tajelsir@gmail.com>
+
+## [2.3.20](https://github.com/contentful/field-editors/compare/@contentful/field-editor-rich-text@2.3.19...@contentful/field-editor-rich-text@2.3.20) (2022-08-10)
+
+### Bug Fixes
+
+- rollback change of deps in useFetchedEntity ([#1213](https://github.com/contentful/field-editors/issues/1213)) ([c12e6ea](https://github.com/contentful/field-editors/commit/c12e6eae473e340b1065bb296c093e5aea6e0adc))
+
 ## [2.3.19](https://github.com/contentful/field-editors/compare/@contentful/field-editor-rich-text@2.3.18...@contentful/field-editor-rich-text@2.3.19) (2022-08-10)
 
 ### Bug Fixes

package/dist/SdkProvider.d.ts

@@ -3,5 +3,5 @@ import { FieldExtensionSDK } from '@contentful/app-sdk';
 interface SdkProviderProps {
     sdk: FieldExtensionSDK;
 }
-export declare const SdkProvider: React.FC<SdkProviderProps>, useSdkContext: any;
+export declare const SdkProvider: React.FC<SdkProviderProps>, useSdkContext: () => FieldExtensionSDK;
 export {};

package/dist/dialogs/HypelinkDialog/HyperlinkDialog.d.ts

@@ -1,7 +1,7 @@
 export namespace LINK_TYPES {
-    export const URI: string;
-    export const ENTRY: string;
-    export const ASSET: string;
+    const URI: string;
+    const ENTRY: string;
+    const ASSET: string;
 }
 export class HyperlinkDialog extends React.Component<any, any, any> {
     static propTypes: {

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

@@ -1955,7 +1955,7 @@ var CommandList = function CommandList(_ref5) {
     contentEditable: false
   }, /*#__PURE__*/React.createElement("div", {
     role: "alert"
-  }, /*#__PURE__*/React.createElement(f36Components.ScreenReaderOnly, null, "Richtext commands. Currently focused item: ", selectedItem, ". Press ", /*#__PURE__*/React.createElement("kbd", null, "enter"), " to select, ", /*#__PURE__*/React.createElement("kbd", null, "arrows"), " to navigate, ", /*#__PURE__*/React.createElement("kbd", null, "escape"), " to close.")), /*#__PURE__*/React.createElement(f36Utils.Portal, null, /*#__PURE__*/React.createElement("div", Object.assign({
+  }, /*#__PURE__*/React.createElement(f36Components.ScreenReaderOnly, null, "Richtext commands. Currently focused item: ", selectedItem, ". Press ", /*#__PURE__*/React.createElement("kbd", null, "enter"), " to select, ", /*#__PURE__*/React.createElement("kbd", null, "arrows"), " to navigate, ", /*#__PURE__*/React.createElement("kbd", null, "escape"), " to close.")), /*#__PURE__*/React.createElement(f36Utils.Portal, null, /*#__PURE__*/React.createElement("div", _extends({
     "aria-hidden": true,
     ref: popoverContainer,
     style: popper.styles.popper
@@ -1999,7 +1999,7 @@ var CommandPrompt = function CommandPrompt(props) {
       textElement = _React$useState[0],
       setTextElement = _React$useState[1];
 
-  return /*#__PURE__*/React.createElement("span", Object.assign({
+  return /*#__PURE__*/React.createElement("span", _extends({
     ref: function ref(e) {
       setTextElement(e);
     }
@@ -2143,84 +2143,12 @@ function withLinkTracking(Component) {
     var onEntityFetchComplete = React__default.useCallback(function () {
       return editor.tracking.onViewportAction('linkRendered');
     }, [editor]);
-    return /*#__PURE__*/React__default.createElement(Component, Object.assign({}, props, {
+    return /*#__PURE__*/React__default.createElement(Component, _extends({}, props, {
       onEntityFetchComplete: onEntityFetchComplete
     }));
   };
 }
 
-function useFetchedEntity(_ref) {
-  var type = _ref.type,
-      id = _ref.id,
-      onEntityFetchComplete = _ref.onEntityFetchComplete;
-
-  var _useEntities = fieldEditorReference.useEntities(),
-      entries = _useEntities.entries,
-      assets = _useEntities.assets,
-      getEntry = _useEntities.getEntry,
-      getAsset = _useEntities.getAsset;
-
-  var store = React.useMemo(function () {
-    return type === 'Entry' ? entries : assets;
-  }, [assets, entries, type]);
-
-  var _useState = React.useState(store == null ? void 0 : store[id]),
-      entity = _useState[0],
-      setEntity = _useState[1]; // Deep compare the entity value to keep re-rendering to minimal
-
-
-  React.useEffect(function () {
-    if (!store) {
-      return;
-    }
-
-    var newValue = store[id];
-
-    if (!areEqual(entity, newValue)) {
-      setEntity(newValue);
-    }
-  }, [store, entity, id]); // Fetch the entity if needed
-
-  React.useEffect(function () {
-    if (!store) {
-      return;
-    }
-
-    (type === 'Entry' ? getEntry : getAsset)(id); // "getEntry" and "getAsset" instances change with every
-    // entity store update causing page lag on initial load
-    // TODO: consider rewriting useEntities() hook to avoid that happening in
-    // first place.
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- TODO: explain this disable
-  }, [type, id, store]);
-  React.useEffect(function () {
-    if (entity) {
-      onEntityFetchComplete == null ? void 0 : onEntityFetchComplete();
-    }
-  }, [onEntityFetchComplete, entity]);
-  return entity;
-}
-
-/**
- * A userland implementation of useEvent RFC
- *
- * See: https://github.com/reactjs/rfcs/pull/220
- */
-
-var useStableCallback = function useStableCallback(callback) {
-  var callbackRef = React.useRef(callback); // Makes sure the callbackRef points to the latest `callback` props
-  // The useLayoutEffect is here for concurrent safety. It has the
-  // disadvantage of not being able to use the result callback during
-  // the render but that's Ok.
-
-  React.useLayoutEffect(function () {
-    callbackRef.current = callback;
-  }); // The stable callback that won't change
-
-  return React.useCallback(function () {
-    return callbackRef.current.apply(callbackRef, arguments);
-  }, []);
-};
-
 var InternalAssetCard = /*#__PURE__*/React.memo(function (props) {
   if (props.asset === undefined) {
     return /*#__PURE__*/React.createElement(f36Components.AssetCard, {
@@ -2252,26 +2180,29 @@ var InternalAssetCard = /*#__PURE__*/React.memo(function (props) {
 }, areEqual);
 InternalAssetCard.displayName = 'InternalAssetCard';
 function FetchingWrappedAssetCard(props) {
-  var onEntityFetchComplete = props.onEntityFetchComplete,
-      assetId = props.assetId;
+  var onEntityFetchComplete = props.onEntityFetchComplete;
 
-  var _useEntities = fieldEditorReference.useEntities(),
-      loadEntityScheduledActions = _useEntities.loadEntityScheduledActions; // FIXME: remove when useEntities() has been refactored to avoid
-  // unnecessary re-rendering
+  var _useEntity = fieldEditorReference.useEntity('Asset', props.assetId),
+      asset = _useEntity.data,
+      status = _useEntity.status;
 
+  var _useEntityLoader = fieldEditorReference.useEntityLoader(),
+      getEntityScheduledActions = _useEntityLoader.getEntityScheduledActions;
 
-  var stableLoadEntityScheduledActions = useStableCallback(loadEntityScheduledActions);
-  var asset = useFetchedEntity({
-    type: 'Asset',
-    id: assetId,
-    onEntityFetchComplete: onEntityFetchComplete
-  });
+  var loadEntityScheduledActions = React.useCallback(function () {
+    return getEntityScheduledActions('Asset', props.assetId);
+  }, [getEntityScheduledActions, props.assetId]);
+  React.useEffect(function () {
+    if (status === 'success') {
+      onEntityFetchComplete == null ? void 0 : onEntityFetchComplete();
+    }
+  }, [onEntityFetchComplete, status]);
   return /*#__PURE__*/React.createElement(InternalAssetCard, {
     asset: asset,
     sdk: props.sdk,
     isDisabled: props.isDisabled,
     isSelected: props.isSelected,
-    loadEntityScheduledActions: stableLoadEntityScheduledActions,
+    loadEntityScheduledActions: loadEntityScheduledActions,
     locale: props.locale,
     onEdit: props.onEdit,
     onRemove: props.onRemove
@@ -2320,17 +2251,21 @@ var FetchingWrappedEntryCard = function FetchingWrappedEntryCard(props) {
   var entryId = props.entryId,
       onEntityFetchComplete = props.onEntityFetchComplete;
 
-  var _useEntities = fieldEditorReference.useEntities(),
-      loadEntityScheduledActions = _useEntities.loadEntityScheduledActions; // FIXME: remove when useEntities() has been refactored to avoid
-  // unnecessary re-rendering
+  var _useEntity = fieldEditorReference.useEntity('Entry', entryId),
+      entry = _useEntity.data,
+      status = _useEntity.status;
 
+  var _useEntityLoader = fieldEditorReference.useEntityLoader(),
+      getEntityScheduledActions = _useEntityLoader.getEntityScheduledActions;
 
-  var stableLoadEntityScheduledActions = useStableCallback(loadEntityScheduledActions);
-  var entry = useFetchedEntity({
-    type: 'Entry',
-    id: entryId,
-    onEntityFetchComplete: onEntityFetchComplete
-  });
+  var loadEntityScheduledActions = React.useCallback(function () {
+    return getEntityScheduledActions('Entry', entryId);
+  }, [getEntityScheduledActions, entryId]);
+  React.useEffect(function () {
+    if (status === 'success') {
+      onEntityFetchComplete == null ? void 0 : onEntityFetchComplete();
+    }
+  }, [onEntityFetchComplete, status]);
   return /*#__PURE__*/React.createElement(InternalEntryCard, {
     entry: entry,
     sdk: props.sdk,
@@ -2339,7 +2274,7 @@ var FetchingWrappedEntryCard = function FetchingWrappedEntryCard(props) {
     isSelected: props.isSelected,
     onEdit: props.onEdit,
     onRemove: props.onRemove,
-    loadEntityScheduledActions: stableLoadEntityScheduledActions
+    loadEntityScheduledActions: loadEntityScheduledActions
   });
 };
 
@@ -2381,7 +2316,7 @@ function LinkedEntityBlock(props) {
       at: pathToElement
     });
   }, [editor, element]);
-  return /*#__PURE__*/React__default.createElement("div", Object.assign({}, attributes, {
+  return /*#__PURE__*/React__default.createElement("div", _extends({}, attributes, {
     className: styles$1.root,
     "data-entity-type": entityType,
     "data-entity-id": entityId,
@@ -2765,29 +2700,32 @@ var styles$3 = {
   })
 };
 function FetchingWrappedInlineEntryCard(props) {
-  var _useEntities = fieldEditorReference.useEntities(),
-      getEntry = _useEntities.getEntry,
-      loadEntityScheduledActions = _useEntities.loadEntityScheduledActions,
-      entries = _useEntities.entries;
-
-  var entry = React__default.useMemo(function () {
-    return entries[props.entryId];
-  }, [entries, props.entryId]);
+  var _useEntity = fieldEditorReference.useEntity('Entry', props.entryId),
+      entry = _useEntity.data,
+      requestStatus = _useEntity.status;
+
+  var _useEntityLoader = fieldEditorReference.useEntityLoader(),
+      getEntityScheduledActions = _useEntityLoader.getEntityScheduledActions;
+
+  var loadEntityScheduledActions = function loadEntityScheduledActions() {
+    return getEntityScheduledActions('Entry', props.entryId);
+  };
+
   var allContentTypes = props.sdk.space.getCachedContentTypes();
   var onEntityFetchComplete = props.onEntityFetchComplete;
   var contentType = React__default.useMemo(function () {
-    if (!entry || entry === 'failed' || !allContentTypes) return undefined;
+    if (!entry || !allContentTypes) return undefined;
     return allContentTypes.find(function (contentType) {
       return contentType.sys.id === entry.sys.contentType.sys.id;
     });
   }, [allContentTypes, entry]);
   React__default.useEffect(function () {
-    if (!entry) {
+    if (requestStatus !== 'success') {
       return;
     }
 
     onEntityFetchComplete == null ? void 0 : onEntityFetchComplete();
-  }, [entry, onEntityFetchComplete]);
+  }, [requestStatus, onEntityFetchComplete]);
   var contentTypeName = contentType ? contentType.name : '';
   var title = React__default.useMemo(function () {
     return getEntryTitle({
@@ -2798,14 +2736,8 @@ function FetchingWrappedInlineEntryCard(props) {
       defaultTitle: 'Untitled'
     });
   }, [entry, contentType, props.sdk.field.locale, props.sdk.locales["default"]]);
-  React__default.useEffect(function () {
-    if (!props.entryId) return;
-    getEntry(props.entryId); // We don't include getEntry below because it's part of the constate-derived
-    // useEntities(), not props.
-    // eslint-disable-next-line -- TODO: explain this disable
-  }, [props.entryId]);
 
-  if (entry === 'failed') {
+  if (requestStatus === 'error') {
     return /*#__PURE__*/React__default.createElement(f36Components.InlineEntryCard, {
       title: "Entry missing or inaccessible",
       testId: Contentful.INLINES.EMBEDDED_ENTRY,
@@ -2813,15 +2745,15 @@ function FetchingWrappedInlineEntryCard(props) {
     });
   }
 
-  if (entry === undefined) {
+  if (requestStatus === 'loading') {
     return /*#__PURE__*/React__default.createElement(f36Components.InlineEntryCard, {
       isLoading: true
     });
   }
 
-  var status = getEntryStatus(entry.sys);
+  var entryStatus = getEntryStatus(entry.sys);
 
-  if (status === 'deleted') {
+  if (entryStatus === 'deleted') {
     return /*#__PURE__*/React__default.createElement(f36Components.InlineEntryCard, {
       title: "Entry missing or inaccessible",
       testId: Contentful.INLINES.EMBEDDED_ENTRY,
@@ -2838,7 +2770,7 @@ function FetchingWrappedInlineEntryCard(props) {
     testId: Contentful.INLINES.EMBEDDED_ENTRY,
     isSelected: props.isSelected,
     title: contentTypeName + ": " + title,
-    status: status,
+    status: entryStatus,
     actions: [/*#__PURE__*/React__default.createElement(f36Components.MenuItem, {
       key: "edit",
       onClick: props.onEdit
@@ -2912,7 +2844,7 @@ function EmbeddedEntityInline(props) {
     });
   }
 
-  return /*#__PURE__*/React.createElement("span", Object.assign({}, props.attributes, {
+  return /*#__PURE__*/React.createElement("span", _extends({}, props.attributes, {
     className: styles$4.root,
     "data-embedded-entity-inline-id": entryId,
     // COMPAT: This makes copy & paste work for Firefox
@@ -3263,7 +3195,7 @@ var styles$6 = {
 
 function createHeading(Tag, block) {
   return function Heading(props) {
-    return /*#__PURE__*/React.createElement(Tag, Object.assign({}, props.attributes, {
+    return /*#__PURE__*/React.createElement(Tag, _extends({}, props.attributes, {
       className: emotion.cx(styles$6.headings.root, styles$6.headings[block])
     }), props.children);
   };
@@ -3464,7 +3396,7 @@ function ToolbarHrButton(props) {
 function Hr(props) {
   var isSelected = Slate.useSelected();
   var isFocused = Slate.useFocused();
-  return /*#__PURE__*/React.createElement("div", Object.assign({}, props.attributes, {
+  return /*#__PURE__*/React.createElement("div", _extends({}, props.attributes, {
     className: styles$8.container,
     "data-void-element": Contentful.BLOCKS.HR
   }), /*#__PURE__*/React.createElement("div", {
@@ -3802,7 +3734,8 @@ function _addOrEditLink() {
             });
             logAction(isEditing ? 'edit' : 'insert', {
               nodeType: type,
-              linkType: (_target$sys$linkType = target == null ? void 0 : target.sys.linkType) != null ? _target$sys$linkType : 'uri'
+              linkType: (_target$sys$linkType = target == null ? void 0 : target.sys.linkType) != null ? _target$sys$linkType : 'uri' // we want to keep the same values we've been using for the old editor, which can be `uri`, `Asset` or `Entry`
+
             });
             focus(editor);
 
@@ -4236,7 +4169,7 @@ var styles$b = (_styles = {}, _styles[Contentful.BLOCKS.UL_LIST] = /*#__PURE__*/
 
 function createList(Tag, block) {
   return function List(props) {
-    return /*#__PURE__*/React.createElement(Tag, Object.assign({}, props.attributes, {
+    return /*#__PURE__*/React.createElement(Tag, _extends({}, props.attributes, {
       className: emotion.cx(baseStyle, styles$b[block])
     }), props.children);
   };
@@ -4248,7 +4181,7 @@ var ListOL = /*#__PURE__*/createList('ol', Contentful.BLOCKS.OL_LIST);
 var _templateObject$5;
 var style = /*#__PURE__*/emotion.css(_templateObject$5 || (_templateObject$5 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  margin: 0;\n  list-style: inherit;\n  margin-top: ", ";\n\n  ol,\n  ul {\n    margin: 0 0 0 ", ";\n  }\n"])), tokens.spacingXs, tokens.spacingL);
 function ListItem(props) {
-  return /*#__PURE__*/React.createElement("li", Object.assign({}, props.attributes, {
+  return /*#__PURE__*/React.createElement("li", _extends({}, props.attributes, {
     className: style
   }), props.children);
 }
@@ -5224,7 +5157,7 @@ var styles$c = {
   })
 };
 function Bold(props) {
-  return /*#__PURE__*/React.createElement("strong", Object.assign({}, props.attributes, {
+  return /*#__PURE__*/React.createElement("strong", _extends({}, props.attributes, {
     className: styles$c.bold
   }), props.children);
 }
@@ -5272,7 +5205,7 @@ var styles$d = {
   })
 };
 function Code(props) {
-  return /*#__PURE__*/React.createElement("code", Object.assign({}, props.attributes, {
+  return /*#__PURE__*/React.createElement("code", _extends({}, props.attributes, {
     className: styles$d.code
   }), props.children);
 }
@@ -5309,7 +5242,7 @@ var styles$e = {
   })
 };
 function Italic(props) {
-  return /*#__PURE__*/React.createElement("em", Object.assign({}, props.attributes, {
+  return /*#__PURE__*/React.createElement("em", _extends({}, props.attributes, {
     className: styles$e.italic
   }), props.children);
 }
@@ -5346,7 +5279,7 @@ var ToolbarUnderlineButton = /*#__PURE__*/createMarkToolbarButton({
   icon: /*#__PURE__*/React.createElement(f36Icons.FormatUnderlinedIcon, null)
 });
 function Underline(props) {
-  return /*#__PURE__*/React.createElement("u", Object.assign({}, props.attributes), props.children);
+  return /*#__PURE__*/React.createElement("u", _extends({}, props.attributes), props.children);
 }
 var createUnderlinePlugin = function createUnderlinePlugin() {
   return plateBasicMarks.createUnderlinePlugin({
@@ -5588,7 +5521,7 @@ var createNormalizerPlugin = function createNormalizerPlugin() {
 var _templateObject$6, _styles$1;
 var styles$f = (_styles$1 = {}, _styles$1[Contentful.BLOCKS.PARAGRAPH] = /*#__PURE__*/emotion.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__*/React.createElement("div", Object.assign({}, props.attributes, {
+  return /*#__PURE__*/React.createElement("div", _extends({}, props.attributes, {
     className: styles$f[Contentful.BLOCKS.PARAGRAPH]
   }), props.children);
 }
@@ -5808,7 +5741,7 @@ var style$1 = /*#__PURE__*/emotion.css({
   fontStyle: 'normal'
 });
 function Quote(props) {
-  return /*#__PURE__*/React.createElement("blockquote", Object.assign({}, props.attributes, {
+  return /*#__PURE__*/React.createElement("blockquote", _extends({}, props.attributes, {
     className: style$1
   }), props.children);
 }
@@ -6348,7 +6281,7 @@ var _templateObject$7;
 var style$2 = /*#__PURE__*/emotion.css(_templateObject$7 || (_templateObject$7 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border: 1px solid ", ";\n  border-collapse: collapse;\n  padding: 10px 12px;\n  min-width: 48px;\n  position: relative;\n  vertical-align: top;\n\n  div:last-child {\n    margin-bottom: 0;\n  }\n"])), tokens.gray400);
 var Cell = function Cell(props) {
   var isSelected = Slate.useSelected();
-  return /*#__PURE__*/React.createElement("td", Object.assign({}, props.attributes, props.element.data, {
+  return /*#__PURE__*/React.createElement("td", _extends({}, props.attributes, props.element.data, {
     className: style$2
   }), isSelected && /*#__PURE__*/React.createElement(TableActions, null), props.children);
 };
@@ -6357,7 +6290,7 @@ var _templateObject$8;
 var style$3 = /*#__PURE__*/emotion.css(_templateObject$8 || (_templateObject$8 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  background-clip: padding-box;\n  background-color: ", ";\n  border: 1px solid ", ";\n  border-collapse: collapse;\n  padding: 10px 12px;\n  font-weight: ", ";\n  text-align: left;\n  min-width: 48px;\n  position: relative;\n\n  div:last-child {\n    margin-bottom: 0;\n  }\n"])), tokens.gray200, tokens.gray400, tokens.fontWeightNormal);
 var HeaderCell = function HeaderCell(props) {
   var isSelected = Slate.useSelected();
-  return /*#__PURE__*/React.createElement("th", Object.assign({}, props.attributes, props.element.data, {
+  return /*#__PURE__*/React.createElement("th", _extends({}, props.attributes, props.element.data, {
     className: style$3
   }), isSelected && /*#__PURE__*/React.createElement(TableActions, null), props.children);
 };
@@ -6365,7 +6298,7 @@ var HeaderCell = function HeaderCell(props) {
 var _templateObject$9;
 var style$4 = /*#__PURE__*/emotion.css(_templateObject$9 || (_templateObject$9 = /*#__PURE__*/_taggedTemplateLiteralLoose(["\n  border: 1px solid ", ";\n  border-collapse: collapse;\n\n  &:hover td {\n    background-color: transparent !important;\n  }\n"])), tokens.gray400);
 var Row = function Row(props) {
-  return /*#__PURE__*/React.createElement("tr", Object.assign({}, props.attributes, {
+  return /*#__PURE__*/React.createElement("tr", _extends({}, props.attributes, {
     className: style$4
   }), props.children);
 };
@@ -6375,7 +6308,7 @@ var style$5 = /*#__PURE__*/emotion.css(_templateObject$a || (_templateObject$a =
 var Table = function Table(props) {
   return /*#__PURE__*/React.createElement("div", {
     "data-block-type": Contentful.BLOCKS.TABLE
-  }, /*#__PURE__*/React.createElement("table", Object.assign({
+  }, /*#__PURE__*/React.createElement("table", _extends({
     className: style$5
   }, props.attributes), /*#__PURE__*/React.createElement("tbody", null, props.children)));
 };
@@ -7651,7 +7584,7 @@ var RichTextEditor = function RichTextEditor(props) {
     var lastRemoteValue = _ref.lastRemoteValue,
         disabled = _ref.disabled,
         setValue = _ref.setValue;
-    return /*#__PURE__*/React__default.createElement(ConnectedRichTextEditor, Object.assign({}, otherProps, {
+    return /*#__PURE__*/React__default.createElement(ConnectedRichTextEditor, _extends({}, otherProps, {
       key: "rich-text-editor-" + id,
       value: lastRemoteValue,
       sdk: sdk,
@@ -8006,7 +7939,7 @@ var openRichTextDialog = function openRichTextDialog(sdk) {
     if (((_options$parameters = options.parameters) == null ? void 0 : _options$parameters.type) === 'rich-text-hyperlink-dialog') {
       return fieldEditorShared.ModalDialogLauncher.openDialog(options, function (_ref) {
         var onClose = _ref.onClose;
-        return /*#__PURE__*/React__default.createElement(HyperlinkDialog, Object.assign({}, options.parameters, {
+        return /*#__PURE__*/React__default.createElement(HyperlinkDialog, _extends({}, options.parameters, {
           onClose: onClose,
           sdk: sdk
         }));
@@ -8022,7 +7955,7 @@ var renderRichTextDialog = function renderRichTextDialog(sdk) {
 
   if ((parameters == null ? void 0 : parameters.type) === 'rich-text-hyperlink-dialog') {
     sdk.window.startAutoResizer();
-    return /*#__PURE__*/React__default.createElement(HyperlinkDialog, Object.assign({}, sdk.parameters.invocation, {
+    return /*#__PURE__*/React__default.createElement(HyperlinkDialog, _extends({}, sdk.parameters.invocation, {
       onClose: sdk.close,
       sdk: sdk
     }));