@atlaskit/editor-plugin-type-ahead 2.2.2 → 2.2.4

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-type-ahead
 
+## 2.2.4
+
+### Patch Changes
+
+- [#133624](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/133624)
+  [`0054ad6978c1b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0054ad6978c1b) -
+  Fixed issue when search term is added to document when opening view more from Quickinsert
+- Updated dependencies
+
+## 2.2.3
+
+### Patch Changes
+
+- [#132892](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/132892)
+  [`6db8f28318224`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6db8f28318224) -
+  update type ahead locale, add key to ai preview react list child
+- Updated dependencies
+
 ## 2.2.2
 
 ### Patch Changes

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

@@ -12,6 +12,7 @@ var _w3cKeyname = require("w3c-keyname");
 var _history = require("@atlaskit/editor-prosemirror/history");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _WrapperTypeAhead = require("../ui/WrapperTypeAhead");
@@ -93,7 +94,8 @@ var factoryDecorations = exports.factoryDecorations = function factoryDecoration
       nodeViewPortalProviderAPI.render(function () {
         var _popupMountRef$curren, _popupMountRef$curren2, _popupMountRef$curren3;
         return /*#__PURE__*/_react.default.createElement(_reactIntlNext.IntlProvider, {
-          locale: intl.locale || 'en',
+          defaultLocale: (0, _platformFeatureFlags.fg)('platform_editor_update_type_ahead_locale') ? intl.defaultLocale || 'en-US' : undefined,
+          locale: intl.locale || ((0, _platformFeatureFlags.fg)('platform_editor_update_type_ahead_locale') ? 'en-US' : 'en'),
           messages: intl.messages,
           formats: intl.formats
         }, /*#__PURE__*/_react.default.createElement(_WrapperTypeAhead.WrapperTypeAhead, {

package/dist/cjs/ui/TypeAheadPopup.js

@@ -17,6 +17,7 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
+var _closeTypeAhead = require("../pm-plugins/commands/close-type-ahead");
 var _constants = require("../pm-plugins/constants");
 var _TypeAheadErrorFallback = require("./TypeAheadErrorFallback");
 var _TypeAheadList = require("./TypeAheadList");
@@ -293,16 +294,27 @@ var TypeAheadPopup = exports.TypeAheadPopup = /*#__PURE__*/_react.default.memo(f
 
   // @ts-ignore
   var openElementBrowserModal = triggerHandler === null || triggerHandler === void 0 ? void 0 : triggerHandler.openElementBrowserModal;
+  var close = function close(editorView) {
+    var tr = editorView.state.tr;
+    (0, _closeTypeAhead.closeTypeAhead)(tr);
+    editorView.dispatch(tr);
+  };
   var onViewMoreClick = (0, _react.useCallback)(function () {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_1')) {
+      close(editorView);
+    }
+
     // TODO: ED-26959 - when clean up, remove config in quick insert plugin
     // platform/packages/editor/editor-plugin-quick-insert/src/quickInsertPlugin.tsx (typeAhead.openElementBrowserModal)
     openElementBrowserModal === null || openElementBrowserModal === void 0 || openElementBrowserModal();
-    cancel({
-      addPrefixTrigger: false,
-      setSelectionAt: _constants.CloseSelectionOptions.AFTER_TEXT_INSERTED,
-      forceFocusOnEditor: false
-    });
-  }, [openElementBrowserModal, cancel]);
+    if (!(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_1')) {
+      cancel({
+        addPrefixTrigger: false,
+        setSelectionAt: _constants.CloseSelectionOptions.AFTER_TEXT_INSERTED,
+        forceFocusOnEditor: false
+      });
+    }
+  }, [cancel, editorView, openElementBrowserModal]);
   return (0, _react2.jsx)(_ui.Popup, {
     zIndex: _editorSharedStyles.akEditorFloatingDialogZIndex,
     target: anchorElement,

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

@@ -5,6 +5,7 @@ import { keyName as keyNameNormalized } from 'w3c-keyname';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { B400 } from '@atlaskit/theme/colors';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { WrapperTypeAhead } from '../ui/WrapperTypeAhead';
@@ -92,7 +93,8 @@ export const factoryDecorations = ({
       nodeViewPortalProviderAPI.render(() => {
         var _popupMountRef$curren, _popupMountRef$curren2, _popupMountRef$curren3;
         return /*#__PURE__*/React.createElement(IntlProvider, {
-          locale: intl.locale || 'en',
+          defaultLocale: fg('platform_editor_update_type_ahead_locale') ? intl.defaultLocale || 'en-US' : undefined,
+          locale: intl.locale || (fg('platform_editor_update_type_ahead_locale') ? 'en-US' : 'en'),
           messages: intl.messages,
           formats: intl.formats
         }, /*#__PURE__*/React.createElement(WrapperTypeAhead, {

package/dist/es2019/ui/TypeAheadPopup.js

@@ -14,6 +14,7 @@ import { findOverflowScrollParent, Popup } from '@atlaskit/editor-common/ui';
 import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { N0, N50A, N60A } from '@atlaskit/theme/colors';
+import { closeTypeAhead } from '../pm-plugins/commands/close-type-ahead';
 import { CloseSelectionOptions, TYPE_AHEAD_DECORATION_DATA_ATTRIBUTE, TYPE_AHEAD_POPUP_CONTENT_CLASS } from '../pm-plugins/constants';
 import { TypeAheadErrorFallback } from './TypeAheadErrorFallback';
 import { TypeAheadList } from './TypeAheadList';
@@ -286,16 +287,31 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
 
   // @ts-ignore
   const openElementBrowserModal = triggerHandler === null || triggerHandler === void 0 ? void 0 : triggerHandler.openElementBrowserModal;
+  const close = editorView => {
+    const {
+      state: {
+        tr
+      }
+    } = editorView;
+    closeTypeAhead(tr);
+    editorView.dispatch(tr);
+  };
   const onViewMoreClick = useCallback(() => {
+    if (fg('platform_editor_controls_patch_1')) {
+      close(editorView);
+    }
+
     // TODO: ED-26959 - when clean up, remove config in quick insert plugin
     // platform/packages/editor/editor-plugin-quick-insert/src/quickInsertPlugin.tsx (typeAhead.openElementBrowserModal)
     openElementBrowserModal === null || openElementBrowserModal === void 0 ? void 0 : openElementBrowserModal();
-    cancel({
-      addPrefixTrigger: false,
-      setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED,
-      forceFocusOnEditor: false
-    });
-  }, [openElementBrowserModal, cancel]);
+    if (!fg('platform_editor_controls_patch_1')) {
+      cancel({
+        addPrefixTrigger: false,
+        setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED,
+        forceFocusOnEditor: false
+      });
+    }
+  }, [cancel, editorView, openElementBrowserModal]);
   return jsx(Popup, {
     zIndex: akEditorFloatingDialogZIndex,
     target: anchorElement,

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

@@ -5,6 +5,7 @@ import { keyName as keyNameNormalized } from 'w3c-keyname';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { B400 } from '@atlaskit/theme/colors';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { WrapperTypeAhead } from '../ui/WrapperTypeAhead';
@@ -86,7 +87,8 @@ export var factoryDecorations = function factoryDecorations(_ref) {
       nodeViewPortalProviderAPI.render(function () {
         var _popupMountRef$curren, _popupMountRef$curren2, _popupMountRef$curren3;
         return /*#__PURE__*/React.createElement(IntlProvider, {
-          locale: intl.locale || 'en',
+          defaultLocale: fg('platform_editor_update_type_ahead_locale') ? intl.defaultLocale || 'en-US' : undefined,
+          locale: intl.locale || (fg('platform_editor_update_type_ahead_locale') ? 'en-US' : 'en'),
           messages: intl.messages,
           formats: intl.formats
         }, /*#__PURE__*/React.createElement(WrapperTypeAhead, {

package/dist/esm/ui/TypeAheadPopup.js

@@ -15,6 +15,7 @@ import { findOverflowScrollParent, Popup } from '@atlaskit/editor-common/ui';
 import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { N0, N50A, N60A } from '@atlaskit/theme/colors';
+import { closeTypeAhead } from '../pm-plugins/commands/close-type-ahead';
 import { CloseSelectionOptions, TYPE_AHEAD_DECORATION_DATA_ATTRIBUTE, TYPE_AHEAD_POPUP_CONTENT_CLASS } from '../pm-plugins/constants';
 import { TypeAheadErrorFallback } from './TypeAheadErrorFallback';
 import { TypeAheadList } from './TypeAheadList';
@@ -282,16 +283,27 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
 
   // @ts-ignore
   var openElementBrowserModal = triggerHandler === null || triggerHandler === void 0 ? void 0 : triggerHandler.openElementBrowserModal;
+  var close = function close(editorView) {
+    var tr = editorView.state.tr;
+    closeTypeAhead(tr);
+    editorView.dispatch(tr);
+  };
   var onViewMoreClick = useCallback(function () {
+    if (fg('platform_editor_controls_patch_1')) {
+      close(editorView);
+    }
+
     // TODO: ED-26959 - when clean up, remove config in quick insert plugin
     // platform/packages/editor/editor-plugin-quick-insert/src/quickInsertPlugin.tsx (typeAhead.openElementBrowserModal)
     openElementBrowserModal === null || openElementBrowserModal === void 0 || openElementBrowserModal();
-    cancel({
-      addPrefixTrigger: false,
-      setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED,
-      forceFocusOnEditor: false
-    });
-  }, [openElementBrowserModal, cancel]);
+    if (!fg('platform_editor_controls_patch_1')) {
+      cancel({
+        addPrefixTrigger: false,
+        setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED,
+        forceFocusOnEditor: false
+      });
+    }
+  }, [cancel, editorView, openElementBrowserModal]);
   return jsx(Popup, {
     zIndex: akEditorFloatingDialogZIndex,
     target: anchorElement,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-type-ahead",
-	"version": "2.2.2",
+	"version": "2.2.4",
 	"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.13.0",
+		"@atlaskit/editor-common": "^102.14.0",
 		"@atlaskit/editor-element-browser": "^0.1.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -42,8 +42,8 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/heading": "^5.1.0",
-		"@atlaskit/icon": "^25.1.0",
-		"@atlaskit/menu": "^3.1.0",
+		"@atlaskit/icon": "^25.2.0",
+		"@atlaskit/menu": "^3.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.2.0",
 		"@atlaskit/prosemirror-input-rules": "^3.3.0",
@@ -95,6 +95,9 @@
 		}
 	},
 	"platform-feature-flags": {
+		"platform_editor_update_type_ahead_locale": {
+			"type": "boolean"
+		},
 		"platform_editor_offline_editing_ga": {
 			"type": "boolean"
 		},
@@ -103,6 +106,9 @@
 		},
 		"platform_editor_typeahead_dynamic_height_fix": {
 			"type": "boolean"
+		},
+		"platform_editor_controls_patch_1": {
+			"type": "boolean"
 		}
 	}
 }