@atlaskit/editor-plugin-block-controls 3.3.14 → 3.3.16

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.3.16
+
+### Patch Changes
+
+- [#127305](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/127305)
+  [`d73df5795b977`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d73df5795b977) -
+  Fix range error
+
+## 3.3.15
+
+### Patch Changes
+
+- [#127338](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/127338)
+  [`2492ca26f15ad`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2492ca26f15ad) -
+  Change position of quick insert tooltip to ‘top’, changed icon color of quick insert to icon,
+  matches drag handle
+- Updated dependencies
+
 ## 3.3.14
 
 ### Patch Changes

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

@@ -275,9 +275,15 @@ var moveNodeViaShortcut = exports.moveNodeViaShortcut = function moveNodeViaShor
         }
       }
       var nodeType = (_state$doc$nodeAt = state.doc.nodeAt(currentNodePos)) === null || _state$doc$nodeAt === void 0 ? void 0 : _state$doc$nodeAt.type.name;
-
-      // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
-      var shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility');
+      var shouldMoveNode = false;
+      if (moveToPos > -1 && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_2')) {
+        var isDestDepthSameAsSource = $currentNodePos.depth === state.doc.resolve(moveToPos).depth;
+        var isSourceLayoutColumn = nodeType === 'layoutColumn';
+        shouldMoveNode = (shouldEnableNestedDndA11y ? isDestDepthSameAsSource || isSourceLayoutColumn : true) || isSourceLayoutColumn && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility');
+      } else {
+        // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
+        shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_accessibility');
+      }
       var _expandSelectionBound = (0, _selection.expandSelectionBounds)($currentNodePos, selection.$to),
         $newAnchor = _expandSelectionBound.$anchor,
         $newHead = _expandSelectionBound.$head;
@@ -340,7 +346,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
     return function (_ref7) {
       var _api$blockControls$co;
       var tr = _ref7.tr;
-      if (!api) {
+      if (!api || (start < 0 || to < 0) && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_multi_select_patch_2')) {
         return tr;
       }
       var handleNode = tr.doc.nodeAt(start);

package/dist/cjs/ui/quick-insert-button.js

@@ -34,7 +34,6 @@ var buttonStyles = (0, _primitives.xcss)({
   border: 'none',
   backgroundColor: 'color.background.neutral.subtle',
   borderRadius: '50%',
-  color: 'color.text.accent.gray',
   zIndex: 'card',
   outline: 'none',
   ':hover': {
@@ -163,7 +162,7 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
         }
       }
     }
-    api === null || api === void 0 || (_api$quickInsert = api.quickInsert) === null || _api$quickInsert === void 0 || _api$quickInsert.actions.openTypeAhead('blockControl');
+    (_api$quickInsert = api.quickInsert) === null || _api$quickInsert === void 0 || _api$quickInsert.actions.openTypeAhead('blockControl');
   }, [api, getPos, view]);
   return (
     /*#__PURE__*/
@@ -172,6 +171,7 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
       style: positionStyles,
       xcss: [containerStaticStyles]
     }, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+      position: "top",
       content: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
         description: formatMessage(_messages.blockControlsMessages.insert)
       })
@@ -181,7 +181,8 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
       xcss: [buttonStyles],
       onClick: handleQuickInsert
     }, /*#__PURE__*/_react.default.createElement(_add.default, {
-      label: "add"
+      label: "add",
+      color: "var(--ds-icon, #44546F)"
     }))))
   );
 };

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

@@ -275,9 +275,15 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
         }
       }
       const nodeType = (_state$doc$nodeAt = state.doc.nodeAt(currentNodePos)) === null || _state$doc$nodeAt === void 0 ? void 0 : _state$doc$nodeAt.type.name;
