@atlaskit/editor-plugin-emoji 2.7.21 → 2.7.23

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-emoji
 
+## 2.7.23
+
+### Patch Changes
+
+- [#97984](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97984)
+  [`8ffeab9aaf1ab`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8ffeab9aaf1ab) -
+  [ux] [ED-23573] Added new actions (resolveMarks and registerMarks) to basePlugin. Callbacks added
+  to mentions, card, emoji and base plugins to handle conversion to inline code. Deprecated code
+  removed from editor-common.
+- Updated dependencies
+
+## 2.7.22
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.7.21
 
 ### Patch Changes

package/dist/cjs/emojiPlugin.js

@@ -85,7 +85,7 @@ var TRIGGER = ':';
  * from `@atlaskit/editor-core`.
  */
 var emojiPlugin = exports.emojiPlugin = function emojiPlugin(_ref2) {
-  var _api$analytics5;
+  var _api$base, _api$analytics5;
   var options = _ref2.config,
     api = _ref2.api;
   var previousEmojiProvider;
@@ -193,6 +193,19 @@ var emojiPlugin = exports.emojiPlugin = function emojiPlugin(_ref2) {
       return tr;
     }
   };
+  api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || _api$base.actions.registerMarks(function (_ref7) {
+    var tr = _ref7.tr,
+      node = _ref7.node,
+      pos = _ref7.pos;
+    var doc = tr.doc;
+    var schema = doc.type.schema;
+    var emojiNodeType = schema.nodes.emoji;
+    if (node.type === emojiNodeType) {
+      var newText = node.attrs.text;
+      var currentPos = tr.mapping.map(pos);
+      tr.replaceWith(currentPos, currentPos + node.nodeSize, schema.text(newText, node.marks));
+    }
+  });
   return {
     name: 'emoji',
     nodes: function nodes() {
@@ -209,9 +222,9 @@ var emojiPlugin = exports.emojiPlugin = function emojiPlugin(_ref2) {
         }
       }, {
         name: 'emojiAsciiInputRule',
-        plugin: function plugin(_ref7) {
+        plugin: function plugin(_ref8) {
           var _api$analytics4;
-          var schema = _ref7.schema;
+          var schema = _ref8.schema;
           return (0, _asciiInputRules.inputRulePlugin)(schema, api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, api);
         }
       }];
@@ -221,10 +234,10 @@ var emojiPlugin = exports.emojiPlugin = function emojiPlugin(_ref2) {
       if (!editorState) {
         return undefined;
       }
-      var _ref8 = (_emojiPluginKey$getSt = emojiPluginKey.getState(editorState)) !== null && _emojiPluginKey$getSt !== void 0 ? _emojiPluginKey$getSt : {},
-        emojiResourceConfig = _ref8.emojiResourceConfig,
-        asciiMap = _ref8.asciiMap,
-        emojiProvider = _ref8.emojiProvider;
+      var _ref9 = (_emojiPluginKey$getSt = emojiPluginKey.getState(editorState)) !== null && _emojiPluginKey$getSt !== void 0 ? _emojiPluginKey$getSt : {},
+        emojiResourceConfig = _ref9.emojiResourceConfig,
+        asciiMap = _ref9.asciiMap,
+        emojiProvider = _ref9.emojiProvider;
       return {
         emojiResourceConfig: emojiResourceConfig,
         asciiMap: asciiMap,
@@ -252,8 +265,8 @@ var emojiPlugin = exports.emojiPlugin = function emojiPlugin(_ref2) {
                 return _context.abrupt("return", false);
               case 5:
                 previousEmojiProvider = provider;
-                return _context.abrupt("return", (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(function (_ref9) {
-                  var tr = _ref9.tr;
+                return _context.abrupt("return", (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(function (_ref10) {
+                  var tr = _ref10.tr;
                   return setProviderTr(provider)(tr);
                 })) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false);
               case 7:
@@ -272,8 +285,8 @@ var emojiPlugin = exports.emojiPlugin = function emojiPlugin(_ref2) {
       insertEmoji: (0, _insertEmoji.insertEmoji)(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions)
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref10) {
-        var formatMessage = _ref10.formatMessage;
+      quickInsert: function quickInsert(_ref11) {
+        var formatMessage = _ref11.formatMessage;
         return [{
           id: 'emoji',
           title: formatMessage(_messages.toolbarInsertBlockMessages.emoji),
@@ -441,12 +454,12 @@ function createEmojiPlugin(pmPluginFactoryParams, options, api) {
         return {};
       },
       apply: function apply(tr, pluginState) {
-        var _ref11 = tr.getMeta(emojiPluginKey) || {
+        var _ref12 = tr.getMeta(emojiPluginKey) || {
             action: null,
             params: null
           },
-          action = _ref11.action,
-          params = _ref11.params;
+          action = _ref12.action,
+          params = _ref12.params;
         var newPluginState = pluginState;
         switch (action) {
           case _actions.ACTIONS.SET_PROVIDER:

package/dist/es2019/emojiPlugin.js

@@ -68,7 +68,7 @@ export const emojiPlugin = ({
   config: options,
   api
 }) => {
-  var _api$analytics5;
+  var _api$base, _api$analytics5;
   let previousEmojiProvider;
   const typeAhead = {
     id: TypeAheadAvailableNodes.EMOJI,
@@ -174,6 +174,26 @@ export const emojiPlugin = ({
       return tr;
     }
   };
+  api === null || api === void 0 ? void 0 : (_api$base = api.base) === null || _api$base === void 0 ? void 0 : _api$base.actions.registerMarks(({
+    tr,
+    node,
+    pos
+  }) => {
+    const {
+      doc
+    } = tr;
+    const {
+      schema
+    } = doc.type;
+    const {
+      emoji: emojiNodeType
+    } = schema.nodes;
+    if (node.type === emojiNodeType) {
+      const newText = node.attrs.text;
+      const currentPos = tr.mapping.map(pos);
+      tr.replaceWith(currentPos, currentPos + node.nodeSize, schema.text(newText, node.marks));
+    }
+  });
   return {
     name: 'emoji',
     nodes() {

package/dist/esm/emojiPlugin.js

@@ -73,7 +73,7 @@ var TRIGGER = ':';
  * from `@atlaskit/editor-core`.
  */
 export var emojiPlugin = function emojiPlugin(_ref2) {
-  var _api$analytics5;
+  var _api$base, _api$analytics5;
   var options = _ref2.config,
     api = _ref2.api;
   var previousEmojiProvider;
@@ -181,6 +181,19 @@ export var emojiPlugin = function emojiPlugin(_ref2) {
       return tr;
     }
   };
+  api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || _api$base.actions.registerMarks(function (_ref7) {
+    var tr = _ref7.tr,
+      node = _ref7.node,
+      pos = _ref7.pos;
+    var doc = tr.doc;
+    var schema = doc.type.schema;
+    var emojiNodeType = schema.nodes.emoji;
+    if (node.type === emojiNodeType) {
+      var newText = node.attrs.text;
+      var currentPos = tr.mapping.map(pos);
+      tr.replaceWith(currentPos, currentPos + node.nodeSize, schema.text(newText, node.marks));
+    }
+  });
   return {
     name: 'emoji',
     nodes: function nodes() {
@@ -197,9 +210,9 @@ export var emojiPlugin = function emojiPlugin(_ref2) {
         }
       }, {
         name: 'emojiAsciiInputRule',
-        plugin: function plugin(_ref7) {
+        plugin: function plugin(_ref8) {
           var _api$analytics4;
-          var schema = _ref7.schema;
+          var schema = _ref8.schema;
           return asciiInputRulePlugin(schema, api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, api);
         }
       }];
@@ -209,10 +222,10 @@ export var emojiPlugin = function emojiPlugin(_ref2) {
       if (!editorState) {
         return undefined;
       }
-      var _ref8 = (_emojiPluginKey$getSt = emojiPluginKey.getState(editorState)) !== null && _emojiPluginKey$getSt !== void 0 ? _emojiPluginKey$getSt : {},
-        emojiResourceConfig = _ref8.emojiResourceConfig,
-        asciiMap = _ref8.asciiMap,
-        emojiProvider = _ref8.emojiProvider;
+      var _ref9 = (_emojiPluginKey$getSt = emojiPluginKey.getState(editorState)) !== null && _emojiPluginKey$getSt !== void 0 ? _emojiPluginKey$getSt : {},
+        emojiResourceConfig = _ref9.emojiResourceConfig,
+        asciiMap = _ref9.asciiMap,
+        emojiProvider = _ref9.emojiProvider;
       return {
         emojiResourceConfig: emojiResourceConfig,
         asciiMap: asciiMap,
@@ -240,8 +253,8 @@ export var emojiPlugin = function emojiPlugin(_ref2) {
                 return _context.abrupt("return", false);
               case 5:
                 previousEmojiProvider = provider;
-                return _context.abrupt("return", (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(function (_ref9) {
-                  var tr = _ref9.tr;
+                return _context.abrupt("return", (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(function (_ref10) {
+                  var tr = _ref10.tr;
                   return setProviderTr(provider)(tr);
                 })) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false);
               case 7:
@@ -260,8 +273,8 @@ export var emojiPlugin = function emojiPlugin(_ref2) {
       insertEmoji: insertEmoji(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions)
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref10) {
-        var formatMessage = _ref10.formatMessage;
+      quickInsert: function quickInsert(_ref11) {
+        var formatMessage = _ref11.formatMessage;
         return [{
           id: 'emoji',
           title: formatMessage(messages.emoji),
@@ -429,12 +442,12 @@ export function createEmojiPlugin(pmPluginFactoryParams, options, api) {
         return {};
       },
       apply: function apply(tr, pluginState) {
-        var _ref11 = tr.getMeta(emojiPluginKey) || {
+        var _ref12 = tr.getMeta(emojiPluginKey) || {
             action: null,
             params: null
           },
-          action = _ref11.action,
-          params = _ref11.params;
+          action = _ref12.action,
+          params = _ref12.params;
         var newPluginState = pluginState;
         switch (action) {
           case ACTIONS.SET_PROVIDER:

package/dist/types/emojiPluginType.d.ts

@@ -2,6 +2,7 @@ import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, EditorCommand, NextEditorPlugin, OptionalPlugin, TypeAheadHandler } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { InlineCommentInputMethod, InlineCommentMap } from '@atlaskit/editor-plugin-annotation';
+import type { BasePlugin } from '@atlaskit/editor-plugin-base';
 import { type EditorViewModePluginState } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { TypeAheadInputMethod, TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import type { SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
@@ -43,7 +44,8 @@ export type EmojiPlugin = NextEditorPlugin<'emoji', {
         OptionalPlugin<AnalyticsPlugin>,
         TypeAheadPlugin,
         OptionalPlugin<AnnotationPluginType>,
-        OptionalPlugin<EditorViewModePluginType>
+        OptionalPlugin<EditorViewModePluginType>,
+        OptionalPlugin<BasePlugin>
     ];
     sharedState: EmojiPluginSharedState | undefined;
     commands: {

package/dist/types-ts4.5/emojiPluginType.d.ts

@@ -2,6 +2,7 @@ import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, EditorCommand, NextEditorPlugin, OptionalPlugin, TypeAheadHandler } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { InlineCommentInputMethod, InlineCommentMap } from '@atlaskit/editor-plugin-annotation';
+import type { BasePlugin } from '@atlaskit/editor-plugin-base';
 import { type EditorViewModePluginState } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { TypeAheadInputMethod, TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import type { SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
@@ -43,7 +44,8 @@ export type EmojiPlugin = NextEditorPlugin<'emoji', {
         OptionalPlugin<AnalyticsPlugin>,
         TypeAheadPlugin,
         OptionalPlugin<AnnotationPluginType>,
-        OptionalPlugin<EditorViewModePluginType>
+        OptionalPlugin<EditorViewModePluginType>,
+        OptionalPlugin<BasePlugin>
     ];
     sharedState: EmojiPluginSharedState | undefined;
     commands: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-emoji",
-	"version": "2.7.21",
+	"version": "2.7.23",
 	"description": "Emoji plugin for @atlaskit/editor-core",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -21,14 +21,15 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^98.0.0",
+		"@atlaskit/editor-common": "^99.0.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
-		"@atlaskit/editor-plugin-annotation": "1.26.9",
+		"@atlaskit/editor-plugin-annotation": "1.26.11",
+		"@atlaskit/editor-plugin-base": "^2.1.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.11.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
-		"@atlaskit/emoji": "^67.11.0",
-		"@atlaskit/icon": "^23.1.0",
+		"@atlaskit/emoji": "^67.12.0",
+		"@atlaskit/icon": "^23.3.0",
 		"@atlaskit/node-data-provider": "^3.0.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",