@atlaskit/editor-plugin-block-controls 2.2.1 → 2.3.0

package/dist/esm/utils/getSelection.js

@@ -1,5 +1,28 @@
+import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
+export var getInlineNodePos = function getInlineNodePos(tr, start, nodeSize) {
+  var $startPos = tr.doc.resolve(start);
+  // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
+  // Find the first inline node in the node
+  var inlineNodePos = start;
+  var foundInlineNode = false;
+  var inlineNodeEndPos = 0;
+  tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n, pos) {
+    if (n.isInline) {
+      inlineNodeEndPos = pos + n.nodeSize;
+    }
+    if (n.isInline && !foundInlineNode) {
+      inlineNodePos = pos;
+      foundInlineNode = true;
+    }
+    return true;
+  });
+  return {
+    inlineNodePos: inlineNodePos,
+    inlineNodeEndPos: inlineNodeEndPos
+  };
+};
 export var getSelection = function getSelection(tr, start) {
   var node = tr.doc.nodeAt(start);
   var isNodeSelection = node && NodeSelection.isSelectable(node);
@@ -19,21 +42,9 @@ export var getSelection = function getSelection(tr, start) {
   nodeName === 'mediaGroup') {
     return new NodeSelection($startPos);
   } else {
-    // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
-    // Find the first inline node in the node
-    var inlineNodePos = start;
-    var foundInlineNode = false;
-    var inlineNodeEndPos = 0;
-    tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n, pos) {
-      if (n.isInline) {
-        inlineNodeEndPos = pos + n.nodeSize;
-      }
-      if (n.isInline && !foundInlineNode) {
-        inlineNodePos = pos;
-        foundInlineNode = true;
-      }
-      return true;
-    });
+    var _getInlineNodePos = getInlineNodePos(tr, start, nodeSize),
+      inlineNodePos = _getInlineNodePos.inlineNodePos,
+      inlineNodeEndPos = _getInlineNodePos.inlineNodeEndPos;
     return new TextSelection(tr.doc.resolve(inlineNodeEndPos), tr.doc.resolve(inlineNodePos));
   }
 };
@@ -45,4 +56,20 @@ export var selectNode = function selectNode(tr, start, nodeType) {
     tr.setSelection(getSelection(tr, start));
   }
   return tr;
+};
+export var setCursorPositionAtMovedNode = function setCursorPositionAtMovedNode(tr, start) {
+  var node = tr.doc.nodeAt(start);
+  var isNodeSelection = node && NodeSelection.isSelectable(node);
+  var nodeSize = node ? node.nodeSize : 1;
+  var selection;
+  // 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') {
+    selection = new GapCursorSelection(tr.doc.resolve(start + node.nodeSize), Side.RIGHT);
+  } else {
+    var _getInlineNodePos2 = getInlineNodePos(tr, start, nodeSize),
+      inlineNodeEndPos = _getInlineNodePos2.inlineNodeEndPos;
+    selection = new TextSelection(tr.doc.resolve(inlineNodeEndPos));
+  }
+  tr.setSelection(selection);
+  return tr;
 };

package/dist/esm/utils/index.js

@@ -1,2 +1,2 @@
-export { getSelection, selectNode } from './getSelection';
+export { getInlineNodePos, getSelection, selectNode, setCursorPositionAtMovedNode } from './getSelection';
 export { getNestedNodePosition } from './getNestedNodePosition';

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

@@ -1,9 +1,14 @@
 import { type IntlShape } from 'react-intl-next';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 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) => Decoration[];
+import { type DropTargetProps } from '../ui/drop-target';
+import { type AnchorHeightsCache } from '../utils/anchor-utils';
+export declare const getNodeAnchor: (node: PMNode) => string;
+export declare const createDropTargetDecoration: (pos: number, props: Omit<DropTargetProps, 'getPos'>, side?: number, anchorHeightsCache?: AnchorHeightsCache) => Decoration;
+export declare const dropTargetDecorations: (newState: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, formatMessage: IntlShape['formatMessage'], activeNode?: ActiveNode, anchorHeightsCache?: AnchorHeightsCache) => 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/ui/drop-target-v2.d.ts

@@ -0,0 +1,8 @@
+import { jsx } from '@emotion/react';
+import { type AnchorHeightsCache } from '../utils/anchor-utils';
+import { type DropTargetProps } from './drop-target';
+export declare const EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET = "--editor-block-controls-drop-indicator-offset";
+export declare const EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP = "--editor-block-controls-drop-indicator-gap";
+export declare const DropTargetV2: ({ api, getPos, prevNode, nextNode, parentNode, formatMessage, anchorHeightsCache, }: DropTargetProps & {
+    anchorHeightsCache?: AnchorHeightsCache | undefined;
+}) => jsx.JSX.Element;

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

