@atlaskit/editor-plugin-emoji 2.5.3 → 2.6.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-emoji
 
+## 2.6.0
+
+### Minor Changes
+
+- [#140949](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/140949)
+  [`f0496e4dd21b2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f0496e4dd21b2) -
+  Make Panel Plugin use Emoji component from editor-plugin-emoji
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.5.4
+
+### Patch Changes
+
+- [#139334](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/139334)
+  [`30793649657c0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/30793649657c0) -
+  [HOT-111629] We had an incident where the last character disappears when hitting the enter key on
+  windows OS for Korean characters. Bumping to prosemirror-view@1.34.2 for the fix.
+
 ## 2.5.3
 
 ### Patch Changes

package/dist/cjs/nodeviews/emoji.js

@@ -8,6 +8,7 @@ exports.EmojiNodeView = EmojiNodeView;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _emoji = require("@atlaskit/editor-common/emoji");
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _Emoji = _interopRequireDefault(require("../ui/Emoji"));
 var _NdpEmoji = require("../ui/NdpEmoji");
 var EmojiAssistiveTextComponent = /*#__PURE__*/_react.default.memo(function (_ref) {
@@ -23,12 +24,18 @@ var EmojiAssistiveTextComponent = /*#__PURE__*/_react.default.memo(function (_re
     }, "".concat(intl.formatMessage(_emoji.messages.emojiNodeLabel), " ").concat(emojiShortName))
   );
 });
