@atlaskit/editor-plugin-block-controls 11.5.2 → 11.5.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 11.5.4
+
+### Patch Changes
+
+- Updated dependencies
+
+## 11.5.3
+
+### Patch Changes
+
+- [`cd85cdec5ae7e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cd85cdec5ae7e) -
+  EDITOR-7170 add transform for panel -> panel_c1
+- Updated dependencies
+
 ## 11.5.2
 
 ### Patch Changes

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

@@ -19,6 +19,7 @@ var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _main = require("../pm-plugins/main");
 var _analytics2 = require("../pm-plugins/utils/analytics");
@@ -77,7 +78,8 @@ var nodesSupportDragLayoutColumnInto = ['tableCell', 'tableHeader', 'panel', 'ex
 var isDragLayoutColumnIntoSupportedNodes = function isDragLayoutColumnIntoSupportedNodes($from, $to) {
   var _$from$nodeAfter;
   var isTopLevel = $to.depth === 0;
-  var isDragIntoNodes = nodesSupportDragLayoutColumnInto.includes($to.parent.type.name);
+  var toParentTypeName = (0, _expValEquals.expValEquals)('platform_editor_nest_table_in_panel', 'isEnabled', true) ? (0, _utils.getBaseNodeTypeName)($to.parent.type) : $to.parent.type.name;
+  var isDragIntoNodes = nodesSupportDragLayoutColumnInto.includes(toParentTypeName);
   var supportedCondition = isDragIntoNodes || isTopLevel;
   return ((_$from$nodeAfter = $from.nodeAfter) === null || _$from$nodeAfter === void 0 ? void 0 : _$from$nodeAfter.type.name) === 'layoutColumn' && $from.parent.type.name === 'layoutSection' && supportedCondition;
 };

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

@@ -245,7 +245,8 @@ var dropTargetDecorations = exports.dropTargetDecorations = function dropTargetD
       return false; //not valid pos, so nested not valid either
     }
     var parentTypesWithEndDropTarget = (0, _experiments.editorExperiment)('platform_synced_block', true) ? PARENT_WITH_END_DROP_TARGET_NEXT : PARENT_WITH_END_DROP_TARGET;
-    if (parent.lastChild === node && !(0, _utils.isEmptyParagraph)(node) && parentTypesWithEndDropTarget.includes(parent.type.name)) {
+    var parentTypeName = (0, _expValEquals.expValEquals)('platform_editor_nest_table_in_panel', 'isEnabled', true) ? (0, _utils.getBaseNodeTypeName)(parent.type) : parent.type.name;
+    if (parent.lastChild === node && !(0, _utils.isEmptyParagraph)(node) && parentTypesWithEndDropTarget.includes(parentTypeName)) {
       endPos = pos + node.nodeSize;
     }
     var previousNode = popNodeStack(depth); // created scoped variable

package/dist/cjs/pm-plugins/utils/validation.js

@@ -12,6 +12,7 @@ var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _nesting = require("@atlaskit/editor-common/nesting");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var isInsideTable = exports.isInsideTable = function isInsideTable(nodeType) {
   var _nodeType$schema$node = nodeType.schema.nodes,
@@ -112,6 +113,7 @@ function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNodePos,
     nestedExpand = _schema$nodes.nestedExpand,
     doc = _schema$nodes.doc,
     panel = _schema$nodes.panel,
+    panel_c1 = _schema$nodes.panel_c1,
     layoutColumn = _schema$nodes.layoutColumn,
     layoutSection = _schema$nodes.layoutSection;
   var destParentNodeType = destParent === null || destParent === void 0 ? void 0 : destParent.type;
@@ -133,7 +135,7 @@ function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNodePos,
       }
       return canCreateNodeWithContentInsideAnotherNode([tableCell, tableHeader], convertedFragment);
     }
-    if (destParentNodeType === panel) {
+    if (destParentNodeType === panel || (0, _expValEquals.expValEquals)('platform_editor_nest_table_in_panel', 'isEnabled', true) && destParentNodeType === panel_c1) {
       return canCreateNodeWithContentInsideAnotherNode([panel], layoutColumnContent);
     }
     if (destParentNodeType === expand) {

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

@@ -134,7 +134,7 @@ var dragHandleButtonStyles = (0, _react2.css)({
     backgroundColor: 'transparent'
   },
   '&:hover:disabled': {
-    backgroundColor: "var(--ds-background-disabled, #17171708)"
+    backgroundColor: "var(--ds-background-disabled, #0515240F)"
   }
 });
 
@@ -190,7 +190,7 @@ var dragHandleButtonStylesOld = (0, _react2.css)({
     backgroundColor: 'transparent'
   },
   '&:hover:disabled': {
-    backgroundColor: "var(--ds-background-disabled, #17171708)"
+    backgroundColor: "var(--ds-background-disabled, #0515240F)"
   }
 });
 var focusedStylesOld = (0, _react2.css)({

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

@@ -4,13 +4,14 @@ import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import { expandSelectionBounds, GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
 import { DIRECTION } from '@atlaskit/editor-common/types';
-import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
+import { getBaseNodeTypeName, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
 import { findChildrenByType, findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
 import { attachMoveNodeAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
@@ -69,7 +70,8 @@ const nodesSupportDragLayoutColumnInto = ['tableCell', 'tableHeader', 'panel', '
 const isDragLayoutColumnIntoSupportedNodes = ($from, $to) => {
   var _$from$nodeAfter;
   const isTopLevel = $to.depth === 0;
-  const isDragIntoNodes = nodesSupportDragLayoutColumnInto.includes($to.parent.type.name);
+  const toParentTypeName = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? getBaseNodeTypeName($to.parent.type) : $to.parent.type.name;
+  const isDragIntoNodes = nodesSupportDragLayoutColumnInto.includes(toParentTypeName);
   const supportedCondition = isDragIntoNodes || isTopLevel;
   return ((_$from$nodeAfter = $from.nodeAfter) === null || _$from$nodeAfter === void 0 ? void 0 : _$from$nodeAfter.type.name) === 'layoutColumn' && $from.parent.type.name === 'layoutSection' && supportedCondition;
 };

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

@@ -2,7 +2,7 @@ import { createElement } from 'react';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid';
 import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
-import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
+import { getBaseNodeTypeName, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -234,7 +234,8 @@ export const dropTargetDecorations = (newState, api, formatMessage, nodeViewPort
       return false; //not valid pos, so nested not valid either
     }
     const parentTypesWithEndDropTarget = editorExperiment('platform_synced_block', true) ? PARENT_WITH_END_DROP_TARGET_NEXT : PARENT_WITH_END_DROP_TARGET;
-    if (parent.lastChild === node && !isEmptyParagraph(node) && parentTypesWithEndDropTarget.includes(parent.type.name)) {
+    const parentTypeName = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? getBaseNodeTypeName(parent.type) : parent.type.name;
+    if (parent.lastChild === node && !isEmptyParagraph(node) && parentTypesWithEndDropTarget.includes(parentTypeName)) {
       endPos = pos + node.nodeSize;
     }
     const previousNode = popNodeStack(depth); // created scoped variable

package/dist/es2019/pm-plugins/utils/validation.js

@@ -2,6 +2,7 @@ import memoizeOne from 'memoize-one';
 import { getParentOfTypeCount, isNestedTablesSupported } from '@atlaskit/editor-common/nesting';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 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';
 export const isInsideTable = nodeType => {
   const {
@@ -100,6 +101,7 @@ export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNo
     nestedExpand,
     doc,
     panel,
+    panel_c1,
     layoutColumn,
     layoutSection
   } = schema.nodes;
@@ -122,7 +124,7 @@ export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNo
       }
       return canCreateNodeWithContentInsideAnotherNode([tableCell, tableHeader], convertedFragment);
     }
-    if (destParentNodeType === panel) {
+    if (destParentNodeType === panel || expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) && destParentNodeType === panel_c1) {
       return canCreateNodeWithContentInsideAnotherNode([panel], layoutColumnContent);
     }
     if (destParentNodeType === expand) {

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

@@ -125,7 +125,7 @@ const dragHandleButtonStyles = css({
     backgroundColor: 'transparent'
   },
   '&:hover:disabled': {
-    backgroundColor: "var(--ds-background-disabled, #17171708)"
+    backgroundColor: "var(--ds-background-disabled, #0515240F)"
   }
 });
 
@@ -184,7 +184,7 @@ const dragHandleButtonStylesOld = css({
     backgroundColor: 'transparent'
   },
   '&:hover:disabled': {
-    backgroundColor: "var(--ds-background-disabled, #17171708)"
+    backgroundColor: "var(--ds-background-disabled, #0515240F)"
   }
 });
 const focusedStylesOld = css({

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

@@ -7,13 +7,14 @@ import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import { expandSelectionBounds, GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/transforms';
 import { DIRECTION } from '@atlaskit/editor-common/types';
-import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
+import { getBaseNodeTypeName, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
 import { findChildrenByType, findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
 import { attachMoveNodeAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
@@ -71,7 +72,8 @@ var nodesSupportDragLayoutColumnInto = ['tableCell', 'tableHeader', 'panel', 'ex
 var isDragLayoutColumnIntoSupportedNodes = function isDragLayoutColumnIntoSupportedNodes($from, $to) {
   var _$from$nodeAfter;
   var isTopLevel = $to.depth === 0;
-  var isDragIntoNodes = nodesSupportDragLayoutColumnInto.includes($to.parent.type.name);
+  var toParentTypeName = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? getBaseNodeTypeName($to.parent.type) : $to.parent.type.name;
+  var isDragIntoNodes = nodesSupportDragLayoutColumnInto.includes(toParentTypeName);
   var supportedCondition = isDragIntoNodes || isTopLevel;
   return ((_$from$nodeAfter = $from.nodeAfter) === null || _$from$nodeAfter === void 0 ? void 0 : _$from$nodeAfter.type.name) === 'layoutColumn' && $from.parent.type.name === 'layoutSection' && supportedCondition;
 };

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

@@ -5,7 +5,7 @@ import { createElement } from 'react';
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid';
 import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
-import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
+import { getBaseNodeTypeName, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -239,7 +239,8 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
       return false; //not valid pos, so nested not valid either
     }
     var parentTypesWithEndDropTarget = editorExperiment('platform_synced_block', true) ? PARENT_WITH_END_DROP_TARGET_NEXT : PARENT_WITH_END_DROP_TARGET;
-    if (parent.lastChild === node && !isEmptyParagraph(node) && parentTypesWithEndDropTarget.includes(parent.type.name)) {
+    var parentTypeName = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? getBaseNodeTypeName(parent.type) : parent.type.name;
+    if (parent.lastChild === node && !isEmptyParagraph(node) && parentTypesWithEndDropTarget.includes(parentTypeName)) {
       endPos = pos + node.nodeSize;
     }
     var previousNode = popNodeStack(depth); // created scoped variable

package/dist/esm/pm-plugins/utils/validation.js

@@ -2,6 +2,7 @@ import memoizeOne from 'memoize-one';
 import { getParentOfTypeCount, isNestedTablesSupported } from '@atlaskit/editor-common/nesting';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 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';
 export var isInsideTable = function isInsideTable(nodeType) {
   var _nodeType$schema$node = nodeType.schema.nodes,
@@ -102,6 +103,7 @@ export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNo
     nestedExpand = _schema$nodes.nestedExpand,
     doc = _schema$nodes.doc,
     panel = _schema$nodes.panel,
+    panel_c1 = _schema$nodes.panel_c1,
     layoutColumn = _schema$nodes.layoutColumn,
     layoutSection = _schema$nodes.layoutSection;
   var destParentNodeType = destParent === null || destParent === void 0 ? void 0 : destParent.type;
@@ -123,7 +125,7 @@ export function canMoveNodeToIndex(destParent, indexIntoParent, srcNode, $destNo
       }
       return canCreateNodeWithContentInsideAnotherNode([tableCell, tableHeader], convertedFragment);
     }
-    if (destParentNodeType === panel) {
+    if (destParentNodeType === panel || expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) && destParentNodeType === panel_c1) {
       return canCreateNodeWithContentInsideAnotherNode([panel], layoutColumnContent);
     }
     if (destParentNodeType === expand) {

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

@@ -130,7 +130,7 @@ var dragHandleButtonStyles = css({
     backgroundColor: 'transparent'
   },
   '&:hover:disabled': {
-    backgroundColor: "var(--ds-background-disabled, #17171708)"
+    backgroundColor: "var(--ds-background-disabled, #0515240F)"
   }
 });
 
@@ -186,7 +186,7 @@ var dragHandleButtonStylesOld = css({
     backgroundColor: 'transparent'
   },
   '&:hover:disabled': {
-    backgroundColor: "var(--ds-background-disabled, #17171708)"
+    backgroundColor: "var(--ds-background-disabled, #0515240F)"
   }
 });
 var focusedStylesOld = css({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "11.5.2",
+	"version": "11.5.4",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,7 +41,7 @@
 		"@atlaskit/editor-plugin-quick-insert": "^10.4.0",
 		"@atlaskit/editor-plugin-selection": "^10.1.0",
 		"@atlaskit/editor-plugin-toolbar": "^7.3.0",
-		"@atlaskit/editor-plugin-type-ahead": "^10.2.0",
+		"@atlaskit/editor-plugin-type-ahead": "^10.3.0",
 		"@atlaskit/editor-plugin-user-intent": "^8.2.0",
 		"@atlaskit/editor-plugin-width": "^11.1.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
@@ -56,9 +56,9 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^19.0.0",
 		"@atlaskit/theme": "^25.0.0",
-		"@atlaskit/tmp-editor-statsig": "^84.0.0",
-		"@atlaskit/tokens": "^13.0.0",
-		"@atlaskit/tooltip": "^22.3.0",
+		"@atlaskit/tmp-editor-statsig": "^85.0.0",
+		"@atlaskit/tokens": "^13.1.0",
+		"@atlaskit/tooltip": "^22.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.47.0",
+		"@atlaskit/editor-common": "^114.50.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"