@atlaskit/editor-plugin-insert-block 1.12.0 → 1.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @atlaskit/editor-plugin-insert-block
2
2
 
3
+ ## 1.13.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#136891](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136891)
8
+ [`388780c6348e9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/388780c6348e9) -
9
+ Pass emoji provider via preset
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies
14
+
3
15
  ## 1.12.0
4
16
 
5
17
  ### Minor Changes
@@ -15,6 +15,7 @@ var _providerFactory = require("@atlaskit/editor-common/provider-factory");
15
15
  var _types = require("@atlaskit/editor-common/types");
16
16
  var _utils = require("@atlaskit/editor-common/utils");
17
17
  var _consts = require("@atlaskit/editor-plugin-block-type/consts");
18
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
18
19
  var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
19
20
  var _switch = _interopRequireDefault(require("./assets/switch"));
20
21
  var _elementBrowser = require("./pm-plugins/elementBrowser");
@@ -256,6 +257,16 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
256
257
  mediaState = _useSharedPluginState.mediaState,
257
258
  typeAheadState = _useSharedPluginState.typeAheadState,
258
259
  placeholderTextState = _useSharedPluginState.placeholderTextState;
260
+ var getEmojiProvider = function getEmojiProvider() {
261
+ if ((0, _platformFeatureFlags.fg)('platform_editor_get_emoji_provider_from_config')) {
262
+ if (emojiState !== null && emojiState !== void 0 && emojiState.emojiProvider) {
263
+ return Promise.resolve(emojiState === null || emojiState === void 0 ? void 0 : emojiState.emojiProvider);
264
+ }
265
+ } else {
266
+ return providers.emojiProvider;
267
+ }
268
+ };
269
+ var emojiProvider = getEmojiProvider();
259
270
  return /*#__PURE__*/_react.default.createElement(_ToolbarInsertBlock.default, {
260
271
  pluginInjectionApi: pluginInjectionApi,
261
272
  buttons: buttons,
@@ -282,8 +293,8 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
282
293
  availableWrapperBlockTypes: blockTypeState && blockTypeState.availableWrapperBlockTypes,
283
294
  linkSupported: !!hyperlinkState,
284
295
  linkDisabled: !hyperlinkState || !hyperlinkState.canInsertLink || !!hyperlinkState.activeLinkMark,
285
- emojiDisabled: !emojiState || !providers.emojiProvider,
286
- emojiProvider: providers.emojiProvider,
296
+ emojiDisabled: !emojiState || !emojiProvider,
297
+ emojiProvider: emojiProvider,
287
298
  nativeStatusSupported: options.nativeStatusSupported,
288
299
  horizontalRuleEnabled: options.horizontalRuleEnabled,
289
300
  onInsertBlockType: handleInsertBlockType(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.codeBlock) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions.insertCodeBlock, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$p = pluginInjectionApi.panel) === null || _pluginInjectionApi$p === void 0 ? void 0 : _pluginInjectionApi$p.actions.insertPanel, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$b = pluginInjectionApi.blockType) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.insertBlockQuote),
@@ -7,6 +7,7 @@ import { WithProviders } from '@atlaskit/editor-common/provider-factory';
7
7
  import { ToolbarSize } from '@atlaskit/editor-common/types';
8
8
  import { getWrappingOptions } from '@atlaskit/editor-common/utils';
9
9
  import { BLOCK_QUOTE, CODE_BLOCK, PANEL } from '@atlaskit/editor-plugin-block-type/consts';
10
+ import { fg } from '@atlaskit/platform-feature-flags';
10
11
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
11
12
  import SwitchIcon from './assets/switch';
12
13
  import { elementBrowserPmKey, elementBrowserPmPlugin } from './pm-plugins/elementBrowser';
@@ -249,6 +250,16 @@ function ToolbarInsertBlockWithInjectionApi({
249
250
  typeAheadState,
250
251
  placeholderTextState
251
252
  } = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media', 'typeAhead', 'placeholderText']);
253
+ const getEmojiProvider = () => {
254
+ if (fg('platform_editor_get_emoji_provider_from_config')) {
255
+ if (emojiState !== null && emojiState !== void 0 && emojiState.emojiProvider) {
256
+ return Promise.resolve(emojiState === null || emojiState === void 0 ? void 0 : emojiState.emojiProvider);
257
+ }
258
+ } else {
259
+ return providers.emojiProvider;
260
+ }
261
+ };
262
+ const emojiProvider = getEmojiProvider();
252
263
  return /*#__PURE__*/React.createElement(ToolbarInsertBlock, {
253
264
  pluginInjectionApi: pluginInjectionApi,
254
265
  buttons: buttons,
@@ -275,8 +286,8 @@ function ToolbarInsertBlockWithInjectionApi({
275
286
  availableWrapperBlockTypes: blockTypeState && blockTypeState.availableWrapperBlockTypes,
276
287
  linkSupported: !!hyperlinkState,
277
288
  linkDisabled: !hyperlinkState || !hyperlinkState.canInsertLink || !!hyperlinkState.activeLinkMark,
278
- emojiDisabled: !emojiState || !providers.emojiProvider,
279
- emojiProvider: providers.emojiProvider,
289
+ emojiDisabled: !emojiState || !emojiProvider,
290
+ emojiProvider: emojiProvider,
280
291
  nativeStatusSupported: options.nativeStatusSupported,
281
292
  horizontalRuleEnabled: options.horizontalRuleEnabled,
282
293
  onInsertBlockType: handleInsertBlockType(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.codeBlock) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions.insertCodeBlock, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$p = pluginInjectionApi.panel) === null || _pluginInjectionApi$p === void 0 ? void 0 : _pluginInjectionApi$p.actions.insertPanel, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$b = pluginInjectionApi.blockType) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.insertBlockQuote),
@@ -7,6 +7,7 @@ import { WithProviders } from '@atlaskit/editor-common/provider-factory';
7
7
  import { ToolbarSize } from '@atlaskit/editor-common/types';
8
8
  import { getWrappingOptions } from '@atlaskit/editor-common/utils';
9
9
  import { BLOCK_QUOTE, CODE_BLOCK, PANEL } from '@atlaskit/editor-plugin-block-type/consts';
10
+ import { fg } from '@atlaskit/platform-feature-flags';
10
11
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
11
12
  import SwitchIcon from './assets/switch';
12
13
  import { elementBrowserPmKey, elementBrowserPmPlugin } from './pm-plugins/elementBrowser';
@@ -246,6 +247,16 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
246
247
  mediaState = _useSharedPluginState.mediaState,
247
248
  typeAheadState = _useSharedPluginState.typeAheadState,
248
249
  placeholderTextState = _useSharedPluginState.placeholderTextState;
250
+ var getEmojiProvider = function getEmojiProvider() {
251
+ if (fg('platform_editor_get_emoji_provider_from_config')) {
252
+ if (emojiState !== null && emojiState !== void 0 && emojiState.emojiProvider) {
253
+ return Promise.resolve(emojiState === null || emojiState === void 0 ? void 0 : emojiState.emojiProvider);
254
+ }
255
+ } else {
256
+ return providers.emojiProvider;
257
+ }
258
+ };
259
+ var emojiProvider = getEmojiProvider();
249
260
  return /*#__PURE__*/React.createElement(ToolbarInsertBlock, {
250
261
  pluginInjectionApi: pluginInjectionApi,
251
262
  buttons: buttons,
@@ -272,8 +283,8 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
272
283
  availableWrapperBlockTypes: blockTypeState && blockTypeState.availableWrapperBlockTypes,
273
284
  linkSupported: !!hyperlinkState,
274
285
  linkDisabled: !hyperlinkState || !hyperlinkState.canInsertLink || !!hyperlinkState.activeLinkMark,
275
- emojiDisabled: !emojiState || !providers.emojiProvider,
276
- emojiProvider: providers.emojiProvider,
286
+ emojiDisabled: !emojiState || !emojiProvider,
287
+ emojiProvider: emojiProvider,
277
288
  nativeStatusSupported: options.nativeStatusSupported,
278
289
  horizontalRuleEnabled: options.horizontalRuleEnabled,
279
290
  onInsertBlockType: handleInsertBlockType(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.codeBlock) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions.insertCodeBlock, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$p = pluginInjectionApi.panel) === null || _pluginInjectionApi$p === void 0 ? void 0 : _pluginInjectionApi$p.actions.insertPanel, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$b = pluginInjectionApi.blockType) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.insertBlockQuote),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-insert-block",
3
- "version": "1.12.0",
3
+ "version": "1.13.0",
4
4
  "description": "Insert block plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -31,12 +31,12 @@
31
31
  ".": "./src/index.ts"
32
32
  },
33
33
  "dependencies": {
34
- "@atlaskit/editor-common": "^88.8.0",
34
+ "@atlaskit/editor-common": "^88.11.0",
35
35
  "@atlaskit/editor-plugin-analytics": "^1.8.0",
36
36
  "@atlaskit/editor-plugin-block-type": "^3.14.0",
37
37
  "@atlaskit/editor-plugin-code-block": "^3.3.0",
38
38
  "@atlaskit/editor-plugin-date": "^2.3.0",
39
- "@atlaskit/editor-plugin-emoji": "^2.4.0",
39
+ "@atlaskit/editor-plugin-emoji": "^2.5.0",
40
40
  "@atlaskit/editor-plugin-expand": "^2.6.0",
41
41
  "@atlaskit/editor-plugin-extension": "^1.14.0",
42
42
  "@atlaskit/editor-plugin-feature-flags": "^1.2.0",
@@ -57,7 +57,8 @@
57
57
  "@atlaskit/editor-prosemirror": "5.0.1",
58
58
  "@atlaskit/editor-shared-styles": "^2.13.0",
59
59
  "@atlaskit/emoji": "^67.7.0",
60
- "@atlaskit/icon": "^22.15.0",
60
+ "@atlaskit/icon": "^22.16.0",
61
+ "@atlaskit/platform-feature-flags": "^0.3.0",
61
62
  "@atlaskit/primitives": "^12.1.0",
62
63
  "@atlaskit/theme": "^13.0.0",
63
64
  "@atlaskit/tmp-editor-statsig": "^2.1.0",
@@ -114,5 +115,10 @@
114
115
  "import-no-extraneous-disable-for-examples-and-docs"
115
116
  ]
116
117
  }
118
+ },
119
+ "platform-feature-flags": {
120
+ "platform_editor_get_emoji_provider_from_config": {
121
+ "type": "boolean"
122
+ }
117
123
  }
118
124
  }