@atlaskit/editor-core 150.0.2 → 150.0.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 150.0.3
+
+### Patch Changes
+
+- [`b52e6fa288b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b52e6fa288b) - [HOT-97127] Fix mentions getItems comunication to avoid wrong results
+
 ## 150.0.2
 
 ### Patch Changes

package/dist/cjs/plugins/mentions/type-ahead/index.js

@@ -40,6 +40,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -232,6 +238,7 @@ var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       HighlightComponent = _ref6.HighlightComponent;
   var sessionId = (0, _uuid.default)();
   var firstQueryWithoutResults = null;
+  var subscriptionKeys = new Set();
   var typeAhead = {
     id: _typeAhead.TypeAheadAvailableNodes.MENTION,
     trigger: '@',
@@ -278,9 +285,15 @@ var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
         var key = "loadingMentionsForTypeAhead_".concat((0, _uuid.default)());
 
         var mentionsSubscribeCallback = function mentionsSubscribeCallback(mentions) {
-          var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+          var resultQuery = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
           var stats = arguments.length > 2 ? arguments[2] : undefined;
+
+          if (query !== resultQuery) {
+            return;
+          }
+
           mentionProvider.unsubscribe(key);
+          subscriptionKeys.delete(key);
           var mentionItems = mentions.map(function (mention) {
             return memoizedToItem.call(mention);
           });
@@ -316,13 +329,14 @@ var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
           }
         };
 
+        subscriptionKeys.add(key);
         mentionProvider.subscribe(key, mentionsSubscribeCallback);
         mentionProvider.filter(query || '', _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
           sessionId: sessionId
         }));
       });
     },
-    onOpen: function onOpen(editorState) {
+    onOpen: function onOpen() {
       firstQueryWithoutResults = null;
     },
     selectItem: function selectItem(state, item, insert, _ref8) {
@@ -394,11 +408,33 @@ var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       return insert(_prosemirrorModel.Fragment.from([mentionNode, space]));
     },
     dismiss: function dismiss(_ref9) {
-      var query = _ref9.query,
+      var editorState = _ref9.editorState,
+          query = _ref9.query,
           stats = _ref9.stats;
       firstQueryWithoutResults = null;
       var pickerElapsedTime = stats.startedAt ? Date.now() - stats.startedAt : 0;
       fireEvent((0, _analytics.buildTypeAheadCancelPayload)(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, query || ''));
+      var pluginState = (0, _utils2.getMentionPluginState)(editorState);
+
+      if (pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider) {
+        var mentionProvider = pluginState.mentionProvider;
+
+        var _iterator = _createForOfIteratorHelper(subscriptionKeys),
+            _step;
+
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var key = _step.value;
+            mentionProvider.unsubscribe(key);
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+      }
+
+      subscriptionKeys.clear();
       sessionId = (0, _uuid.default)();
     }
   };

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.nextMajorVersion = exports.version = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "150.0.2";
+var version = "150.0.3";
 exports.version = version;
 
 var nextMajorVersion = function nextMajorVersion() {

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "150.0.2",
+	"version": "150.0.3",
 	"sideEffects": false
 }

package/dist/es2019/plugins/mentions/type-ahead/index.js

@@ -188,6 +188,7 @@ export const createTypeAheadConfig = ({
 }) => {
   let sessionId = uuid();
   let firstQueryWithoutResults = null;
+  const subscriptionKeys = new Set();
   const typeAhead = {
     id: TypeAheadAvailableNodes.MENTION,
     trigger: '@',
@@ -235,8 +236,13 @@ export const createTypeAheadConfig = ({
       return new Promise(resolve => {
         const key = `loadingMentionsForTypeAhead_${uuid()}`;
 
-        const mentionsSubscribeCallback = (mentions, query = '', stats) => {
+        const mentionsSubscribeCallback = (mentions, resultQuery = '', stats) => {
+          if (query !== resultQuery) {
+            return;
+          }
+
           mentionProvider.unsubscribe(key);
+          subscriptionKeys.delete(key);
           const mentionItems = mentions.map(mention => memoizedToItem.call(mention));
           buildAndSendElementsTypeAheadAnalytics(fireEvent)({
             query,
@@ -272,6 +278,7 @@ export const createTypeAheadConfig = ({
           }
         };
 
+        subscriptionKeys.add(key);
         mentionProvider.subscribe(key, mentionsSubscribeCallback);
         mentionProvider.filter(query || '', { ...contextIdentifierProvider,
           sessionId
@@ -279,7 +286,7 @@ export const createTypeAheadConfig = ({
       });
     },
 
-    onOpen: editorState => {
+    onOpen: () => {
       firstQueryWithoutResults = null;
     },
 
@@ -355,12 +362,24 @@ export const createTypeAheadConfig = ({
     },
 
     dismiss({
+      editorState,
       query,
       stats
     }) {
       firstQueryWithoutResults = null;
       const pickerElapsedTime = stats.startedAt ? Date.now() - stats.startedAt : 0;
       fireEvent(buildTypeAheadCancelPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, query || ''));
+      const pluginState = getMentionPluginState(editorState);
+
+      if (pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider) {
+        const mentionProvider = pluginState.mentionProvider;
+
+        for (let key of subscriptionKeys) {
+          mentionProvider.unsubscribe(key);
+        }
+      }
+
+      subscriptionKeys.clear();
       sessionId = uuid();
     }
 

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "150.0.2";
+export const version = "150.0.3";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "150.0.2",
+	"version": "150.0.3",
 	"sideEffects": false
 }

package/dist/esm/plugins/mentions/type-ahead/index.js

@@ -1,6 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -201,6 +207,7 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       HighlightComponent = _ref6.HighlightComponent;
   var sessionId = uuid();
   var firstQueryWithoutResults = null;
+  var subscriptionKeys = new Set();
   var typeAhead = {
     id: TypeAheadAvailableNodes.MENTION,
     trigger: '@',
@@ -247,9 +254,15 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
         var key = "loadingMentionsForTypeAhead_".concat(uuid());
 
         var mentionsSubscribeCallback = function mentionsSubscribeCallback(mentions) {
-          var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+          var resultQuery = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
           var stats = arguments.length > 2 ? arguments[2] : undefined;
+
+          if (query !== resultQuery) {
+            return;
+          }
+
           mentionProvider.unsubscribe(key);
+          subscriptionKeys.delete(key);
           var mentionItems = mentions.map(function (mention) {
             return memoizedToItem.call(mention);
           });
@@ -285,13 +298,14 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
           }
         };
 
+        subscriptionKeys.add(key);
         mentionProvider.subscribe(key, mentionsSubscribeCallback);
         mentionProvider.filter(query || '', _objectSpread(_objectSpread({}, contextIdentifierProvider), {}, {
           sessionId: sessionId
         }));
       });
     },
-    onOpen: function onOpen(editorState) {
+    onOpen: function onOpen() {
       firstQueryWithoutResults = null;
     },
     selectItem: function selectItem(state, item, insert, _ref8) {
@@ -362,11 +376,33 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
       return insert(Fragment.from([mentionNode, space]));
     },
     dismiss: function dismiss(_ref9) {
-      var query = _ref9.query,
+      var editorState = _ref9.editorState,
+          query = _ref9.query,
           stats = _ref9.stats;
       firstQueryWithoutResults = null;
       var pickerElapsedTime = stats.startedAt ? Date.now() - stats.startedAt : 0;
       fireEvent(buildTypeAheadCancelPayload(pickerElapsedTime, stats.keyCount.arrowUp, stats.keyCount.arrowDown, sessionId, query || ''));
+      var pluginState = getMentionPluginState(editorState);
+
+      if (pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider) {
+        var mentionProvider = pluginState.mentionProvider;
+
+        var _iterator = _createForOfIteratorHelper(subscriptionKeys),
+            _step;
+
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var key = _step.value;
+            mentionProvider.unsubscribe(key);
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+      }
+
+      subscriptionKeys.clear();
       sessionId = uuid();
     }
   };

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "150.0.2";
+export var version = "150.0.3";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "150.0.2",
+	"version": "150.0.3",
 	"sideEffects": false
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "150.0.2",
+  "version": "150.0.3",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"