@atlaskit/editor-plugin-type-ahead 2.1.7 → 2.2.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-type-ahead
 
+## 2.2.1
+
+### Patch Changes
+
+- [#130684](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/130684)
+  [`0656a8915e18f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0656a8915e18f) -
+  updated existing fix for focusOut typeahead trigger duplication to also include IE/Edge
+
+## 2.2.0
+
+### Minor Changes
+
+- [#130262](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/130262)
+  [`236c73af67c7b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/236c73af67c7b) -
+  [ED-24873] This change is cleaning up code from the element templates experiment
+  `platform_editor_element_level_templates`.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.1.7
 
 ### Patch Changes

package/dist/cjs/pm-plugins/commands/insert-type-ahead-item.js

@@ -10,11 +10,10 @@ var _steps = require("@atlaskit/adf-schema/steps");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _history = require("@atlaskit/editor-prosemirror/history");
 var _model = require("@atlaskit/editor-prosemirror/model");
-var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _actions = require("../actions");
 var _key = require("../key");
 var _statsModifier = require("../stats-modifier");
-var _utils2 = require("../utils");
+var _utils = require("../utils");
 var _closeTypeAhead = require("./close-type-ahead");
 var _insertUtils = require("./insert-utils");
 var validateNode = function validateNode(_ref) {
@@ -37,25 +36,14 @@ var validateNode = function validateNode(_ref) {
     return null;
   }
 };
-// For platform_editor_element_level_templates experiment only
-// clean up ticket ED-24873
-var insertTemplateFragment = function insertTemplateFragment(_ref2) {
-  var fragment = _ref2.fragment,
-    tr = _ref2.tr,
-    position = _ref2.position;
-  var start = position.start;
-  var trWithInsert = (0, _utils.safeInsert)(fragment, start)(tr);
-  tr.setSelection(trWithInsert.selection);
-  return tr;
-};
-var createInsertCallback = function createInsertCallback(_ref3) {
-  var state = _ref3.editorState,
-    handler = _ref3.handler,
-    query = _ref3.query,
-    wasInsertedBySpace = _ref3.wasInsertedBySpace,
-    selectedIndex = _ref3.selectedIndex,
-    textStartPosition = _ref3.textStartPosition,
-    textInserted = _ref3.textInserted;
+var createInsertCallback = function createInsertCallback(_ref2) {
+  var state = _ref2.editorState,
+    handler = _ref2.handler,
+    query = _ref2.query,
+    wasInsertedBySpace = _ref2.wasInsertedBySpace,
+    selectedIndex = _ref2.selectedIndex,
+    textStartPosition = _ref2.textStartPosition,
+    textInserted = _ref2.textInserted;
   return function (maybeNode) {
     var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var tr = state.tr;
@@ -74,28 +62,16 @@ var createInsertCallback = function createInsertCallback(_ref3) {
       tr.delete(position.start, position.end);
       return tr;
     }
-
-    // For platform_editor_element_level_templates experiment only
-    // clean up ticket ED-24873
-    // @ts-ignore
-    if (opts.isTemplate) {
-      insertTemplateFragment({
-        fragment: node,
-        tr: tr,
-        position: position
-      });
-    } else {
-      node instanceof _model.Node && node.isBlock ? (0, _insertUtils.insertBlockNode)({
-        node: node,
-        tr: tr,
-        position: position
-      }) : (0, _insertUtils.insertInlineNodeOrFragment)({
-        maybeFragment: node,
-        tr: tr,
-        position: position,
-        selectInlineNode: Boolean(opts.selectInlineNode)
-      });
-    }
+    node instanceof _model.Node && node.isBlock ? (0, _insertUtils.insertBlockNode)({
+      node: node,
+      tr: tr,
+      position: position
+    }) : (0, _insertUtils.insertInlineNodeOrFragment)({
+      maybeFragment: node,
+      tr: tr,
+      position: position,
+      selectInlineNode: Boolean(opts.selectInlineNode)
+    });
     (0, _history.closeHistory)(tr);
     if (wasInsertedBySpace) {
       return tr;
@@ -110,13 +86,13 @@ var createInsertCallback = function createInsertCallback(_ref3) {
     return tr;
   };
 };
-var createDeleteRawTextCallback = function createDeleteRawTextCallback(_ref4) {
-  var trigger = _ref4.trigger,
-    selectedIndex = _ref4.selectedIndex,
-    position = _ref4.position,
-    query = _ref4.query,
-    wasInsertedBySpace = _ref4.wasInsertedBySpace,
-    insertItem = _ref4.insertItem;
+var createDeleteRawTextCallback = function createDeleteRawTextCallback(_ref3) {
+  var trigger = _ref3.trigger,
+    selectedIndex = _ref3.selectedIndex,
+    position = _ref3.position,
+    query = _ref3.query,
+    wasInsertedBySpace = _ref3.wasInsertedBySpace,
+    insertItem = _ref3.insertItem;
   return function (newState) {
     var tr = newState.tr;
     (0, _history.closeHistory)(tr);
@@ -138,13 +114,13 @@ var createDeleteRawTextCallback = function createDeleteRawTextCallback(_ref4) {
   };
 };
 var insertTypeAheadItem = exports.insertTypeAheadItem = function insertTypeAheadItem(view) {
-  return function (_ref5) {
-    var item = _ref5.item,
-      handler = _ref5.handler,
-      mode = _ref5.mode,
-      query = _ref5.query,
-      sourceListItem = _ref5.sourceListItem;
-    var pluginState = (0, _utils2.getPluginState)(view.state);
+  return function (_ref4) {
+    var item = _ref4.item,
+      handler = _ref4.handler,
+      mode = _ref4.mode,
+      query = _ref4.query,
+      sourceListItem = _ref4.sourceListItem;
+    var pluginState = (0, _utils.getPluginState)(view.state);
     if (!pluginState) {
       return;
     }

package/dist/cjs/ui/InputQuery.js

@@ -284,15 +284,12 @@ var InputQuery = exports.InputQuery = /*#__PURE__*/_react.default.memo(function
         return;
       }
 
-      // See ED-14909: Chrome may emit focusout events where an input
-      // device was not directly responsible. (This rears in react v17+ consumers
-      // where react-managed node removal now appears to propagate focusout events to
-      // our event listener). As this path is strictly for click or other typeahead
-      // dismissals that don't involve typeahead item selection, we carve out an
-      // exception for Chrome-specific events where an input device was not the initiator.
-      if (_browser.browser.chrome && !(((_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 ? void 0 : _window$getSelection.type) === 'Range') &&
+      // Chrome and Edge may emit focusout events without direct input.
+      // This path handles dismissals that don't involve item selection, so we ignore these events.
+      // In Edge this also lead to duplication in the trigger character (@, /, :) as `cancel` would be called twice
+      if ((_browser.browser.ie || _browser.browser.chrome) && !(((_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 ? void 0 : _window$getSelection.type) === 'Range') &&
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      !('sourceCapabilities' in event && event.sourceCapabilities)) {
+      !event.sourceCapabilities) {
         return;
       }
       cancel({

package/dist/es2019/pm-plugins/commands/insert-type-ahead-item.js

@@ -2,7 +2,6 @@ import { InsertTypeAheadStages, InsertTypeAheadStep } from '@atlaskit/adf-schema
 import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { Fragment, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { ACTIONS } from '../actions';
 import { pluginKey } from '../key';
 import { StatsModifier } from '../stats-modifier';
@@ -30,20 +29,6 @@ const validateNode = ({
     return null;
   }
 };
-// For platform_editor_element_level_templates experiment only
-// clean up ticket ED-24873
-const insertTemplateFragment = ({
-  fragment,
-  tr,
-  position
-}) => {
-  const {
-    start
-  } = position;
-  const trWithInsert = safeInsert(fragment, start)(tr);
-  tr.setSelection(trWithInsert.selection);
-  return tr;
-};
 const createInsertCallback = ({
   editorState: state,
   handler,
@@ -71,28 +56,16 @@ const createInsertCallback = ({
     tr.delete(position.start, position.end);
     return tr;
   }
-
-  // For platform_editor_element_level_templates experiment only
-  // clean up ticket ED-24873
-  // @ts-ignore
-  if (opts.isTemplate) {
-    insertTemplateFragment({
-      fragment: node,
-      tr,
-      position
-    });
-  } else {
-    node instanceof PMNode && node.isBlock ? insertBlockNode({
-      node,
-      tr,
-      position
-    }) : insertInlineNodeOrFragment({
-      maybeFragment: node,
-      tr,
-      position,
-      selectInlineNode: Boolean(opts.selectInlineNode)
-    });
-  }
+  node instanceof PMNode && node.isBlock ? insertBlockNode({
+    node,
+    tr,
+    position
+  }) : insertInlineNodeOrFragment({
+    maybeFragment: node,
+    tr,
+    position,
+    selectInlineNode: Boolean(opts.selectInlineNode)
+  });
   closeHistory(tr);
   if (wasInsertedBySpace) {
     return tr;

package/dist/es2019/ui/InputQuery.js

@@ -269,15 +269,12 @@ export const InputQuery = /*#__PURE__*/React.memo(({
         return;
       }
 
-      // See ED-14909: Chrome may emit focusout events where an input
-      // device was not directly responsible. (This rears in react v17+ consumers
-      // where react-managed node removal now appears to propagate focusout events to
-      // our event listener). As this path is strictly for click or other typeahead
-      // dismissals that don't involve typeahead item selection, we carve out an
-      // exception for Chrome-specific events where an input device was not the initiator.
-      if (browser.chrome && !(((_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 ? void 0 : _window$getSelection.type) === 'Range') &&
+      // Chrome and Edge may emit focusout events without direct input.
+      // This path handles dismissals that don't involve item selection, so we ignore these events.
+      // In Edge this also lead to duplication in the trigger character (@, /, :) as `cancel` would be called twice
+      if ((browser.ie || browser.chrome) && !(((_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 ? void 0 : _window$getSelection.type) === 'Range') &&
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      !('sourceCapabilities' in event && event.sourceCapabilities)) {
+      !event.sourceCapabilities) {
         return;
       }
       cancel({

package/dist/esm/pm-plugins/commands/insert-type-ahead-item.js

@@ -3,7 +3,6 @@ import { InsertTypeAheadStages, InsertTypeAheadStep } from '@atlaskit/adf-schema
 import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { Fragment, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { ACTIONS } from '../actions';
 import { pluginKey } from '../key';
 import { StatsModifier } from '../stats-modifier';
@@ -30,25 +29,14 @@ var validateNode = function validateNode(_ref) {
     return null;
   }
 };
-// For platform_editor_element_level_templates experiment only
-// clean up ticket ED-24873
-var insertTemplateFragment = function insertTemplateFragment(_ref2) {
-  var fragment = _ref2.fragment,
-    tr = _ref2.tr,
-    position = _ref2.position;
-  var start = position.start;
-  var trWithInsert = safeInsert(fragment, start)(tr);
-  tr.setSelection(trWithInsert.selection);
-  return tr;
-};
-var createInsertCallback = function createInsertCallback(_ref3) {
-  var state = _ref3.editorState,
-    handler = _ref3.handler,
-    query = _ref3.query,
-    wasInsertedBySpace = _ref3.wasInsertedBySpace,
-    selectedIndex = _ref3.selectedIndex,
-    textStartPosition = _ref3.textStartPosition,
-    textInserted = _ref3.textInserted;
+var createInsertCallback = function createInsertCallback(_ref2) {
+  var state = _ref2.editorState,
+    handler = _ref2.handler,
+    query = _ref2.query,
+    wasInsertedBySpace = _ref2.wasInsertedBySpace,
+    selectedIndex = _ref2.selectedIndex,
+    textStartPosition = _ref2.textStartPosition,
+    textInserted = _ref2.textInserted;
   return function (maybeNode) {
     var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var tr = state.tr;
@@ -67,28 +55,16 @@ var createInsertCallback = function createInsertCallback(_ref3) {
       tr.delete(position.start, position.end);
       return tr;
     }
-
-    // For platform_editor_element_level_templates experiment only
-    // clean up ticket ED-24873
-    // @ts-ignore
-    if (opts.isTemplate) {
-      insertTemplateFragment({
-        fragment: node,
-        tr: tr,
-        position: position
-      });
-    } else {
-      node instanceof PMNode && node.isBlock ? insertBlockNode({
-        node: node,
-        tr: tr,
-        position: position
-      }) : insertInlineNodeOrFragment({
-        maybeFragment: node,
-        tr: tr,
-        position: position,
-        selectInlineNode: Boolean(opts.selectInlineNode)
-      });
-    }
+    node instanceof PMNode && node.isBlock ? insertBlockNode({
+      node: node,
+      tr: tr,
+      position: position
+    }) : insertInlineNodeOrFragment({
+      maybeFragment: node,
+      tr: tr,
+      position: position,
+      selectInlineNode: Boolean(opts.selectInlineNode)
+    });
     closeHistory(tr);
     if (wasInsertedBySpace) {
       return tr;
@@ -103,13 +79,13 @@ var createInsertCallback = function createInsertCallback(_ref3) {
     return tr;
   };
 };
-var createDeleteRawTextCallback = function createDeleteRawTextCallback(_ref4) {
-  var trigger = _ref4.trigger,
-    selectedIndex = _ref4.selectedIndex,
-    position = _ref4.position,
-    query = _ref4.query,
-    wasInsertedBySpace = _ref4.wasInsertedBySpace,
-    insertItem = _ref4.insertItem;
+var createDeleteRawTextCallback = function createDeleteRawTextCallback(_ref3) {
+  var trigger = _ref3.trigger,
+    selectedIndex = _ref3.selectedIndex,
+    position = _ref3.position,
+    query = _ref3.query,
+    wasInsertedBySpace = _ref3.wasInsertedBySpace,
+    insertItem = _ref3.insertItem;
   return function (newState) {
     var tr = newState.tr;
     closeHistory(tr);
@@ -131,12 +107,12 @@ var createDeleteRawTextCallback = function createDeleteRawTextCallback(_ref4) {
   };
 };
 export var insertTypeAheadItem = function insertTypeAheadItem(view) {
-  return function (_ref5) {
-    var item = _ref5.item,
-      handler = _ref5.handler,
-      mode = _ref5.mode,
-      query = _ref5.query,
-      sourceListItem = _ref5.sourceListItem;
+  return function (_ref4) {
+    var item = _ref4.item,
+      handler = _ref4.handler,
+      mode = _ref4.mode,
+      query = _ref4.query,
+      sourceListItem = _ref4.sourceListItem;
     var pluginState = getPluginState(view.state);
     if (!pluginState) {
       return;

package/dist/esm/ui/InputQuery.js

@@ -273,15 +273,12 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
         return;
       }
 
-      // See ED-14909: Chrome may emit focusout events where an input
-      // device was not directly responsible. (This rears in react v17+ consumers
-      // where react-managed node removal now appears to propagate focusout events to
-      // our event listener). As this path is strictly for click or other typeahead
-      // dismissals that don't involve typeahead item selection, we carve out an
-      // exception for Chrome-specific events where an input device was not the initiator.
-      if (browser.chrome && !(((_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 ? void 0 : _window$getSelection.type) === 'Range') &&
+      // Chrome and Edge may emit focusout events without direct input.
+      // This path handles dismissals that don't involve item selection, so we ignore these events.
+      // In Edge this also lead to duplication in the trigger character (@, /, :) as `cancel` would be called twice
+      if ((browser.ie || browser.chrome) && !(((_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 ? void 0 : _window$getSelection.type) === 'Range') &&
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      !('sourceCapabilities' in event && event.sourceCapabilities)) {
+      !event.sourceCapabilities) {
         return;
       }
       cancel({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-type-ahead",
-	"version": "2.1.7",
+	"version": "2.2.1",
 	"description": "Type-ahead plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^102.8.0",
+		"@atlaskit/editor-common": "^102.13.0",
 		"@atlaskit/editor-element-browser": "^0.1.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -45,10 +45,10 @@
 		"@atlaskit/icon": "^25.0.0",
 		"@atlaskit/menu": "^3.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^14.1.0",
+		"@atlaskit/primitives": "^14.2.0",
 		"@atlaskit/prosemirror-input-rules": "^3.3.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.0.0",
+		"@atlaskit/tmp-editor-statsig": "^4.4.0",
 		"@atlaskit/tokens": "^4.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",