@atlaskit/editor-plugin-card 4.5.10 → 4.5.12
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 +14 -0
- package/dist/cjs/ui/AwarenessWrapper/index.js +1 -0
- package/dist/cjs/ui/InlineCardOverlay/index.js +1 -0
- package/dist/cjs/ui/ResizableEmbedCard.js +1 -1
- package/dist/cjs/ui/toolbar.js +3 -1
- package/dist/es2019/nodeviews/embedCard.js +2 -2
- package/dist/es2019/pm-plugins/doc.js +2 -2
- package/dist/es2019/pm-plugins/util/resolve.js +1 -1
- package/dist/es2019/ui/AwarenessWrapper/index.js +1 -0
- package/dist/es2019/ui/InlineCardOverlay/index.js +1 -0
- package/dist/es2019/ui/ResizableEmbedCard.js +2 -2
- package/dist/es2019/ui/toolbar.js +3 -1
- package/dist/esm/ui/AwarenessWrapper/index.js +1 -0
- package/dist/esm/ui/InlineCardOverlay/index.js +1 -0
- package/dist/esm/ui/ResizableEmbedCard.js +1 -1
- package/dist/esm/ui/toolbar.js +3 -1
- package/dist/types/cardPluginType.d.ts +3 -1
- package/dist/types-ts4.5/cardPluginType.d.ts +3 -1
- package/package.json +6 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-card
|
|
2
2
|
|
|
3
|
+
## 4.5.12
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#100134](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/100134)
|
|
8
|
+
[`d79324a9356bb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d79324a9356bb) -
|
|
9
|
+
ED-26133: disables smart link comments when browser offline
|
|
10
|
+
|
|
11
|
+
## 4.5.11
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- Updated dependencies
|
|
16
|
+
|
|
3
17
|
## 4.5.10
|
|
4
18
|
|
|
5
19
|
### Patch Changes
|
|
@@ -26,6 +26,7 @@ var _Pulse = require("../Pulse");
|
|
|
26
26
|
var loaderWrapperStyles = (0, _react2.css)({
|
|
27
27
|
// eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
28
28
|
'.loader-wrapper': {
|
|
29
|
+
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
29
30
|
lineHeight: 'normal'
|
|
30
31
|
}
|
|
31
32
|
});
|
|
@@ -45,6 +45,7 @@ var getGradientWithColor = function getGradientWithColor(color) {
|
|
|
45
45
|
};
|
|
46
46
|
var containerStyles = (0, _react2.css)({
|
|
47
47
|
position: 'relative',
|
|
48
|
+
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
48
49
|
lineHeight: 'normal',
|
|
49
50
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
50
51
|
':active': (0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(ICON_AND_LABEL_CLASSNAME), {
|
|
@@ -317,7 +317,7 @@ var ResizableEmbedCard = exports.default = /*#__PURE__*/function (_React$Compone
|
|
|
317
317
|
/* Fixes extra padding problem in Firefox */
|
|
318
318
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
319
319
|
fontSize: 0,
|
|
320
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
320
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/design-system/use-tokens-typography -- Ignored via go/DSP-18766
|
|
321
321
|
lineHeight: 0
|
|
322
322
|
}, heightDefiningStyles)
|
|
323
323
|
});
|
package/dist/cjs/ui/toolbar.js
CHANGED
|
@@ -262,6 +262,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
|
|
|
262
262
|
} else if (shouldRenderDatasourceToolbar) {
|
|
263
263
|
return getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, node.attrs.datasource.id, state, cardOptions, currentAppearance);
|
|
264
264
|
} else {
|
|
265
|
+
var _pluginInjectionApi$c;
|
|
265
266
|
var inlineCard = state.schema.nodes.inlineCard;
|
|
266
267
|
var editItems = cardOptions.allowDatasource ? [{
|
|
267
268
|
type: 'custom',
|
|
@@ -296,7 +297,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
|
|
|
296
297
|
testId: 'inline-card-toolbar-comment-button',
|
|
297
298
|
iconFallback: _comment2.default,
|
|
298
299
|
title: intl.formatMessage(_messages.annotationMessages.createComment),
|
|
299
|
-
onClick: onCommentButtonClick
|
|
300
|
+
onClick: onCommentButtonClick,
|
|
301
|
+
disabled: (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.connectivity) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.sharedState) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.currentState()) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.mode) === 'offline'
|
|
300
302
|
}, {
|
|
301
303
|
type: 'separator'
|
|
302
304
|
}] : [];
|
|
@@ -265,7 +265,7 @@ export class EmbedCardComponent extends React.PureComponent {
|
|
|
265
265
|
actionOptions,
|
|
266
266
|
onClick
|
|
267
267
|
} = this.props;
|
|
268
|
-
|
|
268
|
+
const {
|
|
269
269
|
url,
|
|
270
270
|
width: pctWidth,
|
|
271
271
|
layout,
|
|
@@ -280,7 +280,7 @@ export class EmbedCardComponent extends React.PureComponent {
|
|
|
280
280
|
|
|
281
281
|
// We don't want to use `originalHeight` when `originalWidth` also present,
|
|
282
282
|
// since `heightAlone` is defined only when just height is available.
|
|
283
|
-
|
|
283
|
+
const heightAlone = liveHeight !== null && liveHeight !== void 0 ? liveHeight : !originalWidth && originalHeight || undefined;
|
|
284
284
|
const aspectRatio = !heightAlone && (
|
|
285
285
|
// No need getting aspectRatio if heightAlone defined already
|
|
286
286
|
initialAspectRatio ||
|
|
@@ -72,7 +72,7 @@ export const replaceQueuedUrlWithCard = (url, cardData, analyticsAction, editorA
|
|
|
72
72
|
// try to transform response to ADF
|
|
73
73
|
const schema = editorState.schema;
|
|
74
74
|
const cardAdf = processRawValue(schema, cardData);
|
|
75
|
-
|
|
75
|
+
const tr = editorState.tr;
|
|
76
76
|
if (cardAdf) {
|
|
77
77
|
// Should prevent any other node than cards? [inlineCard, blockCard].includes(cardAdf.type)
|
|
78
78
|
const nodeContexts = requests.map(request => replaceLinksToCards(tr, cardAdf, schema, request)).filter(context => !!context); // context exist
|
|
@@ -193,7 +193,7 @@ export const queueCardFromChangedTr = (state, tr, source, analyticsAction, norma
|
|
|
193
193
|
const {
|
|
194
194
|
link
|
|
195
195
|
} = schema.marks;
|
|
196
|
-
|
|
196
|
+
const requests = [];
|
|
197
197
|
nodesBetweenChanged(tr, (node, pos) => {
|
|
198
198
|
if (!node.isText) {
|
|
199
199
|
return true;
|
|
@@ -38,7 +38,7 @@ export const resolveWithProvider = (view, provider, request, options, editorAnal
|
|
|
38
38
|
const isEmbedFriendlyLocation = fg('hardcoded-embeds-only-on-new-line') ? isFreshlyPastedOnNewLine(view) : true;
|
|
39
39
|
|
|
40
40
|
// When user manually changes appearance from blue link to smart link, we should respect that,
|
|
41
|
-
|
|
41
|
+
const shouldForceAppearance =
|
|
42
42
|
// This flag is set to true only in one place atm:
|
|
43
43
|
// packages/editor/editor-core/src/plugins/card/pm-plugins/doc.ts @ convertHyperlinkToSmartCard
|
|
44
44
|
// Which is used when user switching from URL to smart link appearance.
|
|
@@ -17,6 +17,7 @@ import { DiscoveryPulse } from '../Pulse';
|
|
|
17
17
|
const loaderWrapperStyles = css({
|
|
18
18
|
// eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
19
19
|
'.loader-wrapper': {
|
|
20
|
+
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
20
21
|
lineHeight: 'normal'
|
|
21
22
|
}
|
|
22
23
|
});
|
|
@@ -32,6 +32,7 @@ const getGradientWithColor = color => {
|
|
|
32
32
|
};
|
|
33
33
|
const containerStyles = css({
|
|
34
34
|
position: 'relative',
|
|
35
|
+
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
35
36
|
lineHeight: 'normal',
|
|
36
37
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
37
38
|
':active': {
|
|
@@ -223,7 +223,7 @@ export default class ResizableEmbedCard extends React.Component {
|
|
|
223
223
|
// full width
|
|
224
224
|
snapTargets.push(lineLength - offsetLeft);
|
|
225
225
|
const minimumWidth = calcPxFromColumns(this.wrappedLayout || this.insideInlineLike ? 1 : 2, lineLength, this.props.gridSize);
|
|
226
|
-
|
|
226
|
+
const snapPoints = snapTargets.filter(width => width >= minimumWidth);
|
|
227
227
|
const $pos = this.$pos;
|
|
228
228
|
if (!$pos) {
|
|
229
229
|
return snapPoints;
|
|
@@ -298,7 +298,7 @@ export default class ResizableEmbedCard extends React.Component {
|
|
|
298
298
|
/* Fixes extra padding problem in Firefox */
|
|
299
299
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
300
300
|
fontSize: 0,
|
|
301
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
301
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/design-system/use-tokens-typography -- Ignored via go/DSP-18766
|
|
302
302
|
lineHeight: 0,
|
|
303
303
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
304
304
|
...heightDefiningStyles
|
|
@@ -254,6 +254,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
|
|
|
254
254
|
} else if (shouldRenderDatasourceToolbar) {
|
|
255
255
|
return getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, node.attrs.datasource.id, state, cardOptions, currentAppearance);
|
|
256
256
|
} else {
|
|
257
|
+
var _pluginInjectionApi$c, _pluginInjectionApi$c2, _pluginInjectionApi$c3;
|
|
257
258
|
const {
|
|
258
259
|
inlineCard
|
|
259
260
|
} = state.schema.nodes;
|
|
@@ -288,7 +289,8 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
|
|
|
288
289
|
testId: 'inline-card-toolbar-comment-button',
|
|
289
290
|
iconFallback: LegacyCommentIcon,
|
|
290
291
|
title: intl.formatMessage(annotationMessages.createComment),
|
|
291
|
-
onClick: onCommentButtonClick
|
|
292
|
+
onClick: onCommentButtonClick,
|
|
293
|
+
disabled: (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.connectivity) === null || _pluginInjectionApi$c === void 0 ? void 0 : (_pluginInjectionApi$c2 = _pluginInjectionApi$c.sharedState) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : (_pluginInjectionApi$c3 = _pluginInjectionApi$c2.currentState()) === null || _pluginInjectionApi$c3 === void 0 ? void 0 : _pluginInjectionApi$c3.mode) === 'offline'
|
|
292
294
|
}, {
|
|
293
295
|
type: 'separator'
|
|
294
296
|
}] : [];
|
|
@@ -18,6 +18,7 @@ import { DiscoveryPulse } from '../Pulse';
|
|
|
18
18
|
var loaderWrapperStyles = css({
|
|
19
19
|
// eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
20
20
|
'.loader-wrapper': {
|
|
21
|
+
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
21
22
|
lineHeight: 'normal'
|
|
22
23
|
}
|
|
23
24
|
});
|
|
@@ -36,6 +36,7 @@ var getGradientWithColor = function getGradientWithColor(color) {
|
|
|
36
36
|
};
|
|
37
37
|
var containerStyles = css({
|
|
38
38
|
position: 'relative',
|
|
39
|
+
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
39
40
|
lineHeight: 'normal',
|
|
40
41
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
41
42
|
':active': _defineProperty(_defineProperty({}, ".".concat(ICON_AND_LABEL_CLASSNAME), {
|
|
@@ -313,7 +313,7 @@ var ResizableEmbedCard = /*#__PURE__*/function (_React$Component) {
|
|
|
313
313
|
/* Fixes extra padding problem in Firefox */
|
|
314
314
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
315
315
|
fontSize: 0,
|
|
316
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
316
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/design-system/use-tokens-typography -- Ignored via go/DSP-18766
|
|
317
317
|
lineHeight: 0
|
|
318
318
|
}, heightDefiningStyles)
|
|
319
319
|
});
|
package/dist/esm/ui/toolbar.js
CHANGED
|
@@ -252,6 +252,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
|
|
|
252
252
|
} else if (shouldRenderDatasourceToolbar) {
|
|
253
253
|
return getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, node.attrs.datasource.id, state, cardOptions, currentAppearance);
|
|
254
254
|
} else {
|
|
255
|
+
var _pluginInjectionApi$c;
|
|
255
256
|
var inlineCard = state.schema.nodes.inlineCard;
|
|
256
257
|
var editItems = cardOptions.allowDatasource ? [{
|
|
257
258
|
type: 'custom',
|
|
@@ -286,7 +287,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
|
|
|
286
287
|
testId: 'inline-card-toolbar-comment-button',
|
|
287
288
|
iconFallback: LegacyCommentIcon,
|
|
288
289
|
title: intl.formatMessage(annotationMessages.createComment),
|
|
289
|
-
onClick: onCommentButtonClick
|
|
290
|
+
onClick: onCommentButtonClick,
|
|
291
|
+
disabled: (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.connectivity) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.sharedState) === null || _pluginInjectionApi$c === void 0 || (_pluginInjectionApi$c = _pluginInjectionApi$c.currentState()) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.mode) === 'offline'
|
|
290
292
|
}, {
|
|
291
293
|
type: 'separator'
|
|
292
294
|
}] : [];
|
|
@@ -3,6 +3,7 @@ import type { CardPluginActions } from '@atlaskit/editor-common/card';
|
|
|
3
3
|
import type { NextEditorPlugin, OptionalPlugin, Command } from '@atlaskit/editor-common/types';
|
|
4
4
|
import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
|
|
5
5
|
import type { InlineCommentPluginState } from '@atlaskit/editor-plugin-annotation';
|
|
6
|
+
import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity';
|
|
6
7
|
import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
|
|
7
8
|
import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
|
|
8
9
|
import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
|
|
@@ -30,7 +31,8 @@ export type CardPlugin = NextEditorPlugin<'card', {
|
|
|
30
31
|
FloatingToolbarPlugin,
|
|
31
32
|
OptionalPlugin<EditorDisabledPlugin>,
|
|
32
33
|
OptionalPlugin<SelectionPlugin>,
|
|
33
|
-
OptionalPlugin<DummyAnnotationPlugin
|
|
34
|
+
OptionalPlugin<DummyAnnotationPlugin>,
|
|
35
|
+
OptionalPlugin<ConnectivityPlugin>
|
|
34
36
|
];
|
|
35
37
|
sharedState: CardPluginState | null;
|
|
36
38
|
actions: CardPluginActions;
|
|
@@ -3,6 +3,7 @@ import type { CardPluginActions } from '@atlaskit/editor-common/card';
|
|
|
3
3
|
import type { NextEditorPlugin, OptionalPlugin, Command } from '@atlaskit/editor-common/types';
|
|
4
4
|
import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
|
|
5
5
|
import type { InlineCommentPluginState } from '@atlaskit/editor-plugin-annotation';
|
|
6
|
+
import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity';
|
|
6
7
|
import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
|
|
7
8
|
import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
|
|
8
9
|
import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
|
|
@@ -30,7 +31,8 @@ export type CardPlugin = NextEditorPlugin<'card', {
|
|
|
30
31
|
FloatingToolbarPlugin,
|
|
31
32
|
OptionalPlugin<EditorDisabledPlugin>,
|
|
32
33
|
OptionalPlugin<SelectionPlugin>,
|
|
33
|
-
OptionalPlugin<DummyAnnotationPlugin
|
|
34
|
+
OptionalPlugin<DummyAnnotationPlugin>,
|
|
35
|
+
OptionalPlugin<ConnectivityPlugin>
|
|
34
36
|
];
|
|
35
37
|
sharedState: CardPluginState | null;
|
|
36
38
|
actions: CardPluginActions;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-card",
|
|
3
|
-
"version": "4.5.
|
|
3
|
+
"version": "4.5.12",
|
|
4
4
|
"description": "Card plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -34,8 +34,9 @@
|
|
|
34
34
|
"@atlaskit/adf-schema": "^46.1.0",
|
|
35
35
|
"@atlaskit/analytics-next": "^10.2.0",
|
|
36
36
|
"@atlaskit/custom-steps": "^0.9.0",
|
|
37
|
-
"@atlaskit/editor-common": "^
|
|
37
|
+
"@atlaskit/editor-common": "^98.2.0",
|
|
38
38
|
"@atlaskit/editor-plugin-analytics": "^1.10.0",
|
|
39
|
+
"@atlaskit/editor-plugin-connectivity": "^1.1.0",
|
|
39
40
|
"@atlaskit/editor-plugin-decorations": "^1.3.0",
|
|
40
41
|
"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
|
|
41
42
|
"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
|
|
@@ -45,7 +46,7 @@
|
|
|
45
46
|
"@atlaskit/editor-plugin-width": "^2.0.0",
|
|
46
47
|
"@atlaskit/editor-prosemirror": "6.2.1",
|
|
47
48
|
"@atlaskit/editor-shared-styles": "^3.2.0",
|
|
48
|
-
"@atlaskit/frontend-utilities": "^2.
|
|
49
|
+
"@atlaskit/frontend-utilities": "^2.8.0",
|
|
49
50
|
"@atlaskit/icon": "^23.1.0",
|
|
50
51
|
"@atlaskit/link-analytics": "^8.6.0",
|
|
51
52
|
"@atlaskit/link-client-extension": "^3.0.0",
|
|
@@ -55,9 +56,9 @@
|
|
|
55
56
|
"@atlaskit/menu": "2.13.7",
|
|
56
57
|
"@atlaskit/platform-feature-flags": "^0.3.0",
|
|
57
58
|
"@atlaskit/primitives": "^13.3.0",
|
|
58
|
-
"@atlaskit/smart-card": "^33.
|
|
59
|
+
"@atlaskit/smart-card": "^33.4.0",
|
|
59
60
|
"@atlaskit/theme": "^14.0.0",
|
|
60
|
-
"@atlaskit/tmp-editor-statsig": "^2.
|
|
61
|
+
"@atlaskit/tmp-editor-statsig": "^2.31.0",
|
|
61
62
|
"@atlaskit/tokens": "^2.5.0",
|
|
62
63
|
"@babel/runtime": "^7.0.0",
|
|
63
64
|
"@emotion/react": "^11.7.1",
|