+var useEmojiProvider = function useEmojiProvider(pluginInjectionApi) {
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['emoji']),
+    emojiState = _useSharedPluginState.emojiState;
+  return emojiState === null || emojiState === void 0 ? void 0 : emojiState.emojiProvider;
+};
 function EmojiNodeView(props) {
   var _props$options;
   var _props$node$attrs = props.node.attrs,
     shortName = _props$node$attrs.shortName,
     id = _props$node$attrs.id,
     text = _props$node$attrs.text;
+  var emojiProvider = useEmojiProvider(props.api);
   if ((_props$options = props.options) !== null && _props$options !== void 0 && _props$options.emojiNodeDataProvider) {
     return /*#__PURE__*/_react.default.createElement(_NdpEmoji.NdpEmoji, {
       node: props.node,
@@ -38,7 +45,7 @@ function EmojiNodeView(props) {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(EmojiAssistiveTextComponent, {
     emojiShortName: shortName
   }), /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_Emoji.default, {
-    pluginInjectionApi: props.api,
+    emojiProvider: emojiProvider,
     providers: props.providerFactory,
     id: id,
     shortName: shortName,

package/dist/cjs/ui/Emoji/index.js

@@ -8,8 +8,6 @@ exports.default = EmojiNode;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("@emotion/react");
 var _emoji = require("@atlaskit/editor-common/emoji");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _emojiNext = _interopRequireDefault(require("./emoji-next"));
 var _templateObject;
 /**
  * @jsxRuntime classic
@@ -21,5 +19,5 @@ var clickSelectWrapperStyle = (0, _react.css)(_templateObject || (_templateObjec
 function EmojiNode(props) {
   return (0, _react.jsx)("span", {
     css: clickSelectWrapperStyle
-  }, (0, _platformFeatureFlags.fg)('platform_editor_get_emoji_provider_from_config') ? (0, _react.jsx)(_emojiNext.default, props) : (0, _react.jsx)(_emoji.Emoji, props));
+  }, (0, _react.jsx)(_emoji.Emoji, props));
 }

package/dist/es2019/nodeviews/emoji.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/emoji';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import Emoji from '../ui/Emoji';
 import { NdpEmoji } from '../ui/NdpEmoji';
 const EmojiAssistiveTextComponent = /*#__PURE__*/React.memo(({
@@ -17,6 +18,12 @@ const EmojiAssistiveTextComponent = /*#__PURE__*/React.memo(({
     }, `${intl.formatMessage(messages.emojiNodeLabel)} ${emojiShortName}`)
   );
 });
+const useEmojiProvider = pluginInjectionApi => {
+  const {
+    emojiState
+  } = useSharedPluginState(pluginInjectionApi, ['emoji']);
+  return emojiState === null || emojiState === void 0 ? void 0 : emojiState.emojiProvider;
+};
 export function EmojiNodeView(props) {
   var _props$options;
   const {
@@ -24,6 +31,7 @@ export function EmojiNodeView(props) {
     id,
     text
   } = props.node.attrs;
+  const emojiProvider = useEmojiProvider(props.api);
   if ((_props$options = props.options) !== null && _props$options !== void 0 && _props$options.emojiNodeDataProvider) {
     return /*#__PURE__*/React.createElement(NdpEmoji, {
       node: props.node,
@@ -33,7 +41,7 @@ export function EmojiNodeView(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EmojiAssistiveTextComponent, {
     emojiShortName: shortName
   }), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Emoji, {
-    pluginInjectionApi: props.api,
+    emojiProvider: emojiProvider,
     providers: props.providerFactory,
     id: id,
     shortName: shortName,

package/dist/es2019/ui/Emoji/index.js

@@ -5,8 +5,7 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { Emoji } from '@atlaskit/editor-common/emoji';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { default as EmojiNext } from './emoji-next';
+
 // eslint-disable-next-line
 const clickSelectWrapperStyle = css`
 	// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
@@ -15,5 +14,5 @@ const clickSelectWrapperStyle = css`
 export default function EmojiNode(props) {
   return jsx("span", {
     css: clickSelectWrapperStyle
-  }, fg('platform_editor_get_emoji_provider_from_config') ? jsx(EmojiNext, props) : jsx(Emoji, props));
+  }, jsx(Emoji, props));
 }

package/dist/esm/nodeviews/emoji.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/emoji';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import Emoji from '../ui/Emoji';
 import { NdpEmoji } from '../ui/NdpEmoji';
 var EmojiAssistiveTextComponent = /*#__PURE__*/React.memo(function (_ref) {
@@ -16,12 +17,18 @@ var EmojiAssistiveTextComponent = /*#__PURE__*/React.memo(function (_ref) {
     }, "".concat(intl.formatMessage(messages.emojiNodeLabel), " ").concat(emojiShortName))
   );
 });
+var useEmojiProvider = function useEmojiProvider(pluginInjectionApi) {
+  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['emoji']),
+    emojiState = _useSharedPluginState.emojiState;
+  return emojiState === null || emojiState === void 0 ? void 0 : emojiState.emojiProvider;
+};
 export function EmojiNodeView(props) {
   var _props$options;
   var _props$node$attrs = props.node.attrs,
     shortName = _props$node$attrs.shortName,
     id = _props$node$attrs.id,
     text = _props$node$attrs.text;
+  var emojiProvider = useEmojiProvider(props.api);
   if ((_props$options = props.options) !== null && _props$options !== void 0 && _props$options.emojiNodeDataProvider) {
     return /*#__PURE__*/React.createElement(NdpEmoji, {
       node: props.node,
@@ -31,7 +38,7 @@ export function EmojiNodeView(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EmojiAssistiveTextComponent, {
     emojiShortName: shortName
   }), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Emoji, {
-    pluginInjectionApi: props.api,
+    emojiProvider: emojiProvider,
     providers: props.providerFactory,
     id: id,
     shortName: shortName,

package/dist/esm/ui/Emoji/index.js

@@ -7,12 +7,11 @@ var _templateObject;
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { Emoji } from '@atlaskit/editor-common/emoji';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { default as EmojiNext } from './emoji-next';
+
 // eslint-disable-next-line
 var clickSelectWrapperStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage\n\tuser-select: all;\n"])));
 export default function EmojiNode(props) {
   return jsx("span", {
     css: clickSelectWrapperStyle
-  }, fg('platform_editor_get_emoji_provider_from_config') ? jsx(EmojiNext, props) : jsx(Emoji, props));
+  }, jsx(Emoji, props));
 }

package/dist/types/ui/Emoji/index.d.ts

@@ -3,5 +3,5 @@
  * @jsx jsx
  */
 import { jsx } from '@emotion/react';
-import type { EmojiProps } from './emoji-next';
+import { type EmojiProps } from '@atlaskit/editor-common/emoji';
 export default function EmojiNode(props: EmojiProps): jsx.JSX.Element;

package/dist/types-ts4.5/ui/Emoji/index.d.ts

@@ -3,5 +3,5 @@
  * @jsx jsx
  */
 import { jsx } from '@emotion/react';
-import type { EmojiProps } from './emoji-next';
+import { type EmojiProps } from '@atlaskit/editor-common/emoji';
 export default function EmojiNode(props: EmojiProps): jsx.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-emoji",
-	"version": "2.5.3",
+	"version": "2.6.0",
 	"description": "Emoji plugin for @atlaskit/editor-core",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -21,10 +21,10 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
-		"@atlaskit/editor-common": "^89.0.0",
+		"@atlaskit/editor-common": "^89.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.8.0",
-		"@atlaskit/editor-prosemirror": "5.0.1",
+		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/emoji": "^67.7.0",
 		"@atlaskit/node-data-provider": "^2.0.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",

package/dist/cjs/ui/Emoji/emoji-next.js

@@ -1,55 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _element = require("@atlaskit/emoji/element");
-var useEmojiProvider = function useEmojiProvider(pluginInjectionApi) {
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['emoji']),
-    emojiState = _useSharedPluginState.emojiState;
-  return emojiState === null || emojiState === void 0 ? void 0 : emojiState.emojiProvider;
-};
-var EmojiNode = function EmojiNode(props) {
-  var _resourceConfig$optim;
-  var allowTextFallback = props.allowTextFallback,
-    shortName = props.shortName,
-    id = props.id,
-    fallback = props.fallback,
-    fitToHeight = props.fitToHeight,
-    showTooltip = props.showTooltip,
-    resourceConfig = props.resourceConfig,
-    pluginInjectionApi = props.pluginInjectionApi;
-  var emojiProvider = useEmojiProvider(pluginInjectionApi);
-  if (allowTextFallback && !emojiProvider) {
-    return /*#__PURE__*/_react.default.createElement("span", {
-      "data-emoji-id": id,
-      "data-emoji-short-name": shortName,
-      "data-emoji-text": fallback || shortName
-    }, fallback || shortName);
-  }
-  if (!emojiProvider) {
-    return null;
-  }
-  return /*#__PURE__*/_react.default.createElement(_element.ResourcedEmoji, {
-    emojiId: {
-      id: id,
-      fallback: fallback,
-      shortName: shortName
-    },
-    emojiProvider: Promise.resolve(emojiProvider),
-    showTooltip: showTooltip,
-    fitToHeight: fitToHeight,
-    optimistic: true,
-    optimisticImageURL: resourceConfig === null || resourceConfig === void 0 || (_resourceConfig$optim = resourceConfig.optimisticImageApi) === null || _resourceConfig$optim === void 0 ? void 0 : _resourceConfig$optim.getUrl({
-      id: id,
-      fallback: fallback,
-      shortName: shortName
-    }),
-    editorEmoji: true
-  });
-};
-var _default = exports.default = EmojiNode;

package/dist/es2019/ui/Emoji/emoji-next.js

@@ -1,51 +0,0 @@
-import React from 'react';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { ResourcedEmoji } from '@atlaskit/emoji/element';
-const useEmojiProvider = pluginInjectionApi => {
-  const {
-    emojiState
-  } = useSharedPluginState(pluginInjectionApi, ['emoji']);
-  return emojiState === null || emojiState === void 0 ? void 0 : emojiState.emojiProvider;
-};
-const EmojiNode = props => {
-  var _resourceConfig$optim;
-  const {
-    allowTextFallback,
-    shortName,
-    id,
-    fallback,
-    fitToHeight,
-    showTooltip,
-    resourceConfig,
-    pluginInjectionApi
-  } = props;
-  const emojiProvider = useEmojiProvider(pluginInjectionApi);
-  if (allowTextFallback && !emojiProvider) {
-    return /*#__PURE__*/React.createElement("span", {
-      "data-emoji-id": id,
-      "data-emoji-short-name": shortName,
-      "data-emoji-text": fallback || shortName
-    }, fallback || shortName);
-  }
-  if (!emojiProvider) {
-    return null;
-  }
-  return /*#__PURE__*/React.createElement(ResourcedEmoji, {
-    emojiId: {
-      id,
-      fallback,
-      shortName
-    },
-    emojiProvider: Promise.resolve(emojiProvider),
-    showTooltip: showTooltip,
-    fitToHeight: fitToHeight,
-    optimistic: true,
-    optimisticImageURL: resourceConfig === null || resourceConfig === void 0 ? void 0 : (_resourceConfig$optim = resourceConfig.optimisticImageApi) === null || _resourceConfig$optim === void 0 ? void 0 : _resourceConfig$optim.getUrl({
-      id,
-      fallback,
-      shortName
-    }),
-    editorEmoji: true
-  });
-};
-export default EmojiNode;

package/dist/esm/ui/Emoji/emoji-next.js

@@ -1,48 +0,0 @@
-import React from 'react';
-import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { ResourcedEmoji } from '@atlaskit/emoji/element';
-var useEmojiProvider = function useEmojiProvider(pluginInjectionApi) {
-  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['emoji']),
-    emojiState = _useSharedPluginState.emojiState;
-  return emojiState === null || emojiState === void 0 ? void 0 : emojiState.emojiProvider;
-};
-var EmojiNode = function EmojiNode(props) {
-  var _resourceConfig$optim;
-  var allowTextFallback = props.allowTextFallback,
-    shortName = props.shortName,
-    id = props.id,
-    fallback = props.fallback,
-    fitToHeight = props.fitToHeight,
-    showTooltip = props.showTooltip,
-    resourceConfig = props.resourceConfig,
-    pluginInjectionApi = props.pluginInjectionApi;
-  var emojiProvider = useEmojiProvider(pluginInjectionApi);
-  if (allowTextFallback && !emojiProvider) {
-    return /*#__PURE__*/React.createElement("span", {
-      "data-emoji-id": id,
-      "data-emoji-short-name": shortName,
-      "data-emoji-text": fallback || shortName
-    }, fallback || shortName);
-  }
-  if (!emojiProvider) {
-    return null;
-  }
-  return /*#__PURE__*/React.createElement(ResourcedEmoji, {
-    emojiId: {
-      id: id,
-      fallback: fallback,
-      shortName: shortName
-    },
-    emojiProvider: Promise.resolve(emojiProvider),
-    showTooltip: showTooltip,
-    fitToHeight: fitToHeight,
-    optimistic: true,
-    optimisticImageURL: resourceConfig === null || resourceConfig === void 0 || (_resourceConfig$optim = resourceConfig.optimisticImageApi) === null || _resourceConfig$optim === void 0 ? void 0 : _resourceConfig$optim.getUrl({
-      id: id,
-      fallback: fallback,
-      shortName: shortName
-    }),
-    editorEmoji: true
-  });
-};
-export default EmojiNode;

package/dist/types/ui/Emoji/emoji-next.d.ts

@@ -1,16 +0,0 @@
-/// <reference types="react" />
-import { type ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { EmojiResourceConfig } from '@atlaskit/emoji/resource';
-import type { EmojiId } from '@atlaskit/emoji/types';
-import { type EmojiPlugin } from '../../types';
-export interface EmojiProps extends EmojiId {
-    allowTextFallback?: boolean;
-    providers?: ProviderFactory;
-    fitToHeight?: number;
-    showTooltip?: boolean;
-    resourceConfig?: EmojiResourceConfig;
-    pluginInjectionApi: ExtractInjectionAPI<EmojiPlugin> | undefined;
-}
-declare const EmojiNode: (props: EmojiProps) => JSX.Element | null;
-export default EmojiNode;

package/dist/types-ts4.5/ui/Emoji/emoji-next.d.ts

@@ -1,16 +0,0 @@
-/// <reference types="react" />
-import { type ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { EmojiResourceConfig } from '@atlaskit/emoji/resource';
-import type { EmojiId } from '@atlaskit/emoji/types';
-import { type EmojiPlugin } from '../../types';
-export interface EmojiProps extends EmojiId {
-    allowTextFallback?: boolean;
-    providers?: ProviderFactory;
-    fitToHeight?: number;
-    showTooltip?: boolean;
-    resourceConfig?: EmojiResourceConfig;
-    pluginInjectionApi: ExtractInjectionAPI<EmojiPlugin> | undefined;
-}
-declare const EmojiNode: (props: EmojiProps) => JSX.Element | null;
-export default EmojiNode;