@atlaskit/editor-plugin-emoji 7.6.2 → 7.6.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-emoji
 
+## 7.6.4
+
+### Patch Changes
+
+- [`4cab7924c4af0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4cab7924c4af0) -
+  [ux] Clean up editor_inline_comments_paste_insert_nodes
+- Updated dependencies
+
+## 7.6.3
+
+### Patch Changes
+
+- [`a8137975c5ecb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a8137975c5ecb) -
+  [ux] [EDITOR-2459] css behind an experiment gate to scale emoji sizes with text styles
+- Updated dependencies
+
 ## 7.6.2
 
 ### Patch Changes

package/dist/cjs/editor-commands/insert-emoji.js

@@ -1,19 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.insertEmoji = exports.createEmojiFragment = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var createEmojiFragment = exports.createEmojiFragment = function createEmojiFragment(doc, pos, emoji) {
   var _emoji$id = emoji.id,
     id = _emoji$id === void 0 ? '' : _emoji$id,
@@ -36,16 +31,7 @@ var insertEmoji = exports.insertEmoji = function insertEmoji(editorAnalyticsAPI)
         selection = tr.selection;
       var emoji = tr.doc.type.schema.nodes.emoji;
       if (emoji && emojiId) {
-        var fragment;
-        if ((0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes')) {
-          fragment = createEmojiFragment(doc, selection.$head, emojiId);
-        } else {
-          var node = emoji.createChecked(_objectSpread(_objectSpread({}, emojiId), {}, {
-            text: emojiId.fallback || emojiId.shortName
-          }));
-          var textNode = doc.type.schema.text(' ');
-          fragment = _model.Fragment.fromArray([node, textNode]);
-        }
+        var fragment = createEmojiFragment(doc, selection.$head, emojiId);
         var newTr = (0, _utils2.safeInsert)(fragment)(tr);
         if (inputMethod) {
           editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({

package/dist/cjs/emojiPlugin.js

@@ -19,11 +19,9 @@ var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _utils = require("@atlaskit/editor-common/utils");
-var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _emoji2 = require("@atlaskit/emoji");
 var _comment = _interopRequireDefault(require("@atlaskit/icon/core/comment"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _insertEmoji = require("./editor-commands/insert-emoji");
@@ -177,24 +175,7 @@ var emojiPlugin = exports.emojiPlugin = function emojiPlugin(_ref2) {
           createAnalyticsEvent: (_api$analytics$shared2 = api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.sharedState.currentState()) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.createAnalyticsEvent) !== null && _api$analytics$shared2 !== void 0 ? _api$analytics$shared2 : undefined
         }));
       }
-      var fragment;
-      if ((0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes')) {
-        fragment = (0, _insertEmoji.createEmojiFragment)(state.doc, state.selection.$head, item.emoji);
-      } else {
-        var _item$emoji = item.emoji,
-          _item$emoji$id = _item$emoji.id,
-          id = _item$emoji$id === void 0 ? '' : _item$emoji$id,
-          fallback = _item$emoji.fallback,
-          shortName = _item$emoji.shortName;
-        var text = fallback || shortName;
-        var emojiNode = state.schema.nodes.emoji.createChecked({
-          shortName: shortName,
-          id: id,
-          text: text
-        });
-        var space = state.schema.text(' ');
-        fragment = _model.Fragment.from([emojiNode, space]);
-      }
+      var fragment = (0, _insertEmoji.createEmojiFragment)(state.doc, state.selection.$head, item.emoji);
       var tr = insert(fragment);
       api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.actions.attachAnalyticsEvent({
         action: _analytics.ACTION.INSERTED,

package/dist/cjs/nodeviews/EmojiNodeView.js

@@ -263,10 +263,12 @@ var EmojiNodeView = exports.EmojiNodeView = /*#__PURE__*/function () {
       spriteElement.style.backgroundImage = "url(".concat(sprite.url, ")");
       spriteElement.style.backgroundPosition = "".concat(xPositionInPercent, "% ").concat(yPositionInPercent, "%");
       spriteElement.style.backgroundSize = "".concat(sprite.column * 100, "% ").concat(sprite.row * 100, "%");
-      spriteElement.style.width = "".concat(_emoji.defaultEmojiHeight, "px");
       spriteElement.style.minWidth = "".concat(_emoji.defaultEmojiHeight, "px");
-      spriteElement.style.height = "".concat(_emoji.defaultEmojiHeight, "px");
       spriteElement.style.minHeight = "".concat(_emoji.defaultEmojiHeight, "px");
+      if (!(0, _expValEquals.expValEquals)('platform_editor_lovability_emoji_scaling', 'isEnabled', true)) {
+        spriteElement.style.width = "".concat(_emoji.defaultEmojiHeight, "px");
+        spriteElement.style.height = "".concat(_emoji.defaultEmojiHeight, "px");
+      }
       return spriteElement;
     }
   }, {

package/dist/es2019/editor-commands/insert-emoji.js

@@ -3,7 +3,6 @@ import { getAnnotationMarksForPos } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 export const createEmojiFragment = (doc, pos, emoji) => {
   const {
     id = '',
@@ -31,17 +30,7 @@ export const insertEmoji = editorAnalyticsAPI => (emojiId, inputMethod) => {
       emoji
     } = tr.doc.type.schema.nodes;
     if (emoji && emojiId) {
-      let fragment;
-      if (fg('editor_inline_comments_paste_insert_nodes')) {
-        fragment = createEmojiFragment(doc, selection.$head, emojiId);
-      } else {
-        const node = emoji.createChecked({
-          ...emojiId,
-          text: emojiId.fallback || emojiId.shortName
-        });
-        const textNode = doc.type.schema.text(' ');
-        fragment = Fragment.fromArray([node, textNode]);
-      }
+      const fragment = createEmojiFragment(doc, selection.$head, emojiId);
       const newTr = safeInsert(fragment)(tr);
       if (inputMethod) {
         editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({

package/dist/es2019/emojiPlugin.js

@@ -6,11 +6,9 @@ import { IconEmoji } from '@atlaskit/editor-common/quick-insert';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { TypeAheadAvailableNodes } from '@atlaskit/editor-common/type-ahead';
 import { calculateToolbarPositionAboveSelection } from '@atlaskit/editor-common/utils';
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { EmojiTypeAheadItem, preloadEmojiPicker, recordSelectionFailedSli, recordSelectionSucceededSli, SearchSort } from '@atlaskit/emoji';
 import CommentIcon from '@atlaskit/icon/core/comment';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createEmojiFragment, insertEmoji } from './editor-commands/insert-emoji';
@@ -155,24 +153,7 @@ export const emojiPlugin = ({
           createAnalyticsEvent: (_api$analytics$shared3 = api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : (_api$analytics2$share = _api$analytics2.sharedState.currentState()) === null || _api$analytics2$share === void 0 ? void 0 : _api$analytics2$share.createAnalyticsEvent) !== null && _api$analytics$shared3 !== void 0 ? _api$analytics$shared3 : undefined
         }));
       }
-      let fragment;
-      if (fg('editor_inline_comments_paste_insert_nodes')) {
-        fragment = createEmojiFragment(state.doc, state.selection.$head, item.emoji);
-      } else {
-        const {
-          id = '',
-          fallback,
-          shortName
-        } = item.emoji;
-        const text = fallback || shortName;
-        const emojiNode = state.schema.nodes.emoji.createChecked({
-          shortName,
-          id,
-          text
-        });
-        const space = state.schema.text(' ');
-        fragment = Fragment.from([emojiNode, space]);
-      }
+      const fragment = createEmojiFragment(state.doc, state.selection.$head, item.emoji);
       const tr = insert(fragment);
       api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions.attachAnalyticsEvent({
         action: ACTION.INSERTED,

package/dist/es2019/nodeviews/EmojiNodeView.js

@@ -227,10 +227,12 @@ export class EmojiNodeView {
     spriteElement.style.backgroundImage = `url(${sprite.url})`;
     spriteElement.style.backgroundPosition = `${xPositionInPercent}% ${yPositionInPercent}%`;
     spriteElement.style.backgroundSize = `${sprite.column * 100}% ${sprite.row * 100}%`;
-    spriteElement.style.width = `${defaultEmojiHeight}px`;
     spriteElement.style.minWidth = `${defaultEmojiHeight}px`;
-    spriteElement.style.height = `${defaultEmojiHeight}px`;
     spriteElement.style.minHeight = `${defaultEmojiHeight}px`;
+    if (!expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true)) {
+      spriteElement.style.width = `${defaultEmojiHeight}px`;
+      spriteElement.style.height = `${defaultEmojiHeight}px`;
+    }
     return spriteElement;
   }
   createImageEmojiElement(emojiDescription, representation) {

package/dist/esm/editor-commands/insert-emoji.js

@@ -1,12 +1,8 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { getAnnotationMarksForPos } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 export var createEmojiFragment = function createEmojiFragment(doc, pos, emoji) {
   var _emoji$id = emoji.id,
     id = _emoji$id === void 0 ? '' : _emoji$id,
@@ -29,16 +25,7 @@ export var insertEmoji = function insertEmoji(editorAnalyticsAPI) {
         selection = tr.selection;
       var emoji = tr.doc.type.schema.nodes.emoji;
       if (emoji && emojiId) {
-        var fragment;
-        if (fg('editor_inline_comments_paste_insert_nodes')) {
-          fragment = createEmojiFragment(doc, selection.$head, emojiId);
-        } else {
-          var node = emoji.createChecked(_objectSpread(_objectSpread({}, emojiId), {}, {
-            text: emojiId.fallback || emojiId.shortName
-          }));
-          var textNode = doc.type.schema.text(' ');
-          fragment = Fragment.fromArray([node, textNode]);
-        }
+        var fragment = createEmojiFragment(doc, selection.$head, emojiId);
         var newTr = safeInsert(fragment)(tr);
         if (inputMethod) {
           editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({

package/dist/esm/emojiPlugin.js

@@ -11,11 +11,9 @@ import { IconEmoji } from '@atlaskit/editor-common/quick-insert';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { TypeAheadAvailableNodes } from '@atlaskit/editor-common/type-ahead';
 import { calculateToolbarPositionAboveSelection } from '@atlaskit/editor-common/utils';
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { EmojiTypeAheadItem, preloadEmojiPicker, recordSelectionFailedSli, recordSelectionSucceededSli, SearchSort } from '@atlaskit/emoji';
 import CommentIcon from '@atlaskit/icon/core/comment';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createEmojiFragment, insertEmoji } from './editor-commands/insert-emoji';
@@ -166,24 +164,7 @@ export var emojiPlugin = function emojiPlugin(_ref2) {
           createAnalyticsEvent: (_api$analytics$shared2 = api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.sharedState.currentState()) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.createAnalyticsEvent) !== null && _api$analytics$shared2 !== void 0 ? _api$analytics$shared2 : undefined
         }));
       }
-      var fragment;
-      if (fg('editor_inline_comments_paste_insert_nodes')) {
-        fragment = createEmojiFragment(state.doc, state.selection.$head, item.emoji);
-      } else {
-        var _item$emoji = item.emoji,
-          _item$emoji$id = _item$emoji.id,
-          id = _item$emoji$id === void 0 ? '' : _item$emoji$id,
-          fallback = _item$emoji.fallback,
-          shortName = _item$emoji.shortName;
-        var text = fallback || shortName;
-        var emojiNode = state.schema.nodes.emoji.createChecked({
-          shortName: shortName,
-          id: id,
-          text: text
-        });
-        var space = state.schema.text(' ');
-        fragment = Fragment.from([emojiNode, space]);
-      }
+      var fragment = createEmojiFragment(state.doc, state.selection.$head, item.emoji);
       var tr = insert(fragment);
       api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.actions.attachAnalyticsEvent({
         action: ACTION.INSERTED,

package/dist/esm/nodeviews/EmojiNodeView.js

@@ -255,10 +255,12 @@ export var EmojiNodeView = /*#__PURE__*/function () {
       spriteElement.style.backgroundImage = "url(".concat(sprite.url, ")");
       spriteElement.style.backgroundPosition = "".concat(xPositionInPercent, "% ").concat(yPositionInPercent, "%");
       spriteElement.style.backgroundSize = "".concat(sprite.column * 100, "% ").concat(sprite.row * 100, "%");
-      spriteElement.style.width = "".concat(defaultEmojiHeight, "px");
       spriteElement.style.minWidth = "".concat(defaultEmojiHeight, "px");
-      spriteElement.style.height = "".concat(defaultEmojiHeight, "px");
       spriteElement.style.minHeight = "".concat(defaultEmojiHeight, "px");
+      if (!expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true)) {
+        spriteElement.style.width = "".concat(defaultEmojiHeight, "px");
+        spriteElement.style.height = "".concat(defaultEmojiHeight, "px");
+      }
       return spriteElement;
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-emoji",
-	"version": "7.6.2",
+	"version": "7.6.4",
 	"description": "Emoji plugin for @atlaskit/editor-core",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -30,13 +30,13 @@
 		"@atlaskit/editor-plugin-type-ahead": "^6.5.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.9.0",
-		"@atlaskit/emoji": "^69.7.0",
+		"@atlaskit/emoji": "^69.8.0",
 		"@atlaskit/icon": "^29.0.0",
 		"@atlaskit/node-data-provider": "^7.5.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.6.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.35.0",
+		"@atlaskit/tmp-editor-statsig": "^13.38.0",
 		"@atlaskit/tokens": "^8.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -45,7 +45,7 @@
 		"react-loadable": "^5.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.27.0",
+		"@atlaskit/editor-common": "^110.29.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
@@ -102,9 +102,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"editor_inline_comments_paste_insert_nodes": {
-			"type": "boolean"
-		},
 		"platform_editor_ease_of_use_metrics": {
 			"type": "boolean"
 		},