@atlaskit/renderer 110.0.4 → 110.1.1
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/react/nodes/media/index.js +6 -6
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/es2019/react/nodes/media/index.js +6 -6
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/esm/react/nodes/media/index.js +6 -6
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/package.json +5 -11
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 110.1.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#140707](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/140707)
|
|
8
|
+
[`972fb840acf35`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/972fb840acf35) -
|
|
9
|
+
Switch from fg to experiment for media-from-url
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
12
|
+
## 110.1.0
|
|
13
|
+
|
|
14
|
+
### Minor Changes
|
|
15
|
+
|
|
16
|
+
- [#140717](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/140717)
|
|
17
|
+
[`b68c21839cdb7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b68c21839cdb7) -
|
|
18
|
+
Remove platform.comments-on-media.bug.incorrect-badge-highlight feature gate
|
|
19
|
+
|
|
3
20
|
## 110.0.4
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
|
@@ -35,7 +35,7 @@ var _mediaSingle = require("@atlaskit/editor-common/media-single");
|
|
|
35
35
|
var _reactIntlNext = require("react-intl-next");
|
|
36
36
|
var _hooks = require("../../../ui/annotations/hooks");
|
|
37
37
|
var _types = require("@atlaskit/editor-common/types");
|
|
38
|
-
var
|
|
38
|
+
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
39
39
|
var _excluded = ["marks", "mediaSingleElement", "isDrafting"],
|
|
40
40
|
_excluded2 = ["marks", "mediaSingleElement", "isDrafting"];
|
|
41
41
|
var _templateObject, _templateObject2;
|
|
@@ -165,7 +165,7 @@ var CommentBadgeWrapper = function CommentBadgeWrapper(_ref5) {
|
|
|
165
165
|
var parentNode = mutation.target.parentNode;
|
|
166
166
|
if (mutation.attributeName === 'data-has-focus') {
|
|
167
167
|
var isMediaCaption = parentNode === null || parentNode === void 0 ? void 0 : parentNode.closest('[data-media-caption="true"]');
|
|
168
|
-
var elementHasFocus = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.querySelector('[data-has-focus="true"]')) &&
|
|
168
|
+
var elementHasFocus = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.querySelector('[data-has-focus="true"]')) && !isMediaCaption;
|
|
169
169
|
elementHasFocus ? setStatus('active') : setStatus('default');
|
|
170
170
|
}
|
|
171
171
|
});
|
|
@@ -211,7 +211,7 @@ var CommentBadgeWrapper = function CommentBadgeWrapper(_ref5) {
|
|
|
211
211
|
/**
|
|
212
212
|
* Remove CommentBadgeWrapper component above
|
|
213
213
|
* and rename CommentBadgeNextWrapper to CommentBadgeWrapper
|
|
214
|
-
* when clean up
|
|
214
|
+
* when clean up platform_editor_add_media_from_url feature flag
|
|
215
215
|
*/
|
|
216
216
|
|
|
217
217
|
var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref6) {
|
|
@@ -244,7 +244,7 @@ var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref6) {
|
|
|
244
244
|
var parentNode = mutation.target.parentNode;
|
|
245
245
|
if (mutation.attributeName === 'data-has-focus') {
|
|
246
246
|
var isMediaCaption = parentNode === null || parentNode === void 0 ? void 0 : parentNode.closest('[data-media-caption="true"]');
|
|
247
|
-
var elementHasFocus = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.querySelector('[data-has-focus="true"]')) &&
|
|
247
|
+
var elementHasFocus = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.querySelector('[data-has-focus="true"]')) && !isMediaCaption;
|
|
248
248
|
elementHasFocus ? setStatus('active') : setStatus('default');
|
|
249
249
|
}
|
|
250
250
|
});
|
|
@@ -330,7 +330,7 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
330
330
|
data: (0, _defineProperty2.default)({}, _analyticsNamespacedContext.MEDIA_CONTEXT, {
|
|
331
331
|
border: !!borderMark
|
|
332
332
|
})
|
|
333
|
-
}, (0,
|
|
333
|
+
}, (0, _experiments.editorExperiment)('add-media-from-url', true) && (0, _react2.jsx)(_mediaSingle.MediaBadges, {
|
|
334
334
|
mediaElement: mediaSingleElement,
|
|
335
335
|
mediaWidth: width,
|
|
336
336
|
mediaHeight: height
|
|
@@ -344,7 +344,7 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
344
344
|
isDrafting: isDrafting,
|
|
345
345
|
badgeSize: badgeSize
|
|
346
346
|
}));
|
|
347
|
-
}), !(0,
|
|
347
|
+
}), !(0, _experiments.editorExperiment)('add-media-from-url', true) && showCommentBadge && (0, _react2.jsx)(CommentBadgeWrapper, {
|
|
348
348
|
marks: annotationMarks,
|
|
349
349
|
mediaSingleElement: mediaSingleElement,
|
|
350
350
|
width: width,
|
|
@@ -63,7 +63,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
63
63
|
var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
64
64
|
var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
65
65
|
var packageName = "@atlaskit/renderer";
|
|
66
|
-
var packageVersion = "110.
|
|
66
|
+
var packageVersion = "110.1.1";
|
|
67
67
|
var defaultNodeComponents = exports.defaultNodeComponents = _nodes.nodeToReact;
|
|
68
68
|
var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
|
|
69
69
|
(0, _inherits2.default)(Renderer, _PureComponent);
|
|
@@ -25,7 +25,7 @@ import { CommentBadge as CommentBadgeComponent, CommentBadgeNext, ExternalImageB
|
|
|
25
25
|
import { injectIntl } from 'react-intl-next';
|
|
26
26
|
import { useInlineCommentSubscriberContext, useInlineCommentsFilter } from '../../../ui/annotations/hooks';
|
|
27
27
|
import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
|
|
28
|
-
import {
|
|
28
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
29
29
|
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
30
30
|
const linkStyle = css`
|
|
31
31
|
position: absolute;
|
|
@@ -149,7 +149,7 @@ const CommentBadgeWrapper = ({
|
|
|
149
149
|
const parentNode = mutation.target.parentNode;
|
|
150
150
|
if (mutation.attributeName === 'data-has-focus') {
|
|
151
151
|
const isMediaCaption = parentNode === null || parentNode === void 0 ? void 0 : parentNode.closest('[data-media-caption="true"]');
|
|
152
|
-
const elementHasFocus = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.querySelector('[data-has-focus="true"]')) &&
|
|
152
|
+
const elementHasFocus = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.querySelector('[data-has-focus="true"]')) && !isMediaCaption;
|
|
153
153
|
elementHasFocus ? setStatus('active') : setStatus('default');
|
|
154
154
|
}
|
|
155
155
|
});
|
|
@@ -191,7 +191,7 @@ const CommentBadgeWrapper = ({
|
|
|
191
191
|
/**
|
|
192
192
|
* Remove CommentBadgeWrapper component above
|
|
193
193
|
* and rename CommentBadgeNextWrapper to CommentBadgeWrapper
|
|
194
|
-
* when clean up
|
|
194
|
+
* when clean up platform_editor_add_media_from_url feature flag
|
|
195
195
|
*/
|
|
196
196
|
|
|
197
197
|
const CommentBadgeNextWrapper = ({
|
|
@@ -216,7 +216,7 @@ const CommentBadgeNextWrapper = ({
|
|
|
216
216
|
const parentNode = mutation.target.parentNode;
|
|
217
217
|
if (mutation.attributeName === 'data-has-focus') {
|
|
218
218
|
const isMediaCaption = parentNode === null || parentNode === void 0 ? void 0 : parentNode.closest('[data-media-caption="true"]');
|
|
219
|
-
const elementHasFocus = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.querySelector('[data-has-focus="true"]')) &&
|
|
219
|
+
const elementHasFocus = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.querySelector('[data-has-focus="true"]')) && !isMediaCaption;
|
|
220
220
|
elementHasFocus ? setStatus('active') : setStatus('default');
|
|
221
221
|
}
|
|
222
222
|
});
|
|
@@ -297,7 +297,7 @@ class Media extends PureComponent {
|
|
|
297
297
|
border: !!borderMark
|
|
298
298
|
}
|
|
299
299
|
}
|
|
300
|
-
},
|
|
300
|
+
}, editorExperiment('add-media-from-url', true) && jsx(MediaBadges, {
|
|
301
301
|
mediaElement: mediaSingleElement,
|
|
302
302
|
mediaWidth: width,
|
|
303
303
|
mediaHeight: height
|
|
@@ -310,7 +310,7 @@ class Media extends PureComponent {
|
|
|
310
310
|
mediaSingleElement: mediaSingleElement,
|
|
311
311
|
isDrafting: isDrafting,
|
|
312
312
|
badgeSize: badgeSize
|
|
313
|
-
}))), !
|
|
313
|
+
}))), !editorExperiment('add-media-from-url', true) && showCommentBadge && jsx(CommentBadgeWrapper, {
|
|
314
314
|
marks: annotationMarks,
|
|
315
315
|
mediaSingleElement: mediaSingleElement,
|
|
316
316
|
width: width,
|
|
@@ -45,7 +45,7 @@ import { nodeToReact } from '../../react/nodes';
|
|
|
45
45
|
export const NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
46
46
|
export const DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
47
47
|
const packageName = "@atlaskit/renderer";
|
|
48
|
-
const packageVersion = "110.
|
|
48
|
+
const packageVersion = "110.1.1";
|
|
49
49
|
export const defaultNodeComponents = nodeToReact;
|
|
50
50
|
export class Renderer extends PureComponent {
|
|
51
51
|
constructor(props) {
|
|
@@ -41,7 +41,7 @@ import { CommentBadge as CommentBadgeComponent, CommentBadgeNext, ExternalImageB
|
|
|
41
41
|
import { injectIntl } from 'react-intl-next';
|
|
42
42
|
import { useInlineCommentSubscriberContext, useInlineCommentsFilter } from '../../../ui/annotations/hooks';
|
|
43
43
|
import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
|
|
44
|
-
import {
|
|
44
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
45
45
|
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
46
46
|
var linkStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\tposition: absolute;\n\tbackground: transparent;\n\ttop: 0;\n\tright: 0;\n\tbottom: 0;\n\tleft: 0;\n\tcursor: pointer;\n\twidth: 100% !important;\n\theight: 100% !important;\n"])));
|
|
47
47
|
|
|
@@ -156,7 +156,7 @@ var CommentBadgeWrapper = function CommentBadgeWrapper(_ref5) {
|
|
|
156
156
|
var parentNode = mutation.target.parentNode;
|
|
157
157
|
if (mutation.attributeName === 'data-has-focus') {
|
|
158
158
|
var isMediaCaption = parentNode === null || parentNode === void 0 ? void 0 : parentNode.closest('[data-media-caption="true"]');
|
|
159
|
-
var elementHasFocus = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.querySelector('[data-has-focus="true"]')) &&
|
|
159
|
+
var elementHasFocus = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.querySelector('[data-has-focus="true"]')) && !isMediaCaption;
|
|
160
160
|
elementHasFocus ? setStatus('active') : setStatus('default');
|
|
161
161
|
}
|
|
162
162
|
});
|
|
@@ -202,7 +202,7 @@ var CommentBadgeWrapper = function CommentBadgeWrapper(_ref5) {
|
|
|
202
202
|
/**
|
|
203
203
|
* Remove CommentBadgeWrapper component above
|
|
204
204
|
* and rename CommentBadgeNextWrapper to CommentBadgeWrapper
|
|
205
|
-
* when clean up
|
|
205
|
+
* when clean up platform_editor_add_media_from_url feature flag
|
|
206
206
|
*/
|
|
207
207
|
|
|
208
208
|
var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref6) {
|
|
@@ -235,7 +235,7 @@ var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref6) {
|
|
|
235
235
|
var parentNode = mutation.target.parentNode;
|
|
236
236
|
if (mutation.attributeName === 'data-has-focus') {
|
|
237
237
|
var isMediaCaption = parentNode === null || parentNode === void 0 ? void 0 : parentNode.closest('[data-media-caption="true"]');
|
|
238
|
-
var elementHasFocus = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.querySelector('[data-has-focus="true"]')) &&
|
|
238
|
+
var elementHasFocus = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.querySelector('[data-has-focus="true"]')) && !isMediaCaption;
|
|
239
239
|
elementHasFocus ? setStatus('active') : setStatus('default');
|
|
240
240
|
}
|
|
241
241
|
});
|
|
@@ -321,7 +321,7 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
321
321
|
data: _defineProperty({}, MEDIA_CONTEXT, {
|
|
322
322
|
border: !!borderMark
|
|
323
323
|
})
|
|
324
|
-
},
|
|
324
|
+
}, editorExperiment('add-media-from-url', true) && jsx(MediaBadges, {
|
|
325
325
|
mediaElement: mediaSingleElement,
|
|
326
326
|
mediaWidth: width,
|
|
327
327
|
mediaHeight: height
|
|
@@ -335,7 +335,7 @@ var Media = /*#__PURE__*/function (_PureComponent) {
|
|
|
335
335
|
isDrafting: isDrafting,
|
|
336
336
|
badgeSize: badgeSize
|
|
337
337
|
}));
|
|
338
|
-
}), !
|
|
338
|
+
}), !editorExperiment('add-media-from-url', true) && showCommentBadge && jsx(CommentBadgeWrapper, {
|
|
339
339
|
marks: annotationMarks,
|
|
340
340
|
mediaSingleElement: mediaSingleElement,
|
|
341
341
|
width: width,
|
|
@@ -55,7 +55,7 @@ import { nodeToReact } from '../../react/nodes';
|
|
|
55
55
|
export var NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
56
56
|
export var DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
57
57
|
var packageName = "@atlaskit/renderer";
|
|
58
|
-
var packageVersion = "110.
|
|
58
|
+
var packageVersion = "110.1.1";
|
|
59
59
|
export var defaultNodeComponents = nodeToReact;
|
|
60
60
|
export var Renderer = /*#__PURE__*/function (_PureComponent) {
|
|
61
61
|
_inherits(Renderer, _PureComponent);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/renderer",
|
|
3
|
-
"version": "110.
|
|
3
|
+
"version": "110.1.1",
|
|
4
4
|
"description": "Renderer component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@atlaskit/analytics-next": "^10.1.0",
|
|
30
30
|
"@atlaskit/button": "^20.1.0",
|
|
31
31
|
"@atlaskit/code": "^15.6.0",
|
|
32
|
-
"@atlaskit/editor-common": "^89.
|
|
32
|
+
"@atlaskit/editor-common": "^89.2.0",
|
|
33
33
|
"@atlaskit/editor-json-transformer": "^8.18.0",
|
|
34
34
|
"@atlaskit/editor-palette": "1.6.0",
|
|
35
35
|
"@atlaskit/editor-prosemirror": "6.0.0",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@atlaskit/task-decision": "^17.10.0",
|
|
52
52
|
"@atlaskit/theme": "^13.0.0",
|
|
53
53
|
"@atlaskit/tmp-editor-statsig": "*",
|
|
54
|
-
"@atlaskit/tokens": "^1.
|
|
54
|
+
"@atlaskit/tokens": "^1.60.0",
|
|
55
55
|
"@atlaskit/tooltip": "^18.7.0",
|
|
56
56
|
"@babel/runtime": "^7.0.0",
|
|
57
57
|
"@emotion/react": "^11.7.1",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"uuid": "^3.1.0"
|
|
63
63
|
},
|
|
64
64
|
"peerDependencies": {
|
|
65
|
-
"@atlaskit/link-provider": "^1.
|
|
65
|
+
"@atlaskit/link-provider": "^1.16.0",
|
|
66
66
|
"@atlaskit/media-core": "^34.3.0",
|
|
67
67
|
"react": "^16.8.0 || ^17.0.0 || ~18.2.0",
|
|
68
68
|
"react-dom": "^16.8.0 || ^17.0.0 || ~18.2.0"
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"@atlaskit/analytics-gas-types": "^5.1.0",
|
|
74
74
|
"@atlaskit/css-reset": "^6.10.0",
|
|
75
75
|
"@atlaskit/editor-test-helpers": "^18.33.0",
|
|
76
|
-
"@atlaskit/link-provider": "^1.
|
|
76
|
+
"@atlaskit/link-provider": "^1.16.0",
|
|
77
77
|
"@atlaskit/link-test-helpers": "^7.5.0",
|
|
78
78
|
"@atlaskit/linking-common": "^5.11.0",
|
|
79
79
|
"@atlaskit/media-core": "^34.3.0",
|
|
@@ -137,12 +137,6 @@
|
|
|
137
137
|
"annotations_align_editor_and_renderer_styles": {
|
|
138
138
|
"type": "boolean"
|
|
139
139
|
},
|
|
140
|
-
"platform.comments-on-media.bug.incorrect-badge-highlight": {
|
|
141
|
-
"type": "boolean"
|
|
142
|
-
},
|
|
143
|
-
"platform_editor_insert_media_plugin_phase_one": {
|
|
144
|
-
"type": "boolean"
|
|
145
|
-
},
|
|
146
140
|
"platform-fix-table-ssr-resizing": {
|
|
147
141
|
"type": "boolean"
|
|
148
142
|
},
|