@atlaskit/editor-plugin-block-controls 6.3.8 → 6.4.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 6.4.0
+
+### Minor Changes
+
+- [`687c1b8fa7801`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/687c1b8fa7801) -
+  EDITOR-1566 bump adf-schema + update validator
+
+### Patch Changes
+
+- [`a11b4fec9c5d4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a11b4fec9c5d4) -
+  [FD-90806] Clean up platform_editor_remove_drag_handle_fix
+- Updated dependencies
+
+## 6.3.9
+
+### Patch Changes
+
+- [`f74cedd969dd0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f74cedd969dd0) -
+  FD-97663 clean up fg platform_editor_table_drag_handle_shift_fix
+- Updated dependencies
+
 ## 6.3.8
 
 ### Patch Changes

package/dist/cjs/pm-plugins/handle-mouse-over.js

@@ -84,19 +84,15 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     var parentElementType = (0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true) ? (0, _domAttrName.getTypeNameFromDom)(parentElement) : parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
     if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
       // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
-      if ((0, _platformFeatureFlags.fg)('platform_editor_table_drag_handle_shift_fix')) {
-        if (parentElement && parentElementType === 'table') {
-          rootElement = parentElement;
-        } else if (parentElement && parentElementType === 'tableRow') {
-          var _parentElement$parent;
-          var grandparentElement = parentElement === null || parentElement === void 0 || (_parentElement$parent = parentElement.parentElement) === null || _parentElement$parent === void 0 ? void 0 : _parentElement$parent.closest("[".concat((0, _domAttrName.getAnchorAttrName)(), "]"));
-          var grandparentElementType = (0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true) ? (0, _domAttrName.getTypeNameFromDom)(grandparentElement) : grandparentElement === null || grandparentElement === void 0 ? void 0 : grandparentElement.getAttribute('data-drag-handler-node-type');
-          if (grandparentElement && grandparentElementType === 'table') {
-            rootElement = grandparentElement;
-          }
-        }
-      } else if (parentElement && (parentElementType === 'table' || parentElementType === 'tableRow')) {
+      if (parentElement && parentElementType === 'table') {
         rootElement = parentElement;
+      } else if (parentElement && parentElementType === 'tableRow') {
+        var _parentElement$parent;
+        var grandparentElement = parentElement === null || parentElement === void 0 || (_parentElement$parent = parentElement.parentElement) === null || _parentElement$parent === void 0 ? void 0 : _parentElement$parent.closest("[".concat((0, _domAttrName.getAnchorAttrName)(), "]"));
+        var grandparentElementType = (0, _expValEquals.expValEquals)('platform_editor_native_anchor_support', 'isEnabled', true) ? (0, _domAttrName.getTypeNameFromDom)(grandparentElement) : grandparentElement === null || grandparentElement === void 0 ? void 0 : grandparentElement.getAttribute('data-drag-handler-node-type');
+        if (grandparentElement && grandparentElementType === 'table') {
+          rootElement = grandparentElement;
+        }
       }
     } else {
       // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)

package/dist/cjs/pm-plugins/main.js

@@ -344,15 +344,9 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
     }
   }
   var maybeNodeCountChanged = !isAllText && numReplaceSteps > 0;
-  var latestActiveNode;
-  if ((0, _platformFeatureFlags.fg)('platform_editor_remove_drag_handle_fix')) {
-    latestActiveNode = meta === null || meta === void 0 ? void 0 : meta.activeNode;
-    if (!latestActiveNode && (!isActiveNodeDeleted || isReplacedWithSameSize)) {
-      latestActiveNode = activeNode;
-    }
-  } else {
-    var _meta$activeNode;
-    latestActiveNode = (_meta$activeNode = meta === null || meta === void 0 ? void 0 : meta.activeNode) !== null && _meta$activeNode !== void 0 ? _meta$activeNode : activeNode;
+  var latestActiveNode = meta === null || meta === void 0 ? void 0 : meta.activeNode;
+  if (!latestActiveNode && (!isActiveNodeDeleted || isReplacedWithSameSize)) {
+    latestActiveNode = activeNode;
   }
 
   // Re-create node decorations
@@ -419,14 +413,9 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
   // Create/recreate handle dec when the active node is missing/changes, or the editor viewport has changed (non-anchor pos workaround)
   var shouldRecreateHandle = latestActiveNode && (activeNodeChanged || isActiveNodeModified || editorSizeChanged || handleNeedsRedraw);
   var shouldRecreateQuickInsertButton = latestActiveNode && (rootActiveNodeChanged || isActiveNodeModified || editorSizeChanged || handleNeedsRedraw);
-  var shouldRemoveHandle = false;
-  if ((0, _platformFeatureFlags.fg)('platform_editor_remove_drag_handle_fix')) {
-    // If the active node is missing, we need to remove the handle
-    shouldRemoveHandle = latestActiveNode ? isResizerResizing || isActiveNodeDeleted && !isReplacedWithSameSize || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved) : true;
-  } else {
-    // Remove handle dec when explicitly hidden, a node is resizing, activeNode pos was deleted, or DnD moved a node
-    shouldRemoveHandle = latestActiveNode && (isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
-  }
+
+  // If the active node is missing, we need to remove the handle
+  var shouldRemoveHandle = latestActiveNode ? isResizerResizing || isActiveNodeDeleted && !isReplacedWithSameSize || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved) : true;
   if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
     // Remove handle dec when editor is blurred
     shouldRemoveHandle = shouldRemoveHandle || (meta === null || meta === void 0 ? void 0 : meta.editorBlurred);

