@atlaskit/renderer 81.1.1 → 83.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 +72 -0
- package/dist/cjs/react/index.js +40 -12
- package/dist/cjs/react/marks/code.js +26 -4
- package/dist/cjs/react/marks/fragment.js +21 -0
- package/dist/cjs/react/marks/index.js +10 -1
- package/dist/cjs/react/nodes/codeBlock.js +17 -3
- package/dist/cjs/react/nodes/heading-anchor.js +1 -2
- package/dist/cjs/react/nodes/heading.js +5 -9
- package/dist/cjs/react/nodes/index.js +15 -1
- package/dist/cjs/react/nodes/media.js +4 -2
- package/dist/cjs/react/nodes/mediaInline.js +104 -0
- package/dist/cjs/react/nodes/panel.js +5 -7
- package/dist/cjs/react/nodes/text-wrapper.js +5 -6
- package/dist/cjs/ui/MediaCard.js +11 -5
- package/dist/cjs/ui/Renderer/index.js +4 -4
- package/dist/cjs/ui/Renderer/style.js +5 -5
- package/dist/cjs/ui/SortingIcon.js +1 -1
- package/dist/cjs/ui/annotations/draft/component.js +6 -6
- package/dist/cjs/ui/annotations/hooks/use-events.js +3 -1
- package/dist/cjs/version.json +1 -1
- package/dist/es2019/react/index.js +37 -8
- package/dist/es2019/react/marks/code.js +15 -3
- package/dist/es2019/react/marks/fragment.js +10 -0
- package/dist/es2019/react/marks/index.js +4 -2
- package/dist/es2019/react/nodes/codeBlock.js +13 -3
- package/dist/es2019/react/nodes/heading-anchor.js +1 -2
- package/dist/es2019/react/nodes/heading.js +5 -8
- package/dist/es2019/react/nodes/index.js +8 -1
- package/dist/es2019/react/nodes/media.js +4 -2
- package/dist/es2019/react/nodes/mediaInline.js +53 -0
- package/dist/es2019/react/nodes/panel.js +6 -7
- package/dist/es2019/react/nodes/text-wrapper.js +7 -6
- package/dist/es2019/ui/MediaCard.js +11 -5
- package/dist/es2019/ui/Renderer/index.js +4 -4
- package/dist/es2019/ui/Renderer/style.js +48 -82
- package/dist/es2019/ui/SortingIcon.js +1 -1
- package/dist/es2019/ui/annotations/draft/component.js +6 -6
- package/dist/es2019/ui/annotations/hooks/use-events.js +3 -1
- package/dist/es2019/version.json +1 -1
- package/dist/esm/react/index.js +39 -12
- package/dist/esm/react/marks/code.js +15 -3
- package/dist/esm/react/marks/fragment.js +10 -0
- package/dist/esm/react/marks/index.js +4 -2
- package/dist/esm/react/nodes/codeBlock.js +13 -3
- package/dist/esm/react/nodes/heading-anchor.js +1 -2
- package/dist/esm/react/nodes/heading.js +5 -8
- package/dist/esm/react/nodes/index.js +14 -1
- package/dist/esm/react/nodes/media.js +4 -2
- package/dist/esm/react/nodes/mediaInline.js +80 -0
- package/dist/esm/react/nodes/panel.js +6 -7
- package/dist/esm/react/nodes/text-wrapper.js +7 -6
- package/dist/esm/ui/MediaCard.js +11 -5
- package/dist/esm/ui/Renderer/index.js +4 -4
- package/dist/esm/ui/Renderer/style.js +5 -6
- package/dist/esm/ui/SortingIcon.js +1 -1
- package/dist/esm/ui/annotations/draft/component.js +6 -6
- package/dist/esm/ui/annotations/hooks/use-events.js +3 -1
- package/dist/esm/version.json +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/react/index.d.ts +1 -0
- package/dist/types/react/marks/code.d.ts +15 -1
- package/dist/types/react/marks/fragment.d.ts +3 -0
- package/dist/types/react/marks/index.d.ts +2 -1
- package/dist/types/react/nodes/codeBlock.d.ts +4 -3
- package/dist/types/react/nodes/index.d.ts +8 -7
- package/dist/types/react/nodes/mediaInline.d.ts +17 -0
- package/dist/types/react/nodes/text-wrapper.d.ts +2 -3
- package/dist/types/renderer-context.d.ts +3 -1
- package/dist/types/types/mediaOptions.d.ts +7 -1
- package/dist/types/ui/MediaCard.d.ts +2 -0
- package/dist/types/ui/annotations/draft/component.d.ts +1 -1
- package/dist/types/ui/renderer-props.d.ts +1 -1
- package/package.json +22 -23
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,77 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 83.0.0
|
|
4
|
+
|
|
5
|
+
### Major Changes
|
|
6
|
+
|
|
7
|
+
- [`0cf5fa82add`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0cf5fa82add) - CETI-20 Rename custom panel FF from `UNSAFE_allowCustomPanel` to `allowCustomPanel`
|
|
8
|
+
|
|
9
|
+
### Minor Changes
|
|
10
|
+
|
|
11
|
+
- [`c890a025f6c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c890a025f6c) - Fix annotations state from being set to null when adding a new inline comment
|
|
12
|
+
- [`23514411f27`](https://bitbucket.org/atlassian/atlassian-frontend/commits/23514411f27) - CETI-134 added support to render dark colors for the custom panels in the dark mode
|
|
13
|
+
- [`8bbb96540ea`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8bbb96540ea) - Add "fragment" mark to stage0 ADF schema
|
|
14
|
+
- [`a3737a9b3aa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a3737a9b3aa) - CETI-64 Updating the dark mode colors for the standard panels
|
|
15
|
+
- [`d4643be4f2d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d4643be4f2d) - [ux] AK-551 Add focus outline on code block copy button
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- [`c6feed82071`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c6feed82071) - ED-11632: Bump prosemirror packages;
|
|
20
|
+
|
|
21
|
+
- prosmirror-commands 1.1.4 -> 1.1.11,
|
|
22
|
+
- prosemirror-model 1.11.0 -> 1.14.3,
|
|
23
|
+
- prosemirror-state 1.3.3 -> 1.3.4,
|
|
24
|
+
- prosemirror-transform 1.2.8 -> 1.3.2,
|
|
25
|
+
- prosemirror-view 1.15.4 + 1.18.8 -> 1.20.2.
|
|
26
|
+
|
|
27
|
+
- [`fc70978492a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fc70978492a) - Using type for SSR prop to reduce dependency on media-common
|
|
28
|
+
- [`e741804b52a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e741804b52a) - Fixed media nodes not being built synchronously on SSR
|
|
29
|
+
- [`dd7db18ab6a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/dd7db18ab6a) - ED-13854 Replace url-parser library with native function
|
|
30
|
+
- [`f461edcfd05`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f461edcfd05) - Update CardLoader to use react-loadable
|
|
31
|
+
Add SSR feature prop to be passed in renderer and media card
|
|
32
|
+
- [`577302c5331`](https://bitbucket.org/atlassian/atlassian-frontend/commits/577302c5331) - Column sorting button meets the minimum contrast requirement
|
|
33
|
+
- [`a82305310db`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a82305310db) - [ux] ED-7449: Sort cells in a given table column based on case sensitivity of same letter then on alphabet+ascii code values
|
|
34
|
+
- [`9d43feb1f6a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9d43feb1f6a) - CETI-167 Remove opacity for panels in dark mode.
|
|
35
|
+
- Updated dependencies
|
|
36
|
+
|
|
37
|
+
## 82.2.0
|
|
38
|
+
|
|
39
|
+
### Minor Changes
|
|
40
|
+
|
|
41
|
+
- [`db3477abb18`](https://bitbucket.org/atlassian/atlassian-frontend/commits/db3477abb18) - [ux] ED-13938 disabled code-bidi warning tooltip for mobile, reworked TextWrapper to fix bidi mitigation, and fixed issue where bidi warnings were not presented when renderer used with an annotation provider with draftMode set to true
|
|
42
|
+
|
|
43
|
+
### Patch Changes
|
|
44
|
+
|
|
45
|
+
- Updated dependencies
|
|
46
|
+
|
|
47
|
+
## 82.1.0
|
|
48
|
+
|
|
49
|
+
### Minor Changes
|
|
50
|
+
|
|
51
|
+
- [`c80c71b537d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c80c71b537d) - [ux] ED-13860 add bidi warning decorations to code components
|
|
52
|
+
|
|
53
|
+
### Patch Changes
|
|
54
|
+
|
|
55
|
+
- Updated dependencies
|
|
56
|
+
|
|
57
|
+
## 82.0.0
|
|
58
|
+
|
|
59
|
+
### Major Changes
|
|
60
|
+
|
|
61
|
+
- [`3c5548e50da`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3c5548e50da) - [ux] Introducing new Media Inline component to renderer
|
|
62
|
+
|
|
63
|
+
### Minor Changes
|
|
64
|
+
|
|
65
|
+
- [`971845eac0d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/971845eac0d) - CETI-96 Added new rule to emoji to solve the duplicate icon issue when we copy from renderer
|
|
66
|
+
|
|
67
|
+
### Patch Changes
|
|
68
|
+
|
|
69
|
+
- [`f897443ad45`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f897443ad45) - Revert AK-279
|
|
70
|
+
- [`87865d3284f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/87865d3284f) - CETI-122 Fix Rendering of hybrid renderer when the prop UNSAFE_allowCustomPanels changed.
|
|
71
|
+
- [`a554946e674`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a554946e674) - Skipping flakey tests to unblock the weasal release
|
|
72
|
+
- [`33bca2a18bb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/33bca2a18bb) - Skipping a flaky test to unblock the weasal release
|
|
73
|
+
- Updated dependencies
|
|
74
|
+
|
|
3
75
|
## 81.1.1
|
|
4
76
|
|
|
5
77
|
### Patch Changes
|
package/dist/cjs/react/index.js
CHANGED
|
@@ -39,6 +39,8 @@ var _prosemirrorUtils = require("prosemirror-utils");
|
|
|
39
39
|
|
|
40
40
|
var _rendererNode = require("./renderer-node");
|
|
41
41
|
|
|
42
|
+
var _code = require("./marks/code");
|
|
43
|
+
|
|
42
44
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
43
45
|
|
|
44
46
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
@@ -153,13 +155,22 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
153
155
|
otherAttrs = (0, _objectWithoutProperties2.default)(_mark$attrs, ["key"]);
|
|
154
156
|
var extraProps = {
|
|
155
157
|
isInline: node === null || node === void 0 ? void 0 : node.isInline
|
|
156
|
-
};
|
|
157
|
-
|
|
158
|
-
var
|
|
158
|
+
}; // currently the only mark which has custom props is the code mark
|
|
159
|
+
|
|
160
|
+
var markSpecificProps = (0, _code.isCodeMark)(mark) ? {
|
|
161
|
+
// The appearance being mobile indicates we are in an renderer being
|
|
162
|
+
// rendered by mobile bridge in a web view.
|
|
163
|
+
// The tooltip is likely to have unexpected behaviour there, with being cut
|
|
164
|
+
// off, so we disable it. This is also to keep the behaviour consistent with
|
|
165
|
+
// the rendering in the mobile Native Renderer.
|
|
166
|
+
codeBidiWarningTooltipEnabled: _this.appearance !== 'mobile'
|
|
167
|
+
} : {};
|
|
168
|
+
|
|
169
|
+
var props = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
159
170
|
eventHandlers: _this.eventHandlers,
|
|
160
171
|
fireAnalyticsEvent: _this.fireAnalyticsEvent,
|
|
161
172
|
markKey: key
|
|
162
|
-
}, otherAttrs), extraProps), {}, {
|
|
173
|
+
}, otherAttrs), extraProps), markSpecificProps), {}, {
|
|
163
174
|
dataAttributes: {
|
|
164
175
|
'data-renderer-mark': true
|
|
165
176
|
}
|
|
@@ -220,6 +231,9 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
220
231
|
case 'mediaGroup':
|
|
221
232
|
return this.getMediaGroupProps(node);
|
|
222
233
|
|
|
234
|
+
case 'mediaInline':
|
|
235
|
+
return this.getMediaInlineProps(node);
|
|
236
|
+
|
|
223
237
|
case 'mediaSingle':
|
|
224
238
|
return this.getMediaSingleProps(node, path);
|
|
225
239
|
|
|
@@ -339,9 +353,8 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
339
353
|
return /*#__PURE__*/_react.default.createElement(_textWrapper.default, {
|
|
340
354
|
key: textKey,
|
|
341
355
|
startPos: startPos + parentDepth,
|
|
342
|
-
endPos: endPos + parentDepth
|
|
343
|
-
|
|
344
|
-
});
|
|
356
|
+
endPos: endPos + parentDepth
|
|
357
|
+
}, mark.text);
|
|
345
358
|
}
|
|
346
359
|
|
|
347
360
|
return mark.text || '';
|
|
@@ -426,7 +439,8 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
426
439
|
}, {
|
|
427
440
|
key: "getMediaProps",
|
|
428
441
|
value: function getMediaProps(node) {
|
|
429
|
-
var _this6 = this
|
|
442
|
+
var _this6 = this,
|
|
443
|
+
_this$media;
|
|
430
444
|
|
|
431
445
|
var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
432
446
|
var link = node.type.schema.marks.link;
|
|
@@ -442,7 +456,8 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
442
456
|
isLinkMark: isLinkMark,
|
|
443
457
|
allowAltTextOnImages: this.allowAltTextOnImages,
|
|
444
458
|
featureFlags: this.media && this.media.featureFlags,
|
|
445
|
-
shouldOpenMediaViewer: this.shouldOpenMediaViewer
|
|
459
|
+
shouldOpenMediaViewer: this.shouldOpenMediaViewer,
|
|
460
|
+
ssr: (_this$media = this.media) === null || _this$media === void 0 ? void 0 : _this$media.ssr
|
|
446
461
|
});
|
|
447
462
|
}
|
|
448
463
|
}, {
|
|
@@ -469,15 +484,21 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
469
484
|
}, {
|
|
470
485
|
key: "getMediaGroupProps",
|
|
471
486
|
value: function getMediaGroupProps(node) {
|
|
472
|
-
var _this$
|
|
487
|
+
var _this$media2, _this$media3;
|
|
473
488
|
|
|
474
489
|
return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
|
|
475
490
|
shouldOpenMediaViewer: this.shouldOpenMediaViewer,
|
|
476
491
|
allowAltTextOnImages: this.allowAltTextOnImages,
|
|
477
492
|
featureFlags: this.media && this.media.featureFlags,
|
|
478
|
-
enableDownloadButton: (_this$
|
|
493
|
+
enableDownloadButton: (_this$media2 = this.media) === null || _this$media2 === void 0 ? void 0 : _this$media2.enableDownloadButton,
|
|
494
|
+
ssr: (_this$media3 = this.media) === null || _this$media3 === void 0 ? void 0 : _this$media3.ssr
|
|
479
495
|
});
|
|
480
496
|
}
|
|
497
|
+
}, {
|
|
498
|
+
key: "getMediaInlineProps",
|
|
499
|
+
value: function getMediaInlineProps(node) {
|
|
500
|
+
return _objectSpread({}, this.getProps(node));
|
|
501
|
+
}
|
|
481
502
|
}, {
|
|
482
503
|
key: "getTaskItemProps",
|
|
483
504
|
value: function getTaskItemProps(node) {
|
|
@@ -504,8 +525,15 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
504
525
|
}, {
|
|
505
526
|
key: "getCodeBlockProps",
|
|
506
527
|
value: function getCodeBlockProps(node) {
|
|
528
|
+
// The appearance being mobile indicates we are in an renderer being
|
|
529
|
+
// rendered by mobile bridge in a web view.
|
|
530
|
+
// The tooltip is likely to have unexpected behaviour there, with being cut
|
|
531
|
+
// off, so we disable it. This is also to keep the behaviour consistent with
|
|
532
|
+
// the rendering in the mobile Native Renderer.
|
|
533
|
+
var codeBidiWarningTooltipEnabled = this.appearance !== 'mobile';
|
|
507
534
|
return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
|
|
508
|
-
text: node.textContent
|
|
535
|
+
text: node.textContent,
|
|
536
|
+
codeBidiWarningTooltipEnabled: codeBidiWarningTooltipEnabled
|
|
509
537
|
});
|
|
510
538
|
}
|
|
511
539
|
}, {
|
|
@@ -5,16 +5,38 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports.
|
|
8
|
+
exports.CodeWithIntl = CodeWithIntl;
|
|
9
|
+
exports.default = exports.isCodeMark = void 0;
|
|
9
10
|
|
|
10
11
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
11
12
|
|
|
12
13
|
var _react = _interopRequireDefault(require("react"));
|
|
13
14
|
|
|
15
|
+
var _reactIntl = require("react-intl");
|
|
16
|
+
|
|
14
17
|
var _inline = _interopRequireDefault(require("@atlaskit/code/inline"));
|
|
15
18
|
|
|
16
|
-
|
|
19
|
+
var _messages = require("@atlaskit/editor-common/messages");
|
|
20
|
+
|
|
21
|
+
var _useFeatureFlags = require("../../use-feature-flags");
|
|
22
|
+
|
|
23
|
+
var isCodeMark = function isCodeMark(mark) {
|
|
24
|
+
return mark && mark.type && mark.type.name === 'code';
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
exports.isCodeMark = isCodeMark;
|
|
28
|
+
|
|
29
|
+
function CodeWithIntl(props) {
|
|
30
|
+
var featureFlags = (0, _useFeatureFlags.useFeatureFlags)();
|
|
31
|
+
var codeBidiWarningLabel = props.intl.formatMessage(_messages.codeBidiWarningMessages.label);
|
|
17
32
|
return /*#__PURE__*/_react.default.createElement(_inline.default, (0, _extends2.default)({
|
|
18
|
-
className: "code"
|
|
33
|
+
className: "code",
|
|
34
|
+
codeBidiWarnings: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.codeBidiWarnings,
|
|
35
|
+
codeBidiWarningLabel: codeBidiWarningLabel,
|
|
36
|
+
codeBidiWarningTooltipEnabled: props.codeBidiWarningTooltipEnabled
|
|
19
37
|
}, props.dataAttributes), props.children);
|
|
20
|
-
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
var _default = (0, _reactIntl.injectIntl)(CodeWithIntl);
|
|
41
|
+
|
|
42
|
+
exports.default = _default;
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports.default = FragmentMark;
|
|
9
|
+
|
|
10
|
+
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
11
|
+
|
|
12
|
+
var _react = _interopRequireDefault(require("react"));
|
|
13
|
+
|
|
14
|
+
function FragmentMark(props) {
|
|
15
|
+
var WrapperElement = props.isInline ? 'span' : 'div';
|
|
16
|
+
return /*#__PURE__*/_react.default.createElement(WrapperElement, (0, _extends2.default)({
|
|
17
|
+
"data-localId": props.localId,
|
|
18
|
+
"data-name": props.name,
|
|
19
|
+
"data-mark-type": "fragment"
|
|
20
|
+
}, props.dataAttributes), props.children);
|
|
21
|
+
}
|
|
@@ -79,6 +79,12 @@ Object.defineProperty(exports, "DataConsumer", {
|
|
|
79
79
|
return _dataConsumer.default;
|
|
80
80
|
}
|
|
81
81
|
});
|
|
82
|
+
Object.defineProperty(exports, "FragmentMark", {
|
|
83
|
+
enumerable: true,
|
|
84
|
+
get: function get() {
|
|
85
|
+
return _fragment.default;
|
|
86
|
+
}
|
|
87
|
+
});
|
|
82
88
|
Object.defineProperty(exports, "Annotation", {
|
|
83
89
|
enumerable: true,
|
|
84
90
|
get: function get() {
|
|
@@ -121,6 +127,8 @@ var _unsupportedNodeAttribute = _interopRequireDefault(require("./unsupportedNod
|
|
|
121
127
|
|
|
122
128
|
var _dataConsumer = _interopRequireDefault(require("./data-consumer"));
|
|
123
129
|
|
|
130
|
+
var _fragment = _interopRequireDefault(require("./fragment"));
|
|
131
|
+
|
|
124
132
|
var _annotation = _interopRequireWildcard(require("./annotation"));
|
|
125
133
|
|
|
126
134
|
var _confluenceInlineComment = _interopRequireDefault(require("./confluence-inline-comment"));
|
|
@@ -147,7 +155,8 @@ var markToReact = {
|
|
|
147
155
|
indentation: _indentation.default,
|
|
148
156
|
unsupportedMark: _unsupportedMark.default,
|
|
149
157
|
unsupportedNodeAttribute: _unsupportedNodeAttribute.default,
|
|
150
|
-
dataConsumer: _dataConsumer.default
|
|
158
|
+
dataConsumer: _dataConsumer.default,
|
|
159
|
+
fragment: _fragment.default
|
|
151
160
|
};
|
|
152
161
|
exports.markToReact = markToReact;
|
|
153
162
|
|
|
@@ -11,6 +11,8 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
|
|
|
11
11
|
|
|
12
12
|
var _react = _interopRequireDefault(require("react"));
|
|
13
13
|
|
|
14
|
+
var _reactIntl = require("react-intl");
|
|
15
|
+
|
|
14
16
|
var _styledComponents = _interopRequireDefault(require("styled-components"));
|
|
15
17
|
|
|
16
18
|
var _code = require("@atlaskit/code");
|
|
@@ -23,6 +25,10 @@ var _components = require("@atlaskit/theme/components");
|
|
|
23
25
|
|
|
24
26
|
var _constants = require("@atlaskit/theme/constants");
|
|
25
27
|
|
|
28
|
+
var _messages = require("@atlaskit/editor-common/messages");
|
|
29
|
+
|
|
30
|
+
var _useFeatureFlags = require("../../use-feature-flags");
|
|
31
|
+
|
|
26
32
|
var _codeBlockCopyButton = _interopRequireDefault(require("./codeBlockCopyButton"));
|
|
27
33
|
|
|
28
34
|
var _templateObject;
|
|
@@ -31,7 +37,10 @@ function CodeBlock(props) {
|
|
|
31
37
|
var text = props.text,
|
|
32
38
|
language = props.language,
|
|
33
39
|
_props$allowCopyToCli = props.allowCopyToClipboard,
|
|
34
|
-
allowCopyToClipboard = _props$allowCopyToCli === void 0 ? false : _props$allowCopyToCli
|
|
40
|
+
allowCopyToClipboard = _props$allowCopyToCli === void 0 ? false : _props$allowCopyToCli,
|
|
41
|
+
codeBidiWarningTooltipEnabled = props.codeBidiWarningTooltipEnabled;
|
|
42
|
+
var featureFlags = (0, _useFeatureFlags.useFeatureFlags)();
|
|
43
|
+
var codeBidiWarningLabel = props.intl.formatMessage(_messages.codeBidiWarningMessages.label);
|
|
35
44
|
var className = ['code-block', props.className].join(' ');
|
|
36
45
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
37
46
|
className: className
|
|
@@ -39,11 +48,16 @@ function CodeBlock(props) {
|
|
|
39
48
|
content: text
|
|
40
49
|
}) : null, /*#__PURE__*/_react.default.createElement(_code.CodeBlock, {
|
|
41
50
|
language: language,
|
|
42
|
-
text: text
|
|
51
|
+
text: text,
|
|
52
|
+
codeBidiWarnings: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.codeBidiWarnings,
|
|
53
|
+
codeBidiWarningLabel: codeBidiWarningLabel,
|
|
54
|
+
codeBidiWarningTooltipEnabled: codeBidiWarningTooltipEnabled
|
|
43
55
|
}));
|
|
44
56
|
}
|
|
45
57
|
|
|
46
|
-
var
|
|
58
|
+
var IntlCodeBlock = (0, _reactIntl.injectIntl)(CodeBlock);
|
|
59
|
+
|
|
60
|
+
var _default = (0, _styledComponents.default)(IntlCodeBlock)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n tab-size: 4;\n [data-ds--code--code-block] {\n font-size: ", ";\n line-height: 1.5rem;\n background-image: ", ";\n background-attachment: local, scroll, scroll;\n background-position: 100% 0, 100% 0, 0 0;\n }\n"])), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), (0, _editorSharedStyles.overflowShadow)({
|
|
47
61
|
background: (0, _components.themed)({
|
|
48
62
|
light: _colors.N20,
|
|
49
63
|
dark: _colors.DN50
|
|
@@ -135,8 +135,7 @@ var HeadingAnchor = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
135
135
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderAnchorButton", function () {
|
|
136
136
|
return /*#__PURE__*/_react.default.createElement(CopyAnchorButton, {
|
|
137
137
|
onMouseLeave: _this.resetMessage,
|
|
138
|
-
onClick: _this.copyToClipboard
|
|
139
|
-
"aria-label": _this.state.tooltipMessage
|
|
138
|
+
onClick: _this.copyToClipboard
|
|
140
139
|
}, /*#__PURE__*/_react.default.createElement(_link.default, {
|
|
141
140
|
label: "copy",
|
|
142
141
|
size: _this.props.level > 3 ? 'small' : 'medium',
|
|
@@ -13,8 +13,6 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
13
13
|
|
|
14
14
|
var _headingAnchor = _interopRequireDefault(require("./heading-anchor"));
|
|
15
15
|
|
|
16
|
-
var _urlParse = _interopRequireDefault(require("url-parse"));
|
|
17
|
-
|
|
18
16
|
var _enums = require("../../analytics/enums");
|
|
19
17
|
|
|
20
18
|
var _analyticsContext = _interopRequireDefault(require("../../analytics/analyticsContext"));
|
|
@@ -23,8 +21,8 @@ var _copyTextProvider = require("./copy-text-provider");
|
|
|
23
21
|
|
|
24
22
|
var getCurrentUrlWithHash = function getCurrentUrlWithHash() {
|
|
25
23
|
var hash = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
|
|
26
|
-
var url = new
|
|
27
|
-
url.
|
|
24
|
+
var url = new URL(window.location.href);
|
|
25
|
+
url.hash = encodeURIComponent(hash);
|
|
28
26
|
return url.href;
|
|
29
27
|
};
|
|
30
28
|
|
|
@@ -55,11 +53,9 @@ function Heading(props) {
|
|
|
55
53
|
var showAnchorLink = !!props.showAnchorLink;
|
|
56
54
|
var isRightAligned = hasRightAlignmentMark(marks);
|
|
57
55
|
var enableNestedHeaderLinks = allowHeadingAnchorLinks && allowHeadingAnchorLinks.allowNestedHeaderLinks;
|
|
58
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
59
|
-
className: "heading-wrapper ".concat(HX)
|
|
60
|
-
}, /*#__PURE__*/_react.default.createElement(HX, (0, _extends2.default)({
|
|
56
|
+
return /*#__PURE__*/_react.default.createElement(HX, (0, _extends2.default)({
|
|
61
57
|
id: headingId
|
|
62
|
-
}, dataAttributes), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, showAnchorLink && isRightAligned ? WrapChildTextInSpan(props.children) : props.children
|
|
58
|
+
}, dataAttributes), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, showAnchorLink && isRightAligned ? WrapChildTextInSpan(props.children) : props.children, showAnchorLink && /*#__PURE__*/_react.default.createElement(_copyTextProvider.CopyTextConsumer, null, function (_ref) {
|
|
63
59
|
var copyTextToClipboard = _ref.copyTextToClipboard;
|
|
64
60
|
return headingId && /*#__PURE__*/_react.default.createElement(_analyticsContext.default.Consumer, null, function (_ref2) {
|
|
65
61
|
var fireAnalyticsEvent = _ref2.fireAnalyticsEvent;
|
|
@@ -77,7 +73,7 @@ function Heading(props) {
|
|
|
77
73
|
}
|
|
78
74
|
});
|
|
79
75
|
});
|
|
80
|
-
}));
|
|
76
|
+
})));
|
|
81
77
|
}
|
|
82
78
|
|
|
83
79
|
var _default = Heading;
|
|
@@ -162,7 +162,7 @@ Object.defineProperty(exports, "EmbedCard", {
|
|
|
162
162
|
return _embedCard.default;
|
|
163
163
|
}
|
|
164
164
|
});
|
|
165
|
-
exports.TaskItem = exports.Status = exports.Mention = exports.MediaGroup = exports.Media = exports.InlineCard = exports.Expand = exports.Emoji = exports.DecisionItem = exports.Date = exports.CodeBlock = exports.BlockCard = exports.isEmojiDoc = exports.isTextWrapper = exports.isText = exports.mergeTextNodes = exports.toReact = exports.nodeToReact = void 0;
|
|
165
|
+
exports.TaskItem = exports.Status = exports.Mention = exports.MediaInline = exports.MediaGroup = exports.Media = exports.InlineCard = exports.Expand = exports.Emoji = exports.DecisionItem = exports.Date = exports.CodeBlock = exports.BlockCard = exports.isEmojiDoc = exports.isTextWrapper = exports.isText = exports.mergeTextNodes = exports.toReact = exports.nodeToReact = void 0;
|
|
166
166
|
|
|
167
167
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
168
168
|
|
|
@@ -354,6 +354,19 @@ var MediaGroup = (0, _reactLoadable.default)({
|
|
|
354
354
|
}
|
|
355
355
|
});
|
|
356
356
|
exports.MediaGroup = MediaGroup;
|
|
357
|
+
var MediaInline = (0, _reactLoadable.default)({
|
|
358
|
+
loader: function loader() {
|
|
359
|
+
return Promise.resolve().then(function () {
|
|
360
|
+
return _interopRequireWildcard(require('./mediaInline'));
|
|
361
|
+
}).then(function (mod) {
|
|
362
|
+
return mod.default;
|
|
363
|
+
});
|
|
364
|
+
},
|
|
365
|
+
loading: function loading() {
|
|
366
|
+
return null;
|
|
367
|
+
}
|
|
368
|
+
});
|
|
369
|
+
exports.MediaInline = MediaInline;
|
|
357
370
|
var Mention = (0, _reactLoadable.default)({
|
|
358
371
|
loader: function loader() {
|
|
359
372
|
return Promise.resolve().then(function () {
|
|
@@ -402,6 +415,7 @@ var nodeToReact = {
|
|
|
402
415
|
listItem: _listItem.default,
|
|
403
416
|
media: Media,
|
|
404
417
|
mediaGroup: MediaGroup,
|
|
418
|
+
mediaInline: MediaInline,
|
|
405
419
|
mediaSingle: _mediaSingle.default,
|
|
406
420
|
mention: Mention,
|
|
407
421
|
orderedList: _orderedList.default,
|
|
@@ -69,7 +69,8 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
69
69
|
alt = _this$props.alt,
|
|
70
70
|
featureFlags = _this$props.featureFlags,
|
|
71
71
|
allowMediaViewer = _this$props.shouldOpenMediaViewer,
|
|
72
|
-
enableDownloadButton = _this$props.enableDownloadButton
|
|
72
|
+
enableDownloadButton = _this$props.enableDownloadButton,
|
|
73
|
+
ssr = _this$props.ssr;
|
|
73
74
|
|
|
74
75
|
var linkMark = _this.props.marks.find(_this.props.isLinkMark);
|
|
75
76
|
|
|
@@ -85,7 +86,8 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
85
86
|
eventHandlers: eventHandlers,
|
|
86
87
|
alt: allowAltTextOnImages ? alt : undefined,
|
|
87
88
|
featureFlags: featureFlags,
|
|
88
|
-
shouldEnableDownloadButton: enableDownloadButton
|
|
89
|
+
shouldEnableDownloadButton: enableDownloadButton,
|
|
90
|
+
ssr: ssr
|
|
89
91
|
}));
|
|
90
92
|
|
|
91
93
|
return linkHref ? /*#__PURE__*/_react.default.createElement(_editorCommon.MediaLink, {
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
6
|
+
|
|
7
|
+
Object.defineProperty(exports, "__esModule", {
|
|
8
|
+
value: true
|
|
9
|
+
});
|
|
10
|
+
exports.default = exports.RenderMediaInline = void 0;
|
|
11
|
+
|
|
12
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
13
|
+
|
|
14
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
15
|
+
|
|
16
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
17
|
+
|
|
18
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
19
|
+
|
|
20
|
+
var _mediaCard = require("@atlaskit/media-card");
|
|
21
|
+
|
|
22
|
+
var _editorCommon = require("@atlaskit/editor-common");
|
|
23
|
+
|
|
24
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
25
|
+
|
|
26
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
27
|
+
|
|
28
|
+
var RenderMediaInline = function RenderMediaInline(props) {
|
|
29
|
+
var mediaProvider = props.mediaProvider;
|
|
30
|
+
|
|
31
|
+
var _useState = (0, _react.useState)({}),
|
|
32
|
+
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
33
|
+
viewMediaClientConfigState = _useState2[0],
|
|
34
|
+
setViewMediaClientConfigState = _useState2[1];
|
|
35
|
+
|
|
36
|
+
(0, _react.useEffect)(function () {
|
|
37
|
+
updateViewMediaClientConfigState(mediaProvider);
|
|
38
|
+
}, [mediaProvider]);
|
|
39
|
+
|
|
40
|
+
var updateViewMediaClientConfigState = /*#__PURE__*/function () {
|
|
41
|
+
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(mediaProvider) {
|
|
42
|
+
var mediaClientConfig;
|
|
43
|
+
return _regenerator.default.wrap(function _callee$(_context) {
|
|
44
|
+
while (1) {
|
|
45
|
+
switch (_context.prev = _context.next) {
|
|
46
|
+
case 0:
|
|
47
|
+
if (!mediaProvider) {
|
|
48
|
+
_context.next = 5;
|
|
49
|
+
break;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
_context.next = 3;
|
|
53
|
+
return mediaProvider;
|
|
54
|
+
|
|
55
|
+
case 3:
|
|
56
|
+
mediaClientConfig = _context.sent;
|
|
57
|
+
setViewMediaClientConfigState(mediaClientConfig.viewMediaClientConfig);
|
|
58
|
+
|
|
59
|
+
case 5:
|
|
60
|
+
case "end":
|
|
61
|
+
return _context.stop();
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}, _callee);
|
|
65
|
+
}));
|
|
66
|
+
|
|
67
|
+
return function updateViewMediaClientConfigState(_x) {
|
|
68
|
+
return _ref.apply(this, arguments);
|
|
69
|
+
};
|
|
70
|
+
}();
|
|
71
|
+
|
|
72
|
+
return /*#__PURE__*/_react.default.createElement(_mediaCard.MediaInlineCard, {
|
|
73
|
+
identifier: props.identifier,
|
|
74
|
+
shouldOpenMediaViewer: true,
|
|
75
|
+
mediaClientConfig: viewMediaClientConfigState
|
|
76
|
+
});
|
|
77
|
+
};
|
|
78
|
+
|
|
79
|
+
exports.RenderMediaInline = RenderMediaInline;
|
|
80
|
+
|
|
81
|
+
var MediaInline = function MediaInline(props) {
|
|
82
|
+
var collection = props.collection,
|
|
83
|
+
id = props.id,
|
|
84
|
+
providers = props.providers;
|
|
85
|
+
var identifier = {
|
|
86
|
+
id: id,
|
|
87
|
+
mediaItemType: 'file',
|
|
88
|
+
collectionName: collection
|
|
89
|
+
};
|
|
90
|
+
return /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_editorCommon.WithProviders, {
|
|
91
|
+
providers: ['mediaProvider'],
|
|
92
|
+
providerFactory: providers,
|
|
93
|
+
renderNode: function renderNode(providers) {
|
|
94
|
+
var mediaProvider = providers.mediaProvider;
|
|
95
|
+
return /*#__PURE__*/_react.default.createElement(RenderMediaInline, {
|
|
96
|
+
identifier: identifier,
|
|
97
|
+
mediaProvider: mediaProvider
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
}));
|
|
101
|
+
};
|
|
102
|
+
|
|
103
|
+
var _default = MediaInline;
|
|
104
|
+
exports.default = _default;
|
|
@@ -40,14 +40,12 @@ var _templateObject;
|
|
|
40
40
|
var PanelStyled = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n ", "\n"])), function (props) {
|
|
41
41
|
if (props['data-panel-type'] !== _adfSchema.PanelType.CUSTOM || !props.backgroundColor) {
|
|
42
42
|
return '';
|
|
43
|
-
}
|
|
43
|
+
} // Similar to mainDynamicStyles()
|
|
44
44
|
|
|
45
|
-
var border = (0, _theme.themed)({
|
|
46
|
-
light: 'none',
|
|
47
|
-
dark: "1px solid rgba(255, 255, 255, 0.4)"
|
|
48
|
-
})(props); // Similar to mainDynamicStyles()
|
|
49
45
|
|
|
50
|
-
return "\n &[data-panel-type=".concat(_adfSchema.PanelType.CUSTOM, "] {\n background-color: ").concat(props.backgroundColor, ";\n
|
|
46
|
+
return "\n &[data-panel-type=".concat(_adfSchema.PanelType.CUSTOM, "] {\n background-color: ").concat(props.backgroundColor, ";\n ").concat((0, _theme.themed)({
|
|
47
|
+
dark: _editorCommon.getPanelBackgroundDarkModeColors
|
|
48
|
+
}), ";\n }\n ");
|
|
51
49
|
});
|
|
52
50
|
|
|
53
51
|
var panelIcons = {
|
|
@@ -93,7 +91,7 @@ var Panel = function Panel(props) {
|
|
|
93
91
|
var icon = getIcon();
|
|
94
92
|
|
|
95
93
|
if (icon) {
|
|
96
|
-
return /*#__PURE__*/_react.default.createElement("
|
|
94
|
+
return /*#__PURE__*/_react.default.createElement("div", {
|
|
97
95
|
className: _editorCommon.PanelSharedCssClassName.icon
|
|
98
96
|
}, icon);
|
|
99
97
|
}
|
|
@@ -11,21 +11,20 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
11
11
|
|
|
12
12
|
var _annotations = require("../../ui/annotations");
|
|
13
13
|
|
|
14
|
-
var TextWrapper =
|
|
14
|
+
var TextWrapper = function TextWrapper(props) {
|
|
15
15
|
var startPos = props.startPos,
|
|
16
16
|
endPos = props.endPos;
|
|
17
|
-
var
|
|
17
|
+
var children = props.children;
|
|
18
18
|
|
|
19
|
-
if (!
|
|
19
|
+
if (!children) {
|
|
20
20
|
return null;
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
return /*#__PURE__*/_react.default.createElement(_annotations.TextWithAnnotationDraft, {
|
|
24
|
-
text: text,
|
|
25
24
|
startPos: startPos,
|
|
26
25
|
endPos: endPos
|
|
27
|
-
});
|
|
28
|
-
}
|
|
26
|
+
}, children);
|
|
27
|
+
};
|
|
29
28
|
|
|
30
29
|
var _default = TextWrapper;
|
|
31
30
|
exports.default = _default;
|