-
-      // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
-      const shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && fg('platform_editor_advanced_layouts_accessibility');
+      let shouldMoveNode = false;
+      if (moveToPos > -1 && fg('platform_editor_elements_dnd_multi_select_patch_2')) {
+        const isDestDepthSameAsSource = $currentNodePos.depth === state.doc.resolve(moveToPos).depth;
+        const isSourceLayoutColumn = nodeType === 'layoutColumn';
+        shouldMoveNode = (shouldEnableNestedDndA11y ? isDestDepthSameAsSource || isSourceLayoutColumn : true) || isSourceLayoutColumn && fg('platform_editor_advanced_layouts_accessibility');
+      } else {
+        // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
+        shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && fg('platform_editor_advanced_layouts_accessibility');
+      }
       const {
         $anchor: $newAnchor,
         $head: $newHead
@@ -341,7 +347,7 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
   tr
 }) => {
   var _api$blockControls$co2;
-  if (!api) {
+  if (!api || (start < 0 || to < 0) && fg('platform_editor_elements_dnd_multi_select_patch_2')) {
     return tr;
   }
   const handleNode = tr.doc.nodeAt(start);

package/dist/es2019/ui/quick-insert-button.js

@@ -23,7 +23,6 @@ const buttonStyles = xcss({
   border: 'none',
   backgroundColor: 'color.background.neutral.subtle',
   borderRadius: '50%',
-  color: 'color.text.accent.gray',
   zIndex: 'card',
   outline: 'none',
   ':hover': {
@@ -151,7 +150,7 @@ export const TypeAheadControl = ({
         }
       }
     }
-    api === null || api === void 0 ? void 0 : (_api$quickInsert = api.quickInsert) === null || _api$quickInsert === void 0 ? void 0 : _api$quickInsert.actions.openTypeAhead('blockControl');
+    (_api$quickInsert = api.quickInsert) === null || _api$quickInsert === void 0 ? void 0 : _api$quickInsert.actions.openTypeAhead('blockControl');
   }, [api, getPos, view]);
   return (
     /*#__PURE__*/
@@ -160,6 +159,7 @@ export const TypeAheadControl = ({
       style: positionStyles,
       xcss: [containerStaticStyles]
     }, /*#__PURE__*/React.createElement(Tooltip, {
+      position: "top",
       content: /*#__PURE__*/React.createElement(ToolTipContent, {
         description: formatMessage(messages.insert)
       })
@@ -169,7 +169,8 @@ export const TypeAheadControl = ({
       xcss: [buttonStyles],
       onClick: handleQuickInsert
     }, /*#__PURE__*/React.createElement(AddIcon, {
-      label: "add"
+      label: "add",
+      color: "var(--ds-icon, #44546F)"
     }))))
   );
 };

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

@@ -269,9 +269,15 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
         }
       }
       var nodeType = (_state$doc$nodeAt = state.doc.nodeAt(currentNodePos)) === null || _state$doc$nodeAt === void 0 ? void 0 : _state$doc$nodeAt.type.name;
-
-      // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
-      var shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && fg('platform_editor_advanced_layouts_accessibility');
+      var shouldMoveNode = false;
+      if (moveToPos > -1 && fg('platform_editor_elements_dnd_multi_select_patch_2')) {
+        var isDestDepthSameAsSource = $currentNodePos.depth === state.doc.resolve(moveToPos).depth;
+        var isSourceLayoutColumn = nodeType === 'layoutColumn';
+        shouldMoveNode = (shouldEnableNestedDndA11y ? isDestDepthSameAsSource || isSourceLayoutColumn : true) || isSourceLayoutColumn && fg('platform_editor_advanced_layouts_accessibility');
+      } else {
+        // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
+        shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $currentNodePos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && fg('platform_editor_advanced_layouts_accessibility');
+      }
       var _expandSelectionBound = expandSelectionBounds($currentNodePos, selection.$to),
         $newAnchor = _expandSelectionBound.$anchor,
         $newHead = _expandSelectionBound.$head;
@@ -334,7 +340,7 @@ export var moveNode = function moveNode(api) {
     return function (_ref7) {
       var _api$blockControls$co;
       var tr = _ref7.tr;
-      if (!api) {
+      if (!api || (start < 0 || to < 0) && fg('platform_editor_elements_dnd_multi_select_patch_2')) {
         return tr;
       }
       var handleNode = tr.doc.nodeAt(start);

package/dist/esm/ui/quick-insert-button.js

@@ -24,7 +24,6 @@ var buttonStyles = xcss({
   border: 'none',
   backgroundColor: 'color.background.neutral.subtle',
   borderRadius: '50%',
-  color: 'color.text.accent.gray',
   zIndex: 'card',
   outline: 'none',
   ':hover': {
@@ -153,7 +152,7 @@ export var TypeAheadControl = function TypeAheadControl(_ref) {
         }
       }
     }
-    api === null || api === void 0 || (_api$quickInsert = api.quickInsert) === null || _api$quickInsert === void 0 || _api$quickInsert.actions.openTypeAhead('blockControl');
+    (_api$quickInsert = api.quickInsert) === null || _api$quickInsert === void 0 || _api$quickInsert.actions.openTypeAhead('blockControl');
   }, [api, getPos, view]);
   return (
     /*#__PURE__*/
@@ -162,6 +161,7 @@ export var TypeAheadControl = function TypeAheadControl(_ref) {
       style: positionStyles,
       xcss: [containerStaticStyles]
     }, /*#__PURE__*/React.createElement(Tooltip, {
+      position: "top",
       content: /*#__PURE__*/React.createElement(ToolTipContent, {
         description: formatMessage(messages.insert)
       })
@@ -171,7 +171,8 @@ export var TypeAheadControl = function TypeAheadControl(_ref) {
       xcss: [buttonStyles],
       onClick: handleQuickInsert
     }, /*#__PURE__*/React.createElement(AddIcon, {
-      label: "add"
+      label: "add",
+      color: "var(--ds-icon, #44546F)"
     }))))
   );
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.3.14",
+	"version": "3.3.16",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^102.8.0",
+		"@atlaskit/editor-common": "^102.10.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
@@ -52,7 +52,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.0.0",
 		"@atlaskit/primitives": "^14.1.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.0.0",
+		"@atlaskit/tmp-editor-statsig": "^4.1.0",
 		"@atlaskit/tokens": "^4.5.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -169,6 +169,9 @@
 		},
 		"platform_editor_drag_layout_column_into_nodes": {
 			"type": "boolean"
+		},
+		"platform_editor_elements_dnd_multi_select_patch_2": {
+			"type": "boolean"
 		}
 	}
 }