@atlaskit/editor-plugin-block-controls 8.10.2 → 8.11.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 8.11.0
+
+### Minor Changes
+
+- [`b5390019c2609`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b5390019c2609) -
+  Optimizations for node visibility for remix button checks
+
+### Patch Changes
+
+- Updated dependencies
+
+## 8.10.3
+
+### Patch Changes
+
+- [`5d27d5dc155ff`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5d27d5dc155ff) -
+  Editor-5020: Fix the column drop hint not visible inside sync block
+- Updated dependencies
+
 ## 8.10.2
 
 ### Patch Changes

package/dist/cjs/pm-plugins/decorations-drop-target-active.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getActiveDropTargetDecorations = exports.canMoveNodeOrSliceToPos = void 0;
 var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _decorationsCommon = require("./decorations-common");
@@ -211,23 +212,45 @@ var getActiveDropTargetDecorations = exports.getActiveDropTargetDecorations = fu
       pos: root.pos
     };
   }
+  var anchorEmitNodeWithPos = rootNodeWithPos;
   if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
-    var _isSameLayout = $activeNodePos && (0, _validation.isInSameLayout)($activeNodePos, state.doc.resolve(rootNodeWithPos.pos));
+    if ((0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true) && (0, _expValEquals.expValEquals)('platform_synced_block_patch_6', 'isEnabled', true)) {
+      var schema = rootNodeWithPos.node.type.schema;
+      var layoutSection = schema.nodes.layoutSection;
+      var isLayoutSectionChildOfRoot = (0, _utils2.findChildrenByType)(rootNodeWithPos.node, layoutSection, false).length > 0;
+      if (isLayoutSectionChildOfRoot) {
+        // if node has layoutSection as a child, get the layoutSection node and pos
+        for (var ancestorDepth = $toPos.depth; ancestorDepth >= 1; ancestorDepth--) {
+          if ($toPos.node(ancestorDepth).type.name === 'layoutSection') {
+            anchorEmitNodeWithPos = {
+              node: $toPos.node(ancestorDepth),
+              pos: $toPos.before(ancestorDepth)
+            };
+            break;
+          }
+        }
+      } else {
+        anchorEmitNodeWithPos = rootNodeWithPos;
+      }
+    } else {
+      anchorEmitNodeWithPos = rootNodeWithPos;
+    }
+    var _isSameLayout = $activeNodePos && (0, _validation.isInSameLayout)($activeNodePos, state.doc.resolve(anchorEmitNodeWithPos.pos));
     var hasUnsupportedContent = UNSUPPORTED_LAYOUT_CONTENT.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') && (0, _experiments.editorExperiment)('platform_synced_block', true);
