@atlaskit/editor-core 183.0.12 → 183.1.1

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

@@ -7,11 +7,11 @@ import { Component } from 'react';
 import ButtonGroup from '@atlaskit/button/button-group';
 import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 import { themed } from '@atlaskit/theme/components';
-import { borderRadius, gridSize } from '@atlaskit/theme/constants';
+import { borderRadius } from '@atlaskit/theme/constants';
 import { DN70 } from '@atlaskit/theme/colors';
 import { compareArrays, shallowEqual } from '../utils';
 import { showConfirmDialog } from '../pm-plugins/toolbar-data/commands';
-import Button from './Button';
+import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import Dropdown from './Dropdown';
 import Select from './Select';
 import Separator from './Separator';
@@ -28,7 +28,6 @@ import { clearHoverSelection } from '@atlaskit/editor-plugin-table/commands';
 import ScrollButtons from './ScrollButtons';
 import { ToolbarArrowKeyNavigationProvider } from '../../../ui/ToolbarArrowKeyNavigationProvider';
 import { checkShouldForceFocusAndApply, forceFocusSelector } from '../pm-plugins/force-focus';
-const akGridSize = gridSize();
 const ToolbarItems = /*#__PURE__*/React.memo(({
   items,
   dispatchCommand,
@@ -147,6 +146,7 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
         }
         if (item.selectType === 'color') {
           return jsx(ColorPickerButton, {
+            skipFocusButtonAfterPick: true,
             key: idx,
             title: item.title,
             onChange: selected => {
@@ -244,9 +244,9 @@ const toolbarContainer = (theme, scrollable, hasSelect, firstElementIsSelect) =>
             `}
         overflow: hidden;
       ` : css`
-        padding: ${akGridSize / 2}px ${akGridSize}px;
+        padding: ${"var(--ds-space-050, 4px)"} ${"var(--ds-space-100, 8px)"};
         ${firstElementIsSelect && css`
-          padding-left: ${akGridSize / 2}px;
+          padding-left: ${"var(--ds-space-050, 4px)"};
         `}
       `}
 `;
@@ -259,17 +259,17 @@ const toolbarOverflow = (scrollable, scrollDisabled, firstElementIsSelect) => cs
               overflow-y: hidden;
             `}
         -webkit-overflow-scrolling: touch;
-        padding: ${akGridSize / 2}px 0 50px;
+        padding: ${"var(--ds-space-050, 4px)"} 0 50px;
         > div {
           > div:first-child {
             ${firstElementIsSelect ? css`
-                  margin-left: ${akGridSize / 2}px;
+                  margin-left: ${"var(--ds-space-050, 4px)"};
                 ` : css`
-                  margin-left: ${akGridSize}px;
+                  margin-left: ${"var(--ds-space-100, 8px)"};
                 `}
           }
           > div:last-child {
-            margin-right: ${akGridSize}px;
+            margin-right: ${"var(--ds-space-100, 8px)"};
           }
         }
       ` : css`

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

@@ -1,23 +1,20 @@
-import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import classnames from 'classnames';
 import { withTheme } from '@emotion/react';
 import { PluginKey } from 'prosemirror-state';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { breakoutWideScaleRatio, akEditorFullPageMaxWidth, akEditorBreakoutPadding } from '@atlaskit/editor-shared-styles';
-import { pluginKey as widthPlugin } from '../width/index';
-import WithPluginState from '../../ui/WithPluginState';
-import { createDispatch } from '../../event-dispatcher';
-export const stateKey = new PluginKey('gridPlugin');
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 export const GRID_SIZE = 12;
-export const createDisplayGrid = eventDispatcher => {
-  const dispatch = createDispatch(eventDispatcher);
-  return (show, type, highlight = []) => {
-    return dispatch(stateKey, {
-      visible: show,
-      gridType: type,
-      highlight: highlight
-    });
-  };
+const key = new PluginKey('gridPlugin');
+const createDisplayGrid = view => props => {
+  const {
+    dispatch,
+    state
+  } = view;
+  const tr = state.tr.setMeta(key, props);
+  dispatch(tr);
+  return true;
 };
 export const gridTypeForLayout = layout => layout === 'wrap-left' || layout === 'wrap-right' ? 'wrapped' : 'full';
 const sides = ['left', 'right'];
@@ -99,33 +96,73 @@ class Grid extends React.Component {
   }
 }
 const ThemedGrid = withTheme(Grid);
-const gridPlugin = options => ({
-  name: 'grid',
-  contentComponent: ({
-    editorView
-  }) => {
-    return /*#__PURE__*/React.createElement(WithPluginState, {
-      plugins: {
-        grid: stateKey,
-        widthState: widthPlugin
-      },
-      render: ({
-        grid,
-        widthState = {
-          width: akEditorFullPageMaxWidth
-        }
-      }) => {
-        if (!grid) {
-          return null;
-        }
-        return /*#__PURE__*/React.createElement(ThemedGrid, _extends({
-          shouldCalcBreakoutGridLines: options && options.shouldCalcBreakoutGridLines,
-          editorWidth: widthState.width,
-          containerElement: editorView.dom
-        }, grid));
+const ContentComponent = ({
+  api,
+  editorView,
+  options
+}) => {
+  var _widthState$width, _gridState$gridType;
+  const {
+    widthState,
+    gridState
+  } = useSharedPluginState(api, ['width', 'grid']);
+  if (!gridState) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(ThemedGrid, {
+    shouldCalcBreakoutGridLines: options && options.shouldCalcBreakoutGridLines,
+    editorWidth: (_widthState$width = widthState === null || widthState === void 0 ? void 0 : widthState.width) !== null && _widthState$width !== void 0 ? _widthState$width : akEditorFullPageMaxWidth,
+    containerElement: editorView.dom,
+    visible: gridState.visible,
+    gridType: (_gridState$gridType = gridState.gridType) !== null && _gridState$gridType !== void 0 ? _gridState$gridType : 'full',
+    highlight: gridState.highlight
+  });
+};
+const EMPTY_STATE = {
+  visible: false,
+  highlight: []
+};
+const gridPMPlugin = new SafePlugin({
+  key,
+  state: {
+    init() {
+      return EMPTY_STATE;
+    },
+    apply(tr, currentPluginState) {
+      const nextPluginState = tr.getMeta(key);
+      if (nextPluginState) {
+        return nextPluginState;
       }
-    });
+      return currentPluginState;
+    }
   }
 });
+const gridPlugin = (options, api) => {
+  return {
+    name: 'grid',
+    getSharedState(editorState) {
+      if (!editorState) {
+        return null;
+      }
+      return key.getState(editorState);
+    },
+    actions: {
+      displayGrid: createDisplayGrid
+    },
+    pmPlugins() {
+      return [{
+        name: 'grid',
+        plugin: () => gridPMPlugin
+      }];
+    },
+    contentComponent: ({
+      editorView
+    }) => /*#__PURE__*/React.createElement(ContentComponent, {
+      editorView: editorView,
+      options: options,
+      api: api
+    })
+  };
+};
 export default gridPlugin;
 export { GRID_GUTTER } from './styles';

package/dist/es2019/plugins/history/pm-history-types.js

@@ -1,2 +1 @@
-// prosemirror-history does not export its plugin key
-export const pmHistoryPluginKey = 'history$';
+export {};

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

@@ -1,4 +1,4 @@
-import { pmHistoryPluginKey } from './pm-history-types';
+import { pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
 export const getPmHistoryPlugin = state => {
   return state.plugins.find(plugin => plugin.key === pmHistoryPluginKey);
 };

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

@@ -60,7 +60,8 @@ export class HyperlinkToolbarAppearance extends Component {
       editorView,
       editorState,
       cardOptions,
-      platform
+      platform,
+      editorAnalyticsApi
     } = this.props;
     const {
       supportedUrlsMap
@@ -76,7 +77,8 @@ export class HyperlinkToolbarAppearance extends Component {
       editorState: editorState,
       allowEmbeds: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowEmbeds,
       allowBlockCards: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards,
-      platform: platform
+      platform: platform,
+      editorAnalyticsApi: editorAnalyticsApi
     });
   }
 }

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

@@ -6,7 +6,7 @@ import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
-import { normalizeUrl } from './utils';
+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';
@@ -58,7 +58,7 @@ const getSettingsButtonGroup = (state, intl, featureFlags) => {
     target: '_blank'
   }] : [];
 };
-export const getToolbarConfig = (options, featureFlags) => (state, intl, providerFactory) => {
+export const getToolbarConfig = (options, featureFlags, editorAnalyticsApi) => (state, intl, providerFactory) => {
   const {
     formatMessage
   } = intl;
@@ -121,7 +121,8 @@ export const getToolbarConfig = (options, featureFlags) => (state, intl, provide
                   editorState: state,
                   cardOptions: options === null || options === void 0 ? void 0 : options.cardOptions,
                   providerFactory: providerFactory,
-                  platform: options === null || options === void 0 ? void 0 : options.platform
+                  platform: options === null || options === void 0 ? void 0 : options.platform,
+                  editorAnalyticsApi: editorAnalyticsApi
                 });
               }
             }, {

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

@@ -1,11 +1,11 @@
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
-import { normalizeUrl } from './utils';
+import { normalizeUrl, getLinkCreationAnalyticsEvent } from '@atlaskit/editor-common/utils';
 import { stateKey, LinkAction } from './pm-plugins/main';
 import { Selection } from 'prosemirror-state';
 import { filter } from '../../utils/commands';
-import { addAnalytics, ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT_ID, withAnalytics } from '../analytics';
+import { addAnalytics, withAnalytics } from '../analytics';
+import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { queueCardsFromChangedTr } from '../card/pm-plugins/doc';
-import { getLinkCreationAnalyticsEvent } from './analytics';
 import { buildEditLinkPayload, unlinkPayload } from '../../utils/linking-utils';
 export function isTextAtPos(pos) {
   return state => {

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

@@ -4,13 +4,13 @@ import { createInputRulePlugin } from './pm-plugins/input-rule';
 import { createKeymapPlugin } from './pm-plugins/keymap';
 import { plugin, stateKey, LinkAction } from './pm-plugins/main';
 import fakeCursorToolbarPlugin from './pm-plugins/fake-cursor-for-toolbar';
-import { addAnalytics, ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT_ID } from '../analytics';
+import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { getToolbarConfig } from './Toolbar';
 import { tooltip, addLink } from '../../keymaps';
 import { IconLink } from '../quick-insert/assets';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 const hyperlinkPlugin = (options = {}, api) => {
-  var _api$dependencies, _api$dependencies$fea;
+  var _api$dependencies, _api$dependencies$fea, _api$dependencies$ana;
   const featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
   return {
     name: 'hyperlink',
@@ -56,12 +56,13 @@ const hyperlinkPlugin = (options = {}, api) => {
         keyshortcut: tooltip(addLink),
         icon: () => /*#__PURE__*/React.createElement(IconLink, null),
         action(insert, state) {
+          var _api$dependencies2, _api$dependencies2$an, _api$dependencies2$an2, _api$dependencies2$an3;
           const tr = insert(undefined);
           tr.setMeta(stateKey, {
             type: LinkAction.SHOW_INSERT_TOOLBAR,
             inputMethod: INPUT_METHOD.QUICK_INSERT
           });
-          return addAnalytics(state, tr, {
+          const analyticsAttached = api === null || api === void 0 ? void 0 : (_api$dependencies2 = api.dependencies) === null || _api$dependencies2 === void 0 ? void 0 : (_api$dependencies2$an = _api$dependencies2.analytics) === null || _api$dependencies2$an === void 0 ? void 0 : (_api$dependencies2$an2 = _api$dependencies2$an.actions) === null || _api$dependencies2$an2 === void 0 ? void 0 : (_api$dependencies2$an3 = _api$dependencies2$an2.attachAnalyticsEvent) === null || _api$dependencies2$an3 === void 0 ? void 0 : _api$dependencies2$an3.call(_api$dependencies2$an2, {
             action: ACTION.INVOKED,
             actionSubject: ACTION_SUBJECT.TYPEAHEAD,
             actionSubjectId: ACTION_SUBJECT_ID.TYPEAHEAD_LINK,
@@ -69,10 +70,11 @@ const hyperlinkPlugin = (options = {}, api) => {
               inputMethod: INPUT_METHOD.QUICK_INSERT
             },
             eventType: EVENT_TYPE.UI
-          });
+          })(tr);
+          return analyticsAttached !== false ? tr : false;
         }
       }],
-      floatingToolbar: getToolbarConfig(options, featureFlags)
+      floatingToolbar: getToolbarConfig(options, featureFlags, 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)
     }
   };
 };

package/dist/es2019/plugins/hyperlink/pm-plugins/input-rule.js

@@ -1,8 +1,8 @@
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { createRule, createPlugin } from '../../../utils/input-rules';
-import { findFilepaths, isLinkInMatches, LinkMatcher, normalizeUrl } from '../utils';
-import { INPUT_METHOD, addAnalytics } from '../../analytics';
-import { getLinkCreationAnalyticsEvent } from '../analytics';
+import { findFilepaths, isLinkInMatches, LinkMatcher, normalizeUrl, getLinkCreationAnalyticsEvent } from '@atlaskit/editor-common/utils';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { addAnalytics } from '../../analytics';
 export function createLinkInputRule(regexp, skipAnalytics = false) {
   // Plain typed text (eg, typing 'www.google.com') should convert to a hyperlink
   return createRule(regexp, (state, match, start, end) => {

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

@@ -4,8 +4,7 @@ import * as keymaps from '../../../keymaps';
 import { stateKey } from '../pm-plugins/main';
 import { showLinkToolbar, hideLinkToolbar } from '../commands';
 import { INPUT_METHOD, addAnalytics } from '../../analytics';
-import { getLinkCreationAnalyticsEvent } from '../analytics';
-import { findFilepaths, isLinkInMatches } from '../utils';
+import { findFilepaths, isLinkInMatches, getLinkCreationAnalyticsEvent } from '@atlaskit/editor-common/utils';
 export function createKeymapPlugin(skipAnalytics = false) {
   const list = {};
   keymaps.bindKeymapWithCommand(keymaps.addLink.common, showLinkToolbar(INPUT_METHOD.SHORTCUT), list);

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

@@ -17,7 +17,7 @@ import PanelTextInput from '../../../../ui/PanelTextInput';
 import LinkSearchList from '../../../../ui/LinkSearch/LinkSearchList';
 import { container, containerWithProvider, inputWrapper } from '../../../../ui/LinkSearch/ToolbarComponents';
 import { INPUT_METHOD, fireAnalyticsEvent, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { normalizeUrl } from '../../utils';
+import { normalizeUrl } from '@atlaskit/editor-common/utils';
 import { filterUniqueItems } from '../../../../utils/array';
 import debounce from 'lodash/debounce';
 import { mapContentTypeToIcon, sha1, wordCount } from './utils';

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

@@ -85,7 +85,7 @@ const insertBlockPlugin = (options = {}, api) => {
             placeholderTextState,
             layoutState
           }) => /*#__PURE__*/React.createElement(ToolbarInsertBlock, {
-            insertNodeAPI: options.insertNodeAPI,
+            pluginInjectionApi: api,
             buttons: buttons,
             isReducedSpacing: isToolbarReducedSpacing,
             isDisabled: disabled,

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

@@ -170,27 +170,24 @@ export class ToolbarInsertBlock extends React.PureComponent {
       return true;
     });
     _defineProperty(this, "insertTable", inputMethod => {
+      var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4;
       const {
-        insertNodeAPI
+        pluginInjectionApi,
+        editorView
       } = this.props;
-      if (!insertNodeAPI) {
-        return false;
-      }
-      return insertNodeAPI.insert({
-        node: 'table',
-        options: {
-          selectNodeInserted: false,
-          analyticsPayload: {
-            action: ACTION.INSERTED,
-            actionSubject: ACTION_SUBJECT.DOCUMENT,
-            actionSubjectId: ACTION_SUBJECT_ID.TABLE,
-            attributes: {
-              inputMethod
-            },
-            eventType: EVENT_TYPE.TRACK
-          }
-        }
-      });
+      const {
+        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, {
+        action: ACTION.INSERTED,
+        actionSubject: ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: ACTION_SUBJECT_ID.TABLE,
+        attributes: {
+          inputMethod
+        },
+        eventType: EVENT_TYPE.TRACK
+      })(state, dispatch)) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : false;
     });
     _defineProperty(this, "createDate", inputMethod => {
       const {

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

@@ -1,4 +1,6 @@
 import { css } from '@emotion/react';
+
+// eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { gridSize } from '@atlaskit/theme/constants';
 import { N40A, N50A, DN70, DN80 } from '@atlaskit/theme/colors';
 import { themed } from '@atlaskit/theme/components';
@@ -10,6 +12,8 @@ export { LAYOUT_COLUMN_PADDING, LAYOUT_SECTION_MARGIN };
 export const layoutStyles = props => css`
   .ProseMirror {
     ${columnLayoutSharedStyle} [data-layout-section] {
+      // TODO: Migrate away from gridSize
+      // Recommendation: Replace directly with 7px
       margin: ${gridSize() - 1}px -${akLayoutGutterOffset}px 0;
       transition: border-color 0.3s ${akEditorSwoopCubicBezier};
       cursor: pointer;

package/dist/es2019/plugins/list/actions/conversions.js

@@ -3,7 +3,7 @@ import { NodeRange } from 'prosemirror-model';
 import { findWrapping } from 'prosemirror-transform';
 import { findParentNodeClosestToPos } from 'prosemirror-utils';
 import { isListNode, joinSiblingLists } from '../utils/node';
-import { isEmptyParagraph } from '../../../utils';
+import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { findFirstParentListNode } from '../utils/find';
 import { GapCursorSelection } from '../../selection/gap-cursor-selection';
 export function convertListType({

package/dist/es2019/plugins/list/commands/listBackspace.js

@@ -1,7 +1,7 @@
 import { insertContentDeleteRange, isEmptySelectionAtStart, walkPrevNode } from '../../../utils/commands';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, DELETE_DIRECTION, LIST_TEXT_SCENARIOS, addAnalytics } from '../../analytics';
 import { findParentNodeOfType } from 'prosemirror-utils';
-import { isListNode, isParagraphNode } from '../utils/node';
+import { isListNode, isParagraphNode } from '@atlaskit/editor-common/utils';
 import { isPosInsideList, isPosInsideParagraph } from '../utils/selection';
 //Cases below refer to the cases found in this document: https://product-fabric.atlassian.net/wiki/spaces/E/pages/1146954996/List+Backspace+and+Delete+Behaviour
 //Case for two adjacent list items of the same indentation

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

@@ -6,7 +6,7 @@ import { isWrappingPossible } from '../utils/selection';
 import { isListNode } from '../utils/node';
 import { pluginFactory } from '../../../utils/plugin-state-factory';
 import { setGapCursorSelection } from '../../../utils';
-import { Side } from '../../selection/gap-cursor-selection';
+import { Side } from '@atlaskit/editor-common/selection';
 import { listItemCounterPadding, CodeBlockSharedCssClassName, getOrderedListInlineStyles } from '@atlaskit/editor-common/styles';
 import { getItemCounterDigitsSize } from '@atlaskit/editor-common/utils';
 const listPluginKey = new PluginKey('listPlugin');

package/dist/es2019/plugins/list/transforms.js

@@ -2,7 +2,7 @@ import { Fragment, NodeRange, Slice } from 'prosemirror-model';
 import { EditorState, TextSelection } from 'prosemirror-state';
 import { liftTarget, ReplaceAroundStep } from 'prosemirror-transform';
 import { autoJoin } from 'prosemirror-commands';
-import { isListNode } from './utils/node';
+import { isListNode } from '@atlaskit/editor-common/utils';
 import { mapSlice, mapChildren } from '../../utils/slice';
 import { getListLiftTarget } from './utils/indentation';
 function liftListItem(selection, tr) {

package/dist/es2019/plugins/list/utils/analytics.js

@@ -1,4 +1,4 @@
-import { isListNode, isListItemNode } from './node';
+import { isListItemNode, isListNode } from '@atlaskit/editor-common/utils';
 import { getListItemAttributes } from './selection';
 export const getCommonListAnalyticsAttributes = state => {
   const {

package/dist/es2019/plugins/list/utils/find.js

@@ -1,5 +1,5 @@
 import { findParentNodeClosestToPos } from 'prosemirror-utils';
-import { isListNode, isListItemNode } from './node';
+import { isListItemNode, isListNode } from '@atlaskit/editor-common/utils';
 export function findFirstParentListNode($pos) {
   const currentNode = $pos.doc.nodeAt($pos.pos);
   let listNodePosition = null;

package/dist/es2019/plugins/list/utils/indentation.js

@@ -1,5 +1,5 @@
 import { numberNestedLists } from './selection';
-import { isListItemNode, isListNode } from './node';
+import { isListItemNode, isListNode } from '@atlaskit/editor-common/utils';
 
 // This will return (depth - 1) for root list parent of a list.
 export const getListLiftTarget = resPos => {

package/dist/es2019/plugins/list/utils/node.js

@@ -1,16 +1,6 @@
 import { Fragment } from 'prosemirror-model';
-export function isListNode(node) {
-  return Boolean(node && node.type && ['orderedList', 'bulletList'].includes(node.type.name));
-}
-export function isParagraphNode(node) {
-  return Boolean(node && node.type && 'paragraph' === node.type.name);
-}
-export function isListItemNode(node) {
-  return Boolean(node && node.type && 'listItem' === node.type.name);
-}
-export function isBulletList(node) {
-  return Boolean(node && node.type && 'bulletList' === node.type.name);
-}
+export { isListNode, isListItemNode, isBulletList, isParagraphNode } from '@atlaskit/editor-common/utils';
+import { isListNode, isListItemNode } from '@atlaskit/editor-common/utils';
 function isListNodeValidContent(node) {
   const {
     bulletList

package/dist/es2019/plugins/list/utils/selection.js

@@ -2,7 +2,7 @@ import { findWrapping } from 'prosemirror-transform';
 import { Selection, TextSelection, NodeSelection } from 'prosemirror-state';
 import { findParentNodeClosestToPos, findParentNodeOfType, hasParentNodeOfType } from 'prosemirror-utils';
 import { GapCursorSelection } from '../../selection/gap-cursor-selection';
-import { isListItemNode, isListNode, isParagraphNode } from './node';
+import { isListItemNode, isListNode, isParagraphNode } from '@atlaskit/editor-common/utils';
 export const isPosInsideParagraph = $pos => {
   return $pos.parent.type.name === 'paragraph';
 };

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

@@ -2,7 +2,7 @@ import assert from 'assert';
 import { Selection, NodeSelection, TextSelection } from 'prosemirror-state';
 import { safeInsert, replaceSelectedNode, findSelectedNodeOfType, replaceParentNodeOfType } from 'prosemirror-utils';
 import { getValidNode } from '@atlaskit/editor-common/validator';
-import { normaliseNestedLayout } from '../../utils';
+import { normaliseNestedLayout } from '@atlaskit/editor-common/insert';
 import { getPluginState as getExtensionPluginState } from '../extension/plugin-factory';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, addAnalytics } from '../analytics';
 import { TARGET_SELECTION_SOURCE } from '../analytics/types/extension-events';

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

@@ -1,5 +1,5 @@
 import { createMediaLinkingCommand, getMediaLinkingState, mediaLinkingPluginKey } from '../pm-plugins/linking';
-import { normalizeUrl } from '../../hyperlink/utils';
+import { normalizeUrl } from '@atlaskit/editor-common/utils';
 import { createToggleBlockMarkOnRange } from '../../../commands';
 import { MediaLinkingActionsTypes } from '../pm-plugins/linking/actions';
 import { addAnalytics, EVENT_TYPE, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../../analytics';

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

@@ -79,7 +79,7 @@ const mediaPlugin = (options = {}, api) => {
             providerFactory,
             nodeViews: {
               mediaGroup: ReactMediaGroupNode(portalProviderAPI, eventDispatcher, providerFactory, options),
-              mediaSingle: ReactMediaSingleNode(portalProviderAPI, eventDispatcher, providerFactory, dispatchAnalyticsEvent, options),
+              mediaSingle: ReactMediaSingleNode(portalProviderAPI, eventDispatcher, providerFactory, dispatchAnalyticsEvent, options, api),
               media: ReactMediaNode(portalProviderAPI, eventDispatcher, providerFactory, options),
               mediaInline: ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory)
             },

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

@@ -11,7 +11,6 @@ import WithPluginState from '../../../ui/WithPluginState';
 import { pluginKey as widthPluginKey } from '../../width';
 import { setNodeSelection, setTextSelection } from '../../../utils';
 import ResizableMediaSingle from '../ui/ResizableMediaSingle';
-import { createDisplayGrid } from '../../../plugins/grid';
 import { stateKey as mediaPluginKey, MEDIA_CONTENT_WRAP_CLASS_NAME } from '../pm-plugins/main';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
 import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
@@ -158,6 +157,18 @@ export default class MediaSingleNode extends Component {
       }
       (_this$captionPlaceHol = this.captionPlaceHolderRef.current) === null || _this$captionPlaceHol === void 0 ? void 0 : _this$captionPlaceHol.click();
     });
+    _defineProperty(this, "displayGrid", (visible, gridType, highlight) => {
+      var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+      const {
+        pluginInjectionApi,
+        view
+      } = this.props;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.grid) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions.displayGrid(view)({
+        visible,
+        gridType,
+        highlight: highlight
+      });
+    });
     _defineProperty(this, "clickPlaceholder", () => {
       const {
         view,
@@ -297,7 +308,7 @@ export default class MediaSingleNode extends Component {
       view: this.props.view,
       getPos: getPos,
       updateSize: this.updateSize,
-      displayGrid: createDisplayGrid(this.props.eventDispatcher),
+      displayGrid: this.displayGrid,
       gridSize: 12,
       viewMediaClientConfig: this.state.viewMediaClientConfig,
       allowBreakoutSnapPoints: mediaOptions && mediaOptions.allowBreakoutSnapPoints,
@@ -380,7 +391,8 @@ class MediaSingleNodeView extends ReactNodeView {
       fullWidthMode,
       providerFactory,
       mediaOptions,
-      dispatchAnalyticsEvent
+      dispatchAnalyticsEvent,
+      pluginInjectionApi
     } = this.reactComponentProps;
 
     // getPos is a boolean for marks, since this is a node we know it must be a function
@@ -416,7 +428,8 @@ class MediaSingleNodeView extends ReactNodeView {
               eventDispatcher: eventDispatcher,
               mediaPluginState: mediaPluginState,
               dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-              forwardRef: forwardRef
+              forwardRef: forwardRef,
+              pluginInjectionApi: pluginInjectionApi
             });
           }
         });
@@ -436,7 +449,7 @@ class MediaSingleNodeView extends ReactNodeView {
     return true;
   }
 }
-export const ReactMediaSingleNode = (portalProviderAPI, eventDispatcher, providerFactory, dispatchAnalyticsEvent, mediaOptions = {}) => (node, view, getPos) => {
+export const ReactMediaSingleNode = (portalProviderAPI, eventDispatcher, providerFactory, dispatchAnalyticsEvent, mediaOptions = {}, pluginInjectionApi) => (node, view, getPos) => {
   const hasIntlContext = true;
   return new MediaSingleNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {
     eventDispatcher,
@@ -444,6 +457,7 @@ export const ReactMediaSingleNode = (portalProviderAPI, eventDispatcher, provide
     providerFactory,
     mediaOptions,
     dispatchAnalyticsEvent,
-    isCopyPasteEnabled: mediaOptions.isCopyPasteEnabled
+    isCopyPasteEnabled: mediaOptions.isCopyPasteEnabled,
+    pluginInjectionApi
   }, undefined, undefined, undefined, hasIntlContext).init();
 };

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

@@ -2,7 +2,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from 'prosemirror-state';
 import { pluginFactory } from '../../../../utils/plugin-state-factory';
 import reducer from './reducer';
-import { pmHistoryPluginKey } from '../../../history/pm-history-types';
+import { pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
 export const pluginKey = new PluginKey('mediaAltTextPlugin');
 const {
   createPluginState,