@atlaskit/editor-plugin-block-controls 2.1.7 → 2.1.9

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.1.9
+
+### Patch Changes
+
+- [#147660](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/147660)
+  [`bc7f5f6bfe9ff`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bc7f5f6bfe9ff) -
+  Remove nested dnd gating from analytics events
+- Updated dependencies
+
+## 2.1.8
+
+### Patch Changes
+
+- [#147103](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/147103)
+  [`c550545f3551e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c550545f3551e) -
+  ED-24305 Try to fix type error from getPos in drag handle
+- Updated dependencies
+
 ## 2.1.7
 
 ### Patch Changes

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

@@ -175,12 +175,11 @@ var moveNode = exports.moveNode = function moveNode(api) {
         action: _analytics.ACTION.MOVED,
         actionSubject: _analytics.ACTION_SUBJECT.ELEMENT,
         actionSubjectId: _analytics.ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-        attributes: _objectSpread(_objectSpread({
+        attributes: _objectSpread({
           nodeDepth: resolvedNode.depth,
-          nodeType: node.type.name
-        }, (0, _experiments.editorExperiment)('nested-dnd', true) && {
+          nodeType: node.type.name,
           destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth
-        }), (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873') && {
+        }, (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873') && {
           inputMethod: inputMethod
         })
       })(tr);

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

@@ -295,6 +295,9 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
     positionStyles = _useState6[0],
     setPositionStyles = _useState6[1];
   (0, _react.useEffect)(function () {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_type_error_fix')) {
+      return;
+    }
     var cleanUpTransitionListener;
     if (nodeType === 'extension' || nodeType === 'embedCard') {
       var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
@@ -317,6 +320,32 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
       (_cleanUpTransitionLis = cleanUpTransitionListener) === null || _cleanUpTransitionLis === void 0 || _cleanUpTransitionLis();
     };
   }, [calculatePosition, view.dom, anchorName, nodeType]);
+  (0, _react.useLayoutEffect)(function () {
+    if (!(0, _platformFeatureFlags.fg)('platform_editor_element_dnd_nested_type_error_fix')) {
+      return;
+    }
+    var cleanUpTransitionListener;
+    if (nodeType === 'extension' || nodeType === 'embedCard') {
+      var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
+      if (!dom) {
+        return;
+      }
+      cleanUpTransitionListener = (0, _bindEventListener.bind)(dom, {
+        type: 'transitionend',
+        listener: function listener() {
+          setPositionStyles(calculatePosition());
+        }
+      });
+    }
+    var calcPos = requestAnimationFrame(function () {
+      setPositionStyles(calculatePosition());
+    });
+    return function () {
+      var _cleanUpTransitionLis2;
+      cancelAnimationFrame(calcPos);
+      (_cleanUpTransitionLis2 = cleanUpTransitionListener) === null || _cleanUpTransitionLis2 === void 0 || _cleanUpTransitionLis2();
+    };
+  }, [calculatePosition, view.dom, anchorName, nodeType]);
   (0, _react.useEffect)(function () {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873')) {
       var id = requestAnimationFrame(function () {

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

@@ -172,9 +172,7 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
     attributes: {
       nodeDepth: resolvedNode.depth,
       nodeType: node.type.name,
-      ...(editorExperiment('nested-dnd', true) && {
-        destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth
-      }),
+      destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth,
       ...(fg('platform_editor_element_drag_and_drop_ed_23873') && {
         inputMethod
       })

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

@@ -2,7 +2,7 @@
  * @jsxRuntime classic
  * @jsx jsx
  */
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { bind } from 'bind-event-listener';
@@ -279,6 +279,9 @@ const DragHandleInternal = ({
     display: 'none'
   });
   useEffect(() => {
+    if (fg('platform_editor_element_dnd_nested_type_error_fix')) {
+      return;
+    }
     let cleanUpTransitionListener;
     if (nodeType === 'extension' || nodeType === 'embedCard') {
       const dom = view.dom.querySelector(`[data-drag-handler-anchor-name="${anchorName}"]`);
@@ -301,6 +304,32 @@ const DragHandleInternal = ({
       (_cleanUpTransitionLis = cleanUpTransitionListener) === null || _cleanUpTransitionLis === void 0 ? void 0 : _cleanUpTransitionLis();
     };
   }, [calculatePosition, view.dom, anchorName, nodeType]);
+  useLayoutEffect(() => {
+    if (!fg('platform_editor_element_dnd_nested_type_error_fix')) {
+      return;
+    }
+    let cleanUpTransitionListener;
+    if (nodeType === 'extension' || nodeType === 'embedCard') {
+      const dom = view.dom.querySelector(`[data-drag-handler-anchor-name="${anchorName}"]`);
+      if (!dom) {
+        return;
+      }
+      cleanUpTransitionListener = bind(dom, {
+        type: 'transitionend',
+        listener: () => {
+          setPositionStyles(calculatePosition());
+        }
+      });
+    }
+    const calcPos = requestAnimationFrame(() => {
+      setPositionStyles(calculatePosition());
+    });
+    return () => {
+      var _cleanUpTransitionLis2;
+      cancelAnimationFrame(calcPos);
+      (_cleanUpTransitionLis2 = cleanUpTransitionListener) === null || _cleanUpTransitionLis2 === void 0 ? void 0 : _cleanUpTransitionLis2();
+    };
+  }, [calculatePosition, view.dom, anchorName, nodeType]);
   useEffect(() => {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current && fg('platform_editor_element_drag_and_drop_ed_23873')) {
       const id = requestAnimationFrame(() => {

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

@@ -169,12 +169,11 @@ export var moveNode = function moveNode(api) {
         action: ACTION.MOVED,
         actionSubject: ACTION_SUBJECT.ELEMENT,
         actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-        attributes: _objectSpread(_objectSpread({
+        attributes: _objectSpread({
           nodeDepth: resolvedNode.depth,
-          nodeType: node.type.name
-        }, editorExperiment('nested-dnd', true) && {
+          nodeType: node.type.name,
           destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth
-        }), fg('platform_editor_element_drag_and_drop_ed_23873') && {
+        }, fg('platform_editor_element_drag_and_drop_ed_23873') && {
           inputMethod: inputMethod
         })
       })(tr);

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

@@ -3,7 +3,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
  * @jsxRuntime classic
  * @jsx jsx
  */
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { bind } from 'bind-event-listener';
@@ -286,6 +286,9 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
     positionStyles = _useState6[0],
     setPositionStyles = _useState6[1];
   useEffect(function () {
+    if (fg('platform_editor_element_dnd_nested_type_error_fix')) {
+      return;
+    }
     var cleanUpTransitionListener;
     if (nodeType === 'extension' || nodeType === 'embedCard') {
       var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
@@ -308,6 +311,32 @@ var DragHandleInternal = function DragHandleInternal(_ref) {
       (_cleanUpTransitionLis = cleanUpTransitionListener) === null || _cleanUpTransitionLis === void 0 || _cleanUpTransitionLis();
     };
   }, [calculatePosition, view.dom, anchorName, nodeType]);
+  useLayoutEffect(function () {
+    if (!fg('platform_editor_element_dnd_nested_type_error_fix')) {
+      return;
+    }
+    var cleanUpTransitionListener;
+    if (nodeType === 'extension' || nodeType === 'embedCard') {
+      var dom = view.dom.querySelector("[data-drag-handler-anchor-name=\"".concat(anchorName, "\"]"));
+      if (!dom) {
+        return;
+      }
+      cleanUpTransitionListener = bind(dom, {
+        type: 'transitionend',
+        listener: function listener() {
+          setPositionStyles(calculatePosition());
+        }
+      });
+    }
+    var calcPos = requestAnimationFrame(function () {
+      setPositionStyles(calculatePosition());
+    });
+    return function () {
+      var _cleanUpTransitionLis2;
+      cancelAnimationFrame(calcPos);
+      (_cleanUpTransitionLis2 = cleanUpTransitionListener) === null || _cleanUpTransitionLis2 === void 0 || _cleanUpTransitionLis2();
+    };
+  }, [calculatePosition, view.dom, anchorName, nodeType]);
   useEffect(function () {
     if (handleOptions !== null && handleOptions !== void 0 && handleOptions.isFocused && buttonRef.current && fg('platform_editor_element_drag_and_drop_ed_23873')) {
       var id = requestAnimationFrame(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.1.7",
+	"version": "2.1.9",
 	"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": "^92.0.0",
+		"@atlaskit/editor-common": "^92.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -41,14 +41,14 @@
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/editor-shared-styles": "^3.0.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^22.19.0",
+		"@atlaskit/icon": "^22.20.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.3.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",
 		"@atlaskit/theme": "^13.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.1.0",
+		"@atlaskit/tmp-editor-statsig": "^2.2.0",
 		"@atlaskit/tokens": "^2.0.0",
 		"@atlaskit/tooltip": "^18.7.0",
 		"@babel/runtime": "^7.0.0",
@@ -141,6 +141,9 @@
 		},
 		"platform_editor_element_dnd_nested_fix_patch_2": {
 			"type": "boolean"
+		},
+		"platform_editor_element_dnd_nested_type_error_fix": {
+			"type": "boolean"
 		}
 	}
 }