@atlaskit/editor-plugin-floating-toolbar 1.13.4 → 1.13.5

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,13 @@
1
1
  # @atlaskit/editor-plugin-floating-toolbar
2
2
 
3
+ ## 1.13.5
4
+
5
+ ### Patch Changes
6
+
7
+ - [#146966](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/146966)
8
+ [`ee4562a10804e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ee4562a10804e) -
9
+ cleaned up platform_editor_get_emoji_provider_from_config feature flag
10
+
3
11
  ## 1.13.4
4
12
 
5
13
  ### Patch Changes
@@ -10,11 +10,9 @@ var _react = _interopRequireDefault(require("react"));
10
10
  var _react2 = require("@emotion/react");
11
11
  var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
12
12
  var _hooks = require("@atlaskit/editor-common/hooks");
13
- var _providerFactory = require("@atlaskit/editor-common/provider-factory");
14
13
  var _ui = require("@atlaskit/editor-common/ui");
15
14
  var _uiReact = require("@atlaskit/editor-common/ui-react");
16
15
  var _emoji = require("@atlaskit/emoji");
17
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
18
16
  var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
19
17
  var _EditorEmojiAddIcon = _interopRequireDefault(require("./EditorEmojiAddIcon"));
20
18
  /**
@@ -70,18 +68,6 @@ var EmojiPickerButton = exports.EmojiPickerButton = function EmojiPickerButton(p
70
68
  setIsPopupOpen(false);
71
69
  (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
72
70
  };
73
- var renderPicker = function renderPicker(providers) {
74
- if (!providers.emojiProvider) {
75
- return null;
76
- }
77
- return (0, _react2.jsx)(EmojiPickerWithListener, {
78
- emojiProvider: providers.emojiProvider,
79
- onSelection: updateEmoji,
80
- onPickerRef: function onPickerRef() {},
81
- handleClickOutside: handleEmojiClickOutside,
82
- handleEscapeKeydown: handleEmojiPressEscape
83
- });
84
- };
85
71
  var EmojiPickerWithProvider = function EmojiPickerWithProvider() {
86
72
  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(props.pluginInjectionApi, ['emoji']),
87
73
  emojiState = _useSharedPluginState.emojiState;
@@ -113,11 +99,7 @@ var EmojiPickerButton = exports.EmojiPickerButton = function EmojiPickerButton(p
113
99
  ,
114
100
  zIndex: props.setDisableParentScroll ? 600 : undefined,
115
101
  focusTrap: true
116
- }, (0, _platformFeatureFlags.fg)('platform_editor_get_emoji_provider_from_config') ? (0, _react2.jsx)(EmojiPickerWithProvider, null) : (0, _react2.jsx)(_providerFactory.WithProviders, {
117
- providers: ['emojiProvider'],
118
- providerFactory: props.providerFactory,
119
- renderNode: renderPicker
120
- }));
102
+ }, (0, _react2.jsx)(EmojiPickerWithProvider, null));
121
103
  };
122
104
  var title = props.title || '';
123
105
  return (0, _react2.jsx)("div", {
@@ -8,11 +8,9 @@ import React from 'react';
8
8
  import { css, jsx } from '@emotion/react';
9
9
  import Button from '@atlaskit/button/standard-button';
10
10
  import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
11
- import { WithProviders } from '@atlaskit/editor-common/provider-factory';
12
11
  import { Popup } from '@atlaskit/editor-common/ui';
13
12
  import { withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
14
13
  import { EmojiPicker } from '@atlaskit/emoji';
15
- import { fg } from '@atlaskit/platform-feature-flags';
16
14
  import Tooltip from '@atlaskit/tooltip';
17
15
  import EditorEmojiAddIcon from './EditorEmojiAddIcon';
18
16
 
@@ -57,18 +55,6 @@ export const EmojiPickerButton = props => {
57
55
  setIsPopupOpen(false);
58
56
  (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
59
57
  };
60
- const renderPicker = providers => {
61
- if (!providers.emojiProvider) {
62
- return null;
63
- }
64
- return jsx(EmojiPickerWithListener, {
65
- emojiProvider: providers.emojiProvider,
66
- onSelection: updateEmoji,
67
- onPickerRef: () => {},
68
- handleClickOutside: handleEmojiClickOutside,
69
- handleEscapeKeydown: handleEmojiPressEscape
70
- });
71
- };
72
58
  const EmojiPickerWithProvider = () => {
73
59
  const {
74
60
  emojiState
@@ -101,11 +87,7 @@ export const EmojiPickerButton = props => {
101
87
  ,
102
88
  zIndex: props.setDisableParentScroll ? 600 : undefined,
103
89
  focusTrap: true
104
- }, fg('platform_editor_get_emoji_provider_from_config') ? jsx(EmojiPickerWithProvider, null) : jsx(WithProviders, {
105
- providers: ['emojiProvider'],
106
- providerFactory: props.providerFactory,
107
- renderNode: renderPicker
108
- }));
90
+ }, jsx(EmojiPickerWithProvider, null));
109
91
  };
110
92
  const title = props.title || '';
111
93
  return jsx("div", {
@@ -9,11 +9,9 @@ import React from 'react';
9
9
  import { css, jsx } from '@emotion/react';
10
10
  import Button from '@atlaskit/button/standard-button';
11
11
  import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
12
- import { WithProviders } from '@atlaskit/editor-common/provider-factory';
13
12
  import { Popup } from '@atlaskit/editor-common/ui';
14
13
  import { withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
15
14
  import { EmojiPicker } from '@atlaskit/emoji';
16
- import { fg } from '@atlaskit/platform-feature-flags';
17
15
  import Tooltip from '@atlaskit/tooltip';
18
16
  import EditorEmojiAddIcon from './EditorEmojiAddIcon';
19
17
 
@@ -63,18 +61,6 @@ export var EmojiPickerButton = function EmojiPickerButton(props) {
63
61
  setIsPopupOpen(false);
64
62
  (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.focus();
65
63
  };
66
- var renderPicker = function renderPicker(providers) {
67
- if (!providers.emojiProvider) {
68
- return null;
69
- }
70
- return jsx(EmojiPickerWithListener, {
71
- emojiProvider: providers.emojiProvider,
72
- onSelection: updateEmoji,
73
- onPickerRef: function onPickerRef() {},
74
- handleClickOutside: handleEmojiClickOutside,
75
- handleEscapeKeydown: handleEmojiPressEscape
76
- });
77
- };
78
64
  var EmojiPickerWithProvider = function EmojiPickerWithProvider() {
79
65
  var _useSharedPluginState = useSharedPluginState(props.pluginInjectionApi, ['emoji']),
80
66
  emojiState = _useSharedPluginState.emojiState;
@@ -106,11 +92,7 @@ export var EmojiPickerButton = function EmojiPickerButton(props) {
106
92
  ,
107
93
  zIndex: props.setDisableParentScroll ? 600 : undefined,
108
94
  focusTrap: true
109
- }, fg('platform_editor_get_emoji_provider_from_config') ? jsx(EmojiPickerWithProvider, null) : jsx(WithProviders, {
110
- providers: ['emojiProvider'],
111
- providerFactory: props.providerFactory,
112
- renderNode: renderPicker
113
- }));
95
+ }, jsx(EmojiPickerWithProvider, null));
114
96
  };
115
97
  var title = props.title || '';
116
98
  return jsx("div", {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-floating-toolbar",
3
- "version": "1.13.4",
3
+ "version": "1.13.5",
4
4
  "description": "Floating toolbar plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -26,7 +26,7 @@
26
26
  "@atlaskit/adf-utils": "^19.8.0",
27
27
  "@atlaskit/button": "^20.2.0",
28
28
  "@atlaskit/checkbox": "^14.0.0",
29
- "@atlaskit/editor-common": "^91.1.0",
29
+ "@atlaskit/editor-common": "^91.2.0",
30
30
  "@atlaskit/editor-palette": "1.6.1",
31
31
  "@atlaskit/editor-plugin-block-controls": "^2.1.0",
32
32
  "@atlaskit/editor-plugin-context-panel": "^1.3.0",
@@ -39,10 +39,9 @@
39
39
  "@atlaskit/editor-plugin-table": "^7.28.0",
40
40
  "@atlaskit/editor-prosemirror": "6.0.0",
41
41
  "@atlaskit/emoji": "^67.8.0",
42
- "@atlaskit/icon": "^22.18.0",
42
+ "@atlaskit/icon": "^22.19.0",
43
43
  "@atlaskit/menu": "^2.12.0",
44
44
  "@atlaskit/modal-dialog": "^12.17.0",
45
- "@atlaskit/platform-feature-flags": "^0.3.0",
46
45
  "@atlaskit/primitives": "^12.2.0",
47
46
  "@atlaskit/select": "^17.19.0",
48
47
  "@atlaskit/theme": "^13.0.0",
@@ -105,10 +104,5 @@
105
104
  "dist/types-ts4.5/index.d.ts"
106
105
  ]
107
106
  }
108
- },
109
- "platform-feature-flags": {
110
- "platform_editor_get_emoji_provider_from_config": {
111
- "type": "boolean"
112
- }
113
107
  }
114
108
  }