@atlaskit/editor-core 187.46.1 → 187.47.2

package/dist/esm/plugins/selection/commands.js

@@ -1,20 +1,32 @@
 import { NodeSelection, TextSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { GapCursorSelection, Side } from './gap-cursor-selection';
-import { isIgnored as isIgnoredByGapCursor } from '../selection/gap-cursor/utils/is-ignored';
+import { isIgnored as isIgnoredByGapCursor } from '@atlaskit/editor-common/selection';
 import { isNodeEmpty, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { SelectionActionTypes } from './actions';
 import { createCommand, getPluginState } from './plugin-factory';
 import { isSelectableContainerNode, isSelectionAtEndOfParentNode, findSelectableContainerParent, isSelectionAtStartOfParentNode, findSelectableContainerBefore, findSelectableContainerAfter, findFirstChildNodeToSelect, findLastChildNodeToSelect } from './utils';
-import { RelativeSelectionPos, SelectionDirection } from './types';
+import { RelativeSelectionPos, SelectionDirection, selectionPluginKey } from './types';
+export var selectNearNode = function selectNearNode(selectionRelativeToNode, selection) {
+  return function (_ref) {
+    var tr = _ref.tr;
+    tr.setMeta(selectionPluginKey, {
+      type: SelectionActionTypes.SET_RELATIVE_SELECTION,
+      selectionRelativeToNode: selectionRelativeToNode
+    });
+    if (selection) {
+      return tr.setSelection(selection);
+    }
+    return tr;
+  };
+};
 export var setSelectionRelativeToNode = function setSelectionRelativeToNode(selectionRelativeToNode, selection) {
   return createCommand({
     type: SelectionActionTypes.SET_RELATIVE_SELECTION,
     selectionRelativeToNode: selectionRelativeToNode
   }, function (tr) {
-    if (selection) {
-      return tr.setSelection(selection);
-    }
-    return tr;
+    return selectNearNode(selectionRelativeToNode, selection)({
+      tr: tr
+    }) || tr;
   });
 };
 export var arrowRight = function arrowRight(state, dispatch) {

package/dist/esm/plugins/selection/gap-cursor/utils/place-gap-cursor.js

@@ -1,6 +1,6 @@
 import _toArray from "@babel/runtime/helpers/toArray";
 import { getLayoutModeFromTargetNode, isLeftCursor, getComputedStyleForLayoutMode } from '../utils';
-import { Side } from '../selection';
+import { Side } from '@atlaskit/editor-common/selection';
 
 /**
  * We have a couple of nodes that require us to compute style

package/dist/esm/plugins/selection/index.js

@@ -1,8 +1,10 @@
 import { createPlugin } from './pm-plugins/selection-main';
+import { selectionPluginKey } from './types';
 import selectionKeymapPlugin from './pm-plugins/keymap';
 import gapCursorPlugin from './pm-plugins/gap-cursor-main';
 import { gapCursorPluginKey } from './pm-plugins/gap-cursor-plugin-key';
 import gapCursorKeymapPlugin from './pm-plugins/gap-cursor-keymap';
+import { selectNearNode } from './commands';
 var displayGapCursor = function displayGapCursor(toggle) {
   return function (_ref) {
     var tr = _ref.tr;
@@ -16,7 +18,17 @@ export var selectionPlugin = function selectionPlugin(_ref2) {
   return {
     name: 'selection',
     commands: {
-      displayGapCursor: displayGapCursor
+      displayGapCursor: displayGapCursor,
+      selectNearNode: selectNearNode
+    },
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return undefined;
+      }
+      var pluginState = selectionPluginKey.getState(editorState);
+      return {
+        selectionRelativeToNode: pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectionRelativeToNode
+      };
     },
     pmPlugins: function pmPlugins() {
       return [{

package/dist/esm/plugins/selection/utils.js

@@ -2,28 +2,9 @@ import { NodeSelection, TextSelection, Selection, AllSelection } from '@atlaskit
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { flatten, findParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
-import { isSelectionAtStartOfNode, isSelectionAtEndOfNode, getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, selectNode } from '@atlaskit/editor-common/selection';
+import { isSelectionAtStartOfNode, isSelectionAtEndOfNode, getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, createSelectionClickHandler, isIgnored as isIgnoredByGapCursor } from '@atlaskit/editor-common/selection';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
-import { isIgnored as isIgnoredByGapCursor } from '../selection/gap-cursor/utils/is-ignored';
 import { selectionPluginKey } from './types';
-export function createSelectionClickHandler(nodes, isValidTarget, options) {
-  return function handleClickOn(view, pos, node, nodePos, event, direct) {
-    if (options.useLongPressSelection) {
-      return false;
-    }
-    if (direct && nodes.indexOf(node.type.name) !== -1) {
-      if (event.target) {
-        var _target = event.target;
-        if (isValidTarget(_target)) {
-          var selectionPos = options.getNodeSelectionPos ? options.getNodeSelectionPos(view.state, nodePos) : nodePos;
-          selectNode(selectionPos)(view.state, view.dispatch);
-          return true;
-        }
-      }
-    }
-    return false;
-  };
-}
 export var getDecorations = function getDecorations(tr) {
   if (tr.selection instanceof NodeSelection) {
     return DecorationSet.create(tr.doc, [Decoration.node(tr.selection.from, tr.selection.to, {
@@ -257,4 +238,4 @@ export var isSelectionAtStartOfParentNode = function isSelectionAtStartOfParentN
 export var isSelectionAtEndOfParentNode = function isSelectionAtEndOfParentNode($pos, selection) {
   return isSelectionAtEndOfNode($pos, findSelectableContainerParent(selection));
 };
-export { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload };
+export { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, createSelectionClickHandler };

package/dist/esm/plugins/tasks-and-decisions/commands.js

@@ -7,7 +7,7 @@ import { findParentNodeOfType, hasParentNodeOfType, replaceParentNodeOfType, saf
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { uuid } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD, USER_CONTEXT } from '../analytics';
-import { GapCursorSelection } from '../selection/gap-cursor-selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { stateKey as taskDecisionStateKey } from './pm-plugins/plugin-key';
 import { autoJoinTr } from '@atlaskit/editor-common/utils';
 var getContextData = function getContextData() {

package/dist/esm/plugins/tasks-and-decisions/pm-plugins/main.js

@@ -7,7 +7,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { uuid } from '@atlaskit/adf-schema';
 import { nodesBetweenChanged, SetAttrsStep } from '../../../utils';
-import { createSelectionClickHandler } from '../../selection/utils';
+import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { decisionItemNodeView } from '../nodeviews/decisionItem';
 import { taskItemNodeViewFactory } from '../nodeviews/taskItem';
 import { stateKey } from './plugin-key';

package/dist/esm/test-utils.js

@@ -91,7 +91,7 @@ export var createPMSchemaAndPlugins = function createPMSchemaAndPlugins() {
   };
 };
 export { EventDispatcher } from './event-dispatcher';
-export { GapCursorSelection, Side as GapCursorSide } from './plugins/selection/gap-cursor/selection';
+export { GapCursorSelection, Side as GapCursorSide } from '@atlaskit/editor-common/selection';
 export function setTextSelection(view, anchor, head) {
   var state = view.state;
   var tr = state.tr.setSelection(TextSelection.create(state.doc, anchor, head));

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "187.46.1";
+export var version = "187.47.2";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/index.d.ts

@@ -75,7 +75,7 @@ export type { Command, EditorPlugin, EditorProps, EditorInstance, CommandDispatc
 export { default as EditorActions } from './actions';
 export type { MacroProvider, MacroAttributes, ExtensionType, CardProvider, } from '@atlaskit/editor-common/provider-factory';
 export { PortalProvider, PortalProviderAPI, PortalRenderer, } from '@atlaskit/editor-common/portal-provider';
-export { GapCursorSelection, Side as GapCursorSide, } from './plugins/selection/gap-cursor-selection';
+export { GapCursorSelection, Side as GapCursorSide, } from '@atlaskit/editor-common/selection';
 export type { HistoryPluginState } from './plugins/history/types';
 export type { MentionPluginState } from './plugins/mentions/types';
 export type { TOOLBAR_MENU_TYPE as InsertBlockInputMethodToolbar } from './plugins/insert-block/ui/ToolbarInsertBlock/types';

package/dist/types/labs/next/presets/default.d.ts

@@ -8,7 +8,7 @@ import type { PlaceholderPluginOptions } from '@atlaskit/editor-plugin-placehold
 import type { AnnotationProviders } from '../../../plugins/annotation';
 import type { TextFormattingOptions, HyperlinkPluginOptions, QuickInsertPluginOptions } from '@atlaskit/editor-common/types';
 import type { CodeBlockOptions } from '../../../plugins/code-block/types';
-import type { SelectionPluginOptions } from '../../../plugins/selection/types';
+import type { SelectionPluginOptions } from '@atlaskit/editor-common/selection';
 import type { CardOptions } from '@atlaskit/editor-common/card';
 import type { TypeAheadPluginOptions } from '../../../plugins/type-ahead';
 import { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
@@ -60,11 +60,13 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
         insertCodeBlock: (inputMethod: import("@atlaskit/editor-common/analytics").INPUT_METHOD) => import("@atlaskit/editor-common/types").Command;
     };
 }, CodeBlockOptions>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
-    pluginConfiguration: SelectionPluginOptions | undefined;
+    pluginConfiguration: import("../../../plugins/selection/types").SelectionPluginOptions | undefined;
     commands: {
         displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
+        selectNearNode: import("@atlaskit/editor-common/types").EditorCommandWithMetadata;
     };
-}, SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"floatingToolbar", {
+    sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
+}, import("../../../plugins/selection/types").SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"floatingToolbar", {
     dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
         pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
         sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
@@ -268,11 +270,13 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
         insertCodeBlock: (inputMethod: import("@atlaskit/editor-common/analytics").INPUT_METHOD) => import("@atlaskit/editor-common/types").Command;
     };
 }, CodeBlockOptions>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
-    pluginConfiguration: SelectionPluginOptions | undefined;
+    pluginConfiguration: import("../../../plugins/selection/types").SelectionPluginOptions | undefined;
     commands: {
         displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
+        selectNearNode: import("@atlaskit/editor-common/types").EditorCommandWithMetadata;
     };
-}, SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"floatingToolbar", {
+    sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
+}, import("../../../plugins/selection/types").SelectionPluginOptions | undefined>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"floatingToolbar", {
     dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
         pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
         sharedState: import("@atlaskit/editor-common/types").FeatureFlags;

package/dist/types/plugins/annotation/commands/index.d.ts

@@ -1,10 +1,11 @@
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { RESOLVE_METHOD } from './../../analytics/types/inline-comment-events';
 import type { Command } from '../../../types';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '../../analytics';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';
 export declare const updateInlineCommentResolvedState: (partialNewState: InlineCommentMap, resolveMethod?: RESOLVE_METHOD) => Command;
-export declare const closeComponent: () => Command;
+export declare const closeComponent: (state: EditorState) => Command;
 export declare const clearDirtyMark: () => Command;
 export declare const removeInlineCommentNearSelection: (id: string) => Command;
 export declare const setInlineCommentDraftState: (drafting: boolean, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT) => Command;

package/dist/types/plugins/annotation/pm-plugins/types.d.ts

@@ -43,6 +43,9 @@ export type InlineCommentAction = {
     type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK;
 } | {
     type: ACTIONS.CLOSE_COMPONENT;
+    data: {
+        lastClosedPos: number;
+    };
 } | {
     type: ACTIONS.ADD_INLINE_COMMENT;
     data: {
@@ -71,4 +74,5 @@ export type InlineCommentPluginState = {
     bookmark?: SelectionBookmark;
     disallowOnWhitespace: boolean;
     isVisible: boolean;
+    lastClosedPos?: number;
 };

package/dist/types/plugins/expand/index.d.ts

@@ -2,13 +2,18 @@ import type { NextEditorPlugin, EditorProps } from '../../types';
 import type { LongPressSelectionPluginOptions } from '@atlaskit/editor-common/types';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
+import type { SelectionPlugin } from '../selection';
 interface ExpandPluginOptions extends LongPressSelectionPluginOptions {
     allowInsertion?: boolean;
     appearance?: EditorProps['appearance'];
 }
 declare const expandPlugin: NextEditorPlugin<'expand', {
     pluginConfiguration: ExpandPluginOptions | undefined;
-    dependencies: [FeatureFlagsPlugin, typeof decorationsPlugin];
+    dependencies: [
+        FeatureFlagsPlugin,
+        typeof decorationsPlugin,
+        SelectionPlugin
+    ];
 }>;
 interface ExpandEditorProps {
     allowExpand?: EditorProps['allowExpand'];

package/dist/types/plugins/expand/nodeviews/index.d.ts

@@ -2,8 +2,10 @@ import type { IntlShape } from 'react-intl-next';
 import type { EditorView, NodeView, Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { getPosHandlerNode, getPosHandler } from '../../../nodeviews/';
-import type { FeatureFlags } from '@atlaskit/editor-common/types';
+import type { FeatureFlags, ExtractInjectionAPI, EditorCommandWithMetadata } from '@atlaskit/editor-common/types';
+import type expandPlugin from '../index';
 export declare class ExpandNodeView implements NodeView {
+    private selectNearNode;
     node: PmNode;
     view: EditorView;
     dom: HTMLElement;
@@ -17,7 +19,8 @@ export declare class ExpandNodeView implements NodeView {
     allowInteractiveExpand: boolean;
     isMobile: boolean;
     featureFlags: FeatureFlags;
-    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, featureFlags: FeatureFlags);
+    api: ExtractInjectionAPI<typeof expandPlugin> | undefined;
+    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, featureFlags: FeatureFlags, selectNearNode: EditorCommandWithMetadata | undefined, api: ExtractInjectionAPI<typeof expandPlugin> | undefined);
     private initHandlers;
     private focusTitle;
     private handleIconKeyDown;
@@ -43,8 +46,9 @@ export declare class ExpandNodeView implements NodeView {
     update(node: PmNode, _decorations: readonly Decoration[]): boolean;
     destroy(): void;
 }
-export default function ({ getIntl, isMobile, featureFlags, }: {
+export default function ({ getIntl, isMobile, featureFlags, api, }: {
     getIntl: () => IntlShape;
     isMobile: boolean;
     featureFlags: FeatureFlags;
+    api: ExtractInjectionAPI<typeof expandPlugin> | undefined;
 }): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;

package/dist/types/plugins/expand/pm-plugins/keymap.d.ts

@@ -1,2 +1,4 @@
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-export declare function expandKeymap(): SafePlugin;
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type expandPlugin from '../index';
+export declare function expandKeymap(api: ExtractInjectionAPI<typeof expandPlugin> | undefined): SafePlugin;

package/dist/types/plugins/expand/pm-plugins/main.d.ts

@@ -2,6 +2,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { Dispatch } from '../../../event-dispatcher';
 import type { EditorProps } from '../../../types';
 import type { IntlShape } from 'react-intl-next';
-import type { FeatureFlags } from '@atlaskit/editor-common/types';
+import type { FeatureFlags, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type expandPlugin from '../index';
 export declare function containsClass(element: Element | null, className: string): boolean;
-export declare const createPlugin: (dispatch: Dispatch, getIntl: () => IntlShape, appearance: EditorProps['appearance'], useLongPressSelection: boolean | undefined, featureFlags: FeatureFlags) => SafePlugin<import("..").ExpandPluginState>;
+export declare const createPlugin: (dispatch: Dispatch, getIntl: () => IntlShape, appearance: EditorProps['appearance'], useLongPressSelection: boolean | undefined, featureFlags: FeatureFlags, api: ExtractInjectionAPI<typeof expandPlugin> | undefined) => SafePlugin<import("../types").ExpandPluginState>;

package/dist/types/plugins/panel/pm-plugins/main.d.ts

@@ -1,7 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import { PanelPluginOptions } from '../types';
-import { Dispatch } from '../../../event-dispatcher';
+import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
+import type { PanelPluginOptions } from '../types';
+import type { Dispatch } from '../../../event-dispatcher';
 export type PanelOptions = {
     color?: string;
     emoji?: string;

package/dist/types/plugins/selection/commands.d.ts

@@ -1,8 +1,10 @@
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
-import type { Command } from '@atlaskit/editor-common/types';
+import type { Command } from '../../types';
 import { RelativeSelectionPos } from './types';
-export declare const setSelectionRelativeToNode: (selectionRelativeToNode?: RelativeSelectionPos, selection?: Selection | null) => Command;
+import type { EditorCommandWithMetadata } from '@atlaskit/editor-common/types';
+export declare const selectNearNode: EditorCommandWithMetadata;
+export declare const setSelectionRelativeToNode: (selectionRelativeToNode?: RelativeSelectionPos, selection?: Selection | null) => import("@atlaskit/editor-common/types").Command;
 export declare const arrowRight: Command;
 export declare const arrowLeft: Command;
 export declare const setSelectionInsideAtNodeEnd: (selectionRelativeToNode: RelativeSelectionPos, node: PmNode, from: number, to: number) => Command;

package/dist/types/plugins/selection/index.d.ts

@@ -1,10 +1,13 @@
-import type { EditorCommand, NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { EditorCommand, NextEditorPlugin, EditorCommandWithMetadata } from '@atlaskit/editor-common/types';
+import type { SelectionSharedState } from '@atlaskit/editor-common/selection';
 import type { SelectionPluginOptions } from './types';
-type SelectionPlugin = NextEditorPlugin<'selection', {
+export type SelectionPlugin = NextEditorPlugin<'selection', {
     pluginConfiguration: SelectionPluginOptions | undefined;
     commands: {
         displayGapCursor: (toggle: boolean) => EditorCommand;
+        selectNearNode: EditorCommandWithMetadata;
     };
+    sharedState: SelectionSharedState;
 }>;
 export declare const selectionPlugin: SelectionPlugin;
 export default selectionPlugin;

package/dist/types/plugins/selection/utils.d.ts

@@ -1,14 +1,9 @@
 import type { Transaction, ReadonlyTransaction, EditorState } from '@atlaskit/editor-prosemirror/state';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { Node as PmNode, ResolvedPos } from '@atlaskit/editor-prosemirror/model';
 import type { ContentNodeWithPos, NodeWithPos } from '@atlaskit/editor-prosemirror/utils';
-import { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload } from '@atlaskit/editor-common/selection';
-export declare function createSelectionClickHandler(nodes: string[], isValidTarget: (target: HTMLElement) => boolean, options: {
-    useLongPressSelection: boolean;
-    getNodeSelectionPos?: (state: EditorState, nodePos: number) => number;
-}): (view: EditorView, pos: number, node: PmNode, nodePos: number, event: MouseEvent, direct: boolean) => boolean;
+import { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 export declare const getDecorations: (tr: Transaction | ReadonlyTransaction) => DecorationSet;
 /**
  * Use `getNodesToDecorateFromSelection` to collect and return
@@ -60,4 +55,4 @@ export declare const findFirstChildNodeToSelect: (parent: PmNode) => NodeWithPos
 export declare const findLastChildNodeToSelect: (parent: PmNode) => NodeWithPos | undefined;
 export declare const isSelectionAtStartOfParentNode: ($pos: ResolvedPos, selection: Selection) => boolean;
 export declare const isSelectionAtEndOfParentNode: ($pos: ResolvedPos, selection: Selection) => boolean;
-export { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, };
+export { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, createSelectionClickHandler, };

package/dist/types/test-utils.d.ts

@@ -30,7 +30,7 @@ export declare const createPMSchemaAndPlugins: (inputPreset?: EditorPresetBuilde
 }) => PluginData;
 export { EventDispatcher } from './event-dispatcher';
 export type { Dispatch } from './event-dispatcher';
-export { GapCursorSelection, Side as GapCursorSide, } from './plugins/selection/gap-cursor/selection';
+export { GapCursorSelection, Side as GapCursorSide, } from '@atlaskit/editor-common/selection';
 export declare function setTextSelection(view: EditorView, anchor: number, head?: number): void;
 /**
  * Given a selector, checks if an element matching the selector exists in the

package/dist/types-ts4.5/index.d.ts

@@ -75,7 +75,7 @@ export type { Command, EditorPlugin, EditorProps, EditorInstance, CommandDispatc
 export { default as EditorActions } from './actions';
 export type { MacroProvider, MacroAttributes, ExtensionType, CardProvider, } from '@atlaskit/editor-common/provider-factory';
 export { PortalProvider, PortalProviderAPI, PortalRenderer, } from '@atlaskit/editor-common/portal-provider';
-export { GapCursorSelection, Side as GapCursorSide, } from './plugins/selection/gap-cursor-selection';
+export { GapCursorSelection, Side as GapCursorSide, } from '@atlaskit/editor-common/selection';
 export type { HistoryPluginState } from './plugins/history/types';
 export type { MentionPluginState } from './plugins/mentions/types';
 export type { TOOLBAR_MENU_TYPE as InsertBlockInputMethodToolbar } from './plugins/insert-block/ui/ToolbarInsertBlock/types';

package/dist/types-ts4.5/labs/next/presets/default.d.ts

@@ -8,7 +8,7 @@ import type { PlaceholderPluginOptions } from '@atlaskit/editor-plugin-placehold
 import type { AnnotationProviders } from '../../../plugins/annotation';
 import type { TextFormattingOptions, HyperlinkPluginOptions, QuickInsertPluginOptions } from '@atlaskit/editor-common/types';
 import type { CodeBlockOptions } from '../../../plugins/code-block/types';
-import type { SelectionPluginOptions } from '../../../plugins/selection/types';
+import type { SelectionPluginOptions } from '@atlaskit/editor-common/selection';
 import type { CardOptions } from '@atlaskit/editor-common/card';
 import type { TypeAheadPluginOptions } from '../../../plugins/type-ahead';
 import { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
@@ -84,11 +84,13 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
         };
     }, CodeBlockOptions>,
     import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
-        pluginConfiguration: SelectionPluginOptions | undefined;
+        pluginConfiguration: import("../../../plugins/selection/types").SelectionPluginOptions | undefined;
         commands: {
             displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
+            selectNearNode: import("@atlaskit/editor-common/types").EditorCommandWithMetadata;
         };
-    }, SelectionPluginOptions | undefined>,
+        sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
+    }, import("../../../plugins/selection/types").SelectionPluginOptions | undefined>,
     import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"floatingToolbar", {
         dependencies: [
             import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
@@ -363,11 +365,13 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
         };
     }, CodeBlockOptions>,
     import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"selection", {
-        pluginConfiguration: SelectionPluginOptions | undefined;
+        pluginConfiguration: import("../../../plugins/selection/types").SelectionPluginOptions | undefined;
         commands: {
             displayGapCursor: (toggle: boolean) => import("@atlaskit/editor-common/types").EditorCommand;
+            selectNearNode: import("@atlaskit/editor-common/types").EditorCommandWithMetadata;
         };
-    }, SelectionPluginOptions | undefined>,
+        sharedState: import("@atlaskit/editor-common/selection").SelectionSharedState;
+    }, import("../../../plugins/selection/types").SelectionPluginOptions | undefined>,
     import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"floatingToolbar", {
         dependencies: [
             import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {

package/dist/types-ts4.5/plugins/annotation/commands/index.d.ts

@@ -1,10 +1,11 @@
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { RESOLVE_METHOD } from './../../analytics/types/inline-comment-events';
 import type { Command } from '../../../types';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '../../analytics';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';
 export declare const updateInlineCommentResolvedState: (partialNewState: InlineCommentMap, resolveMethod?: RESOLVE_METHOD) => Command;
-export declare const closeComponent: () => Command;
+export declare const closeComponent: (state: EditorState) => Command;
 export declare const clearDirtyMark: () => Command;
 export declare const removeInlineCommentNearSelection: (id: string) => Command;
 export declare const setInlineCommentDraftState: (drafting: boolean, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT) => Command;

package/dist/types-ts4.5/plugins/annotation/pm-plugins/types.d.ts

@@ -43,6 +43,9 @@ export type InlineCommentAction = {
     type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK;
 } | {
     type: ACTIONS.CLOSE_COMPONENT;
+    data: {
+        lastClosedPos: number;
+    };
 } | {
     type: ACTIONS.ADD_INLINE_COMMENT;
     data: {
@@ -71,4 +74,5 @@ export type InlineCommentPluginState = {
     bookmark?: SelectionBookmark;
     disallowOnWhitespace: boolean;
     isVisible: boolean;
+    lastClosedPos?: number;
 };

package/dist/types-ts4.5/plugins/expand/index.d.ts

@@ -2,6 +2,7 @@ import type { NextEditorPlugin, EditorProps } from '../../types';
 import type { LongPressSelectionPluginOptions } from '@atlaskit/editor-common/types';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
+import type { SelectionPlugin } from '../selection';
 interface ExpandPluginOptions extends LongPressSelectionPluginOptions {
     allowInsertion?: boolean;
     appearance?: EditorProps['appearance'];
@@ -10,7 +11,8 @@ declare const expandPlugin: NextEditorPlugin<'expand', {
     pluginConfiguration: ExpandPluginOptions | undefined;
     dependencies: [
         FeatureFlagsPlugin,
-        typeof decorationsPlugin
+        typeof decorationsPlugin,
+        SelectionPlugin
     ];
 }>;
 interface ExpandEditorProps {

package/dist/types-ts4.5/plugins/expand/nodeviews/index.d.ts

@@ -2,8 +2,10 @@ import type { IntlShape } from 'react-intl-next';
 import type { EditorView, NodeView, Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { getPosHandlerNode, getPosHandler } from '../../../nodeviews/';
-import type { FeatureFlags } from '@atlaskit/editor-common/types';
+import type { FeatureFlags, ExtractInjectionAPI, EditorCommandWithMetadata } from '@atlaskit/editor-common/types';
+import type expandPlugin from '../index';
 export declare class ExpandNodeView implements NodeView {
+    private selectNearNode;
     node: PmNode;
     view: EditorView;
     dom: HTMLElement;
@@ -17,7 +19,8 @@ export declare class ExpandNodeView implements NodeView {
     allowInteractiveExpand: boolean;
     isMobile: boolean;
     featureFlags: FeatureFlags;
-    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, featureFlags: FeatureFlags);
+    api: ExtractInjectionAPI<typeof expandPlugin> | undefined;
+    constructor(node: PmNode, view: EditorView, getPos: getPosHandlerNode, getIntl: () => IntlShape, isMobile: boolean, featureFlags: FeatureFlags, selectNearNode: EditorCommandWithMetadata | undefined, api: ExtractInjectionAPI<typeof expandPlugin> | undefined);
     private initHandlers;
     private focusTitle;
     private handleIconKeyDown;
@@ -43,8 +46,9 @@ export declare class ExpandNodeView implements NodeView {
     update(node: PmNode, _decorations: readonly Decoration[]): boolean;
     destroy(): void;
 }
-export default function ({ getIntl, isMobile, featureFlags, }: {
+export default function ({ getIntl, isMobile, featureFlags, api, }: {
     getIntl: () => IntlShape;
     isMobile: boolean;
     featureFlags: FeatureFlags;
+    api: ExtractInjectionAPI<typeof expandPlugin> | undefined;
 }): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;

package/dist/types-ts4.5/plugins/expand/pm-plugins/keymap.d.ts

@@ -1,2 +1,4 @@
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-export declare function expandKeymap(): SafePlugin;
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type expandPlugin from '../index';
+export declare function expandKeymap(api: ExtractInjectionAPI<typeof expandPlugin> | undefined): SafePlugin;

package/dist/types-ts4.5/plugins/expand/pm-plugins/main.d.ts

@@ -2,6 +2,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { Dispatch } from '../../../event-dispatcher';
 import type { EditorProps } from '../../../types';
 import type { IntlShape } from 'react-intl-next';
-import type { FeatureFlags } from '@atlaskit/editor-common/types';
+import type { FeatureFlags, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type expandPlugin from '../index';
 export declare function containsClass(element: Element | null, className: string): boolean;
-export declare const createPlugin: (dispatch: Dispatch, getIntl: () => IntlShape, appearance: EditorProps['appearance'], useLongPressSelection: boolean | undefined, featureFlags: FeatureFlags) => SafePlugin<import("..").ExpandPluginState>;
+export declare const createPlugin: (dispatch: Dispatch, getIntl: () => IntlShape, appearance: EditorProps['appearance'], useLongPressSelection: boolean | undefined, featureFlags: FeatureFlags, api: ExtractInjectionAPI<typeof expandPlugin> | undefined) => SafePlugin<import("../types").ExpandPluginState>;

package/dist/types-ts4.5/plugins/panel/pm-plugins/main.d.ts

@@ -1,7 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import { PanelPluginOptions } from '../types';
-import { Dispatch } from '../../../event-dispatcher';
+import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
+import type { PanelPluginOptions } from '../types';
+import type { Dispatch } from '../../../event-dispatcher';
 export type PanelOptions = {
     color?: string;
     emoji?: string;

package/dist/types-ts4.5/plugins/selection/commands.d.ts

@@ -1,8 +1,10 @@
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
-import type { Command } from '@atlaskit/editor-common/types';
+import type { Command } from '../../types';
 import { RelativeSelectionPos } from './types';
-export declare const setSelectionRelativeToNode: (selectionRelativeToNode?: RelativeSelectionPos, selection?: Selection | null) => Command;
+import type { EditorCommandWithMetadata } from '@atlaskit/editor-common/types';
+export declare const selectNearNode: EditorCommandWithMetadata;
+export declare const setSelectionRelativeToNode: (selectionRelativeToNode?: RelativeSelectionPos, selection?: Selection | null) => import("@atlaskit/editor-common/types").Command;
 export declare const arrowRight: Command;
 export declare const arrowLeft: Command;
 export declare const setSelectionInsideAtNodeEnd: (selectionRelativeToNode: RelativeSelectionPos, node: PmNode, from: number, to: number) => Command;

package/dist/types-ts4.5/plugins/selection/index.d.ts

@@ -1,10 +1,13 @@
-import type { EditorCommand, NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { EditorCommand, NextEditorPlugin, EditorCommandWithMetadata } from '@atlaskit/editor-common/types';
+import type { SelectionSharedState } from '@atlaskit/editor-common/selection';
 import type { SelectionPluginOptions } from './types';
-type SelectionPlugin = NextEditorPlugin<'selection', {
+export type SelectionPlugin = NextEditorPlugin<'selection', {
     pluginConfiguration: SelectionPluginOptions | undefined;
     commands: {
         displayGapCursor: (toggle: boolean) => EditorCommand;
+        selectNearNode: EditorCommandWithMetadata;
     };
+    sharedState: SelectionSharedState;
 }>;
 export declare const selectionPlugin: SelectionPlugin;
 export default selectionPlugin;

package/dist/types-ts4.5/plugins/selection/utils.d.ts

@@ -1,14 +1,9 @@
 import type { Transaction, ReadonlyTransaction, EditorState } from '@atlaskit/editor-prosemirror/state';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { Node as PmNode, ResolvedPos } from '@atlaskit/editor-prosemirror/model';
 import type { ContentNodeWithPos, NodeWithPos } from '@atlaskit/editor-prosemirror/utils';
-import { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload } from '@atlaskit/editor-common/selection';
-export declare function createSelectionClickHandler(nodes: string[], isValidTarget: (target: HTMLElement) => boolean, options: {
-    useLongPressSelection: boolean;
-    getNodeSelectionPos?: (state: EditorState, nodePos: number) => number;
-}): (view: EditorView, pos: number, node: PmNode, nodePos: number, event: MouseEvent, direct: boolean) => boolean;
+import { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 export declare const getDecorations: (tr: Transaction | ReadonlyTransaction) => DecorationSet;
 /**
  * Use `getNodesToDecorateFromSelection` to collect and return
@@ -60,4 +55,4 @@ export declare const findFirstChildNodeToSelect: (parent: PmNode) => NodeWithPos
 export declare const findLastChildNodeToSelect: (parent: PmNode) => NodeWithPos | undefined;
 export declare const isSelectionAtStartOfParentNode: ($pos: ResolvedPos, selection: Selection) => boolean;
 export declare const isSelectionAtEndOfParentNode: ($pos: ResolvedPos, selection: Selection) => boolean;
-export { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, };
+export { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, createSelectionClickHandler, };