@atlaskit/editor-core 188.12.0 → 188.12.1

package/dist/cjs/plugins/tasks-and-decisions/pm-plugins/keymaps.js

@@ -15,7 +15,8 @@ var _steps = require("@atlaskit/adf-schema/steps");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _utils2 = require("@atlaskit/editor-common/utils");
-var _analytics = require("../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _commands2 = require("../commands");
 var _commands3 = require("./commands");
 var _helpers = require("./helpers");
@@ -96,16 +97,18 @@ var joinTaskDecisionFollowing = function joinTaskDecisionFollowing(state, dispat
   }
   return false;
 };
-var getUnindentCommand = exports.getUnindentCommand = function getUnindentCommand() {
-  var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.KEYBOARD;
-  return (0, _utils2.filterCommand)(_helpers.isInsideTask, function (state, dispatch) {
-    var normalizedSelection = (0, _utils3.normalizeTaskItemsSelection)(state.selection);
-    var curIndentLevel = (0, _helpers.getCurrentIndentLevel)(normalizedSelection);
-    if (!curIndentLevel || curIndentLevel === 1) {
-      return false;
-    }
-    return (0, _analytics.withAnalytics)(indentationAnalytics(curIndentLevel, _analytics.INDENT_DIRECTION.OUTDENT, inputMethod))((0, _commands.autoJoin)(_commands3.liftSelection, ['taskList']))(state, dispatch);
-  });
+var getUnindentCommand = exports.getUnindentCommand = function getUnindentCommand(editorAnalyticsAPI) {
+  return function () {
+    var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.KEYBOARD;
+    return (0, _utils2.filterCommand)(_helpers.isInsideTask, function (state, dispatch) {
+      var normalizedSelection = (0, _utils3.normalizeTaskItemsSelection)(state.selection);
+      var curIndentLevel = (0, _helpers.getCurrentIndentLevel)(normalizedSelection);
+      if (!curIndentLevel || curIndentLevel === 1) {
+        return false;
+      }
+      return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, indentationAnalytics(curIndentLevel, _analytics.INDENT_DIRECTION.OUTDENT, inputMethod))((0, _commands.autoJoin)(_commands3.liftSelection, ['taskList']))(state, dispatch);
+    });
+  };
 };
 
 // if selection is decision item or first action item in table cell
@@ -122,53 +125,59 @@ var shouldLetTabThroughInTable = function shouldLetTabThroughInTable(state) {
   }
   return false;
 };
-var getIndentCommand = exports.getIndentCommand = function getIndentCommand() {
-  var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.KEYBOARD;
-  return (0, _utils2.filterCommand)(_helpers.isInsideTask, function (state, dispatch) {
-    var normalizedSelection = (0, _utils3.normalizeTaskItemsSelection)(state.selection);
-    var curIndentLevel = (0, _helpers.getCurrentIndentLevel)(normalizedSelection);
-    if (!curIndentLevel || curIndentLevel >= 6) {
-      return true;
-    }
-    return (0, _analytics.withAnalytics)(indentationAnalytics(curIndentLevel, _analytics.INDENT_DIRECTION.INDENT, inputMethod))((0, _commands.autoJoin)(_commands3.wrapSelectionInTaskList, ['taskList']))(state, dispatch);
-  });
+var getIndentCommand = exports.getIndentCommand = function getIndentCommand(editorAnalyticsAPI) {
+  return function () {
+    var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.KEYBOARD;
+    return (0, _utils2.filterCommand)(_helpers.isInsideTask, function (state, dispatch) {
+      var normalizedSelection = (0, _utils3.normalizeTaskItemsSelection)(state.selection);
+      var curIndentLevel = (0, _helpers.getCurrentIndentLevel)(normalizedSelection);
+      if (!curIndentLevel || curIndentLevel >= 6) {
+        return true;
+      }
+      return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, indentationAnalytics(curIndentLevel, _analytics.INDENT_DIRECTION.INDENT, inputMethod))((0, _commands.autoJoin)(_commands3.wrapSelectionInTaskList, ['taskList']))(state, dispatch);
+    });
+  };
 };
