@atlaskit/editor-plugin-floating-toolbar 5.2.3 → 6.0.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 +18 -0
- package/dist/cjs/floatingToolbarPlugin.js +1 -1
- package/dist/cjs/ui/EmojiPickerButton.js +2 -10
- package/dist/es2019/floatingToolbarPlugin.js +1 -1
- package/dist/es2019/ui/EmojiPickerButton.js +3 -12
- package/dist/esm/floatingToolbarPlugin.js +1 -1
- package/dist/esm/ui/EmojiPickerButton.js +3 -11
- package/package.json +14 -14
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-floating-toolbar
|
|
2
2
|
|
|
3
|
+
## 6.0.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`0fda385059db0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0fda385059db0) -
|
|
8
|
+
PR to cleanup platform_editor_usesharedpluginstatewithselector for `collab-edit`,
|
|
9
|
+
`floating-toolbar`, `grid` and `guideline`
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
12
|
+
## 5.2.4
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- [`bacdc0ed302a6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bacdc0ed302a6) -
|
|
17
|
+
[ED-29067] Fix a bug where link picker is not shown when texts are selected and link button is
|
|
18
|
+
clicked
|
|
19
|
+
- Updated dependencies
|
|
20
|
+
|
|
3
21
|
## 5.2.3
|
|
4
22
|
|
|
5
23
|
### Patch Changes
|
|
@@ -248,7 +248,7 @@ function ContentComponent(_ref5) {
|
|
|
248
248
|
var selection = editorView.state.selection;
|
|
249
249
|
var isCellSelection = '$anchorCell' in selection && !selection.empty;
|
|
250
250
|
var isTextSelected = selection instanceof _state.TextSelection && !selection.empty;
|
|
251
|
-
if (isTextSelected || isCellSelection) {
|
|
251
|
+
if (isTextSelected && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_1', 'isEnabled', true) || config.className !== 'hyperlink-floating-toolbar') || isCellSelection) {
|
|
252
252
|
return null;
|
|
253
253
|
}
|
|
254
254
|
}
|
|
@@ -65,22 +65,14 @@ var selector = function selector(states) {
|
|
|
65
65
|
var _states$emojiState;
|
|
66
66
|
return (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.emojiProvider;
|
|
67
67
|
};
|
|
68
|
-
var useEmojiProvider = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
|
|
69
|
-
var emojiProvider = (0, _hooks.useSharedPluginStateWithSelector)(api, ['emoji'], selector);
|
|
70
|
-
return emojiProvider ? Promise.resolve(emojiProvider) : undefined;
|
|
71
|
-
}, function (api) {
|
|
72
|
-
var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['emoji']),
|
|
73
|
-
emojiState = _useSharedPluginState.emojiState;
|
|
74
|
-
return emojiState !== null && emojiState !== void 0 && emojiState.emojiProvider ? Promise.resolve(emojiState.emojiProvider) : undefined;
|
|
75
|
-
});
|
|
76
68
|
var EmojiPickerWithProvider = function EmojiPickerWithProvider(props) {
|
|
77
|
-
var emojiProvider =
|
|
69
|
+
var emojiProvider = (0, _hooks.useSharedPluginStateWithSelector)(props.pluginInjectionApi, ['emoji'], selector);
|
|
78
70
|
var setOutsideClickTargetRef = (0, _react.useContext)(_uiReact.OutsideClickTargetRefContext);
|
|
79
71
|
if (!emojiProvider) {
|
|
80
72
|
return null;
|
|
81
73
|
}
|
|
82
74
|
return (0, _react2.jsx)(_emoji.EmojiPicker, {
|
|
83
|
-
emojiProvider: emojiProvider,
|
|
75
|
+
emojiProvider: Promise.resolve(emojiProvider),
|
|
84
76
|
onSelection: props.updateEmoji,
|
|
85
77
|
onPickerRef: setOutsideClickTargetRef
|
|
86
78
|
});
|
|
@@ -240,7 +240,7 @@ export function ContentComponent({
|
|
|
240
240
|
const selection = editorView.state.selection;
|
|
241
241
|
const isCellSelection = '$anchorCell' in selection && !selection.empty;
|
|
242
242
|
const isTextSelected = selection instanceof TextSelection && !selection.empty;
|
|
243
|
-
if (isTextSelected || isCellSelection) {
|
|
243
|
+
if (isTextSelected && (!expValEquals('platform_editor_toolbar_aifc_patch_1', 'isEnabled', true) || config.className !== 'hyperlink-floating-toolbar') || isCellSelection) {
|
|
244
244
|
return null;
|
|
245
245
|
}
|
|
246
246
|
}
|
|
@@ -7,7 +7,7 @@ import React, { useCallback, useContext } from 'react';
|
|
|
7
7
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
8
8
|
import { css, jsx } from '@emotion/react';
|
|
9
9
|
import { IconButton } from '@atlaskit/button/new';
|
|
10
|
-
import {
|
|
10
|
+
import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
|
|
11
11
|
import { Popup } from '@atlaskit/editor-common/ui';
|
|
12
12
|
import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
|
|
13
13
|
import { EmojiPicker } from '@atlaskit/emoji';
|
|
@@ -55,23 +55,14 @@ const selector = states => {
|
|
|
55
55
|
var _states$emojiState;
|
|
56
56
|
return (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.emojiProvider;
|
|
57
57
|
};
|
|
58
|
-
const useEmojiProvider = sharedPluginStateHookMigratorFactory(api => {
|
|
59
|
-
const emojiProvider = useSharedPluginStateWithSelector(api, ['emoji'], selector);
|
|
60
|
-
return emojiProvider ? Promise.resolve(emojiProvider) : undefined;
|
|
61
|
-
}, api => {
|
|
62
|
-
const {
|
|
63
|
-
emojiState
|
|
64
|
-
} = useSharedPluginState(api, ['emoji']);
|
|
65
|
-
return emojiState !== null && emojiState !== void 0 && emojiState.emojiProvider ? Promise.resolve(emojiState.emojiProvider) : undefined;
|
|
66
|
-
});
|
|
67
58
|
const EmojiPickerWithProvider = props => {
|
|
68
|
-
const emojiProvider =
|
|
59
|
+
const emojiProvider = useSharedPluginStateWithSelector(props.pluginInjectionApi, ['emoji'], selector);
|
|
69
60
|
const setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
|
|
70
61
|
if (!emojiProvider) {
|
|
71
62
|
return null;
|
|
72
63
|
}
|
|
73
64
|
return jsx(EmojiPicker, {
|
|
74
|
-
emojiProvider: emojiProvider,
|
|
65
|
+
emojiProvider: Promise.resolve(emojiProvider),
|
|
75
66
|
onSelection: props.updateEmoji,
|
|
76
67
|
onPickerRef: setOutsideClickTargetRef
|
|
77
68
|
});
|
|
@@ -239,7 +239,7 @@ export function ContentComponent(_ref5) {
|
|
|
239
239
|
var selection = editorView.state.selection;
|
|
240
240
|
var isCellSelection = '$anchorCell' in selection && !selection.empty;
|
|
241
241
|
var isTextSelected = selection instanceof TextSelection && !selection.empty;
|
|
242
|
-
if (isTextSelected || isCellSelection) {
|
|
242
|
+
if (isTextSelected && (!expValEquals('platform_editor_toolbar_aifc_patch_1', 'isEnabled', true) || config.className !== 'hyperlink-floating-toolbar') || isCellSelection) {
|
|
243
243
|
return null;
|
|
244
244
|
}
|
|
245
245
|
}
|
|
@@ -8,7 +8,7 @@ import React, { useCallback, useContext } from 'react';
|
|
|
8
8
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
9
9
|
import { css, jsx } from '@emotion/react';
|
|
10
10
|
import { IconButton } from '@atlaskit/button/new';
|
|
11
|
-
import {
|
|
11
|
+
import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
|
|
12
12
|
import { Popup } from '@atlaskit/editor-common/ui';
|
|
13
13
|
import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
|
|
14
14
|
import { EmojiPicker } from '@atlaskit/emoji';
|
|
@@ -56,22 +56,14 @@ var selector = function selector(states) {
|
|
|
56
56
|
var _states$emojiState;
|
|
57
57
|
return (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.emojiProvider;
|
|
58
58
|
};
|
|
59
|
-
var useEmojiProvider = sharedPluginStateHookMigratorFactory(function (api) {
|
|
60
|
-
var emojiProvider = useSharedPluginStateWithSelector(api, ['emoji'], selector);
|
|
61
|
-
return emojiProvider ? Promise.resolve(emojiProvider) : undefined;
|
|
62
|
-
}, function (api) {
|
|
63
|
-
var _useSharedPluginState = useSharedPluginState(api, ['emoji']),
|
|
64
|
-
emojiState = _useSharedPluginState.emojiState;
|
|
65
|
-
return emojiState !== null && emojiState !== void 0 && emojiState.emojiProvider ? Promise.resolve(emojiState.emojiProvider) : undefined;
|
|
66
|
-
});
|
|
67
59
|
var EmojiPickerWithProvider = function EmojiPickerWithProvider(props) {
|
|
68
|
-
var emojiProvider =
|
|
60
|
+
var emojiProvider = useSharedPluginStateWithSelector(props.pluginInjectionApi, ['emoji'], selector);
|
|
69
61
|
var setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
|
|
70
62
|
if (!emojiProvider) {
|
|
71
63
|
return null;
|
|
72
64
|
}
|
|
73
65
|
return jsx(EmojiPicker, {
|
|
74
|
-
emojiProvider: emojiProvider,
|
|
66
|
+
emojiProvider: Promise.resolve(emojiProvider),
|
|
75
67
|
onSelection: props.updateEmoji,
|
|
76
68
|
onPickerRef: setOutsideClickTargetRef
|
|
77
69
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-floating-toolbar",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.0",
|
|
4
4
|
"description": "Floating toolbar plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -25,17 +25,17 @@
|
|
|
25
25
|
"@atlaskit/button": "^23.4.0",
|
|
26
26
|
"@atlaskit/checkbox": "^17.1.0",
|
|
27
27
|
"@atlaskit/editor-palette": "^2.1.0",
|
|
28
|
-
"@atlaskit/editor-plugin-analytics": "^
|
|
29
|
-
"@atlaskit/editor-plugin-context-panel": "^
|
|
30
|
-
"@atlaskit/editor-plugin-copy-button": "^
|
|
31
|
-
"@atlaskit/editor-plugin-decorations": "^
|
|
32
|
-
"@atlaskit/editor-plugin-editor-disabled": "^
|
|
33
|
-
"@atlaskit/editor-plugin-editor-viewmode": "^
|
|
34
|
-
"@atlaskit/editor-plugin-emoji": "^
|
|
35
|
-
"@atlaskit/editor-plugin-extension": "^
|
|
36
|
-
"@atlaskit/editor-plugin-interaction": "^
|
|
37
|
-
"@atlaskit/editor-plugin-table": "^
|
|
38
|
-
"@atlaskit/editor-plugin-user-intent": "^
|
|
28
|
+
"@atlaskit/editor-plugin-analytics": "^4.0.0",
|
|
29
|
+
"@atlaskit/editor-plugin-context-panel": "^6.0.0",
|
|
30
|
+
"@atlaskit/editor-plugin-copy-button": "^4.0.0",
|
|
31
|
+
"@atlaskit/editor-plugin-decorations": "^4.0.0",
|
|
32
|
+
"@atlaskit/editor-plugin-editor-disabled": "^4.0.0",
|
|
33
|
+
"@atlaskit/editor-plugin-editor-viewmode": "^6.0.0",
|
|
34
|
+
"@atlaskit/editor-plugin-emoji": "^5.0.0",
|
|
35
|
+
"@atlaskit/editor-plugin-extension": "^7.0.0",
|
|
36
|
+
"@atlaskit/editor-plugin-interaction": "^6.0.0",
|
|
37
|
+
"@atlaskit/editor-plugin-table": "^13.0.0",
|
|
38
|
+
"@atlaskit/editor-plugin-user-intent": "^2.0.0",
|
|
39
39
|
"@atlaskit/editor-prosemirror": "7.0.0",
|
|
40
40
|
"@atlaskit/emoji": "^69.5.0",
|
|
41
41
|
"@atlaskit/icon": "^28.1.0",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"@atlaskit/primitives": "^14.12.0",
|
|
46
46
|
"@atlaskit/select": "^21.2.0",
|
|
47
47
|
"@atlaskit/theme": "^20.0.0",
|
|
48
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
48
|
+
"@atlaskit/tmp-editor-statsig": "^12.0.0",
|
|
49
49
|
"@atlaskit/tokens": "^6.1.0",
|
|
50
50
|
"@atlaskit/tooltip": "^20.4.0",
|
|
51
51
|
"@babel/runtime": "^7.0.0",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"react-loadable": "^5.1.0"
|
|
58
58
|
},
|
|
59
59
|
"peerDependencies": {
|
|
60
|
-
"@atlaskit/editor-common": "^
|
|
60
|
+
"@atlaskit/editor-common": "^108.0.0",
|
|
61
61
|
"react": "^18.2.0",
|
|
62
62
|
"react-dom": "^18.2.0"
|
|
63
63
|
},
|