@atlaskit/editor-plugin-type-ahead 2.7.13 → 2.7.14

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-type-ahead
 
+## 2.7.14
+
+### Patch Changes
+
+- [#169326](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/169326)
+  [`f93af5ddb6981`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f93af5ddb6981) -
+  [ED-28214] Fix a bug where in quick insert, editor loses focus and query disappears after pressing
+  space when there's no matching result
+
 ## 2.7.13
 
 ### Patch Changes

package/dist/cjs/ui/hooks/use-item-insert.js

@@ -6,11 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.useItemInsert = void 0;
 var _react = require("react");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _closeTypeAhead = require("../../pm-plugins/commands/close-type-ahead");
 var _insertTypeAheadItem = require("../../pm-plugins/commands/insert-type-ahead-item");
 var _setSelectionBeforeQuery = require("../../pm-plugins/commands/set-selection-before-query");
 var _constants = require("../../pm-plugins/constants");
 var _itemIsDisabled = require("../../pm-plugins/item-is-disabled");
+var onlyHasViewMoreItem = function onlyHasViewMoreItem(items) {
+  var _items$at;
+  return ((_items$at = items.at(0)) === null || _items$at === void 0 ? void 0 : _items$at.title) === 'View more';
+};
 var insertRawQuery = function insertRawQuery(_ref) {
   var view = _ref.view,
     setSelectionAt = _ref.setSelectionAt,
@@ -54,7 +59,9 @@ var useItemInsert = exports.useItemInsert = function useItemInsert(triggerHandle
       index = _ref3.index,
       query = _ref3.query;
     var sourceListItem = itemsRef.current;
-    if (sourceListItem.length === 0 || !triggerHandler) {
+    if (sourceListItem.length === 0 || !triggerHandler ||
+    // View more item is only added for keyboard navigation and should not be considered as a valid item to be inserted
+    onlyHasViewMoreItem(sourceListItem) && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_13')) {
       var text = "".concat(triggerHandler.trigger).concat(query);
       onTextInsert({
         forceFocusOnEditor: true,
@@ -87,7 +94,9 @@ var useItemInsert = exports.useItemInsert = function useItemInsert(triggerHandle
     if (_items && _items.length > 1) {
       return false;
     }
-    if (_items.length === 1) {
+    if (_items.length === 1 && (
+    // View more item is only added for keyboard navigation and should not be considered as a valid item to be inserted
+    !onlyHasViewMoreItem(_items) || !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_13'))) {
       queueMicrotask(function () {
         onItemInsert({
           mode: mode,

package/dist/cjs/ui/hooks/use-load-items.js

@@ -34,6 +34,8 @@ var useLoadItems = exports.useLoadItems = function useLoadItems(triggerHandler,
       if (componentIsMounted.current) {
         setItems(list);
       }
+
+      // Add a placeholder item for view more button so that it can be traversed with arrow keys
       var viewMoreItem = {
         title: 'View more'
       };

package/dist/es2019/ui/hooks/use-item-insert.js

@@ -1,10 +1,15 @@
 import { useCallback, useLayoutEffect, useRef } from 'react';
 import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { closeTypeAhead } from '../../pm-plugins/commands/close-type-ahead';
 import { insertTypeAheadItem } from '../../pm-plugins/commands/insert-type-ahead-item';
 import { setSelectionBeforeQuery } from '../../pm-plugins/commands/set-selection-before-query';
 import { CloseSelectionOptions } from '../../pm-plugins/constants';
 import { itemIsDisabled } from '../../pm-plugins/item-is-disabled';
+const onlyHasViewMoreItem = items => {
+  var _items$at;
+  return ((_items$at = items.at(0)) === null || _items$at === void 0 ? void 0 : _items$at.title) === 'View more';
+};
 const insertRawQuery = ({
   view,
   setSelectionAt,
@@ -54,7 +59,9 @@ export const useItemInsert = (triggerHandler, editorView, items, api) => {
     query
   }) => {
     const sourceListItem = itemsRef.current;
-    if (sourceListItem.length === 0 || !triggerHandler) {
+    if (sourceListItem.length === 0 || !triggerHandler ||
+    // View more item is only added for keyboard navigation and should not be considered as a valid item to be inserted
+    onlyHasViewMoreItem(sourceListItem) && fg('platform_editor_controls_patch_13')) {
       const text = `${triggerHandler.trigger}${query}`;
       onTextInsert({
         forceFocusOnEditor: true,
@@ -90,7 +97,9 @@ export const useItemInsert = (triggerHandler, editorView, items, api) => {
     if (_items && _items.length > 1) {
       return false;
     }
-    if (_items.length === 1) {
+    if (_items.length === 1 && (
+    // View more item is only added for keyboard navigation and should not be considered as a valid item to be inserted
+    !onlyHasViewMoreItem(_items) || !fg('platform_editor_controls_patch_13'))) {
       queueMicrotask(() => {
         onItemInsert({
           mode,

package/dist/es2019/ui/hooks/use-load-items.js

@@ -25,6 +25,8 @@ export const useLoadItems = (triggerHandler, editorView, query, showViewMore) =>
       if (componentIsMounted.current) {
         setItems(list);
       }
+
+      // Add a placeholder item for view more button so that it can be traversed with arrow keys
       const viewMoreItem = {
         title: 'View more'
       };

package/dist/esm/ui/hooks/use-item-insert.js

@@ -1,10 +1,15 @@
 import { useCallback, useLayoutEffect, useRef } from 'react';
 import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { closeTypeAhead } from '../../pm-plugins/commands/close-type-ahead';
 import { insertTypeAheadItem } from '../../pm-plugins/commands/insert-type-ahead-item';
 import { setSelectionBeforeQuery } from '../../pm-plugins/commands/set-selection-before-query';
 import { CloseSelectionOptions } from '../../pm-plugins/constants';
 import { itemIsDisabled } from '../../pm-plugins/item-is-disabled';
+var onlyHasViewMoreItem = function onlyHasViewMoreItem(items) {
+  var _items$at;
+  return ((_items$at = items.at(0)) === null || _items$at === void 0 ? void 0 : _items$at.title) === 'View more';
+};
 var insertRawQuery = function insertRawQuery(_ref) {
   var view = _ref.view,
     setSelectionAt = _ref.setSelectionAt,
@@ -48,7 +53,9 @@ export var useItemInsert = function useItemInsert(triggerHandler, editorView, it
       index = _ref3.index,
       query = _ref3.query;
     var sourceListItem = itemsRef.current;
-    if (sourceListItem.length === 0 || !triggerHandler) {
+    if (sourceListItem.length === 0 || !triggerHandler ||
+    // View more item is only added for keyboard navigation and should not be considered as a valid item to be inserted
+    onlyHasViewMoreItem(sourceListItem) && fg('platform_editor_controls_patch_13')) {
       var text = "".concat(triggerHandler.trigger).concat(query);
       onTextInsert({
         forceFocusOnEditor: true,
@@ -81,7 +88,9 @@ export var useItemInsert = function useItemInsert(triggerHandler, editorView, it
     if (_items && _items.length > 1) {
       return false;
     }
-    if (_items.length === 1) {
+    if (_items.length === 1 && (
+    // View more item is only added for keyboard navigation and should not be considered as a valid item to be inserted
+    !onlyHasViewMoreItem(_items) || !fg('platform_editor_controls_patch_13'))) {
       queueMicrotask(function () {
         onItemInsert({
           mode: mode,

package/dist/esm/ui/hooks/use-load-items.js

@@ -27,6 +27,8 @@ export var useLoadItems = function useLoadItems(triggerHandler, editorView, quer
       if (componentIsMounted.current) {
         setItems(list);
       }
+
+      // Add a placeholder item for view more button so that it can be traversed with arrow keys
       var viewMoreItem = {
         title: 'View more'
       };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-type-ahead",
-	"version": "2.7.13",
+	"version": "2.7.14",
 	"description": "Type-ahead plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -49,7 +49,7 @@
 		"@atlaskit/primitives": "^14.8.0",
 		"@atlaskit/prosemirror-input-rules": "^3.3.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^6.0.0",
+		"@atlaskit/tmp-editor-statsig": "^6.1.0",
 		"@atlaskit/tokens": "^5.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -125,6 +125,9 @@
 		},
 		"platform_editor_controls_patch_12": {
 			"type": "boolean"
+		},
+		"platform_editor_controls_patch_13": {
+			"type": "boolean"
 		}
 	}
 }