@atlaskit/editor-plugin-emoji 7.6.7 → 7.7.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-emoji
 
+## 7.7.0
+
+### Minor Changes
+
+- [`3e2dbad92ccea`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3e2dbad92ccea) -
+  [https://product-fabric.atlassian.net/browse/ED-29691](ED-29691) - fix
+  EmojiNodeDataProvider.nodeDataKey when node.attrs.id is empty string
+
+### Patch Changes
+
+- Updated dependencies
+
+## 7.6.8
+
+### Patch Changes
+
+- [`8281874c30443`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8281874c30443) -
+  [ux] [EDITOR-2917] scale emoji placeholders in the editor
+- Updated dependencies
+
 ## 7.6.7
 
 ### Patch Changes

package/dist/cjs/emojiPlugin.js

@@ -163,9 +163,10 @@ var emojiPlugin = exports.emojiPlugin = function emojiPlugin(_ref2) {
           emoji: _emoji
         };
       }
-      var matchedItem = isFullShortName(normalizedQuery)
+      var matchedItem = isFullShortName(normalizedQuery) ?
       // @ts-ignore - Workaround for help-center local consumption
-      ? items.find(function (item) {
+
+      items.find(function (item) {
         return item.title.toLowerCase() === normalizedQuery;
       }) : undefined;
       return matchedItem;

package/dist/cjs/nodeviews/emojiNodeSpec.js

@@ -10,6 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _adfSchema = require("@atlaskit/adf-schema");
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 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 isSSR = Boolean(process.env.REACT_SSR);
@@ -37,17 +38,23 @@ function emojiToDom(node) {
     shortName = _node$attrs.shortName,
     id = _node$attrs.id,
     text = _node$attrs.text;
+  var isEmojiScalingEnabled = (0, _expValEquals.expValEquals)('platform_editor_lovability_emoji_scaling', 'isEnabled', true);
   var attrs = {
     'data-emoji-short-name': shortName,
     'data-emoji-id': id,
     'data-emoji-text': text,
     contenteditable: 'false',
-    style: (0, _lazyNodeView.convertToInlineCss)({
+    style: (0, _lazyNodeView.convertToInlineCss)(_objectSpread(_objectSpread({
       content: "''",
-      fill: "var(--ds-background-neutral, #0515240F)",
+      fill: "var(--ds-background-neutral, #0515240F)"
+    }, isEmojiScalingEnabled ? {
+      minWidth: '16.25px',
+      minHeight: '16.25px'
+    } : {
       minWidth: "20px",
       width: "20px",
-      height: "20px",
+      height: "20px"
+    }), {}, {
       position: 'relative',
       margin: '-1px 0',
       display: 'inline-block',
@@ -57,7 +64,7 @@ function emojiToDom(node) {
       verticalAlign: 'middle',
       whiteSpace: 'nowrap',
       textAlign: 'center'
-    }),
+    })),
     'aria-busy': 'true',
     'aria-label': shortName,
     class: 'emoji-common-placeholder'

package/dist/cjs/pm-plugins/providers/EmojiNodeDataProvider.js

@@ -39,8 +39,7 @@ var EmojiNodeDataProvider = exports.EmojiNodeDataProvider = /*#__PURE__*/functio
   }, {
     key: "nodeDataKey",
     value: function nodeDataKey(node) {
-      var _node$attrs$id;
-      return (_node$attrs$id = node.attrs.id) !== null && _node$attrs$id !== void 0 ? _node$attrs$id : node.attrs.shortName;
+      return node.attrs.id || node.attrs.shortName;
     }
 
     /**

package/dist/es2019/emojiPlugin.js

@@ -142,9 +142,10 @@ export const emojiPlugin = ({
           emoji
         };
       }
-      const matchedItem = isFullShortName(normalizedQuery)
+      const matchedItem = isFullShortName(normalizedQuery) ?
       // @ts-ignore - Workaround for help-center local consumption
-      ? items.find(item => item.title.toLowerCase() === normalizedQuery) : undefined;
+
+      items.find(item => item.title.toLowerCase() === normalizedQuery) : undefined;
       return matchedItem;
     },
     selectItem(state, item, insert, {

package/dist/es2019/nodeviews/emojiNodeSpec.js

@@ -1,6 +1,7 @@
 import { emoji, emojiWithLocalId } from '@atlaskit/adf-schema';
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const isSSR = Boolean(process.env.REACT_SSR);
 
 /**
@@ -26,6 +27,7 @@ export function emojiToDom(node) {
     id,
     text
   } = node.attrs;
+  const isEmojiScalingEnabled = expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true);
   const attrs = {
     'data-emoji-short-name': shortName,
     'data-emoji-id': id,
@@ -34,9 +36,14 @@ export function emojiToDom(node) {
     style: convertToInlineCss({
       content: "''",
       fill: "var(--ds-background-neutral, #0515240F)",
-      minWidth: `20px`,
-      width: `20px`,
-      height: `20px`,
+      ...(isEmojiScalingEnabled ? {
+        minWidth: '16.25px',
+        minHeight: '16.25px'
+      } : {
+        minWidth: `20px`,
+        width: `20px`,
+        height: `20px`
+      }),
       position: 'relative',
       margin: '-1px 0',
       display: 'inline-block',

package/dist/es2019/pm-plugins/providers/EmojiNodeDataProvider.js

@@ -13,8 +13,7 @@ export class EmojiNodeDataProvider extends NodeDataProvider {
     return node.type === 'emoji';
   }
   nodeDataKey(node) {
-    var _node$attrs$id;
-    return (_node$attrs$id = node.attrs.id) !== null && _node$attrs$id !== void 0 ? _node$attrs$id : node.attrs.shortName;
+    return node.attrs.id || node.attrs.shortName;
   }
 
   /**

package/dist/esm/emojiPlugin.js

@@ -152,9 +152,10 @@ export var emojiPlugin = function emojiPlugin(_ref2) {
           emoji: _emoji
         };
       }
-      var matchedItem = isFullShortName(normalizedQuery)
+      var matchedItem = isFullShortName(normalizedQuery) ?
       // @ts-ignore - Workaround for help-center local consumption
-      ? items.find(function (item) {
+
+      items.find(function (item) {
         return item.title.toLowerCase() === normalizedQuery;
       }) : undefined;
       return matchedItem;

package/dist/esm/nodeviews/emojiNodeSpec.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { emoji, emojiWithLocalId } from '@atlaskit/adf-schema';
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var isSSR = Boolean(process.env.REACT_SSR);
 
 /**
@@ -29,17 +30,23 @@ export function emojiToDom(node) {
     shortName = _node$attrs.shortName,
     id = _node$attrs.id,
     text = _node$attrs.text;
+  var isEmojiScalingEnabled = expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true);
   var attrs = {
     'data-emoji-short-name': shortName,
     'data-emoji-id': id,
     'data-emoji-text': text,
     contenteditable: 'false',
-    style: convertToInlineCss({
+    style: convertToInlineCss(_objectSpread(_objectSpread({
       content: "''",
-      fill: "var(--ds-background-neutral, #0515240F)",
+      fill: "var(--ds-background-neutral, #0515240F)"
+    }, isEmojiScalingEnabled ? {
+      minWidth: '16.25px',
+      minHeight: '16.25px'
+    } : {
       minWidth: "20px",
       width: "20px",
-      height: "20px",
+      height: "20px"
+    }), {}, {
       position: 'relative',
       margin: '-1px 0',
       display: 'inline-block',
@@ -49,7 +56,7 @@ export function emojiToDom(node) {
       verticalAlign: 'middle',
       whiteSpace: 'nowrap',
       textAlign: 'center'
-    }),
+    })),
     'aria-busy': 'true',
     'aria-label': shortName,
     class: 'emoji-common-placeholder'

package/dist/esm/pm-plugins/providers/EmojiNodeDataProvider.js

@@ -32,8 +32,7 @@ export var EmojiNodeDataProvider = /*#__PURE__*/function (_NodeDataProvider) {
   }, {
     key: "nodeDataKey",
     value: function nodeDataKey(node) {
-      var _node$attrs$id;
-      return (_node$attrs$id = node.attrs.id) !== null && _node$attrs$id !== void 0 ? _node$attrs$id : node.attrs.shortName;
+      return node.attrs.id || node.attrs.shortName;
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-emoji",
-	"version": "7.6.7",
+	"version": "7.7.0",
 	"description": "Emoji plugin for @atlaskit/editor-core",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -36,8 +36,8 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.6.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.42.0",
-		"@atlaskit/tokens": "^8.3.0",
+		"@atlaskit/tmp-editor-statsig": "^13.44.0",
+		"@atlaskit/tokens": "^8.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"lodash": "^4.17.21",
@@ -45,7 +45,7 @@
 		"react-loadable": "^5.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.34.0",
+		"@atlaskit/editor-common": "^110.35.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},