@atlaskit/editor-core 148.0.0 → 149.0.3

package/dist/cjs/plugins/emoji/index.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.memoize = memoize;
 exports.getEmojiPluginState = getEmojiPluginState;
 exports.emojiPluginFactory = emojiPluginFactory;
-exports.emojiPluginKey = exports.setResults = exports.setProvider = exports.ACTIONS = exports.default = exports.defaultListLimit = exports.emojiToTypeaheadItem = void 0;
+exports.emojiPluginKey = exports.setProvider = exports.ACTIONS = exports.default = exports.defaultListLimit = exports.emojiToTypeaheadItem = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -18,7 +18,11 @@ var _prosemirrorState = require("prosemirror-state");
 
 var _adfSchema = require("@atlaskit/adf-schema");
 
-var _emoji = require("@atlaskit/emoji");
+var _prosemirrorModel = require("prosemirror-model");
+
+var _typeAhead = require("@atlaskit/editor-common/type-ahead");
+
+var _emoji2 = require("@atlaskit/emoji");
 
 var _asciiInputRules = require("./pm-plugins/ascii-input-rules");
 
@@ -26,7 +30,7 @@ var _analytics = require("../analytics");
 
 var _assets = require("../quick-insert/assets");
 
-var _emoji2 = _interopRequireDefault(require("./nodeviews/emoji"));
+var _emoji3 = _interopRequireDefault(require("./nodeviews/emoji"));
 
 var _emojiNext = _interopRequireDefault(require("./nodeviews/emoji-next"));
 
@@ -36,6 +40,8 @@ var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
 
 var _featureFlagsContext = require("../feature-flags-context");
 
