@atlaskit/editor-plugin-selection 6.0.2 → 6.1.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-selection
 
+## 6.1.0
+
+### Minor Changes
+
+- [`a3fe38f9b65b1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a3fe38f9b65b1) -
+  [ux] [EDITOR-1686] hidden cursor while ai is streaming text
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 6.0.2
 
 ### Patch Changes

package/dist/cjs/pm-plugins/cursor/ui/hide-cursor-decoration.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createHideCursorDecoration = void 0;
+var _view = require("@atlaskit/editor-prosemirror/view");
+var hideCursorWidgetStyles = "\n\tposition: absolute;\n\tpointer-events: none;\n\twidth: 0;\n\theight: 0;\n";
+var createHideCursorWidget = function createHideCursorWidget() {
+  var span = document.createElement('span');
+  span.className = 'ProseMirror-hide-cursor';
+  span.setAttribute('style', hideCursorWidgetStyles);
+  return span;
+};
+var createHideCursorDecoration = exports.createHideCursorDecoration = function createHideCursorDecoration() {
+  return _view.Decoration.widget(0, createHideCursorWidget, {
+    key: 'hide-cursor-decoration',
+    side: -1
+  });
+};

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

@@ -10,6 +10,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _types = require("../types");
 var _gapCursorPluginKey = require("./gap-cursor-plugin-key");
 var _actions = require("./gap-cursor/actions");
 var _direction = require("./gap-cursor/direction");
@@ -21,17 +22,21 @@ var plugin = new _safePlugin.SafePlugin({
     init: function init() {
       return {
         selectionIsGapCursor: false,
-        displayGapCursor: true
+        displayGapCursor: true,
+        hideCursor: false
       };
     },
     apply: function apply(tr, pluginState, _oldState, newState) {
-      var _meta$displayGapCurso;
+      var _meta$displayGapCurso, _selectionMeta$hideCu;
       var meta = tr.getMeta(_gapCursorPluginKey.gapCursorPluginKey);
+      var selectionMeta = tr.getMeta(_types.selectionPluginKey);
       var selectionIsGapCursor = newState.selection instanceof _selection.GapCursorSelection;
       return {
         selectionIsGapCursor: selectionIsGapCursor,
         // only attempt to hide gap cursor if selection is gap cursor
-        displayGapCursor: selectionIsGapCursor ? (_meta$displayGapCurso = meta === null || meta === void 0 ? void 0 : meta.displayGapCursor) !== null && _meta$displayGapCurso !== void 0 ? _meta$displayGapCurso : pluginState.displayGapCursor : true
+        displayGapCursor: selectionIsGapCursor ? (_meta$displayGapCurso = meta === null || meta === void 0 ? void 0 : meta.displayGapCursor) !== null && _meta$displayGapCurso !== void 0 ? _meta$displayGapCurso : pluginState.displayGapCursor : true,
+        // track hideCursor state from selection plugin
+        hideCursor: (_selectionMeta$hideCu = selectionMeta === null || selectionMeta === void 0 ? void 0 : selectionMeta.hideCursor) !== null && _selectionMeta$hideCu !== void 0 ? _selectionMeta$hideCu : pluginState.hideCursor
       };
     }
   },
@@ -71,8 +76,9 @@ var plugin = new _safePlugin.SafePlugin({
       var doc = editorState.doc,
         selection = editorState.selection;
       var _gapCursorPluginKey$g2 = _gapCursorPluginKey.gapCursorPluginKey.getState(editorState),
-        displayGapCursor = _gapCursorPluginKey$g2.displayGapCursor;
-      if (selection instanceof _selection.GapCursorSelection && displayGapCursor) {
+        displayGapCursor = _gapCursorPluginKey$g2.displayGapCursor,
+        hideCursor = _gapCursorPluginKey$g2.hideCursor;
+      if (selection instanceof _selection.GapCursorSelection && displayGapCursor && !hideCursor) {
         var $from = selection.$from,
           side = selection.side;
 

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

@@ -7,6 +7,7 @@ exports.getInitialState = exports.createPlugin = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
+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 _types = require("../types");
@@ -24,32 +25,44 @@ var getInitialState = exports.getInitialState = function getInitialState(state)
 };
 var createPlugin = exports.createPlugin = function createPlugin(api, dispatch, dispatchAnalyticsEvent) {
   var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var cursorHidden = false;
   return new _safePlugin.SafePlugin({
     key: _types.selectionPluginKey,
     state: (0, _pluginFactory.createPluginState)(dispatch, getInitialState),
     appendTransaction: function appendTransaction(transactions, oldEditorState, newEditorState) {
       var tr = newEditorState.tr;
       var manualSelection;
-      if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
-        // Start at most recent transaction, look for manualSelection meta
+      var hideCursorChanged = false;
+      var needsHideCursor = (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_beta');
+      var needsManualSelection = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true);
+      if (needsHideCursor || needsManualSelection) {
         for (var i = transactions.length - 1; i >= 0; i--) {
-          var _transactions$i$getMe;
-          manualSelection = (_transactions$i$getMe = transactions[i].getMeta(_types.selectionPluginKey)) === null || _transactions$i$getMe === void 0 ? void 0 : _transactions$i$getMe.manualSelection;
-          if (manualSelection) {
-            break;
+          var meta = transactions[i].getMeta(_types.selectionPluginKey);
+          if (needsHideCursor && (meta === null || meta === void 0 ? void 0 : meta.hideCursor) !== undefined) {
+            var newHideCursorValue = meta.hideCursor;
+            if (cursorHidden !== newHideCursorValue) {
+              cursorHidden = newHideCursorValue;
+              hideCursorChanged = true;
+            }
+          }
+          if (needsManualSelection && meta !== null && meta !== void 0 && meta.manualSelection && !manualSelection) {
+            manualSelection = meta.manualSelection;
+            if (!needsHideCursor) {
+              break;
+            }
           }
         }
       }
       if (!(0, _utils.shouldRecalcDecorations)({
         oldEditorState: oldEditorState,
         newEditorState: newEditorState
-      }) && !manualSelection) {
+      }) && !manualSelection && !hideCursorChanged) {
         return;
       }
       tr.setMeta(_types.selectionPluginKey, {
         type: _actions.SelectionActionTypes.SET_DECORATIONS,
         selection: tr.selection,
-        decorationSet: (0, _utils.getDecorations)(tr, manualSelection)
+        decorationSet: (0, _utils.getDecorations)(tr, manualSelection, cursorHidden)
       });
       return tr;
     },

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

@@ -1,10 +1,12 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isSelectionAtStartOfParentNode = exports.isSelectionAtEndOfParentNode = exports.isSelectionAtEndOfLayoutColumn = exports.isSelectableContainerNode = exports.isSelectableChildNode = exports.isListItemWithinContainerNotAtEnd = exports.isLayoutColumnNode = exports.isContainerNode = exports.getNodesToDecorateFromSelection = exports.getDecorations = exports.findTopLevelList = exports.findSelectableContainerParent = exports.findSelectableContainerBefore = exports.findSelectableContainerAfter = exports.findLastChildNodeToSelect = exports.findFirstChildNodeToSelect = void 0;
 exports.shouldRecalcDecorations = shouldRecalcDecorations;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -13,27 +15,34 @@ var _view = require("@atlaskit/editor-prosemirror/view");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../types");
-var getDecorations = exports.getDecorations = function getDecorations(tr, manualSelection) {
+var _hideCursorDecoration = require("./cursor/ui/hide-cursor-decoration");
+var getDecorations = exports.getDecorations = function getDecorations(tr, manualSelection, hideCursor) {
   var selection = tr.selection;
+  var decorations = [];
+  if (hideCursor && (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_beta')) {
+    decorations.push((0, _hideCursorDecoration.createHideCursorDecoration)());
+  }
   if (selection instanceof _state.NodeSelection) {
-    return _view.DecorationSet.create(tr.doc, [_view.Decoration.node(selection.from, selection.to, {
+    decorations.push(_view.Decoration.node(selection.from, selection.to, {
       class: _editorSharedStyles.akEditorSelectedNodeClassName
-    })]);
+    }));
+    return _view.DecorationSet.create(tr.doc, decorations);
   }
   if (selection instanceof _state.TextSelection || selection instanceof _state.AllSelection) {
     if (manualSelection && manualSelection.anchor >= 0 && manualSelection.head >= 0 && manualSelection.anchor <= tr.doc.nodeSize && manualSelection.head <= tr.doc.nodeSize) {
       selection = _state.TextSelection.create(tr.doc, manualSelection.anchor, manualSelection.head);
     }
-    var decorations = getNodesToDecorateFromSelection(selection, tr.doc).map(function (_ref) {
+    var selectionDecorations = getNodesToDecorateFromSelection(selection, tr.doc).map(function (_ref) {
       var node = _ref.node,
         pos = _ref.pos;
       return _view.Decoration.node(pos, pos + node.nodeSize, {
         class: _editorSharedStyles.akEditorSelectedNodeClassName
       });
     });
+    decorations.push.apply(decorations, (0, _toConsumableArray2.default)(selectionDecorations));
     return _view.DecorationSet.create(tr.doc, decorations);
   }
-  return _view.DecorationSet.empty;
+  return decorations.length > 0 ? _view.DecorationSet.create(tr.doc, decorations) : _view.DecorationSet.empty;
 };
 var topLevelBlockNodesThatHaveSelectionStyles = ['table', 'panel', 'expand', 'layoutSection', 'decisionList', 'decisionItem', 'codeBlock'];
 

package/dist/cjs/selectionPlugin.js

@@ -47,20 +47,30 @@ var setManualSelection = function setManualSelection(anchor, head) {
     }));
   };
 };
-var selectionPlugin = exports.selectionPlugin = function selectionPlugin(_ref4) {
-  var api = _ref4.api,
-    options = _ref4.config;
+var hideCursor = function hideCursor(hide) {
+  return function (_ref4) {
+    var tr = _ref4.tr;
+    var currMeta = tr.getMeta(_types.selectionPluginKey);
+    return tr.setMeta(_types.selectionPluginKey, _objectSpread(_objectSpread({}, currMeta), {}, {
+      hideCursor: hide
+    }));
+  };
+};
+var selectionPlugin = exports.selectionPlugin = function selectionPlugin(_ref5) {
+  var api = _ref5.api,
+    options = _ref5.config;
   return {
     name: 'selection',
     commands: {
       displayGapCursor: displayGapCursor,
       clearManualSelection: clearManualSelection,
+      hideCursor: hideCursor,
       setManualSelection: setManualSelection
     },
     actions: {
-      selectNearNode: function selectNearNode(_ref5) {
-        var selectionRelativeToNode = _ref5.selectionRelativeToNode,
-          selection = _ref5.selection;
+      selectNearNode: function selectNearNode(_ref6) {
+        var selectionRelativeToNode = _ref6.selectionRelativeToNode,
+          selection = _ref6.selection;
         return function (state) {
           return (0, _commands.selectNearNode)(selectionRelativeToNode, selection)({
             tr: state.tr
@@ -83,9 +93,9 @@ var selectionPlugin = exports.selectionPlugin = function selectionPlugin(_ref4)
     pmPlugins: function pmPlugins() {
       return [{
         name: 'selection',
-        plugin: function plugin(_ref6) {
-          var dispatch = _ref6.dispatch,
-            dispatchAnalyticsEvent = _ref6.dispatchAnalyticsEvent;
+        plugin: function plugin(_ref7) {
+          var dispatch = _ref7.dispatch,
+            dispatchAnalyticsEvent = _ref7.dispatchAnalyticsEvent;
           return (0, _selectionMain.createPlugin)(api, dispatch, dispatchAnalyticsEvent, options);
         }
       }, {

package/dist/es2019/pm-plugins/cursor/ui/hide-cursor-decoration.js

@@ -0,0 +1,19 @@
+import { Decoration } from '@atlaskit/editor-prosemirror/view';
+const hideCursorWidgetStyles = `
+	position: absolute;
+	pointer-events: none;
+	width: 0;
+	height: 0;
+`;
+const createHideCursorWidget = () => {
+  const span = document.createElement('span');
+  span.className = 'ProseMirror-hide-cursor';
+  span.setAttribute('style', hideCursorWidgetStyles);
+  return span;
+};
+export const createHideCursorDecoration = () => {
+  return Decoration.widget(0, createHideCursorWidget, {
+    key: 'hide-cursor-decoration',
+    side: -1
+  });
+};

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

@@ -4,6 +4,7 @@ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { selectionPluginKey } from '../types';
 import { gapCursorPluginKey } from './gap-cursor-plugin-key';
 import { deleteNode } from './gap-cursor/actions';
 import { Direction } from './gap-cursor/direction';
@@ -14,16 +15,20 @@ const plugin = new SafePlugin({
   state: {
     init: () => ({
       selectionIsGapCursor: false,
-      displayGapCursor: true
+      displayGapCursor: true,
+      hideCursor: false
     }),
     apply: (tr, pluginState, _oldState, newState) => {
-      var _meta$displayGapCurso;
+      var _meta$displayGapCurso, _selectionMeta$hideCu;
       const meta = tr.getMeta(gapCursorPluginKey);
+      const selectionMeta = tr.getMeta(selectionPluginKey);
       const selectionIsGapCursor = newState.selection instanceof GapCursorSelection;
       return {
         selectionIsGapCursor,
         // only attempt to hide gap cursor if selection is gap cursor
-        displayGapCursor: selectionIsGapCursor ? (_meta$displayGapCurso = meta === null || meta === void 0 ? void 0 : meta.displayGapCursor) !== null && _meta$displayGapCurso !== void 0 ? _meta$displayGapCurso : pluginState.displayGapCursor : true
+        displayGapCursor: selectionIsGapCursor ? (_meta$displayGapCurso = meta === null || meta === void 0 ? void 0 : meta.displayGapCursor) !== null && _meta$displayGapCurso !== void 0 ? _meta$displayGapCurso : pluginState.displayGapCursor : true,
+        // track hideCursor state from selection plugin
+        hideCursor: (_selectionMeta$hideCu = selectionMeta === null || selectionMeta === void 0 ? void 0 : selectionMeta.hideCursor) !== null && _selectionMeta$hideCu !== void 0 ? _selectionMeta$hideCu : pluginState.hideCursor
       };
     }
   },
@@ -66,9 +71,10 @@ const plugin = new SafePlugin({
         selection
       } = editorState;
       const {
-        displayGapCursor
+        displayGapCursor,
+        hideCursor
       } = gapCursorPluginKey.getState(editorState);
-      if (selection instanceof GapCursorSelection && displayGapCursor) {
+      if (selection instanceof GapCursorSelection && displayGapCursor && !hideCursor) {
         const {
           $from,
           side

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

@@ -1,6 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+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 { selectionPluginKey } from '../types';
@@ -15,6 +16,7 @@ export const getInitialState = state => ({
   selection: state.selection
 });
 export const createPlugin = (api, dispatch, dispatchAnalyticsEvent, options = {}) => {
+  let cursorHidden = false;
   return new SafePlugin({
     key: selectionPluginKey,
     state: createPluginState(dispatch, getInitialState),
@@ -23,26 +25,37 @@ export const createPlugin = (api, dispatch, dispatchAnalyticsEvent, options = {}
         tr
       } = newEditorState;
       let manualSelection;
-      if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-        // Start at most recent transaction, look for manualSelection meta
+      let hideCursorChanged = false;
+      const needsHideCursor = fg('platform_editor_ai_aifc_patch_beta');
+      const needsManualSelection = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
+      if (needsHideCursor || needsManualSelection) {
         for (let i = transactions.length - 1; i >= 0; i--) {
-          var _transactions$i$getMe;
-          manualSelection = (_transactions$i$getMe = transactions[i].getMeta(selectionPluginKey)) === null || _transactions$i$getMe === void 0 ? void 0 : _transactions$i$getMe.manualSelection;
-          if (manualSelection) {
-            break;
+          const meta = transactions[i].getMeta(selectionPluginKey);
+          if (needsHideCursor && (meta === null || meta === void 0 ? void 0 : meta.hideCursor) !== undefined) {
+            const newHideCursorValue = meta.hideCursor;
+            if (cursorHidden !== newHideCursorValue) {
+              cursorHidden = newHideCursorValue;
+              hideCursorChanged = true;
+            }
+          }
+          if (needsManualSelection && meta !== null && meta !== void 0 && meta.manualSelection && !manualSelection) {
+            manualSelection = meta.manualSelection;
+            if (!needsHideCursor) {
+              break;
+            }
           }
         }
       }
       if (!shouldRecalcDecorations({
         oldEditorState,
         newEditorState
-      }) && !manualSelection) {
+      }) && !manualSelection && !hideCursorChanged) {
         return;
       }
       tr.setMeta(selectionPluginKey, {
         type: SelectionActionTypes.SET_DECORATIONS,
         selection: tr.selection,
-        decorationSet: getDecorations(tr, manualSelection)
+        decorationSet: getDecorations(tr, manualSelection, cursorHidden)
       });
       return tr;
     },

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

@@ -6,18 +6,24 @@ import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { selectionPluginKey } from '../types';
-export const getDecorations = (tr, manualSelection) => {
+import { createHideCursorDecoration } from './cursor/ui/hide-cursor-decoration';
+export const getDecorations = (tr, manualSelection, hideCursor) => {
   let selection = tr.selection;
+  const decorations = [];
+  if (hideCursor && fg('platform_editor_ai_aifc_patch_beta')) {
+    decorations.push(createHideCursorDecoration());
+  }
   if (selection instanceof NodeSelection) {
-    return DecorationSet.create(tr.doc, [Decoration.node(selection.from, selection.to, {
+    decorations.push(Decoration.node(selection.from, selection.to, {
       class: akEditorSelectedNodeClassName
-    })]);
+    }));
+    return DecorationSet.create(tr.doc, decorations);
   }
   if (selection instanceof TextSelection || selection instanceof AllSelection) {
     if (manualSelection && manualSelection.anchor >= 0 && manualSelection.head >= 0 && manualSelection.anchor <= tr.doc.nodeSize && manualSelection.head <= tr.doc.nodeSize) {
       selection = TextSelection.create(tr.doc, manualSelection.anchor, manualSelection.head);
     }
-    const decorations = getNodesToDecorateFromSelection(selection, tr.doc).map(({
+    const selectionDecorations = getNodesToDecorateFromSelection(selection, tr.doc).map(({
       node,
       pos
     }) => {
@@ -25,9 +31,10 @@ export const getDecorations = (tr, manualSelection) => {
         class: akEditorSelectedNodeClassName
       });
     });
+    decorations.push(...selectionDecorations);
     return DecorationSet.create(tr.doc, decorations);
   }
-  return DecorationSet.empty;
+  return decorations.length > 0 ? DecorationSet.create(tr.doc, decorations) : DecorationSet.empty;
 };
 const topLevelBlockNodesThatHaveSelectionStyles = ['table', 'panel', 'expand', 'layoutSection', 'decisionList', 'decisionItem', 'codeBlock'];
 

package/dist/es2019/selectionPlugin.js

@@ -36,6 +36,15 @@ const setManualSelection = (anchor, head) => ({
     }
   });
 };
+const hideCursor = hide => ({
+  tr
+}) => {
+  const currMeta = tr.getMeta(selectionPluginKey);
+  return tr.setMeta(selectionPluginKey, {
+    ...currMeta,
+    hideCursor: hide
+  });
+};
 export const selectionPlugin = ({
   api,
   config: options
@@ -44,6 +53,7 @@ export const selectionPlugin = ({
   commands: {
     displayGapCursor,
     clearManualSelection,
+    hideCursor,
     setManualSelection
   },
   actions: {

package/dist/esm/pm-plugins/cursor/ui/hide-cursor-decoration.js

@@ -0,0 +1,14 @@
+import { Decoration } from '@atlaskit/editor-prosemirror/view';
+var hideCursorWidgetStyles = "\n\tposition: absolute;\n\tpointer-events: none;\n\twidth: 0;\n\theight: 0;\n";
+var createHideCursorWidget = function createHideCursorWidget() {
+  var span = document.createElement('span');
+  span.className = 'ProseMirror-hide-cursor';
+  span.setAttribute('style', hideCursorWidgetStyles);
+  return span;
+};
+export var createHideCursorDecoration = function createHideCursorDecoration() {
+  return Decoration.widget(0, createHideCursorWidget, {
+    key: 'hide-cursor-decoration',
+    side: -1
+  });
+};

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

@@ -4,6 +4,7 @@ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { selectionPluginKey } from '../types';
 import { gapCursorPluginKey } from './gap-cursor-plugin-key';
 import { deleteNode } from './gap-cursor/actions';
 import { Direction } from './gap-cursor/direction';
@@ -15,17 +16,21 @@ var plugin = new SafePlugin({
     init: function init() {
       return {
         selectionIsGapCursor: false,
-        displayGapCursor: true
+        displayGapCursor: true,
+        hideCursor: false
       };
     },
     apply: function apply(tr, pluginState, _oldState, newState) {
-      var _meta$displayGapCurso;
+      var _meta$displayGapCurso, _selectionMeta$hideCu;
       var meta = tr.getMeta(gapCursorPluginKey);
+      var selectionMeta = tr.getMeta(selectionPluginKey);
       var selectionIsGapCursor = newState.selection instanceof GapCursorSelection;
       return {
         selectionIsGapCursor: selectionIsGapCursor,
         // only attempt to hide gap cursor if selection is gap cursor
-        displayGapCursor: selectionIsGapCursor ? (_meta$displayGapCurso = meta === null || meta === void 0 ? void 0 : meta.displayGapCursor) !== null && _meta$displayGapCurso !== void 0 ? _meta$displayGapCurso : pluginState.displayGapCursor : true
+        displayGapCursor: selectionIsGapCursor ? (_meta$displayGapCurso = meta === null || meta === void 0 ? void 0 : meta.displayGapCursor) !== null && _meta$displayGapCurso !== void 0 ? _meta$displayGapCurso : pluginState.displayGapCursor : true,
+        // track hideCursor state from selection plugin
+        hideCursor: (_selectionMeta$hideCu = selectionMeta === null || selectionMeta === void 0 ? void 0 : selectionMeta.hideCursor) !== null && _selectionMeta$hideCu !== void 0 ? _selectionMeta$hideCu : pluginState.hideCursor
       };
     }
   },
@@ -65,8 +70,9 @@ var plugin = new SafePlugin({
       var doc = editorState.doc,
         selection = editorState.selection;
       var _gapCursorPluginKey$g2 = gapCursorPluginKey.getState(editorState),
-        displayGapCursor = _gapCursorPluginKey$g2.displayGapCursor;
-      if (selection instanceof GapCursorSelection && displayGapCursor) {
+        displayGapCursor = _gapCursorPluginKey$g2.displayGapCursor,
+        hideCursor = _gapCursorPluginKey$g2.hideCursor;
+      if (selection instanceof GapCursorSelection && displayGapCursor && !hideCursor) {
         var $from = selection.$from,
           side = selection.side;
 

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

@@ -1,6 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+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 { selectionPluginKey } from '../types';
@@ -18,32 +19,44 @@ export var getInitialState = function getInitialState(state) {
 };
 export var createPlugin = function createPlugin(api, dispatch, dispatchAnalyticsEvent) {
   var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var cursorHidden = false;
   return new SafePlugin({
     key: selectionPluginKey,
     state: createPluginState(dispatch, getInitialState),
     appendTransaction: function appendTransaction(transactions, oldEditorState, newEditorState) {
       var tr = newEditorState.tr;
       var manualSelection;
-      if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-        // Start at most recent transaction, look for manualSelection meta
+      var hideCursorChanged = false;
+      var needsHideCursor = fg('platform_editor_ai_aifc_patch_beta');
+      var needsManualSelection = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
+      if (needsHideCursor || needsManualSelection) {
         for (var i = transactions.length - 1; i >= 0; i--) {
-          var _transactions$i$getMe;
-          manualSelection = (_transactions$i$getMe = transactions[i].getMeta(selectionPluginKey)) === null || _transactions$i$getMe === void 0 ? void 0 : _transactions$i$getMe.manualSelection;
-          if (manualSelection) {
-            break;
+          var meta = transactions[i].getMeta(selectionPluginKey);
+          if (needsHideCursor && (meta === null || meta === void 0 ? void 0 : meta.hideCursor) !== undefined) {
+            var newHideCursorValue = meta.hideCursor;
+            if (cursorHidden !== newHideCursorValue) {
+              cursorHidden = newHideCursorValue;
+              hideCursorChanged = true;
+            }
+          }
+          if (needsManualSelection && meta !== null && meta !== void 0 && meta.manualSelection && !manualSelection) {
+            manualSelection = meta.manualSelection;
+            if (!needsHideCursor) {
+              break;
+            }
           }
         }
       }
       if (!shouldRecalcDecorations({
         oldEditorState: oldEditorState,
         newEditorState: newEditorState
-      }) && !manualSelection) {
+      }) && !manualSelection && !hideCursorChanged) {
         return;
       }
       tr.setMeta(selectionPluginKey, {
         type: SelectionActionTypes.SET_DECORATIONS,
         selection: tr.selection,
-        decorationSet: getDecorations(tr, manualSelection)
+        decorationSet: getDecorations(tr, manualSelection, cursorHidden)
       });
       return tr;
     },

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

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { isIgnored as isIgnoredByGapCursor, isSelectionAtStartOfNode } from '@atlaskit/editor-common/selection';
 import { isEmptyParagraph, isListItemNode } from '@atlaskit/editor-common/utils';
 import { AllSelection, NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -6,27 +7,34 @@ import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { selectionPluginKey } from '../types';
-export var getDecorations = function getDecorations(tr, manualSelection) {
+import { createHideCursorDecoration } from './cursor/ui/hide-cursor-decoration';
+export var getDecorations = function getDecorations(tr, manualSelection, hideCursor) {
   var selection = tr.selection;
+  var decorations = [];
+  if (hideCursor && fg('platform_editor_ai_aifc_patch_beta')) {
+    decorations.push(createHideCursorDecoration());
+  }
   if (selection instanceof NodeSelection) {
-    return DecorationSet.create(tr.doc, [Decoration.node(selection.from, selection.to, {
+    decorations.push(Decoration.node(selection.from, selection.to, {
       class: akEditorSelectedNodeClassName
-    })]);
+    }));
+    return DecorationSet.create(tr.doc, decorations);
   }
   if (selection instanceof TextSelection || selection instanceof AllSelection) {
     if (manualSelection && manualSelection.anchor >= 0 && manualSelection.head >= 0 && manualSelection.anchor <= tr.doc.nodeSize && manualSelection.head <= tr.doc.nodeSize) {
       selection = TextSelection.create(tr.doc, manualSelection.anchor, manualSelection.head);
     }
-    var decorations = getNodesToDecorateFromSelection(selection, tr.doc).map(function (_ref) {
+    var selectionDecorations = getNodesToDecorateFromSelection(selection, tr.doc).map(function (_ref) {
       var node = _ref.node,
         pos = _ref.pos;
       return Decoration.node(pos, pos + node.nodeSize, {
         class: akEditorSelectedNodeClassName
       });
     });
+    decorations.push.apply(decorations, _toConsumableArray(selectionDecorations));
     return DecorationSet.create(tr.doc, decorations);
   }
-  return DecorationSet.empty;
+  return decorations.length > 0 ? DecorationSet.create(tr.doc, decorations) : DecorationSet.empty;
 };
 var topLevelBlockNodesThatHaveSelectionStyles = ['table', 'panel', 'expand', 'layoutSection', 'decisionList', 'decisionItem', 'codeBlock'];
 

package/dist/esm/selectionPlugin.js

@@ -40,20 +40,30 @@ var setManualSelection = function setManualSelection(anchor, head) {
     }));
   };
 };
-export var selectionPlugin = function selectionPlugin(_ref4) {
-  var api = _ref4.api,
-    options = _ref4.config;
+var hideCursor = function hideCursor(hide) {
+  return function (_ref4) {
+    var tr = _ref4.tr;
+    var currMeta = tr.getMeta(selectionPluginKey);
+    return tr.setMeta(selectionPluginKey, _objectSpread(_objectSpread({}, currMeta), {}, {
+      hideCursor: hide
+    }));
+  };
+};
+export var selectionPlugin = function selectionPlugin(_ref5) {
+  var api = _ref5.api,
+    options = _ref5.config;
   return {
     name: 'selection',
     commands: {
       displayGapCursor: displayGapCursor,
       clearManualSelection: clearManualSelection,
+      hideCursor: hideCursor,
       setManualSelection: setManualSelection
     },
     actions: {
-      selectNearNode: function selectNearNode(_ref5) {
-        var selectionRelativeToNode = _ref5.selectionRelativeToNode,
-          selection = _ref5.selection;
+      selectNearNode: function selectNearNode(_ref6) {
+        var selectionRelativeToNode = _ref6.selectionRelativeToNode,
+          selection = _ref6.selection;
         return function (state) {
           return _selectNearNode(selectionRelativeToNode, selection)({
             tr: state.tr
@@ -76,9 +86,9 @@ export var selectionPlugin = function selectionPlugin(_ref4) {
     pmPlugins: function pmPlugins() {
       return [{
         name: 'selection',
-        plugin: function plugin(_ref6) {
-          var dispatch = _ref6.dispatch,
-            dispatchAnalyticsEvent = _ref6.dispatchAnalyticsEvent;
+        plugin: function plugin(_ref7) {
+          var dispatch = _ref7.dispatch,
+            dispatchAnalyticsEvent = _ref7.dispatchAnalyticsEvent;
           return createPlugin(api, dispatch, dispatchAnalyticsEvent, options);
         }
       }, {

package/dist/types/pm-plugins/cursor/ui/hide-cursor-decoration.d.ts

@@ -0,0 +1,2 @@
+import { Decoration } from '@atlaskit/editor-prosemirror/view';
+export declare const createHideCursorDecoration: () => Decoration;

package/dist/types/pm-plugins/gap-cursor-main.d.ts

@@ -2,5 +2,6 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 declare const plugin: SafePlugin<{
     selectionIsGapCursor: boolean;
     displayGapCursor: boolean;
+    hideCursor: boolean;
 }>;
 export default plugin;

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

@@ -6,7 +6,7 @@ import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 export declare const getDecorations: (tr: Transaction | ReadonlyTransaction, manualSelection?: {
     anchor: number;
     head: number;
-}) => DecorationSet;
+}, hideCursor?: boolean) => DecorationSet;
 /**
  * Use `getNodesToDecorateFromSelection` to collect and return
  * a list of nodes within the Selection that should have Selection

package/dist/types/selectionPluginType.d.ts

@@ -7,6 +7,7 @@ export type SelectionPlugin = NextEditorPlugin<'selection', {
     commands: {
         clearManualSelection: () => EditorCommand;
         displayGapCursor: (toggle: boolean) => EditorCommand;
+        hideCursor: (hide: boolean) => EditorCommand;
         setManualSelection: (anchor: number, head: number) => EditorCommand;
     };
     dependencies: [OptionalPlugin<InteractionPlugin>];

package/dist/types-ts4.5/pm-plugins/cursor/ui/hide-cursor-decoration.d.ts

@@ -0,0 +1,2 @@
+import { Decoration } from '@atlaskit/editor-prosemirror/view';
+export declare const createHideCursorDecoration: () => Decoration;

package/dist/types-ts4.5/pm-plugins/gap-cursor-main.d.ts

@@ -2,5 +2,6 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 declare const plugin: SafePlugin<{
     selectionIsGapCursor: boolean;
     displayGapCursor: boolean;
+    hideCursor: boolean;
 }>;
 export default plugin;

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

@@ -6,7 +6,7 @@ import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 export declare const getDecorations: (tr: Transaction | ReadonlyTransaction, manualSelection?: {
     anchor: number;
     head: number;
-}) => DecorationSet;
+}, hideCursor?: boolean) => DecorationSet;
 /**
  * Use `getNodesToDecorateFromSelection` to collect and return
  * a list of nodes within the Selection that should have Selection

package/dist/types-ts4.5/selectionPluginType.d.ts

@@ -7,6 +7,7 @@ export type SelectionPlugin = NextEditorPlugin<'selection', {
     commands: {
         clearManualSelection: () => EditorCommand;
         displayGapCursor: (toggle: boolean) => EditorCommand;
+        hideCursor: (hide: boolean) => EditorCommand;
         setManualSelection: (anchor: number, head: number) => EditorCommand;
     };
     dependencies: [

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection",
-	"version": "6.0.2",
+	"version": "6.1.0",
 	"description": "Selection plugin for @atlaskit/editor-core",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -92,6 +92,9 @@
 		},
 		"platform_editor_fix_list_item_nav_bug_in_layout": {
 			"type": "boolean"
+		},
+		"platform_editor_ai_aifc_patch_beta": {
+			"type": "boolean"
 		}
 	}
 }