@atlaskit/editor-plugin-block-controls 3.19.8 → 3.19.10

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.19.10
+
+### Patch Changes
+
+- [#175523](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/175523)
+  [`0623f8fb2b5ee`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0623f8fb2b5ee) -
+  Fix a bug where slash command via quick insert button is not inserted at the correct location
+
+## 3.19.9
+
+### Patch Changes
+
+- [#173895](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/173895)
+  [`6e123631d7c26`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6e123631d7c26) -
+  Clean up platform_editor_interaction_api_refactor
+- Updated dependencies
+
 ## 3.19.8
 
 ### Patch Changes

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

@@ -299,7 +299,6 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     macroInteractionUpdates = _useDragHandlePluginS.macroInteractionUpdates;
   var selection = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'selection.selection');
   var isShiftDown = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockControls.isShiftDown');
-  var _hasHadInteraction = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'interaction.hasHadInteraction') !== false;
   var interactionState = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'interaction.interactionState');
   var start = getPos();
   var isLayoutColumn = nodeType === 'layoutColumn';
@@ -846,7 +845,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   var handleOnDrop = function handleOnDrop(event) {
     (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true) && event.stopPropagation();
   };
-  var hasHadInteraction = !(0, _platformFeatureFlags.fg)('platform_editor_no_cursor_on_live_doc_init') || ((0, _platformFeatureFlags.fg)('platform_editor_interaction_api_refactor') ? interactionState !== 'hasNotHadInteraction' : _hasHadInteraction !== false);
+  var hasHadInteraction = !(0, _platformFeatureFlags.fg)('platform_editor_no_cursor_on_live_doc_init') || interactionState !== 'hasNotHadInteraction';
   var renderButton = function renderButton() {
     return (
       // eslint-disable-next-line @atlaskit/design-system/no-html-button

package/dist/cjs/ui/quick-insert-button.js

@@ -209,7 +209,7 @@ var TypeAheadControl = exports.TypeAheadControl = function TypeAheadControl(_ref
       var codeBlock = view.state.schema.nodes.codeBlock;
       var selection = view.state.selection;
       var codeBlockParentNode = (0, _utils.findParentNodeOfType)(codeBlock)(selection);
-      if (codeBlockParentNode && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_11')) {
+      if (codeBlockParentNode) {
         // Slash command is not meant to be triggered inside code block, hence always insert slash in a new line following
         api.core.actions.execute((0, _editorCommands.createNewLine)(codeBlockParentNode.pos));
       } else if (isSelectionInsideNode) {

package/dist/cjs/ui/utils/document-checks.js

@@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isSelectionInNode = exports.isNonEditableBlock = exports.isNestedNodeSelected = exports.isInTextSelection = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var isNestedNodeSelected = exports.isNestedNodeSelected = function isNestedNodeSelected(view) {
   var selection = view.state.selection;
-  return selection instanceof _state.NodeSelection && selection.$from.depth > ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_11') ? 0 : 1);
+  return selection instanceof _state.NodeSelection && selection.$from.depth > 0;
 };
 var isSelectionInNode = exports.isSelectionInNode = function isSelectionInNode(start, view) {
   var node = view.state.doc.nodeAt(start);

package/dist/cjs/ui/utils/editor-commands.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createNewLine = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var createNewLine = exports.createNewLine = function createNewLine(start) {
   return function (_ref) {
     var _tr$doc$nodeAt;
@@ -15,6 +16,6 @@ var createNewLine = exports.createNewLine = function createNewLine(start) {
     }
     var position = start + nodeSize;
     tr.insert(position, tr.doc.type.schema.nodes.paragraph.create());
-    return tr.setSelection(_state.TextSelection.create(tr.doc, position));
+    return tr.setSelection((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_14') ? _state.TextSelection.near(tr.doc.resolve(position)) : _state.TextSelection.create(tr.doc, position));
   };
 };

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

@@ -278,7 +278,6 @@ export const DragHandle = ({
   } = useDragHandlePluginState(api);
   const selection = useSharedPluginStateSelector(api, 'selection.selection');
   const isShiftDown = useSharedPluginStateSelector(api, 'blockControls.isShiftDown');
-  const _hasHadInteraction = useSharedPluginStateSelector(api, 'interaction.hasHadInteraction') !== false;
   const interactionState = useSharedPluginStateSelector(api, 'interaction.interactionState');
   const start = getPos();
   const isLayoutColumn = nodeType === 'layoutColumn';
@@ -834,7 +833,7 @@ export const DragHandle = ({
   const handleOnDrop = event => {
     editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) && event.stopPropagation();
   };
-  const hasHadInteraction = !fg('platform_editor_no_cursor_on_live_doc_init') || (fg('platform_editor_interaction_api_refactor') ? interactionState !== 'hasNotHadInteraction' : _hasHadInteraction !== false);
+  const hasHadInteraction = !fg('platform_editor_no_cursor_on_live_doc_init') || interactionState !== 'hasNotHadInteraction';
   const renderButton = () =>
   // eslint-disable-next-line @atlaskit/design-system/no-html-button
   jsx("button", {

package/dist/es2019/ui/quick-insert-button.js

@@ -204,7 +204,7 @@ export const TypeAheadControl = ({
         selection
       } = view.state;
       const codeBlockParentNode = findParentNodeOfType(codeBlock)(selection);
-      if (codeBlockParentNode && fg('platform_editor_controls_patch_11')) {
+      if (codeBlockParentNode) {
         // Slash command is not meant to be triggered inside code block, hence always insert slash in a new line following
         api.core.actions.execute(createNewLine(codeBlockParentNode.pos));
       } else if (isSelectionInsideNode) {

package/dist/es2019/ui/utils/document-checks.js

@@ -1,8 +1,7 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 export const isNestedNodeSelected = view => {
   const selection = view.state.selection;
-  return selection instanceof NodeSelection && selection.$from.depth > (fg('platform_editor_controls_patch_11') ? 0 : 1);
+  return selection instanceof NodeSelection && selection.$from.depth > 0;
 };
 export const isSelectionInNode = (start, view) => {
   const node = view.state.doc.nodeAt(start);

package/dist/es2019/ui/utils/editor-commands.js

@@ -1,4 +1,5 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 export const createNewLine = start => ({
   tr
 }) => {
@@ -9,5 +10,5 @@ export const createNewLine = start => ({
   }
   const position = start + nodeSize;
   tr.insert(position, tr.doc.type.schema.nodes.paragraph.create());
-  return tr.setSelection(TextSelection.create(tr.doc, position));
+  return tr.setSelection(fg('platform_editor_controls_patch_14') ? TextSelection.near(tr.doc.resolve(position)) : TextSelection.create(tr.doc, position));
 };

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

@@ -296,7 +296,6 @@ export var DragHandle = function DragHandle(_ref) {
     macroInteractionUpdates = _useDragHandlePluginS.macroInteractionUpdates;
   var selection = useSharedPluginStateSelector(api, 'selection.selection');
   var isShiftDown = useSharedPluginStateSelector(api, 'blockControls.isShiftDown');
-  var _hasHadInteraction = useSharedPluginStateSelector(api, 'interaction.hasHadInteraction') !== false;
   var interactionState = useSharedPluginStateSelector(api, 'interaction.interactionState');
   var start = getPos();
   var isLayoutColumn = nodeType === 'layoutColumn';
@@ -843,7 +842,7 @@ export var DragHandle = function DragHandle(_ref) {
   var handleOnDrop = function handleOnDrop(event) {
     editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) && event.stopPropagation();
   };
-  var hasHadInteraction = !fg('platform_editor_no_cursor_on_live_doc_init') || (fg('platform_editor_interaction_api_refactor') ? interactionState !== 'hasNotHadInteraction' : _hasHadInteraction !== false);
+  var hasHadInteraction = !fg('platform_editor_no_cursor_on_live_doc_init') || interactionState !== 'hasNotHadInteraction';
   var renderButton = function renderButton() {
     return (
       // eslint-disable-next-line @atlaskit/design-system/no-html-button

package/dist/esm/ui/quick-insert-button.js

@@ -204,7 +204,7 @@ export var TypeAheadControl = function TypeAheadControl(_ref) {
       var codeBlock = view.state.schema.nodes.codeBlock;
       var selection = view.state.selection;
       var codeBlockParentNode = findParentNodeOfType(codeBlock)(selection);
-      if (codeBlockParentNode && fg('platform_editor_controls_patch_11')) {
+      if (codeBlockParentNode) {
         // Slash command is not meant to be triggered inside code block, hence always insert slash in a new line following
         api.core.actions.execute(createNewLine(codeBlockParentNode.pos));
       } else if (isSelectionInsideNode) {

package/dist/esm/ui/utils/document-checks.js

@@ -1,8 +1,7 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 export var isNestedNodeSelected = function isNestedNodeSelected(view) {
   var selection = view.state.selection;
-  return selection instanceof NodeSelection && selection.$from.depth > (fg('platform_editor_controls_patch_11') ? 0 : 1);
+  return selection instanceof NodeSelection && selection.$from.depth > 0;
 };
 export var isSelectionInNode = function isSelectionInNode(start, view) {
   var node = view.state.doc.nodeAt(start);

package/dist/esm/ui/utils/editor-commands.js

@@ -1,4 +1,5 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 export var createNewLine = function createNewLine(start) {
   return function (_ref) {
     var _tr$doc$nodeAt;
@@ -9,6 +10,6 @@ export var createNewLine = function createNewLine(start) {
     }
     var position = start + nodeSize;
     tr.insert(position, tr.doc.type.schema.nodes.paragraph.create());
-    return tr.setSelection(TextSelection.create(tr.doc, position));
+    return tr.setSelection(fg('platform_editor_controls_patch_14') ? TextSelection.near(tr.doc.resolve(position)) : TextSelection.create(tr.doc, position));
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.19.8",
+	"version": "3.19.10",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,12 +33,12 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^107.1.0",
+		"@atlaskit/editor-common": "^107.2.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^2.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.1.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.4.0",
-		"@atlaskit/editor-plugin-interaction": "^2.0.0",
+		"@atlaskit/editor-plugin-interaction": "^3.0.0",
 		"@atlaskit/editor-plugin-metrics": "^3.5.0",
 		"@atlaskit/editor-plugin-quick-insert": "^2.6.0",
 		"@atlaskit/editor-plugin-selection": "^2.2.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^27.0.0",
+		"@atlaskit/icon": "^27.1.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
@@ -56,7 +56,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^14.9.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^8.0.0",
+		"@atlaskit/tmp-editor-statsig": "^8.1.0",
 		"@atlaskit/tokens": "^5.4.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
@@ -177,16 +177,13 @@
 		"platform_editor_table_drag_handle_shift_fix": {
 			"type": "boolean"
 		},
-		"platform_editor_interaction_api_refactor": {
-			"type": "boolean"
-		},
 		"dst-a11y__replace-anchor-with-link__editor-jenga": {
 			"type": "boolean"
 		},
-		"platform_editor_controls_patch_11": {
+		"platform_editor_controls_patch_13": {
 			"type": "boolean"
 		},
-		"platform_editor_controls_patch_13": {
+		"platform_editor_controls_patch_14": {
 			"type": "boolean"
 		},
 		"platform_editor_breakout_resizing_hello_release": {