@atlaskit/editor-core 185.14.2 → 185.15.0

package/dist/es2019/plugins/{hyperlink → deprecated-hyperlink}/commands.js

@@ -1,55 +1,32 @@
-import { addLinkMetadata, commandWithMetadata } from '@atlaskit/editor-common/card';
+import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { normalizeUrl, getLinkCreationAnalyticsEvent } from '@atlaskit/editor-common/utils';
-import { stateKey, LinkAction } from './pm-plugins/main';
+import { isTextAtPos, LinkAction } from '@atlaskit/editor-common/link';
+import { getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-common/utils';
 import { Selection } from 'prosemirror-state';
-import { filter } from '../../utils/commands';
-import { addAnalytics, withAnalytics } from '../analytics';
-import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT_ID, buildEditLinkPayload, unlinkPayload } from '@atlaskit/editor-common/analytics';
+import { ACTION } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '../analytics';
 import { queueCardsFromChangedTr } from '../card/pm-plugins/doc';
-export function isTextAtPos(pos) {
-  return state => {
-    const node = state.doc.nodeAt(pos);
-    return !!node && node.isText;
-  };
-}
-export function isLinkAtPos(pos) {
-  return state => {
-    const node = state.doc.nodeAt(pos);
-    return !!node && !!state.schema.marks.link.isInSet(node.marks);
-  };
-}
-export function setLinkHref(href, pos, to, isTabPressed) {
-  return filter(isTextAtPos(pos), (state, dispatch) => {
-    const $pos = state.doc.resolve(pos);
-    const node = state.doc.nodeAt(pos);
-    const linkMark = state.schema.marks.link;
-    const mark = linkMark.isInSet(node.marks);
-    const url = normalizeUrl(href);
-    if (mark && mark.attrs.href === url) {
-      return false;
-    }
-    const rightBound = to && pos !== to ? to : pos - $pos.textOffset + node.nodeSize;
-    const tr = state.tr.removeMark(pos, rightBound, linkMark);
-    if (href.trim()) {
-      tr.addMark(pos, rightBound, linkMark.create({
-        ...(mark && mark.attrs || {}),
-        href: url
-      }));
-    } else {
-      addAnalytics(state, tr, unlinkPayload(ACTION_SUBJECT_ID.HYPERLINK));
-    }
-    if (!isTabPressed) {
-      tr.setMeta(stateKey, {
-        type: LinkAction.HIDE_TOOLBAR
-      });
-    }
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
-  });
-}
+// TODO: ED-17836 This workaround is used since we extracted the hyperlink plugin.
+// As soon as we deprecate the plugin we can delete this code.
+/**
+ * @deprecated
+ * Please do not use this key anymore it will be removed soon.
+ * Using plugin keys is a deprecated approach and if you need
+ * to access state use the Preset API in EditorNext.
+ */
+export const stateKey = {
+  key: 'hyperlinkPlugin$',
+  getState: state => {
+    return state['hyperlinkPlugin$'];
+  }
+};
+
+/**
+ * @deprecated
+ * Please do not use this function anymore it will be removed soon.
+ * If you need to update the link please do it through the Preset
+ * API in EditorNext.
+ */
 export function updateLink(href, text, pos, to) {
   return (state, dispatch) => {
     const $pos = state.doc.resolve(pos);
@@ -85,6 +62,13 @@ export function updateLink(href, text, pos, to) {
     return true;
   };
 }
+
+/**
+ * @deprecated
+ * Please do not use this function anymore it will be removed soon.
+ * If you need to insert link please do it through the Preset
+ * API in EditorNext.
+ */
 export function insertLink(from, to, incomingHref, incomingTitle, displayText, source, sourceEvent) {
   return (state, dispatch) => {
     const link = state.schema.marks.link;
@@ -140,6 +124,13 @@ export function insertLink(from, to, incomingHref, incomingTitle, displayText, s
     return false;
   };
 }
+
+/**
+ * @deprecated
+ * Please do not use this function anymore it will be removed soon.
+ * If you need to insert link please do it through the Preset
+ * API in EditorNext.
+ */
 export const insertLinkWithAnalytics = (inputMethod, from, to, href, title, displayText, cardsAvailable = false, sourceEvent = undefined) => {
   // If smart cards are available, we send analytics for hyperlinks when a smart link is rejected.
   if (cardsAvailable && !title && !displayText) {
@@ -147,56 +138,13 @@ export const insertLinkWithAnalytics = (inputMethod, from, to, href, title, disp
   }
   return withAnalytics(getLinkCreationAnalyticsEvent(inputMethod, href))(insertLink(from, to, href, title, displayText, inputMethod, sourceEvent));
 };
+
+/**
+ * @deprecated
+ * Please do not use this function anymore it will be removed soon.
+ * If you need to insert link please do it through the Preset
+ * API in EditorNext.
+ */
 export const insertLinkWithAnalyticsMobileNative = (inputMethod, from, to, href, title, displayText) => {
   return withAnalytics(getLinkCreationAnalyticsEvent(inputMethod, href))(insertLink(from, to, href, title, displayText, inputMethod));
-};
-export function removeLink(pos) {
-  return commandWithMetadata(setLinkHref('', pos), {
-    action: ACTION.UNLINK
-  });
-}
-export function editInsertedLink() {
-  return (state, dispatch) => {
-    if (dispatch) {
-      dispatch(addAnalytics(state, state.tr.setMeta(stateKey, {
-        type: LinkAction.EDIT_INSERTED_TOOLBAR,
-        inputMethod: INPUT_METHOD.FLOATING_TB
-      }), buildEditLinkPayload(ACTION_SUBJECT_ID.HYPERLINK)));
-    }
-    return true;
-  };
-}
-export function showLinkToolbar(inputMethod = INPUT_METHOD.TOOLBAR) {
-  return function (state, dispatch) {
-    if (dispatch) {
-      let tr = state.tr.setMeta(stateKey, {
-        type: LinkAction.SHOW_INSERT_TOOLBAR,
-        inputMethod
-      });
-      tr = addAnalytics(state, tr, {
-        action: ACTION.INVOKED,
-        actionSubject: ACTION_SUBJECT.TYPEAHEAD,
-        actionSubjectId: ACTION_SUBJECT_ID.TYPEAHEAD_LINK,
-        attributes: {
-          inputMethod
-        },
-        eventType: EVENT_TYPE.UI
-      });
-      dispatch(tr);
-    }
-    return true;
-  };
-}
-export function hideLinkToolbar() {
-  return function (state, dispatch) {
-    if (dispatch) {
-      dispatch(hideLinkToolbarSetMeta(state.tr));
-    }
-    return true;
-  };
-}
-export function hideLinkToolbarSetMeta(tr) {
-  return tr.setMeta(stateKey, {
-    type: LinkAction.HIDE_TOOLBAR
-  });
-}
+};

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

@@ -8,7 +8,7 @@ import { EmojiTypeAheadItem, SearchSort, recordSelectionSucceededSli, recordSele
 import { getInlineNodeViewProducer } from '@atlaskit/editor-common/react-node-view';
 import { inputRulePlugin as asciiInputRulePlugin } from './pm-plugins/ascii-input-rules';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { IconEmoji } from '../quick-insert/assets';
+import { IconEmoji } from '@atlaskit/editor-common/quick-insert';
 import { EmojiNodeView } from './nodeviews/emoji';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { openTypeAheadAtCursor } from '../type-ahead/transforms/open-typeahead-at-cursor';

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

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { PluginKey } from 'prosemirror-state';
-import { createRule, createPlugin } from '../../../utils/input-rules';
+import { createRule, createPlugin } from '@atlaskit/prosemirror-input-rules';
 import { leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '../../analytics';
 let matcher;

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { expand, nestedExpand } from '@atlaskit/adf-schema';
 import { createPlugin } from './pm-plugins/main';
 import { expandKeymap } from './pm-plugins/keymap';
-import { IconExpand } from '../quick-insert/assets';
+import { IconExpand } from '@atlaskit/editor-common/quick-insert';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
 import { getToolbarConfig } from './toolbar';
 import { createExpandNode } from './commands';

package/dist/es2019/plugins/feedback-dialog/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { IconFeedback } from '../quick-insert/assets';
+import { IconFeedback } from '@atlaskit/editor-common/quick-insert';
 import { version as coreVersion } from '../../version-wrapper';
 import { addAnalytics, ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE } from '../analytics';
 import loadJiraCollectorDialogScript from './loadJiraCollectorDialogScript';

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

@@ -3,7 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { jsx } from '@emotion/react';
 import { Component } from 'react';
-import { panelTextInput } from '../../../ui/PanelTextInput/styles';
+import { panelTextInput } from '@atlaskit/editor-common/ui';
 export default class TextField extends Component {
   constructor(props) {
     super(props);

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

@@ -20,7 +20,7 @@ import { ExtensionsPlaceholder } from './ExtensionsPlaceholder';
 import ColorPickerButton from '../../../ui/ColorPickerButton';
 import { backgroundPaletteTooltipMessages } from '../../../ui/ColorPalette';
 import { EmojiPickerButton } from './EmojiPickerButton';
-import Announcer from '../../../utils/announcer/announcer';
+import { Announcer } from '@atlaskit/editor-common/ui';
 import { injectIntl } from 'react-intl-next';
 import messages from './messages';
 import { clearHoverSelection } from '@atlaskit/editor-plugin-table/commands';

package/dist/es2019/plugins/image-upload/pm-plugins/commands.js

@@ -18,7 +18,7 @@ export const insertExternalImage = options => (state, dispatch) => {
 };
 export const startImageUpload = event => (state, dispatch) => {
   const pluginState = stateKey.getState(state);
-  if (!(pluginState !== null && pluginState !== void 0 && pluginState.enabled)) {
+  if (pluginState && !pluginState.enabled) {
     return false;
   }
   if (dispatch) {

package/dist/es2019/plugins/image-upload/pm-plugins/input-rule.js

@@ -1,4 +1,4 @@
-import { createRule, createPlugin } from '../../../utils/input-rules';
+import { createRule, createPlugin } from '@atlaskit/prosemirror-input-rules';
 import { createExternalMediaNode } from '../utils';
 export function inputRulePlugin(schema, featureFlags) {
   if (!schema.nodes.media || !schema.nodes.mediaSingle) {

package/dist/es2019/plugins/image-upload/pm-plugins/main.js

@@ -1,10 +1,9 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { isPastedFile } from '../../../utils/clipboard';
-import { isDroppedFile } from '../../../utils/drag-drop';
+import { isClipboardEvent, isPastedFile } from '../../../utils/clipboard';
+import { isDragEvent, isDroppedFile } from '../../../utils/drag-drop';
 import { canInsertMedia, isMediaSelected } from '../utils';
 import { insertExternalImage, startImageUpload } from './commands';
 import { stateKey } from './plugin-key';
-
 /**
  * Microsoft Office includes a screenshot image when copying text content.
  *
@@ -38,15 +37,55 @@ const hasScreenshotImageFromMSOffice = ev => {
   const isImagePNG = file.type === 'image/png' && file.name === 'image.png';
   return isImagePNG && textPlain && isOfficeXMLNamespace;
 };
-const createDOMHandler = (pred, eventName) => (view, event) => {
+const createReferenceEventFromEvent = event => {
+  var _event$dataTransfer, _event$clipboardData;
+  if (!isDragEvent(event) && !isClipboardEvent(event)) {
+    return null;
+  }
+
+  // Get files list and early exit if files is undefined
+  const files = isDragEvent(event) ? (_event$dataTransfer = event.dataTransfer) === null || _event$dataTransfer === void 0 ? void 0 : _event$dataTransfer.files : (_event$clipboardData = event.clipboardData) === null || _event$clipboardData === void 0 ? void 0 : _event$clipboardData.files;
+  if (!files) {
+    return null;
+  }
+
+  // Convert filelist into an array
+  const filesArray = Array.from(files);
+
+  // Creating a new DataTransfer object should remove any mutation that could be possible from the original event
+  const dataTransfer = filesArray.reduce((acc, value) => {
+    acc.items.add(value);
+    return acc;
+  }, new DataTransfer());
+  return {
+    type: isDragEvent(event) ? 'drop' : 'paste',
+    ...(isDragEvent(event) && {
+      dataTransfer
+    }),
+    ...(isClipboardEvent(event) && {
+      clipboardData: dataTransfer
+    })
+  };
+};
+const createDOMHandler = (pred, _eventName, uploadHandlerReference) => (view, event) => {
   if (!pred(event)) {
     return false;
   }
   const shouldUpload = !hasScreenshotImageFromMSOffice(event);
-  if (shouldUpload) {
+  const referenceEvent = createReferenceEventFromEvent(event);
+  if (shouldUpload && referenceEvent) {
     event.preventDefault();
     event.stopPropagation();
-    startImageUpload(event)(view.state, view.dispatch);
+
+    // Insert external image into document
+    if (uploadHandlerReference.current) {
+      uploadHandlerReference.current(referenceEvent, options => {
+        insertExternalImage(options)(view.state, view.dispatch);
+      });
+    }
+
+    // Start image upload
+    startImageUpload(referenceEvent)(view.state, view.dispatch);
   }
   return shouldUpload;
 };
@@ -63,7 +102,9 @@ export const createPlugin = ({
   dispatch,
   providerFactory
 }) => {
-  let uploadHandler;
+  let uploadHandlerReference = {
+    current: null
+  };
   return new SafePlugin({
     state: {
       init(_config, state) {
@@ -97,39 +138,24 @@ export const createPlugin = ({
           return;
         }
         try {
-          uploadHandler = await provider;
+          const imageUploadProvider = await provider;
+          uploadHandlerReference.current = imageUploadProvider;
         } catch (e) {
-          uploadHandler = undefined;
+          uploadHandlerReference.current = null;
         }
       };
       providerFactory.subscribe('imageUploadProvider', handleProvider);
       return {
-        update(view, prevState) {
-          const {
-            state: editorState
-          } = view;
-          const currentState = stateKey.getState(editorState);
-
-          // if we've add a new upload to the state, execute the uploadHandler
-          const oldState = stateKey.getState(prevState);
-          if (currentState.activeUpload !== oldState.activeUpload && currentState.activeUpload && uploadHandler) {
-            const {
-              event
-            } = currentState.activeUpload;
-            if (!event || !hasScreenshotImageFromMSOffice(event)) {
-              uploadHandler(event, options => insertExternalImage(options)(view.state, view.dispatch));
-            }
-          }
-        },
         destroy() {
+          uploadHandlerReference.current = null;
           providerFactory.unsubscribe('imageUploadProvider', handleProvider);
         }
       };
     },
     props: {
       handleDOMEvents: {
-        drop: createDOMHandler(isDroppedFile, 'atlassian.editor.image.drop'),
-        paste: createDOMHandler(isPastedFile, 'atlassian.editor.image.paste')
+        drop: createDOMHandler(isDroppedFile, 'atlassian.editor.image.drop', uploadHandlerReference),
+        paste: createDOMHandler(isPastedFile, 'atlassian.editor.image.paste', uploadHandlerReference)
       }
     }
   });

package/dist/es2019/plugins/index.js

@@ -9,7 +9,6 @@ export { default as emojiPlugin } from './emoji';
 export { default as extensionPlugin } from './extension';
 export { default as fakeTextCursorPlugin } from './fake-text-cursor';
 export { default as helpDialogPlugin } from './help-dialog';
-export { default as hyperlinkPlugin } from './hyperlink';
 export { default as imageUploadPlugin } from './image-upload';
 export { default as insertBlockPlugin } from './insert-block';
 export { default as jiraIssuePlugin } from './jira-issue';

package/dist/es2019/plugins/insert-block/index.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { pluginKey as blockTypeStateKey } from '../block-type/pm-plugins/main';
 import { stateKey as mediaStateKey } from '../media/pm-plugins/plugin-key';
-import { stateKey as hyperlinkPluginKey } from '../hyperlink/pm-plugins/main';
 import { isTypeAheadAllowed } from '../type-ahead/utils';
 import { mentionPluginKey } from '../mentions/pm-plugins/key';
 import { pluginKey as layoutStateKey } from '../layout';
@@ -15,10 +14,10 @@ import { insertBlockTypesWithAnalytics } from '../block-type/commands';
 import { startImageUpload } from '../image-upload/pm-plugins/commands';
 import { INPUT_METHOD } from '../analytics';
 import { stateKey as imageUploadStateKey } from '../image-upload/pm-plugins/plugin-key';
-import { pluginKey as dateStateKey } from '../date/pm-plugins/plugin-key';
 import { pluginKey as placeholderTextStateKey } from '../placeholder-text/plugin-key';
 import { pluginKey as macroStateKey } from '../macro/plugin-key';
 import { ToolbarSize } from '../../ui/Toolbar/types';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 const toolbarSizeToButtons = toolbarSize => {
   switch (toolbarSize) {
     case ToolbarSize.XXL:
@@ -57,8 +56,9 @@ const insertBlockPlugin = (options = {}, api) => {
       isToolbarReducedSpacing,
       isLastItem
     }) {
-      const buttons = toolbarSizeToButtons(toolbarSize);
       const renderNode = providers => {
+        // We will slowly migrate these to use the new approach inside
+        // `ToolbarInsertBlockWithInjectionApi` and remove `WithPluginState`
         return /*#__PURE__*/React.createElement(WithPluginState, {
           plugins: {
             typeAheadState: typeAheadPluginKey,
@@ -66,9 +66,7 @@ const insertBlockPlugin = (options = {}, api) => {
             mediaState: mediaStateKey,
             mentionState: mentionPluginKey,
             macroState: macroStateKey,
-            hyperlinkState: hyperlinkPluginKey,
             emojiState: emojiPluginKey,
-            dateState: dateStateKey,
             imageUpload: imageUploadStateKey,
             placeholderTextState: placeholderTextStateKey,
             layoutState: layoutStateKey
@@ -78,57 +76,35 @@ const insertBlockPlugin = (options = {}, api) => {
             blockTypeState,
             mediaState,
             macroState = {},
-            hyperlinkState,
             emojiState,
-            dateState,
             imageUpload,
             placeholderTextState,
             layoutState
-          }) => {
-            var _api$dependencies$ana;
-            return /*#__PURE__*/React.createElement(ToolbarInsertBlock, {
-              pluginInjectionApi: api,
-              buttons: buttons,
-              isReducedSpacing: isToolbarReducedSpacing,
-              isDisabled: disabled,
-              isTypeAheadAllowed: isTypeAheadAllowed(editorView.state),
-              editorView: editorView,
-              tableSupported: !!editorView.state.schema.nodes.table,
-              actionSupported: !!editorView.state.schema.nodes.taskItem,
-              mentionsSupported: !!(mentionState && mentionState.mentionProvider),
-              decisionSupported: !!editorView.state.schema.nodes.decisionItem,
-              dateEnabled: !!dateState,
-              placeholderTextEnabled: placeholderTextState && placeholderTextState.allowInserting,
-              layoutSectionEnabled: !!layoutState,
-              expandEnabled: !!options.allowExpand,
-              mediaUploadsEnabled: mediaState && mediaState.allowsUploads,
-              onShowMediaPicker: mediaState && mediaState.showMediaPicker,
-              mediaSupported: !!mediaState,
-              imageUploadSupported: !!imageUpload,
-              imageUploadEnabled: imageUpload && imageUpload.enabled,
-              handleImageUpload: startImageUpload,
-              availableWrapperBlockTypes: blockTypeState && blockTypeState.availableWrapperBlockTypes,
-              linkSupported: !!hyperlinkState,
-              linkDisabled: !hyperlinkState || !hyperlinkState.canInsertLink || !!hyperlinkState.activeLinkMark,
-              emojiDisabled: !emojiState || !emojiState.emojiProvider,
-              emojiProvider: providers.emojiProvider,
-              nativeStatusSupported: options.nativeStatusSupported,
-              horizontalRuleEnabled: options.horizontalRuleEnabled,
-              onInsertBlockType: handleInsertBlockType(api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions),
-              onInsertMacroFromMacroBrowser: insertMacroFromMacroBrowser,
-              macroProvider: macroState.macroProvider,
-              popupsMountPoint: popupsMountPoint,
-              popupsBoundariesElement: popupsBoundariesElement,
-              popupsScrollableElement: popupsScrollableElement,
-              insertMenuItems: options.insertMenuItems,
-              editorActions: editorActions,
-              dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-              replacePlusMenuWithElementBrowser: options.replacePlusMenuWithElementBrowser,
-              showElementBrowserLink: options.showElementBrowserLink,
-              showSeparator: !isLastItem && toolbarSize <= ToolbarSize.S,
-              featureFlags: featureFlags
-            });
-          }
+          }) => /*#__PURE__*/React.createElement(ToolbarInsertBlockWithInjectionApi, {
+            pluginInjectionApi: api,
+            editorView: editorView,
+            editorActions: editorActions,
+            dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+            providerFactory: providerFactory,
+            popupsMountPoint: popupsMountPoint,
+            popupsBoundariesElement: popupsBoundariesElement,
+            popupsScrollableElement: popupsScrollableElement,
+            toolbarSize: toolbarSize,
+            disabled: disabled,
+            isToolbarReducedSpacing: isToolbarReducedSpacing,
+            isLastItem: isLastItem,
+            featureFlags: featureFlags,
+            mentionState: mentionState,
+            blockTypeState: blockTypeState,
+            mediaState: mediaState,
+            macroState: macroState,
+            emojiState: emojiState,
+            imageUpload: imageUpload,
+            placeholderTextState: placeholderTextState,
+            layoutState: layoutState,
+            providers: providers,
+            options: options
+          })
         });
       };
       return /*#__PURE__*/React.createElement(WithProviders, {
@@ -139,4 +115,78 @@ const insertBlockPlugin = (options = {}, api) => {
     }
   };
 };
+function ToolbarInsertBlockWithInjectionApi({
+  editorView,
+  editorActions,
+  dispatchAnalyticsEvent,
+  providerFactory,
+  popupsMountPoint,
+  popupsBoundariesElement,
+  popupsScrollableElement,
+  toolbarSize,
+  disabled,
+  isToolbarReducedSpacing,
+  isLastItem,
+  providers,
+  pluginInjectionApi,
+  options,
+  mentionState,
+  blockTypeState,
+  mediaState,
+  macroState,
+  emojiState,
+  imageUpload,
+  placeholderTextState,
+  layoutState,
+  featureFlags
+}) {
+  var _pluginInjectionApi$d;
+  const buttons = toolbarSizeToButtons(toolbarSize);
+  const {
+    dateState,
+    hyperlinkState
+  } = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date']);
+  return /*#__PURE__*/React.createElement(ToolbarInsertBlock, {
+    pluginInjectionApi: pluginInjectionApi,
+    buttons: buttons,
+    isReducedSpacing: isToolbarReducedSpacing,
+    isDisabled: disabled,
+    isTypeAheadAllowed: isTypeAheadAllowed(editorView.state),
+    editorView: editorView,
+    tableSupported: !!editorView.state.schema.nodes.table,
+    actionSupported: !!editorView.state.schema.nodes.taskItem,
+    mentionsSupported: !!(mentionState && mentionState.mentionProvider),
+    decisionSupported: !!editorView.state.schema.nodes.decisionItem,
+    dateEnabled: !!dateState,
+    placeholderTextEnabled: placeholderTextState && placeholderTextState.allowInserting,
+    layoutSectionEnabled: !!layoutState,
+    expandEnabled: !!options.allowExpand,
+    mediaUploadsEnabled: mediaState && mediaState.allowsUploads,
+    onShowMediaPicker: mediaState && mediaState.showMediaPicker,
+    mediaSupported: !!mediaState,
+    imageUploadSupported: !!imageUpload,
+    imageUploadEnabled: imageUpload && imageUpload.enabled,
+    handleImageUpload: startImageUpload,
+    availableWrapperBlockTypes: blockTypeState && blockTypeState.availableWrapperBlockTypes,
+    linkSupported: !!hyperlinkState,
+    linkDisabled: !hyperlinkState || !hyperlinkState.canInsertLink || !!hyperlinkState.activeLinkMark,
+    emojiDisabled: !emojiState || !emojiState.emojiProvider,
+    emojiProvider: providers.emojiProvider,
+    nativeStatusSupported: options.nativeStatusSupported,
+    horizontalRuleEnabled: options.horizontalRuleEnabled,
+    onInsertBlockType: handleInsertBlockType(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions),
+    onInsertMacroFromMacroBrowser: insertMacroFromMacroBrowser,
+    macroProvider: macroState.macroProvider,
+    popupsMountPoint: popupsMountPoint,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    insertMenuItems: options.insertMenuItems,
+    editorActions: editorActions,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    replacePlusMenuWithElementBrowser: options.replacePlusMenuWithElementBrowser,
+    showElementBrowserLink: options.showElementBrowserLink,
+    showSeparator: !isLastItem && toolbarSize <= ToolbarSize.S,
+    featureFlags: featureFlags
+  });
+}
 export default insertBlockPlugin;

package/dist/es2019/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -14,7 +14,6 @@ import { showPlaceholderFloatingToolbar } from '../../../placeholder-text/action
 import { insertLayoutColumnsWithAnalytics } from '../../../layout/actions';
 import { insertTaskDecisionCommand } from '../../../tasks-and-decisions/commands';
 import { insertExpand } from '../../../expand/commands';
-import { showLinkToolbar } from '../../../hyperlink/commands';
 import { createTypeAheadTools } from '../../../type-ahead/api';
 import { updateStatusWithAnalytics } from '../../../status/actions';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../../../analytics';
@@ -153,10 +152,16 @@ export class ToolbarInsertBlock extends React.PureComponent {
       }
     });
     _defineProperty(this, "toggleLinkPanel", inputMethod => {
+      var _pluginInjectionApi$d, _pluginInjectionApi$d2;
       const {
-        editorView
+        editorView,
+        pluginInjectionApi
       } = this.props;
-      showLinkToolbar(inputMethod)(editorView.state, editorView.dispatch);
+      const {
+        state,
+        dispatch
+      } = editorView;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.hyperlink) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions.showLinkToolbar(inputMethod)(state, dispatch);
       return true;
     });
     _defineProperty(this, "insertMention", inputMethod => {
@@ -170,7 +175,7 @@ export class ToolbarInsertBlock extends React.PureComponent {
       return true;
     });
     _defineProperty(this, "insertTable", inputMethod => {
-      var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+      var _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _pluginInjectionApi$d6;
       const {
         pluginInjectionApi,
         editorView
@@ -179,7 +184,7 @@ export class ToolbarInsertBlock extends React.PureComponent {
         state,
         dispatch
       } = editorView;
-      return (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies.table) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : (_pluginInjectionApi$d3 = (_pluginInjectionApi$d4 = _pluginInjectionApi$d2.actions).insertTable) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : _pluginInjectionApi$d3.call(_pluginInjectionApi$d4, {
+      return (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d4 = pluginInjectionApi.dependencies.table) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : (_pluginInjectionApi$d5 = (_pluginInjectionApi$d6 = _pluginInjectionApi$d4.actions).insertTable) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : _pluginInjectionApi$d5.call(_pluginInjectionApi$d6, {
         action: ACTION.INSERTED,
         actionSubject: ACTION_SUBJECT.DOCUMENT,
         actionSubjectId: ACTION_SUBJECT_ID.TABLE,
@@ -187,7 +192,7 @@ export class ToolbarInsertBlock extends React.PureComponent {
           inputMethod
         },
         eventType: EVENT_TYPE.TRACK
-      })(state, dispatch)) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : false;
+      })(state, dispatch)) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : false;
     });
     _defineProperty(this, "createDate", inputMethod => {
       const {

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

@@ -3,7 +3,7 @@ import { layoutColumn, layoutSection } from '@atlaskit/adf-schema';
 import { default as createLayoutPlugin } from './pm-plugins/main';
 import { buildToolbar } from './toolbar';
 import { createDefaultLayoutSection } from './actions';
-import { IconLayout } from '../quick-insert/assets';
+import { IconLayout } from '@atlaskit/editor-common/quick-insert';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { pluginKey } from './pm-plugins/plugin-key';