@atlaskit/editor-plugin-emoji 26.0.0 → 26.0.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-emoji
 
+## 26.0.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 26.0.1
+
+### Patch Changes
+
+- [`b7e558430d632`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b7e558430d632) -
+  Use legacy emoji quick-insert selection for registered menus under platform_editor_slash_command.
+- Updated dependencies
+
 ## 26.0.0
 
 ### Patch Changes

package/dist/cjs/emojiPlugin.js

@@ -190,10 +190,26 @@ var emojiPlugin = exports.emojiPlugin = function emojiPlugin(_ref2) {
       return tr;
     }
   };
+  var selectEmojiFromQuickInsert = function selectEmojiFromQuickInsert(insert) {
+    var _api$typeAhead;
+    if ((0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1', {
+      exposure: true
+    })) {
+      return (0, _actions.setInlineEmojiPopupOpen)(true)(insert(''));
+    }
+    var tr = insert(undefined);
+    api === null || api === void 0 || (_api$typeAhead = api.typeAhead) === null || _api$typeAhead === void 0 || _api$typeAhead.actions.openAtTransaction({
+      triggerHandler: typeAhead,
+      inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
+    })(tr);
+    return tr;
+  };
   var isRegisteredSlashCommandEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_slash_command');
   if (isRegisteredSlashCommandEnabled) {
     var _api$uiControlRegistr;
-    api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register((0, _getEmojiQuickInsertComponents.getEmojiQuickInsertComponents)());
+    api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register((0, _getEmojiQuickInsertComponents.getEmojiQuickInsertComponents)({
+      selectEmojiFromQuickInsert: selectEmojiFromQuickInsert
+    }));
   }
   api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || _api$base.actions.registerMarks(function (_ref7) {
     var tr = _ref7.tr,
@@ -328,23 +344,7 @@ var emojiPlugin = exports.emojiPlugin = function emojiPlugin(_ref2) {
           icon: function icon() {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconEmoji, null);
           },
-          action: function action(insert) {
-            var _api$typeAhead;
-            if ((0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1', {
-              exposure: true
-            })) {
-              // Clear slash
-              var _tr = insert('');
-              _tr = (0, _actions.setInlineEmojiPopupOpen)(true)(_tr);
-              return _tr;
-            }
-            var tr = insert(undefined);
-            api === null || api === void 0 || (_api$typeAhead = api.typeAhead) === null || _api$typeAhead === void 0 || _api$typeAhead.actions.openAtTransaction({
-              triggerHandler: typeAhead,
-              inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
-            })(tr);
-            return tr;
-          }
+          action: selectEmojiFromQuickInsert
         }];
       }
     }), {}, {

package/dist/cjs/ui/quick-insert/EmojiQuickInsertMenuItem.js

@@ -12,13 +12,13 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _menuItem = require("@atlaskit/editor-common/quick-insert/menu-item");
 var _messages2 = require("@atlaskit/editor-common/quick-insert/messages");
 var _emoji = _interopRequireDefault(require("@atlaskit/icon/core/emoji"));
-var _actions = require("../../pm-plugins/actions");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var previewImageUrls = {
   dark: 'https://dam-cdn.atl.orangelogic.com/CDNLink/AT12OVH4.png',
   light: 'https://dam-cdn.atl.orangelogic.com/CDNLink/AT12OVKH.png'
 };
-var EmojiQuickInsertMenuItem = exports.EmojiQuickInsertMenuItem = function EmojiQuickInsertMenuItem() {
+var EmojiQuickInsertMenuItem = exports.EmojiQuickInsertMenuItem = function EmojiQuickInsertMenuItem(_ref) {
+  var selectEmojiFromQuickInsert = _ref.selectEmojiFromQuickInsert;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var preview = (0, _react.useMemo)(function () {
@@ -29,10 +29,10 @@ var EmojiQuickInsertMenuItem = exports.EmojiQuickInsertMenuItem = function Emoji
       }
     };
   }, [formatMessage]);
-  var onSelect = (0, _react.useCallback)(function (_ref) {
-    var insert = _ref.insert;
-    return (0, _actions.setInlineEmojiPopupOpen)(true)(insert(''));
-  }, []);
+  var onSelect = (0, _react.useCallback)(function (_ref2) {
+    var insert = _ref2.insert;
+    return selectEmojiFromQuickInsert(insert);
+  }, [selectEmojiFromQuickInsert]);
   return /*#__PURE__*/_react.default.createElement(_menuItem.QuickInsertMenuItem, {
     description: formatMessage(_messages.toolbarInsertBlockMessages.emojiDescription),
     iconBefore: /*#__PURE__*/_react.default.createElement(_emoji.default, {

package/dist/cjs/ui/quick-insert/getEmojiQuickInsertComponents.js

@@ -1,15 +1,18 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getEmojiQuickInsertComponents = void 0;
+var _react = _interopRequireDefault(require("react"));
 var _messages = require("@atlaskit/editor-common/messages");
 var _createQuickInsertMatcher = require("@atlaskit/editor-common/quick-insert/create-quick-insert-matcher");
 var _keys = require("@atlaskit/editor-common/quick-insert/keys");
 var _rank = require("@atlaskit/editor-common/quick-insert/rank");
 var _EmojiQuickInsertMenuItem = require("./EmojiQuickInsertMenuItem");
-var getEmojiQuickInsertComponents = exports.getEmojiQuickInsertComponents = function getEmojiQuickInsertComponents() {
+var getEmojiQuickInsertComponents = exports.getEmojiQuickInsertComponents = function getEmojiQuickInsertComponents(_ref) {
+  var selectEmojiFromQuickInsert = _ref.selectEmojiFromQuickInsert;
   return [{
     key: _keys.EMOJI_MENU_ITEM.key,
     type: _keys.EMOJI_MENU_ITEM.type,
@@ -18,14 +21,18 @@ var getEmojiQuickInsertComponents = exports.getEmojiQuickInsertComponents = func
       type: _keys.MEDIA_SECTION.type,
       rank: _rank.MEDIA_SECTION_RANK[_keys.EMOJI_MENU_ITEM.key]
     }],
-    match: (0, _createQuickInsertMatcher.createQuickInsertMatcher)(function (_ref) {
-      var formatMessage = _ref.formatMessage;
+    match: (0, _createQuickInsertMatcher.createQuickInsertMatcher)(function (_ref2) {
+      var formatMessage = _ref2.formatMessage;
       return {
         description: formatMessage(_messages.toolbarInsertBlockMessages.emojiDescription),
         shortcut: ':',
         title: formatMessage(_messages.toolbarInsertBlockMessages.emoji)
       };
     }),
-    component: _EmojiQuickInsertMenuItem.EmojiQuickInsertMenuItem
+    component: function component() {
+      return /*#__PURE__*/_react.default.createElement(_EmojiQuickInsertMenuItem.EmojiQuickInsertMenuItem, {
+        selectEmojiFromQuickInsert: selectEmojiFromQuickInsert
+      });
+    }
   }];
 };

package/dist/es2019/emojiPlugin.js

@@ -168,10 +168,26 @@ export const emojiPlugin = ({
       return tr;
     }
   };
+  const selectEmojiFromQuickInsert = insert => {
+    var _api$typeAhead;
+    if (editorExperiment('platform_editor_controls', 'variant1', {
+      exposure: true
+    })) {
+      return setInlineEmojiPopupOpen(true)(insert(''));
+    }
+    const tr = insert(undefined);
+    api === null || api === void 0 ? void 0 : (_api$typeAhead = api.typeAhead) === null || _api$typeAhead === void 0 ? void 0 : _api$typeAhead.actions.openAtTransaction({
+      triggerHandler: typeAhead,
+      inputMethod: INPUT_METHOD.QUICK_INSERT
+    })(tr);
+    return tr;
+  };
   const isRegisteredSlashCommandEnabled = isExperimentEnabled('platform_editor_slash_command');
   if (isRegisteredSlashCommandEnabled) {
     var _api$uiControlRegistr;
-    api === null || api === void 0 ? void 0 : (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 ? void 0 : _api$uiControlRegistr.actions.register(getEmojiQuickInsertComponents());
+    api === null || api === void 0 ? void 0 : (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 ? void 0 : _api$uiControlRegistr.actions.register(getEmojiQuickInsertComponents({
+      selectEmojiFromQuickInsert
+    }));
   }
   api === null || api === void 0 ? void 0 : (_api$base = api.base) === null || _api$base === void 0 ? void 0 : _api$base.actions.registerMarks(({
     tr,
@@ -294,23 +310,7 @@ export const emojiPlugin = ({
           keyshortcut: ':',
           isDisabledOffline: false,
           icon: () => /*#__PURE__*/React.createElement(IconEmoji, null),
-          action(insert) {
-            var _api$typeAhead;
-            if (editorExperiment('platform_editor_controls', 'variant1', {
-              exposure: true
-            })) {
-              // Clear slash
-              let tr = insert('');
-              tr = setInlineEmojiPopupOpen(true)(tr);
-              return tr;
-            }
-            const tr = insert(undefined);
-            api === null || api === void 0 ? void 0 : (_api$typeAhead = api.typeAhead) === null || _api$typeAhead === void 0 ? void 0 : _api$typeAhead.actions.openAtTransaction({
-              triggerHandler: typeAhead,
-              inputMethod: INPUT_METHOD.QUICK_INSERT
-            })(tr);
-            return tr;
-          }
+          action: selectEmojiFromQuickInsert
         }]
       }),
       typeAhead,

package/dist/es2019/ui/quick-insert/EmojiQuickInsertMenuItem.js

@@ -4,12 +4,13 @@ import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/
 import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
 import { messages as quickInsertMessages } from '@atlaskit/editor-common/quick-insert/messages';
 import EmojiIcon from '@atlaskit/icon/core/emoji';
-import { setInlineEmojiPopupOpen } from '../../pm-plugins/actions';
 const previewImageUrls = {
   dark: 'https://dam-cdn.atl.orangelogic.com/CDNLink/AT12OVH4.png',
   light: 'https://dam-cdn.atl.orangelogic.com/CDNLink/AT12OVKH.png'
 };
-export const EmojiQuickInsertMenuItem = () => {
+export const EmojiQuickInsertMenuItem = ({
+  selectEmojiFromQuickInsert
+}) => {
   const {
     formatMessage
   } = useIntl();
@@ -21,7 +22,7 @@ export const EmojiQuickInsertMenuItem = () => {
   }), [formatMessage]);
   const onSelect = useCallback(({
     insert
-  }) => setInlineEmojiPopupOpen(true)(insert('')), []);
+  }) => selectEmojiFromQuickInsert(insert), [selectEmojiFromQuickInsert]);
   return /*#__PURE__*/React.createElement(QuickInsertMenuItem, {
     description: formatMessage(messages.emojiDescription),
     iconBefore: /*#__PURE__*/React.createElement(EmojiIcon, {

package/dist/es2019/ui/quick-insert/getEmojiQuickInsertComponents.js

@@ -1,9 +1,12 @@
+import React from 'react';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { createQuickInsertMatcher } from '@atlaskit/editor-common/quick-insert/create-quick-insert-matcher';
 import { EMOJI_MENU_ITEM, MEDIA_SECTION } from '@atlaskit/editor-common/quick-insert/keys';
 import { MEDIA_SECTION_RANK } from '@atlaskit/editor-common/quick-insert/rank';
 import { EmojiQuickInsertMenuItem } from './EmojiQuickInsertMenuItem';
-export const getEmojiQuickInsertComponents = () => [{
+export const getEmojiQuickInsertComponents = ({
+  selectEmojiFromQuickInsert
+}) => [{
   key: EMOJI_MENU_ITEM.key,
   type: EMOJI_MENU_ITEM.type,
   parents: [{
@@ -18,5 +21,7 @@ export const getEmojiQuickInsertComponents = () => [{
     shortcut: ':',
     title: formatMessage(messages.emoji)
   })),
-  component: EmojiQuickInsertMenuItem
+  component: () => /*#__PURE__*/React.createElement(EmojiQuickInsertMenuItem, {
+    selectEmojiFromQuickInsert: selectEmojiFromQuickInsert
+  })
 }];

package/dist/esm/emojiPlugin.js

@@ -179,10 +179,26 @@ export var emojiPlugin = function emojiPlugin(_ref2) {
       return tr;
     }
   };
+  var selectEmojiFromQuickInsert = function selectEmojiFromQuickInsert(insert) {
+    var _api$typeAhead;
+    if (editorExperiment('platform_editor_controls', 'variant1', {
+      exposure: true
+    })) {
+      return setInlineEmojiPopupOpen(true)(insert(''));
+    }
+    var tr = insert(undefined);
+    api === null || api === void 0 || (_api$typeAhead = api.typeAhead) === null || _api$typeAhead === void 0 || _api$typeAhead.actions.openAtTransaction({
+      triggerHandler: typeAhead,
+      inputMethod: INPUT_METHOD.QUICK_INSERT
+    })(tr);
+    return tr;
+  };
   var isRegisteredSlashCommandEnabled = isExperimentEnabled('platform_editor_slash_command');
   if (isRegisteredSlashCommandEnabled) {
     var _api$uiControlRegistr;
-    api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register(getEmojiQuickInsertComponents());
+    api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register(getEmojiQuickInsertComponents({
+      selectEmojiFromQuickInsert: selectEmojiFromQuickInsert
+    }));
   }
   api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || _api$base.actions.registerMarks(function (_ref7) {
     var tr = _ref7.tr,
@@ -317,23 +333,7 @@ export var emojiPlugin = function emojiPlugin(_ref2) {
           icon: function icon() {
             return /*#__PURE__*/React.createElement(IconEmoji, null);
           },
-          action: function action(insert) {
-            var _api$typeAhead;
-            if (editorExperiment('platform_editor_controls', 'variant1', {
-              exposure: true
-            })) {
-              // Clear slash
-              var _tr = insert('');
-              _tr = setInlineEmojiPopupOpen(true)(_tr);
-              return _tr;
-            }
-            var tr = insert(undefined);
-            api === null || api === void 0 || (_api$typeAhead = api.typeAhead) === null || _api$typeAhead === void 0 || _api$typeAhead.actions.openAtTransaction({
-              triggerHandler: typeAhead,
-              inputMethod: INPUT_METHOD.QUICK_INSERT
-            })(tr);
-            return tr;
-          }
+          action: selectEmojiFromQuickInsert
         }];
       }
     }), {}, {

package/dist/esm/ui/quick-insert/EmojiQuickInsertMenuItem.js

@@ -4,12 +4,12 @@ import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/
 import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
 import { messages as quickInsertMessages } from '@atlaskit/editor-common/quick-insert/messages';
 import EmojiIcon from '@atlaskit/icon/core/emoji';
-import { setInlineEmojiPopupOpen } from '../../pm-plugins/actions';
 var previewImageUrls = {
   dark: 'https://dam-cdn.atl.orangelogic.com/CDNLink/AT12OVH4.png',
   light: 'https://dam-cdn.atl.orangelogic.com/CDNLink/AT12OVKH.png'
 };
-export var EmojiQuickInsertMenuItem = function EmojiQuickInsertMenuItem() {
+export var EmojiQuickInsertMenuItem = function EmojiQuickInsertMenuItem(_ref) {
+  var selectEmojiFromQuickInsert = _ref.selectEmojiFromQuickInsert;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var preview = useMemo(function () {
@@ -20,10 +20,10 @@ export var EmojiQuickInsertMenuItem = function EmojiQuickInsertMenuItem() {
       }
     };
   }, [formatMessage]);
-  var onSelect = useCallback(function (_ref) {
-    var insert = _ref.insert;
-    return setInlineEmojiPopupOpen(true)(insert(''));
-  }, []);
+  var onSelect = useCallback(function (_ref2) {
+    var insert = _ref2.insert;
+    return selectEmojiFromQuickInsert(insert);
+  }, [selectEmojiFromQuickInsert]);
   return /*#__PURE__*/React.createElement(QuickInsertMenuItem, {
     description: formatMessage(messages.emojiDescription),
     iconBefore: /*#__PURE__*/React.createElement(EmojiIcon, {

package/dist/esm/ui/quick-insert/getEmojiQuickInsertComponents.js

@@ -1,9 +1,11 @@
+import React from 'react';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { createQuickInsertMatcher } from '@atlaskit/editor-common/quick-insert/create-quick-insert-matcher';
 import { EMOJI_MENU_ITEM, MEDIA_SECTION } from '@atlaskit/editor-common/quick-insert/keys';
 import { MEDIA_SECTION_RANK } from '@atlaskit/editor-common/quick-insert/rank';
 import { EmojiQuickInsertMenuItem } from './EmojiQuickInsertMenuItem';
-export var getEmojiQuickInsertComponents = function getEmojiQuickInsertComponents() {
+export var getEmojiQuickInsertComponents = function getEmojiQuickInsertComponents(_ref) {
+  var selectEmojiFromQuickInsert = _ref.selectEmojiFromQuickInsert;
   return [{
     key: EMOJI_MENU_ITEM.key,
     type: EMOJI_MENU_ITEM.type,
@@ -12,14 +14,18 @@ export var getEmojiQuickInsertComponents = function getEmojiQuickInsertComponent
       type: MEDIA_SECTION.type,
       rank: MEDIA_SECTION_RANK[EMOJI_MENU_ITEM.key]
     }],
-    match: createQuickInsertMatcher(function (_ref) {
-      var formatMessage = _ref.formatMessage;
+    match: createQuickInsertMatcher(function (_ref2) {
+      var formatMessage = _ref2.formatMessage;
       return {
         description: formatMessage(messages.emojiDescription),
         shortcut: ':',
         title: formatMessage(messages.emoji)
       };
     }),
-    component: EmojiQuickInsertMenuItem
+    component: function component() {
+      return /*#__PURE__*/React.createElement(EmojiQuickInsertMenuItem, {
+        selectEmojiFromQuickInsert: selectEmojiFromQuickInsert
+      });
+    }
   }];
 };

package/dist/types/ui/quick-insert/EmojiQuickInsertMenuItem.d.ts

@@ -1,2 +1,6 @@
 import React from 'react';
-export declare const EmojiQuickInsertMenuItem: () => React.JSX.Element;
+import type { TypeAheadInsert } from '@atlaskit/editor-common/types';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+export declare const EmojiQuickInsertMenuItem: ({ selectEmojiFromQuickInsert, }: {
+    selectEmojiFromQuickInsert: (insert: TypeAheadInsert) => Transaction;
+}) => React.JSX.Element;

package/dist/types/ui/quick-insert/getEmojiQuickInsertComponents.d.ts

@@ -1,2 +1,6 @@
+import type { TypeAheadInsert } from '@atlaskit/editor-common/types';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { RegisterMenuItem } from '@atlaskit/editor-ui-control-model/types';
-export declare const getEmojiQuickInsertComponents: () => RegisterMenuItem[];
+export declare const getEmojiQuickInsertComponents: ({ selectEmojiFromQuickInsert, }: {
+    selectEmojiFromQuickInsert: (insert: TypeAheadInsert) => Transaction;
+}) => RegisterMenuItem[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-emoji",
-	"version": "26.0.0",
+	"version": "26.0.2",
 	"description": "Emoji plugin for @atlaskit/editor-core",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -41,7 +41,7 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/prosemirror-input-rules": "^4.1.0",
-		"@atlaskit/tmp-editor-statsig": "^224.0.0",
+		"@atlaskit/tmp-editor-statsig": "^226.0.0",
 		"@atlaskit/tokens": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -50,7 +50,7 @@
 		"react-loadable": "^5.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^129.0.0",
+		"@atlaskit/editor-common": "^129.1.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"