@atlaskit/editor-plugin-block-controls 4.1.12 → 4.2.1

package/dist/esm/pm-plugins/utils/getNestedNodePosition.js

@@ -1,15 +1,17 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-export var getNestedNodePosition = function getNestedNodePosition(state) {
-  var selection = state.selection;
+export var getNestedNodePosition = function getNestedNodePosition(_ref) {
+  var selection = _ref.selection,
+    schema = _ref.schema,
+    resolve = _ref.resolve;
   var nestedNodePos = selection.$from.before(1);
   if (selection instanceof TextSelection) {
     nestedNodePos = selection.$from.before();
-    var $pos = state.doc.resolve(nestedNodePos);
+    var $pos = resolve(nestedNodePos);
     if ($pos.depth < 1) {
       return nestedNodePos;
     }
-    var parentNodeOfSpecificTypes = findParentNodeOfType([state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.blockquote, state.schema.nodes.taskList, state.schema.nodes.decisionList])(state.selection);
+    var parentNodeOfSpecificTypes = findParentNodeOfType([schema.nodes.bulletList, schema.nodes.orderedList, schema.nodes.blockquote, schema.nodes.taskList, schema.nodes.decisionList])(selection);
     if (parentNodeOfSpecificTypes) {
       var parentNodeType = parentNodeOfSpecificTypes.node.type.name;
       nestedNodePos = ['bulletList', 'orderedList'].includes(parentNodeType) ? $pos.before($pos.depth - 1) : ['blockquote', 'taskList', 'decisionList'].includes(parentNodeType) ? $pos.before() : nestedNodePos;

package/dist/esm/ui/block-menu-items.js

@@ -8,13 +8,13 @@
 import { jsx } from '@emotion/react';
 import { dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, tooltip } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
+import { DIRECTION } from '@atlaskit/editor-common/types';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 import ArrowDownIcon from '@atlaskit/icon/core/arrow-down';
 import ArrowLeftIcon from '@atlaskit/icon/core/arrow-left';
 import ArrowRightnIcon from '@atlaskit/icon/core/arrow-right';
 import ArrowUpIcon from '@atlaskit/icon/core/arrow-up';
 import { moveNodeViaShortcut } from '../editor-commands/move-node';
-import { DIRECTION } from '../pm-plugins/utils/consts';
 export var getBlockMenuItems = function getBlockMenuItems(formatMessage) {
   return [{
     items: [{

package/dist/types/blockControlsPluginType.d.ts

@@ -1,6 +1,6 @@
 import { type IntlShape } from 'react-intl-next';
 import { type INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { EditorCommand, NextEditorPlugin, OptionalPlugin, DIRECTION } from '@atlaskit/editor-common/types';
 import type { AccessibilityUtilsPlugin } from '@atlaskit/editor-plugin-accessibility-utils';
 import { type AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
@@ -40,6 +40,10 @@ export interface PluginState {
     isDragging: boolean;
     isMenuOpen?: boolean;
     menuTriggerBy?: string;
+    blockMenuOptions?: {
+        canMoveUp?: boolean;
+        canMoveDown?: boolean;
+    };
     editorHeight: number;
     editorWidthLeft: number;
     editorWidthRight: number;
@@ -64,6 +68,10 @@ export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsSharedState = {
     isMenuOpen: boolean;
     menuTriggerBy?: string;
+    blockMenuOptions?: {
+        canMoveUp?: boolean;
+        canMoveDown?: boolean;
+    };
     activeNode?: ActiveNode;
     activeDropTargetNode?: ActiveDropTargetNode;
     isDragging: boolean;
@@ -118,6 +126,7 @@ export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
         setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => EditorCommand;
         setMultiSelectPositions: (anchor?: number, head?: number) => EditorCommand;
         setSelectedViaDragHandle: (isSelectedViaDragHandle?: boolean) => EditorCommand;
+        moveNodeWithBlockMenu: (direction: DIRECTION.UP | DIRECTION.DOWN) => EditorCommand;
     };
 }>;
 export type BlockControlsMeta = {
@@ -128,4 +137,4 @@ export type BlockControlsMeta = {
     nodeMoved: boolean;
     editorBlurred: boolean;
 };
-export type MoveNodeMethod = INPUT_METHOD.DRAG_AND_DROP | INPUT_METHOD.SHORTCUT;
+export type MoveNodeMethod = INPUT_METHOD.DRAG_AND_DROP | INPUT_METHOD.SHORTCUT | INPUT_METHOD.BLOCK_MENU;

package/dist/types/editor-commands/move-node-with-block-menu.d.ts

@@ -0,0 +1,4 @@
+import type { EditorCommand, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { DIRECTION } from '@atlaskit/editor-common/types';
+import type { BlockControlsPlugin } from '../blockControlsPluginType';
+export declare const moveNodeWithBlockMenu: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, direction: DIRECTION.UP | DIRECTION.DOWN) => EditorCommand;

package/dist/types/editor-commands/move-node.d.ts

@@ -1,6 +1,6 @@
 import { type IntlShape } from 'react-intl-next';
 import type { Command, EditorCommand, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { DIRECTION } from '@atlaskit/editor-common/types';
 import type { BlockControlsPlugin, MoveNodeMethod } from '../blockControlsPluginType';
-import { DIRECTION } from '../pm-plugins/utils/consts';
 export declare const moveNodeViaShortcut: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, direction: DIRECTION, formatMessage?: IntlShape["formatMessage"]) => Command;
 export declare const moveNode: (api?: ExtractInjectionAPI<BlockControlsPlugin>) => (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape["formatMessage"]) => EditorCommand;

package/dist/types/editor-commands/utils/move-node-utils.d.ts

@@ -0,0 +1,23 @@
+import type { ResolvedPos, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type Selection } from '@atlaskit/editor-prosemirror/state';
+export declare const getCurrentNodePosFromDragHandleSelection: ({ selection, schema, resolve, }: {
+    selection: Selection;
+    schema: Schema;
+    resolve: (pos: number) => ResolvedPos;
+}) => number;
+export declare const getPosWhenMoveNodeUp: ($currentNodePos: ResolvedPos, currentNodePos: number) => number;
+export declare const getPosWhenMoveNodeDown: ({ $currentNodePos, nodeAfterPos, tr, }: {
+    $currentNodePos: ResolvedPos;
+    nodeAfterPos: number;
+    tr: Transaction;
+}) => number;
+export declare const getShouldMoveNode: ({ currentNodePos, moveToPos, tr, }: {
+    currentNodePos: number;
+    moveToPos: number;
+    tr: Transaction;
+}) => boolean;
+export declare const canMoveNodeUpOrDown: (tr: Transaction) => {
+    moveUp: boolean;
+    moveDown: boolean;
+};

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

@@ -19,6 +19,10 @@ export declare const apply: (api: ExtractInjectionAPI<BlockControlsPlugin> | und
     isDragging: any;
     isMenuOpen: boolean | undefined;
     menuTriggerBy: any;
+    blockMenuOptions: {
+        canMoveUp: any;
+        canMoveDown: any;
+    } | undefined;
     editorHeight: any;
     editorWidthLeft: any;
     editorWidthRight: any;
@@ -37,6 +41,10 @@ export declare const createPlugin: (api: ExtractInjectionAPI<BlockControlsPlugin
     isDragging: any;
     isMenuOpen: boolean | undefined;
     menuTriggerBy: any;
+    blockMenuOptions: {
+        canMoveUp: any;
+        canMoveDown: any;
+    } | undefined;
     editorHeight: any;
     editorWidthLeft: any;
     editorWidthRight: any;

package/dist/types/pm-plugins/utils/consts.d.ts

@@ -1,8 +1,2 @@
-export declare enum DIRECTION {
-    UP = "up",
-    DOWN = "down",
-    LEFT = "left",
-    RIGHT = "right"
-}
 export declare const maxLayoutColumnSupported: () => 3 | 5;
 export declare const MIN_LAYOUT_COLUMN = 2;

package/dist/types/pm-plugins/utils/getNestedNodePosition.d.ts

@@ -1,2 +1,7 @@
-import { type EditorState } from '@atlaskit/editor-prosemirror/state';
-export declare const getNestedNodePosition: (state: EditorState) => number;
+import type { ResolvedPos, Schema } from '@atlaskit/editor-prosemirror/model';
+import { type Selection } from '@atlaskit/editor-prosemirror/state';
+export declare const getNestedNodePosition: ({ selection, schema, resolve, }: {
+    selection: Selection;
+    schema: Schema;
+    resolve: (pos: number) => ResolvedPos;
+}) => number;

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

@@ -1,6 +1,6 @@
 import { type IntlShape } from 'react-intl-next';
 import { type INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { EditorCommand, NextEditorPlugin, OptionalPlugin, DIRECTION } from '@atlaskit/editor-common/types';
 import type { AccessibilityUtilsPlugin } from '@atlaskit/editor-plugin-accessibility-utils';
 import { type AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
@@ -40,6 +40,10 @@ export interface PluginState {
     isDragging: boolean;
     isMenuOpen?: boolean;
     menuTriggerBy?: string;
+    blockMenuOptions?: {
+        canMoveUp?: boolean;
+        canMoveDown?: boolean;
+    };
     editorHeight: number;
     editorWidthLeft: number;
     editorWidthRight: number;
@@ -64,6 +68,10 @@ export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsSharedState = {
     isMenuOpen: boolean;
     menuTriggerBy?: string;
+    blockMenuOptions?: {
+        canMoveUp?: boolean;
+        canMoveDown?: boolean;
+    };
     activeNode?: ActiveNode;
     activeDropTargetNode?: ActiveDropTargetNode;
     isDragging: boolean;
@@ -118,6 +126,7 @@ export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
         setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => EditorCommand;
         setMultiSelectPositions: (anchor?: number, head?: number) => EditorCommand;
         setSelectedViaDragHandle: (isSelectedViaDragHandle?: boolean) => EditorCommand;
+        moveNodeWithBlockMenu: (direction: DIRECTION.UP | DIRECTION.DOWN) => EditorCommand;
     };
 }>;
 export type BlockControlsMeta = {
@@ -128,4 +137,4 @@ export type BlockControlsMeta = {
     nodeMoved: boolean;
     editorBlurred: boolean;
 };
-export type MoveNodeMethod = INPUT_METHOD.DRAG_AND_DROP | INPUT_METHOD.SHORTCUT;
+export type MoveNodeMethod = INPUT_METHOD.DRAG_AND_DROP | INPUT_METHOD.SHORTCUT | INPUT_METHOD.BLOCK_MENU;

package/dist/types-ts4.5/editor-commands/move-node-with-block-menu.d.ts

@@ -0,0 +1,4 @@
+import type { EditorCommand, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { DIRECTION } from '@atlaskit/editor-common/types';
+import type { BlockControlsPlugin } from '../blockControlsPluginType';
+export declare const moveNodeWithBlockMenu: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, direction: DIRECTION.UP | DIRECTION.DOWN) => EditorCommand;

package/dist/types-ts4.5/editor-commands/move-node.d.ts

@@ -1,6 +1,6 @@
 import { type IntlShape } from 'react-intl-next';
 import type { Command, EditorCommand, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { DIRECTION } from '@atlaskit/editor-common/types';
 import type { BlockControlsPlugin, MoveNodeMethod } from '../blockControlsPluginType';
-import { DIRECTION } from '../pm-plugins/utils/consts';
 export declare const moveNodeViaShortcut: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, direction: DIRECTION, formatMessage?: IntlShape["formatMessage"]) => Command;
 export declare const moveNode: (api?: ExtractInjectionAPI<BlockControlsPlugin>) => (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape["formatMessage"]) => EditorCommand;

package/dist/types-ts4.5/editor-commands/utils/move-node-utils.d.ts

@@ -0,0 +1,23 @@
+import type { ResolvedPos, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type Selection } from '@atlaskit/editor-prosemirror/state';
+export declare const getCurrentNodePosFromDragHandleSelection: ({ selection, schema, resolve, }: {
+    selection: Selection;
+    schema: Schema;
+    resolve: (pos: number) => ResolvedPos;
+}) => number;
+export declare const getPosWhenMoveNodeUp: ($currentNodePos: ResolvedPos, currentNodePos: number) => number;
+export declare const getPosWhenMoveNodeDown: ({ $currentNodePos, nodeAfterPos, tr, }: {
+    $currentNodePos: ResolvedPos;
+    nodeAfterPos: number;
+    tr: Transaction;
+}) => number;
+export declare const getShouldMoveNode: ({ currentNodePos, moveToPos, tr, }: {
+    currentNodePos: number;
+    moveToPos: number;
+    tr: Transaction;
+}) => boolean;
+export declare const canMoveNodeUpOrDown: (tr: Transaction) => {
+    moveUp: boolean;
+    moveDown: boolean;
+};

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

@@ -19,6 +19,10 @@ export declare const apply: (api: ExtractInjectionAPI<BlockControlsPlugin> | und
     isDragging: any;
     isMenuOpen: boolean | undefined;
     menuTriggerBy: any;
+    blockMenuOptions: {
+        canMoveUp: any;
+        canMoveDown: any;
+    } | undefined;
     editorHeight: any;
     editorWidthLeft: any;
     editorWidthRight: any;
@@ -37,6 +41,10 @@ export declare const createPlugin: (api: ExtractInjectionAPI<BlockControlsPlugin
     isDragging: any;
     isMenuOpen: boolean | undefined;
     menuTriggerBy: any;
+    blockMenuOptions: {
+        canMoveUp: any;
+        canMoveDown: any;
+    } | undefined;
     editorHeight: any;
     editorWidthLeft: any;
     editorWidthRight: any;

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

@@ -1,8 +1,2 @@
-export declare enum DIRECTION {
-    UP = "up",
-    DOWN = "down",
-    LEFT = "left",
-    RIGHT = "right"
-}
 export declare const maxLayoutColumnSupported: () => 3 | 5;
 export declare const MIN_LAYOUT_COLUMN = 2;

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

@@ -1,2 +1,7 @@
-import { type EditorState } from '@atlaskit/editor-prosemirror/state';
-export declare const getNestedNodePosition: (state: EditorState) => number;
+import type { ResolvedPos, Schema } from '@atlaskit/editor-prosemirror/model';
+import { type Selection } from '@atlaskit/editor-prosemirror/state';
+export declare const getNestedNodePosition: ({ selection, schema, resolve, }: {
+    selection: Selection;
+    schema: Schema;
+    resolve: (pos: number) => ResolvedPos;
+}) => number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "4.1.12",
+	"version": "4.2.1",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^50.2.0",
+		"@atlaskit/adf-schema": "^50.2.1",
 		"@atlaskit/editor-plugin-accessibility-utils": "^3.0.0",
 		"@atlaskit/editor-plugin-analytics": "^3.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^3.0.0",
@@ -40,7 +40,7 @@
 		"@atlaskit/editor-plugin-limited-mode": "^0.0.3",
 		"@atlaskit/editor-plugin-metrics": "^4.0.0",
 		"@atlaskit/editor-plugin-quick-insert": "^3.0.0",
-		"@atlaskit/editor-plugin-selection": "^3.0.0",
+		"@atlaskit/editor-plugin-selection": "^3.1.0",
 		"@atlaskit/editor-plugin-type-ahead": "^3.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^1.1.0",
 		"@atlaskit/editor-plugin-width": "^4.0.0",
@@ -55,7 +55,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^14.11.0",
 		"@atlaskit/theme": "^19.0.0",
-		"@atlaskit/tmp-editor-statsig": "^11.1.0",
+		"@atlaskit/tmp-editor-statsig": "^11.3.0",
 		"@atlaskit/tokens": "^6.0.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.25.0",
+		"@atlaskit/editor-common": "^107.26.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"