@@ -0,0 +1,12 @@
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+export declare const isAnchorSupported: import("memoize-one").MemoizedFn<() => boolean>;
+export declare class AnchorHeightsCache {
+    private anchorHeightsMap;
+    private isAnchorSupported;
+    private isDirty;
+    private view;
+    clear(): void;
+    private getHeights;
+    setEditorView(view: EditorView): void;
+    getHeight(anchorName: string): number | null;
+}

package/dist/types/utils/getSelection.d.ts

@@ -1,3 +1,8 @@
 import { NodeSelection, TextSelection, type Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const getInlineNodePos: (tr: Transaction, start: number, nodeSize: number) => {
+    inlineNodePos: number;
+    inlineNodeEndPos: number;
+};
 export declare const getSelection: (tr: Transaction, start: number) => NodeSelection | TextSelection;
 export declare const selectNode: (tr: Transaction, start: number, nodeType: string) => Transaction;
+export declare const setCursorPositionAtMovedNode: (tr: Transaction, start: number) => Transaction;

package/dist/types/utils/index.d.ts

@@ -1,2 +1,2 @@
-export { getSelection, selectNode } from './getSelection';
+export { getInlineNodePos, getSelection, selectNode, setCursorPositionAtMovedNode, } from './getSelection';
 export { getNestedNodePosition } from './getNestedNodePosition';

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

@@ -1,9 +1,14 @@
 import { type IntlShape } from 'react-intl-next';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 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) => Decoration[];
+import { type DropTargetProps } from '../ui/drop-target';
+import { type AnchorHeightsCache } from '../utils/anchor-utils';
+export declare const getNodeAnchor: (node: PMNode) => string;
+export declare const createDropTargetDecoration: (pos: number, props: Omit<DropTargetProps, 'getPos'>, side?: number, anchorHeightsCache?: AnchorHeightsCache) => Decoration;
+export declare const dropTargetDecorations: (newState: EditorState, api: ExtractInjectionAPI<BlockControlsPlugin>, formatMessage: IntlShape['formatMessage'], activeNode?: ActiveNode, anchorHeightsCache?: AnchorHeightsCache) => 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/ui/drop-target-v2.d.ts

@@ -0,0 +1,8 @@
+import { jsx } from '@emotion/react';
+import { type AnchorHeightsCache } from '../utils/anchor-utils';
+import { type DropTargetProps } from './drop-target';
+export declare const EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_OFFSET = "--editor-block-controls-drop-indicator-offset";
+export declare const EDITOR_BLOCK_CONTROLS_DROP_INDICATOR_GAP = "--editor-block-controls-drop-indicator-gap";
+export declare const DropTargetV2: ({ api, getPos, prevNode, nextNode, parentNode, formatMessage, anchorHeightsCache, }: DropTargetProps & {
+    anchorHeightsCache?: AnchorHeightsCache | undefined;
+}) => jsx.JSX.Element;

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

@@ -0,0 +1,12 @@
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+export declare const isAnchorSupported: import("memoize-one").MemoizedFn<() => boolean>;
+export declare class AnchorHeightsCache {
+    private anchorHeightsMap;
+    private isAnchorSupported;
+    private isDirty;
+    private view;
+    clear(): void;
+    private getHeights;
+    setEditorView(view: EditorView): void;
+    getHeight(anchorName: string): number | null;
+}

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

@@ -1,3 +1,8 @@
 import { NodeSelection, TextSelection, type Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const getInlineNodePos: (tr: Transaction, start: number, nodeSize: number) => {
+    inlineNodePos: number;
+    inlineNodeEndPos: number;
+};
 export declare const getSelection: (tr: Transaction, start: number) => NodeSelection | TextSelection;
 export declare const selectNode: (tr: Transaction, start: number, nodeType: string) => Transaction;
+export declare const setCursorPositionAtMovedNode: (tr: Transaction, start: number) => Transaction;

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

@@ -1,2 +1,2 @@
-export { getSelection, selectNode } from './getSelection';
+export { getInlineNodePos, getSelection, selectNode, setCursorPositionAtMovedNode, } from './getSelection';
 export { getNestedNodePosition } from './getNestedNodePosition';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.2.1",
+	"version": "2.3.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
-		"@atlaskit/editor-common": "^93.1.0",
+		"@atlaskit/editor-common": "^93.2.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -43,7 +43,7 @@
 		"@atlaskit/editor-tables": "^2.8.0",
 		"@atlaskit/icon": "^22.22.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/pragmatic-drag-and-drop": "^1.3.0",
+		"@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.4.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/primitives": "^12.2.0",
@@ -150,6 +150,9 @@
 		},
 		"platform_editor_element_dnd_nested_a11y": {
 			"type": "boolean"
+		},
+		"platform_editor_drag_and_drop_target_v2": {
+			"type": "boolean"
 		}
 	}
 }