@atlaskit/editor-plugin-block-controls 7.5.10 → 7.7.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.7.0
+
+### Minor Changes
+
+- [`1bfde822534e5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1bfde822534e5) -
+  EDITOR-2749 fix drag and drop issue in bodied sync block
+
+### Patch Changes
+
+- Updated dependencies
+
+## 7.6.0
+
+### Minor Changes
+
+- [`a68556d4ce662`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a68556d4ce662) -
+  [ux] Stop flickering on synced blocks as first child + expands as f irst child in synced blocks
+
 ## 7.5.10
 
 ### Patch Changes

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

@@ -18,12 +18,16 @@ var _validation = require("./utils/validation");
  * List of parent node types that can have child nodes
  */
 var PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
+var PARENT_WITH_END_DROP_TARGET_SYNC_BLOCK = [].concat(PARENT_WITH_END_DROP_TARGET, ['bodiedSyncBlock']);
 
 /**
  * List of node types that does not allow drop targets at before or after the node.
  */
 var NODE_WITH_NO_PARENT_POS = ['tableCell', 'tableHeader', 'layoutColumn'];
 var isContainerNode = function isContainerNode(node) {
+  if ((0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true)) {
+    return PARENT_WITH_END_DROP_TARGET_SYNC_BLOCK.includes(node.type.name);
+  }
   return PARENT_WITH_END_DROP_TARGET.includes(node.type.name);
 };
 var canMoveNodeOrSliceToPos = exports.canMoveNodeOrSliceToPos = function canMoveNodeOrSliceToPos(state, node, parent, index, $toPos, activeNode) {

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

@@ -493,7 +493,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
   if (api) {
     if ((0, _expValEquals.expValEquals)('platform_editor_block_controls_perf_optimization', 'isEnabled', true)) {
       // If page is updated while dragging (likely by remote updates), we simply remove the drop targets
-      // and add them back when the use interacts with the editor again
+      // and add them back when the user interacts with the editor again
       if (isDropTargetsMissing) {
         var oldDropTargetDecs = (0, _decorationsDropTarget.findDropTargetDecs)(decorations);
         decorations = decorations.remove(oldDropTargetDecs);

package/dist/cjs/ui/global-styles.js

@@ -231,7 +231,7 @@ var globalDnDStyle = (0, _react.css)({
 var globalStyles = function globalStyles() {
   return (0, _react.css)({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-    '.ProseMirror-widget:first-child + *:not([data-panel-type], .code-block, [data-node-type="nestedExpand"], [data-layout-section="true"])': {
+    '.ProseMirror-widget:first-child + *:not([data-panel-type], .code-block, [data-node-type="nestedExpand"], [data-node-type="expand"], [data-layout-section="true"], [data-prosemirror-node-name="bodiedSyncBlock"])': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
       marginTop: '0 !important'
     }
@@ -324,7 +324,7 @@ var topLevelNodeMarginStyles = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.ProseMirror': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-    '> .ProseMirror-widget:first-child + .ProseMirror-gapcursor + *:not([data-layout-section="true"]), > .ProseMirror-widget:first-child + *:not([data-layout-section="true"])': {
+    '> .ProseMirror-widget:first-child + .ProseMirror-gapcursor + *:not([data-layout-section="true"], [data-prosemirror-node-name="bodiedSyncBlock"]), > .ProseMirror-widget:first-child + *:not([data-layout-section="true"], [data-prosemirror-node-name="bodiedSyncBlock"])': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
       marginTop: '0 !important'
     }

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

@@ -13,12 +13,16 @@ import { canMoveNodeToIndex, canMoveSliceToIndex, isInSameLayout } from './utils
  * List of parent node types that can have child nodes
  */
 const PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
+const PARENT_WITH_END_DROP_TARGET_SYNC_BLOCK = [...PARENT_WITH_END_DROP_TARGET, 'bodiedSyncBlock'];
 
 /**
  * List of node types that does not allow drop targets at before or after the node.
  */
 const NODE_WITH_NO_PARENT_POS = ['tableCell', 'tableHeader', 'layoutColumn'];
 const isContainerNode = node => {
+  if (expValEquals('platform_synced_block', 'isEnabled', true)) {
+    return PARENT_WITH_END_DROP_TARGET_SYNC_BLOCK.includes(node.type.name);
+  }
   return PARENT_WITH_END_DROP_TARGET.includes(node.type.name);
 };
 export const canMoveNodeOrSliceToPos = (state, node, parent, index, $toPos, activeNode) => {

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

@@ -490,7 +490,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
   if (api) {
     if (expValEquals('platform_editor_block_controls_perf_optimization', 'isEnabled', true)) {
       // If page is updated while dragging (likely by remote updates), we simply remove the drop targets
-      // and add them back when the use interacts with the editor again
+      // and add them back when the user interacts with the editor again
       if (isDropTargetsMissing) {
         const oldDropTargetDecs = findDropTargetDecs(decorations);
         decorations = decorations.remove(oldDropTargetDecs);

package/dist/es2019/ui/global-styles.js

@@ -284,7 +284,7 @@ const globalDnDStyle = css({
 });
 const globalStyles = () => css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-  '.ProseMirror-widget:first-child + *:not([data-panel-type], .code-block, [data-node-type="nestedExpand"], [data-layout-section="true"])': {
+  '.ProseMirror-widget:first-child + *:not([data-panel-type], .code-block, [data-node-type="nestedExpand"], [data-node-type="expand"], [data-layout-section="true"], [data-prosemirror-node-name="bodiedSyncBlock"])': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
     marginTop: '0 !important'
   }
@@ -374,7 +374,7 @@ const topLevelNodeMarginStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.ProseMirror': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-    '> .ProseMirror-widget:first-child + .ProseMirror-gapcursor + *:not([data-layout-section="true"]), > .ProseMirror-widget:first-child + *:not([data-layout-section="true"])': {
+    '> .ProseMirror-widget:first-child + .ProseMirror-gapcursor + *:not([data-layout-section="true"], [data-prosemirror-node-name="bodiedSyncBlock"]), > .ProseMirror-widget:first-child + *:not([data-layout-section="true"], [data-prosemirror-node-name="bodiedSyncBlock"])': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
       marginTop: '0 !important'
     }

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

@@ -13,12 +13,16 @@ import { canMoveNodeToIndex, canMoveSliceToIndex, isInSameLayout } from './utils
  * List of parent node types that can have child nodes
  */
 var PARENT_WITH_END_DROP_TARGET = ['tableCell', 'tableHeader', 'panel', 'layoutColumn', 'expand', 'nestedExpand', 'bodiedExtension'];
+var PARENT_WITH_END_DROP_TARGET_SYNC_BLOCK = [].concat(PARENT_WITH_END_DROP_TARGET, ['bodiedSyncBlock']);
 
 /**
  * List of node types that does not allow drop targets at before or after the node.
  */
 var NODE_WITH_NO_PARENT_POS = ['tableCell', 'tableHeader', 'layoutColumn'];
 var isContainerNode = function isContainerNode(node) {
+  if (expValEquals('platform_synced_block', 'isEnabled', true)) {
+    return PARENT_WITH_END_DROP_TARGET_SYNC_BLOCK.includes(node.type.name);
+  }
   return PARENT_WITH_END_DROP_TARGET.includes(node.type.name);
 };
 export var canMoveNodeOrSliceToPos = function canMoveNodeOrSliceToPos(state, node, parent, index, $toPos, activeNode) {

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

@@ -486,7 +486,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
   if (api) {
     if (expValEquals('platform_editor_block_controls_perf_optimization', 'isEnabled', true)) {
       // If page is updated while dragging (likely by remote updates), we simply remove the drop targets
-      // and add them back when the use interacts with the editor again
+      // and add them back when the user interacts with the editor again
       if (isDropTargetsMissing) {
         var oldDropTargetDecs = findDropTargetDecs(decorations);
         decorations = decorations.remove(oldDropTargetDecs);

package/dist/esm/ui/global-styles.js

@@ -224,7 +224,7 @@ var globalDnDStyle = css({
 var globalStyles = function globalStyles() {
   return css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-    '.ProseMirror-widget:first-child + *:not([data-panel-type], .code-block, [data-node-type="nestedExpand"], [data-layout-section="true"])': {
+    '.ProseMirror-widget:first-child + *:not([data-panel-type], .code-block, [data-node-type="nestedExpand"], [data-node-type="expand"], [data-layout-section="true"], [data-prosemirror-node-name="bodiedSyncBlock"])': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
       marginTop: '0 !important'
     }
@@ -317,7 +317,7 @@ var topLevelNodeMarginStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.ProseMirror': {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-    '> .ProseMirror-widget:first-child + .ProseMirror-gapcursor + *:not([data-layout-section="true"]), > .ProseMirror-widget:first-child + *:not([data-layout-section="true"])': {
+    '> .ProseMirror-widget:first-child + .ProseMirror-gapcursor + *:not([data-layout-section="true"], [data-prosemirror-node-name="bodiedSyncBlock"]), > .ProseMirror-widget:first-child + *:not([data-layout-section="true"], [data-prosemirror-node-name="bodiedSyncBlock"])': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
       marginTop: '0 !important'
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "7.5.10",
+	"version": "7.7.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -55,7 +55,7 @@
 		"@atlaskit/theme": "^21.0.0",
 		"@atlaskit/tmp-editor-statsig": "^13.38.0",
 		"@atlaskit/tokens": "^8.0.0",
-		"@atlaskit/tooltip": "^20.8.0",
+		"@atlaskit/tooltip": "^20.9.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"@popperjs/core": "^2.11.8",
@@ -65,7 +65,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.29.0",
+		"@atlaskit/editor-common": "^110.31.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"