@atlaskit/editor-plugin-block-controls 2.15.1 → 2.15.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.15.3
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.15.2
+
+### Patch Changes
+
+- [#176596](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/176596)
+  [`86e9b63cc47f0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/86e9b63cc47f0) -
+  Remove internal re-exports
+- Updated dependencies
+
 ## 2.15.1
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -10,7 +10,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _moveNode = require("./editor-commands/move-node");
 var _moveToLayout = require("./editor-commands/move-to-layout");
 var _main = require("./pm-plugins/main");
-var _utils = require("./pm-plugins/utils");
+var _getSelection = require("./pm-plugins/utils/getSelection");
 var _dragHandleMenu = require("./ui/drag-handle-menu");
 var _globalStyles = require("./ui/global-styles");
 var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPlugin(_ref) {
@@ -52,7 +52,7 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
             return tr;
           }
           if (!(0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24885')) {
-            tr = (0, _utils.selectNode)(tr, pos, nodeType);
+            tr = (0, _getSelection.selectNode)(tr, pos, nodeType);
           }
           tr.setMeta(_main.key, {
             isDragging: true,

package/dist/cjs/editor-commands/move-node.js

@@ -18,9 +18,9 @@ var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _main = require("../pm-plugins/main");
-var _utils4 = require("../pm-plugins/utils");
 var _consts = require("../pm-plugins/utils/consts");
 var _fireAnalytics = require("../pm-plugins/utils/fire-analytics");
+var _getNestedNodePosition = require("../pm-plugins/utils/getNestedNodePosition");
 var _getSelection = require("../pm-plugins/utils/getSelection");
 var _removeFromSource = require("../pm-plugins/utils/remove-from-source");
 var _validation = require("../pm-plugins/utils/validation");
@@ -79,7 +79,7 @@ var getCurrentNodePos = function getCurrentNodePos(state, isParentNodeOfTypeLayo
     // 3. the start of the selection is inside the node
     currentNodePos = selection.$from.before(1);
     if (selection.$from.depth > 0 && (0, _experiments.editorExperiment)('nested-dnd', true) && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_a11y')) {
-      currentNodePos = (0, _utils4.getNestedNodePosition)(state);
+      currentNodePos = (0, _getNestedNodePosition.getNestedNodePosition)(state);
     }
   }
   return currentNodePos;
@@ -146,7 +146,7 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
         // If the node is first/last one, only select the node
         api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref3) {
           var tr = _ref3.tr;
-          (0, _utils4.selectNode)(tr, currentNodePos, nodeType);
+          (0, _getSelection.selectNode)(tr, currentNodePos, nodeType);
           tr.scrollIntoView();
           return tr;
         });
@@ -212,7 +212,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
         mappedTo = tr.mapping.map(to);
         tr.insert(mappedTo, _nodeCopy); // insert the content at the new position
       }
-      tr = inputMethod === _analytics.INPUT_METHOD.DRAG_AND_DROP && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_2') ? (0, _getSelection.setCursorPositionAtMovedNode)(tr, mappedTo) : (0, _utils4.selectNode)(tr, mappedTo, node.type.name);
+      tr = inputMethod === _analytics.INPUT_METHOD.DRAG_AND_DROP && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_fix_patch_2') ? (0, _getSelection.setCursorPositionAtMovedNode)(tr, mappedTo) : (0, _getSelection.selectNode)(tr, mappedTo, node.type.name);
       tr.setMeta(_main.key, {
         nodeMoved: true
       });

package/dist/cjs/editor-commands/show-drag-handle.js

@@ -8,7 +8,7 @@ var _utils = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _main = require("../pm-plugins/main");
-var _utils2 = require("../pm-plugins/utils");
+var _getNestedNodePosition = require("../pm-plugins/utils/getNestedNodePosition");
 var showDragHandleAtSelection = exports.showDragHandleAtSelection = function showDragHandleAtSelection(api, shouldFocusParentNode) {
   return function (state, _, view) {
     var $from = state.selection.$from;
@@ -20,7 +20,7 @@ var showDragHandleAtSelection = exports.showDragHandleAtSelection = function sho
 
       // if the node is already focused, pressing the keymap second times should focus the parent node
       shouldFocusParentNode = activeNode && ((_activeNode$handleOpt = activeNode.handleOptions) === null || _activeNode$handleOpt === void 0 ? void 0 : _activeNode$handleOpt.isFocused);
-      var parentPos = (0, _utils.isInTable)(state) ? $from.before(1) : shouldFocusParentNode ? $from.before(1) : (0, _utils2.getNestedNodePosition)(state) + 1;
+      var parentPos = (0, _utils.isInTable)(state) ? $from.before(1) : shouldFocusParentNode ? $from.before(1) : (0, _getNestedNodePosition.getNestedNodePosition)(state) + 1;
       var parentElement = view === null || view === void 0 || (_view$domAtPos = view.domAtPos(parentPos, 0)) === null || _view$domAtPos === void 0 ? void 0 : _view$domAtPos.node;
       if (parentElement) {
         var anchorName = parentElement.getAttribute('data-drag-handler-anchor-name');

package/dist/cjs/ui/drag-handle.js

@@ -22,8 +22,9 @@ var _setCustomNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/ele
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _main = require("../pm-plugins/main");
-var _utils = require("../pm-plugins/utils");
 var _dragHandlePositions = require("../pm-plugins/utils/drag-handle-positions");
+var _getNestedNodePosition = require("../pm-plugins/utils/getNestedNodePosition");
+var _getSelection = require("../pm-plugins/utils/getSelection");
 var _consts = require("./consts");
 var _dragPreview = require("./drag-preview");
 /**
@@ -122,7 +123,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       if (startPos === undefined) {
         return tr;
       }
-      tr = (0, _utils.selectNode)(tr, startPos, nodeType);
+      tr = (0, _getSelection.selectNode)(tr, startPos, nodeType);
       var resolvedMovingNode = tr.doc.resolve(startPos);
       var maybeNode = resolvedMovingNode.nodeAfter;
       tr.setMeta('scrollIntoView', false);
@@ -401,7 +402,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   }];
   var isParentNodeOfTypeLayout;
   if (!isTopLevelNode && handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && (0, _experiments.editorExperiment)('nested-dnd', true) && (0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_a11y')) {
-    isParentNodeOfTypeLayout = nodeType === 'layoutSection' || view.state.doc.resolve((0, _utils.getNestedNodePosition)(view.state)).node().type.name === 'layoutColumn';
+    isParentNodeOfTypeLayout = nodeType === 'layoutSection' || view.state.doc.resolve((0, _getNestedNodePosition.getNestedNodePosition)(view.state)).node().type.name === 'layoutColumn';
     if (isParentNodeOfTypeLayout) {
       helpDescriptors = [].concat((0, _toConsumableArray2.default)(helpDescriptors), [{
         description: formatMessage(_messages.blockControlsMessages.moveLeft),

package/dist/cjs/ui/drag-preview.js

@@ -8,10 +8,12 @@ var _browser = require("@atlaskit/editor-common/browser");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
 var previewStyle = {
+  // eslint-disable-next-line @atlaskit/platform/no-module-level-eval
   borderColor: (0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23189') ? "var(--ds-border, ".concat(_colors.N30, ")") : "var(--ds-border-focused, ".concat(_colors.B200, ")"),
   borderStyle: 'solid',
   borderRadius: "var(--ds-border-radius-100, 3px)",
   borderWidth: "var(--ds-border-width-outline, 2px)",
+  // eslint-disable-next-line @atlaskit/platform/no-module-level-eval
   backgroundColor: (0, _platformFeatureFlags.fg)('platform_editor_elements_drag_and_drop_ed_23189') ? "var(--ds-skeleton-subtle, ".concat(_colors.N20, ")") : "var(--ds-blanket-selected, #388BFF14)"
 };
 var dragPreview = exports.dragPreview = function dragPreview(container, dom, nodeType) {

package/dist/es2019/blockControlsPlugin.js

@@ -3,7 +3,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { moveNode } from './editor-commands/move-node';
 import { moveToLayout } from './editor-commands/move-to-layout';
 import { createPlugin, key } from './pm-plugins/main';
-import { selectNode } from './pm-plugins/utils';
+import { selectNode } from './pm-plugins/utils/getSelection';
 import { DragHandleMenu } from './ui/drag-handle-menu';
 import { GlobalStylesWrapper } from './ui/global-styles';
 export const blockControlsPlugin = ({

package/dist/es2019/editor-commands/move-node.js

@@ -10,10 +10,10 @@ import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/u
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
-import { getNestedNodePosition, selectNode } from '../pm-plugins/utils';
 import { DIRECTION } from '../pm-plugins/utils/consts';
 import { fireMoveNodeAnalytics } from '../pm-plugins/utils/fire-analytics';
-import { setCursorPositionAtMovedNode } from '../pm-plugins/utils/getSelection';
+import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
+import { selectNode, setCursorPositionAtMovedNode } from '../pm-plugins/utils/getSelection';
 import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
 import { canMoveNodeToIndex, isInsideTable, transformSliceExpandToNestedExpand } from '../pm-plugins/utils/validation';
 

package/dist/es2019/editor-commands/show-drag-handle.js

@@ -2,7 +2,7 @@ import { isInTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
-import { getNestedNodePosition } from '../pm-plugins/utils';
+import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
 export const showDragHandleAtSelection = (api, shouldFocusParentNode) => (state, _, view) => {
   const {
     $from

package/dist/es2019/index.js

@@ -1 +1,4 @@
+// Disable no-re-export rule for entry point files
+/* eslint-disable @atlaskit/editor/no-re-export */
+
 export { blockControlsPlugin } from './blockControlsPlugin';

package/dist/es2019/ui/drag-handle.js

@@ -18,8 +18,9 @@ import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/el
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
 import { key } from '../pm-plugins/main';
-import { getNestedNodePosition, selectNode } from '../pm-plugins/utils';
 import { getLeftPosition, getTopPosition } from '../pm-plugins/utils/drag-handle-positions';
+import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
+import { selectNode } from '../pm-plugins/utils/getSelection';
 import { DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_WIDTH, DRAG_HANDLE_ZINDEX, dragHandleGap, topPositionAdjustment } from './consts';
 import { dragPreview } from './drag-preview';
 const dragHandleButtonStyles = css({

package/dist/es2019/ui/drag-preview.js

@@ -2,10 +2,12 @@ import { browser } from '@atlaskit/editor-common/browser';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { B200, N20, N30 } from '@atlaskit/theme/colors';
 const previewStyle = {
+  // eslint-disable-next-line @atlaskit/platform/no-module-level-eval
   borderColor: fg('platform_editor_elements_drag_and_drop_ed_23189') ? `var(--ds-border, ${N30})` : `var(--ds-border-focused, ${B200})`,
   borderStyle: 'solid',
   borderRadius: "var(--ds-border-radius-100, 3px)",
   borderWidth: "var(--ds-border-width-outline, 2px)",
+  // eslint-disable-next-line @atlaskit/platform/no-module-level-eval
   backgroundColor: fg('platform_editor_elements_drag_and_drop_ed_23189') ? `var(--ds-skeleton-subtle, ${N20})` : "var(--ds-blanket-selected, #388BFF14)"
 };
 export const dragPreview = (container, dom, nodeType) => {

package/dist/esm/blockControlsPlugin.js

@@ -3,7 +3,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { moveNode } from './editor-commands/move-node';
 import { moveToLayout } from './editor-commands/move-to-layout';
 import { createPlugin, key } from './pm-plugins/main';
-import { selectNode } from './pm-plugins/utils';
+import { selectNode } from './pm-plugins/utils/getSelection';
 import { DragHandleMenu } from './ui/drag-handle-menu';
 import { GlobalStylesWrapper } from './ui/global-styles';
 export var blockControlsPlugin = function blockControlsPlugin(_ref) {

package/dist/esm/editor-commands/move-node.js

@@ -13,10 +13,10 @@ import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/u
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
-import { getNestedNodePosition, selectNode } from '../pm-plugins/utils';
 import { DIRECTION } from '../pm-plugins/utils/consts';
 import { fireMoveNodeAnalytics } from '../pm-plugins/utils/fire-analytics';
-import { setCursorPositionAtMovedNode } from '../pm-plugins/utils/getSelection';
+import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
+import { selectNode, setCursorPositionAtMovedNode } from '../pm-plugins/utils/getSelection';
 import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
 import { canMoveNodeToIndex, isInsideTable, transformSliceExpandToNestedExpand } from '../pm-plugins/utils/validation';
 

package/dist/esm/editor-commands/show-drag-handle.js

@@ -2,7 +2,7 @@ import { isInTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
-import { getNestedNodePosition } from '../pm-plugins/utils';
+import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
 export var showDragHandleAtSelection = function showDragHandleAtSelection(api, shouldFocusParentNode) {
   return function (state, _, view) {
     var $from = state.selection.$from;

package/dist/esm/index.js

@@ -1 +1,4 @@
+// Disable no-re-export rule for entry point files
+/* eslint-disable @atlaskit/editor/no-re-export */
+
 export { blockControlsPlugin } from './blockControlsPlugin';

package/dist/esm/ui/drag-handle.js

@@ -20,8 +20,9 @@ import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/el
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
 import { key } from '../pm-plugins/main';
-import { getNestedNodePosition, selectNode } from '../pm-plugins/utils';
 import { getLeftPosition, getTopPosition } from '../pm-plugins/utils/drag-handle-positions';
+import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
+import { selectNode } from '../pm-plugins/utils/getSelection';
 import { DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_WIDTH, DRAG_HANDLE_ZINDEX, dragHandleGap, topPositionAdjustment } from './consts';
 import { dragPreview } from './drag-preview';
 var dragHandleButtonStyles = css({

package/dist/esm/ui/drag-preview.js

@@ -2,10 +2,12 @@ import { browser } from '@atlaskit/editor-common/browser';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { B200, N20, N30 } from '@atlaskit/theme/colors';
 var previewStyle = {
+  // eslint-disable-next-line @atlaskit/platform/no-module-level-eval
   borderColor: fg('platform_editor_elements_drag_and_drop_ed_23189') ? "var(--ds-border, ".concat(N30, ")") : "var(--ds-border-focused, ".concat(B200, ")"),
   borderStyle: 'solid',
   borderRadius: "var(--ds-border-radius-100, 3px)",
   borderWidth: "var(--ds-border-width-outline, 2px)",
+  // eslint-disable-next-line @atlaskit/platform/no-module-level-eval
   backgroundColor: fg('platform_editor_elements_drag_and_drop_ed_23189') ? "var(--ds-skeleton-subtle, ".concat(N20, ")") : "var(--ds-blanket-selected, #388BFF14)"
 };
 export var dragPreview = function dragPreview(container, dom, nodeType) {

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

@@ -3,6 +3,6 @@ export declare const getInlineNodePos: (tr: Transaction, start: number, nodeSize
     inlineNodePos: number;
     inlineNodeEndPos: number;
 };
-export declare const getSelection: (tr: Transaction, start: number) => NodeSelection | TextSelection;
+export declare const getSelection: (tr: Transaction, start: number) => TextSelection | NodeSelection;
 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/pm-plugins/utils/getSelection.d.ts

@@ -3,6 +3,6 @@ export declare const getInlineNodePos: (tr: Transaction, start: number, nodeSize
     inlineNodePos: number;
     inlineNodeEndPos: number;
 };
-export declare const getSelection: (tr: Transaction, start: number) => NodeSelection | TextSelection;
+export declare const getSelection: (tr: Transaction, start: number) => TextSelection | NodeSelection;
 export declare const selectNode: (tr: Transaction, start: number, nodeType: string) => Transaction;
 export declare const setCursorPositionAtMovedNode: (tr: Transaction, start: number) => Transaction;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.15.1",
+	"version": "2.15.3",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,9 +48,9 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.24.0",
+		"@atlaskit/tmp-editor-statsig": "^2.25.0",
 		"@atlaskit/tokens": "^2.4.0",
-		"@atlaskit/tooltip": "^18.9.0",
+		"@atlaskit/tooltip": "^19.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0",

package/dist/cjs/pm-plugins/utils/index.js

@@ -1,37 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "getInlineNodePos", {
-  enumerable: true,
-  get: function get() {
-    return _getSelection.getInlineNodePos;
-  }
-});
-Object.defineProperty(exports, "getNestedNodePosition", {
-  enumerable: true,
-  get: function get() {
-    return _getNestedNodePosition.getNestedNodePosition;
-  }
-});
-Object.defineProperty(exports, "getSelection", {
-  enumerable: true,
-  get: function get() {
-    return _getSelection.getSelection;
-  }
-});
-Object.defineProperty(exports, "selectNode", {
-  enumerable: true,
-  get: function get() {
-    return _getSelection.selectNode;
-  }
-});
-Object.defineProperty(exports, "setCursorPositionAtMovedNode", {
-  enumerable: true,
-  get: function get() {
-    return _getSelection.setCursorPositionAtMovedNode;
-  }
-});
-var _getSelection = require("./getSelection");
-var _getNestedNodePosition = require("./getNestedNodePosition");

package/dist/es2019/pm-plugins/utils/index.js

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

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

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

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

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

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

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