@atlaskit/editor-plugin-card 0.15.2 → 0.16.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 +17 -0
- package/dist/cjs/plugin.js +2 -3
- package/dist/cjs/toolbar.js +5 -6
- package/dist/cjs/ui/EditLinkToolbar.js +8 -8
- package/dist/es2019/plugin.js +2 -3
- package/dist/es2019/toolbar.js +5 -8
- package/dist/es2019/ui/EditLinkToolbar.js +8 -8
- package/dist/esm/plugin.js +2 -3
- package/dist/esm/toolbar.js +5 -6
- package/dist/esm/ui/EditLinkToolbar.js +8 -8
- package/dist/types/toolbar.d.ts +2 -2
- package/dist/types/types.d.ts +1 -0
- package/dist/types/ui/EditLinkToolbar.d.ts +6 -6
- package/dist/types-ts4.5/toolbar.d.ts +2 -2
- package/dist/types-ts4.5/types.d.ts +1 -0
- package/dist/types-ts4.5/ui/EditLinkToolbar.d.ts +6 -6
- package/package.json +7 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-card
|
|
2
2
|
|
|
3
|
+
## 0.16.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#65019](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65019) [`7290a6f8d435`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7290a6f8d435) - Adding lpLinkPicker param to card and hyperlink plugins instead of using feature flag
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies
|
|
12
|
+
|
|
13
|
+
## 0.15.3
|
|
14
|
+
|
|
15
|
+
### Patch Changes
|
|
16
|
+
|
|
17
|
+
- [#65031](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65031) [`a00094111b5a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a00094111b5a) - ED-21609 Update adf-schema to 35.3.0
|
|
18
|
+
- Updated dependencies
|
|
19
|
+
|
|
3
20
|
## 0.15.2
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
package/dist/cjs/plugin.js
CHANGED
|
@@ -31,10 +31,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
31
31
|
* from `@atlaskit/editor-core`.
|
|
32
32
|
*/
|
|
33
33
|
var cardPlugin = exports.cardPlugin = function cardPlugin(_ref) {
|
|
34
|
-
var
|
|
34
|
+
var _options$lpLinkPicker;
|
|
35
35
|
var options = _ref.config,
|
|
36
36
|
api = _ref.api;
|
|
37
|
-
var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
|
|
38
37
|
var cardPluginEvents = (0, _createEventsQueue.createEventsQueue)();
|
|
39
38
|
return {
|
|
40
39
|
name: 'card',
|
|
@@ -125,7 +124,7 @@ var cardPlugin = exports.cardPlugin = function cardPlugin(_ref) {
|
|
|
125
124
|
setSelectedCardAppearance: _doc.setSelectedCardAppearance
|
|
126
125
|
},
|
|
127
126
|
pluginsOptions: {
|
|
128
|
-
floatingToolbar: (0, _toolbar.floatingToolbar)(options,
|
|
127
|
+
floatingToolbar: (0, _toolbar.floatingToolbar)(options, (_options$lpLinkPicker = options.lpLinkPicker) !== null && _options$lpLinkPicker !== void 0 ? _options$lpLinkPicker : false, options.platform, options.linkPicker, api),
|
|
129
128
|
quickInsert: function quickInsert(_ref4) {
|
|
130
129
|
var formatMessage = _ref4.formatMessage;
|
|
131
130
|
var quickInsertArray = [];
|
package/dist/cjs/toolbar.js
CHANGED
|
@@ -96,7 +96,7 @@ var openLinkSettings = exports.openLinkSettings = function openLinkSettings(edit
|
|
|
96
96
|
return true;
|
|
97
97
|
};
|
|
98
98
|
};
|
|
99
|
-
var floatingToolbar = exports.floatingToolbar = function floatingToolbar(cardOptions,
|
|
99
|
+
var floatingToolbar = exports.floatingToolbar = function floatingToolbar(cardOptions, lpLinkPicker, platform, linkPickerOptions, pluginInjectionApi) {
|
|
100
100
|
return function (state, intl, providerFactory) {
|
|
101
101
|
var _state$schema$nodes = state.schema.nodes,
|
|
102
102
|
inlineCard = _state$schema$nodes.inlineCard,
|
|
@@ -120,7 +120,6 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(cardOpt
|
|
|
120
120
|
|
|
121
121
|
// Applies padding override for when link picker is currently displayed
|
|
122
122
|
var className = pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar ? _styles.FLOATING_TOOLBAR_LINKPICKER_CLASSNAME : undefined;
|
|
123
|
-
var lpLinkPicker = featureFlags.lpLinkPicker;
|
|
124
123
|
var isLinkPickerEnabled = !!lpLinkPicker;
|
|
125
124
|
return _objectSpread(_objectSpread({
|
|
126
125
|
title: intl.formatMessage(_messages.cardMessages.card),
|
|
@@ -138,7 +137,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(cardOpt
|
|
|
138
137
|
}
|
|
139
138
|
return element;
|
|
140
139
|
},
|
|
141
|
-
items: generateToolbarItems(state,
|
|
140
|
+
items: generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, platform, linkPickerOptions, pluginInjectionApi),
|
|
142
141
|
scrollable: pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar ? false : true
|
|
143
142
|
}, (0, _EditLinkToolbar.editLinkToolbarConfig)(Boolean(pluginState === null || pluginState === void 0 ? void 0 : pluginState.showLinkingToolbar), isLinkPickerEnabled));
|
|
144
143
|
};
|
|
@@ -180,7 +179,7 @@ var getToolbarViewedItem = function getToolbarViewedItem(url, display) {
|
|
|
180
179
|
}
|
|
181
180
|
}];
|
|
182
181
|
};
|
|
183
|
-
var generateToolbarItems = function generateToolbarItems(state,
|
|
182
|
+
var generateToolbarItems = function generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, platform, linkPicker, pluginInjectionApi) {
|
|
184
183
|
return function (node) {
|
|
185
184
|
var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs2;
|
|
186
185
|
var _titleUrlPairFromNode2 = (0, _utils3.titleUrlPairFromNode)(node),
|
|
@@ -213,8 +212,8 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
|
|
|
213
212
|
providerFactory: providerFactory,
|
|
214
213
|
linkPicker: linkPicker,
|
|
215
214
|
node: node,
|
|
216
|
-
|
|
217
|
-
|
|
215
|
+
pluginInjectionApi: pluginInjectionApi,
|
|
216
|
+
lpLinkPicker: lpLinkPicker
|
|
218
217
|
})];
|
|
219
218
|
} else if (shouldRenderDatasourceToolbar) {
|
|
220
219
|
return getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, node.attrs.datasource.id, state);
|
|
@@ -35,7 +35,7 @@ function HyperlinkAddToolbarWithState(_ref) {
|
|
|
35
35
|
view = _ref.view,
|
|
36
36
|
onCancel = _ref.onCancel,
|
|
37
37
|
invokeMethod = _ref.invokeMethod,
|
|
38
|
-
|
|
38
|
+
lpLinkPicker = _ref.lpLinkPicker,
|
|
39
39
|
onClose = _ref.onClose,
|
|
40
40
|
onEscapeCallback = _ref.onEscapeCallback,
|
|
41
41
|
onClickAwayCallback = _ref.onClickAwayCallback,
|
|
@@ -51,7 +51,7 @@ function HyperlinkAddToolbarWithState(_ref) {
|
|
|
51
51
|
view: view,
|
|
52
52
|
onCancel: onCancel,
|
|
53
53
|
invokeMethod: invokeMethod,
|
|
54
|
-
|
|
54
|
+
lpLinkPicker: lpLinkPicker,
|
|
55
55
|
onClose: onClose,
|
|
56
56
|
onEscapeCallback: onEscapeCallback,
|
|
57
57
|
onClickAwayCallback: onClickAwayCallback,
|
|
@@ -95,10 +95,10 @@ var EditLinkToolbar = exports.EditLinkToolbar = /*#__PURE__*/function (_React$Co
|
|
|
95
95
|
url = _this$props.url,
|
|
96
96
|
text = _this$props.text,
|
|
97
97
|
view = _this$props.view,
|
|
98
|
-
featureFlags = _this$props.featureFlags,
|
|
99
98
|
_onSubmit = _this$props.onSubmit,
|
|
100
99
|
pluginInjectionApi = _this$props.pluginInjectionApi,
|
|
101
|
-
forceFocusSelector = _this$props.forceFocusSelector
|
|
100
|
+
forceFocusSelector = _this$props.forceFocusSelector,
|
|
101
|
+
lpLinkPicker = _this$props.lpLinkPicker;
|
|
102
102
|
return /*#__PURE__*/_react.default.createElement(HyperlinkAddToolbarWithState, {
|
|
103
103
|
pluginInjectionApi: pluginInjectionApi,
|
|
104
104
|
view: view,
|
|
@@ -110,7 +110,7 @@ var EditLinkToolbar = exports.EditLinkToolbar = /*#__PURE__*/function (_React$Co
|
|
|
110
110
|
// via the floating toolbar
|
|
111
111
|
,
|
|
112
112
|
invokeMethod: _analytics.INPUT_METHOD.FLOATING_TB,
|
|
113
|
-
|
|
113
|
+
lpLinkPicker: lpLinkPicker,
|
|
114
114
|
onSubmit: function onSubmit(href, title, displayText, inputMethod, analytic) {
|
|
115
115
|
_this.hideLinkToolbar();
|
|
116
116
|
if (_onSubmit) {
|
|
@@ -162,8 +162,8 @@ var buildEditLinkToolbar = exports.buildEditLinkToolbar = function buildEditLink
|
|
|
162
162
|
var providerFactory = _ref2.providerFactory,
|
|
163
163
|
node = _ref2.node,
|
|
164
164
|
linkPicker = _ref2.linkPicker,
|
|
165
|
-
|
|
166
|
-
|
|
165
|
+
pluginInjectionApi = _ref2.pluginInjectionApi,
|
|
166
|
+
lpLinkPicker = _ref2.lpLinkPicker;
|
|
167
167
|
return {
|
|
168
168
|
type: 'custom',
|
|
169
169
|
disableArrowNavigation: true,
|
|
@@ -183,7 +183,7 @@ var buildEditLinkToolbar = exports.buildEditLinkToolbar = function buildEditLink
|
|
|
183
183
|
url: displayInfo.url,
|
|
184
184
|
text: displayInfo.title || '',
|
|
185
185
|
node: node,
|
|
186
|
-
|
|
186
|
+
lpLinkPicker: lpLinkPicker,
|
|
187
187
|
forceFocusSelector: pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar.actions) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.forceFocusSelector,
|
|
188
188
|
onSubmit: function onSubmit(newHref, newText, inputMethod, analytic) {
|
|
189
189
|
var urlChanged = newHref !== displayInfo.url;
|
package/dist/es2019/plugin.js
CHANGED
|
@@ -24,8 +24,7 @@ export const cardPlugin = ({
|
|
|
24
24
|
config: options,
|
|
25
25
|
api
|
|
26
26
|
}) => {
|
|
27
|
-
var
|
|
28
|
-
const featureFlags = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
|
|
27
|
+
var _options$lpLinkPicker;
|
|
29
28
|
const cardPluginEvents = createEventsQueue();
|
|
30
29
|
return {
|
|
31
30
|
name: 'card',
|
|
@@ -117,7 +116,7 @@ export const cardPlugin = ({
|
|
|
117
116
|
setSelectedCardAppearance
|
|
118
117
|
},
|
|
119
118
|
pluginsOptions: {
|
|
120
|
-
floatingToolbar: floatingToolbar(options,
|
|
119
|
+
floatingToolbar: floatingToolbar(options, (_options$lpLinkPicker = options.lpLinkPicker) !== null && _options$lpLinkPicker !== void 0 ? _options$lpLinkPicker : false, options.platform, options.linkPicker, api),
|
|
121
120
|
quickInsert: ({
|
|
122
121
|
formatMessage
|
|
123
122
|
}) => {
|
package/dist/es2019/toolbar.js
CHANGED
|
@@ -89,7 +89,7 @@ export const openLinkSettings = editorAnalyticsApi => (state, dispatch) => {
|
|
|
89
89
|
}
|
|
90
90
|
return true;
|
|
91
91
|
};
|
|
92
|
-
export const floatingToolbar = (cardOptions,
|
|
92
|
+
export const floatingToolbar = (cardOptions, lpLinkPicker, platform, linkPickerOptions, pluginInjectionApi) => {
|
|
93
93
|
return (state, intl, providerFactory) => {
|
|
94
94
|
const {
|
|
95
95
|
inlineCard,
|
|
@@ -114,9 +114,6 @@ export const floatingToolbar = (cardOptions, featureFlags, platform, linkPickerO
|
|
|
114
114
|
|
|
115
115
|
// Applies padding override for when link picker is currently displayed
|
|
116
116
|
const className = pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar ? FLOATING_TOOLBAR_LINKPICKER_CLASSNAME : undefined;
|
|
117
|
-
const {
|
|
118
|
-
lpLinkPicker
|
|
119
|
-
} = featureFlags;
|
|
120
117
|
const isLinkPickerEnabled = !!lpLinkPicker;
|
|
121
118
|
return {
|
|
122
119
|
title: intl.formatMessage(messages.card),
|
|
@@ -134,7 +131,7 @@ export const floatingToolbar = (cardOptions, featureFlags, platform, linkPickerO
|
|
|
134
131
|
}
|
|
135
132
|
return element;
|
|
136
133
|
},
|
|
137
|
-
items: generateToolbarItems(state,
|
|
134
|
+
items: generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, platform, linkPickerOptions, pluginInjectionApi),
|
|
138
135
|
scrollable: pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar ? false : true,
|
|
139
136
|
...editLinkToolbarConfig(Boolean(pluginState === null || pluginState === void 0 ? void 0 : pluginState.showLinkingToolbar), isLinkPickerEnabled)
|
|
140
137
|
};
|
|
@@ -171,7 +168,7 @@ const getToolbarViewedItem = (url, display) => {
|
|
|
171
168
|
})
|
|
172
169
|
}];
|
|
173
170
|
};
|
|
174
|
-
const generateToolbarItems = (state,
|
|
171
|
+
const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkPicker, platform, linkPicker, pluginInjectionApi) => node => {
|
|
175
172
|
var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs2, _node$attrs2$datasour;
|
|
176
173
|
const {
|
|
177
174
|
url
|
|
@@ -207,8 +204,8 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
|
|
|
207
204
|
providerFactory,
|
|
208
205
|
linkPicker,
|
|
209
206
|
node,
|
|
210
|
-
|
|
211
|
-
|
|
207
|
+
pluginInjectionApi,
|
|
208
|
+
lpLinkPicker
|
|
212
209
|
})];
|
|
213
210
|
} else if (shouldRenderDatasourceToolbar) {
|
|
214
211
|
return getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, node.attrs.datasource.id, state);
|
|
@@ -18,7 +18,7 @@ export function HyperlinkAddToolbarWithState({
|
|
|
18
18
|
view,
|
|
19
19
|
onCancel,
|
|
20
20
|
invokeMethod,
|
|
21
|
-
|
|
21
|
+
lpLinkPicker,
|
|
22
22
|
onClose,
|
|
23
23
|
onEscapeCallback,
|
|
24
24
|
onClickAwayCallback,
|
|
@@ -36,7 +36,7 @@ export function HyperlinkAddToolbarWithState({
|
|
|
36
36
|
view: view,
|
|
37
37
|
onCancel: onCancel,
|
|
38
38
|
invokeMethod: invokeMethod,
|
|
39
|
-
|
|
39
|
+
lpLinkPicker: lpLinkPicker,
|
|
40
40
|
onClose: onClose,
|
|
41
41
|
onEscapeCallback: onEscapeCallback,
|
|
42
42
|
onClickAwayCallback: onClickAwayCallback,
|
|
@@ -67,10 +67,10 @@ export class EditLinkToolbar extends React.Component {
|
|
|
67
67
|
url,
|
|
68
68
|
text,
|
|
69
69
|
view,
|
|
70
|
-
featureFlags,
|
|
71
70
|
onSubmit,
|
|
72
71
|
pluginInjectionApi,
|
|
73
|
-
forceFocusSelector
|
|
72
|
+
forceFocusSelector,
|
|
73
|
+
lpLinkPicker
|
|
74
74
|
} = this.props;
|
|
75
75
|
return /*#__PURE__*/React.createElement(HyperlinkAddToolbarWithState, {
|
|
76
76
|
pluginInjectionApi: pluginInjectionApi,
|
|
@@ -83,7 +83,7 @@ export class EditLinkToolbar extends React.Component {
|
|
|
83
83
|
// via the floating toolbar
|
|
84
84
|
,
|
|
85
85
|
invokeMethod: INPUT_METHOD.FLOATING_TB,
|
|
86
|
-
|
|
86
|
+
lpLinkPicker: lpLinkPicker,
|
|
87
87
|
onSubmit: (href, title, displayText, inputMethod, analytic) => {
|
|
88
88
|
this.hideLinkToolbar();
|
|
89
89
|
if (onSubmit) {
|
|
@@ -137,8 +137,8 @@ export const buildEditLinkToolbar = ({
|
|
|
137
137
|
providerFactory,
|
|
138
138
|
node,
|
|
139
139
|
linkPicker,
|
|
140
|
-
|
|
141
|
-
|
|
140
|
+
pluginInjectionApi,
|
|
141
|
+
lpLinkPicker
|
|
142
142
|
}) => {
|
|
143
143
|
return {
|
|
144
144
|
type: 'custom',
|
|
@@ -159,7 +159,7 @@ export const buildEditLinkToolbar = ({
|
|
|
159
159
|
url: displayInfo.url,
|
|
160
160
|
text: displayInfo.title || '',
|
|
161
161
|
node: node,
|
|
162
|
-
|
|
162
|
+
lpLinkPicker: lpLinkPicker,
|
|
163
163
|
forceFocusSelector: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar.actions) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.forceFocusSelector,
|
|
164
164
|
onSubmit: (newHref, newText, inputMethod, analytic) => {
|
|
165
165
|
const urlChanged = newHref !== displayInfo.url;
|
package/dist/esm/plugin.js
CHANGED
|
@@ -24,10 +24,9 @@ import LayoutButton from './ui/LayoutButton';
|
|
|
24
24
|
* from `@atlaskit/editor-core`.
|
|
25
25
|
*/
|
|
26
26
|
export var cardPlugin = function cardPlugin(_ref) {
|
|
27
|
-
var
|
|
27
|
+
var _options$lpLinkPicker;
|
|
28
28
|
var options = _ref.config,
|
|
29
29
|
api = _ref.api;
|
|
30
|
-
var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
|
|
31
30
|
var cardPluginEvents = createEventsQueue();
|
|
32
31
|
return {
|
|
33
32
|
name: 'card',
|
|
@@ -118,7 +117,7 @@ export var cardPlugin = function cardPlugin(_ref) {
|
|
|
118
117
|
setSelectedCardAppearance: setSelectedCardAppearance
|
|
119
118
|
},
|
|
120
119
|
pluginsOptions: {
|
|
121
|
-
floatingToolbar: floatingToolbar(options,
|
|
120
|
+
floatingToolbar: floatingToolbar(options, (_options$lpLinkPicker = options.lpLinkPicker) !== null && _options$lpLinkPicker !== void 0 ? _options$lpLinkPicker : false, options.platform, options.linkPicker, api),
|
|
122
121
|
quickInsert: function quickInsert(_ref4) {
|
|
123
122
|
var formatMessage = _ref4.formatMessage;
|
|
124
123
|
var quickInsertArray = [];
|
package/dist/esm/toolbar.js
CHANGED
|
@@ -86,7 +86,7 @@ export var openLinkSettings = function openLinkSettings(editorAnalyticsApi) {
|
|
|
86
86
|
return true;
|
|
87
87
|
};
|
|
88
88
|
};
|
|
89
|
-
export var floatingToolbar = function floatingToolbar(cardOptions,
|
|
89
|
+
export var floatingToolbar = function floatingToolbar(cardOptions, lpLinkPicker, platform, linkPickerOptions, pluginInjectionApi) {
|
|
90
90
|
return function (state, intl, providerFactory) {
|
|
91
91
|
var _state$schema$nodes = state.schema.nodes,
|
|
92
92
|
inlineCard = _state$schema$nodes.inlineCard,
|
|
@@ -110,7 +110,6 @@ export var floatingToolbar = function floatingToolbar(cardOptions, featureFlags,
|
|
|
110
110
|
|
|
111
111
|
// Applies padding override for when link picker is currently displayed
|
|
112
112
|
var className = pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar ? FLOATING_TOOLBAR_LINKPICKER_CLASSNAME : undefined;
|
|
113
|
-
var lpLinkPicker = featureFlags.lpLinkPicker;
|
|
114
113
|
var isLinkPickerEnabled = !!lpLinkPicker;
|
|
115
114
|
return _objectSpread(_objectSpread({
|
|
116
115
|
title: intl.formatMessage(messages.card),
|
|
@@ -128,7 +127,7 @@ export var floatingToolbar = function floatingToolbar(cardOptions, featureFlags,
|
|
|
128
127
|
}
|
|
129
128
|
return element;
|
|
130
129
|
},
|
|
131
|
-
items: generateToolbarItems(state,
|
|
130
|
+
items: generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, platform, linkPickerOptions, pluginInjectionApi),
|
|
132
131
|
scrollable: pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar ? false : true
|
|
133
132
|
}, editLinkToolbarConfig(Boolean(pluginState === null || pluginState === void 0 ? void 0 : pluginState.showLinkingToolbar), isLinkPickerEnabled));
|
|
134
133
|
};
|
|
@@ -170,7 +169,7 @@ var getToolbarViewedItem = function getToolbarViewedItem(url, display) {
|
|
|
170
169
|
}
|
|
171
170
|
}];
|
|
172
171
|
};
|
|
173
|
-
var generateToolbarItems = function generateToolbarItems(state,
|
|
172
|
+
var generateToolbarItems = function generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, platform, linkPicker, pluginInjectionApi) {
|
|
174
173
|
return function (node) {
|
|
175
174
|
var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs2;
|
|
176
175
|
var _titleUrlPairFromNode2 = titleUrlPairFromNode(node),
|
|
@@ -203,8 +202,8 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
|
|
|
203
202
|
providerFactory: providerFactory,
|
|
204
203
|
linkPicker: linkPicker,
|
|
205
204
|
node: node,
|
|
206
|
-
|
|
207
|
-
|
|
205
|
+
pluginInjectionApi: pluginInjectionApi,
|
|
206
|
+
lpLinkPicker: lpLinkPicker
|
|
208
207
|
})];
|
|
209
208
|
} else if (shouldRenderDatasourceToolbar) {
|
|
210
209
|
return getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, node.attrs.datasource.id, state);
|
|
@@ -26,7 +26,7 @@ export function HyperlinkAddToolbarWithState(_ref) {
|
|
|
26
26
|
view = _ref.view,
|
|
27
27
|
onCancel = _ref.onCancel,
|
|
28
28
|
invokeMethod = _ref.invokeMethod,
|
|
29
|
-
|
|
29
|
+
lpLinkPicker = _ref.lpLinkPicker,
|
|
30
30
|
onClose = _ref.onClose,
|
|
31
31
|
onEscapeCallback = _ref.onEscapeCallback,
|
|
32
32
|
onClickAwayCallback = _ref.onClickAwayCallback,
|
|
@@ -42,7 +42,7 @@ export function HyperlinkAddToolbarWithState(_ref) {
|
|
|
42
42
|
view: view,
|
|
43
43
|
onCancel: onCancel,
|
|
44
44
|
invokeMethod: invokeMethod,
|
|
45
|
-
|
|
45
|
+
lpLinkPicker: lpLinkPicker,
|
|
46
46
|
onClose: onClose,
|
|
47
47
|
onEscapeCallback: onEscapeCallback,
|
|
48
48
|
onClickAwayCallback: onClickAwayCallback,
|
|
@@ -86,10 +86,10 @@ export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
|
|
|
86
86
|
url = _this$props.url,
|
|
87
87
|
text = _this$props.text,
|
|
88
88
|
view = _this$props.view,
|
|
89
|
-
featureFlags = _this$props.featureFlags,
|
|
90
89
|
_onSubmit = _this$props.onSubmit,
|
|
91
90
|
pluginInjectionApi = _this$props.pluginInjectionApi,
|
|
92
|
-
forceFocusSelector = _this$props.forceFocusSelector
|
|
91
|
+
forceFocusSelector = _this$props.forceFocusSelector,
|
|
92
|
+
lpLinkPicker = _this$props.lpLinkPicker;
|
|
93
93
|
return /*#__PURE__*/React.createElement(HyperlinkAddToolbarWithState, {
|
|
94
94
|
pluginInjectionApi: pluginInjectionApi,
|
|
95
95
|
view: view,
|
|
@@ -101,7 +101,7 @@ export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
|
|
|
101
101
|
// via the floating toolbar
|
|
102
102
|
,
|
|
103
103
|
invokeMethod: INPUT_METHOD.FLOATING_TB,
|
|
104
|
-
|
|
104
|
+
lpLinkPicker: lpLinkPicker,
|
|
105
105
|
onSubmit: function onSubmit(href, title, displayText, inputMethod, analytic) {
|
|
106
106
|
_this.hideLinkToolbar();
|
|
107
107
|
if (_onSubmit) {
|
|
@@ -153,8 +153,8 @@ export var buildEditLinkToolbar = function buildEditLinkToolbar(_ref2) {
|
|
|
153
153
|
var providerFactory = _ref2.providerFactory,
|
|
154
154
|
node = _ref2.node,
|
|
155
155
|
linkPicker = _ref2.linkPicker,
|
|
156
|
-
|
|
157
|
-
|
|
156
|
+
pluginInjectionApi = _ref2.pluginInjectionApi,
|
|
157
|
+
lpLinkPicker = _ref2.lpLinkPicker;
|
|
158
158
|
return {
|
|
159
159
|
type: 'custom',
|
|
160
160
|
disableArrowNavigation: true,
|
|
@@ -174,7 +174,7 @@ export var buildEditLinkToolbar = function buildEditLinkToolbar(_ref2) {
|
|
|
174
174
|
url: displayInfo.url,
|
|
175
175
|
text: displayInfo.title || '',
|
|
176
176
|
node: node,
|
|
177
|
-
|
|
177
|
+
lpLinkPicker: lpLinkPicker,
|
|
178
178
|
forceFocusSelector: pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar.actions) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.forceFocusSelector,
|
|
179
179
|
onSubmit: function onSubmit(newHref, newText, inputMethod, analytic) {
|
|
180
180
|
var urlChanged = newHref !== displayInfo.url;
|
package/dist/types/toolbar.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
|
|
2
2
|
import type { CardOptions } from '@atlaskit/editor-common/card';
|
|
3
|
-
import type { Command, ExtractInjectionAPI,
|
|
3
|
+
import type { Command, ExtractInjectionAPI, FloatingToolbarHandler, LinkPickerOptions } from '@atlaskit/editor-common/types';
|
|
4
4
|
import type { CardPlatform } from '@atlaskit/smart-card';
|
|
5
5
|
import type { cardPlugin } from './index';
|
|
6
6
|
export declare const removeCard: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
|
|
7
7
|
export declare const visitCardLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
|
|
8
8
|
export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
|
|
9
|
-
export declare const floatingToolbar: (cardOptions: CardOptions,
|
|
9
|
+
export declare const floatingToolbar: (cardOptions: CardOptions, lpLinkPicker: boolean, platform?: CardPlatform, linkPickerOptions?: LinkPickerOptions, pluginInjectionApi?: ExtractInjectionAPI<typeof cardPlugin>) => FloatingToolbarHandler;
|
|
10
10
|
export declare const shouldRenderToolbarPulse: (embedEnabled: boolean, appearance: string, status: string, isDiscoverabilityEnabled: boolean) => boolean;
|
package/dist/types/types.d.ts
CHANGED
|
@@ -89,6 +89,7 @@ export type CardPluginOptions = CardOptions & {
|
|
|
89
89
|
fullWidthMode?: boolean;
|
|
90
90
|
linkPicker?: LinkPickerOptions;
|
|
91
91
|
cardPluginEvents?: EditorCardPluginEvents<CardPluginEvent>;
|
|
92
|
+
lpLinkPicker?: boolean;
|
|
92
93
|
};
|
|
93
94
|
export type SetProvider = {
|
|
94
95
|
type: 'SET_PROVIDER';
|
|
@@ -3,7 +3,7 @@ import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
|
|
|
3
3
|
import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
|
|
4
4
|
import type { HyperlinkAddToolbarProps } from '@atlaskit/editor-common/link';
|
|
5
5
|
import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
|
|
6
|
-
import type { Command, ExtractInjectionAPI,
|
|
6
|
+
import type { Command, ExtractInjectionAPI, FloatingToolbarConfig, FloatingToolbarItem, LinkInputType, LinkPickerOptions } from '@atlaskit/editor-common/types';
|
|
7
7
|
import type { ForceFocusSelector } from '@atlaskit/editor-plugin-floating-toolbar';
|
|
8
8
|
import type { Node } from '@atlaskit/editor-prosemirror/model';
|
|
9
9
|
import type { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
@@ -19,10 +19,10 @@ export type EditLinkToolbarProps = InjectionAPI & {
|
|
|
19
19
|
node: Node;
|
|
20
20
|
onSubmit?: (href: string, text?: string, inputMethod?: LinkInputType, analytic?: UIAnalyticsEvent | null | undefined) => void;
|
|
21
21
|
linkPickerOptions?: LinkPickerOptions;
|
|
22
|
-
featureFlags: FeatureFlags;
|
|
23
22
|
forceFocusSelector: ForceFocusSelector | undefined;
|
|
23
|
+
lpLinkPicker: boolean;
|
|
24
24
|
};
|
|
25
|
-
export declare function HyperlinkAddToolbarWithState({ linkPickerOptions, onSubmit, displayText, displayUrl, providerFactory, view, onCancel, invokeMethod,
|
|
25
|
+
export declare function HyperlinkAddToolbarWithState({ linkPickerOptions, onSubmit, displayText, displayUrl, providerFactory, view, onCancel, invokeMethod, lpLinkPicker, onClose, onEscapeCallback, onClickAwayCallback, pluginInjectionApi, }: HyperlinkAddToolbarProps & InjectionAPI): JSX.Element;
|
|
26
26
|
export declare class EditLinkToolbar extends React.Component<EditLinkToolbarProps> {
|
|
27
27
|
componentDidUpdate(prevProps: EditLinkToolbarProps): void;
|
|
28
28
|
componentWillUnmount(): void;
|
|
@@ -30,12 +30,12 @@ export declare class EditLinkToolbar extends React.Component<EditLinkToolbarProp
|
|
|
30
30
|
render(): JSX.Element;
|
|
31
31
|
}
|
|
32
32
|
export declare const editLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
|
|
33
|
-
export declare const buildEditLinkToolbar: ({ providerFactory, node, linkPicker,
|
|
33
|
+
export declare const buildEditLinkToolbar: ({ providerFactory, node, linkPicker, pluginInjectionApi, lpLinkPicker, }: {
|
|
34
34
|
providerFactory: ProviderFactory;
|
|
35
35
|
node: Node;
|
|
36
36
|
linkPicker?: LinkPickerOptions | undefined;
|
|
37
|
-
featureFlags: FeatureFlags;
|
|
38
37
|
pluginInjectionApi: ExtractInjectionAPI<typeof cardPlugin> | undefined;
|
|
38
|
+
lpLinkPicker: boolean;
|
|
39
39
|
}) => FloatingToolbarItem<Command>;
|
|
40
|
-
export declare const editLinkToolbarConfig: (showLinkingToolbar: boolean, lpLinkPicker
|
|
40
|
+
export declare const editLinkToolbarConfig: (showLinkingToolbar: boolean, lpLinkPicker?: boolean) => Partial<FloatingToolbarConfig>;
|
|
41
41
|
export {};
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
|
|
2
2
|
import type { CardOptions } from '@atlaskit/editor-common/card';
|
|
3
|
-
import type { Command, ExtractInjectionAPI,
|
|
3
|
+
import type { Command, ExtractInjectionAPI, FloatingToolbarHandler, LinkPickerOptions } from '@atlaskit/editor-common/types';
|
|
4
4
|
import type { CardPlatform } from '@atlaskit/smart-card';
|
|
5
5
|
import type { cardPlugin } from './index';
|
|
6
6
|
export declare const removeCard: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
|
|
7
7
|
export declare const visitCardLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
|
|
8
8
|
export declare const openLinkSettings: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
|
|
9
|
-
export declare const floatingToolbar: (cardOptions: CardOptions,
|
|
9
|
+
export declare const floatingToolbar: (cardOptions: CardOptions, lpLinkPicker: boolean, platform?: CardPlatform, linkPickerOptions?: LinkPickerOptions, pluginInjectionApi?: ExtractInjectionAPI<typeof cardPlugin>) => FloatingToolbarHandler;
|
|
10
10
|
export declare const shouldRenderToolbarPulse: (embedEnabled: boolean, appearance: string, status: string, isDiscoverabilityEnabled: boolean) => boolean;
|
|
@@ -89,6 +89,7 @@ export type CardPluginOptions = CardOptions & {
|
|
|
89
89
|
fullWidthMode?: boolean;
|
|
90
90
|
linkPicker?: LinkPickerOptions;
|
|
91
91
|
cardPluginEvents?: EditorCardPluginEvents<CardPluginEvent>;
|
|
92
|
+
lpLinkPicker?: boolean;
|
|
92
93
|
};
|
|
93
94
|
export type SetProvider = {
|
|
94
95
|
type: 'SET_PROVIDER';
|
|
@@ -3,7 +3,7 @@ import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
|
|
|
3
3
|
import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
|
|
4
4
|
import type { HyperlinkAddToolbarProps } from '@atlaskit/editor-common/link';
|
|
5
5
|
import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
|
|
6
|
-
import type { Command, ExtractInjectionAPI,
|
|
6
|
+
import type { Command, ExtractInjectionAPI, FloatingToolbarConfig, FloatingToolbarItem, LinkInputType, LinkPickerOptions } from '@atlaskit/editor-common/types';
|
|
7
7
|
import type { ForceFocusSelector } from '@atlaskit/editor-plugin-floating-toolbar';
|
|
8
8
|
import type { Node } from '@atlaskit/editor-prosemirror/model';
|
|
9
9
|
import type { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
@@ -19,10 +19,10 @@ export type EditLinkToolbarProps = InjectionAPI & {
|
|
|
19
19
|
node: Node;
|
|
20
20
|
onSubmit?: (href: string, text?: string, inputMethod?: LinkInputType, analytic?: UIAnalyticsEvent | null | undefined) => void;
|
|
21
21
|
linkPickerOptions?: LinkPickerOptions;
|
|
22
|
-
featureFlags: FeatureFlags;
|
|
23
22
|
forceFocusSelector: ForceFocusSelector | undefined;
|
|
23
|
+
lpLinkPicker: boolean;
|
|
24
24
|
};
|
|
25
|
-
export declare function HyperlinkAddToolbarWithState({ linkPickerOptions, onSubmit, displayText, displayUrl, providerFactory, view, onCancel, invokeMethod,
|
|
25
|
+
export declare function HyperlinkAddToolbarWithState({ linkPickerOptions, onSubmit, displayText, displayUrl, providerFactory, view, onCancel, invokeMethod, lpLinkPicker, onClose, onEscapeCallback, onClickAwayCallback, pluginInjectionApi, }: HyperlinkAddToolbarProps & InjectionAPI): JSX.Element;
|
|
26
26
|
export declare class EditLinkToolbar extends React.Component<EditLinkToolbarProps> {
|
|
27
27
|
componentDidUpdate(prevProps: EditLinkToolbarProps): void;
|
|
28
28
|
componentWillUnmount(): void;
|
|
@@ -30,12 +30,12 @@ export declare class EditLinkToolbar extends React.Component<EditLinkToolbarProp
|
|
|
30
30
|
render(): JSX.Element;
|
|
31
31
|
}
|
|
32
32
|
export declare const editLink: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
|
|
33
|
-
export declare const buildEditLinkToolbar: ({ providerFactory, node, linkPicker,
|
|
33
|
+
export declare const buildEditLinkToolbar: ({ providerFactory, node, linkPicker, pluginInjectionApi, lpLinkPicker, }: {
|
|
34
34
|
providerFactory: ProviderFactory;
|
|
35
35
|
node: Node;
|
|
36
36
|
linkPicker?: LinkPickerOptions | undefined;
|
|
37
|
-
featureFlags: FeatureFlags;
|
|
38
37
|
pluginInjectionApi: ExtractInjectionAPI<typeof cardPlugin> | undefined;
|
|
38
|
+
lpLinkPicker: boolean;
|
|
39
39
|
}) => FloatingToolbarItem<Command>;
|
|
40
|
-
export declare const editLinkToolbarConfig: (showLinkingToolbar: boolean, lpLinkPicker
|
|
40
|
+
export declare const editLinkToolbarConfig: (showLinkingToolbar: boolean, lpLinkPicker?: boolean) => Partial<FloatingToolbarConfig>;
|
|
41
41
|
export {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-card",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.16.0",
|
|
4
4
|
"description": "Card plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -32,16 +32,16 @@
|
|
|
32
32
|
".": "./src/index.ts"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@atlaskit/adf-schema": "^35.
|
|
35
|
+
"@atlaskit/adf-schema": "^35.3.0",
|
|
36
36
|
"@atlaskit/analytics-next": "^9.1.0",
|
|
37
|
-
"@atlaskit/custom-steps": "^0.0.
|
|
38
|
-
"@atlaskit/editor-common": "^76.
|
|
37
|
+
"@atlaskit/custom-steps": "^0.0.11",
|
|
38
|
+
"@atlaskit/editor-common": "^76.36.0",
|
|
39
39
|
"@atlaskit/editor-plugin-analytics": "^0.4.0",
|
|
40
40
|
"@atlaskit/editor-plugin-decorations": "^0.2.0",
|
|
41
41
|
"@atlaskit/editor-plugin-feature-flags": "^1.0.0",
|
|
42
42
|
"@atlaskit/editor-plugin-floating-toolbar": "^0.7.0",
|
|
43
43
|
"@atlaskit/editor-plugin-grid": "^0.3.0",
|
|
44
|
-
"@atlaskit/editor-plugin-hyperlink": "^0.
|
|
44
|
+
"@atlaskit/editor-plugin-hyperlink": "^0.7.0",
|
|
45
45
|
"@atlaskit/editor-plugin-width": "^0.2.0",
|
|
46
46
|
"@atlaskit/editor-prosemirror": "1.1.0",
|
|
47
47
|
"@atlaskit/editor-shared-styles": "^2.9.0",
|
|
@@ -53,8 +53,8 @@
|
|
|
53
53
|
"@atlaskit/linking-common": "^5.3.0",
|
|
54
54
|
"@atlaskit/linking-types": "^8.5.0",
|
|
55
55
|
"@atlaskit/platform-feature-flags": "^0.2.0",
|
|
56
|
-
"@atlaskit/primitives": "^1.
|
|
57
|
-
"@atlaskit/smart-card": "^26.
|
|
56
|
+
"@atlaskit/primitives": "^1.17.0",
|
|
57
|
+
"@atlaskit/smart-card": "^26.44.0",
|
|
58
58
|
"@atlaskit/theme": "^12.6.0",
|
|
59
59
|
"@atlaskit/tokens": "^1.33.0",
|
|
60
60
|
"@babel/runtime": "^7.0.0",
|
|
@@ -75,7 +75,6 @@
|
|
|
75
75
|
"@atlaskit/ssr": "*",
|
|
76
76
|
"@atlaskit/util-data-test": "^17.8.0",
|
|
77
77
|
"@atlaskit/visual-regression": "*",
|
|
78
|
-
"@atlaskit/webdriver-runner": "*",
|
|
79
78
|
"@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0",
|
|
80
79
|
"@atlassian/feature-flags-test-utils": "*",
|
|
81
80
|
"@emotion/jest": "^11.8.0",
|