@atlaskit/editor-core 185.2.0 → 185.2.5

package/dist/es2019/plugins/card/nodeviews/genericCard.js

@@ -61,6 +61,7 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
       // (2) Render a blue link whilst downgrading to `link` in the ADF (fatal errs).
 
       if (maybeAPIError.kind && maybeAPIError.kind === 'fatal') {
+        var _pluginInjectionApi$d;
         this.setState({
           isError: true
         });
@@ -76,7 +77,7 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
         if (!getPos || typeof getPos === 'boolean') {
           return;
         }
-        changeSelectedCardToLinkFallback(undefined, url, true, node, getPos(), pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.analytics.actions)(view.state, view.dispatch);
+        changeSelectedCardToLinkFallback(undefined, url, true, node, getPos(), pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions)(view.state, view.dispatch);
         return null;
       } else {
         // Otherwise, render a blue link as fallback (above in render()).

package/dist/es2019/plugins/card/pm-plugins/doc.js

@@ -2,9 +2,8 @@ import { NodeSelection, TextSelection } from 'prosemirror-state';
 import { closeHistory } from 'prosemirror-history';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, SMART_LINK_TYPE } from '@atlaskit/editor-common/analytics';
-import { nodesBetweenChanged, processRawValue } from '../../../utils';
-import { unlinkPayload } from '../../../utils/linking-utils';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, SMART_LINK_TYPE, unlinkPayload } from '@atlaskit/editor-common/analytics';
+import { nodesBetweenChanged, processRawValue } from '@atlaskit/editor-common/utils';
 import { isFromCurrentDomain, getLinkCreationAnalyticsEvent } from '@atlaskit/editor-common/utils';
 import { appearanceForNodeType, selectedCardAppearance } from '../utils';
 import { queueCards, resolveCard } from './actions';

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

@@ -1,6 +1,6 @@
 import { keymap } from 'prosemirror-keymap';
 import { NodeSelection } from 'prosemirror-state';
-import * as keymaps from '../../../keymaps';
+import { bindKeymapWithCommand, moveDown, moveUp } from '@atlaskit/editor-common/keymaps';
 import { findChildren, flatten } from 'prosemirror-utils';
 import { browser } from '@atlaskit/editor-common/utils';
 const lookupPixel = 10;
@@ -52,8 +52,8 @@ export function cardKeymap(featureFlags) {
 
   // https://bugs.chromium.org/p/chromium/issues/detail?id=1227468 introduced since Chrome 91
   if (browser.chrome && browser.chrome_version > 90 && featureFlags.chromeCursorHandlerFixedVersion && browser.chrome_version < featureFlags.chromeCursorHandlerFixedVersion) {
-    keymaps.bindKeymapWithCommand(keymaps.moveUp.common, selectAboveBelowInlineCard('up'), list);
-    keymaps.bindKeymapWithCommand(keymaps.moveDown.common, selectAboveBelowInlineCard('down'), list);
+    bindKeymapWithCommand(moveUp.common, selectAboveBelowInlineCard('up'), list);
+    bindKeymapWithCommand(moveDown.common, selectAboveBelowInlineCard('down'), list);
   }
   return keymap(list);
 }

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

@@ -1,6 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import rafSchedule from 'raf-schd';
-import { getInlineNodeViewProducer } from '../../../nodeviews/getInlineNodeViewProducer';
+import { getInlineNodeViewProducer } from '@atlaskit/editor-common/react-node-view';
 import { BlockCard } from '../nodeviews/blockCard';
 import { EmbedCard } from '../nodeviews/embedCard';
 import { InlineCardNodeView } from '../nodeviews/inlineCard';

package/dist/es2019/plugins/card/toolbar.js

