@atlaskit/renderer 109.34.0 → 109.36.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 +24 -0
- package/afm-jira/tsconfig.json +108 -0
- package/dist/cjs/ui/Renderer/ErrorBoundary.js +1 -1
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/cjs/ui/annotations/selection/mounter.js +15 -20
- package/dist/es2019/actions/get-renderer-range-inline-node-names.js +3 -1
- package/dist/es2019/ui/Renderer/ErrorBoundary.js +1 -1
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/es2019/ui/annotations/selection/mounter.js +16 -21
- package/dist/esm/ui/Renderer/ErrorBoundary.js +1 -1
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/dist/esm/ui/annotations/selection/mounter.js +16 -21
- package/dist/types/actions/index.d.ts +1 -1
- package/dist/types-ts4.5/actions/index.d.ts +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,29 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 109.36.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#114477](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114477)
|
|
8
|
+
[`33e0090cf80ef`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/33e0090cf80ef) -
|
|
9
|
+
ED-23785 - add `inlineNodeTypes` to `InlineCommentSelectionComponentProps`
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- Updated dependencies
|
|
14
|
+
|
|
15
|
+
## 109.35.0
|
|
16
|
+
|
|
17
|
+
### Minor Changes
|
|
18
|
+
|
|
19
|
+
- [#113571](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/113571)
|
|
20
|
+
[`67a148fad7f47`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/67a148fad7f47) -
|
|
21
|
+
ED-23785 - add `inlineNodeTypes` to `InlineCommentSelectionComponentProps`
|
|
22
|
+
|
|
23
|
+
### Patch Changes
|
|
24
|
+
|
|
25
|
+
- Updated dependencies
|
|
26
|
+
|
|
3
27
|
## 109.34.0
|
|
4
28
|
|
|
5
29
|
### Minor Changes
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
{
|
|
2
|
+
"extends": "../../../../tsconfig.entry-points.jira.json",
|
|
3
|
+
"compilerOptions": {
|
|
4
|
+
"declaration": true,
|
|
5
|
+
"target": "es5",
|
|
6
|
+
"outDir": "../../../../../tsDist/@atlaskit__renderer/app",
|
|
7
|
+
"composite": true,
|
|
8
|
+
"rootDir": "../"
|
|
9
|
+
},
|
|
10
|
+
"include": [
|
|
11
|
+
"../src/**/*.ts",
|
|
12
|
+
"../src/**/*.tsx"
|
|
13
|
+
],
|
|
14
|
+
"exclude": [
|
|
15
|
+
"../src/**/__tests__/*",
|
|
16
|
+
"../src/**/*.test.*",
|
|
17
|
+
"../src/**/test.*"
|
|
18
|
+
],
|
|
19
|
+
"references": [
|
|
20
|
+
{
|
|
21
|
+
"path": "../../adf-utils/afm-jira/tsconfig.json"
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
"path": "../../../analytics/analytics-listeners/afm-jira/tsconfig.json"
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
"path": "../../../analytics/analytics-namespaced-context/afm-jira/tsconfig.json"
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
"path": "../../../analytics/analytics-next/afm-jira/tsconfig.json"
|
|
31
|
+
},
|
|
32
|
+
{
|
|
33
|
+
"path": "../../../design-system/button/afm-jira/tsconfig.json"
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
"path": "../../../design-system/code/afm-jira/tsconfig.json"
|
|
37
|
+
},
|
|
38
|
+
{
|
|
39
|
+
"path": "../../editor-common/afm-jira/tsconfig.json"
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
"path": "../../editor-json-transformer/afm-jira/tsconfig.json"
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
"path": "../../editor-palette/afm-jira/tsconfig.json"
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
"path": "../../editor-shared-styles/afm-jira/tsconfig.json"
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
"path": "../../../elements/emoji/afm-jira/tsconfig.json"
|
|
52
|
+
},
|
|
53
|
+
{
|
|
54
|
+
"path": "../../../design-system/icon/afm-jira/tsconfig.json"
|
|
55
|
+
},
|
|
56
|
+
{
|
|
57
|
+
"path": "../../../linking-platform/link-datasource/afm-jira/tsconfig.json"
|
|
58
|
+
},
|
|
59
|
+
{
|
|
60
|
+
"path": "../../../media/media-card/afm-jira/tsconfig.json"
|
|
61
|
+
},
|
|
62
|
+
{
|
|
63
|
+
"path": "../../../media/media-client/afm-jira/tsconfig.json"
|
|
64
|
+
},
|
|
65
|
+
{
|
|
66
|
+
"path": "../../../media/media-client-react/afm-jira/tsconfig.json"
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
"path": "../../../media/media-common/afm-jira/tsconfig.json"
|
|
70
|
+
},
|
|
71
|
+
{
|
|
72
|
+
"path": "../../../media/media-filmstrip/afm-jira/tsconfig.json"
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
"path": "../../../media/media-ui/afm-jira/tsconfig.json"
|
|
76
|
+
},
|
|
77
|
+
{
|
|
78
|
+
"path": "../../../media/media-viewer/afm-jira/tsconfig.json"
|
|
79
|
+
},
|
|
80
|
+
{
|
|
81
|
+
"path": "../../../platform/feature-flags/afm-jira/tsconfig.json"
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
"path": "../../../linking-platform/smart-card/afm-jira/tsconfig.json"
|
|
85
|
+
},
|
|
86
|
+
{
|
|
87
|
+
"path": "../../../elements/status/afm-jira/tsconfig.json"
|
|
88
|
+
},
|
|
89
|
+
{
|
|
90
|
+
"path": "../../../elements/task-decision/afm-jira/tsconfig.json"
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
"path": "../../../design-system/theme/afm-jira/tsconfig.json"
|
|
94
|
+
},
|
|
95
|
+
{
|
|
96
|
+
"path": "../../../design-system/tokens/afm-jira/tsconfig.json"
|
|
97
|
+
},
|
|
98
|
+
{
|
|
99
|
+
"path": "../../../design-system/tooltip/afm-jira/tsconfig.json"
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
"path": "../../../linking-platform/link-provider/afm-jira/tsconfig.json"
|
|
103
|
+
},
|
|
104
|
+
{
|
|
105
|
+
"path": "../../../media/media-core/afm-jira/tsconfig.json"
|
|
106
|
+
}
|
|
107
|
+
]
|
|
108
|
+
}
|
|
@@ -70,7 +70,7 @@ var ErrorBoundary = exports.ErrorBoundary = /*#__PURE__*/function (_React$Compon
|
|
|
70
70
|
attributes: {
|
|
71
71
|
platform: _events.PLATFORM.WEB,
|
|
72
72
|
errorMessage: "".concat(additionalInfo).concat(error === null || error === void 0 ? void 0 : error.message),
|
|
73
|
-
componentStack: errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.componentStack,
|
|
73
|
+
componentStack: (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.componentStack) || undefined,
|
|
74
74
|
errorRethrown: Boolean(this.props.rethrowError)
|
|
75
75
|
}
|
|
76
76
|
});
|
|
@@ -56,7 +56,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
56
56
|
var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
57
57
|
var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
58
58
|
var packageName = "@atlaskit/renderer";
|
|
59
|
-
var packageVersion = "109.
|
|
59
|
+
var packageVersion = "109.36.0";
|
|
60
60
|
var defaultNodeComponents = exports.defaultNodeComponents = _nodes.nodeToReact;
|
|
61
61
|
var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
|
|
62
62
|
(0, _inherits2.default)(Renderer, _PureComponent);
|
|
@@ -37,6 +37,12 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
|
|
|
37
37
|
var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
|
|
38
38
|
var providers = (0, _react.useContext)(_context.ProvidersContext);
|
|
39
39
|
var isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
|
|
40
|
+
var inlineNodeTypes = (0, _react.useMemo)(function () {
|
|
41
|
+
return (0, _getRendererRangeInlineNodeNames.getRendererRangeInlineNodeNames)({
|
|
42
|
+
pos: documentPosition,
|
|
43
|
+
actions: actions
|
|
44
|
+
});
|
|
45
|
+
}, [documentPosition, actions]);
|
|
40
46
|
var onCreateCallback = (0, _react.useCallback)(function (annotationId) {
|
|
41
47
|
// We want to support creation on a documentPosition if the user is only using ranges
|
|
42
48
|
// but we want to prioritize draft positions if they are being used by consumers
|
|
@@ -60,16 +66,13 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
|
|
|
60
66
|
actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
|
|
61
67
|
actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
62
68
|
attributes: {
|
|
63
|
-
inlineNodeNames:
|
|
64
|
-
pos: positionToAnnotate,
|
|
65
|
-
actions: actions
|
|
66
|
-
})
|
|
69
|
+
inlineNodeNames: inlineNodeTypes
|
|
67
70
|
},
|
|
68
71
|
eventType: _analytics.EVENT_TYPE.TRACK
|
|
69
72
|
}).fire(_analyticsListeners.FabricChannel.editor);
|
|
70
73
|
}
|
|
71
74
|
return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
|
|
72
|
-
}, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, isCommentsOnMediaBugFixEnabled]);
|
|
75
|
+
}, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, isCommentsOnMediaBugFixEnabled, inlineNodeTypes]);
|
|
73
76
|
var createIndexCallback = (0, _react.useCallback)(function () {
|
|
74
77
|
if (!documentPosition || !generateIndexMatch) {
|
|
75
78
|
return false;
|
|
@@ -88,10 +91,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
|
|
|
88
91
|
actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
|
|
89
92
|
actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
90
93
|
attributes: {
|
|
91
|
-
inlineNodeNames:
|
|
92
|
-
pos: documentPosition,
|
|
93
|
-
actions: actions
|
|
94
|
-
})
|
|
94
|
+
inlineNodeNames: inlineNodeTypes
|
|
95
95
|
},
|
|
96
96
|
eventType: _analytics.EVENT_TYPE.TRACK
|
|
97
97
|
}).fire(_analyticsListeners.FabricChannel.editor);
|
|
@@ -109,10 +109,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
|
|
|
109
109
|
eventType: _analytics.EVENT_TYPE.TRACK,
|
|
110
110
|
attributes: {
|
|
111
111
|
overlap: uniqueAnnotationsInRange.length,
|
|
112
|
-
inlineNodeNames:
|
|
113
|
-
pos: documentPosition,
|
|
114
|
-
actions: actions
|
|
115
|
-
})
|
|
112
|
+
inlineNodeNames: inlineNodeTypes
|
|
116
113
|
}
|
|
117
114
|
}).fire(_analyticsListeners.FabricChannel.editor);
|
|
118
115
|
}
|
|
@@ -135,7 +132,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
|
|
|
135
132
|
annotationType: _adfSchema.AnnotationTypes.INLINE_COMMENT
|
|
136
133
|
};
|
|
137
134
|
return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
|
|
138
|
-
}, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, isCommentsOnMediaBugFixEnabled, actions, range]);
|
|
135
|
+
}, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, isCommentsOnMediaBugFixEnabled, actions, range, inlineNodeTypes]);
|
|
139
136
|
var removeDraftModeCallback = (0, _react.useCallback)(function () {
|
|
140
137
|
clearAnnotationDraft();
|
|
141
138
|
setDraftDocumentPosition(null);
|
|
@@ -152,16 +149,13 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
|
|
|
152
149
|
actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
153
150
|
eventType: _analytics.EVENT_TYPE.TRACK,
|
|
154
151
|
attributes: {
|
|
155
|
-
inlineNodeNames:
|
|
156
|
-
pos: documentPosition,
|
|
157
|
-
actions: actions
|
|
158
|
-
})
|
|
152
|
+
inlineNodeNames: inlineNodeTypes
|
|
159
153
|
}
|
|
160
154
|
}).fire(_analyticsListeners.FabricChannel.editor);
|
|
161
155
|
}
|
|
162
156
|
removeDraftModeCallback();
|
|
163
157
|
onCloseProps();
|
|
164
|
-
}, [
|
|
158
|
+
}, [onCloseProps, removeDraftModeCallback, createAnalyticsEvent, inlineNodeTypes]);
|
|
165
159
|
return /*#__PURE__*/_react.default.createElement(Component, {
|
|
166
160
|
range: range,
|
|
167
161
|
draftRange: draftRange,
|
|
@@ -171,6 +165,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
|
|
|
171
165
|
onCreate: onCreateCallback,
|
|
172
166
|
getAnnotationIndexMatch: createIndexCallback,
|
|
173
167
|
applyDraftMode: applyDraftModeCallback,
|
|
174
|
-
removeDraftMode: removeDraftModeCallback
|
|
168
|
+
removeDraftMode: removeDraftModeCallback,
|
|
169
|
+
inlineNodeTypes: inlineNodeTypes
|
|
175
170
|
});
|
|
176
171
|
});
|
|
@@ -7,7 +7,9 @@ export function getRendererRangeInlineNodeNames({
|
|
|
7
7
|
if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
|
|
8
8
|
return undefined;
|
|
9
9
|
}
|
|
10
|
-
const
|
|
10
|
+
const {
|
|
11
|
+
doc
|
|
12
|
+
} = actions;
|
|
11
13
|
if (!pos || !doc) {
|
|
12
14
|
return undefined;
|
|
13
15
|
}
|
|
@@ -40,7 +40,7 @@ export class ErrorBoundary extends React.Component {
|
|
|
40
40
|
attributes: {
|
|
41
41
|
platform: PLATFORM.WEB,
|
|
42
42
|
errorMessage: `${additionalInfo}${error === null || error === void 0 ? void 0 : error.message}`,
|
|
43
|
-
componentStack: errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.componentStack,
|
|
43
|
+
componentStack: (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.componentStack) || undefined,
|
|
44
44
|
errorRethrown: Boolean(this.props.rethrowError)
|
|
45
45
|
}
|
|
46
46
|
});
|
|
@@ -38,7 +38,7 @@ import { nodeToReact } from '../../react/nodes';
|
|
|
38
38
|
export const NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
39
39
|
export const DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
40
40
|
const packageName = "@atlaskit/renderer";
|
|
41
|
-
const packageVersion = "109.
|
|
41
|
+
const packageVersion = "109.36.0";
|
|
42
42
|
export const defaultNodeComponents = nodeToReact;
|
|
43
43
|
export class Renderer extends PureComponent {
|
|
44
44
|
constructor(props) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useCallback, useState, useContext } from 'react';
|
|
1
|
+
import React, { useCallback, useState, useContext, useMemo } from 'react';
|
|
2
2
|
import { AnnotationTypes } from '@atlaskit/adf-schema';
|
|
3
3
|
import { updateWindowSelectionAroundDraft } from '../draft';
|
|
4
4
|
import { FabricChannel } from '@atlaskit/analytics-listeners';
|
|
@@ -25,6 +25,12 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
|
|
|
25
25
|
const actions = useContext(ActionsContext);
|
|
26
26
|
const providers = useContext(ProvidersContext);
|
|
27
27
|
const isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
|
|
28
|
+
const inlineNodeTypes = useMemo(() => {
|
|
29
|
+
return getRendererRangeInlineNodeNames({
|
|
30
|
+
pos: documentPosition,
|
|
31
|
+
actions
|
|
32
|
+
});
|
|
33
|
+
}, [documentPosition, actions]);
|
|
28
34
|
const onCreateCallback = useCallback(annotationId => {
|
|
29
35
|
// We want to support creation on a documentPosition if the user is only using ranges
|
|
30
36
|
// but we want to prioritize draft positions if they are being used by consumers
|
|
@@ -48,16 +54,13 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
|
|
|
48
54
|
actionSubject: ACTION_SUBJECT.ANNOTATION,
|
|
49
55
|
actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
50
56
|
attributes: {
|
|
51
|
-
inlineNodeNames:
|
|
52
|
-
pos: positionToAnnotate,
|
|
53
|
-
actions
|
|
54
|
-
})
|
|
57
|
+
inlineNodeNames: inlineNodeTypes
|
|
55
58
|
},
|
|
56
59
|
eventType: EVENT_TYPE.TRACK
|
|
57
60
|
}).fire(FabricChannel.editor);
|
|
58
61
|
}
|
|
59
62
|
return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
|
|
60
|
-
}, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, isCommentsOnMediaBugFixEnabled]);
|
|
63
|
+
}, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, isCommentsOnMediaBugFixEnabled, inlineNodeTypes]);
|
|
61
64
|
const createIndexCallback = useCallback(() => {
|
|
62
65
|
if (!documentPosition || !generateIndexMatch) {
|
|
63
66
|
return false;
|
|
@@ -76,10 +79,7 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
|
|
|
76
79
|
actionSubject: ACTION_SUBJECT.ANNOTATION,
|
|
77
80
|
actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
78
81
|
attributes: {
|
|
79
|
-
inlineNodeNames:
|
|
80
|
-
pos: documentPosition,
|
|
81
|
-
actions
|
|
82
|
-
})
|
|
82
|
+
inlineNodeNames: inlineNodeTypes
|
|
83
83
|
},
|
|
84
84
|
eventType: EVENT_TYPE.TRACK
|
|
85
85
|
}).fire(FabricChannel.editor);
|
|
@@ -97,10 +97,7 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
|
|
|
97
97
|
eventType: EVENT_TYPE.TRACK,
|
|
98
98
|
attributes: {
|
|
99
99
|
overlap: uniqueAnnotationsInRange.length,
|
|
100
|
-
inlineNodeNames:
|
|
101
|
-
pos: documentPosition,
|
|
102
|
-
actions
|
|
103
|
-
})
|
|
100
|
+
inlineNodeNames: inlineNodeTypes
|
|
104
101
|
}
|
|
105
102
|
}).fire(FabricChannel.editor);
|
|
106
103
|
}
|
|
@@ -123,7 +120,7 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
|
|
|
123
120
|
annotationType: AnnotationTypes.INLINE_COMMENT
|
|
124
121
|
};
|
|
125
122
|
return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
|
|
126
|
-
}, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, isCommentsOnMediaBugFixEnabled, actions, range]);
|
|
123
|
+
}, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, isCommentsOnMediaBugFixEnabled, actions, range, inlineNodeTypes]);
|
|
127
124
|
const removeDraftModeCallback = useCallback(() => {
|
|
128
125
|
clearAnnotationDraft();
|
|
129
126
|
setDraftDocumentPosition(null);
|
|
@@ -140,16 +137,13 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
|
|
|
140
137
|
actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
141
138
|
eventType: EVENT_TYPE.TRACK,
|
|
142
139
|
attributes: {
|
|
143
|
-
inlineNodeNames:
|
|
144
|
-
pos: documentPosition,
|
|
145
|
-
actions
|
|
146
|
-
})
|
|
140
|
+
inlineNodeNames: inlineNodeTypes
|
|
147
141
|
}
|
|
148
142
|
}).fire(FabricChannel.editor);
|
|
149
143
|
}
|
|
150
144
|
removeDraftModeCallback();
|
|
151
145
|
onCloseProps();
|
|
152
|
-
}, [
|
|
146
|
+
}, [onCloseProps, removeDraftModeCallback, createAnalyticsEvent, inlineNodeTypes]);
|
|
153
147
|
return /*#__PURE__*/React.createElement(Component, {
|
|
154
148
|
range: range,
|
|
155
149
|
draftRange: draftRange,
|
|
@@ -159,6 +153,7 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
|
|
|
159
153
|
onCreate: onCreateCallback,
|
|
160
154
|
getAnnotationIndexMatch: createIndexCallback,
|
|
161
155
|
applyDraftMode: applyDraftModeCallback,
|
|
162
|
-
removeDraftMode: removeDraftModeCallback
|
|
156
|
+
removeDraftMode: removeDraftModeCallback,
|
|
157
|
+
inlineNodeTypes: inlineNodeTypes
|
|
163
158
|
});
|
|
164
159
|
});
|
|
@@ -63,7 +63,7 @@ export var ErrorBoundary = /*#__PURE__*/function (_React$Component) {
|
|
|
63
63
|
attributes: {
|
|
64
64
|
platform: PLATFORM.WEB,
|
|
65
65
|
errorMessage: "".concat(additionalInfo).concat(error === null || error === void 0 ? void 0 : error.message),
|
|
66
|
-
componentStack: errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.componentStack,
|
|
66
|
+
componentStack: (errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.componentStack) || undefined,
|
|
67
67
|
errorRethrown: Boolean(this.props.rethrowError)
|
|
68
68
|
}
|
|
69
69
|
});
|
|
@@ -48,7 +48,7 @@ import { nodeToReact } from '../../react/nodes';
|
|
|
48
48
|
export var NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
49
49
|
export var DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
50
50
|
var packageName = "@atlaskit/renderer";
|
|
51
|
-
var packageVersion = "109.
|
|
51
|
+
var packageVersion = "109.36.0";
|
|
52
52
|
export var defaultNodeComponents = nodeToReact;
|
|
53
53
|
export var Renderer = /*#__PURE__*/function (_PureComponent) {
|
|
54
54
|
_inherits(Renderer, _PureComponent);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
2
|
-
import React, { useCallback, useState, useContext } from 'react';
|
|
2
|
+
import React, { useCallback, useState, useContext, useMemo } from 'react';
|
|
3
3
|
import { AnnotationTypes } from '@atlaskit/adf-schema';
|
|
4
4
|
import { updateWindowSelectionAroundDraft } from '../draft';
|
|
5
5
|
import { FabricChannel } from '@atlaskit/analytics-listeners';
|
|
@@ -27,6 +27,12 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
|
|
|
27
27
|
var actions = useContext(ActionsContext);
|
|
28
28
|
var providers = useContext(ProvidersContext);
|
|
29
29
|
var isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
|
|
30
|
+
var inlineNodeTypes = useMemo(function () {
|
|
31
|
+
return getRendererRangeInlineNodeNames({
|
|
32
|
+
pos: documentPosition,
|
|
33
|
+
actions: actions
|
|
34
|
+
});
|
|
35
|
+
}, [documentPosition, actions]);
|
|
30
36
|
var onCreateCallback = useCallback(function (annotationId) {
|
|
31
37
|
// We want to support creation on a documentPosition if the user is only using ranges
|
|
32
38
|
// but we want to prioritize draft positions if they are being used by consumers
|
|
@@ -50,16 +56,13 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
|
|
|
50
56
|
actionSubject: ACTION_SUBJECT.ANNOTATION,
|
|
51
57
|
actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
52
58
|
attributes: {
|
|
53
|
-
inlineNodeNames:
|
|
54
|
-
pos: positionToAnnotate,
|
|
55
|
-
actions: actions
|
|
56
|
-
})
|
|
59
|
+
inlineNodeNames: inlineNodeTypes
|
|
57
60
|
},
|
|
58
61
|
eventType: EVENT_TYPE.TRACK
|
|
59
62
|
}).fire(FabricChannel.editor);
|
|
60
63
|
}
|
|
61
64
|
return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
|
|
62
|
-
}, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, isCommentsOnMediaBugFixEnabled]);
|
|
65
|
+
}, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, isCommentsOnMediaBugFixEnabled, inlineNodeTypes]);
|
|
63
66
|
var createIndexCallback = useCallback(function () {
|
|
64
67
|
if (!documentPosition || !generateIndexMatch) {
|
|
65
68
|
return false;
|
|
@@ -78,10 +81,7 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
|
|
|
78
81
|
actionSubject: ACTION_SUBJECT.ANNOTATION,
|
|
79
82
|
actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
80
83
|
attributes: {
|
|
81
|
-
inlineNodeNames:
|
|
82
|
-
pos: documentPosition,
|
|
83
|
-
actions: actions
|
|
84
|
-
})
|
|
84
|
+
inlineNodeNames: inlineNodeTypes
|
|
85
85
|
},
|
|
86
86
|
eventType: EVENT_TYPE.TRACK
|
|
87
87
|
}).fire(FabricChannel.editor);
|
|
@@ -99,10 +99,7 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
|
|
|
99
99
|
eventType: EVENT_TYPE.TRACK,
|
|
100
100
|
attributes: {
|
|
101
101
|
overlap: uniqueAnnotationsInRange.length,
|
|
102
|
-
inlineNodeNames:
|
|
103
|
-
pos: documentPosition,
|
|
104
|
-
actions: actions
|
|
105
|
-
})
|
|
102
|
+
inlineNodeNames: inlineNodeTypes
|
|
106
103
|
}
|
|
107
104
|
}).fire(FabricChannel.editor);
|
|
108
105
|
}
|
|
@@ -125,7 +122,7 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
|
|
|
125
122
|
annotationType: AnnotationTypes.INLINE_COMMENT
|
|
126
123
|
};
|
|
127
124
|
return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
|
|
128
|
-
}, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, isCommentsOnMediaBugFixEnabled, actions, range]);
|
|
125
|
+
}, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, isCommentsOnMediaBugFixEnabled, actions, range, inlineNodeTypes]);
|
|
129
126
|
var removeDraftModeCallback = useCallback(function () {
|
|
130
127
|
clearAnnotationDraft();
|
|
131
128
|
setDraftDocumentPosition(null);
|
|
@@ -142,16 +139,13 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
|
|
|
142
139
|
actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
143
140
|
eventType: EVENT_TYPE.TRACK,
|
|
144
141
|
attributes: {
|
|
145
|
-
inlineNodeNames:
|
|
146
|
-
pos: documentPosition,
|
|
147
|
-
actions: actions
|
|
148
|
-
})
|
|
142
|
+
inlineNodeNames: inlineNodeTypes
|
|
149
143
|
}
|
|
150
144
|
}).fire(FabricChannel.editor);
|
|
151
145
|
}
|
|
152
146
|
removeDraftModeCallback();
|
|
153
147
|
onCloseProps();
|
|
154
|
-
}, [
|
|
148
|
+
}, [onCloseProps, removeDraftModeCallback, createAnalyticsEvent, inlineNodeTypes]);
|
|
155
149
|
return /*#__PURE__*/React.createElement(Component, {
|
|
156
150
|
range: range,
|
|
157
151
|
draftRange: draftRange,
|
|
@@ -161,6 +155,7 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
|
|
|
161
155
|
onCreate: onCreateCallback,
|
|
162
156
|
getAnnotationIndexMatch: createIndexCallback,
|
|
163
157
|
applyDraftMode: applyDraftModeCallback,
|
|
164
|
-
removeDraftMode: removeDraftModeCallback
|
|
158
|
+
removeDraftMode: removeDraftModeCallback,
|
|
159
|
+
inlineNodeTypes: inlineNodeTypes
|
|
165
160
|
});
|
|
166
161
|
});
|
|
@@ -34,7 +34,7 @@ export interface PositionRendererActionsOptions {
|
|
|
34
34
|
export default class RendererActions implements RendererActionsOptions, AnnotationsRendererActionsOptions, PositionRendererActionsOptions {
|
|
35
35
|
private initFromContext;
|
|
36
36
|
private transformer;
|
|
37
|
-
|
|
37
|
+
doc?: Node;
|
|
38
38
|
private schema?;
|
|
39
39
|
private ref?;
|
|
40
40
|
private onAnalyticsEvent?;
|
|
@@ -34,7 +34,7 @@ export interface PositionRendererActionsOptions {
|
|
|
34
34
|
export default class RendererActions implements RendererActionsOptions, AnnotationsRendererActionsOptions, PositionRendererActionsOptions {
|
|
35
35
|
private initFromContext;
|
|
36
36
|
private transformer;
|
|
37
|
-
|
|
37
|
+
doc?: Node;
|
|
38
38
|
private schema?;
|
|
39
39
|
private ref?;
|
|
40
40
|
private onAnalyticsEvent?;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/renderer",
|
|
3
|
-
"version": "109.
|
|
3
|
+
"version": "109.36.0",
|
|
4
4
|
"description": "Renderer component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"@atlaskit/analytics-next": "^9.3.0",
|
|
32
32
|
"@atlaskit/button": "^18.0.0",
|
|
33
33
|
"@atlaskit/code": "^15.3.0",
|
|
34
|
-
"@atlaskit/editor-common": "^82.
|
|
34
|
+
"@atlaskit/editor-common": "^82.14.0",
|
|
35
35
|
"@atlaskit/editor-json-transformer": "^8.14.0",
|
|
36
36
|
"@atlaskit/editor-palette": "1.6.0",
|
|
37
37
|
"@atlaskit/editor-prosemirror": "4.0.1",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"@atlaskit/media-ui": "^25.10.0",
|
|
48
48
|
"@atlaskit/media-viewer": "^48.6.0",
|
|
49
49
|
"@atlaskit/platform-feature-flags": "^0.2.0",
|
|
50
|
-
"@atlaskit/smart-card": "^27.
|
|
50
|
+
"@atlaskit/smart-card": "^27.7.0",
|
|
51
51
|
"@atlaskit/status": "^1.4.0",
|
|
52
52
|
"@atlaskit/task-decision": "^17.10.0",
|
|
53
53
|
"@atlaskit/theme": "^12.11.0",
|