-    if (rootNodeWithPos.node.type.name === 'layoutSection' && !hasUnsupportedContent) {
-      var layoutSectionNode = rootNodeWithPos.node;
+    if (anchorEmitNodeWithPos.node.type.name === 'layoutSection' && !hasUnsupportedContent) {
+      var layoutSectionNode = anchorEmitNodeWithPos.node;
       if (layoutSectionNode.childCount < (0, _consts.maxLayoutColumnSupported)() || _isSameLayout) {
         layoutSectionNode.descendants(function (childNode, childPos, parent, index) {
           if (childNode.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && index !== 0 // Not the first node
           ) {
-            var currentPos = rootNodeWithPos.pos + childPos + 1;
+            var currentPos = anchorEmitNodeWithPos.pos + childPos + 1;
             if (existingDecsPos.includes(currentPos)) {
               // if the decoration already exists, we don't add it again.
               decsToRemove = decsToRemove.filter(function (dec) {
                 return dec.from !== currentPos;
               });
             } else {
-              decsToAdd.push((0, _decorationsDropTarget.createLayoutDropTargetDecoration)(rootNodeWithPos.pos + childPos + 1, {
+              decsToAdd.push((0, _decorationsDropTarget.createLayoutDropTargetDecoration)(anchorEmitNodeWithPos.pos + childPos + 1, {
                 api: api,
                 parent: parent,
                 formatMessage: formatMessage
@@ -239,7 +262,7 @@ var getActiveDropTargetDecorations = exports.getActiveDropTargetDecorations = fu
       }
     }
   }
-  _activeAnchorTracker.defaultActiveAnchorTracker.emit((0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? api.core.actions.getAnchorIdForNode(rootNodeWithPos.node, rootNodeWithPos.pos) || '' : (0, _decorationsCommon.getNodeAnchor)(rootNodeWithPos.node));
+  _activeAnchorTracker.defaultActiveAnchorTracker.emit((0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? api.core.actions.getAnchorIdForNode(anchorEmitNodeWithPos.node, anchorEmitNodeWithPos.pos) || '' : (0, _decorationsCommon.getNodeAnchor)(anchorEmitNodeWithPos.node));
   return {
     decsToAdd: decsToAdd,
     decsToRemove: decsToRemove

package/dist/es2019/pm-plugins/decorations-drop-target-active.js

@@ -1,5 +1,6 @@
 import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
+import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getNodeAnchor } from './decorations-common';
@@ -194,21 +195,45 @@ export const getActiveDropTargetDecorations = (activeDropTargetNode, state, api,
       pos: root.pos
     };
   }
+  let anchorEmitNodeWithPos = rootNodeWithPos;
   if (editorExperiment('advanced_layouts', true)) {
-    const isSameLayout = $activeNodePos && isInSameLayout($activeNodePos, state.doc.resolve(rootNodeWithPos.pos));
+    if (expValEquals('platform_synced_block', 'isEnabled', true) && expValEquals('platform_synced_block_patch_6', 'isEnabled', true)) {
+      const schema = rootNodeWithPos.node.type.schema;
+      const {
+        layoutSection
+      } = schema.nodes;
+      const isLayoutSectionChildOfRoot = findChildrenByType(rootNodeWithPos.node, layoutSection, false).length > 0;
+      if (isLayoutSectionChildOfRoot) {
+        // if node has layoutSection as a child, get the layoutSection node and pos
+        for (let ancestorDepth = $toPos.depth; ancestorDepth >= 1; ancestorDepth--) {
+          if ($toPos.node(ancestorDepth).type.name === 'layoutSection') {
+            anchorEmitNodeWithPos = {
+              node: $toPos.node(ancestorDepth),
+              pos: $toPos.before(ancestorDepth)
+            };
+            break;
+          }
+        }
+      } else {
+        anchorEmitNodeWithPos = rootNodeWithPos;
+      }
+    } else {
+      anchorEmitNodeWithPos = rootNodeWithPos;
+    }
+    const isSameLayout = $activeNodePos && isInSameLayout($activeNodePos, state.doc.resolve(anchorEmitNodeWithPos.pos));
     const hasUnsupportedContent = UNSUPPORTED_LAYOUT_CONTENT.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') && editorExperiment('platform_synced_block', true);
-    if (rootNodeWithPos.node.type.name === 'layoutSection' && !hasUnsupportedContent) {
-      const layoutSectionNode = rootNodeWithPos.node;
+    if (anchorEmitNodeWithPos.node.type.name === 'layoutSection' && !hasUnsupportedContent) {
+      const layoutSectionNode = anchorEmitNodeWithPos.node;
       if (layoutSectionNode.childCount < maxLayoutColumnSupported() || isSameLayout) {
         layoutSectionNode.descendants((childNode, childPos, parent, index) => {
           if (childNode.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && index !== 0 // Not the first node
           ) {
-            const currentPos = rootNodeWithPos.pos + childPos + 1;
+            const currentPos = anchorEmitNodeWithPos.pos + childPos + 1;
             if (existingDecsPos.includes(currentPos)) {
               // if the decoration already exists, we don't add it again.
               decsToRemove = decsToRemove.filter(dec => dec.from !== currentPos);
             } else {
-              decsToAdd.push(createLayoutDropTargetDecoration(rootNodeWithPos.pos + childPos + 1, {
+              decsToAdd.push(createLayoutDropTargetDecoration(anchorEmitNodeWithPos.pos + childPos + 1, {
                 api,
                 parent,
                 formatMessage
@@ -220,7 +245,7 @@ export const getActiveDropTargetDecorations = (activeDropTargetNode, state, api,
       }
     }
   }
-  defaultActiveAnchorTracker.emit(expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? api.core.actions.getAnchorIdForNode(rootNodeWithPos.node, rootNodeWithPos.pos) || '' : getNodeAnchor(rootNodeWithPos.node));
+  defaultActiveAnchorTracker.emit(expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? api.core.actions.getAnchorIdForNode(anchorEmitNodeWithPos.node, anchorEmitNodeWithPos.pos) || '' : getNodeAnchor(anchorEmitNodeWithPos.node));
   return {
     decsToAdd,
     decsToRemove

package/dist/esm/pm-plugins/decorations-drop-target-active.js

@@ -1,5 +1,6 @@
 import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
+import { findChildrenByType } from '@atlaskit/editor-prosemirror/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { getNodeAnchor } from './decorations-common';
@@ -206,23 +207,45 @@ export var getActiveDropTargetDecorations = function getActiveDropTargetDecorati
       pos: root.pos
     };
   }
+  var anchorEmitNodeWithPos = rootNodeWithPos;
   if (editorExperiment('advanced_layouts', true)) {
-    var _isSameLayout = $activeNodePos && isInSameLayout($activeNodePos, state.doc.resolve(rootNodeWithPos.pos));
+    if (expValEquals('platform_synced_block', 'isEnabled', true) && expValEquals('platform_synced_block_patch_6', 'isEnabled', true)) {
+      var schema = rootNodeWithPos.node.type.schema;
+      var layoutSection = schema.nodes.layoutSection;
+      var isLayoutSectionChildOfRoot = findChildrenByType(rootNodeWithPos.node, layoutSection, false).length > 0;
+      if (isLayoutSectionChildOfRoot) {
+        // if node has layoutSection as a child, get the layoutSection node and pos
+        for (var ancestorDepth = $toPos.depth; ancestorDepth >= 1; ancestorDepth--) {
+          if ($toPos.node(ancestorDepth).type.name === 'layoutSection') {
+            anchorEmitNodeWithPos = {
+              node: $toPos.node(ancestorDepth),
+              pos: $toPos.before(ancestorDepth)
+            };
+            break;
+          }
+        }
+      } else {
+        anchorEmitNodeWithPos = rootNodeWithPos;
+      }
+    } else {
+      anchorEmitNodeWithPos = rootNodeWithPos;
+    }
+    var _isSameLayout = $activeNodePos && isInSameLayout($activeNodePos, state.doc.resolve(anchorEmitNodeWithPos.pos));
     var hasUnsupportedContent = UNSUPPORTED_LAYOUT_CONTENT.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') && editorExperiment('platform_synced_block', true);
-    if (rootNodeWithPos.node.type.name === 'layoutSection' && !hasUnsupportedContent) {
-      var layoutSectionNode = rootNodeWithPos.node;
+    if (anchorEmitNodeWithPos.node.type.name === 'layoutSection' && !hasUnsupportedContent) {
+      var layoutSectionNode = anchorEmitNodeWithPos.node;
       if (layoutSectionNode.childCount < maxLayoutColumnSupported() || _isSameLayout) {
         layoutSectionNode.descendants(function (childNode, childPos, parent, index) {
           if (childNode.type.name === 'layoutColumn' && (parent === null || parent === void 0 ? void 0 : parent.type.name) === 'layoutSection' && index !== 0 // Not the first node
           ) {
-            var currentPos = rootNodeWithPos.pos + childPos + 1;
+            var currentPos = anchorEmitNodeWithPos.pos + childPos + 1;
             if (existingDecsPos.includes(currentPos)) {
               // if the decoration already exists, we don't add it again.
               decsToRemove = decsToRemove.filter(function (dec) {
                 return dec.from !== currentPos;
               });
             } else {
-              decsToAdd.push(createLayoutDropTargetDecoration(rootNodeWithPos.pos + childPos + 1, {
+              decsToAdd.push(createLayoutDropTargetDecoration(anchorEmitNodeWithPos.pos + childPos + 1, {
                 api: api,
                 parent: parent,
                 formatMessage: formatMessage
@@ -234,7 +257,7 @@ export var getActiveDropTargetDecorations = function getActiveDropTargetDecorati
       }
     }
   }
-  defaultActiveAnchorTracker.emit(expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? api.core.actions.getAnchorIdForNode(rootNodeWithPos.node, rootNodeWithPos.pos) || '' : getNodeAnchor(rootNodeWithPos.node));
+  defaultActiveAnchorTracker.emit(expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? api.core.actions.getAnchorIdForNode(anchorEmitNodeWithPos.node, anchorEmitNodeWithPos.pos) || '' : getNodeAnchor(anchorEmitNodeWithPos.node));
   return {
     decsToAdd: decsToAdd,
     decsToRemove: decsToRemove

package/dist/types/blockControlsPluginType.d.ts

@@ -111,7 +111,6 @@ export type HandleOptions = {
 } | undefined;
 /**
  * Props passed to custom right-edge button components (e.g. config.rightEdgeButton).
- * Used by malleable-ui for BlockRemixButton when rendered via node decoration.
  */
 export type RightEdgeButtonProps = {
     api: PublicPluginAPI<[BlockControlsPlugin]>;
@@ -132,13 +131,13 @@ export type NodeDecorationFactoryParams = {
  */
 export type NodeDecorationFactory = {
     create: (params: NodeDecorationFactoryParams) => Decoration;
-    /** Show this decoration in view mode when hovering over a block */
-    showInViewMode?: boolean;
     /**
      * Optional filter: when false, the decoration is not created.
      * Use for node-type-specific visibility (e.g. Remix button only on remixable blocks).
      */
     shouldCreate?: (params: NodeDecorationFactoryParams) => boolean;
+    /** Show this decoration in view mode when hovering over a block */
+    showInViewMode?: boolean;
     type: string;
 };
 export type MoveNode = (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape['formatMessage']) => EditorCommand;

package/dist/types-ts4.5/blockControlsPluginType.d.ts

@@ -111,7 +111,6 @@ export type HandleOptions = {
 } | undefined;
 /**
  * Props passed to custom right-edge button components (e.g. config.rightEdgeButton).
- * Used by malleable-ui for BlockRemixButton when rendered via node decoration.
  */
 export type RightEdgeButtonProps = {
     api: PublicPluginAPI<[
@@ -134,13 +133,13 @@ export type NodeDecorationFactoryParams = {
  */
 export type NodeDecorationFactory = {
     create: (params: NodeDecorationFactoryParams) => Decoration;
-    /** Show this decoration in view mode when hovering over a block */
-    showInViewMode?: boolean;
     /**
      * Optional filter: when false, the decoration is not created.
      * Use for node-type-specific visibility (e.g. Remix button only on remixable blocks).
      */
     shouldCreate?: (params: NodeDecorationFactoryParams) => boolean;
+    /** Show this decoration in view mode when hovering over a block */
+    showInViewMode?: boolean;
     type: string;
 };
 export type MoveNode = (start: number, to: number, inputMethod?: MoveNodeMethod, formatMessage?: IntlShape['formatMessage']) => EditorCommand;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "8.10.2",
+	"version": "8.11.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -56,7 +56,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/theme": "^22.0.0",
-		"@atlaskit/tmp-editor-statsig": "^35.0.0",
+		"@atlaskit/tmp-editor-statsig": "^35.4.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@babel/runtime": "^7.0.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.30.0",
+		"@atlaskit/editor-common": "^111.31.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"