@atlaskit/editor-plugin-block-controls 3.11.2 → 3.13.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.13.0
+
+### Minor Changes
+
+- [#146198](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/146198)
+  [`86a786e83342d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/86a786e83342d) -
+  ED-27730 update layout analytics to include layout column count
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.12.0
+
+### Minor Changes
+
+- [#141039](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/141039)
+  [`ac95ffeb54bda`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ac95ffeb54bda) -
+  ED-27226 clean up platform_editor_advanced_layouts_redraw_on_drag
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.11.2
 
 ### Patch Changes

package/dist/cjs/editor-commands/move-to-layout.js

@@ -330,7 +330,12 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
           breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
             mode: breakoutMode
           })]);
-          (0, _analytics2.fireInsertLayoutAnalytics)(tr, api, sourceNodeTypes, hasSelectedMultipleNodes);
+          if ((0, _platformFeatureFlags.fg)('platform_editor_column_count_analytics')) {
+            // layout created via drag and drop will always be 2 columns
+            (0, _analytics2.fireInsertLayoutAnalytics)(tr, api, sourceNodeTypes, hasSelectedMultipleNodes, 2);
+          } else {
+            (0, _analytics2.fireInsertLayoutAnalytics)(tr, api, sourceNodeTypes, hasSelectedMultipleNodes);
+          }
         }
         return tr;
       }

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

@@ -281,7 +281,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
   // Re-create node decorations
   var isDecSetEmpty = decorations === _view2.DecorationSet.empty;
   var isNodeDecsMissing = isDecSetEmpty || maybeNodeCountChanged;
-  var shouldRedrawNodeDecs = !isResizerResizing && ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_redraw_on_drag') ? isNodeDecsMissing || (meta === null || meta === void 0 ? void 0 : meta.isDragging) : isNodeDecsMissing);
+  var shouldRedrawNodeDecs = !isResizerResizing && (isNodeDecsMissing || (meta === null || meta === void 0 ? void 0 : meta.isDragging));
   var isActiveNodeModified = false;
   if (api && shouldRedrawNodeDecs) {
     var oldNodeDecs = (0, _decorationsAnchor.findNodeDecs)(decorations, from, to);

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

@@ -27,7 +27,7 @@ var attachMoveNodeAnalytics = exports.attachMoveNodeAnalytics = function attachM
     }
   })(tr);
 };
-var fireInsertLayoutAnalytics = exports.fireInsertLayoutAnalytics = function fireInsertLayoutAnalytics(tr, api, nodeTypes, hasSelectedMultipleNodes) {
+var fireInsertLayoutAnalytics = exports.fireInsertLayoutAnalytics = function fireInsertLayoutAnalytics(tr, api, nodeTypes, hasSelectedMultipleNodes, columnCount) {
   var _api$analytics2;
   api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.attachAnalyticsEvent({
     action: _analytics.ACTION.INSERTED,
@@ -36,7 +36,8 @@ var fireInsertLayoutAnalytics = exports.fireInsertLayoutAnalytics = function fir
     attributes: {
       inputMethod: _analytics.INPUT_METHOD.DRAG_AND_DROP,
       nodeTypes: nodeTypes,
-      hasSelectedMultipleNodes: hasSelectedMultipleNodes
+      hasSelectedMultipleNodes: hasSelectedMultipleNodes,
+      columnCount: columnCount
     },
     eventType: _analytics.EVENT_TYPE.TRACK
   })(tr);

package/dist/es2019/editor-commands/move-to-layout.js

@@ -320,7 +320,12 @@ export const moveToLayout = api => (from, to, options) => ({
       breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
         mode: breakoutMode
       })]);
-      fireInsertLayoutAnalytics(tr, api, sourceNodeTypes, hasSelectedMultipleNodes);
+      if (fg('platform_editor_column_count_analytics')) {
+        // layout created via drag and drop will always be 2 columns
+        fireInsertLayoutAnalytics(tr, api, sourceNodeTypes, hasSelectedMultipleNodes, 2);
+      } else {
+        fireInsertLayoutAnalytics(tr, api, sourceNodeTypes, hasSelectedMultipleNodes);
+      }
     }
     return tr;
   }

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

@@ -281,7 +281,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
   // Re-create node decorations
   const isDecSetEmpty = decorations === DecorationSet.empty;
   const isNodeDecsMissing = isDecSetEmpty || maybeNodeCountChanged;
-  const shouldRedrawNodeDecs = !isResizerResizing && (fg('platform_editor_advanced_layouts_redraw_on_drag') ? isNodeDecsMissing || (meta === null || meta === void 0 ? void 0 : meta.isDragging) : isNodeDecsMissing);
+  const shouldRedrawNodeDecs = !isResizerResizing && (isNodeDecsMissing || (meta === null || meta === void 0 ? void 0 : meta.isDragging));
   let isActiveNodeModified = false;
   if (api && shouldRedrawNodeDecs) {
     const oldNodeDecs = findNodeDecs(decorations, from, to);

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

@@ -19,7 +19,7 @@ export const attachMoveNodeAnalytics = (tr, inputMethod, fromDepth, fromNodeType
     }
   })(tr);
 };
-export const fireInsertLayoutAnalytics = (tr, api, nodeTypes, hasSelectedMultipleNodes) => {
+export const fireInsertLayoutAnalytics = (tr, api, nodeTypes, hasSelectedMultipleNodes, columnCount) => {
   var _api$analytics2, _api$analytics2$actio;
   api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : (_api$analytics2$actio = _api$analytics2.actions) === null || _api$analytics2$actio === void 0 ? void 0 : _api$analytics2$actio.attachAnalyticsEvent({
     action: ACTION.INSERTED,
@@ -28,7 +28,8 @@ export const fireInsertLayoutAnalytics = (tr, api, nodeTypes, hasSelectedMultipl
     attributes: {
       inputMethod: INPUT_METHOD.DRAG_AND_DROP,
       nodeTypes,
-      hasSelectedMultipleNodes
+      hasSelectedMultipleNodes,
+      columnCount
     },
     eventType: EVENT_TYPE.TRACK
   })(tr);

package/dist/esm/editor-commands/move-to-layout.js

@@ -324,7 +324,12 @@ export var moveToLayout = function moveToLayout(api) {
           breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
             mode: breakoutMode
           })]);
-          fireInsertLayoutAnalytics(tr, api, sourceNodeTypes, hasSelectedMultipleNodes);
+          if (fg('platform_editor_column_count_analytics')) {
+            // layout created via drag and drop will always be 2 columns
+            fireInsertLayoutAnalytics(tr, api, sourceNodeTypes, hasSelectedMultipleNodes, 2);
+          } else {
+            fireInsertLayoutAnalytics(tr, api, sourceNodeTypes, hasSelectedMultipleNodes);
+          }
         }
         return tr;
       }

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

@@ -274,7 +274,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
   // Re-create node decorations
   var isDecSetEmpty = decorations === DecorationSet.empty;
   var isNodeDecsMissing = isDecSetEmpty || maybeNodeCountChanged;
-  var shouldRedrawNodeDecs = !isResizerResizing && (fg('platform_editor_advanced_layouts_redraw_on_drag') ? isNodeDecsMissing || (meta === null || meta === void 0 ? void 0 : meta.isDragging) : isNodeDecsMissing);
+  var shouldRedrawNodeDecs = !isResizerResizing && (isNodeDecsMissing || (meta === null || meta === void 0 ? void 0 : meta.isDragging));
   var isActiveNodeModified = false;
   if (api && shouldRedrawNodeDecs) {
     var oldNodeDecs = findNodeDecs(decorations, from, to);

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

@@ -20,7 +20,7 @@ export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputM
     }
   })(tr);
 };
-export var fireInsertLayoutAnalytics = function fireInsertLayoutAnalytics(tr, api, nodeTypes, hasSelectedMultipleNodes) {
+export var fireInsertLayoutAnalytics = function fireInsertLayoutAnalytics(tr, api, nodeTypes, hasSelectedMultipleNodes, columnCount) {
   var _api$analytics2;
   api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.attachAnalyticsEvent({
     action: ACTION.INSERTED,
@@ -29,7 +29,8 @@ export var fireInsertLayoutAnalytics = function fireInsertLayoutAnalytics(tr, ap
     attributes: {
       inputMethod: INPUT_METHOD.DRAG_AND_DROP,
       nodeTypes: nodeTypes,
-      hasSelectedMultipleNodes: hasSelectedMultipleNodes
+      hasSelectedMultipleNodes: hasSelectedMultipleNodes,
+      columnCount: columnCount
     },
     eventType: EVENT_TYPE.TRACK
   })(tr);

package/dist/types/pm-plugins/utils/analytics.d.ts

@@ -2,7 +2,7 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { type Transaction } from '@atlaskit/editor-prosemirror/state';
 import { type BlockControlsPlugin } from '../../blockControlsPluginType';
 export declare const attachMoveNodeAnalytics: (tr: Transaction, inputMethod: string, fromDepth: number, fromNodeType: string, toDepth?: number, toNodeType?: string, isSameParent?: boolean, api?: ExtractInjectionAPI<BlockControlsPlugin>, fromNodeTypes?: string, hasSelectedMultipleNodes?: boolean) => boolean | undefined;
-export declare const fireInsertLayoutAnalytics: (tr: Transaction, api?: ExtractInjectionAPI<BlockControlsPlugin>, nodeTypes?: string, hasSelectedMultipleNodes?: boolean) => void;
+export declare const fireInsertLayoutAnalytics: (tr: Transaction, api?: ExtractInjectionAPI<BlockControlsPlugin>, nodeTypes?: string, hasSelectedMultipleNodes?: boolean, columnCount?: number) => void;
 /**
  * Given a range, return distinctive types of node and whether there are multiple nodes in the range
  */

package/dist/types-ts4.5/pm-plugins/utils/analytics.d.ts

@@ -2,7 +2,7 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { type Transaction } from '@atlaskit/editor-prosemirror/state';
 import { type BlockControlsPlugin } from '../../blockControlsPluginType';
 export declare const attachMoveNodeAnalytics: (tr: Transaction, inputMethod: string, fromDepth: number, fromNodeType: string, toDepth?: number, toNodeType?: string, isSameParent?: boolean, api?: ExtractInjectionAPI<BlockControlsPlugin>, fromNodeTypes?: string, hasSelectedMultipleNodes?: boolean) => boolean | undefined;
-export declare const fireInsertLayoutAnalytics: (tr: Transaction, api?: ExtractInjectionAPI<BlockControlsPlugin>, nodeTypes?: string, hasSelectedMultipleNodes?: boolean) => void;
+export declare const fireInsertLayoutAnalytics: (tr: Transaction, api?: ExtractInjectionAPI<BlockControlsPlugin>, nodeTypes?: string, hasSelectedMultipleNodes?: boolean, columnCount?: number) => void;
 /**
  * Given a range, return distinctive types of node and whether there are multiple nodes in the range
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.11.2",
+	"version": "3.13.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^103.16.0",
+		"@atlaskit/editor-common": "^103.20.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
@@ -50,12 +50,12 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/pragmatic-drag-and-drop": "^1.5.0",
+		"@atlaskit/pragmatic-drag-and-drop": "^1.6.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.1.0",
 		"@atlaskit/primitives": "^14.4.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.14.0",
+		"@atlaskit/tmp-editor-statsig": "^4.15.0",
 		"@atlaskit/tokens": "^4.8.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -115,9 +115,6 @@
 		"platform_editor_element_dnd_nested_fix_patch_6": {
 			"type": "boolean"
 		},
-		"platform_editor_advanced_layouts_redraw_on_drag": {
-			"type": "boolean"
-		},
 		"platform_editor_use_nested_table_pm_nodes": {
 			"type": "boolean"
 		},
@@ -187,6 +184,9 @@
 		"platform_editor_no_selection_until_interaction": {
 			"type": "boolean"
 		},
+		"platform_editor_column_count_analytics": {
+			"type": "boolean"
+		},
 		"platform_editor_fix_widget_destroy": {
 			"type": "boolean"
 		}