@atlaskit/editor-plugin-selection 2.1.9 → 2.2.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-selection
 
+## 2.2.1
+
+### Patch Changes
+
+- [#149285](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/149285)
+  [`d00629c3a33cf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d00629c3a33cf) -
+  Clean up feature gate platform_editor_lcm_inline_node_selection_fix
+
+## 2.2.0
+
+### Minor Changes
+
+- [#147781](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/147781)
+  [`154676654d6ce`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/154676654d6ce) -
+  [ED-27777] Remove selection decorator until interaction for live pages
+
 ## 2.1.9
 
 ### Patch Changes

package/dist/cjs/pm-plugins/auto-expand-selection-range-on-inline-node-main.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.createAutoExpandSelectionRangeOnInlineNodePlugin = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _autoExpandSelectionRangeOnInlineNodeKey = require("./auto-expand-selection-range-on-inline-node-key");
 var createAutoExpandSelectionRangeOnInlineNodePlugin = exports.createAutoExpandSelectionRangeOnInlineNodePlugin = function createAutoExpandSelectionRangeOnInlineNodePlugin() {
   var mouseDownElement = null;
@@ -23,22 +22,16 @@ var createAutoExpandSelectionRangeOnInlineNodePlugin = exports.createAutoExpandS
           // Ignored via go/ees005
           // eslint-disable-next-line @atlaskit/editor/no-as-casting
           var mouseUpElement = event.target;
-          if ((0, _platformFeatureFlags.fg)('platform_editor_lcm_inline_node_selection_fix')) {
-            // terminate early if mouse down and mouse up elements are the same -> e.g a click event
-            // or mouse down doesn't trigger
-            if (!mouseDownElement || mouseDownElement === mouseUpElement) {
-              mouseDownElement = null;
-              return;
-            }
-            // reset mouse down element after mouse up event
-            // so that we can detect the next mouse down event is triggered right after mouse up event or not
+
+          // terminate early if mouse down and mouse up elements are the same -> e.g a click event
+          // or mouse down doesn't trigger
+          if (!mouseDownElement || mouseDownElement === mouseUpElement) {
             mouseDownElement = null;
-          } else {
-            // terminate early if mouse down and mouse up elements are the same -> e.g a click event
-            if (mouseDownElement === mouseUpElement) {
-              return;
-            }
+            return;
           }
+          // reset mouse down element after mouse up event
+          // so that we can detect the next mouse down event is triggered right after mouse up event or not
+          mouseDownElement = null;
 
           // terminate early if mouse up event is not fired on inline node
           if (!isMouseUpOnSupportedNode(mouseUpElement)) {

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

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 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 _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _types = require("../types");
 var _actions = require("./actions");
@@ -20,8 +22,8 @@ var getInitialState = exports.getInitialState = function getInitialState(state)
     selection: state.selection
   };
 };
-var createPlugin = exports.createPlugin = function createPlugin(dispatch, dispatchAnalyticsEvent) {
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+var createPlugin = exports.createPlugin = function createPlugin(api, dispatch, dispatchAnalyticsEvent) {
+  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   return new _safePlugin.SafePlugin({
     key: _types.selectionPluginKey,
     state: (0, _pluginFactory.createPluginState)(dispatch, getInitialState),
@@ -68,6 +70,17 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, dispat
     props: {
       createSelectionBetween: _createSelectionBetween.onCreateSelectionBetween,
       decorations: function decorations(state) {
+        var _api$interaction;
+        // TODO: ED-27865 - This has to be explicitly checked against false to ensure that
+        // we don't change behaviour when hasHadInteraction is undefined.
+        var hasHadInteraction = (api === null || api === void 0 || (_api$interaction = api.interaction) === null || _api$interaction === void 0 || (_api$interaction = _api$interaction.sharedState.currentState()) === null || _api$interaction === void 0 ? void 0 : _api$interaction.hasHadInteraction) !== false;
+
+        // Do not show selection decorations for live pages where the user has not
+        // interacted with the page. We do not show cursor until interaction and we do not
+        // want to show selections either.
+        if (options.__livePage && !hasHadInteraction && (0, _platformFeatureFlags.fg)('platform_editor_no_selection_decorations')) {
+          return _view.DecorationSet.empty;
+        }
         return (0, _pluginFactory.getPluginState)(state).decorationSet;
       },
       handleDOMEvents: {

package/dist/cjs/selectionPlugin.js

@@ -47,7 +47,8 @@ var setManualSelection = function setManualSelection(anchor, head) {
   };
 };
 var selectionPlugin = exports.selectionPlugin = function selectionPlugin(_ref4) {
-  var options = _ref4.config;
+  var api = _ref4.api,
+    options = _ref4.config;
   return {
     name: 'selection',
     commands: {
@@ -82,7 +83,7 @@ var selectionPlugin = exports.selectionPlugin = function selectionPlugin(_ref4)
         plugin: function plugin(_ref6) {
           var dispatch = _ref6.dispatch,
             dispatchAnalyticsEvent = _ref6.dispatchAnalyticsEvent;
-          return (0, _selectionMain.createPlugin)(dispatch, dispatchAnalyticsEvent, options);
+          return (0, _selectionMain.createPlugin)(api, dispatch, dispatchAnalyticsEvent, options);
         }
       }, {
         name: 'selectionKeymap',

package/dist/es2019/pm-plugins/auto-expand-selection-range-on-inline-node-main.js

@@ -1,6 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { autoExpandSelectionRangeOnInlineNodePluginKey } from './auto-expand-selection-range-on-inline-node-key';
 export const createAutoExpandSelectionRangeOnInlineNodePlugin = () => {
   let mouseDownElement = null;
@@ -17,22 +16,16 @@ export const createAutoExpandSelectionRangeOnInlineNodePlugin = () => {
           // Ignored via go/ees005
           // eslint-disable-next-line @atlaskit/editor/no-as-casting
           const mouseUpElement = event.target;
-          if (fg('platform_editor_lcm_inline_node_selection_fix')) {
-            // terminate early if mouse down and mouse up elements are the same -> e.g a click event
-            // or mouse down doesn't trigger
-            if (!mouseDownElement || mouseDownElement === mouseUpElement) {
-              mouseDownElement = null;
-              return;
-            }
-            // reset mouse down element after mouse up event
-            // so that we can detect the next mouse down event is triggered right after mouse up event or not
+
+          // terminate early if mouse down and mouse up elements are the same -> e.g a click event
+          // or mouse down doesn't trigger
+          if (!mouseDownElement || mouseDownElement === mouseUpElement) {
             mouseDownElement = null;
-          } else {
-            // terminate early if mouse down and mouse up elements are the same -> e.g a click event
-            if (mouseDownElement === mouseUpElement) {
-              return;
-            }
+            return;
           }
+          // reset mouse down element after mouse up event
+          // so that we can detect the next mouse down event is triggered right after mouse up event or not
+          mouseDownElement = null;
 
           // terminate early if mouse up event is not fired on inline node
           if (!isMouseUpOnSupportedNode(mouseUpElement)) {

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

@@ -1,5 +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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { selectionPluginKey } from '../types';
 import { SelectionActionTypes } from './actions';
@@ -12,7 +14,7 @@ export const getInitialState = state => ({
   decorationSet: getDecorations(state.tr),
   selection: state.selection
 });
-export const createPlugin = (dispatch, dispatchAnalyticsEvent, options = {}) => {
+export const createPlugin = (api, dispatch, dispatchAnalyticsEvent, options = {}) => {
   return new SafePlugin({
     key: selectionPluginKey,
     state: createPluginState(dispatch, getInitialState),
@@ -61,6 +63,17 @@ export const createPlugin = (dispatch, dispatchAnalyticsEvent, options = {}) =>
     props: {
       createSelectionBetween: onCreateSelectionBetween,
       decorations(state) {
+        var _api$interaction, _api$interaction$shar;
+        // TODO: ED-27865 - This has to be explicitly checked against false to ensure that
+        // we don't change behaviour when hasHadInteraction is undefined.
+        const hasHadInteraction = (api === null || api === void 0 ? void 0 : (_api$interaction = api.interaction) === null || _api$interaction === void 0 ? void 0 : (_api$interaction$shar = _api$interaction.sharedState.currentState()) === null || _api$interaction$shar === void 0 ? void 0 : _api$interaction$shar.hasHadInteraction) !== false;
+
+        // Do not show selection decorations for live pages where the user has not
+        // interacted with the page. We do not show cursor until interaction and we do not
+        // want to show selections either.
+        if (options.__livePage && !hasHadInteraction && fg('platform_editor_no_selection_decorations')) {
+          return DecorationSet.empty;
+        }
         return getPluginState(state).decorationSet;
       },
       handleDOMEvents: {

package/dist/es2019/selectionPlugin.js

@@ -36,6 +36,7 @@ const setManualSelection = (anchor, head) => ({
   });
 };
 export const selectionPlugin = ({
+  api,
   config: options
 }) => ({
   name: 'selection',
@@ -70,7 +71,7 @@ export const selectionPlugin = ({
       plugin: ({
         dispatch,
         dispatchAnalyticsEvent
-      }) => createPlugin(dispatch, dispatchAnalyticsEvent, options)
+      }) => createPlugin(api, dispatch, dispatchAnalyticsEvent, options)
     }, {
       name: 'selectionKeymap',
       plugin: selectionKeymapPlugin

package/dist/esm/pm-plugins/auto-expand-selection-range-on-inline-node-main.js

@@ -1,6 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { autoExpandSelectionRangeOnInlineNodePluginKey } from './auto-expand-selection-range-on-inline-node-key';
 export var createAutoExpandSelectionRangeOnInlineNodePlugin = function createAutoExpandSelectionRangeOnInlineNodePlugin() {
   var mouseDownElement = null;
@@ -17,22 +16,16 @@ export var createAutoExpandSelectionRangeOnInlineNodePlugin = function createAut
           // Ignored via go/ees005
           // eslint-disable-next-line @atlaskit/editor/no-as-casting
           var mouseUpElement = event.target;
-          if (fg('platform_editor_lcm_inline_node_selection_fix')) {
-            // terminate early if mouse down and mouse up elements are the same -> e.g a click event
-            // or mouse down doesn't trigger
-            if (!mouseDownElement || mouseDownElement === mouseUpElement) {
-              mouseDownElement = null;
-              return;
-            }
-            // reset mouse down element after mouse up event
-            // so that we can detect the next mouse down event is triggered right after mouse up event or not
+
+          // terminate early if mouse down and mouse up elements are the same -> e.g a click event
+          // or mouse down doesn't trigger
+          if (!mouseDownElement || mouseDownElement === mouseUpElement) {
             mouseDownElement = null;
-          } else {
-            // terminate early if mouse down and mouse up elements are the same -> e.g a click event
-            if (mouseDownElement === mouseUpElement) {
-              return;
-            }
+            return;
           }
+          // reset mouse down element after mouse up event
+          // so that we can detect the next mouse down event is triggered right after mouse up event or not
+          mouseDownElement = null;
 
           // terminate early if mouse up event is not fired on inline node
           if (!isMouseUpOnSupportedNode(mouseUpElement)) {

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

@@ -1,5 +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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { selectionPluginKey } from '../types';
 import { SelectionActionTypes } from './actions';
@@ -14,8 +16,8 @@ export var getInitialState = function getInitialState(state) {
     selection: state.selection
   };
 };
-export var createPlugin = function createPlugin(dispatch, dispatchAnalyticsEvent) {
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+export var createPlugin = function createPlugin(api, dispatch, dispatchAnalyticsEvent) {
+  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   return new SafePlugin({
     key: selectionPluginKey,
     state: createPluginState(dispatch, getInitialState),
@@ -62,6 +64,17 @@ export var createPlugin = function createPlugin(dispatch, dispatchAnalyticsEvent
     props: {
       createSelectionBetween: onCreateSelectionBetween,
       decorations: function decorations(state) {
+        var _api$interaction;
+        // TODO: ED-27865 - This has to be explicitly checked against false to ensure that
+        // we don't change behaviour when hasHadInteraction is undefined.
+        var hasHadInteraction = (api === null || api === void 0 || (_api$interaction = api.interaction) === null || _api$interaction === void 0 || (_api$interaction = _api$interaction.sharedState.currentState()) === null || _api$interaction === void 0 ? void 0 : _api$interaction.hasHadInteraction) !== false;
+
+        // Do not show selection decorations for live pages where the user has not
+        // interacted with the page. We do not show cursor until interaction and we do not
+        // want to show selections either.
+        if (options.__livePage && !hasHadInteraction && fg('platform_editor_no_selection_decorations')) {
+          return DecorationSet.empty;
+        }
         return getPluginState(state).decorationSet;
       },
       handleDOMEvents: {

package/dist/esm/selectionPlugin.js

@@ -40,7 +40,8 @@ var setManualSelection = function setManualSelection(anchor, head) {
   };
 };
 export var selectionPlugin = function selectionPlugin(_ref4) {
-  var options = _ref4.config;
+  var api = _ref4.api,
+    options = _ref4.config;
   return {
     name: 'selection',
     commands: {
@@ -75,7 +76,7 @@ export var selectionPlugin = function selectionPlugin(_ref4) {
         plugin: function plugin(_ref6) {
           var dispatch = _ref6.dispatch,
             dispatchAnalyticsEvent = _ref6.dispatchAnalyticsEvent;
-          return createPlugin(dispatch, dispatchAnalyticsEvent, options);
+          return createPlugin(api, dispatch, dispatchAnalyticsEvent, options);
         }
       }, {
         name: 'selectionKeymap',

package/dist/types/pm-plugins/selection-main.d.ts

@@ -2,7 +2,9 @@ import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { SelectionPluginState } from '@atlaskit/editor-common/selection';
+import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { SelectionPlugin } from '../selectionPluginType';
 import type { SelectionPluginOptions } from '../types';
 export declare const getInitialState: (state: EditorState) => SelectionPluginState;
-export declare const createPlugin: (dispatch: Dispatch, dispatchAnalyticsEvent: DispatchAnalyticsEvent, options?: SelectionPluginOptions) => SafePlugin<SelectionPluginState>;
+export declare const createPlugin: (api: ExtractInjectionAPI<SelectionPlugin> | undefined, dispatch: Dispatch, dispatchAnalyticsEvent: DispatchAnalyticsEvent, options?: SelectionPluginOptions) => SafePlugin<SelectionPluginState>;

package/dist/types/selectionPluginType.d.ts

@@ -1,9 +1,11 @@
 import type { SelectionSharedState } from '@atlaskit/editor-common/selection';
-import type { EditorCommand, NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
 import type { EditorSelectionAPI, SelectionPluginOptions } from './types';
 export type SelectionPlugin = NextEditorPlugin<'selection', {
     pluginConfiguration: SelectionPluginOptions | undefined;
     actions: EditorSelectionAPI;
+    dependencies: [OptionalPlugin<InteractionPlugin>];
     commands: {
         displayGapCursor: (toggle: boolean) => EditorCommand;
         clearManualSelection: () => EditorCommand;

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

@@ -2,7 +2,9 @@ import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { SelectionPluginState } from '@atlaskit/editor-common/selection';
+import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { SelectionPlugin } from '../selectionPluginType';
 import type { SelectionPluginOptions } from '../types';
 export declare const getInitialState: (state: EditorState) => SelectionPluginState;
-export declare const createPlugin: (dispatch: Dispatch, dispatchAnalyticsEvent: DispatchAnalyticsEvent, options?: SelectionPluginOptions) => SafePlugin<SelectionPluginState>;
+export declare const createPlugin: (api: ExtractInjectionAPI<SelectionPlugin> | undefined, dispatch: Dispatch, dispatchAnalyticsEvent: DispatchAnalyticsEvent, options?: SelectionPluginOptions) => SafePlugin<SelectionPluginState>;

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

@@ -1,9 +1,13 @@
 import type { SelectionSharedState } from '@atlaskit/editor-common/selection';
-import type { EditorCommand, NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
 import type { EditorSelectionAPI, SelectionPluginOptions } from './types';
 export type SelectionPlugin = NextEditorPlugin<'selection', {
     pluginConfiguration: SelectionPluginOptions | undefined;
     actions: EditorSelectionAPI;
+    dependencies: [
+        OptionalPlugin<InteractionPlugin>
+    ];
     commands: {
         displayGapCursor: (toggle: boolean) => EditorCommand;
         clearManualSelection: () => EditorCommand;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection",
-	"version": "2.1.9",
+	"version": "2.2.1",
 	"description": "Selection plugin for @atlaskit/editor-core",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -20,12 +20,13 @@
 		"runReact18": true
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^103.12.0",
+		"@atlaskit/editor-common": "^103.22.0",
+		"@atlaskit/editor-plugin-interaction": "^1.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.12.0",
+		"@atlaskit/tmp-editor-statsig": "^4.15.0",
 		"@atlaskit/tokens": "^4.8.0",
 		"@babel/runtime": "^7.0.0"
 	},
@@ -87,10 +88,10 @@
 		"platform_editor_fix_drag_and_drop_lists": {
 			"type": "boolean"
 		},
-		"platform_editor_lcm_inline_node_selection_fix": {
+		"platform_editor_nested_tables_gap_cursor": {
 			"type": "boolean"
 		},
-		"platform_editor_nested_tables_gap_cursor": {
+		"platform_editor_no_selection_decorations": {
 			"type": "boolean"
 		}
 	}