@atlaskit/editor-plugin-block-controls 2.15.12 → 2.16.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.16.0
+
+### Minor Changes
+
+- [#180960](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/180960)
+  [`3ee72a54bc1bb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3ee72a54bc1bb) -
+  ED-26040 fix editor layout padding issue
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.15.13
+
+### Patch Changes
+
+- [#178794](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/178794)
+  [`a8c669da6eb60`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a8c669da6eb60) -
+  ED-25991 Cleaned up "platform_editor_element_drag_and_drop_ed_24304" feature gate
+
 ## 2.15.12
 
 ### Patch Changes

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

@@ -491,7 +491,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           }
 
           // TODO: Review usage of posAtDOM here
-          var domPos = (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_24304') ? Math.max(view.posAtDOM(nodeElement, 0) - 1, 0) : view.posAtDOM(nodeElement, 0) - 1;
+          var domPos = Math.max(view.posAtDOM(nodeElement, 0) - 1, 0);
           var nodeTarget = state.doc.nodeAt(domPos);
           var isSameNode = !!(nodeTarget && draggable !== null && draggable !== void 0 && draggable.eq(nodeTarget));
           if (isSameNode) {
@@ -552,7 +552,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
               return true;
             }
           }
-          if (event.shiftKey && event.ctrlKey && (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873')) {
+          if (event.shiftKey && event.ctrlKey) {
             //prevent holding down key combo from firing repeatedly
             if (!event.repeat && (0, _keymap.boundKeydownHandler)(api, formatMessage)(view, event)) {
               event.preventDefault();

package/dist/cjs/ui/consts.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.topPositionAdjustment = exports.spaceLookupMap = exports.nodeMargins = exports.getNestedNodeLeftPaddingMargin = exports.dropTargetMarginMap = exports.dragHandleGap = exports.DRAG_HANDLE_ZINDEX = exports.DRAG_HANDLE_WIDTH = exports.DRAG_HANDLE_PARAGRAPH_TOP_ADJUSTMENT = exports.DRAG_HANDLE_NARROW_GAP = exports.DRAG_HANDLE_MAX_WIDTH_PLUS_GAP = exports.DRAG_HANDLE_MAX_GAP = exports.DRAG_HANDLE_LAYOUT_SECTION_TOP_ADJUSTMENT = exports.DRAG_HANDLE_HEIGHT = exports.DRAG_HANDLE_H6_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H5_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H4_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H3_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H2_TOP_ADJUSTMENT = exports.DRAG_HANDLE_H1_TOP_ADJUSTMENT = exports.DRAG_HANDLE_DIVIDER_TOP_ADJUSTMENT = exports.DRAG_HANDLE_DEFAULT_GAP = exports.DRAG_HANDLE_BORDER_RADIUS = exports.DEFAULT_COLUMN_DISTRIBUTIONS = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _dropTargetMarginMap;
 var DRAG_HANDLE_HEIGHT = exports.DRAG_HANDLE_HEIGHT = 24;
@@ -28,6 +29,9 @@ var DRAG_HANDLE_LAYOUT_SECTION_TOP_ADJUSTMENT = exports.DRAG_HANDLE_LAYOUT_SECTI
 var DRAG_HANDLE_PARAGRAPH_TOP_ADJUSTMENT = exports.DRAG_HANDLE_PARAGRAPH_TOP_ADJUSTMENT = 2;
 var nodeTypeExcludeList = ['embedCard', 'mediaSingle', 'table'];
 var dragHandleGap = exports.dragHandleGap = function dragHandleGap(nodeType, parentNodeType) {
+  if (nodeType === 'layoutSection' && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_2')) {
+    return DRAG_HANDLE_DEFAULT_GAP + 20;
+  }
   if (parentNodeType && parentNodeType !== 'doc') {
     return DRAG_HANDLE_NARROW_GAP;
   }

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

@@ -468,7 +468,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
           }
 
           // TODO: Review usage of posAtDOM here
-          const domPos = fg('platform_editor_element_drag_and_drop_ed_24304') ? Math.max(view.posAtDOM(nodeElement, 0) - 1, 0) : view.posAtDOM(nodeElement, 0) - 1;
+          const domPos = Math.max(view.posAtDOM(nodeElement, 0) - 1, 0);
           const nodeTarget = state.doc.nodeAt(domPos);
           const isSameNode = !!(nodeTarget && draggable !== null && draggable !== void 0 && draggable.eq(nodeTarget));
           if (isSameNode) {
@@ -532,7 +532,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
               return true;
             }
           }
-          if (event.shiftKey && event.ctrlKey && fg('platform_editor_element_drag_and_drop_ed_23873')) {
+          if (event.shiftKey && event.ctrlKey) {
             //prevent holding down key combo from firing repeatedly
             if (!event.repeat && boundKeydownHandler(api, formatMessage)(view, event)) {
               event.preventDefault();

package/dist/es2019/ui/consts.js

@@ -1,4 +1,5 @@
 import { akEditorUnitZIndex, akRichMediaResizeZIndex } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export const DRAG_HANDLE_HEIGHT = 24;
 export const DRAG_HANDLE_WIDTH = 12;
@@ -19,6 +20,9 @@ export const DRAG_HANDLE_LAYOUT_SECTION_TOP_ADJUSTMENT = 8;
 export const DRAG_HANDLE_PARAGRAPH_TOP_ADJUSTMENT = 2;
 const nodeTypeExcludeList = ['embedCard', 'mediaSingle', 'table'];
 export const dragHandleGap = (nodeType, parentNodeType) => {
+  if (nodeType === 'layoutSection' && fg('platform_editor_advanced_layouts_post_fix_patch_2')) {
+    return DRAG_HANDLE_DEFAULT_GAP + 20;
+  }
   if (parentNodeType && parentNodeType !== 'doc') {
     return DRAG_HANDLE_NARROW_GAP;
   }

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

@@ -484,7 +484,7 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           }
 
           // TODO: Review usage of posAtDOM here
-          var domPos = fg('platform_editor_element_drag_and_drop_ed_24304') ? Math.max(view.posAtDOM(nodeElement, 0) - 1, 0) : view.posAtDOM(nodeElement, 0) - 1;
+          var domPos = Math.max(view.posAtDOM(nodeElement, 0) - 1, 0);
           var nodeTarget = state.doc.nodeAt(domPos);
           var isSameNode = !!(nodeTarget && draggable !== null && draggable !== void 0 && draggable.eq(nodeTarget));
           if (isSameNode) {
@@ -545,7 +545,7 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
               return true;
             }
           }
-          if (event.shiftKey && event.ctrlKey && fg('platform_editor_element_drag_and_drop_ed_23873')) {
+          if (event.shiftKey && event.ctrlKey) {
             //prevent holding down key combo from firing repeatedly
             if (!event.repeat && boundKeydownHandler(api, formatMessage)(view, event)) {
               event.preventDefault();

package/dist/esm/ui/consts.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _dropTargetMarginMap;
 import { akEditorUnitZIndex, akRichMediaResizeZIndex } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var DRAG_HANDLE_HEIGHT = 24;
 export var DRAG_HANDLE_WIDTH = 12;
@@ -21,6 +22,9 @@ export var DRAG_HANDLE_LAYOUT_SECTION_TOP_ADJUSTMENT = 8;
 export var DRAG_HANDLE_PARAGRAPH_TOP_ADJUSTMENT = 2;
 var nodeTypeExcludeList = ['embedCard', 'mediaSingle', 'table'];
 export var dragHandleGap = function dragHandleGap(nodeType, parentNodeType) {
+  if (nodeType === 'layoutSection' && fg('platform_editor_advanced_layouts_post_fix_patch_2')) {
+    return DRAG_HANDLE_DEFAULT_GAP + 20;
+  }
   if (parentNodeType && parentNodeType !== 'doc') {
     return DRAG_HANDLE_NARROW_GAP;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "2.15.12",
+	"version": "2.16.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^96.5.0",
+		"@atlaskit/editor-common": "^96.8.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.27.0",
+		"@atlaskit/tmp-editor-statsig": "^2.29.0",
 		"@atlaskit/tokens": "^2.5.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -124,9 +124,6 @@
 		"platform_editor_element_drag_and_drop_ed_24227": {
 			"type": "boolean"
 		},
-		"platform_editor_element_drag_and_drop_ed_24304": {
-			"type": "boolean"
-		},
 		"platform_editor_element_drag_and_drop_debug": {
 			"type": "boolean"
 		},
@@ -168,6 +165,9 @@
 		},
 		"platform_editor_advanced_layouts_post_fix_patch_1": {
 			"type": "boolean"
+		},
+		"platform_editor_advanced_layouts_post_fix_patch_2": {
+			"type": "boolean"
 		}
 	}
 }