@atlaskit/renderer 111.1.2 → 111.1.3
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 +8 -0
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/cjs/ui/annotations/hooks/use-load-annotations.js +2 -11
- package/dist/cjs/ui/annotations/index.js +4 -8
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/es2019/ui/annotations/hooks/use-load-annotations.js +2 -9
- package/dist/es2019/ui/annotations/index.js +4 -8
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/dist/esm/ui/annotations/hooks/use-load-annotations.js +2 -11
- package/dist/esm/ui/annotations/index.js +4 -8
- package/dist/types/ui/annotations/hooks/use-load-annotations.d.ts +1 -4
- package/dist/types-ts4.5/ui/annotations/hooks/use-load-annotations.d.ts +1 -4
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 111.1.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#148476](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/148476)
|
|
8
|
+
[`4a3547a1691e2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4a3547a1691e2) -
|
|
9
|
+
Reverting change to add onLoadComplete callback for useLoadAnnotations annotations hook
|
|
10
|
+
|
|
3
11
|
## 111.1.2
|
|
4
12
|
|
|
5
13
|
### Patch Changes
|
|
@@ -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 = "111.1.
|
|
68
|
+
var packageVersion = "111.1.3";
|
|
69
69
|
var setAsQueryContainerStyles = (0, _react2.css)({
|
|
70
70
|
containerName: 'ak-renderer-wrapper',
|
|
71
71
|
containerType: 'inline-size',
|
|
@@ -14,8 +14,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
|
|
|
14
14
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
15
15
|
var useLoadAnnotations = exports.useLoadAnnotations = function useLoadAnnotations(_ref) {
|
|
16
16
|
var adfDocument = _ref.adfDocument,
|
|
17
|
-
isNestedRender = _ref.isNestedRender
|
|
18
|
-
onLoadComplete = _ref.onLoadComplete;
|
|
17
|
+
isNestedRender = _ref.isNestedRender;
|
|
19
18
|
var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
|
|
20
19
|
var providers = (0, _react.useContext)(_context.ProvidersContext);
|
|
21
20
|
(0, _react.useEffect)(function () {
|
|
@@ -28,9 +27,6 @@ var useLoadAnnotations = exports.useLoadAnnotations = function useLoadAnnotation
|
|
|
28
27
|
var annotations = actions.getAnnotationMarks();
|
|
29
28
|
// we don't want to request integrators for state with an empty list of ids.
|
|
30
29
|
if (!annotations.length) {
|
|
31
|
-
onLoadComplete && onLoadComplete({
|
|
32
|
-
numberOfUnresolvedInlineComments: 0
|
|
33
|
-
});
|
|
34
30
|
return;
|
|
35
31
|
}
|
|
36
32
|
var ids = annotations.map(function (mark) {
|
|
@@ -44,12 +40,7 @@ var useLoadAnnotations = exports.useLoadAnnotations = function useLoadAnnotation
|
|
|
44
40
|
return _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2.default)({}, value.id, value));
|
|
45
41
|
}, {});
|
|
46
42
|
updateSubscriberInlineComment.emit(_types.AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
|
|
47
|
-
onLoadComplete && onLoadComplete({
|
|
48
|
-
numberOfUnresolvedInlineComments: data.filter(function (data) {
|
|
49
|
-
return data.state === 'active';
|
|
50
|
-
}).length
|
|
51
|
-
});
|
|
52
43
|
};
|
|
53
44
|
inlineCommentGetState(ids, isNestedRender).then(cb);
|
|
54
|
-
}, [actions, providers, adfDocument, isNestedRender
|
|
45
|
+
}, [actions, providers, adfDocument, isNestedRender]);
|
|
55
46
|
};
|
|
@@ -31,12 +31,10 @@ var _draft = require("./draft");
|
|
|
31
31
|
var _element = require("./element");
|
|
32
32
|
var LoadAnnotations = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
33
33
|
var adfDocument = _ref.adfDocument,
|
|
34
|
-
isNestedRender = _ref.isNestedRender
|
|
35
|
-
onLoadComplete = _ref.onLoadComplete;
|
|
34
|
+
isNestedRender = _ref.isNestedRender;
|
|
36
35
|
(0, _useLoadAnnotations.useLoadAnnotations)({
|
|
37
36
|
adfDocument: adfDocument,
|
|
38
|
-
isNestedRender: isNestedRender
|
|
39
|
-
onLoadComplete: onLoadComplete
|
|
37
|
+
isNestedRender: isNestedRender
|
|
40
38
|
});
|
|
41
39
|
return null;
|
|
42
40
|
});
|
|
@@ -54,8 +52,7 @@ var AnnotationsWrapper = exports.AnnotationsWrapper = function AnnotationsWrappe
|
|
|
54
52
|
annotationProvider = props.annotationProvider,
|
|
55
53
|
rendererRef = props.rendererRef,
|
|
56
54
|
adfDocument = props.adfDocument,
|
|
57
|
-
isNestedRender = props.isNestedRender
|
|
58
|
-
onLoadComplete = props.onLoadComplete;
|
|
55
|
+
isNestedRender = props.isNestedRender;
|
|
59
56
|
var updateSubscriber = annotationProvider && annotationProvider.inlineComment && annotationProvider.inlineComment.updateSubscriber;
|
|
60
57
|
var inlineCommentAnnotationsState = (0, _useEvents.useAnnotationStateByTypeEvent)({
|
|
61
58
|
type: _adfSchema.AnnotationTypes.INLINE_COMMENT,
|
|
@@ -74,8 +71,7 @@ var AnnotationsWrapper = exports.AnnotationsWrapper = function AnnotationsWrappe
|
|
|
74
71
|
rendererRef: rendererRef
|
|
75
72
|
}, /*#__PURE__*/_react.default.createElement(LoadAnnotations, {
|
|
76
73
|
adfDocument: adfDocument,
|
|
77
|
-
isNestedRender: isNestedRender
|
|
78
|
-
onLoadComplete: onLoadComplete
|
|
74
|
+
isNestedRender: isNestedRender
|
|
79
75
|
}), /*#__PURE__*/_react.default.createElement(_view.AnnotationView, {
|
|
80
76
|
createAnalyticsEvent: createAnalyticsEvent
|
|
81
77
|
}), children)))));
|
|
@@ -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 = "111.1.
|
|
48
|
+
const packageVersion = "111.1.3";
|
|
49
49
|
const setAsQueryContainerStyles = css({
|
|
50
50
|
containerName: 'ak-renderer-wrapper',
|
|
51
51
|
containerType: 'inline-size',
|
|
@@ -4,8 +4,7 @@ import { ProvidersContext } from '../context';
|
|
|
4
4
|
import { RendererContext as ActionsContext } from '../../RendererActionsContext';
|
|
5
5
|
export const useLoadAnnotations = ({
|
|
6
6
|
adfDocument,
|
|
7
|
-
isNestedRender
|
|
8
|
-
onLoadComplete
|
|
7
|
+
isNestedRender
|
|
9
8
|
}) => {
|
|
10
9
|
const actions = useContext(ActionsContext);
|
|
11
10
|
const providers = useContext(ProvidersContext);
|
|
@@ -22,9 +21,6 @@ export const useLoadAnnotations = ({
|
|
|
22
21
|
const annotations = actions.getAnnotationMarks();
|
|
23
22
|
// we don't want to request integrators for state with an empty list of ids.
|
|
24
23
|
if (!annotations.length) {
|
|
25
|
-
onLoadComplete && onLoadComplete({
|
|
26
|
-
numberOfUnresolvedInlineComments: 0
|
|
27
|
-
});
|
|
28
24
|
return;
|
|
29
25
|
}
|
|
30
26
|
const ids = annotations.map(mark => mark.attrs.id);
|
|
@@ -37,10 +33,7 @@ export const useLoadAnnotations = ({
|
|
|
37
33
|
[value.id]: value
|
|
38
34
|
}), {});
|
|
39
35
|
updateSubscriberInlineComment.emit(AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
|
|
40
|
-
onLoadComplete && onLoadComplete({
|
|
41
|
-
numberOfUnresolvedInlineComments: data.filter(data => data.state === 'active').length
|
|
42
|
-
});
|
|
43
36
|
};
|
|
44
37
|
inlineCommentGetState(ids, isNestedRender).then(cb);
|
|
45
|
-
}, [actions, providers, adfDocument, isNestedRender
|
|
38
|
+
}, [actions, providers, adfDocument, isNestedRender]);
|
|
46
39
|
};
|
|
@@ -10,13 +10,11 @@ import { AnnotationRangeProvider } from './contexts/AnnotationRangeContext';
|
|
|
10
10
|
import { AnnotationHoverContext } from './contexts/AnnotationHoverContext';
|
|
11
11
|
const LoadAnnotations = /*#__PURE__*/React.memo(({
|
|
12
12
|
adfDocument,
|
|
13
|
-
isNestedRender
|
|
14
|
-
onLoadComplete
|
|
13
|
+
isNestedRender
|
|
15
14
|
}) => {
|
|
16
15
|
useLoadAnnotations({
|
|
17
16
|
adfDocument,
|
|
18
|
-
isNestedRender
|
|
19
|
-
onLoadComplete
|
|
17
|
+
isNestedRender
|
|
20
18
|
});
|
|
21
19
|
return null;
|
|
22
20
|
});
|
|
@@ -35,8 +33,7 @@ export const AnnotationsWrapper = props => {
|
|
|
35
33
|
annotationProvider,
|
|
36
34
|
rendererRef,
|
|
37
35
|
adfDocument,
|
|
38
|
-
isNestedRender
|
|
39
|
-
onLoadComplete
|
|
36
|
+
isNestedRender
|
|
40
37
|
} = props;
|
|
41
38
|
const updateSubscriber = annotationProvider && annotationProvider.inlineComment && annotationProvider.inlineComment.updateSubscriber;
|
|
42
39
|
const inlineCommentAnnotationsState = useAnnotationStateByTypeEvent({
|
|
@@ -57,8 +54,7 @@ export const AnnotationsWrapper = props => {
|
|
|
57
54
|
rendererRef: rendererRef
|
|
58
55
|
}, /*#__PURE__*/React.createElement(LoadAnnotations, {
|
|
59
56
|
adfDocument: adfDocument,
|
|
60
|
-
isNestedRender: isNestedRender
|
|
61
|
-
onLoadComplete: onLoadComplete
|
|
57
|
+
isNestedRender: isNestedRender
|
|
62
58
|
}), /*#__PURE__*/React.createElement(AnnotationView, {
|
|
63
59
|
createAnalyticsEvent: createAnalyticsEvent
|
|
64
60
|
}), children)))));
|
|
@@ -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 = "111.1.
|
|
58
|
+
var packageVersion = "111.1.3";
|
|
59
59
|
var setAsQueryContainerStyles = css({
|
|
60
60
|
containerName: 'ak-renderer-wrapper',
|
|
61
61
|
containerType: 'inline-size',
|
|
@@ -7,8 +7,7 @@ import { ProvidersContext } from '../context';
|
|
|
7
7
|
import { RendererContext as ActionsContext } from '../../RendererActionsContext';
|
|
8
8
|
export var useLoadAnnotations = function useLoadAnnotations(_ref) {
|
|
9
9
|
var adfDocument = _ref.adfDocument,
|
|
10
|
-
isNestedRender = _ref.isNestedRender
|
|
11
|
-
onLoadComplete = _ref.onLoadComplete;
|
|
10
|
+
isNestedRender = _ref.isNestedRender;
|
|
12
11
|
var actions = useContext(ActionsContext);
|
|
13
12
|
var providers = useContext(ProvidersContext);
|
|
14
13
|
useEffect(function () {
|
|
@@ -21,9 +20,6 @@ export var useLoadAnnotations = function useLoadAnnotations(_ref) {
|
|
|
21
20
|
var annotations = actions.getAnnotationMarks();
|
|
22
21
|
// we don't want to request integrators for state with an empty list of ids.
|
|
23
22
|
if (!annotations.length) {
|
|
24
|
-
onLoadComplete && onLoadComplete({
|
|
25
|
-
numberOfUnresolvedInlineComments: 0
|
|
26
|
-
});
|
|
27
23
|
return;
|
|
28
24
|
}
|
|
29
25
|
var ids = annotations.map(function (mark) {
|
|
@@ -37,12 +33,7 @@ export var useLoadAnnotations = function useLoadAnnotations(_ref) {
|
|
|
37
33
|
return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, value.id, value));
|
|
38
34
|
}, {});
|
|
39
35
|
updateSubscriberInlineComment.emit(AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
|
|
40
|
-
onLoadComplete && onLoadComplete({
|
|
41
|
-
numberOfUnresolvedInlineComments: data.filter(function (data) {
|
|
42
|
-
return data.state === 'active';
|
|
43
|
-
}).length
|
|
44
|
-
});
|
|
45
36
|
};
|
|
46
37
|
inlineCommentGetState(ids, isNestedRender).then(cb);
|
|
47
|
-
}, [actions, providers, adfDocument, isNestedRender
|
|
38
|
+
}, [actions, providers, adfDocument, isNestedRender]);
|
|
48
39
|
};
|
|
@@ -10,12 +10,10 @@ import { AnnotationRangeProvider } from './contexts/AnnotationRangeContext';
|
|
|
10
10
|
import { AnnotationHoverContext } from './contexts/AnnotationHoverContext';
|
|
11
11
|
var LoadAnnotations = /*#__PURE__*/React.memo(function (_ref) {
|
|
12
12
|
var adfDocument = _ref.adfDocument,
|
|
13
|
-
isNestedRender = _ref.isNestedRender
|
|
14
|
-
onLoadComplete = _ref.onLoadComplete;
|
|
13
|
+
isNestedRender = _ref.isNestedRender;
|
|
15
14
|
useLoadAnnotations({
|
|
16
15
|
adfDocument: adfDocument,
|
|
17
|
-
isNestedRender: isNestedRender
|
|
18
|
-
onLoadComplete: onLoadComplete
|
|
16
|
+
isNestedRender: isNestedRender
|
|
19
17
|
});
|
|
20
18
|
return null;
|
|
21
19
|
});
|
|
@@ -33,8 +31,7 @@ export var AnnotationsWrapper = function AnnotationsWrapper(props) {
|
|
|
33
31
|
annotationProvider = props.annotationProvider,
|
|
34
32
|
rendererRef = props.rendererRef,
|
|
35
33
|
adfDocument = props.adfDocument,
|
|
36
|
-
isNestedRender = props.isNestedRender
|
|
37
|
-
onLoadComplete = props.onLoadComplete;
|
|
34
|
+
isNestedRender = props.isNestedRender;
|
|
38
35
|
var updateSubscriber = annotationProvider && annotationProvider.inlineComment && annotationProvider.inlineComment.updateSubscriber;
|
|
39
36
|
var inlineCommentAnnotationsState = useAnnotationStateByTypeEvent({
|
|
40
37
|
type: AnnotationTypes.INLINE_COMMENT,
|
|
@@ -53,8 +50,7 @@ export var AnnotationsWrapper = function AnnotationsWrapper(props) {
|
|
|
53
50
|
rendererRef: rendererRef
|
|
54
51
|
}, /*#__PURE__*/React.createElement(LoadAnnotations, {
|
|
55
52
|
adfDocument: adfDocument,
|
|
56
|
-
isNestedRender: isNestedRender
|
|
57
|
-
onLoadComplete: onLoadComplete
|
|
53
|
+
isNestedRender: isNestedRender
|
|
58
54
|
}), /*#__PURE__*/React.createElement(AnnotationView, {
|
|
59
55
|
createAnalyticsEvent: createAnalyticsEvent
|
|
60
56
|
}), children)))));
|
|
@@ -2,9 +2,6 @@ import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
|
|
|
2
2
|
type Props = {
|
|
3
3
|
adfDocument: JSONDocNode;
|
|
4
4
|
isNestedRender: boolean;
|
|
5
|
-
onLoadComplete?: ({ numberOfUnresolvedInlineComments, }: {
|
|
6
|
-
numberOfUnresolvedInlineComments: number;
|
|
7
|
-
}) => void;
|
|
8
5
|
};
|
|
9
|
-
export declare const useLoadAnnotations: ({ adfDocument, isNestedRender
|
|
6
|
+
export declare const useLoadAnnotations: ({ adfDocument, isNestedRender }: Props) => void;
|
|
10
7
|
export {};
|
|
@@ -2,9 +2,6 @@ import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
|
|
|
2
2
|
type Props = {
|
|
3
3
|
adfDocument: JSONDocNode;
|
|
4
4
|
isNestedRender: boolean;
|
|
5
|
-
onLoadComplete?: ({ numberOfUnresolvedInlineComments, }: {
|
|
6
|
-
numberOfUnresolvedInlineComments: number;
|
|
7
|
-
}) => void;
|
|
8
5
|
};
|
|
9
|
-
export declare const useLoadAnnotations: ({ adfDocument, isNestedRender
|
|
6
|
+
export declare const useLoadAnnotations: ({ adfDocument, isNestedRender }: Props) => void;
|
|
10
7
|
export {};
|