package/dist/es2019/pm-plugins/handle-mouse-over.js

@@ -74,19 +74,15 @@ export const handleMouseOver = (view, event, api) => {
     const parentElementType = expValEquals('platform_editor_native_anchor_support', 'isEnabled', true) ? getTypeNameFromDom(parentElement) : parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
     if (editorExperiment('advanced_layouts', true)) {
       // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
-      if (fg('platform_editor_table_drag_handle_shift_fix')) {
-        if (parentElement && parentElementType === 'table') {
-          rootElement = parentElement;
-        } else if (parentElement && parentElementType === 'tableRow') {
-          var _parentElement$parent;
-          const grandparentElement = parentElement === null || parentElement === void 0 ? void 0 : (_parentElement$parent = parentElement.parentElement) === null || _parentElement$parent === void 0 ? void 0 : _parentElement$parent.closest(`[${getAnchorAttrName()}]`);
-          const grandparentElementType = expValEquals('platform_editor_native_anchor_support', 'isEnabled', true) ? getTypeNameFromDom(grandparentElement) : grandparentElement === null || grandparentElement === void 0 ? void 0 : grandparentElement.getAttribute('data-drag-handler-node-type');
-          if (grandparentElement && grandparentElementType === 'table') {
-            rootElement = grandparentElement;
-          }
-        }
-      } else if (parentElement && (parentElementType === 'table' || parentElementType === 'tableRow')) {
+      if (parentElement && parentElementType === 'table') {
         rootElement = parentElement;
+      } else if (parentElement && parentElementType === 'tableRow') {
+        var _parentElement$parent;
+        const grandparentElement = parentElement === null || parentElement === void 0 ? void 0 : (_parentElement$parent = parentElement.parentElement) === null || _parentElement$parent === void 0 ? void 0 : _parentElement$parent.closest(`[${getAnchorAttrName()}]`);
+        const grandparentElementType = expValEquals('platform_editor_native_anchor_support', 'isEnabled', true) ? getTypeNameFromDom(grandparentElement) : grandparentElement === null || grandparentElement === void 0 ? void 0 : grandparentElement.getAttribute('data-drag-handler-node-type');
+        if (grandparentElement && grandparentElementType === 'table') {
+          rootElement = grandparentElement;
+        }
       }
     } else {
       // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)

package/dist/es2019/pm-plugins/main.js

@@ -343,15 +343,9 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
     }
   }
   const maybeNodeCountChanged = !isAllText && numReplaceSteps > 0;
-  let latestActiveNode;
-  if (fg('platform_editor_remove_drag_handle_fix')) {
-    latestActiveNode = meta === null || meta === void 0 ? void 0 : meta.activeNode;
-    if (!latestActiveNode && (!isActiveNodeDeleted || isReplacedWithSameSize)) {
-      latestActiveNode = activeNode;
-    }
-  } else {
-    var _meta$activeNode;
-    latestActiveNode = (_meta$activeNode = meta === null || meta === void 0 ? void 0 : meta.activeNode) !== null && _meta$activeNode !== void 0 ? _meta$activeNode : activeNode;
+  let latestActiveNode = meta === null || meta === void 0 ? void 0 : meta.activeNode;
+  if (!latestActiveNode && (!isActiveNodeDeleted || isReplacedWithSameSize)) {
+    latestActiveNode = activeNode;
   }
 
   // Re-create node decorations
@@ -416,14 +410,9 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
   // Create/recreate handle dec when the active node is missing/changes, or the editor viewport has changed (non-anchor pos workaround)
   const shouldRecreateHandle = latestActiveNode && (activeNodeChanged || isActiveNodeModified || editorSizeChanged || handleNeedsRedraw);
   const shouldRecreateQuickInsertButton = latestActiveNode && (rootActiveNodeChanged || isActiveNodeModified || editorSizeChanged || handleNeedsRedraw);
-  let shouldRemoveHandle = false;
-  if (fg('platform_editor_remove_drag_handle_fix')) {
-    // If the active node is missing, we need to remove the handle
-    shouldRemoveHandle = latestActiveNode ? isResizerResizing || isActiveNodeDeleted && !isReplacedWithSameSize || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved) : true;
-  } else {
-    // Remove handle dec when explicitly hidden, a node is resizing, activeNode pos was deleted, or DnD moved a node
-    shouldRemoveHandle = latestActiveNode && (isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
-  }
+
+  // If the active node is missing, we need to remove the handle
+  let shouldRemoveHandle = latestActiveNode ? isResizerResizing || isActiveNodeDeleted && !isReplacedWithSameSize || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved) : true;
   if (editorExperiment('platform_editor_controls', 'variant1')) {
     // Remove handle dec when editor is blurred
     shouldRemoveHandle = shouldRemoveHandle || (meta === null || meta === void 0 ? void 0 : meta.editorBlurred);

package/dist/esm/pm-plugins/handle-mouse-over.js

@@ -77,19 +77,15 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     var parentElementType = expValEquals('platform_editor_native_anchor_support', 'isEnabled', true) ? getTypeNameFromDom(parentElement) : parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('data-drag-handler-node-type');
     if (editorExperiment('advanced_layouts', true)) {
       // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)
-      if (fg('platform_editor_table_drag_handle_shift_fix')) {
-        if (parentElement && parentElementType === 'table') {
-          rootElement = parentElement;
-        } else if (parentElement && parentElementType === 'tableRow') {
-          var _parentElement$parent;
-          var grandparentElement = parentElement === null || parentElement === void 0 || (_parentElement$parent = parentElement.parentElement) === null || _parentElement$parent === void 0 ? void 0 : _parentElement$parent.closest("[".concat(getAnchorAttrName(), "]"));
-          var grandparentElementType = expValEquals('platform_editor_native_anchor_support', 'isEnabled', true) ? getTypeNameFromDom(grandparentElement) : grandparentElement === null || grandparentElement === void 0 ? void 0 : grandparentElement.getAttribute('data-drag-handler-node-type');
-          if (grandparentElement && grandparentElementType === 'table') {
-            rootElement = grandparentElement;
-          }
-        }
-      } else if (parentElement && (parentElementType === 'table' || parentElementType === 'tableRow')) {
+      if (parentElement && parentElementType === 'table') {
         rootElement = parentElement;
+      } else if (parentElement && parentElementType === 'tableRow') {
+        var _parentElement$parent;
+        var grandparentElement = parentElement === null || parentElement === void 0 || (_parentElement$parent = parentElement.parentElement) === null || _parentElement$parent === void 0 ? void 0 : _parentElement$parent.closest("[".concat(getAnchorAttrName(), "]"));
+        var grandparentElementType = expValEquals('platform_editor_native_anchor_support', 'isEnabled', true) ? getTypeNameFromDom(grandparentElement) : grandparentElement === null || grandparentElement === void 0 ? void 0 : grandparentElement.getAttribute('data-drag-handler-node-type');
+        if (grandparentElement && grandparentElementType === 'table') {
+          rootElement = grandparentElement;
+        }
       }
     } else {
       // We want to exclude handles from showing for direct descendant of table nodes (i.e. nodes in cells)

package/dist/esm/pm-plugins/main.js

@@ -337,15 +337,9 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
     }
   }
   var maybeNodeCountChanged = !isAllText && numReplaceSteps > 0;
-  var latestActiveNode;
-  if (fg('platform_editor_remove_drag_handle_fix')) {
-    latestActiveNode = meta === null || meta === void 0 ? void 0 : meta.activeNode;
-    if (!latestActiveNode && (!isActiveNodeDeleted || isReplacedWithSameSize)) {
-      latestActiveNode = activeNode;
-    }
-  } else {
-    var _meta$activeNode;
-    latestActiveNode = (_meta$activeNode = meta === null || meta === void 0 ? void 0 : meta.activeNode) !== null && _meta$activeNode !== void 0 ? _meta$activeNode : activeNode;
+  var latestActiveNode = meta === null || meta === void 0 ? void 0 : meta.activeNode;
+  if (!latestActiveNode && (!isActiveNodeDeleted || isReplacedWithSameSize)) {
+    latestActiveNode = activeNode;
   }
 
   // Re-create node decorations
@@ -412,14 +406,9 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
   // Create/recreate handle dec when the active node is missing/changes, or the editor viewport has changed (non-anchor pos workaround)
   var shouldRecreateHandle = latestActiveNode && (activeNodeChanged || isActiveNodeModified || editorSizeChanged || handleNeedsRedraw);
   var shouldRecreateQuickInsertButton = latestActiveNode && (rootActiveNodeChanged || isActiveNodeModified || editorSizeChanged || handleNeedsRedraw);
-  var shouldRemoveHandle = false;
-  if (fg('platform_editor_remove_drag_handle_fix')) {
-    // If the active node is missing, we need to remove the handle
-    shouldRemoveHandle = latestActiveNode ? isResizerResizing || isActiveNodeDeleted && !isReplacedWithSameSize || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved) : true;
-  } else {
-    // Remove handle dec when explicitly hidden, a node is resizing, activeNode pos was deleted, or DnD moved a node
-    shouldRemoveHandle = latestActiveNode && (isResizerResizing || isActiveNodeDeleted || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved));
-  }
+
+  // If the active node is missing, we need to remove the handle
+  var shouldRemoveHandle = latestActiveNode ? isResizerResizing || isActiveNodeDeleted && !isReplacedWithSameSize || (meta === null || meta === void 0 ? void 0 : meta.nodeMoved) : true;
   if (editorExperiment('platform_editor_controls', 'variant1')) {
     // Remove handle dec when editor is blurred
     shouldRemoveHandle = shouldRemoveHandle || (meta === null || meta === void 0 ? void 0 : meta.editorBlurred);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "6.3.8",
+	"version": "6.4.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,23 +28,23 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.1.2",
+		"@atlaskit/adf-schema": "^51.2.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^5.0.0",
-		"@atlaskit/editor-plugin-analytics": "^5.2.0",
+		"@atlaskit/editor-plugin-analytics": "^5.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^5.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^4.0.0",
 		"@atlaskit/editor-plugin-interaction": "^7.0.0",
 		"@atlaskit/editor-plugin-limited-mode": "^2.1.0",
-		"@atlaskit/editor-plugin-metrics": "^6.2.0",
+		"@atlaskit/editor-plugin-metrics": "^6.3.0",
 		"@atlaskit/editor-plugin-quick-insert": "^5.0.0",
 		"@atlaskit/editor-plugin-selection": "^5.0.0",
-		"@atlaskit/editor-plugin-type-ahead": "^5.2.0",
+		"@atlaskit/editor-plugin-type-ahead": "^5.3.0",
 		"@atlaskit/editor-plugin-user-intent": "^3.0.0",
 		"@atlaskit/editor-plugin-width": "^6.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.6.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^28.2.0",
+		"@atlaskit/icon": "^28.3.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
@@ -52,7 +52,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^14.15.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^12.29.0",
+		"@atlaskit/tmp-editor-statsig": "^12.30.0",
 		"@atlaskit/tokens": "^6.3.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -64,7 +64,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.14.0",
+		"@atlaskit/editor-common": "^109.16.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -126,9 +126,6 @@
 		"platform_editor_ease_of_use_metrics": {
 			"type": "boolean"
 		},
-		"platform_editor_remove_drag_handle_fix": {
-			"type": "boolean"
-		},
 		"platform_editor_drag_layout_column_into_nodes": {
 			"type": "boolean"
 		},
@@ -153,9 +150,6 @@
 		"platform_editor_fix_widget_destroy": {
 			"type": "boolean"
 		},
-		"platform_editor_table_drag_handle_shift_fix": {
-			"type": "boolean"
-		},
 		"dst-a11y__replace-anchor-with-link__editor-jenga": {
 			"type": "boolean"
 		},