@@ -5,8 +5,8 @@ import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
-import { linkToolbarMessages } from '../../messages';
-import commonMessages, { linkMessages } from '@atlaskit/editor-common/messages';
+import { buildLayoutButtons } from '@atlaskit/editor-common/card';
+import commonMessages, { linkMessages, linkToolbarMessages } from '@atlaskit/editor-common/messages';
 import { changeSelectedCardToText } from './pm-plugins/doc';
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import { pluginKey } from './pm-plugins/main';
@@ -16,10 +16,8 @@ import { displayInfoForCard, findCardInfo, titleUrlPairFromNode, appearanceForNo
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { LinkToolbarAppearance } from './ui/LinkToolbarAppearance';
 import { messages } from './messages';
-import buildLayoutButtons from '../../ui/MediaAndEmbedsToolbar';
-import { buildOpenedSettingsPayload, buildVisitedLinkPayload } from '../../utils/linking-utils';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME } from './styles';
-import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, buildOpenedSettingsPayload, buildVisitedLinkPayload } from '@atlaskit/editor-common/analytics';
 export const removeCard = editorAnalyticsApi => commandWithMetadata((state, dispatch) => {
   if (!(state.selection instanceof NodeSelection)) {
     return false;
@@ -158,8 +156,8 @@ const unlinkCard = (node, state, editorAnalyticsApi) => {
   }
   return () => false;
 };
-const buildAlignmentOptions = (state, intl, widthPluginDependencyApi, cardOptions) => {
-  return buildLayoutButtons(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
+const buildAlignmentOptions = (state, intl, widthPluginDependencyApi, analyticsApi, cardOptions) => {
+  return buildLayoutButtons(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, analyticsApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
 };
 const withToolbarMetadata = command => commandWithMetadata(command, {
   inputMethod: INPUT_METHOD.FLOATING_TB
@@ -197,7 +195,7 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
       linkPicker,
       node,
       featureFlags,
-      editorAnalyticsApi
+      pluginInjectionApi
     })];
   } else {
     const {
@@ -247,8 +245,8 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
       onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
     }];
     if (currentAppearance === 'embed') {
-      var _pluginInjectionApi$d6;
-      const alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d6 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d6 === void 0 ? void 0 : _pluginInjectionApi$d6.width, cardOptions);
+      var _pluginInjectionApi$d6, _pluginInjectionApi$d7, _pluginInjectionApi$d8;
+      const alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d6 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d6 === void 0 ? void 0 : _pluginInjectionApi$d6.width, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d7 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d7 === void 0 ? void 0 : (_pluginInjectionApi$d8 = _pluginInjectionApi$d7.analytics) === null || _pluginInjectionApi$d8 === void 0 ? void 0 : _pluginInjectionApi$d8.actions, cardOptions);
       if (alignmentOptions.length) {
         alignmentOptions.push({
           type: 'separator'

package/dist/es2019/plugins/card/ui/EditLinkToolbar.js

@@ -4,14 +4,12 @@ import { withOuterListeners } from '@atlaskit/editor-common/ui';
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import HyperlinkToolbar from '../../hyperlink/ui/HyperlinkAddToolbar';
 import { showLinkToolbar, hideLinkToolbar } from '../pm-plugins/actions';
-import { INPUT_METHOD, ACTION } from '@atlaskit/editor-common/analytics';
-import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '../../../ui/LinkSearch/ToolbarComponents';
+import { INPUT_METHOD, ACTION, buildEditLinkPayload } from '@atlaskit/editor-common/analytics';
+import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import { changeSelectedCardToLink, updateCard } from '../pm-plugins/doc';
 import { findCardInfo, displayInfoForCard } from '../utils';
 import { NodeSelection } from 'prosemirror-state';
-import { buildEditLinkPayload } from '../../../utils/linking-utils';
-import { forceFocusSelector } from '../../floating-toolbar/pm-plugins/force-focus';
-import { linkToolbarMessages } from '../../../messages';
+import { linkToolbarMessages } from '@atlaskit/editor-common/messages';
 const HyperLinkToolbarWithListeners = withOuterListeners(HyperlinkToolbar);
 export class EditLinkToolbar extends React.Component {
   constructor(...args) {
@@ -20,7 +18,8 @@ export class EditLinkToolbar extends React.Component {
      * and not close the floating toolbar.
      */
     _defineProperty(this, "handleEsc", e => {
-      forceFocusSelector(`[aria-label="${linkToolbarMessages.editLink.defaultMessage}"]`, this.props.view);
+      var _this$props$forceFocu, _this$props;
+      (_this$props$forceFocu = (_this$props = this.props).forceFocusSelector) === null || _this$props$forceFocu === void 0 ? void 0 : _this$props$forceFocu.call(_this$props, `[aria-label="${linkToolbarMessages.editLink.defaultMessage}"]`, this.props.view);
     });
   }
   componentDidUpdate(prevProps) {
@@ -89,13 +88,14 @@ export const buildEditLinkToolbar = ({
   node,
   linkPicker,
   featureFlags,
-  editorAnalyticsApi
+  pluginInjectionApi
 }) => {
   return {
     type: 'custom',
     disableArrowNavigation: true,
     fallback: [],
     render: (view, idx) => {
+      var _pluginInjectionApi$d;
       if (!view || !providerFactory) {
         return null;
       }
@@ -109,6 +109,7 @@ export const buildEditLinkToolbar = ({
         text: displayInfo.title || '',
         node: node,
         featureFlags: featureFlags,
+        forceFocusSelector: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.forceFocusSelector,
         onSubmit: (newHref, newText, analytic) => {
           const urlChanged = newHref !== displayInfo.url;
           const titleChanged = newText !== displayInfo.title;
@@ -116,7 +117,8 @@ export const buildEditLinkToolbar = ({
           // If the title is changed in a smartlink, convert to standard blue hyperlink
           // (even if the url was also changed) - we don't want to lose the custom title.
           if (titleChanged) {
-            return commandWithMetadata(changeSelectedCardToLink(newText, newHref, undefined, undefined, undefined, editorAnalyticsApi), {
+            var _pluginInjectionApi$d2;
+            return commandWithMetadata(changeSelectedCardToLink(newText, newHref, undefined, undefined, undefined, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions), {
               action: ACTION.UPDATED,
               sourceEvent: analytic
             })(view.state, view.dispatch);

package/dist/es2019/plugins/card/ui/ResizableEmbedCard.js

@@ -7,10 +7,7 @@ import { findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from 'prosemirr
 import { calcColumnsFromPx, calcPctFromPx, calcPxFromColumns, wrappedLayouts } from '@atlaskit/editor-common/ui';
 import { akEditorMediaResizeHandlerPaddingWide, akEditorBreakoutPadding, akEditorWideLayoutWidth, breakoutWideScaleRatio, DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
 import { embedHeaderHeight } from '@atlaskit/smart-card';
-import { wrapperStyle } from '../../../ui/Resizer/styled';
-import Resizer from '../../../ui/Resizer';
-import { handleSides, imageAlignmentMap, snapTo } from '../../../ui/Resizer/utils';
-import { calcMediaPxWidth } from '@atlaskit/editor-common/ui';
+import { wrapperStyle, Resizer, handleSides, imageAlignmentMap, snapTo, calcMediaPxWidth } from '@atlaskit/editor-common/ui';
 import { embedSpacingStyles } from './styled';
 export default class ResizableEmbedCard extends React.Component {
   constructor(...args) {

package/dist/es2019/plugins/card/utils.js

@@ -1,8 +1,7 @@
 import { NodeSelection } from 'prosemirror-state';
 import { Slice, Fragment } from 'prosemirror-model';
 import { pluginKey } from './pm-plugins/plugin-key';
-import { mapChildren } from '../../utils/slice';
-import { isSupportedInParent } from '../../utils/nodes';
+import { isSupportedInParent, mapChildren } from '@atlaskit/editor-common/utils';
 export const appearanceForNodeType = spec => {
   if (spec.name === 'inlineCard') {
     return 'inline';

package/dist/es2019/plugins/clear-marks-on-change-to-empty-document/index.js

@@ -1,6 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from 'prosemirror-state';
-import { isEmptyDocument } from '../../utils';
+import { isEmptyDocument } from '@atlaskit/editor-common/utils';
 export const pluginKey = new PluginKey('clearMarksOnChangeToEmptyDocumentPlugin');
 export function createPlugin() {
   return new SafePlugin({

package/dist/es2019/plugins/custom-autoformat/doc.js

@@ -1,5 +1,5 @@
 import { closeHistory } from 'prosemirror-history';
-import { processRawValue } from '../../utils';
+import { processRawValue } from '@atlaskit/editor-common/utils';
 import { autoformatAction } from './utils';
 export const buildHandler = (_regex, handler) => {
   return async (view, match, start, end) => {

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

@@ -1,6 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DateNodeView } from '../nodeviews/date';
-import { getInlineNodeViewProducer } from '../../../nodeviews/getInlineNodeViewProducer';
+import { getInlineNodeViewProducer } from '@atlaskit/editor-common/react-node-view';
 import { pluginFactory } from '../../../utils/plugin-state-factory';
 import { reducer, mapping, onSelectionChanged } from './utils';
 import { pluginKey } from './plugin-key';

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

@@ -5,7 +5,7 @@ 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 { getInlineNodeViewProducer } from '../../nodeviews/getInlineNodeViewProducer';
+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, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
 import { IconEmoji } from '../quick-insert/assets';

package/dist/es2019/plugins/floating-toolbar/index.js

@@ -8,7 +8,7 @@ import { Popup } from '@atlaskit/editor-common/ui';
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
 import WithPluginState from '../../ui/WithPluginState';
 import { CONTENT_COMPONENT } from '../analytics/types';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../analytics';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { pluginKey as extensionsPluginKey } from '../extension/plugin-key';
 import { pluginKey as editorDisabledPluginKey } from '../editor-disabled';
 import { pluginKey as dataPluginKey } from './pm-plugins/toolbar-data/plugin-key';
@@ -19,7 +19,7 @@ import { ToolbarLoader } from './ui/ToolbarLoader';
 import { findNode } from './utils';
 import { ErrorBoundary } from '../../ui/ErrorBoundary';
 import { processCopyButtonItems } from '../copy-button/toolbar';
-import forceFocusPlugin from './pm-plugins/force-focus';
+import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
 export const getRelevantConfig = (selection, configs) => {
   // node selections always take precedence, see if
   let configPair;
@@ -140,6 +140,9 @@ const floatingToolbarPlugin = (_, api) => {
         plugin: () => forceFocusPlugin()
       }];
     },
+    actions: {
+      forceFocusSelector
+    },
     contentComponent({
       popupsMountPoint,
       popupsBoundariesElement,

package/dist/es2019/plugins/hyperlink/Toolbar.js

@@ -9,10 +9,10 @@ import OpenIcon from '@atlaskit/icon/glyph/shortcut';
 import { normalizeUrl } from '@atlaskit/editor-common/utils';
 import { linkToolbarMessages as linkToolbarCommonMessages, linkMessages } from '../../messages';
 import { isSafeUrl } from '@atlaskit/adf-schema';
-import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '../../ui/LinkSearch/ToolbarComponents';
+import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import { HyperlinkToolbarAppearance } from './HyperlinkToolbarAppearance';
-import { addAnalytics, ACTION_SUBJECT_ID, ACTION, INPUT_METHOD } from '../analytics';
-import { buildVisitedLinkPayload, buildOpenedSettingsPayload } from '../../utils/linking-utils';
+import { ACTION_SUBJECT_ID, ACTION, INPUT_METHOD, buildVisitedLinkPayload, buildOpenedSettingsPayload } from '@atlaskit/editor-common/analytics';
+import { addAnalytics } from '../analytics';
 /* type guard for edit links */
 function isEditLink(linkMark) {
   return linkMark.pos !== undefined;

package/dist/es2019/plugins/hyperlink/commands.js

@@ -4,9 +4,8 @@ import { stateKey, LinkAction } from './pm-plugins/main';
 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 } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT_ID, buildEditLinkPayload, unlinkPayload } from '@atlaskit/editor-common/analytics';
 import { queueCardsFromChangedTr } from '../card/pm-plugins/doc';
-import { buildEditLinkPayload, unlinkPayload } from '../../utils/linking-utils';
 export function isTextAtPos(pos) {
   return state => {
     const node = state.doc.nodeAt(pos);

package/dist/es2019/plugins/hyperlink/ui/HyperlinkAddToolbar/index.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import HyperlinkAddToolbarComp from './HyperlinkAddToolbar';
-import { INPUT_METHOD } from '../../../analytics/types';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { stateKey as pluginKey } from '../../pm-plugins/main';
 import WithPluginState from '../../../../ui/WithPluginState';
 import { EditorLinkPicker } from '../EditorLinkPicker';

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

@@ -2,7 +2,7 @@ import { safeInsert } from 'prosemirror-utils';
 import { Fragment, Slice } from 'prosemirror-model';
 import { TextSelection, NodeSelection } from 'prosemirror-state';
 import { flatmap, mapChildren } from '../../utils/slice';
-import { getStepRange, isEmptyDocument } from '../../utils';
+import { getStepRange, isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../analytics/types/enums';
 import { addAnalytics, withAnalytics } from '../analytics/utils';
 import { LAYOUT_TYPE } from '../analytics/types/node-events';

package/dist/es2019/plugins/media/nodeviews/mediaNodeUpdater.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import uuidV4 from 'uuid/v4';
 import { DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/ui';
 import { getMediaClient, isMediaBlobUrl, getAttrsFromUrl, isImageRepresentationReady } from '@atlaskit/media-client';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { replaceExternalMedia, updateAllMediaSingleNodesAttrs, updateCurrentMediaNodeAttrs, updateMediaSingleNodeAttrs } from '../commands/helpers';
 export class MediaNodeUpdater {
   constructor(props) {

package/dist/es2019/plugins/media/nodeviews/mediaSingle.js

@@ -14,7 +14,7 @@ import { MediaNodeUpdater } from './mediaNodeUpdater';
 import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { figureWrapper, MediaSingleNodeSelector } from './styles';
-import { floatingLayouts, isRichMediaInsideOfBlockNode } from '../../../utils/rich-media-utils';
+import { floatingLayouts, isRichMediaInsideOfBlockNode } from '@atlaskit/editor-common/utils';
 import { getAttrsFromUrl } from '@atlaskit/media-client';
 import { isMediaBlobUrlFromAttrs } from '../utils/media-common';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';

package/dist/es2019/plugins/media/pm-plugins/alt-text/ui/AltTextEdit.js

@@ -14,7 +14,7 @@ import { ToolTipContent } from '../../../../../keymaps';
 import { closeMediaAltTextMenu, updateAltText } from '../commands';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, fireAnalyticsEvent, ACTION } from '@atlaskit/editor-common/analytics';
-import { RECENT_SEARCH_WIDTH_IN_PX } from '../../../../../ui/LinkSearch/ToolbarComponents';
+import { RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 import { ErrorMessage } from '@atlaskit/editor-common/ui';
 export const CONTAINER_WIDTH_IN_PX = RECENT_SEARCH_WIDTH_IN_PX;

package/dist/es2019/plugins/media/toolbar/index.js

@@ -7,7 +7,7 @@ import { mediaFilmstripItemDOMSelector } from '@atlaskit/media-filmstrip';
 import commonMessages from '../../../messages';
 import { stateKey } from '../pm-plugins/plugin-key';
 import { getLinkingToolbar, shouldShowMediaLinkToolbar } from './linking';
-import buildLayoutButtons from '../../../ui/MediaAndEmbedsToolbar';
+import { buildLayoutButtons } from '@atlaskit/editor-common/card';
 import { getMediaLinkingState } from '../pm-plugins/linking';
 import { getPluginState as getMediaAltTextPluginState } from '../pm-plugins/alt-text';
 import { altTextButton, getAltTextToolbar } from './alt-text';
@@ -187,7 +187,7 @@ const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState, hover
   return items;
 };
 const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags) => {
-  var _pluginInjectionApi$d2;
+  var _pluginInjectionApi$d3;
   const {
     mediaSingle
   } = state.schema.nodes;
@@ -230,7 +230,8 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
     });
   }
   if (allowAdvancedToolBarOptions) {
-    toolbarButtons = [...toolbarButtons, ...buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.width, allowResizing, allowResizingInTables)];
+    var _pluginInjectionApi$d;
+    toolbarButtons = [...toolbarButtons, ...buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.width, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions, allowResizing, allowResizingInTables)];
     if (toolbarButtons.length) {
       toolbarButtons.push({
         type: 'separator'
@@ -253,14 +254,14 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
             };
             const openLink = () => {
               if (editorView) {
-                var _pluginInjectionApi$d;
+                var _pluginInjectionApi$d2;
                 const {
                   state: {
                     tr
                   },
                   dispatch
                 } = editorView;
-                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions.attachAnalyticsEvent({
+                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions.attachAnalyticsEvent({
                   eventType: EVENT_TYPE.TRACK,
                   action: ACTION.VISITED,
                   actionSubject: ACTION_SUBJECT.MEDIA,
@@ -292,7 +293,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
   }
   const {
     hoverDecoration
-  } = (_pluginInjectionApi$d2 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d2 !== void 0 ? _pluginInjectionApi$d2 : {};
+  } = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {};
   const removeButton = {
     id: 'editor.media.delete',
     type: 'button',
@@ -320,7 +321,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
   return items;
 };
 export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) => {
-  var _pluginInjectionApi$d3;
+  var _pluginInjectionApi$d4;
   const {
     media,
     mediaInline,
@@ -339,7 +340,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
   const mediaLinkingState = getMediaLinkingState(state);
   const {
     hoverDecoration
-  } = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {};
+  } = (_pluginInjectionApi$d4 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d4 !== void 0 ? _pluginInjectionApi$d4 : {};
   if (!mediaPluginState) {
     return;
   }
@@ -350,7 +351,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
     getDomRef: () => mediaPluginState.element
   };
   if (allowLinking && mediaLinkingState && mediaLinkingState.visible && shouldShowMediaLinkToolbar(state)) {
-    const linkingToolbar = getLinkingToolbar(baseToolbar, mediaLinkingState, state, intl, providerFactory);
+    const linkingToolbar = getLinkingToolbar(baseToolbar, mediaLinkingState, state, intl, pluginInjectionApi, providerFactory);
     if (linkingToolbar) {
       return linkingToolbar;
     }

package/dist/es2019/plugins/media/toolbar/linking-toolbar-appearance.js

@@ -7,7 +7,8 @@ import { isSafeUrl } from '@atlaskit/adf-schema';
 import { checkMediaType } from '../utils/check-media-type';
 import { FloatingToolbarButton as ToolbarButton } from '@atlaskit/editor-common/ui';
 import Separator from '../../floating-toolbar/ui/Separator';
-import { linkToolbarMessages, linkMessages } from '../../../messages';
+import { linkMessages } from '../../../messages';
+import { linkToolbarMessages } from '@atlaskit/editor-common/messages';
 import { ToolTipContent, addLink } from '../../../keymaps';
 import { stateKey } from '../pm-plugins/plugin-key';
 import { currentMediaNode } from '../utils/current-media-node';

package/dist/es2019/plugins/media/toolbar/linking.js

@@ -2,8 +2,7 @@ import React from 'react';
 import { hideLinkingToolbar, setUrlToMedia, unlink } from '../commands/linking';
 import { getMediaLinkingState } from '../pm-plugins/linking';
 import MediaLinkingToolbar from '../ui/MediaLinkingToolbar';
-import { RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '../../../ui/LinkSearch/ToolbarComponents';
-import { forceFocusSelector } from '../../floating-toolbar/pm-plugins/force-focus';
+import { RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 const FORCE_FOCUS_SELECTOR = '[data-testid="add-link-button"],[data-testid="edit-link-button"]';
 export function shouldShowMediaLinkToolbar(editorState) {
   const mediaLinkingState = getMediaLinkingState(editorState);
@@ -27,7 +26,7 @@ export function shouldShowMediaLinkToolbar(editorState) {
   } = editorState.doc.resolve(mediaLinkingState.mediaPos);
   return parent && parent.type.allowsMarkType(link);
 }
-export const getLinkingToolbar = (toolbarBaseConfig, mediaLinkingState, state, intl, providerFactory) => {
+export const getLinkingToolbar = (toolbarBaseConfig, mediaLinkingState, state, intl, pluginInjectionApi, providerFactory) => {
   const {
     link,
     visible,
@@ -64,11 +63,12 @@ export const getLinkingToolbar = (toolbarBaseConfig, mediaLinkingState, state, i
                 hideLinkingToolbar(view.state, view.dispatch, view);
               },
               onCancel: () => {
+                var _pluginInjectionApi$d;
                 hideLinkingToolbar(view.state, view.dispatch, view, true);
                 /** Focus should move to the 'Add link' button when the toolbar closes
                  * and not close the floating toolbar.
                  */
-                forceFocusSelector(FORCE_FOCUS_SELECTOR, view);
+                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.forceFocusSelector(FORCE_FOCUS_SELECTOR, view);
               },
               onSubmit: (href, meta) => {
                 setUrlToMedia(href, meta.inputMethod)(view.state, view.dispatch, view);

package/dist/es2019/plugins/media/ui/MediaLinkingToolbar.js

@@ -12,7 +12,7 @@ import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import Separator from '../../floating-toolbar/ui/Separator';
 import { container, containerWithProvider, inputWrapper } from '../../../ui/LinkSearch/ToolbarComponents';
 import RecentSearch from '../../../ui/LinkSearch';
-import { linkToolbarMessages } from '../../../messages';
+import { linkToolbarMessages } from '@atlaskit/editor-common/messages';
 import { normalizeUrl } from '@atlaskit/editor-common/utils';
 import { R400 } from '@atlaskit/theme/colors';
 import { INPUT_METHOD } from '../../analytics/types/enums';

package/dist/es2019/plugins/media/ui/ResizableMediaSingle/index.js

@@ -8,10 +8,8 @@ import { getMediaClient } from '@atlaskit/media-client';
 import { calcPctFromPx, calcColumnsFromPx, wrappedLayouts } from '@atlaskit/editor-common/ui';
 import { akEditorWideLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { wrapperStyle } from './styled';
-import Resizer from '../../../../ui/Resizer';
-import { snapTo, handleSides, imageAlignmentMap } from '../../../../ui/Resizer/utils';
-import { calcMediaPxWidth } from '@atlaskit/editor-common/ui';
-import { calculateSnapPoints } from '../../../../utils/rich-media-utils';
+import { Resizer, calcMediaPxWidth, snapTo, handleSides, imageAlignmentMap } from '@atlaskit/editor-common/ui';
+import { calculateSnapPoints } from '@atlaskit/editor-common/utils';
 export default class ResizableMediaSingle extends React.Component {
   constructor(...args) {
     super(...args);

package/dist/es2019/plugins/media/utils/media-files.js

@@ -1,10 +1,11 @@
 import { Fragment } from 'prosemirror-model';
-import { setNodeSelection, setTextSelection, insideTableCell, isInListItem, findFarthestParentNode, isInLayoutColumn } from '../../../utils';
+import { setNodeSelection, setTextSelection, insideTableCell, isInListItem, findFarthestParentNode } from '../../../utils';
+import { isInLayoutColumn, isSupportedInParent } from '@atlaskit/editor-common/utils';
 import { posOfPrecedingMediaGroup, posOfMediaGroupNearby, posOfParentMediaGroup, isSelectionNonMediaBlockNode, isInsidePotentialEmptyParagraph, copyOptionalAttrsFromMediaState } from './media-common';
 import { canInsert, safeInsert, hasParentNode } from 'prosemirror-utils';
 import { atTheBeginningOfBlock, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, startPositionOfParent } from '../../../utils/prosemirror/position';
-import { isSupportedInParent } from '../../../utils/nodes';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, addAnalytics } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { addAnalytics } from '../../analytics';
 export const canInsertMediaInline = state => {
   const node = state.schema.nodes.mediaInline.create({});
   return canInsert(state.selection.$to, Fragment.from(node));

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

@@ -1,6 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { SLI_EVENT_TYPE, SMART_EVENT_TYPE, buildSliPayload } from '@atlaskit/mention/resource';
-import { getInlineNodeViewProducer } from '../../../nodeviews/getInlineNodeViewProducer';
+import { getInlineNodeViewProducer } from '@atlaskit/editor-common/react-node-view';
 import { MentionNodeView } from '../nodeviews/mention';
 import { mentionPluginKey } from './key';
 const ACTIONS = {

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

@@ -2,7 +2,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { browser } from '@atlaskit/editor-common/utils';
 import { PluginKey } from 'prosemirror-state';
 import { DecorationSet, Decoration } from 'prosemirror-view';
-import { isEmptyDocument, bracketTyped } from '../../utils/document';
+import { isEmptyDocument, bracketTyped } from '@atlaskit/editor-common/utils';
 export const pluginKey = new PluginKey('placeholderPlugin');
 import { focusStateKey } from '../base/pm-plugins/focus-handler';
 import { isTypeAheadOpen } from '../type-ahead/utils';

package/dist/es2019/plugins/status/plugin.js

@@ -1,7 +1,7 @@
 import { NodeSelection, TextSelection } from 'prosemirror-state';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
-import { getInlineNodeViewProducer } from '../../nodeviews/getInlineNodeViewProducer';
+import { getInlineNodeViewProducer } from '@atlaskit/editor-common/react-node-view';
 import { StatusNodeView } from './nodeviews/status';
 import { pluginKey } from './plugin-key';
 import { isEmptyStatus, mayGetStatusAtSelection } from './utils';

package/dist/es2019/plugins/unsupported-content/index.js

@@ -4,7 +4,7 @@ import { confluenceUnsupportedBlock, confluenceUnsupportedInline, unsupportedBlo
 import { UnsupportedBlock } from '@atlaskit/editor-common/ui';
 import { UnsupportedInlineNodeView } from './unsupported-inline-node-view';
 import { ReactNodeView } from '../../nodeviews';
-import { getInlineNodeViewProducer } from '../../nodeviews/getInlineNodeViewProducer';
+import { getInlineNodeViewProducer } from '@atlaskit/editor-common/react-node-view';
 export const pluginKey = new PluginKey('unsupportedContentPlugin');
 const createPlugin = pmPluginFactoryParams => {
   const hasIntlContext = true;

package/dist/es2019/ui/LinkSearch/ToolbarComponents.js

@@ -1,8 +1,5 @@
 import { css } from '@emotion/react';
-export const RECENT_SEARCH_WIDTH_IN_PX = 420;
-export const RECENT_SEARCH_WIDTH_WITHOUT_ITEMS_IN_PX = 360;
-export const RECENT_SEARCH_HEIGHT_IN_PX = 360;
-export const LINKPICKER_HEIGHT_IN_PX = 570;
+import { RECENT_SEARCH_WIDTH_WITHOUT_ITEMS_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 export const inputWrapper = css`
   display: flex;
   line-height: 0;