+var _openTypeaheadAtCursor = require("../type-ahead/transforms/open-typeahead-at-cursor");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -53,7 +59,7 @@ var emojiToTypeaheadItem = function emojiToTypeaheadItem(emoji, emojiProvider) {
         // It's required to pass emojiProvider through the context for custom emojis to work
         _react.default.createElement(_EmojiContextProvider.EmojiContextProvider, {
           emojiProvider: emojiProvider
-        }, /*#__PURE__*/_react.default.createElement(_emoji.EmojiTypeAheadItem, {
+        }, /*#__PURE__*/_react.default.createElement(_emoji2.EmojiTypeAheadItem, {
           emoji: emoji,
           selected: isSelected,
           onMouseMove: onHover,
@@ -99,7 +105,105 @@ var isFullShortName = function isFullShortName(query) {
   return query && query.length > 1 && query.charAt(0) === ':' && query.charAt(query.length - 1) === ':';
 };
 
+var TRIGGER = ':';
+
 var emojiPlugin = function emojiPlugin(options) {
+  var typeAhead = {
+    id: _typeAhead.TypeAheadAvailableNodes.EMOJI,
+    trigger: TRIGGER,
+    // Custom regex must have a capture group around trigger
+    // so it's possible to use it without needing to scan through all triggers again
+    customRegex: '\\(?(:)',
+    headless: options ? options.headless : undefined,
+    getItems: function getItems(_ref2) {
+      var query = _ref2.query,
+          editorState = _ref2.editorState;
+      var pluginState = getEmojiPluginState(editorState);
+      var emojiProvider = pluginState.emojiProvider;
+
+      if (!emojiProvider) {
+        return Promise.resolve([]);
+      }
+
+      return new Promise(function (resolve) {
+        var emojiProviderChangeHandler = {
+          result: function result(emojiResult) {
+            if (!emojiResult || !emojiResult.emojis) {
+              resolve([]);
+            } else {
+              var emojiItems = emojiResult.emojis.map(function (emoji) {
+                return memoizedToItem.call(emoji, emojiProvider);
+              });
+              resolve(emojiItems);
+            }
+
+            emojiProvider.unsubscribe(emojiProviderChangeHandler);
+          }
+        };
+        emojiProvider.subscribe(emojiProviderChangeHandler);
+        emojiProvider.filter(TRIGGER.concat(query), {
+          limit: defaultListLimit,
+          skinTone: emojiProvider.getSelectedTone(),
+          sort: !query.length ? _emoji2.SearchSort.UsageFrequency : _emoji2.SearchSort.Default
+        });
+      });
+    },
+    forceSelect: function forceSelect(_ref3) {
+      var query = _ref3.query,
+          items = _ref3.items,
+          editorState = _ref3.editorState;
+
+      var _emojiPluginKey$getSt = emojiPluginKey.getState(editorState),
+          asciiMap = _emojiPluginKey$getSt.asciiMap;
+
+      var normalizedQuery = TRIGGER.concat(query); // if the query has space at the end
+      // check the ascii map for emojis
+
+      if (asciiMap && normalizedQuery.length >= 3 && normalizedQuery.endsWith(' ') && asciiMap.has(normalizedQuery.trim())) {
+        var _emoji = asciiMap.get(normalizedQuery.trim());
+
+        return {
+          title: _emoji.name,
+          emoji: _emoji
+        };
+      }
+
+      var matchedItem = isFullShortName(normalizedQuery) ? items.find(function (item) {
+        return item.title.toLowerCase() === normalizedQuery;
+      }) : undefined;
+      return matchedItem;
+    },
+    selectItem: function selectItem(state, item, insert, _ref4) {
+      var mode = _ref4.mode;
+      var _item$emoji = item.emoji,
+          _item$emoji$id = _item$emoji.id,
+          id = _item$emoji$id === void 0 ? '' : _item$emoji$id,
+          fallback = _item$emoji.fallback,
+          shortName = _item$emoji.shortName;
+      var text = fallback || shortName;
+      var emojiPluginState = emojiPluginKey.getState(state);
+
+      if (emojiPluginState.emojiProvider && emojiPluginState.emojiProvider.recordSelection && item.emoji) {
+        emojiPluginState.emojiProvider.recordSelection(item.emoji).then((0, _emoji2.recordSelectionSucceededSli)(options)).catch((0, _emoji2.recordSelectionFailedSli)(options));
+      }
+
+      var emojiNode = state.schema.nodes.emoji.createChecked({
+        shortName: shortName,
+        id: id,
+        text: text
+      });
+      var space = state.schema.text(' ');
+      return (0, _analytics.addAnalytics)(state, insert(_prosemirrorModel.Fragment.from([emojiNode, space])), {
+        action: _analytics.ACTION.INSERTED,
+        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: _analytics.ACTION_SUBJECT_ID.EMOJI,
+        attributes: {
+          inputMethod: _analytics.INPUT_METHOD.TYPEAHEAD
+        },
+        eventType: _analytics.EVENT_TYPE.TRACK
+      });
+    }
+  };
   return {
     name: 'emoji',
     nodes: function nodes() {
@@ -111,26 +215,26 @@ var emojiPlugin = function emojiPlugin(options) {
     pmPlugins: function pmPlugins() {
       return [{
         name: 'emoji',
-        plugin: function plugin(_ref2) {
-          var providerFactory = _ref2.providerFactory,
-              dispatch = _ref2.dispatch,
-              portalProviderAPI = _ref2.portalProviderAPI,
-              eventDispatcher = _ref2.eventDispatcher;
+        plugin: function plugin(_ref5) {
+          var providerFactory = _ref5.providerFactory,
+              dispatch = _ref5.dispatch,
+              portalProviderAPI = _ref5.portalProviderAPI,
+              eventDispatcher = _ref5.eventDispatcher;
           return emojiPluginFactory(dispatch, providerFactory, portalProviderAPI, eventDispatcher, options);
         }
       }, {
         name: 'emojiAsciiInputRule',
-        plugin: function plugin(_ref3) {
-          var schema = _ref3.schema,
-              providerFactory = _ref3.providerFactory,
-              featureFlags = _ref3.featureFlags;
+        plugin: function plugin(_ref6) {
+          var schema = _ref6.schema,
+              providerFactory = _ref6.providerFactory,
+              featureFlags = _ref6.featureFlags;
           return (0, _asciiInputRules.inputRulePlugin)(schema, providerFactory, featureFlags);
         }
       }];
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref4) {
-        var formatMessage = _ref4.formatMessage;
+      quickInsert: function quickInsert(_ref7) {
+        var formatMessage = _ref7.formatMessage;
         return [{
           id: 'emoji',
           title: formatMessage(_messages.messages.emoji),
@@ -141,11 +245,11 @@ var emojiPlugin = function emojiPlugin(options) {
             return /*#__PURE__*/_react.default.createElement(_assets.IconEmoji, null);
           },
           action: function action(insert, state) {
-            var mark = state.schema.mark('typeAheadQuery', {
-              trigger: ':'
-            });
-            var emojiText = state.schema.text(':', [mark]);
-            var tr = insert(emojiText);
+            var tr = insert(undefined);
+            (0, _openTypeaheadAtCursor.openTypeAheadAtCursor)({
+              triggerHandler: typeAhead,
+              inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
+            })(tr);
             return (0, _analytics.addAnalytics)(state, tr, {
               action: _analytics.ACTION.INVOKED,
               actionSubject: _analytics.ACTION_SUBJECT.TYPEAHEAD,
@@ -158,69 +262,7 @@ var emojiPlugin = function emojiPlugin(options) {
           }
         }];
       },
-      typeAhead: {
-        trigger: ':',
-        // Custom regex must have a capture group around trigger
-        // so it's possible to use it without needing to scan through all triggers again
-        customRegex: '\\(?(:)',
-        headless: options ? options.headless : undefined,
-        getItems: function getItems(query, state, _intl, _ref5) {
-          var prevActive = _ref5.prevActive,
-              queryChanged = _ref5.queryChanged;
-          var pluginState = getEmojiPluginState(state);
-          var emojiProvider = pluginState.emojiProvider,
-              pluginEmojis = pluginState.emojis;
-          var emojis = !prevActive && queryChanged ? [] : pluginEmojis || [];
-
-          if (queryChanged && emojiProvider) {
-            memoizedToItem.clear();
-            emojiProvider.filter(query ? ":".concat(query) : '', {
-              limit: defaultListLimit,
-              skinTone: emojiProvider.getSelectedTone(),
-              sort: !query.length ? _emoji.SearchSort.UsageFrequency : _emoji.SearchSort.Default
-            });
-          }
-
-          return emojis.map(function (emoji) {
-            return memoizedToItem.call(emoji, emojiProvider);
-          });
-        },
-        forceSelect: function forceSelect(query, items) {
-          var normalizedQuery = ':' + query;
-          var matchedItem = isFullShortName(normalizedQuery) ? items.find(function (item) {
-            return item.title.toLowerCase() === normalizedQuery;
-          }) : undefined;
-          return matchedItem;
-        },
-        selectItem: function selectItem(state, item, insert, _ref6) {
-          var mode = _ref6.mode;
-          var _item$emoji = item.emoji,
-              _item$emoji$id = _item$emoji.id,
-              id = _item$emoji$id === void 0 ? '' : _item$emoji$id,
-              fallback = _item$emoji.fallback,
-              shortName = _item$emoji.shortName;
-          var text = fallback || shortName;
-          var emojiPluginState = emojiPluginKey.getState(state);
-
-          if (emojiPluginState.emojiProvider && emojiPluginState.emojiProvider.recordSelection && item.emoji) {
-            emojiPluginState.emojiProvider.recordSelection(item.emoji).then((0, _emoji.recordSelectionSucceededSli)(options)).catch((0, _emoji.recordSelectionFailedSli)(options));
-          }
-
-          return (0, _analytics.addAnalytics)(state, insert(state.schema.nodes.emoji.createChecked({
-            shortName: shortName,
-            id: id,
-            text: text
-          })), {
-            action: _analytics.ACTION.INSERTED,
-            actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-            actionSubjectId: _analytics.ACTION_SUBJECT_ID.EMOJI,
-            attributes: {
-              inputMethod: _analytics.INPUT_METHOD.TYPEAHEAD
-            },
-            eventType: _analytics.EVENT_TYPE.TRACK
-          });
-        }
-      }
+      typeAhead: typeAhead
     }
   };
 };
@@ -233,17 +275,18 @@ var _default = emojiPlugin;
 exports.default = _default;
 var ACTIONS = {
   SET_PROVIDER: 'SET_PROVIDER',
-  SET_RESULTS: 'SET_RESULTS'
+  SET_RESULTS: 'SET_RESULTS',
+  SET_ASCII_MAP: 'SET_ASCII_MAP'
 };
 exports.ACTIONS = ACTIONS;
 
-var setProvider = function setProvider(provider) {
+var setAsciiMap = function setAsciiMap(asciiMap) {
   return function (state, dispatch) {
     if (dispatch) {
       dispatch(state.tr.setMeta(emojiPluginKey, {
-        action: ACTIONS.SET_PROVIDER,
+        action: ACTIONS.SET_ASCII_MAP,
         params: {
-          provider: provider
+          asciiMap: asciiMap
         }
       }));
     }
@@ -252,15 +295,13 @@ var setProvider = function setProvider(provider) {
   };
 };
 
-exports.setProvider = setProvider;
-
-var setResults = function setResults(results) {
+var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {
       dispatch(state.tr.setMeta(emojiPluginKey, {
-        action: ACTIONS.SET_RESULTS,
+        action: ACTIONS.SET_PROVIDER,
         params: {
-          results: results
+          provider: provider
         }
       }));
     }
@@ -269,7 +310,7 @@ var setResults = function setResults(results) {
   };
 };
 
-exports.setResults = setResults;
+exports.setProvider = setProvider;
 var emojiPluginKey = new _prosemirrorState.PluginKey('emojiPlugin');
 exports.emojiPluginKey = emojiPluginKey;
 
@@ -278,8 +319,6 @@ function getEmojiPluginState(state) {
 }
 
 function emojiPluginFactory(dispatch, providerFactory, portalProviderAPI, eventDispatcher, options) {
-  var emojiProvider;
-  var emojiProviderChangeHandler;
   return new _prosemirrorState.Plugin({
     key: emojiPluginKey,
     state: {
@@ -287,12 +326,12 @@ function emojiPluginFactory(dispatch, providerFactory, portalProviderAPI, eventD
         return {};
       },
       apply: function apply(tr, pluginState) {
-        var _ref7 = tr.getMeta(emojiPluginKey) || {
+        var _ref8 = tr.getMeta(emojiPluginKey) || {
           action: null,
           params: null
         },
-            action = _ref7.action,
-            params = _ref7.params;
+            action = _ref8.action,
+            params = _ref8.params;
 
         var newPluginState = pluginState;
 
@@ -304,9 +343,9 @@ function emojiPluginFactory(dispatch, providerFactory, portalProviderAPI, eventD
             dispatch(emojiPluginKey, newPluginState);
             return newPluginState;
 
-          case ACTIONS.SET_RESULTS:
+          case ACTIONS.SET_ASCII_MAP:
             newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
-              emojis: params.results.emojis
+              asciiMap: params.asciiMap
             });
             dispatch(emojiPluginKey, newPluginState);
             return newPluginState;
@@ -319,7 +358,7 @@ function emojiPluginFactory(dispatch, providerFactory, portalProviderAPI, eventD
       nodeViews: {
         emoji: function emoji(node, view, getPos) {
           var featureFlags = (0, _featureFlagsContext.getFeatureFlags)(view.state);
-          var createEmojiNodeView = featureFlags !== null && featureFlags !== void 0 && featureFlags.nextEmojiNodeView ? (0, _emojiNext.default)(providerFactory, options) : (0, _emoji2.default)(portalProviderAPI, eventDispatcher, providerFactory, options);
+          var createEmojiNodeView = featureFlags !== null && featureFlags !== void 0 && featureFlags.nextEmojiNodeView ? (0, _emojiNext.default)(providerFactory, options) : (0, _emoji3.default)(portalProviderAPI, eventDispatcher, providerFactory, options);
           return createEmojiNodeView(node, view, getPos);
         }
       }
@@ -333,22 +372,10 @@ function emojiPluginFactory(dispatch, providerFactory, portalProviderAPI, eventD
             }
 
             providerPromise.then(function (provider) {
-              if (emojiProvider && emojiProviderChangeHandler) {
-                emojiProvider.unsubscribe(emojiProviderChangeHandler);
-              }
-
-              emojiProvider = provider;
               setProvider(provider)(editorView.state, editorView.dispatch);
-              emojiProviderChangeHandler = {
-                result: function result(emojis) {
-                  // Emoji provider is synchronous and
-                  // we need to make it async here to make PM happy
-                  Promise.resolve().then(function () {
-                    setResults(emojis)(editorView.state, editorView.dispatch);
-                  });
-                }
-              };
-              provider.subscribe(emojiProviderChangeHandler);
+              provider.getAsciiMap().then(function (asciiMap) {
+                setAsciiMap(asciiMap)(editorView.state, editorView.dispatch);
+              });
             }).catch(function () {
               return setProvider(undefined)(editorView.state, editorView.dispatch);
             });
@@ -364,10 +391,6 @@ function emojiPluginFactory(dispatch, providerFactory, portalProviderAPI, eventD
           if (providerFactory) {
             providerFactory.unsubscribe('emojiProvider', providerHandler);
           }
-
-          if (emojiProvider && emojiProviderChangeHandler) {
-            emojiProvider.unsubscribe(emojiProviderChangeHandler);
-          }
         }
       };
     }

package/dist/cjs/plugins/emoji/pm-plugins/ascii-input-rules.js

@@ -28,8 +28,6 @@ var _inputRules = require("../../../utils/input-rules");
 
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 
-var _utils = require("../../../utils");
-
 var _analytics = require("../../analytics");
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -71,10 +69,6 @@ function inputRuleHandler(state, matchParts, start, end) {
     return null;
   }
 
-  if (!isEnabled(state)) {
-    return null;
-  }
-
   var match = matcher.match(matchParts);
 
   if (match) {
@@ -85,14 +79,6 @@ function inputRuleHandler(state, matchParts, start, end) {
   return null;
 }
 
-function isEnabled(state) {
-  var typeAheadQuery = state.schema.marks.typeAheadQuery;
-  var isTypeAheadQueryActive = state.selection.$from.marks().some(function (mark) {
-    return mark.type === typeAheadQuery;
-  });
-  return isTypeAheadQueryActive || (0, _utils.isMarkTypeAllowedInCurrentSelection)(typeAheadQuery, state);
-}
-
 var REGEX_LEADING_CAPTURE_INDEX = 1;
 var REGEX_EMOJI_LEADING_PARENTHESES = 2;
 var REGEX_EMOJI_ASCII_CAPTURE_INDEX = 3;

package/dist/cjs/plugins/expand/pm-plugins/keymap.js

@@ -17,8 +17,6 @@ var _gapCursorSelection = require("../../selection/gap-cursor-selection");
 
 var _utils = require("../utils");
 
-var _findQueryMark = require("../../type-ahead/utils/find-query-mark");
-
 var _utils2 = require("../../../utils");
 
 var _classNames = require("../ui/class-names");
@@ -101,9 +99,7 @@ function expandKeymap() {
     return false;
   }, list);
   keymaps.bindKeymapWithCommand(keymaps.moveUp.common, function (state, dispatch, editorView) {
-    var queryMark = (0, _findQueryMark.findTypeAheadQuery)(state);
-
-    if (queryMark.start !== -1 && queryMark.end !== -1 || !editorView) {
+    if (!editorView) {
       return false;
     }
 
@@ -136,8 +132,8 @@ function expandKeymap() {
           return (0, _commands.focusTitle)(expandBefore.start)(state, dispatch, editorView);
         } // moving cursor from outside of an expand to the content when it is expanded
         else if (dispatch) {
-            dispatch(state.tr.setSelection(sel));
-          }
+          dispatch(state.tr.setSelection(sel));
+        }
 
         return true;
       }

package/dist/cjs/plugins/extension/actions.js

@@ -86,22 +86,22 @@ var performNodeUpdate = function performNodeUpdate(type, newAttrs, content, mark
       tr.setSelection(_prosemirrorState.TextSelection.create(tr.doc, state.selection.anchor));
     } // If any extension is currently selected
     else if ((0, _prosemirrorUtils.findSelectedNodeOfType)([extension, bodiedExtension, inlineExtension])(selection)) {
-        tr = (0, _prosemirrorUtils.replaceSelectedNode)(newNode)(tr); // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
-
-        tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, tr.mapping.map(state.selection.anchor)));
-      } // When we loose the selection. This usually happens when Synchrony resets or changes
-      // the selection when user is in the middle of updating an extension.
-      else if (extensionState.element) {
-          var pos = view.posAtDOM(extensionState.element, -1);
-
-          if (pos > -1) {
-            tr = tr.replaceWith(pos, pos + (content.size || 0) + 1, newNode);
-            tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(pos)));
-            targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
-          } else {
-            action = _analytics.ACTION.ERRORED;
-          }
-        } // Only scroll if we have anything to update, best to avoid surprise scroll
+      tr = (0, _prosemirrorUtils.replaceSelectedNode)(newNode)(tr); // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
+
+      tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, tr.mapping.map(state.selection.anchor)));
+    } // When we loose the selection. This usually happens when Synchrony resets or changes
+    // the selection when user is in the middle of updating an extension.
+    else if (extensionState.element) {
+      var pos = view.posAtDOM(extensionState.element, -1);
+
+      if (pos > -1) {
+        tr = tr.replaceWith(pos, pos + (content.size || 0) + 1, newNode);
+        tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(pos)));
+        targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
+      } else {
+        action = _analytics.ACTION.ERRORED;
+      }
+    } // Only scroll if we have anything to update, best to avoid surprise scroll
 
 
     if (dispatch && tr.docChanged) {

package/dist/cjs/plugins/extension/pm-plugins/main.js

@@ -359,10 +359,10 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
             })(state, dispatch);
           } // New DOM element doesn't necessarily mean it's a new Node
           else if (element !== newElement) {
-              (0, _commands.updateState)({
-                element: newElement
-              })(state, dispatch);
-            }
+            (0, _commands.updateState)({
+              element: newElement
+            })(state, dispatch);
+          }
 
           return true;
         },

package/dist/cjs/plugins/extension/ui/Extension/ExtensionComponent.js

@@ -146,7 +146,8 @@ var ExtensionComponent = /*#__PURE__*/function (_Component) {
         extensionType: extensionType,
         extensionKey: extensionKey,
         parameters: parameters,
-        content: text
+        content: text,
+        localId: pmNode.attrs.localId
       };
       var result;
 
@@ -162,7 +163,7 @@ var ExtensionComponent = /*#__PURE__*/function (_Component) {
           var NodeRenderer = extensionHandlerFromProvider;
           return /*#__PURE__*/_react.default.createElement(NodeRenderer, {
             node: node,
-            refNode: _this.props.refNode
+            references: _this.props.references
           });
         }
       }
@@ -215,7 +216,7 @@ var ExtensionComponent = /*#__PURE__*/function (_Component) {
           node = _this$props2.node,
           handleContentDOMRef = _this$props2.handleContentDOMRef,
           editorView = _this$props2.editorView,
-          refNode = _this$props2.refNode,
+          references = _this$props2.references,
           editorAppearance = _this$props2.editorAppearance;
       var extensionHandlerResult = this.tryExtensionHandler();
 
@@ -224,7 +225,7 @@ var ExtensionComponent = /*#__PURE__*/function (_Component) {
         case 'bodiedExtension':
           return /*#__PURE__*/_react.default.createElement(_Extension.default, {
             node: node,
-            refNode: refNode,
+            references: references,
             extensionProvider: this.state.extensionProvider,
             handleContentDOMRef: handleContentDOMRef,
             view: editorView,

package/dist/cjs/plugins/extension/ui/Extension/index.js

@@ -54,12 +54,12 @@ var Extension = /*#__PURE__*/function (_Component) {
           editorView = _this$props.editorView,
           handleContentDOMRef = _this$props.handleContentDOMRef,
           extensionHandlers = _this$props.extensionHandlers,
-          refNode = _this$props.refNode,
+          references = _this$props.references,
           editorAppearance = _this$props.editorAppearance;
       return /*#__PURE__*/_react.default.createElement(_ExtensionComponent.default, {
         editorView: editorView,
         node: node,
-        refNode: refNode,
+        references: references,
         extensionProvider: extensionProvider,
         handleContentDOMRef: handleContentDOMRef,
         extensionHandlers: extensionHandlers,

package/dist/cjs/plugins/feature-flags-context/feature-flags-from-props.js

@@ -22,7 +22,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * which is used by both current and archv3 editors.
  */
 function createFeatureFlagsFromProps(props) {
-  var _props$allowTextColor, _props$performanceTra, _props$performanceTra2, _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$allowTables, _props$featureFlags4, _props$featureFlags5, _props$allowTables2, _props$featureFlags6, _props$featureFlags7, _props$allowTables3, _props$featureFlags8, _props$featureFlags9, _props$allowTables4, _props$featureFlags10, _props$featureFlags11, _props$allowTables5, _props$allowExtension, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23;
+  var _props$allowTextColor, _props$performanceTra, _props$performanceTra2, _props$featureFlags, _props$featureFlags2, _props$featureFlags3, _props$allowTables, _props$featureFlags4, _props$featureFlags5, _props$allowTables2, _props$featureFlags6, _props$featureFlags7, _props$allowTables3, _props$featureFlags8, _props$featureFlags9, _props$allowTables4, _props$featureFlags10, _props$featureFlags11, _props$allowTables5, _props$allowExtension, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25;
 
   return _objectSpread(_objectSpread({}, (0, _normalizeFeatureFlags.normalizeFeatureFlags)(props.featureFlags)), {}, {
     newInsertionBehaviour: props.allowNewInsertionBehaviour,
@@ -48,6 +48,7 @@ function createFeatureFlagsFromProps(props) {
     showAvatarGroupAsPlugin: Boolean(typeof ((_props$featureFlags16 = props.featureFlags) === null || _props$featureFlags16 === void 0 ? void 0 : _props$featureFlags16.showAvatarGroupAsPlugin) === 'boolean' ? !!((_props$featureFlags17 = props.featureFlags) !== null && _props$featureFlags17 !== void 0 && _props$featureFlags17.showAvatarGroupAsPlugin) : false),
     errorBoundaryDocStructure: Boolean(typeof ((_props$featureFlags18 = props.featureFlags) === null || _props$featureFlags18 === void 0 ? void 0 : _props$featureFlags18.useErrorBoundaryDocStructure) === 'boolean' ? !!((_props$featureFlags19 = props.featureFlags) !== null && _props$featureFlags19 !== void 0 && _props$featureFlags19.useErrorBoundaryDocStructure) : false),
     synchronyErrorDocStructure: Boolean(typeof ((_props$featureFlags20 = props.featureFlags) === null || _props$featureFlags20 === void 0 ? void 0 : _props$featureFlags20.synchronyErrorDocStructure) === 'boolean' ? !!((_props$featureFlags21 = props.featureFlags) !== null && _props$featureFlags21 !== void 0 && _props$featureFlags21.synchronyErrorDocStructure) : false),
-    enableViewUpdateSubscription: Boolean(typeof ((_props$featureFlags22 = props.featureFlags) === null || _props$featureFlags22 === void 0 ? void 0 : _props$featureFlags22.enableViewUpdateSubscription) === 'boolean' ? !!((_props$featureFlags23 = props.featureFlags) !== null && _props$featureFlags23 !== void 0 && _props$featureFlags23.enableViewUpdateSubscription) : false)
+    enableViewUpdateSubscription: Boolean(typeof ((_props$featureFlags22 = props.featureFlags) === null || _props$featureFlags22 === void 0 ? void 0 : _props$featureFlags22.enableViewUpdateSubscription) === 'boolean' ? !!((_props$featureFlags23 = props.featureFlags) !== null && _props$featureFlags23 !== void 0 && _props$featureFlags23.enableViewUpdateSubscription) : false),
+    collabAvatarScroll: Boolean(typeof ((_props$featureFlags24 = props.featureFlags) === null || _props$featureFlags24 === void 0 ? void 0 : _props$featureFlags24.collabAvatarScroll) === 'boolean' ? !!((_props$featureFlags25 = props.featureFlags) !== null && _props$featureFlags25 !== void 0 && _props$featureFlags25.collabAvatarScroll) : false)
   });
 }

package/dist/cjs/plugins/floating-toolbar/ui/ConfirmationModal.js

@@ -13,6 +13,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _reactIntl = require("react-intl");
 
+var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
+
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
 
 var _messages = _interopRequireDefault(require("./messages"));
@@ -30,24 +32,20 @@ var ConfirmationModalImpl = function ConfirmationModalImpl(props) {
   var heading = (options === null || options === void 0 ? void 0 : options.title) || formatMessage(_messages.default.confirmModalDefaultHeading);
   var okButtonLabel = (options === null || options === void 0 ? void 0 : options.okButtonLabel) || formatMessage(_messages.default.confirmModalOK);
   var cancelButtonLabel = (options === null || options === void 0 ? void 0 : options.cancelButtonLabel) || formatMessage(_messages.default.confirmModalCancel);
-  var actionButtons = [{
-    text: cancelButtonLabel,
-    appearance: 'default',
+  return /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTransition, null, options && /*#__PURE__*/_react.default.createElement(_modalDialog.default, {
+    onClose: onClose,
+    testId: testId
+  }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, {
+    appearance: "warning"
+  }, heading)), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalBody, null, /*#__PURE__*/_react.default.createElement("p", null, options.message)), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalFooter, null, /*#__PURE__*/_react.default.createElement(_standardButton.default, {
+    appearance: "default",
     onClick: onClose,
     testId: testId ? "".concat(testId, "-cancel-button") : undefined
-  }, {
-    text: okButtonLabel,
-    appearance: 'warning',
+  }, cancelButtonLabel), /*#__PURE__*/_react.default.createElement(_standardButton.default, {
+    appearance: "warning",
     onClick: onConfirm,
     testId: testId ? "".concat(testId, "-confirm-button") : undefined
-  }];
-  return /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTransition, null, options && /*#__PURE__*/_react.default.createElement(_modalDialog.default, {
-    actions: actionButtons,
-    onClose: onClose,
-    heading: heading,
-    appearance: "warning",
-    testId: testId
-  }, /*#__PURE__*/_react.default.createElement("p", null, options.message)));
+  }, okButtonLabel))));
 };
 
 var ConfirmationModal = (0, _reactIntl.injectIntl)(ConfirmationModalImpl);