-var backspaceFrom = function backspaceFrom($from) {
-  return function (state, dispatch) {
-    // previous was empty, just delete backwards
-    var taskBefore = $from.doc.resolve($from.before());
-    if (taskBefore.nodeBefore && (0, _helpers.isActionOrDecisionItem)(taskBefore.nodeBefore) && taskBefore.nodeBefore.nodeSize === 2) {
-      return false;
-    }
+var backspaceFrom = function backspaceFrom(editorAnalyticsAPI) {
+  return function ($from) {
+    return function (state, dispatch) {
+      // previous was empty, just delete backwards
+      var taskBefore = $from.doc.resolve($from.before());
+      if (taskBefore.nodeBefore && (0, _helpers.isActionOrDecisionItem)(taskBefore.nodeBefore) && taskBefore.nodeBefore.nodeSize === 2) {
+        return false;
+      }
 
-    // if nested, just unindent
-    var _state$schema$nodes3 = state.schema.nodes,
-      taskList = _state$schema$nodes3.taskList,
-      paragraph = _state$schema$nodes3.paragraph;
-    if ($from.node($from.depth - 2).type === taskList) {
-      return getUnindentCommand()(state, dispatch);
-    }
+      // if nested, just unindent
+      var _state$schema$nodes3 = state.schema.nodes,
+        taskList = _state$schema$nodes3.taskList,
+        paragraph = _state$schema$nodes3.paragraph;
+      if ($from.node($from.depth - 2).type === taskList) {
+        return getUnindentCommand(editorAnalyticsAPI)()(state, dispatch);
+      }
 
-    // bottom level, should "unwrap" taskItem contents into paragraph
-    // we achieve this by slicing the content out, and replacing
-    if (actionDecisionFollowsOrNothing($from)) {
-      if (dispatch) {
-        var taskContent = state.doc.slice($from.start(), $from.end()).content;
+      // bottom level, should "unwrap" taskItem contents into paragraph
+      // we achieve this by slicing the content out, and replacing
+      if (actionDecisionFollowsOrNothing($from)) {
+        if (dispatch) {
+          var taskContent = state.doc.slice($from.start(), $from.end()).content;
 
-        // might be end of document after
-        var slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
-        dispatch(splitListItemWith(state.tr, slice, $from, true));
+          // might be end of document after
+          var slice = taskContent.size ? paragraph.createChecked(undefined, taskContent) : paragraph.createChecked();
+          dispatch(splitListItemWith(state.tr, slice, $from, true));
+        }
+        return true;
       }
-      return true;
-    }
-    return false;
+      return false;
+    };
   };
 };
-var backspace = (0, _utils2.filterCommand)(_utils2.isEmptySelectionAtStart, (0, _commands.autoJoin)((0, _commands.chainCommands)(function (state, dispatch) {
-  return (0, _commands3.joinAtCut)(state.selection.$from)(state, dispatch);
-}, (0, _utils2.filterCommand)(_helpers.isInsideTaskOrDecisionItem, function (state, dispatch) {
-  return backspaceFrom(state.selection.$from)(state, dispatch);
-})), ['taskList', 'decisionList']));
+var backspace = function backspace(editorAnalyticsAPI) {
+  return (0, _utils2.filterCommand)(_utils2.isEmptySelectionAtStart, (0, _commands.autoJoin)((0, _commands.chainCommands)(function (state, dispatch) {
+    return (0, _commands3.joinAtCut)(state.selection.$from)(state, dispatch);
+  }, (0, _utils2.filterCommand)(_helpers.isInsideTaskOrDecisionItem, function (state, dispatch) {
+    return backspaceFrom(editorAnalyticsAPI)(state.selection.$from)(state, dispatch);
+  })), ['taskList', 'decisionList']));
+};
 var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTaskDecisionFollowing(state, dispatch) {
   var $from = state.selection.$from,
     _state$schema$nodes4 = state.schema.nodes,
@@ -278,42 +287,44 @@ var splitListItem = function splitListItem(state, dispatch) {
   }
   return false;
 };
-var enter = (0, _utils2.filterCommand)(_helpers.isInsideTaskOrDecisionItem, (0, _commands.chainCommands)((0, _utils2.filterCommand)(_helpers.isEmptyTaskDecision, (0, _commands.chainCommands)(getUnindentCommand(), splitListItem)), function (state, dispatch) {
-  var selection = state.selection,
-    schema = state.schema;
-  var taskItem = schema.nodes.taskItem;
-  var $from = selection.$from,
-    $to = selection.$to;
-  var node = $from.node($from.depth);
-  var nodeType = node && node.type;
-  var listType = nodeType === taskItem ? 'taskList' : 'decisionList';
-  var addItem = function addItem(_ref) {
-    var tr = _ref.tr,
-      itemLocalId = _ref.itemLocalId;
-    // ED-8932: When cursor is at the beginning of a task item, instead of split, we insert above.
-    if ($from.pos === $to.pos && $from.parentOffset === 0) {
-      var newTask = nodeType.createAndFill({
-        localId: itemLocalId
-      });
-      if (newTask) {
-        // Current position will point to text node, but we want to insert above the taskItem node
-        return tr.insert($from.pos - 1, newTask);
+var enter = function enter(editorAnalyticsAPI) {
+  return (0, _utils2.filterCommand)(_helpers.isInsideTaskOrDecisionItem, (0, _commands.chainCommands)((0, _utils2.filterCommand)(_helpers.isEmptyTaskDecision, (0, _commands.chainCommands)(getUnindentCommand(editorAnalyticsAPI)(), splitListItem)), function (state, dispatch) {
+    var selection = state.selection,
+      schema = state.schema;
+    var taskItem = schema.nodes.taskItem;
+    var $from = selection.$from,
+      $to = selection.$to;
+    var node = $from.node($from.depth);
+    var nodeType = node && node.type;
+    var listType = nodeType === taskItem ? 'taskList' : 'decisionList';
+    var addItem = function addItem(_ref) {
+      var tr = _ref.tr,
+        itemLocalId = _ref.itemLocalId;
+      // ED-8932: When cursor is at the beginning of a task item, instead of split, we insert above.
+      if ($from.pos === $to.pos && $from.parentOffset === 0) {
+        var newTask = nodeType.createAndFill({
+          localId: itemLocalId
+        });
+        if (newTask) {
+          // Current position will point to text node, but we want to insert above the taskItem node
+          return tr.insert($from.pos - 1, newTask);
+        }
       }
+      return tr.split($from.pos, 1, [{
+        type: nodeType,
+        attrs: {
+          localId: itemLocalId
+        }
+      }]);
+    };
+    var insertTr = (0, _commands2.insertTaskDecisionWithAnalytics)(state, listType, _analytics.INPUT_METHOD.KEYBOARD, addItem);
+    if (insertTr && dispatch) {
+      insertTr.scrollIntoView();
+      dispatch(insertTr);
     }
-    return tr.split($from.pos, 1, [{
-      type: nodeType,
-      attrs: {
-        localId: itemLocalId
-      }
-    }]);
-  };
-  var insertTr = (0, _commands2.insertTaskDecisionWithAnalytics)(state, listType, _analytics.INPUT_METHOD.KEYBOARD, addItem);
-  if (insertTr && dispatch) {
-    insertTr.scrollIntoView();
-    dispatch(insertTr);
-  }
-  return true;
-}));
+    return true;
+  }));
+};
 var cmdOptEnter = (0, _utils2.filterCommand)(_helpers.isInsideTaskOrDecisionItem, function (state, dispatch) {
   var selection = state.selection,
     schema = state.schema;
@@ -334,17 +345,20 @@ var cmdOptEnter = (0, _utils2.filterCommand)(_helpers.isInsideTaskOrDecisionItem
   }
   return true;
 });
-function keymapPlugin(schema, allowNestedTasks, consumeTabs) {
+function keymapPlugin(schema, api, allowNestedTasks, consumeTabs) {
+  var _api$analytics3, _api$analytics4;
   var indentHandlers = {
     'Shift-Tab': (0, _utils2.filterCommand)([_helpers.isInsideTaskOrDecisionItem, function (state) {
       return !shouldLetTabThroughInTable(state);
     }], function (state, dispatch) {
-      return getUnindentCommand(_analytics.INPUT_METHOD.KEYBOARD)(state, dispatch) || !!consumeTabs;
+      var _api$analytics;
+      return getUnindentCommand(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(_analytics.INPUT_METHOD.KEYBOARD)(state, dispatch) || !!consumeTabs;
     }),
     Tab: (0, _utils2.filterCommand)([_helpers.isInsideTaskOrDecisionItem, function (state) {
       return !shouldLetTabThroughInTable(state);
     }], function (state, dispatch) {
-      return getIndentCommand(_analytics.INPUT_METHOD.KEYBOARD)(state, dispatch) || !!consumeTabs;
+      var _api$analytics2;
+      return getIndentCommand(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)(_analytics.INPUT_METHOD.KEYBOARD)(state, dispatch) || !!consumeTabs;
     })
   };
   var defaultHandlers = consumeTabs ? {
@@ -352,10 +366,10 @@ function keymapPlugin(schema, allowNestedTasks, consumeTabs) {
     Tab: _helpers.isInsideTaskOrDecisionItem
   } : {};
   var keymaps = _objectSpread((0, _defineProperty2.default)({
-    Backspace: backspace,
+    Backspace: backspace(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions),
     Delete: deleteForwards,
     'Ctrl-d': deleteForwards,
-    Enter: enter
+    Enter: enter(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)
   }, _keymaps.toggleTaskItemCheckbox.common, cmdOptEnter), allowNestedTasks ? indentHandlers : defaultHandlers);
   return (0, _keymap.keymap)(keymaps);
 }

package/dist/cjs/plugins/toolbar-lists-indentation/ui/onItemActivated.js

@@ -30,7 +30,8 @@ var onItemActivated = exports.onItemActivated = function onItemActivated(pluginI
             pluginInjectionApi === null || pluginInjectionApi === void 0 || pluginInjectionApi.core.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.commands.indentList(_analytics.INPUT_METHOD.TOOLBAR));
           }
           if (node === 'taskList') {
-            (0, _keymaps.getIndentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+            var _pluginInjectionApi$a;
+            (0, _keymaps.getIndentCommand)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
           }
           break;
         }
@@ -45,7 +46,8 @@ var onItemActivated = exports.onItemActivated = function onItemActivated(pluginI
             pluginInjectionApi === null || pluginInjectionApi === void 0 || pluginInjectionApi.core.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.commands.outdentList(_analytics.INPUT_METHOD.TOOLBAR));
           }
           if (_node === 'taskList') {
-            (0, _keymaps.getUnindentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+            var _pluginInjectionApi$a2;
+            (0, _keymaps.getUnindentCommand)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
           }
           break;
         }

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "188.12.0";
+var version = exports.version = "188.12.1";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/labs/next/presets/universal.js

@@ -20,6 +20,7 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { saveOnEnterPlugin } from '@atlaskit/editor-plugin-save-on-enter';
 import { scrollIntoViewPlugin } from '@atlaskit/editor-plugin-scroll-into-view';
 import { mentionsPlugin } from '@atlaskit/editor-plugin-mentions';
+import { selectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
 import { isFullPage as fullPageCheck } from '../../../utils/is-full-page';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { createDefaultPreset } from './default';
@@ -398,6 +399,16 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     return builder;
   }).add([codeBidiWarningPlugin, {
     appearance
-  }]);
+  }])
+  /**
+   * Do not use this plugin - it is for AI purposes only.
+   */.maybeAdd(selectionToolbarPlugin, (plugin, builder) => {
+    if (getBooleanFF('platform.editor.enable-selection-toolbar_ucdwd')) {
+      return builder.add([plugin, {
+        preferenceToolbarAboveSelection: false
+      }]);
+    }
+    return builder;
+  });
   return finalPreset;
 }

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

@@ -7,6 +7,7 @@ import { getPluginState } from './utils';
 import { buildToolbar } from './toolbar';
 import { InlineCommentView } from './ui/InlineCommentView';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 const annotationPlugin = ({
   config: annotationProviders,
   api
@@ -53,7 +54,19 @@ const annotationPlugin = ({
     }],
     pluginsOptions: {
       floatingToolbar(state, intl) {
-        if (!annotationProviders) {
+        if (getBooleanFF('platform.editor.enable-selection-toolbar_ucdwd') || !annotationProviders) {
+          return;
+        }
+        const pluginState = getPluginState(state);
+        if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
+          const {
+            isToolbarAbove
+          } = annotationProviders.inlineComment;
+          return buildToolbar(state, intl, isToolbarAbove);
+        }
+      },
+      selectionToolbar(state, intl) {
+        if (!getBooleanFF('platform.editor.enable-selection-toolbar_ucdwd') || !annotationProviders) {
           return;
         }
         const pluginState = getPluginState(state);

package/dist/es2019/plugins/annotation/pm-plugins/inline-comment.js

@@ -36,7 +36,8 @@ const initialState = (disallowOnWhitespace = false) => {
       isSelecting: false
     },
     disallowOnWhitespace,
-    isVisible: true
+    isVisible: true,
+    skipSelectionHandling: false
   };
 };
 const hideToolbar = (state, dispatch) => () => {

package/dist/es2019/plugins/annotation/pm-plugins/plugin-factory.js

@@ -11,6 +11,12 @@ const handleDocChanged = (tr, prevPluginState) => {
   };
 };
 const handleSelectionChanged = (tr, pluginState) => {
+  if (pluginState.skipSelectionHandling) {
+    return {
+      ...pluginState,
+      skipSelectionHandling: false
+    };
+  }
   const selectedAnnotations = findAnnotationsInSelection(tr.selection, tr.doc);
   const changed = selectedAnnotations.length !== pluginState.selectedAnnotations.length || selectedAnnotations.some(annotationInfo => {
     return !pluginState.selectedAnnotations.some(aInfo => aInfo.type === annotationInfo.id);

package/dist/es2019/plugins/annotation/pm-plugins/reducer.js

@@ -54,7 +54,8 @@ export default ((pluginState, action) => {
     case ACTIONS.SET_SELECTED_ANNOTATION:
       return {
         ...pluginState,
-        selectedAnnotations: [...action.data.selectedAnnotations]
+        selectedAnnotations: [...action.data.selectedAnnotations],
+        skipSelectionHandling: true
       };
     default:
       return pluginState;

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

@@ -1,166 +1,11 @@
 import React from 'react';
 import CommentIcon from '@atlaskit/icon/glyph/comment';
-// AFP-2532 TODO: Fix automatic suppressions below
-// eslint-disable-next-line @atlassian/tangerine/import/entry-points
 import { addInlineComment, ToolTipContent } from '../../keymaps';
 import { setInlineCommentDraftState } from './commands';
 import { AnnotationTestIds, AnnotationSelectionType } from './types';
 import { isSelectionValid } from './utils';
 import { annotationMessages } from '@atlaskit/editor-common/messages';
-
-/**
- * Returns the coordintes at the bottom the selection.
- */
-const getCoordsBelowSelection = (bottomCoords, toolbarRect) => {
-  return {
-    top: (bottomCoords.top || 0) + toolbarRect.height / 1.15,
-    left: bottomCoords.right - toolbarRect.width / 2
-  };
-};
-
-/*
-  Calculates the position of the floating toolbar relative to the selection.
-
-  This is a re-implementation which closely matches the behaviour on Confluence renderer.
-  The main difference is the popup is always above the selection.
-
-  Things to consider:
-  - popup is always above the selection
-  - coordinates of head X and getBoundingClientRect() are absolute in client viewport (not including scroll offsets)
-  - popup may appear in '.fabric-editor-popup-scroll-parent' (or body)
-  - we use the toolbarRect to center align toolbar
-  - use wrapperBounds to clamp values
-  - editorView.dom bounds differ to wrapperBounds, convert at the end
-*/
-const calculateToolbarPositionAboveSelection = toolbarTitle => (editorView, nextPos) => {
-  const toolbar = document.querySelector(`div[aria-label="${toolbarTitle}"]`);
-  if (!toolbar) {
-    return nextPos;
-  }
-
-  // scroll wrapper for full page, fall back to document body
-  // TODO: look into using getScrollGutterOptions()
-  const scrollWrapper = editorView.dom.closest('.fabric-editor-popup-scroll-parent') || document.body;
-  const wrapperBounds = scrollWrapper.getBoundingClientRect();
-  const selection = window && window.getSelection();
-  const range = selection && !selection.isCollapsed && selection.getRangeAt(0);
-  if (!range) {
-    return nextPos;
-  }
-  const toolbarRect = toolbar.getBoundingClientRect();
-  const {
-    head,
-    anchor
-  } = editorView.state.selection;
-  const topCoords = editorView.coordsAtPos(Math.min(head, anchor));
-  const bottomCoords = editorView.coordsAtPos(Math.max(head, anchor) - Math.min(range.endOffset, 1));
-  let top = (topCoords.top || 0) - toolbarRect.height * 1.5;
-  let left = 0;
-
-  // If not on the same line
-  if (topCoords.top !== bottomCoords.top) {
-    // selecting downwards
-    if (head > anchor) {
-      left = Math.max(topCoords.right, bottomCoords.right);
-    } else {
-      left = Math.min(topCoords.left, bottomCoords.left);
-    }
-
-    /*
-      short selection above a long paragraph
-       eg. short {<}heading
-      The purpose of this text is to show the selection range{>}.
-       The horizontal positioning should center around "heading",
-      not where it ends at "range".
-       Note: if it was "head<b>ing</b>" then it would only center
-      around "head". Undesireable but matches the current renderer.
-    */
-    const cliffPosition = range.getClientRects()[0];
-    if (cliffPosition.right < left) {
-      left = cliffPosition.left + cliffPosition.width / 2;
-    }
-  } else {
-    // Otherwise center on the single line selection
-    left = topCoords.left + (bottomCoords.right - topCoords.left) / 2;
-  }
-  left -= toolbarRect.width / 2;
-
-  // Place toolbar below selection if not sufficient space above
-  if (top < wrapperBounds.top) {
-    ({
-      top,
-      left
-    } = getCoordsBelowSelection(bottomCoords, toolbarRect));
-  }
-
-  // remap positions from browser document to wrapperBounds
-  return {
-    top: top - wrapperBounds.top + scrollWrapper.scrollTop,
-    left: Math.max(0, left - wrapperBounds.left)
-  };
-};
-
-/*
-  Calculates the position of the floating toolbar relative to the selection.
-
-  This is a re-implementation which closely matches the behaviour on Confluence renderer.
-  The main difference is the popup is always above the selection.
-
-  Things to consider:
-  - stick as close to the head X release coordinates as possible
-  - coordinates of head X and getBoundingClientRect() are absolute in client viewport (not including scroll offsets)
-  - popup may appear in '.fabric-editor-popup-scroll-parent' (or body)
-  - we use the toolbarRect to center align toolbar
-  - use wrapperBounds to clamp values
-  - editorView.dom bounds differ to wrapperBounds, convert at the end
-*/
-const calculateToolbarPositionTrackHead = toolbarTitle => (editorView, nextPos) => {
-  const toolbar = document.querySelector(`div[aria-label="${toolbarTitle}"]`);
-  if (!toolbar) {
-    return nextPos;
-  }
-
-  // scroll wrapper for full page, fall back to document body
-  // TODO: look into using getScrollGutterOptions()
-  const scrollWrapper = editorView.dom.closest('.fabric-editor-popup-scroll-parent') || document.body;
-  const wrapperBounds = scrollWrapper.getBoundingClientRect();
-  const selection = window && window.getSelection();
-  const range = selection && !selection.isCollapsed && selection.getRangeAt(0);
-  if (!range) {
-    return nextPos;
-  }
-  const toolbarRect = toolbar.getBoundingClientRect();
-  const {
-    head,
-    anchor
-  } = editorView.state.selection;
-  let topCoords = editorView.coordsAtPos(Math.min(head, anchor));
-  let bottomCoords = editorView.coordsAtPos(Math.max(head, anchor) - Math.min(range.endOffset, 1));
-  let top;
-  // If not the same line, display toolbar below.
-  if (head > anchor && topCoords.top !== bottomCoords.top) {
-    // We are taking the previous pos to the maxium, so avoid end of line positions
-    // returning the next line's rect.
-    top = (bottomCoords.top || 0) + toolbarRect.height / 1.15;
-  } else {
-    top = (topCoords.top || 0) - toolbarRect.height * 1.5;
-  }
-  let left = (head > anchor ? bottomCoords.right : topCoords.left) - toolbarRect.width / 2;
-
-  // Place toolbar below selection if not sufficient space above
-  if (top < wrapperBounds.top) {
-    ({
-      top,
-      left
-    } = getCoordsBelowSelection(bottomCoords, toolbarRect));
-  }
-
-  // remap positions from browser document to wrapperBounds
-  return {
-    top: top - wrapperBounds.top + scrollWrapper.scrollTop,
-    left: Math.max(0, left - wrapperBounds.left)
-  };
-};
+import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils';
 export const buildToolbar = (state, intl, isToolbarAbove = false) => {
   const {
     schema

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

@@ -10,7 +10,6 @@ import ToolbarButton from '../../../../ui/ToolbarButton';
 import { separatorStyles, buttonGroupStyle, wrapperStyle } from '@atlaskit/editor-common/styles';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 import { showPlaceholderFloatingToolbar } from '../../../placeholder-text/actions';
-import { insertLayoutColumnsWithAnalytics } from '../../../layout/actions';
 import { insertTaskDecisionCommand } from '../../../tasks-and-decisions/commands';
 import { insertExpand } from '../../../expand/commands';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
@@ -206,10 +205,12 @@ export class ToolbarInsertBlock extends React.PureComponent {
       return true;
     });
     _defineProperty(this, "insertLayoutColumns", inputMethod => {
+      var _pluginInjectionApi$l;
       const {
-        editorView
+        editorView,
+        pluginInjectionApi
       } = this.props;
-      insertLayoutColumnsWithAnalytics(inputMethod)(editorView.state, editorView.dispatch);
+      pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$l = pluginInjectionApi.layout) === null || _pluginInjectionApi$l === void 0 ? void 0 : _pluginInjectionApi$l.actions.insertLayoutColumns(inputMethod)(editorView.state, editorView.dispatch);
       return true;
     });
     _defineProperty(this, "createStatus", inputMethod => {

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

@@ -3,8 +3,9 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { flatmap, mapChildren } from '../../utils/slice';
 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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { addAnalytics } from '../analytics/utils';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { LAYOUT_TYPE } from '../analytics/types/node-events';
 import { pluginKey } from './pm-plugins/plugin-key';
 export const ONE_COL_LAYOUTS = ['single'];
@@ -75,7 +76,7 @@ export const insertLayoutColumns = (state, dispatch) => {
   }
   return true;
 };
-export const insertLayoutColumnsWithAnalytics = inputMethod => withAnalytics({
+export const insertLayoutColumnsWithAnalytics = editorAnalyticsAPI => inputMethod => withAnalytics(editorAnalyticsAPI, {
   action: ACTION.INSERTED,
   actionSubject: ACTION_SUBJECT.DOCUMENT,
   actionSubjectId: ACTION_SUBJECT_ID.LAYOUT,