@atlaskit/editor-plugin-block-controls 1.13.11 → 2.0.0

package/dist/esm/ui/drop-target.js

@@ -74,7 +74,7 @@ var getDropTargetOffsetStyle = function getDropTargetOffsetStyle(prevNode, nextN
 export var DropTarget = function DropTarget(_ref3) {
   var _dynamicStyle;
   var api = _ref3.api,
-    id = _ref3.id,
+    getPos = _ref3.getPos,
     prevNode = _ref3.prevNode,
     nextNode = _ref3.nextNode,
     parentNode = _ref3.parentNode,
@@ -106,15 +106,11 @@ export var DropTarget = function DropTarget(_ref3) {
       onDrop: function onDrop() {
         var _api$blockControls;
         var _ref4 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
-          activeNode = _ref4.activeNode,
-          decorationState = _ref4.decorationState;
-        if (!activeNode || !decorationState) {
+          activeNode = _ref4.activeNode;
+        if (!activeNode) {
           return;
         }
-        var _ref5 = decorationState.find(function (dec) {
-            return dec.id === id;
-          }) || {},
-          pos = _ref5.pos;
+        var pos = getPos();
         if (activeNode && pos !== undefined) {
           var _api$core, _api$blockControls2;
           var start = activeNode.pos;
@@ -122,7 +118,7 @@ export var DropTarget = function DropTarget(_ref3) {
         }
       }
     });
-  }, [id, api, formatMessage]);
+  }, [api, formatMessage, getPos]);
   var dropTargetOffsetStyle = useMemo(function () {
     /**
      * First child of a nested node.

package/dist/esm/utils/getSelection.js

@@ -5,17 +5,18 @@ export var getSelection = function getSelection(tr, start) {
   var isNodeSelection = node && NodeSelection.isSelectable(node);
   var nodeSize = node ? node.nodeSize : 1;
   var $startPos = tr.doc.resolve(start);
+  var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
 
   // decisionList node is not selectable, but we want to select the whole node not just text
-  if (isNodeSelection || (node === null || node === void 0 ? void 0 : node.type.name) === 'decisionList') {
+  if (isNodeSelection || nodeName === 'decisionList') {
     return new NodeSelection($startPos);
-  } else if ((node === null || node === void 0 ? void 0 : node.type.name) === 'mediaGroup' && node.childCount === 1) {
+  } else if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
     var $mediaStartPos = tr.doc.resolve(start + 1);
     return new NodeSelection($mediaStartPos);
   } else if (
   // Even though mediaGroup is not selectable,
   // we need a quick way to make all child media nodes appear as selected without the need for a custom selection
-  (node === null || node === void 0 ? void 0 : node.type.name) === 'mediaGroup') {
+  nodeName === 'mediaGroup') {
     return new NodeSelection($startPos);
   } else {
     // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
 export { blockControlsPlugin } from './plugin';
-export type { BlockControlsPlugin, DecorationState, BlockControlsSharedState, HandleOptions, MoveNodeMethod, } from './types';
+export type { BlockControlsPlugin, BlockControlsSharedState, HandleOptions, MoveNodeMethod, } from './types';

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

@@ -3,13 +3,7 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { ActiveNode, BlockControlsPlugin, HandleOptions } from '../types';
-export declare const dropTargetDecorations: (newState: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, formatMessage: IntlShape['formatMessage'], activeNode?: ActiveNode) => {
-    decs: Decoration[];
-    decorationState: {
-        id: number;
-        pos: number;
-    }[];
-};
+export declare const dropTargetDecorations: (newState: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, formatMessage: IntlShape['formatMessage'], activeNode?: ActiveNode) => Decoration[];
 export declare const emptyParagraphNodeDecorations: () => Decoration;
 export declare const nodeDecorations: (newState: EditorState) => Decoration[];
 export declare const dragHandleDecoration: (api: ExtractInjectionAPI<BlockControlsPlugin>, getIntl: () => IntlShape, pos: number, anchorName: string, nodeType: string, handleOptions?: HandleOptions) => Decoration;

package/dist/types/types.d.ts

@@ -16,13 +16,12 @@ export type ActiveNode = {
 };
 export interface PluginState {
     decorations: DecorationSet;
-    decorationState: DecorationState;
     isDragging: boolean;
     isMenuOpen?: boolean;
     editorHeight: number;
     editorWidthLeft: number;
     editorWidthRight: number;
-    activeNode: ActiveNode | null;
+    activeNode?: ActiveNode;
     isResizerResizing: boolean;
     /**
      * @private
@@ -38,8 +37,7 @@ export interface PluginState {
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsSharedState = {
     isMenuOpen: boolean;
-    activeNode: ActiveNode | null;
-    decorationState: DecorationState;
+    activeNode?: ActiveNode;
     isDragging: boolean;
     isPMDragging: boolean;
 } | undefined;
@@ -63,13 +61,9 @@ export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
     commands: {
         moveNode: (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape['formatMessage']) => EditorCommand;
         showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: HandleOptions) => EditorCommand;
-        setNodeDragged: (posNumber: number, anchorName: string, nodeType: string) => EditorCommand;
+        setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => EditorCommand;
     };
 }>;
-export type DecorationState = {
-    id: number;
-    pos: number;
-}[];
 export type BlockControlsMeta = {
     activeNode: ActiveNode;
     type: string;

package/dist/types/ui/drop-target.d.ts

@@ -5,10 +5,10 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { BlockControlsPlugin } from '../types';
 export type DropTargetProps = {
     api: ExtractInjectionAPI<BlockControlsPlugin> | undefined;
-    id: number;
+    getPos: () => number | undefined;
     prevNode?: PMNode;
     nextNode?: PMNode;
     parentNode?: PMNode;
     formatMessage?: IntlShape['formatMessage'];
 };
-export declare const DropTarget: ({ api, id, prevNode, nextNode, parentNode, formatMessage, }: DropTargetProps) => jsx.JSX.Element;
+export declare const DropTarget: ({ api, getPos, prevNode, nextNode, parentNode, formatMessage, }: DropTargetProps) => jsx.JSX.Element;

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

@@ -1,2 +1,2 @@
 export { blockControlsPlugin } from './plugin';
-export type { BlockControlsPlugin, DecorationState, BlockControlsSharedState, HandleOptions, MoveNodeMethod, } from './types';
+export type { BlockControlsPlugin, BlockControlsSharedState, HandleOptions, MoveNodeMethod, } from './types';

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

@@ -3,13 +3,7 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { ActiveNode, BlockControlsPlugin, HandleOptions } from '../types';
-export declare const dropTargetDecorations: (newState: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, formatMessage: IntlShape['formatMessage'], activeNode?: ActiveNode) => {
-    decs: Decoration[];
-    decorationState: {
-        id: number;
-        pos: number;
-    }[];
-};
+export declare const dropTargetDecorations: (newState: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, formatMessage: IntlShape['formatMessage'], activeNode?: ActiveNode) => Decoration[];
 export declare const emptyParagraphNodeDecorations: () => Decoration;
 export declare const nodeDecorations: (newState: EditorState) => Decoration[];
 export declare const dragHandleDecoration: (api: ExtractInjectionAPI<BlockControlsPlugin>, getIntl: () => IntlShape, pos: number, anchorName: string, nodeType: string, handleOptions?: HandleOptions) => Decoration;

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

@@ -16,13 +16,12 @@ export type ActiveNode = {
 };
 export interface PluginState {
     decorations: DecorationSet;
-    decorationState: DecorationState;
     isDragging: boolean;
     isMenuOpen?: boolean;
     editorHeight: number;
     editorWidthLeft: number;
     editorWidthRight: number;
-    activeNode: ActiveNode | null;
+    activeNode?: ActiveNode;
     isResizerResizing: boolean;
     /**
      * @private
@@ -38,8 +37,7 @@ export interface PluginState {
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsSharedState = {
     isMenuOpen: boolean;
-    activeNode: ActiveNode | null;
-    decorationState: DecorationState;
+    activeNode?: ActiveNode;
     isDragging: boolean;
     isPMDragging: boolean;
 } | undefined;
@@ -63,13 +61,9 @@ export type BlockControlsPlugin = NextEditorPlugin<'blockControls', {
     commands: {
         moveNode: (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape['formatMessage']) => EditorCommand;
         showDragHandleAt: (pos: number, anchorName: string, nodeType: string, handleOptions?: HandleOptions) => EditorCommand;
-        setNodeDragged: (posNumber: number, anchorName: string, nodeType: string) => EditorCommand;
+        setNodeDragged: (getPos: () => number | undefined, anchorName: string, nodeType: string) => EditorCommand;
     };
 }>;
-export type DecorationState = {
-    id: number;
-    pos: number;
-}[];
 export type BlockControlsMeta = {
     activeNode: ActiveNode;
     type: string;

package/dist/types-ts4.5/ui/drop-target.d.ts

@@ -5,10 +5,10 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { BlockControlsPlugin } from '../types';
 export type DropTargetProps = {
     api: ExtractInjectionAPI<BlockControlsPlugin> | undefined;
-    id: number;
+    getPos: () => number | undefined;
     prevNode?: PMNode;
     nextNode?: PMNode;
     parentNode?: PMNode;
     formatMessage?: IntlShape['formatMessage'];
 };
-export declare const DropTarget: ({ api, id, prevNode, nextNode, parentNode, formatMessage, }: DropTargetProps) => jsx.JSX.Element;
+export declare const DropTarget: ({ api, getPos, prevNode, nextNode, parentNode, formatMessage, }: DropTargetProps) => jsx.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "1.13.11",
+	"version": "2.0.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/primitives": "^12.1.0",
 		"@atlaskit/theme": "^13.0.0",
 		"@atlaskit/tmp-editor-statsig": "^2.1.0",
-		"@atlaskit/tokens": "^1.59.0",
+		"@atlaskit/tokens": "^1.60.0",
 		"@atlaskit/tooltip": "^18.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -128,6 +128,9 @@
 		},
 		"platform_editor_element_drag_and_drop_debug": {
 			"type": "boolean"
+		},
+		"platform_editor_element_drag_and_drop_ed_24885": {
+			"type": "boolean"
 		}
 	}
 }