@atlaskit/renderer 112.13.0 → 112.14.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 +20 -0
- package/dist/cjs/react/index.js +3 -2
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/cjs/ui/annotations/element/mark.js +3 -4
- package/dist/cjs/ui/annotations/hooks/use-events.js +5 -8
- package/dist/es2019/react/index.js +3 -2
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/es2019/ui/annotations/element/mark.js +3 -4
- package/dist/es2019/ui/annotations/hooks/use-events.js +5 -8
- package/dist/esm/react/index.js +3 -2
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/dist/esm/ui/annotations/element/mark.js +3 -4
- package/dist/esm/ui/annotations/hooks/use-events.js +5 -8
- package/package.json +5 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 112.14.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#108891](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108891)
|
|
8
|
+
[`f2cdf63d500f1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f2cdf63d500f1) -
|
|
9
|
+
Removing rolled out feature gate
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- Updated dependencies
|
|
14
|
+
|
|
15
|
+
## 112.13.1
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- [#112949](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/112949)
|
|
20
|
+
[`3204ff13be49e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3204ff13be49e) -
|
|
21
|
+
[ux] ED-26481 Disable sticky headers for nested tables in renderer
|
|
22
|
+
|
|
3
23
|
## 112.13.0
|
|
4
24
|
|
|
5
25
|
### Minor Changes
|
package/dist/cjs/react/index.js
CHANGED
|
@@ -394,11 +394,12 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
|
|
|
394
394
|
key: "getTableProps",
|
|
395
395
|
value: function getTableProps(node) {
|
|
396
396
|
var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
397
|
-
// TODO: https://product-fabric.atlassian.net/browse/CEMS-1048
|
|
398
|
-
var stickyHeaders = !(0, _rendererNode.insideBreakoutLayout)(path) ? this.stickyHeaders : undefined;
|
|
399
397
|
var isInsideOfBlockNode = (0, _rendererNode.insideBlockNode)(path, node.type.schema);
|
|
400
398
|
var isInsideMultiBodiedExtension = (0, _rendererNode.insideMultiBodiedExtension)(path, node.type.schema);
|
|
401
399
|
var isInsideOfTable = (0, _rendererNode.insideTable)(path, node.type.schema);
|
|
400
|
+
|
|
401
|
+
// TODO: https://product-fabric.atlassian.net/browse/CEMS-1048
|
|
402
|
+
var stickyHeaders = !isInsideOfTable && !(0, _rendererNode.insideBreakoutLayout)(path) ? this.stickyHeaders : undefined;
|
|
402
403
|
return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
|
|
403
404
|
allowColumnSorting: this.allowColumnSorting,
|
|
404
405
|
columnWidths:
|
|
@@ -64,7 +64,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
64
64
|
var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
65
65
|
var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
66
66
|
var packageName = "@atlaskit/renderer";
|
|
67
|
-
var packageVersion = "112.
|
|
67
|
+
var packageVersion = "112.14.0";
|
|
68
68
|
var setAsQueryContainerStyles = (0, _react2.css)({
|
|
69
69
|
containerName: 'ak-renderer-wrapper',
|
|
70
70
|
containerType: 'inline-size',
|
|
@@ -63,7 +63,6 @@ var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
|
|
|
63
63
|
isHovered = _ref.isHovered,
|
|
64
64
|
onClick = _ref.onClick,
|
|
65
65
|
useBlockLevel = _ref.useBlockLevel;
|
|
66
|
-
var isInlineCommentsKbAccessible = (0, _platformFeatureFlags.fg)('inline_comments_keyboard_accessible_renderer');
|
|
67
66
|
var intl = (0, _reactIntlNext.useIntl)();
|
|
68
67
|
var annotationIds = (0, _react.useMemo)(function () {
|
|
69
68
|
return (0, _toConsumableArray2.default)(new Set([].concat((0, _toConsumableArray2.default)(annotationParentIds), [id])));
|
|
@@ -114,12 +113,12 @@ var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
|
|
|
114
113
|
'data-has-focus': hasFocus,
|
|
115
114
|
'data-is-hovered': isHovered
|
|
116
115
|
});
|
|
117
|
-
var desktopAccessibilityAttributes =
|
|
116
|
+
var desktopAccessibilityAttributes = isMobile() ? {} : {
|
|
118
117
|
role: 'button',
|
|
119
118
|
tabIndex: 0,
|
|
120
119
|
onKeyDown: onMarkEnter,
|
|
121
120
|
'aria-expanded': hasFocus
|
|
122
|
-
}
|
|
121
|
+
};
|
|
123
122
|
var accessibility = state !== _adfSchema.AnnotationMarkStates.ACTIVE ? {
|
|
124
123
|
'aria-disabled': true
|
|
125
124
|
} : _objectSpread({
|
|
@@ -129,7 +128,7 @@ var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
|
|
|
129
128
|
if (isMobile()) {
|
|
130
129
|
return {};
|
|
131
130
|
}
|
|
132
|
-
if (
|
|
131
|
+
if (state !== _adfSchema.AnnotationMarkStates.RESOLVED) {
|
|
133
132
|
var startMarker = intl.formatMessage(_messages.inlineCommentMessages.contentRendererInlineCommentMarkerStart);
|
|
134
133
|
var endMarker = intl.formatMessage(_messages.inlineCommentMessages.contentRendererInlineCommentMarkerEnd);
|
|
135
134
|
return accessibilityStyles(startMarker, endMarker);
|
|
@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
9
9
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
10
10
|
var _react = require("react");
|
|
11
11
|
var _types = require("@atlaskit/editor-common/types");
|
|
12
|
-
var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
|
|
13
12
|
var _adfSchema = require("@atlaskit/adf-schema");
|
|
14
13
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
15
14
|
var _types2 = require("@atlaskit/analytics-listeners/types");
|
|
@@ -58,7 +57,6 @@ var useHasFocusEvent = exports.useHasFocusEvent = function useHasFocusEvent(_ref
|
|
|
58
57
|
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
|
|
59
58
|
isHovered = _useState6[0],
|
|
60
59
|
setIsHovered = _useState6[1];
|
|
61
|
-
var isInlineCommentsKbAccessible = _featureGateJsClient.default.checkGate('inline_comments_keyboard_accessible_renderer');
|
|
62
60
|
(0, _react.useLayoutEffect)(function () {
|
|
63
61
|
if (!updateSubscriber) {
|
|
64
62
|
return;
|
|
@@ -71,13 +69,13 @@ var useHasFocusEvent = exports.useHasFocusEvent = function useHasFocusEvent(_ref
|
|
|
71
69
|
};
|
|
72
70
|
var removeFocus = function removeFocus() {
|
|
73
71
|
setHasFocus(false);
|
|
74
|
-
if (
|
|
72
|
+
if (document.activeElement instanceof HTMLElement) {
|
|
75
73
|
document.activeElement.blur();
|
|
76
74
|
}
|
|
77
75
|
};
|
|
78
76
|
var removeHoverEffect = function removeHoverEffect() {
|
|
79
77
|
setIsHovered(false);
|
|
80
|
-
if (
|
|
78
|
+
if (document.activeElement instanceof HTMLElement) {
|
|
81
79
|
document.activeElement.blur();
|
|
82
80
|
}
|
|
83
81
|
};
|
|
@@ -91,7 +89,7 @@ var useHasFocusEvent = exports.useHasFocusEvent = function useHasFocusEvent(_ref
|
|
|
91
89
|
updateSubscriber.off(_types.AnnotationUpdateEvent.REMOVE_ANNOTATION_FOCUS, removeFocus);
|
|
92
90
|
updateSubscriber.off(_types.AnnotationUpdateEvent.SET_ANNOTATION_HOVERED, removeHoverEffect);
|
|
93
91
|
};
|
|
94
|
-
}, [id, updateSubscriber
|
|
92
|
+
}, [id, updateSubscriber]);
|
|
95
93
|
return {
|
|
96
94
|
hasFocus: hasFocus,
|
|
97
95
|
isHovered: isHovered
|
|
@@ -105,7 +103,6 @@ var useAnnotationClickEvent = exports.useAnnotationClickEvent = function useAnno
|
|
|
105
103
|
var updateSubscriber = props.updateSubscriber,
|
|
106
104
|
createAnalyticsEvent = props.createAnalyticsEvent,
|
|
107
105
|
isNestedRender = props.isNestedRender;
|
|
108
|
-
var isInlineCommentsKbAccessible = _featureGateJsClient.default.checkGate('inline_comments_keyboard_accessible_renderer');
|
|
109
106
|
(0, _react.useLayoutEffect)(function () {
|
|
110
107
|
if (!updateSubscriber || isNestedRender) {
|
|
111
108
|
return;
|
|
@@ -146,7 +143,7 @@ var useAnnotationClickEvent = exports.useAnnotationClickEvent = function useAnno
|
|
|
146
143
|
annotations: [],
|
|
147
144
|
clickElementTarget: undefined
|
|
148
145
|
});
|
|
149
|
-
if (
|
|
146
|
+
if (document.activeElement instanceof HTMLElement) {
|
|
150
147
|
document.activeElement.blur();
|
|
151
148
|
}
|
|
152
149
|
};
|
|
@@ -156,6 +153,6 @@ var useAnnotationClickEvent = exports.useAnnotationClickEvent = function useAnno
|
|
|
156
153
|
updateSubscriber.off(_types.AnnotationUpdateEvent.ON_ANNOTATION_CLICK, clickCb);
|
|
157
154
|
updateSubscriber.off(_types.AnnotationUpdateEvent.DESELECT_ANNOTATIONS, deselectCb);
|
|
158
155
|
};
|
|
159
|
-
}, [updateSubscriber, createAnalyticsEvent,
|
|
156
|
+
}, [updateSubscriber, createAnalyticsEvent, isNestedRender]);
|
|
160
157
|
return annotationClickEvent;
|
|
161
158
|
};
|
|
@@ -361,11 +361,12 @@ export default class ReactSerializer {
|
|
|
361
361
|
};
|
|
362
362
|
}
|
|
363
363
|
getTableProps(node, path = []) {
|
|
364
|
-
// TODO: https://product-fabric.atlassian.net/browse/CEMS-1048
|
|
365
|
-
const stickyHeaders = !insideBreakoutLayout(path) ? this.stickyHeaders : undefined;
|
|
366
364
|
const isInsideOfBlockNode = insideBlockNode(path, node.type.schema);
|
|
367
365
|
const isInsideMultiBodiedExtension = insideMultiBodiedExtension(path, node.type.schema);
|
|
368
366
|
const isInsideOfTable = insideTable(path, node.type.schema);
|
|
367
|
+
|
|
368
|
+
// TODO: https://product-fabric.atlassian.net/browse/CEMS-1048
|
|
369
|
+
const stickyHeaders = !isInsideOfTable && !insideBreakoutLayout(path) ? this.stickyHeaders : undefined;
|
|
369
370
|
return {
|
|
370
371
|
...this.getProps(node),
|
|
371
372
|
allowColumnSorting: this.allowColumnSorting,
|
|
@@ -45,7 +45,7 @@ import { TruncatedWrapper } from './truncated-wrapper';
|
|
|
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.14.0";
|
|
49
49
|
const setAsQueryContainerStyles = css({
|
|
50
50
|
containerName: 'ak-renderer-wrapper',
|
|
51
51
|
containerType: 'inline-size',
|
|
@@ -66,7 +66,6 @@ export const MarkComponent = ({
|
|
|
66
66
|
onClick,
|
|
67
67
|
useBlockLevel
|
|
68
68
|
}) => {
|
|
69
|
-
const isInlineCommentsKbAccessible = fg('inline_comments_keyboard_accessible_renderer');
|
|
70
69
|
const intl = useIntl();
|
|
71
70
|
const annotationIds = useMemo(() => [...new Set([...annotationParentIds, id])], [id, annotationParentIds]);
|
|
72
71
|
const onMarkClick = useCallback(event => {
|
|
@@ -116,12 +115,12 @@ export const MarkComponent = ({
|
|
|
116
115
|
'data-has-focus': hasFocus,
|
|
117
116
|
'data-is-hovered': isHovered
|
|
118
117
|
};
|
|
119
|
-
const desktopAccessibilityAttributes =
|
|
118
|
+
const desktopAccessibilityAttributes = isMobile() ? {} : {
|
|
120
119
|
role: 'button',
|
|
121
120
|
tabIndex: 0,
|
|
122
121
|
onKeyDown: onMarkEnter,
|
|
123
122
|
'aria-expanded': hasFocus
|
|
124
|
-
}
|
|
123
|
+
};
|
|
125
124
|
const accessibility = state !== AnnotationMarkStates.ACTIVE ? {
|
|
126
125
|
'aria-disabled': true
|
|
127
126
|
} : {
|
|
@@ -132,7 +131,7 @@ export const MarkComponent = ({
|
|
|
132
131
|
if (isMobile()) {
|
|
133
132
|
return {};
|
|
134
133
|
}
|
|
135
|
-
if (
|
|
134
|
+
if (state !== AnnotationMarkStates.RESOLVED) {
|
|
136
135
|
const startMarker = intl.formatMessage(inlineCommentMessages.contentRendererInlineCommentMarkerStart);
|
|
137
136
|
const endMarker = intl.formatMessage(inlineCommentMessages.contentRendererInlineCommentMarkerEnd);
|
|
138
137
|
return accessibilityStyles(startMarker, endMarker);
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { useLayoutEffect, useState } from 'react';
|
|
2
2
|
import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
|
|
3
|
-
import FeatureGates from '@atlaskit/feature-gate-js-client';
|
|
4
3
|
import { AnnotationTypes } from '@atlaskit/adf-schema';
|
|
5
4
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
|
|
6
5
|
import { FabricChannel } from '@atlaskit/analytics-listeners/types';
|
|
@@ -46,7 +45,6 @@ export const useHasFocusEvent = ({
|
|
|
46
45
|
}) => {
|
|
47
46
|
const [hasFocus, setHasFocus] = useState(false);
|
|
48
47
|
const [isHovered, setIsHovered] = useState(false);
|
|
49
|
-
const isInlineCommentsKbAccessible = FeatureGates.checkGate('inline_comments_keyboard_accessible_renderer');
|
|
50
48
|
useLayoutEffect(() => {
|
|
51
49
|
if (!updateSubscriber) {
|
|
52
50
|
return;
|
|
@@ -59,13 +57,13 @@ export const useHasFocusEvent = ({
|
|
|
59
57
|
};
|
|
60
58
|
const removeFocus = () => {
|
|
61
59
|
setHasFocus(false);
|
|
62
|
-
if (
|
|
60
|
+
if (document.activeElement instanceof HTMLElement) {
|
|
63
61
|
document.activeElement.blur();
|
|
64
62
|
}
|
|
65
63
|
};
|
|
66
64
|
const removeHoverEffect = () => {
|
|
67
65
|
setIsHovered(false);
|
|
68
|
-
if (
|
|
66
|
+
if (document.activeElement instanceof HTMLElement) {
|
|
69
67
|
document.activeElement.blur();
|
|
70
68
|
}
|
|
71
69
|
};
|
|
@@ -79,7 +77,7 @@ export const useHasFocusEvent = ({
|
|
|
79
77
|
updateSubscriber.off(AnnotationUpdateEvent.REMOVE_ANNOTATION_FOCUS, removeFocus);
|
|
80
78
|
updateSubscriber.off(AnnotationUpdateEvent.SET_ANNOTATION_HOVERED, removeHoverEffect);
|
|
81
79
|
};
|
|
82
|
-
}, [id, updateSubscriber
|
|
80
|
+
}, [id, updateSubscriber]);
|
|
83
81
|
return {
|
|
84
82
|
hasFocus,
|
|
85
83
|
isHovered
|
|
@@ -92,7 +90,6 @@ export const useAnnotationClickEvent = props => {
|
|
|
92
90
|
createAnalyticsEvent,
|
|
93
91
|
isNestedRender
|
|
94
92
|
} = props;
|
|
95
|
-
const isInlineCommentsKbAccessible = FeatureGates.checkGate('inline_comments_keyboard_accessible_renderer');
|
|
96
93
|
useLayoutEffect(() => {
|
|
97
94
|
if (!updateSubscriber || isNestedRender) {
|
|
98
95
|
return;
|
|
@@ -130,7 +127,7 @@ export const useAnnotationClickEvent = props => {
|
|
|
130
127
|
annotations: [],
|
|
131
128
|
clickElementTarget: undefined
|
|
132
129
|
});
|
|
133
|
-
if (
|
|
130
|
+
if (document.activeElement instanceof HTMLElement) {
|
|
134
131
|
document.activeElement.blur();
|
|
135
132
|
}
|
|
136
133
|
};
|
|
@@ -140,6 +137,6 @@ export const useAnnotationClickEvent = props => {
|
|
|
140
137
|
updateSubscriber.off(AnnotationUpdateEvent.ON_ANNOTATION_CLICK, clickCb);
|
|
141
138
|
updateSubscriber.off(AnnotationUpdateEvent.DESELECT_ANNOTATIONS, deselectCb);
|
|
142
139
|
};
|
|
143
|
-
}, [updateSubscriber, createAnalyticsEvent,
|
|
140
|
+
}, [updateSubscriber, createAnalyticsEvent, isNestedRender]);
|
|
144
141
|
return annotationClickEvent;
|
|
145
142
|
};
|
package/dist/esm/react/index.js
CHANGED
|
@@ -387,11 +387,12 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
387
387
|
key: "getTableProps",
|
|
388
388
|
value: function getTableProps(node) {
|
|
389
389
|
var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
390
|
-
// TODO: https://product-fabric.atlassian.net/browse/CEMS-1048
|
|
391
|
-
var stickyHeaders = !insideBreakoutLayout(path) ? this.stickyHeaders : undefined;
|
|
392
390
|
var isInsideOfBlockNode = insideBlockNode(path, node.type.schema);
|
|
393
391
|
var isInsideMultiBodiedExtension = insideMultiBodiedExtension(path, node.type.schema);
|
|
394
392
|
var isInsideOfTable = insideTable(path, node.type.schema);
|
|
393
|
+
|
|
394
|
+
// TODO: https://product-fabric.atlassian.net/browse/CEMS-1048
|
|
395
|
+
var stickyHeaders = !isInsideOfTable && !insideBreakoutLayout(path) ? this.stickyHeaders : undefined;
|
|
395
396
|
return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
|
|
396
397
|
allowColumnSorting: this.allowColumnSorting,
|
|
397
398
|
columnWidths:
|
|
@@ -54,7 +54,7 @@ import { TruncatedWrapper } from './truncated-wrapper';
|
|
|
54
54
|
export var NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
55
55
|
export var DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
56
56
|
var packageName = "@atlaskit/renderer";
|
|
57
|
-
var packageVersion = "112.
|
|
57
|
+
var packageVersion = "112.14.0";
|
|
58
58
|
var setAsQueryContainerStyles = css({
|
|
59
59
|
containerName: 'ak-renderer-wrapper',
|
|
60
60
|
containerType: 'inline-size',
|
|
@@ -58,7 +58,6 @@ export var MarkComponent = function MarkComponent(_ref) {
|
|
|
58
58
|
isHovered = _ref.isHovered,
|
|
59
59
|
onClick = _ref.onClick,
|
|
60
60
|
useBlockLevel = _ref.useBlockLevel;
|
|
61
|
-
var isInlineCommentsKbAccessible = fg('inline_comments_keyboard_accessible_renderer');
|
|
62
61
|
var intl = useIntl();
|
|
63
62
|
var annotationIds = useMemo(function () {
|
|
64
63
|
return _toConsumableArray(new Set([].concat(_toConsumableArray(annotationParentIds), [id])));
|
|
@@ -109,12 +108,12 @@ export var MarkComponent = function MarkComponent(_ref) {
|
|
|
109
108
|
'data-has-focus': hasFocus,
|
|
110
109
|
'data-is-hovered': isHovered
|
|
111
110
|
});
|
|
112
|
-
var desktopAccessibilityAttributes =
|
|
111
|
+
var desktopAccessibilityAttributes = isMobile() ? {} : {
|
|
113
112
|
role: 'button',
|
|
114
113
|
tabIndex: 0,
|
|
115
114
|
onKeyDown: onMarkEnter,
|
|
116
115
|
'aria-expanded': hasFocus
|
|
117
|
-
}
|
|
116
|
+
};
|
|
118
117
|
var accessibility = state !== AnnotationMarkStates.ACTIVE ? {
|
|
119
118
|
'aria-disabled': true
|
|
120
119
|
} : _objectSpread({
|
|
@@ -124,7 +123,7 @@ export var MarkComponent = function MarkComponent(_ref) {
|
|
|
124
123
|
if (isMobile()) {
|
|
125
124
|
return {};
|
|
126
125
|
}
|
|
127
|
-
if (
|
|
126
|
+
if (state !== AnnotationMarkStates.RESOLVED) {
|
|
128
127
|
var startMarker = intl.formatMessage(inlineCommentMessages.contentRendererInlineCommentMarkerStart);
|
|
129
128
|
var endMarker = intl.formatMessage(inlineCommentMessages.contentRendererInlineCommentMarkerEnd);
|
|
130
129
|
return accessibilityStyles(startMarker, endMarker);
|
|
@@ -4,7 +4,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
|
|
|
4
4
|
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) { _defineProperty(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; }
|
|
5
5
|
import { useLayoutEffect, useState } from 'react';
|
|
6
6
|
import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
|
|
7
|
-
import FeatureGates from '@atlaskit/feature-gate-js-client';
|
|
8
7
|
import { AnnotationTypes } from '@atlaskit/adf-schema';
|
|
9
8
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
|
|
10
9
|
import { FabricChannel } from '@atlaskit/analytics-listeners/types';
|
|
@@ -51,7 +50,6 @@ export var useHasFocusEvent = function useHasFocusEvent(_ref2) {
|
|
|
51
50
|
_useState6 = _slicedToArray(_useState5, 2),
|
|
52
51
|
isHovered = _useState6[0],
|
|
53
52
|
setIsHovered = _useState6[1];
|
|
54
|
-
var isInlineCommentsKbAccessible = FeatureGates.checkGate('inline_comments_keyboard_accessible_renderer');
|
|
55
53
|
useLayoutEffect(function () {
|
|
56
54
|
if (!updateSubscriber) {
|
|
57
55
|
return;
|
|
@@ -64,13 +62,13 @@ export var useHasFocusEvent = function useHasFocusEvent(_ref2) {
|
|
|
64
62
|
};
|
|
65
63
|
var removeFocus = function removeFocus() {
|
|
66
64
|
setHasFocus(false);
|
|
67
|
-
if (
|
|
65
|
+
if (document.activeElement instanceof HTMLElement) {
|
|
68
66
|
document.activeElement.blur();
|
|
69
67
|
}
|
|
70
68
|
};
|
|
71
69
|
var removeHoverEffect = function removeHoverEffect() {
|
|
72
70
|
setIsHovered(false);
|
|
73
|
-
if (
|
|
71
|
+
if (document.activeElement instanceof HTMLElement) {
|
|
74
72
|
document.activeElement.blur();
|
|
75
73
|
}
|
|
76
74
|
};
|
|
@@ -84,7 +82,7 @@ export var useHasFocusEvent = function useHasFocusEvent(_ref2) {
|
|
|
84
82
|
updateSubscriber.off(AnnotationUpdateEvent.REMOVE_ANNOTATION_FOCUS, removeFocus);
|
|
85
83
|
updateSubscriber.off(AnnotationUpdateEvent.SET_ANNOTATION_HOVERED, removeHoverEffect);
|
|
86
84
|
};
|
|
87
|
-
}, [id, updateSubscriber
|
|
85
|
+
}, [id, updateSubscriber]);
|
|
88
86
|
return {
|
|
89
87
|
hasFocus: hasFocus,
|
|
90
88
|
isHovered: isHovered
|
|
@@ -98,7 +96,6 @@ export var useAnnotationClickEvent = function useAnnotationClickEvent(props) {
|
|
|
98
96
|
var updateSubscriber = props.updateSubscriber,
|
|
99
97
|
createAnalyticsEvent = props.createAnalyticsEvent,
|
|
100
98
|
isNestedRender = props.isNestedRender;
|
|
101
|
-
var isInlineCommentsKbAccessible = FeatureGates.checkGate('inline_comments_keyboard_accessible_renderer');
|
|
102
99
|
useLayoutEffect(function () {
|
|
103
100
|
if (!updateSubscriber || isNestedRender) {
|
|
104
101
|
return;
|
|
@@ -139,7 +136,7 @@ export var useAnnotationClickEvent = function useAnnotationClickEvent(props) {
|
|
|
139
136
|
annotations: [],
|
|
140
137
|
clickElementTarget: undefined
|
|
141
138
|
});
|
|
142
|
-
if (
|
|
139
|
+
if (document.activeElement instanceof HTMLElement) {
|
|
143
140
|
document.activeElement.blur();
|
|
144
141
|
}
|
|
145
142
|
};
|
|
@@ -149,6 +146,6 @@ export var useAnnotationClickEvent = function useAnnotationClickEvent(props) {
|
|
|
149
146
|
updateSubscriber.off(AnnotationUpdateEvent.ON_ANNOTATION_CLICK, clickCb);
|
|
150
147
|
updateSubscriber.off(AnnotationUpdateEvent.DESELECT_ANNOTATIONS, deselectCb);
|
|
151
148
|
};
|
|
152
|
-
}, [updateSubscriber, createAnalyticsEvent,
|
|
149
|
+
}, [updateSubscriber, createAnalyticsEvent, isNestedRender]);
|
|
153
150
|
return annotationClickEvent;
|
|
154
151
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/renderer",
|
|
3
|
-
"version": "112.
|
|
3
|
+
"version": "112.14.0",
|
|
4
4
|
"description": "Renderer component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -29,14 +29,14 @@
|
|
|
29
29
|
"@atlaskit/analytics-next": "^10.3.0",
|
|
30
30
|
"@atlaskit/button": "^20.5.0",
|
|
31
31
|
"@atlaskit/code": "^15.7.0",
|
|
32
|
-
"@atlaskit/editor-common": "^99.
|
|
32
|
+
"@atlaskit/editor-common": "^99.12.0",
|
|
33
33
|
"@atlaskit/editor-json-transformer": "^8.23.0",
|
|
34
34
|
"@atlaskit/editor-palette": "1.7.0",
|
|
35
35
|
"@atlaskit/editor-prosemirror": "7.0.0",
|
|
36
36
|
"@atlaskit/editor-shared-styles": "^3.2.0",
|
|
37
37
|
"@atlaskit/emoji": "^67.13.0",
|
|
38
38
|
"@atlaskit/feature-gate-js-client": "^4.23.0",
|
|
39
|
-
"@atlaskit/icon": "^23.
|
|
39
|
+
"@atlaskit/icon": "^23.8.0",
|
|
40
40
|
"@atlaskit/link-datasource": "^3.19.0",
|
|
41
41
|
"@atlaskit/media-card": "^78.19.0",
|
|
42
42
|
"@atlaskit/media-client": "^31.1.0",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"@atlaskit/status": "^1.9.0",
|
|
51
51
|
"@atlaskit/task-decision": "^17.12.0",
|
|
52
52
|
"@atlaskit/theme": "^15.0.0",
|
|
53
|
-
"@atlaskit/tmp-editor-statsig": "^2.
|
|
53
|
+
"@atlaskit/tmp-editor-statsig": "^2.45.0",
|
|
54
54
|
"@atlaskit/tokens": "^3.3.0",
|
|
55
55
|
"@atlaskit/tooltip": "^19.1.0",
|
|
56
56
|
"@atlaskit/visually-hidden": "^1.6.0",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"@af/integration-testing": "*",
|
|
74
74
|
"@af/visual-regression": "*",
|
|
75
75
|
"@atlaskit/analytics-gas-types": "^5.1.0",
|
|
76
|
-
"@atlaskit/css-reset": "^6.
|
|
76
|
+
"@atlaskit/css-reset": "^6.13.0",
|
|
77
77
|
"@atlaskit/link-provider": "^1.19.0",
|
|
78
78
|
"@atlaskit/link-test-helpers": "^7.6.0",
|
|
79
79
|
"@atlaskit/linking-common": "^6.3.0",
|
|
@@ -158,9 +158,6 @@
|
|
|
158
158
|
"platform_editor_nested_tables_renderer_styles": {
|
|
159
159
|
"type": "boolean"
|
|
160
160
|
},
|
|
161
|
-
"inline_comments_keyboard_accessible_renderer": {
|
|
162
|
-
"type": "boolean"
|
|
163
|
-
},
|
|
164
161
|
"confluence-frontend-comments-panel": {
|
|
165
162
|
"type": "boolean"
|
|
166
163
|
},
|