@atlaskit/renderer 112.4.1 → 112.5.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 +13 -0
- package/dist/cjs/render-document.js +27 -0
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/es2019/render-document.js +29 -1
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/esm/render-document.js +28 -1
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/dist/types/analytics/events.d.ts +2 -1
- package/dist/types-ts4.5/analytics/events.d.ts +2 -1
- package/package.json +15 -12
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 112.5.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#162298](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/162298)
|
|
8
|
+
[`f5893b7270927`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f5893b7270927) -
|
|
9
|
+
ED-25498 Integrate transformNestedTablesIncomingDocument with Editor and Renderer to transform
|
|
10
|
+
nested table extensions
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- Updated dependencies
|
|
15
|
+
|
|
3
16
|
## 112.4.1
|
|
4
17
|
|
|
5
18
|
### Patch Changes
|
|
@@ -15,6 +15,7 @@ var _events = require("./analytics/events");
|
|
|
15
15
|
var _unsupportedContent = require("./analytics/unsupported-content");
|
|
16
16
|
var _transforms = require("@atlaskit/adf-utils/transforms");
|
|
17
17
|
var _countNodes = require("./ui/Renderer/count-nodes");
|
|
18
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
18
19
|
var SUPPORTS_HIRES_TIMER_API = !!(typeof window !== 'undefined' && window.performance && performance.now);
|
|
19
20
|
var withStopwatch = function withStopwatch(cb) {
|
|
20
21
|
var startTime = SUPPORTS_HIRES_TIMER_API ? performance.now() : Date.now();
|
|
@@ -63,6 +64,32 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
|
|
|
63
64
|
result.version = 1;
|
|
64
65
|
}
|
|
65
66
|
}
|
|
67
|
+
if ((0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes')) {
|
|
68
|
+
// Convert nested-table extensions into nested tables
|
|
69
|
+
try {
|
|
70
|
+
var _transformNestedTable = (0, _transforms.transformNestedTablesIncomingDocument)(result),
|
|
71
|
+
_transformedAdf = _transformNestedTable.transformedAdf,
|
|
72
|
+
_isTransformed = _transformNestedTable.isTransformed;
|
|
73
|
+
if (_isTransformed) {
|
|
74
|
+
dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
|
|
75
|
+
action: _analytics.ACTION.NESTED_TABLE_TRANSFORMED,
|
|
76
|
+
actionSubject: _analytics.ACTION_SUBJECT.RENDERER,
|
|
77
|
+
eventType: _analytics.EVENT_TYPE.OPERATIONAL
|
|
78
|
+
});
|
|
79
|
+
result = _transformedAdf;
|
|
80
|
+
}
|
|
81
|
+
} catch (e) {
|
|
82
|
+
dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
|
|
83
|
+
action: _analytics.ACTION.INVALID_PROSEMIRROR_DOCUMENT,
|
|
84
|
+
actionSubject: _analytics.ACTION_SUBJECT.RENDERER,
|
|
85
|
+
eventType: _analytics.EVENT_TYPE.OPERATIONAL,
|
|
86
|
+
attributes: {
|
|
87
|
+
platform: _events.PLATFORM.WEB,
|
|
88
|
+
errorStack: 'Failed to transform one or more nested tables in the document'
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
}
|
|
66
93
|
return result;
|
|
67
94
|
};
|
|
68
95
|
var memoValidation = (0, _memoizeOne.default)(_validation, function (newArgs, lastArgs) {
|
|
@@ -65,7 +65,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
65
65
|
var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
66
66
|
var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
67
67
|
var packageName = "@atlaskit/renderer";
|
|
68
|
-
var packageVersion = "112.
|
|
68
|
+
var packageVersion = "112.5.0";
|
|
69
69
|
var setAsQueryContainerStyles = (0, _react2.css)({
|
|
70
70
|
containerName: 'ak-renderer-wrapper',
|
|
71
71
|
containerType: 'inline-size',
|
|
@@ -5,8 +5,9 @@ import { validateADFEntity, findAndTrackUnsupportedContentNodes } from '@atlaski
|
|
|
5
5
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
|
|
6
6
|
import { PLATFORM } from './analytics/events';
|
|
7
7
|
import { trackUnsupportedContentLevels } from './analytics/unsupported-content';
|
|
8
|
-
import { transformMediaLinkMarks } from '@atlaskit/adf-utils/transforms';
|
|
8
|
+
import { transformMediaLinkMarks, transformNestedTablesIncomingDocument } from '@atlaskit/adf-utils/transforms';
|
|
9
9
|
import { countNodes } from './ui/Renderer/count-nodes';
|
|
10
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
10
11
|
const SUPPORTS_HIRES_TIMER_API = !!(typeof window !== 'undefined' && window.performance && performance.now);
|
|
11
12
|
const withStopwatch = cb => {
|
|
12
13
|
const startTime = SUPPORTS_HIRES_TIMER_API ? performance.now() : Date.now();
|
|
@@ -56,6 +57,33 @@ const _validation = (doc, schema, adfStage, useSpecBasedValidator, dispatchAnaly
|
|
|
56
57
|
result.version = 1;
|
|
57
58
|
}
|
|
58
59
|
}
|
|
60
|
+
if (fg('platform_editor_use_nested_table_pm_nodes')) {
|
|
61
|
+
// Convert nested-table extensions into nested tables
|
|
62
|
+
try {
|
|
63
|
+
const {
|
|
64
|
+
transformedAdf,
|
|
65
|
+
isTransformed
|
|
66
|
+
} = transformNestedTablesIncomingDocument(result);
|
|
67
|
+
if (isTransformed) {
|
|
68
|
+
dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 ? void 0 : dispatchAnalyticsEvent({
|
|
69
|
+
action: ACTION.NESTED_TABLE_TRANSFORMED,
|
|
70
|
+
actionSubject: ACTION_SUBJECT.RENDERER,
|
|
71
|
+
eventType: EVENT_TYPE.OPERATIONAL
|
|
72
|
+
});
|
|
73
|
+
result = transformedAdf;
|
|
74
|
+
}
|
|
75
|
+
} catch (e) {
|
|
76
|
+
dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 ? void 0 : dispatchAnalyticsEvent({
|
|
77
|
+
action: ACTION.INVALID_PROSEMIRROR_DOCUMENT,
|
|
78
|
+
actionSubject: ACTION_SUBJECT.RENDERER,
|
|
79
|
+
eventType: EVENT_TYPE.OPERATIONAL,
|
|
80
|
+
attributes: {
|
|
81
|
+
platform: PLATFORM.WEB,
|
|
82
|
+
errorStack: 'Failed to transform one or more nested tables in the document'
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
}
|
|
59
87
|
return result;
|
|
60
88
|
};
|
|
61
89
|
const memoValidation = memoizeOne(_validation, (newArgs, lastArgs) => {
|
|
@@ -45,7 +45,7 @@ import { countNodes } from './count-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 = "112.
|
|
48
|
+
const packageVersion = "112.5.0";
|
|
49
49
|
const setAsQueryContainerStyles = css({
|
|
50
50
|
containerName: 'ak-renderer-wrapper',
|
|
51
51
|
containerType: 'inline-size',
|
|
@@ -6,8 +6,9 @@ import { validateADFEntity, findAndTrackUnsupportedContentNodes } from '@atlaski
|
|
|
6
6
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
|
|
7
7
|
import { PLATFORM } from './analytics/events';
|
|
8
8
|
import { trackUnsupportedContentLevels } from './analytics/unsupported-content';
|
|
9
|
-
import { transformMediaLinkMarks } from '@atlaskit/adf-utils/transforms';
|
|
9
|
+
import { transformMediaLinkMarks, transformNestedTablesIncomingDocument } from '@atlaskit/adf-utils/transforms';
|
|
10
10
|
import { countNodes } from './ui/Renderer/count-nodes';
|
|
11
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
11
12
|
var SUPPORTS_HIRES_TIMER_API = !!(typeof window !== 'undefined' && window.performance && performance.now);
|
|
12
13
|
var withStopwatch = function withStopwatch(cb) {
|
|
13
14
|
var startTime = SUPPORTS_HIRES_TIMER_API ? performance.now() : Date.now();
|
|
@@ -56,6 +57,32 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
|
|
|
56
57
|
result.version = 1;
|
|
57
58
|
}
|
|
58
59
|
}
|
|
60
|
+
if (fg('platform_editor_use_nested_table_pm_nodes')) {
|
|
61
|
+
// Convert nested-table extensions into nested tables
|
|
62
|
+
try {
|
|
63
|
+
var _transformNestedTable = transformNestedTablesIncomingDocument(result),
|
|
64
|
+
_transformedAdf = _transformNestedTable.transformedAdf,
|
|
65
|
+
_isTransformed = _transformNestedTable.isTransformed;
|
|
66
|
+
if (_isTransformed) {
|
|
67
|
+
dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
|
|
68
|
+
action: ACTION.NESTED_TABLE_TRANSFORMED,
|
|
69
|
+
actionSubject: ACTION_SUBJECT.RENDERER,
|
|
70
|
+
eventType: EVENT_TYPE.OPERATIONAL
|
|
71
|
+
});
|
|
72
|
+
result = _transformedAdf;
|
|
73
|
+
}
|
|
74
|
+
} catch (e) {
|
|
75
|
+
dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
|
|
76
|
+
action: ACTION.INVALID_PROSEMIRROR_DOCUMENT,
|
|
77
|
+
actionSubject: ACTION_SUBJECT.RENDERER,
|
|
78
|
+
eventType: EVENT_TYPE.OPERATIONAL,
|
|
79
|
+
attributes: {
|
|
80
|
+
platform: PLATFORM.WEB,
|
|
81
|
+
errorStack: 'Failed to transform one or more nested tables in the document'
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
}
|
|
59
86
|
return result;
|
|
60
87
|
};
|
|
61
88
|
var memoValidation = memoizeOne(_validation, function (newArgs, lastArgs) {
|
|
@@ -55,7 +55,7 @@ import { countNodes } from './count-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 = "112.
|
|
58
|
+
var packageVersion = "112.5.0";
|
|
59
59
|
var setAsQueryContainerStyles = css({
|
|
60
60
|
containerName: 'ak-renderer-wrapper',
|
|
61
61
|
containerType: 'inline-size',
|
|
@@ -114,6 +114,7 @@ type RendererTTIAEP = AEP<ACTION.RENDERER_TTI, ACTION_SUBJECT.RENDERER, undefine
|
|
|
114
114
|
ttiFromInvocation: number;
|
|
115
115
|
canceled: boolean;
|
|
116
116
|
}, EVENT_TYPE.OPERATIONAL>;
|
|
117
|
-
|
|
117
|
+
type NestedTableTransformedAEP = OperationalAEP<ACTION.NESTED_TABLE_TRANSFORMED, ACTION_SUBJECT.RENDERER, undefined, undefined>;
|
|
118
|
+
export type AnalyticsEventPayload<T = void> = RendererStartAEP | RendererRenderedAEP | ComponentCrashErrorAEP | RendererUnsupportedContentLevelsTrackingSucceeded | RendererUnsupportedContentLevelsTrackingErrored | RendererSelectAllCaughtAEP | RendererSelectAllEscapedAEP | CodeBlockCopyAEP | CodeBlockWrapAEP | HeadingAnchorLinkButtonAEP | AnchorLinkAEP | TableSortColumnNotAllowedAEP | TableSortColumnAEP | VisitLinkAEP | VisitMediaLinkAEP | ExpandAEP | UnsupportedContentPayload | UnsupportedContentTooltipPayload | AnnotationAEP | AnnotationDeleteAEP | MediaLnkTransformedAEP | InvalidProsemirrorDocumentErrorAEP | RendererTTIAEP | NestedTableTransformedAEP;
|
|
118
119
|
export type FireAnalyticsCallback = <T = void>(payload: AnalyticsEventPayload<T>) => void | undefined;
|
|
119
120
|
export {};
|
|
@@ -114,6 +114,7 @@ type RendererTTIAEP = AEP<ACTION.RENDERER_TTI, ACTION_SUBJECT.RENDERER, undefine
|
|
|
114
114
|
ttiFromInvocation: number;
|
|
115
115
|
canceled: boolean;
|
|
116
116
|
}, EVENT_TYPE.OPERATIONAL>;
|
|
117
|
-
|
|
117
|
+
type NestedTableTransformedAEP = OperationalAEP<ACTION.NESTED_TABLE_TRANSFORMED, ACTION_SUBJECT.RENDERER, undefined, undefined>;
|
|
118
|
+
export type AnalyticsEventPayload<T = void> = RendererStartAEP | RendererRenderedAEP | ComponentCrashErrorAEP | RendererUnsupportedContentLevelsTrackingSucceeded | RendererUnsupportedContentLevelsTrackingErrored | RendererSelectAllCaughtAEP | RendererSelectAllEscapedAEP | CodeBlockCopyAEP | CodeBlockWrapAEP | HeadingAnchorLinkButtonAEP | AnchorLinkAEP | TableSortColumnNotAllowedAEP | TableSortColumnAEP | VisitLinkAEP | VisitMediaLinkAEP | ExpandAEP | UnsupportedContentPayload | UnsupportedContentTooltipPayload | AnnotationAEP | AnnotationDeleteAEP | MediaLnkTransformedAEP | InvalidProsemirrorDocumentErrorAEP | RendererTTIAEP | NestedTableTransformedAEP;
|
|
118
119
|
export type FireAnalyticsCallback = <T = void>(payload: AnalyticsEventPayload<T>) => void | undefined;
|
|
119
120
|
export {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/renderer",
|
|
3
|
-
"version": "112.
|
|
3
|
+
"version": "112.5.0",
|
|
4
4
|
"description": "Renderer component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -23,14 +23,14 @@
|
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@atlaskit/adf-schema": "^44.2.0",
|
|
26
|
-
"@atlaskit/adf-utils": "^19.
|
|
26
|
+
"@atlaskit/adf-utils": "^19.12.0",
|
|
27
27
|
"@atlaskit/analytics-listeners": "^8.11.0",
|
|
28
28
|
"@atlaskit/analytics-namespaced-context": "^6.12.0",
|
|
29
29
|
"@atlaskit/analytics-next": "^10.1.0",
|
|
30
30
|
"@atlaskit/button": "^20.3.0",
|
|
31
31
|
"@atlaskit/code": "^15.6.0",
|
|
32
|
-
"@atlaskit/editor-common": "^94.
|
|
33
|
-
"@atlaskit/editor-json-transformer": "^8.
|
|
32
|
+
"@atlaskit/editor-common": "^94.17.0",
|
|
33
|
+
"@atlaskit/editor-json-transformer": "^8.21.0",
|
|
34
34
|
"@atlaskit/editor-palette": "1.6.3",
|
|
35
35
|
"@atlaskit/editor-prosemirror": "6.0.0",
|
|
36
36
|
"@atlaskit/editor-shared-styles": "^3.2.0",
|
|
@@ -38,13 +38,13 @@
|
|
|
38
38
|
"@atlaskit/feature-gate-js-client": "^4.22.0",
|
|
39
39
|
"@atlaskit/icon": "^22.24.0",
|
|
40
40
|
"@atlaskit/link-datasource": "^3.8.0",
|
|
41
|
-
"@atlaskit/media-card": "^78.
|
|
42
|
-
"@atlaskit/media-client": "^28.
|
|
41
|
+
"@atlaskit/media-card": "^78.12.0",
|
|
42
|
+
"@atlaskit/media-client": "^28.2.0",
|
|
43
43
|
"@atlaskit/media-client-react": "^2.3.0",
|
|
44
44
|
"@atlaskit/media-common": "^11.7.0",
|
|
45
|
-
"@atlaskit/media-filmstrip": "^47.
|
|
46
|
-
"@atlaskit/media-ui": "^26.
|
|
47
|
-
"@atlaskit/media-viewer": "^49.
|
|
45
|
+
"@atlaskit/media-filmstrip": "^47.5.0",
|
|
46
|
+
"@atlaskit/media-ui": "^26.1.0",
|
|
47
|
+
"@atlaskit/media-viewer": "^49.3.0",
|
|
48
48
|
"@atlaskit/platform-feature-flags": "^0.3.0",
|
|
49
49
|
"@atlaskit/smart-card": "^30.2.0",
|
|
50
50
|
"@atlaskit/status": "^1.5.0",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"@atlaskit/theme": "^14.0.0",
|
|
53
53
|
"@atlaskit/tmp-editor-statsig": "^2.12.0",
|
|
54
54
|
"@atlaskit/tokens": "^2.2.0",
|
|
55
|
-
"@atlaskit/tooltip": "^18.
|
|
55
|
+
"@atlaskit/tooltip": "^18.9.0",
|
|
56
56
|
"@babel/runtime": "^7.0.0",
|
|
57
57
|
"@emotion/react": "^11.7.1",
|
|
58
58
|
"lodash": "^4.17.21",
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"@atlaskit/linking-common": "^6.0.0",
|
|
78
78
|
"@atlaskit/media-core": "^34.3.0",
|
|
79
79
|
"@atlaskit/media-integration-test-helpers": "^3.1.0",
|
|
80
|
-
"@atlaskit/media-test-helpers": "^34.
|
|
80
|
+
"@atlaskit/media-test-helpers": "^34.6.0",
|
|
81
81
|
"@atlaskit/mention": "^23.3.0",
|
|
82
82
|
"@atlaskit/navigation-next": "^9.0.0",
|
|
83
83
|
"@atlaskit/util-data-test": "^17.12.0",
|
|
@@ -126,7 +126,7 @@
|
|
|
126
126
|
"annotations_align_editor_and_renderer_styles": {
|
|
127
127
|
"type": "boolean"
|
|
128
128
|
},
|
|
129
|
-
"
|
|
129
|
+
"platform_editor_react18_phase2_v2": {
|
|
130
130
|
"type": "boolean"
|
|
131
131
|
},
|
|
132
132
|
"platform-fix-table-ssr-resizing": {
|
|
@@ -149,6 +149,9 @@
|
|
|
149
149
|
},
|
|
150
150
|
"platform_editor_advanced_layouts_breakout_resizing": {
|
|
151
151
|
"type": "boolean"
|
|
152
|
+
},
|
|
153
|
+
"platform_editor_use_nested_table_pm_nodes": {
|
|
154
|
+
"type": "boolean"
|
|
152
155
|
}
|
|
153
156
|
},
|
|
154
157
|
"af:exports": {
|