@atlaskit/editor-plugin-block-controls 2.7.0 → 2.7.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.7.1
+
+### Patch Changes
+
+- [#153381](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/153381)
+  [`47cf4f0676e5a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/47cf4f0676e5a) -
+  ED-25040 setup feature flags and hooked up pre release-1
+- Updated dependencies
+
 ## 2.7.0
 
 ### Minor Changes

package/dist/cjs/ui/inline-drop-target.js

@@ -44,7 +44,8 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
   var api = _ref.api,
     nextNode = _ref.nextNode,
     position = _ref.position,
-    anchorRectCache = _ref.anchorRectCache;
+    anchorRectCache = _ref.anchorRectCache,
+    getPos = _ref.getPos;
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['width']),
     widthState = _useSharedPluginState.widthState;
   var _useState = (0, _react.useState)(false),
@@ -74,6 +75,20 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
       top: "".concat((nodeRect === null || nodeRect === void 0 ? void 0 : nodeRect.top) || 0, "px")
     });
   }, [anchorName, anchorRectCache, position]);
+  var onDrop = (0, _react.useCallback)(function () {
+    var _api$blockControls;
+    var _ref2 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
+      activeNode = _ref2.activeNode;
+    if (!activeNode) {
+      return;
+    }
+    var toPos = getPos();
+    if (activeNode && toPos !== undefined) {
+      var _api$core, _api$blockControls2;
+      var start = activeNode.pos;
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.moveToLayout(start, toPos, position));
+    }
+  }, [api, getPos, position]);
   return (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)("div", {
     "data-test-id": "block-ctrl-drop-target-".concat(position),
     css: [dropTargetCommonStyle, dropTargetRectStyle, !isDraggedOver && hideDropTargetStyle]
@@ -86,20 +101,20 @@ var InlineDropTarget = exports.InlineDropTarget = function InlineDropTarget(_ref
     anchorRectCache: anchorRectCache,
     onDragEnter: handleDragEnter,
     onDragLeave: handleDragLeave,
-    onDrop: function onDrop() {}
+    onDrop: onDrop
   }));
 };
-var InlineHoverZone = exports.InlineHoverZone = function InlineHoverZone(_ref2) {
-  var node = _ref2.node,
-    editorWidthState = _ref2.editorWidthState,
-    anchorRectCache = _ref2.anchorRectCache,
-    position = _ref2.position,
-    onDragEnter = _ref2.onDragEnter,
-    onDragLeave = _ref2.onDragLeave,
-    onDrop = _ref2.onDrop;
+var InlineHoverZone = exports.InlineHoverZone = function InlineHoverZone(_ref3) {
+  var node = _ref3.node,
+    editorWidthState = _ref3.editorWidthState,
+    anchorRectCache = _ref3.anchorRectCache,
+    position = _ref3.position,
+    onDragEnter = _ref3.onDragEnter,
+    onDragLeave = _ref3.onDragLeave,
+    onDrop = _ref3.onDrop;
   var ref = (0, _react.useRef)(null);
-  var _ref3 = editorWidthState || {},
-    editorWith = _ref3.width;
+  var _ref4 = editorWidthState || {},
+    editorWith = _ref4.width;
   var anchorName = node ? (0, _decorations.getNodeAnchor)(node) : '';
   (0, _react.useEffect)(function () {
     if (ref.current) {

package/dist/cjs/utils/advanced-layouts-flags.js

@@ -3,9 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isPreRelease1 = void 0;
+exports.isPreRelease2 = exports.isPreRelease1 = void 0;
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+// When we turn on re-release 2, will also turn on pre-release 1
+// but not vice-versa
 var isPreRelease1 = exports.isPreRelease1 = function isPreRelease1() {
-  return (0, _experiments.editorExperiment)('advanced_layouts', true) || (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_pre_release_1');
+  return (0, _experiments.editorExperiment)('advanced_layouts', true) || (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_pre_release_1') || (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_pre_release_2');
+};
+var isPreRelease2 = exports.isPreRelease2 = function isPreRelease2() {
+  return (0, _experiments.editorExperiment)('advanced_layouts', true) || (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_pre_release_2');
 };

package/dist/es2019/ui/inline-drop-target.js

@@ -35,7 +35,8 @@ export const InlineDropTarget = ({
   api,
   nextNode,
   position,
-  anchorRectCache
+  anchorRectCache,
+  getPos
 }) => {
   const {
     widthState
@@ -64,6 +65,23 @@ export const InlineDropTarget = ({
       top: `${(nodeRect === null || nodeRect === void 0 ? void 0 : nodeRect.top) || 0}px`
     });
   }, [anchorName, anchorRectCache, position]);
+  const onDrop = useCallback(() => {
+    var _api$blockControls;
+    const {
+      activeNode
+    } = (api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {};
+    if (!activeNode) {
+      return;
+    }
+    const toPos = getPos();
+    if (activeNode && toPos !== undefined) {
+      var _api$core, _api$blockControls2, _api$blockControls2$c;
+      const {
+        pos: start
+      } = activeNode;
+      api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : (_api$blockControls2$c = _api$blockControls2.commands) === null || _api$blockControls2$c === void 0 ? void 0 : _api$blockControls2$c.moveToLayout(start, toPos, position));
+    }
+  }, [api, getPos, position]);
   return jsx(Fragment, null, jsx("div", {
     "data-test-id": `block-ctrl-drop-target-${position}`,
     css: [dropTargetCommonStyle, dropTargetRectStyle, !isDraggedOver && hideDropTargetStyle]
@@ -76,7 +94,7 @@ export const InlineDropTarget = ({
     anchorRectCache: anchorRectCache,
     onDragEnter: handleDragEnter,
     onDragLeave: handleDragLeave,
-    onDrop: () => {}
+    onDrop: onDrop
   }));
 };
 export const InlineHoverZone = ({

package/dist/es2019/utils/advanced-layouts-flags.js

@@ -1,5 +1,11 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+
+// When we turn on re-release 2, will also turn on pre-release 1
+// but not vice-versa
 export const isPreRelease1 = () => {
-  return editorExperiment('advanced_layouts', true) || fg('platform_editor_advanced_layouts_pre_release_1');
+  return editorExperiment('advanced_layouts', true) || fg('platform_editor_advanced_layouts_pre_release_1') || fg('platform_editor_advanced_layouts_pre_release_2');
+};
+export const isPreRelease2 = () => {
+  return editorExperiment('advanced_layouts', true) || fg('platform_editor_advanced_layouts_pre_release_2');
 };

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

@@ -36,7 +36,8 @@ export var InlineDropTarget = function InlineDropTarget(_ref) {
   var api = _ref.api,
     nextNode = _ref.nextNode,
     position = _ref.position,
-    anchorRectCache = _ref.anchorRectCache;
+    anchorRectCache = _ref.anchorRectCache,
+    getPos = _ref.getPos;
   var _useSharedPluginState = useSharedPluginState(api, ['width']),
     widthState = _useSharedPluginState.widthState;
   var _useState = useState(false),
@@ -66,6 +67,20 @@ export var InlineDropTarget = function InlineDropTarget(_ref) {
       top: "".concat((nodeRect === null || nodeRect === void 0 ? void 0 : nodeRect.top) || 0, "px")
     });
   }, [anchorName, anchorRectCache, position]);
+  var onDrop = useCallback(function () {
+    var _api$blockControls;
+    var _ref2 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
+      activeNode = _ref2.activeNode;
+    if (!activeNode) {
+      return;
+    }
+    var toPos = getPos();
+    if (activeNode && toPos !== undefined) {
+      var _api$core, _api$blockControls2;
+      var start = activeNode.pos;
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.moveToLayout(start, toPos, position));
+    }
+  }, [api, getPos, position]);
   return jsx(Fragment, null, jsx("div", {
     "data-test-id": "block-ctrl-drop-target-".concat(position),
     css: [dropTargetCommonStyle, dropTargetRectStyle, !isDraggedOver && hideDropTargetStyle]
@@ -78,20 +93,20 @@ export var InlineDropTarget = function InlineDropTarget(_ref) {
     anchorRectCache: anchorRectCache,
     onDragEnter: handleDragEnter,
     onDragLeave: handleDragLeave,
-    onDrop: function onDrop() {}
+    onDrop: onDrop
   }));
 };
-export var InlineHoverZone = function InlineHoverZone(_ref2) {
-  var node = _ref2.node,
-    editorWidthState = _ref2.editorWidthState,
-    anchorRectCache = _ref2.anchorRectCache,
-    position = _ref2.position,
-    onDragEnter = _ref2.onDragEnter,
-    onDragLeave = _ref2.onDragLeave,
-    onDrop = _ref2.onDrop;
+export var InlineHoverZone = function InlineHoverZone(_ref3) {
+  var node = _ref3.node,
+    editorWidthState = _ref3.editorWidthState,
+    anchorRectCache = _ref3.anchorRectCache,
+    position = _ref3.position,
+    onDragEnter = _ref3.onDragEnter,
+    onDragLeave = _ref3.onDragLeave,
+    onDrop = _ref3.onDrop;
   var ref = useRef(null);
-  var _ref3 = editorWidthState || {},
-    editorWith = _ref3.width;
+  var _ref4 = editorWidthState || {},
+    editorWith = _ref4.width;
   var anchorName = node ? getNodeAnchor(node) : '';
   useEffect(function () {
     if (ref.current) {

package/dist/esm/utils/advanced-layouts-flags.js

@@ -1,5 +1,11 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+
+// When we turn on re-release 2, will also turn on pre-release 1
+// but not vice-versa
 export var isPreRelease1 = function isPreRelease1() {
-  return editorExperiment('advanced_layouts', true) || fg('platform_editor_advanced_layouts_pre_release_1');
+  return editorExperiment('advanced_layouts', true) || fg('platform_editor_advanced_layouts_pre_release_1') || fg('platform_editor_advanced_layouts_pre_release_2');
+};
+export var isPreRelease2 = function isPreRelease2() {
+  return editorExperiment('advanced_layouts', true) || fg('platform_editor_advanced_layouts_pre_release_2');
 };

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

@@ -3,7 +3,7 @@ import { type EditorContainerWidth } from '@atlaskit/editor-common/src/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { type AnchorRectCache } from '../utils/anchor-utils';
 import { type DropTargetProps } from './drop-target';
-export declare const InlineDropTarget: ({ api, nextNode, position, anchorRectCache, }: DropTargetProps & {
+export declare const InlineDropTarget: ({ api, nextNode, position, anchorRectCache, getPos, }: DropTargetProps & {
     anchorRectCache?: AnchorRectCache | undefined;
     position: 'left' | 'right';
 }) => jsx.JSX.Element;

package/dist/types/utils/advanced-layouts-flags.d.ts

@@ -1 +1,2 @@
 export declare const isPreRelease1: () => boolean;
+export declare const isPreRelease2: () => boolean;

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

@@ -3,7 +3,7 @@ import { type EditorContainerWidth } from '@atlaskit/editor-common/src/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { type AnchorRectCache } from '../utils/anchor-utils';
 import { type DropTargetProps } from './drop-target';
-export declare const InlineDropTarget: ({ api, nextNode, position, anchorRectCache, }: DropTargetProps & {
+export declare const InlineDropTarget: ({ api, nextNode, position, anchorRectCache, getPos, }: DropTargetProps & {
     anchorRectCache?: AnchorRectCache | undefined;
     position: 'left' | 'right';
 }) => jsx.JSX.Element;

package/dist/types-ts4.5/utils/advanced-layouts-flags.d.ts

@@ -1 +1,2 @@
 export declare const isPreRelease1: () => boolean;
+export declare const isPreRelease2: () => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.7.0",
+	"version": "2.7.1",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -47,7 +47,7 @@
 		"@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",
-		"@atlaskit/theme": "^13.1.0",
+		"@atlaskit/theme": "^14.0.0",
 		"@atlaskit/tmp-editor-statsig": "^2.6.0",
 		"@atlaskit/tokens": "^2.0.0",
 		"@atlaskit/tooltip": "^18.8.0",
@@ -153,6 +153,9 @@
 		},
 		"platform_editor_advanced_layouts_pre_release_1": {
 			"type": "boolean"
+		},
+		"platform_editor_advanced_layouts_pre_release_2": {
+			"type": "boolean"
 		}
 	}
 }