@atlaskit/editor-core 148.0.0 → 149.0.3

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

@@ -1,6 +1,8 @@
 import React from 'react';
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { emoji } from '@atlaskit/adf-schema';
+import { Fragment } from 'prosemirror-model';
+import { TypeAheadAvailableNodes } from '@atlaskit/editor-common/type-ahead';
 import { EmojiTypeAheadItem, SearchSort, recordSelectionSucceededSli, recordSelectionFailedSli } from '@atlaskit/emoji';
 import { inputRulePlugin as asciiInputRulePlugin } from './pm-plugins/ascii-input-rules';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
@@ -10,6 +12,7 @@ import emojiNodeViewNext from './nodeviews/emoji-next';
 import { EmojiContextProvider } from './ui/EmojiContextProvider';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { getFeatureFlags } from '../feature-flags-context';
+import { openTypeAheadAtCursor } from '../type-ahead/transforms/open-typeahead-at-cursor';
 export const emojiToTypeaheadItem = (emoji, emojiProvider) => ({
   title: emoji.shortName || '',
   key: emoji.id || emoji.shortName,
@@ -63,133 +66,169 @@ export const defaultListLimit = 50;
 
 const isFullShortName = query => query && query.length > 1 && query.charAt(0) === ':' && query.charAt(query.length - 1) === ':';
 
-const emojiPlugin = options => ({
-  name: 'emoji',
+const TRIGGER = ':';
+
+const emojiPlugin = options => {
+  const typeAhead = {
+    id: 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({
+      query,
+      editorState
+    }) {
+      const pluginState = getEmojiPluginState(editorState);
+      const emojiProvider = pluginState.emojiProvider;
+
+      if (!emojiProvider) {
+        return Promise.resolve([]);
+      }
 
-  nodes() {
-    return [{
-      name: 'emoji',
-      node: emoji
-    }];
-  },
+      return new Promise(resolve => {
+        const emojiProviderChangeHandler = {
+          result(emojiResult) {
+            if (!emojiResult || !emojiResult.emojis) {
+              resolve([]);
+            } else {
+              const emojiItems = emojiResult.emojis.map(emoji => memoizedToItem.call(emoji, emojiProvider));
+              resolve(emojiItems);
+            }
 
-  pmPlugins() {
-    return [{
-      name: 'emoji',
-      plugin: ({
-        providerFactory,
-        dispatch,
-        portalProviderAPI,
-        eventDispatcher
-      }) => emojiPluginFactory(dispatch, providerFactory, portalProviderAPI, eventDispatcher, options)
-    }, {
-      name: 'emojiAsciiInputRule',
-      plugin: ({
-        schema,
-        providerFactory,
-        featureFlags
-      }) => asciiInputRulePlugin(schema, providerFactory, featureFlags)
-    }];
-  },
+            emojiProvider.unsubscribe(emojiProviderChangeHandler);
+          }
 
-  pluginsOptions: {
-    quickInsert: ({
-      formatMessage
-    }) => [{
-      id: 'emoji',
-      title: formatMessage(messages.emoji),
-      description: formatMessage(messages.emojiDescription),
-      priority: 500,
-      keyshortcut: ':',
-      icon: () => /*#__PURE__*/React.createElement(IconEmoji, null),
-
-      action(insert, state) {
-        const mark = state.schema.mark('typeAheadQuery', {
-          trigger: ':'
-        });
-        const emojiText = state.schema.text(':', [mark]);
-        const tr = insert(emojiText);
-        return addAnalytics(state, tr, {
-          action: ACTION.INVOKED,
-          actionSubject: ACTION_SUBJECT.TYPEAHEAD,
-          actionSubjectId: ACTION_SUBJECT_ID.TYPEAHEAD_EMOJI,
-          attributes: {
-            inputMethod: INPUT_METHOD.QUICK_INSERT
-          },
-          eventType: EVENT_TYPE.UI
+        };
+        emojiProvider.subscribe(emojiProviderChangeHandler);
+        emojiProvider.filter(TRIGGER.concat(query), {
+          limit: defaultListLimit,
+          skinTone: emojiProvider.getSelectedTone(),
+          sort: !query.length ? SearchSort.UsageFrequency : SearchSort.Default
         });
+      });
+    },
+
+    forceSelect({
+      query,
+      items,
+      editorState
+    }) {
+      const {
+        asciiMap
+      } = emojiPluginKey.getState(editorState);
+      const 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())) {
+        const emoji = asciiMap.get(normalizedQuery.trim());
+        return {
+          title: emoji.name,
+          emoji
+        };
       }
 
-    }],
-    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(query, state, _intl, {
-        prevActive,
-        queryChanged
-      }) {
-        const pluginState = getEmojiPluginState(state);
-        const {
-          emojiProvider,
-          emojis: pluginEmojis
-        } = pluginState;
-        const emojis = !prevActive && queryChanged ? [] : pluginEmojis || [];
-
-        if (queryChanged && emojiProvider) {
-          memoizedToItem.clear();
-          emojiProvider.filter(query ? `:${query}` : '', {
-            limit: defaultListLimit,
-            skinTone: emojiProvider.getSelectedTone(),
-            sort: !query.length ? SearchSort.UsageFrequency : SearchSort.Default
-          });
-        }
+      const matchedItem = isFullShortName(normalizedQuery) ? items.find(item => item.title.toLowerCase() === normalizedQuery) : undefined;
+      return matchedItem;
+    },
 
-        return emojis.map(emoji => memoizedToItem.call(emoji, emojiProvider));
-      },
+    selectItem(state, item, insert, {
+      mode
+    }) {
+      const {
+        id = '',
+        fallback,
+        shortName
+      } = item.emoji;
+      const text = fallback || shortName;
+      const emojiPluginState = emojiPluginKey.getState(state);
+
+      if (emojiPluginState.emojiProvider && emojiPluginState.emojiProvider.recordSelection && item.emoji) {
+        emojiPluginState.emojiProvider.recordSelection(item.emoji).then(recordSelectionSucceededSli(options)).catch(recordSelectionFailedSli(options));
+      }
 
-      forceSelect(query, items) {
-        const normalizedQuery = ':' + query;
-        const matchedItem = isFullShortName(normalizedQuery) ? items.find(item => item.title.toLowerCase() === normalizedQuery) : undefined;
-        return matchedItem;
-      },
+      const emojiNode = state.schema.nodes.emoji.createChecked({
+        shortName,
+        id,
+        text
+      });
+      const space = state.schema.text(' ');
+      return addAnalytics(state, insert(Fragment.from([emojiNode, space])), {
+        action: ACTION.INSERTED,
+        actionSubject: ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: ACTION_SUBJECT_ID.EMOJI,
+        attributes: {
+          inputMethod: INPUT_METHOD.TYPEAHEAD
+        },
+        eventType: EVENT_TYPE.TRACK
+      });
+    }
 
-      selectItem(state, item, insert, {
-        mode
-      }) {
-        const {
-          id = '',
-          fallback,
-          shortName
-        } = item.emoji;
-        const text = fallback || shortName;
-        const emojiPluginState = emojiPluginKey.getState(state);
-
-        if (emojiPluginState.emojiProvider && emojiPluginState.emojiProvider.recordSelection && item.emoji) {
-          emojiPluginState.emojiProvider.recordSelection(item.emoji).then(recordSelectionSucceededSli(options)).catch(recordSelectionFailedSli(options));
-        }
+  };
+  return {
+    name: 'emoji',
 
-        return addAnalytics(state, insert(state.schema.nodes.emoji.createChecked({
-          shortName,
-          id,
-          text
-        })), {
-          action: ACTION.INSERTED,
-          actionSubject: ACTION_SUBJECT.DOCUMENT,
-          actionSubjectId: ACTION_SUBJECT_ID.EMOJI,
-          attributes: {
-            inputMethod: INPUT_METHOD.TYPEAHEAD
-          },
-          eventType: EVENT_TYPE.TRACK
-        });
-      }
+    nodes() {
+      return [{
+        name: 'emoji',
+        node: emoji
+      }];
+    },
+
+    pmPlugins() {
+      return [{
+        name: 'emoji',
+        plugin: ({
+          providerFactory,
+          dispatch,
+          portalProviderAPI,
+          eventDispatcher
+        }) => emojiPluginFactory(dispatch, providerFactory, portalProviderAPI, eventDispatcher, options)
+      }, {
+        name: 'emojiAsciiInputRule',
+        plugin: ({
+          schema,
+          providerFactory,
+          featureFlags
+        }) => asciiInputRulePlugin(schema, providerFactory, featureFlags)
+      }];
+    },
+
+    pluginsOptions: {
+      quickInsert: ({
+        formatMessage
+      }) => [{
+        id: 'emoji',
+        title: formatMessage(messages.emoji),
+        description: formatMessage(messages.emojiDescription),
+        priority: 500,
+        keyshortcut: ':',
+        icon: () => /*#__PURE__*/React.createElement(IconEmoji, null),
+
+        action(insert, state) {
+          const tr = insert(undefined);
+          openTypeAheadAtCursor({
+            triggerHandler: typeAhead,
+            inputMethod: INPUT_METHOD.QUICK_INSERT
+          })(tr);
+          return addAnalytics(state, tr, {
+            action: ACTION.INVOKED,
+            actionSubject: ACTION_SUBJECT.TYPEAHEAD,
+            actionSubjectId: ACTION_SUBJECT_ID.TYPEAHEAD_EMOJI,
+            attributes: {
+              inputMethod: INPUT_METHOD.QUICK_INSERT
+            },
+            eventType: EVENT_TYPE.UI
+          });
+        }
 
+      }],
+      typeAhead
     }
-  }
-});
+  };
+};
 
 export default emojiPlugin;
 /**
@@ -198,26 +237,29 @@ export default emojiPlugin;
 
 export const ACTIONS = {
   SET_PROVIDER: 'SET_PROVIDER',
-  SET_RESULTS: 'SET_RESULTS'
+  SET_RESULTS: 'SET_RESULTS',
+  SET_ASCII_MAP: 'SET_ASCII_MAP'
 };
-export const setProvider = provider => (state, dispatch) => {
+
+const setAsciiMap = asciiMap => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(emojiPluginKey, {
-      action: ACTIONS.SET_PROVIDER,
+      action: ACTIONS.SET_ASCII_MAP,
       params: {
-        provider
+        asciiMap
       }
     }));
   }
 
   return true;
 };
-export const setResults = results => (state, dispatch) => {
+
+export const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(emojiPluginKey, {
-      action: ACTIONS.SET_RESULTS,
+      action: ACTIONS.SET_PROVIDER,
       params: {
-        results
+        provider
       }
     }));
   }
@@ -229,8 +271,6 @@ export function getEmojiPluginState(state) {
   return emojiPluginKey.getState(state) || {};
 }
 export function emojiPluginFactory(dispatch, providerFactory, portalProviderAPI, eventDispatcher, options) {
-  let emojiProvider;
-  let emojiProviderChangeHandler;
   return new Plugin({
     key: emojiPluginKey,
     state: {
@@ -256,9 +296,9 @@ export function emojiPluginFactory(dispatch, providerFactory, portalProviderAPI,
             dispatch(emojiPluginKey, newPluginState);
             return newPluginState;
 
-          case ACTIONS.SET_RESULTS:
+          case ACTIONS.SET_ASCII_MAP:
             newPluginState = { ...pluginState,
-              emojis: params.results.emojis
+              asciiMap: params.asciiMap
             };
             dispatch(emojiPluginKey, newPluginState);
             return newPluginState;
@@ -288,23 +328,10 @@ export function emojiPluginFactory(dispatch, providerFactory, portalProviderAPI,
             }
 
             providerPromise.then(provider => {
-              if (emojiProvider && emojiProviderChangeHandler) {
-                emojiProvider.unsubscribe(emojiProviderChangeHandler);
-              }
-
-              emojiProvider = provider;
               setProvider(provider)(editorView.state, editorView.dispatch);
-              emojiProviderChangeHandler = {
-                result(emojis) {
-                  // Emoji provider is synchronous and
-                  // we need to make it async here to make PM happy
-                  Promise.resolve().then(() => {
-                    setResults(emojis)(editorView.state, editorView.dispatch);
-                  });
-                }
-
-              };
-              provider.subscribe(emojiProviderChangeHandler);
+              provider.getAsciiMap().then(asciiMap => {
+                setAsciiMap(asciiMap)(editorView.state, editorView.dispatch);
+              });
             }).catch(() => setProvider(undefined)(editorView.state, editorView.dispatch));
             break;
         }
@@ -318,10 +345,6 @@ export function emojiPluginFactory(dispatch, providerFactory, portalProviderAPI,
           if (providerFactory) {
             providerFactory.unsubscribe('emojiProvider', providerHandler);
           }
-
-          if (emojiProvider && emojiProviderChangeHandler) {
-            emojiProvider.unsubscribe(emojiProviderChangeHandler);
-          }
         }
 
       };

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

@@ -2,7 +2,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { PluginKey } from 'prosemirror-state';
 import { createRule, createPlugin } from '../../../utils/input-rules';
 import { leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
-import { isMarkTypeAllowedInCurrentSelection } from '../../../utils';
 import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '../../analytics';
 let matcher;
 export function inputRulePlugin(schema, providerFactory, featureFlags) {
@@ -38,10 +37,6 @@ function inputRuleHandler(state, matchParts, start, end) {
     return null;
   }
 
-  if (!isEnabled(state)) {
-    return null;
-  }
-
   const match = matcher.match(matchParts);
 
   if (match) {
@@ -52,12 +47,6 @@ function inputRuleHandler(state, matchParts, start, end) {
   return null;
 }
 
-function isEnabled(state) {
-  const typeAheadQuery = state.schema.marks.typeAheadQuery;
-  const isTypeAheadQueryActive = state.selection.$from.marks().some(mark => mark.type === typeAheadQuery);
-  return isTypeAheadQueryActive || isMarkTypeAllowedInCurrentSelection(typeAheadQuery, state);
-}
-
 const REGEX_LEADING_CAPTURE_INDEX = 1;
 const REGEX_EMOJI_LEADING_PARENTHESES = 2;
 const REGEX_EMOJI_ASCII_CAPTURE_INDEX = 3;

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

@@ -3,7 +3,6 @@ import { Selection, TextSelection, NodeSelection } from 'prosemirror-state';
 import * as keymaps from '../../../keymaps';
 import { GapCursorSelection, Side } from '../../selection/gap-cursor-selection';
 import { findExpand } from '../utils';
-import { findTypeAheadQuery } from '../../type-ahead/utils/find-query-mark';
 import { isEmptyNode } from '../../../utils';
 import { expandClassNames } from '../ui/class-names';
 import { deleteExpand, focusTitle } from '../commands';
@@ -84,9 +83,7 @@ export function expandKeymap() {
     return false;
   }, list);
   keymaps.bindKeymapWithCommand(keymaps.moveUp.common, (state, dispatch, editorView) => {
-    const queryMark = findTypeAheadQuery(state);
-
-    if (queryMark.start !== -1 && queryMark.end !== -1 || !editorView) {
+    if (!editorView) {
       return false;
     }
 
@@ -126,8 +123,8 @@ export function expandKeymap() {
           return 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/es2019/plugins/extension/actions.js

@@ -61,22 +61,22 @@ export const performNodeUpdate = (type, newAttrs, content, marks, shouldScrollIn
     tr.setSelection(TextSelection.create(tr.doc, state.selection.anchor));
   } // If any extension is currently selected
   else if (findSelectedNodeOfType([extension, bodiedExtension, inlineExtension])(selection)) {
-      tr = replaceSelectedNode(newNode)(tr); // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
-
-      tr.setSelection(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) {
-        const pos = view.posAtDOM(extensionState.element, -1);
-
-        if (pos > -1) {
-          tr = tr.replaceWith(pos, pos + (content.size || 0) + 1, newNode);
-          tr.setSelection(Selection.near(tr.doc.resolve(pos)));
-          targetSelectionSource = TARGET_SELECTION_SOURCE.HTML_ELEMENT;
-        } else {
-          action = ACTION.ERRORED;
-        }
-      } // Only scroll if we have anything to update, best to avoid surprise scroll
+    tr = replaceSelectedNode(newNode)(tr); // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
+
+    tr.setSelection(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) {
+    const pos = view.posAtDOM(extensionState.element, -1);
+
+    if (pos > -1) {
+      tr = tr.replaceWith(pos, pos + (content.size || 0) + 1, newNode);
+      tr.setSelection(Selection.near(tr.doc.resolve(pos)));
+      targetSelectionSource = TARGET_SELECTION_SOURCE.HTML_ELEMENT;
+    } else {
+      action = ACTION.ERRORED;
+    }
+  } // Only scroll if we have anything to update, best to avoid surprise scroll
 
 
   if (dispatch && tr.docChanged) {

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

@@ -166,10 +166,10 @@ const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProvid
             })(state, dispatch);
           } // New DOM element doesn't necessarily mean it's a new Node
           else if (element !== newElement) {
-              updateState({
-                element: newElement
-              })(state, dispatch);
-            }
+            updateState({
+              element: newElement
+            })(state, dispatch);
+          }
 
           return true;
         },

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

@@ -82,7 +82,8 @@ export default class ExtensionComponent extends Component {
         extensionType,
         extensionKey,
         parameters,
-        content: text
+        content: text,
+        localId: pmNode.attrs.localId
       };
       let result;
 
@@ -98,7 +99,7 @@ export default class ExtensionComponent extends Component {
           const NodeRenderer = extensionHandlerFromProvider;
           return /*#__PURE__*/React.createElement(NodeRenderer, {
             node: node,
-            refNode: this.props.refNode
+            references: this.props.references
           });
         }
       }
@@ -147,7 +148,7 @@ export default class ExtensionComponent extends Component {
       node,
       handleContentDOMRef,
       editorView,
-      refNode,
+      references,
       editorAppearance
     } = this.props;
     const extensionHandlerResult = this.tryExtensionHandler();
@@ -157,7 +158,7 @@ export default class ExtensionComponent extends Component {
       case 'bodiedExtension':
         return /*#__PURE__*/React.createElement(Extension, {
           node: node,
-          refNode: refNode,
+          references: references,
           extensionProvider: this.state.extensionProvider,
           handleContentDOMRef: handleContentDOMRef,
           view: editorView,

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

@@ -15,13 +15,13 @@ export default class Extension extends Component {
         editorView,
         handleContentDOMRef,
         extensionHandlers,
-        refNode,
+        references,
         editorAppearance
       } = this.props;
       return /*#__PURE__*/React.createElement(ExtensionComponent, {
         editorView: editorView,
         node: node,
-        refNode: refNode,
+        references: references,
         extensionProvider: extensionProvider,
         handleContentDOMRef: handleContentDOMRef,
         extensionHandlers: extensionHandlers,

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

@@ -5,7 +5,7 @@ import { normalizeFeatureFlags } from '@atlaskit/editor-common/normalize-feature
  * which is used by both current and archv3 editors.
  */
 export 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 { ...normalizeFeatureFlags(props.featureFlags),
     newInsertionBehaviour: props.allowNewInsertionBehaviour,
@@ -31,6 +31,7 @@ export 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/es2019/plugins/floating-toolbar/ui/ConfirmationModal.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { injectIntl } from 'react-intl';
-import Modal, { ModalTransition } from '@atlaskit/modal-dialog';
+import Button from '@atlaskit/button/standard-button';
+import Modal, { ModalTransition, ModalBody, ModalTitle, ModalHeader, ModalFooter } from '@atlaskit/modal-dialog';
 import messages from './messages';
 
 const ConfirmationModalImpl = props => {
@@ -16,24 +17,20 @@ const ConfirmationModalImpl = props => {
   const heading = (options === null || options === void 0 ? void 0 : options.title) || formatMessage(messages.confirmModalDefaultHeading);
   const okButtonLabel = (options === null || options === void 0 ? void 0 : options.okButtonLabel) || formatMessage(messages.confirmModalOK);
   const cancelButtonLabel = (options === null || options === void 0 ? void 0 : options.cancelButtonLabel) || formatMessage(messages.confirmModalCancel);
-  const actionButtons = [{
-    text: cancelButtonLabel,
-    appearance: 'default',
+  return /*#__PURE__*/React.createElement(ModalTransition, null, options && /*#__PURE__*/React.createElement(Modal, {
+    onClose: onClose,
+    testId: testId
+  }, /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(ModalTitle, {
+    appearance: "warning"
+  }, heading)), /*#__PURE__*/React.createElement(ModalBody, null, /*#__PURE__*/React.createElement("p", null, options.message)), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
+    appearance: "default",
     onClick: onClose,
     testId: testId ? `${testId}-cancel-button` : undefined
-  }, {
-    text: okButtonLabel,
-    appearance: 'warning',
+  }, cancelButtonLabel), /*#__PURE__*/React.createElement(Button, {
+    appearance: "warning",
     onClick: onConfirm,
     testId: testId ? `${testId}-confirm-button` : undefined
-  }];
-  return /*#__PURE__*/React.createElement(ModalTransition, null, options && /*#__PURE__*/React.createElement(Modal, {
-    actions: actionButtons,
-    onClose: onClose,
-    heading: heading,
-    appearance: "warning",
-    testId: testId
-  }, /*#__PURE__*/React.createElement("p", null, options.message)));
+  }, okButtonLabel))));
 };
 
 export const ConfirmationModal = injectIntl(ConfirmationModalImpl);

package/dist/es2019/plugins/floating-toolbar/ui/EditorEmojiAddIcon.js

@@ -0,0 +1,25 @@
+import React from 'react';
+export default function EditorEmojiAddIcon() {
+  return /*#__PURE__*/React.createElement("svg", {
+    width: 24,
+    height: 24,
+    viewBox: "0 0 24 24",
+    fill: "none",
+    "aria-label": "editor-add-emoji"
+  }, /*#__PURE__*/React.createElement("rect", {
+    width: 24,
+    height: 24,
+    fill: "white",
+    fillOpacity: "0.01"
+  }), /*#__PURE__*/React.createElement("path", {
+    fillRule: "evenodd",
+    clipRule: "evenodd",
+    d: "M14.5715 6.20367C13.7531 5.88041 12.8807 5.71423 12 5.71423C10.1435 5.71423 8.36301 6.45173 7.05025 7.76449C5.7375 9.07724 5 10.8577 5 12.7142C5 14.5708 5.7375 16.3512 7.05025 17.664C8.36301 18.9767 10.1435 19.7142 12 19.7142C12.9193 19.7142 13.8295 19.5332 14.6788 19.1814C15.5281 18.8296 16.2997 18.314 16.9497 17.664C17.5998 17.014 18.1154 16.2423 18.4672 15.393C18.8189 14.5437 19 13.6335 19 12.7142C19 12.1349 18.9281 11.5591 18.7868 10.9999H17.2266C17.404 11.5396 17.5 12.1159 17.5 12.7142C17.5 15.7472 15.033 18.2142 12 18.2142C8.967 18.2142 6.5 15.7472 6.5 12.7142C6.50159 11.256 7.08156 9.85801 8.11267 8.8269C9.14377 7.79579 10.5418 7.21582 12 7.21423C12.9284 7.21423 13.8037 7.44537 14.5715 7.85312V6.20367ZM9.79289 11.9213C9.98043 12.1089 10.2348 12.2142 10.5 12.2142C10.7652 12.2142 11.0196 12.1089 11.2071 11.9213C11.3946 11.7338 11.5 11.4795 11.5 11.2142C11.5 10.949 11.3946 10.6947 11.2071 10.5071C11.0196 10.3196 10.7652 10.2142 10.5 10.2142C10.2348 10.2142 9.98043 10.3196 9.79289 10.5071C9.60536 10.6947 9.5 10.949 9.5 11.2142C9.5 11.4795 9.60536 11.7338 9.79289 11.9213ZM12.7929 11.9213C12.9804 12.1089 13.2348 12.2142 13.5 12.2142C13.7652 12.2142 14.0196 12.1089 14.2071 11.9213C14.3946 11.7338 14.5 11.4795 14.5 11.2142C14.5 10.949 14.3946 10.6947 14.2071 10.5071C14.0196 10.3196 13.7652 10.2142 13.5 10.2142C13.2348 10.2142 12.9804 10.3196 12.7929 10.5071C12.6054 10.6947 12.5 10.949 12.5 11.2142C12.5 11.4795 12.6054 11.7338 12.7929 11.9213ZM14.1965 13.61C14.0355 13.6153 13.8828 13.6823 13.77 13.7972C12.871 14.8032 11.133 14.8032 10.232 13.8002C10.1205 13.6799 9.96614 13.6082 9.80223 13.6006C9.63832 13.5931 9.47801 13.6503 9.35592 13.7599C9.23383 13.8695 9.15974 14.0227 9.14965 14.1865C9.13956 14.3503 9.19428 14.5115 9.302 14.6352C9.64217 15.0139 10.0582 15.3167 10.523 15.5241C10.9878 15.7316 11.491 15.8389 12 15.8392C12.51 15.839 13.0142 15.7313 13.4797 15.5231C13.9453 15.315 14.3617 15.0111 14.702 14.6312C14.8037 14.5064 14.8535 14.3472 14.8409 14.1866C14.8282 14.0261 14.7542 13.8766 14.6342 13.7692C14.5142 13.6618 14.3574 13.6048 14.1965 13.61Z",
+    fill: "currentColor"
+  }), /*#__PURE__*/React.createElement("path", {
+    fillRule: "evenodd",
+    clipRule: "evenodd",
+    d: "M16.2856 8.31714H17.0228V9.05429C17.0228 9.28161 17.1131 9.49963 17.2738 9.66038C17.4345 9.82112 17.6526 9.91143 17.8799 9.91143C18.1072 9.91143 18.3252 9.82112 18.486 9.66038C18.6467 9.49963 18.737 9.28161 18.737 9.05429V8.31714H19.4828C19.7101 8.31714 19.9281 8.22684 20.0888 8.06609C20.2496 7.90535 20.3399 7.68733 20.3399 7.46C20.3399 7.23267 20.2496 7.01465 20.0888 6.85391C19.9281 6.69316 19.7101 6.60286 19.4828 6.60286H18.737V5.85714C18.737 5.62981 18.6467 5.4118 18.486 5.25105C18.3252 5.09031 18.1072 5 17.8799 5C17.6526 5 17.4345 5.09031 17.2738 5.25105C17.1131 5.4118 17.0228 5.62981 17.0228 5.85714V6.60286H16.2856C16.0583 6.60286 15.8403 6.69316 15.6795 6.85391C15.5188 7.01465 15.4285 7.23267 15.4285 7.46C15.4285 7.68733 15.5188 7.90535 15.6795 8.06609C15.8403 8.22684 16.0583 8.31714 16.2856 8.31714Z",
+    fill: "currentColor"
+  }));
+}