@atlaskit/renderer 123.1.1 → 123.2.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 +7 -0
- package/dist/cjs/ui/annotations/hooks/use-events.js +0 -4
- package/dist/cjs/ui/annotations/hover/mounter.js +12 -15
- package/dist/cjs/ui/annotations/selection/mounter.js +12 -14
- package/dist/es2019/ui/annotations/hooks/use-events.js +0 -4
- package/dist/es2019/ui/annotations/hover/mounter.js +12 -15
- package/dist/es2019/ui/annotations/selection/mounter.js +12 -14
- package/dist/esm/ui/annotations/hooks/use-events.js +0 -4
- package/dist/esm/ui/annotations/hover/mounter.js +12 -15
- package/dist/esm/ui/annotations/selection/mounter.js +12 -14
- package/package.json +5 -11
package/CHANGELOG.md
CHANGED
|
@@ -12,7 +12,6 @@ var _types = require("@atlaskit/editor-common/types");
|
|
|
12
12
|
var _adfSchema = require("@atlaskit/adf-schema");
|
|
13
13
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
14
14
|
var _types2 = require("@atlaskit/analytics-listeners/types");
|
|
15
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
16
15
|
var _AnnotationManagerContext = require("../contexts/AnnotationManagerContext");
|
|
17
16
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
18
17
|
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; }
|
|
@@ -97,9 +96,6 @@ var useHasFocusEvent = exports.useHasFocusEvent = function useHasFocusEvent(_ref
|
|
|
97
96
|
};
|
|
98
97
|
var removeHoverEffect = function removeHoverEffect() {
|
|
99
98
|
setIsHovered(false);
|
|
100
|
-
if (document.activeElement instanceof HTMLElement && !(0, _platformFeatureFlags.fg)('confluence_frontend_comments_panel_editor_focus')) {
|
|
101
|
-
document.activeElement.blur();
|
|
102
|
-
}
|
|
103
99
|
};
|
|
104
100
|
if (!isAnnotationManagerEnabled) {
|
|
105
101
|
updateSubscriber.on(_types.AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, cb);
|
|
@@ -12,7 +12,6 @@ var _types = require("@atlaskit/analytics-listeners/types");
|
|
|
12
12
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
13
13
|
var _RendererActionsContext = require("../../RendererActionsContext");
|
|
14
14
|
var _AnnotationRangeContext = require("../contexts/AnnotationRangeContext");
|
|
15
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
16
15
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
17
16
|
var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props) {
|
|
18
17
|
var Component = props.component,
|
|
@@ -102,20 +101,18 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
|
|
|
102
101
|
});
|
|
103
102
|
var positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
|
|
104
103
|
if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
|
|
105
|
-
if (
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
}).fire(_types.FabricChannel.editor);
|
|
118
|
-
}
|
|
104
|
+
if (createAnalyticsEvent) {
|
|
105
|
+
createAnalyticsEvent({
|
|
106
|
+
action: _analytics.ACTION.CREATE_NOT_ALLOWED,
|
|
107
|
+
actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
|
|
108
|
+
actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
109
|
+
attributes: {
|
|
110
|
+
positionToAnnotate: positionToAnnotate,
|
|
111
|
+
applyAnnotationMissing: !applyAnnotation,
|
|
112
|
+
annotationId: options.annotationId
|
|
113
|
+
},
|
|
114
|
+
eventType: _analytics.EVENT_TYPE.TRACK
|
|
115
|
+
}).fire(_types.FabricChannel.editor);
|
|
119
116
|
}
|
|
120
117
|
return false;
|
|
121
118
|
}
|
|
@@ -153,20 +153,18 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
|
|
|
153
153
|
// use platform_editor_comments_api_manager here so we can clear the code path when the flag is removed
|
|
154
154
|
var positionToAnnotate = (0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager') ? documentPosition : selectionDraftDocumentPosition || documentPosition;
|
|
155
155
|
if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
|
|
156
|
-
if (
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
}).fire(_types.FabricChannel.editor);
|
|
169
|
-
}
|
|
156
|
+
if (createAnalyticsEvent) {
|
|
157
|
+
createAnalyticsEvent({
|
|
158
|
+
action: _analytics.ACTION.CREATE_NOT_ALLOWED,
|
|
159
|
+
actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
|
|
160
|
+
actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
161
|
+
attributes: {
|
|
162
|
+
positionToAnnotate: positionToAnnotate,
|
|
163
|
+
applyAnnotationMissing: !applyAnnotation,
|
|
164
|
+
annotationId: options.annotationId
|
|
165
|
+
},
|
|
166
|
+
eventType: _analytics.EVENT_TYPE.TRACK
|
|
167
|
+
}).fire(_types.FabricChannel.editor);
|
|
170
168
|
}
|
|
171
169
|
return false;
|
|
172
170
|
}
|
|
@@ -3,7 +3,6 @@ import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
|
|
|
3
3
|
import { AnnotationTypes } from '@atlaskit/adf-schema';
|
|
4
4
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
|
|
5
5
|
import { FabricChannel } from '@atlaskit/analytics-listeners/types';
|
|
6
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
6
|
import { useAnnotationManagerDispatch, useAnnotationManagerState } from '../contexts/AnnotationManagerContext';
|
|
8
7
|
export const useAnnotationStateByTypeEvent = ({
|
|
9
8
|
type,
|
|
@@ -92,9 +91,6 @@ export const useHasFocusEvent = ({
|
|
|
92
91
|
};
|
|
93
92
|
const removeHoverEffect = () => {
|
|
94
93
|
setIsHovered(false);
|
|
95
|
-
if (document.activeElement instanceof HTMLElement && !fg('confluence_frontend_comments_panel_editor_focus')) {
|
|
96
|
-
document.activeElement.blur();
|
|
97
|
-
}
|
|
98
94
|
};
|
|
99
95
|
if (!isAnnotationManagerEnabled) {
|
|
100
96
|
updateSubscriber.on(AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, cb);
|
|
@@ -5,7 +5,6 @@ import { FabricChannel } from '@atlaskit/analytics-listeners/types';
|
|
|
5
5
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
|
|
6
6
|
import { RendererContext as ActionsContext } from '../../RendererActionsContext';
|
|
7
7
|
import { useAnnotationRangeDispatch, useAnnotationRangeState } from '../contexts/AnnotationRangeContext';
|
|
8
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
8
|
export const Mounter = /*#__PURE__*/React.memo(props => {
|
|
10
9
|
const {
|
|
11
10
|
component: Component,
|
|
@@ -98,20 +97,18 @@ export const Mounter = /*#__PURE__*/React.memo(props => {
|
|
|
98
97
|
});
|
|
99
98
|
const positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
|
|
100
99
|
if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
|
|
101
|
-
if (
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
}).fire(FabricChannel.editor);
|
|
114
|
-
}
|
|
100
|
+
if (createAnalyticsEvent) {
|
|
101
|
+
createAnalyticsEvent({
|
|
102
|
+
action: ACTION.CREATE_NOT_ALLOWED,
|
|
103
|
+
actionSubject: ACTION_SUBJECT.ANNOTATION,
|
|
104
|
+
actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
105
|
+
attributes: {
|
|
106
|
+
positionToAnnotate,
|
|
107
|
+
applyAnnotationMissing: !applyAnnotation,
|
|
108
|
+
annotationId: options.annotationId
|
|
109
|
+
},
|
|
110
|
+
eventType: EVENT_TYPE.TRACK
|
|
111
|
+
}).fire(FabricChannel.editor);
|
|
115
112
|
}
|
|
116
113
|
return false;
|
|
117
114
|
}
|
|
@@ -150,20 +150,18 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
|
|
|
150
150
|
// use platform_editor_comments_api_manager here so we can clear the code path when the flag is removed
|
|
151
151
|
const positionToAnnotate = fg('platform_editor_comments_api_manager') ? documentPosition : selectionDraftDocumentPosition || documentPosition;
|
|
152
152
|
if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
|
|
153
|
-
if (
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
}).fire(FabricChannel.editor);
|
|
166
|
-
}
|
|
153
|
+
if (createAnalyticsEvent) {
|
|
154
|
+
createAnalyticsEvent({
|
|
155
|
+
action: ACTION.CREATE_NOT_ALLOWED,
|
|
156
|
+
actionSubject: ACTION_SUBJECT.ANNOTATION,
|
|
157
|
+
actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
158
|
+
attributes: {
|
|
159
|
+
positionToAnnotate,
|
|
160
|
+
applyAnnotationMissing: !applyAnnotation,
|
|
161
|
+
annotationId: options.annotationId
|
|
162
|
+
},
|
|
163
|
+
eventType: EVENT_TYPE.TRACK
|
|
164
|
+
}).fire(FabricChannel.editor);
|
|
167
165
|
}
|
|
168
166
|
return false;
|
|
169
167
|
}
|
|
@@ -7,7 +7,6 @@ import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
|
|
|
7
7
|
import { AnnotationTypes } from '@atlaskit/adf-schema';
|
|
8
8
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
|
|
9
9
|
import { FabricChannel } from '@atlaskit/analytics-listeners/types';
|
|
10
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
11
10
|
import { useAnnotationManagerDispatch, useAnnotationManagerState } from '../contexts/AnnotationManagerContext';
|
|
12
11
|
export var useAnnotationStateByTypeEvent = function useAnnotationStateByTypeEvent(_ref) {
|
|
13
12
|
var type = _ref.type,
|
|
@@ -90,9 +89,6 @@ export var useHasFocusEvent = function useHasFocusEvent(_ref2) {
|
|
|
90
89
|
};
|
|
91
90
|
var removeHoverEffect = function removeHoverEffect() {
|
|
92
91
|
setIsHovered(false);
|
|
93
|
-
if (document.activeElement instanceof HTMLElement && !fg('confluence_frontend_comments_panel_editor_focus')) {
|
|
94
|
-
document.activeElement.blur();
|
|
95
|
-
}
|
|
96
92
|
};
|
|
97
93
|
if (!isAnnotationManagerEnabled) {
|
|
98
94
|
updateSubscriber.on(AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, cb);
|
|
@@ -5,7 +5,6 @@ import { FabricChannel } from '@atlaskit/analytics-listeners/types';
|
|
|
5
5
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
|
|
6
6
|
import { RendererContext as ActionsContext } from '../../RendererActionsContext';
|
|
7
7
|
import { useAnnotationRangeDispatch, useAnnotationRangeState } from '../contexts/AnnotationRangeContext';
|
|
8
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
8
|
export var Mounter = /*#__PURE__*/React.memo(function (props) {
|
|
10
9
|
var Component = props.component,
|
|
11
10
|
range = props.range,
|
|
@@ -94,20 +93,18 @@ export var Mounter = /*#__PURE__*/React.memo(function (props) {
|
|
|
94
93
|
});
|
|
95
94
|
var positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
|
|
96
95
|
if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
|
|
97
|
-
if (
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
}).fire(FabricChannel.editor);
|
|
110
|
-
}
|
|
96
|
+
if (createAnalyticsEvent) {
|
|
97
|
+
createAnalyticsEvent({
|
|
98
|
+
action: ACTION.CREATE_NOT_ALLOWED,
|
|
99
|
+
actionSubject: ACTION_SUBJECT.ANNOTATION,
|
|
100
|
+
actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
101
|
+
attributes: {
|
|
102
|
+
positionToAnnotate: positionToAnnotate,
|
|
103
|
+
applyAnnotationMissing: !applyAnnotation,
|
|
104
|
+
annotationId: options.annotationId
|
|
105
|
+
},
|
|
106
|
+
eventType: EVENT_TYPE.TRACK
|
|
107
|
+
}).fire(FabricChannel.editor);
|
|
111
108
|
}
|
|
112
109
|
return false;
|
|
113
110
|
}
|
|
@@ -144,20 +144,18 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
|
|
|
144
144
|
// use platform_editor_comments_api_manager here so we can clear the code path when the flag is removed
|
|
145
145
|
var positionToAnnotate = fg('platform_editor_comments_api_manager') ? documentPosition : selectionDraftDocumentPosition || documentPosition;
|
|
146
146
|
if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
|
|
147
|
-
if (
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
}).fire(FabricChannel.editor);
|
|
160
|
-
}
|
|
147
|
+
if (createAnalyticsEvent) {
|
|
148
|
+
createAnalyticsEvent({
|
|
149
|
+
action: ACTION.CREATE_NOT_ALLOWED,
|
|
150
|
+
actionSubject: ACTION_SUBJECT.ANNOTATION,
|
|
151
|
+
actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
|
|
152
|
+
attributes: {
|
|
153
|
+
positionToAnnotate: positionToAnnotate,
|
|
154
|
+
applyAnnotationMissing: !applyAnnotation,
|
|
155
|
+
annotationId: options.annotationId
|
|
156
|
+
},
|
|
157
|
+
eventType: EVENT_TYPE.TRACK
|
|
158
|
+
}).fire(FabricChannel.editor);
|
|
161
159
|
}
|
|
162
160
|
return false;
|
|
163
161
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/renderer",
|
|
3
|
-
"version": "123.
|
|
3
|
+
"version": "123.2.0",
|
|
4
4
|
"description": "Renderer component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"@atlaskit/editor-tables": "^2.9.0",
|
|
38
38
|
"@atlaskit/emoji": "^69.5.0",
|
|
39
39
|
"@atlaskit/feature-gate-js-client": "^5.5.0",
|
|
40
|
-
"@atlaskit/icon": "^28.
|
|
40
|
+
"@atlaskit/icon": "^28.2.0",
|
|
41
41
|
"@atlaskit/link": "^3.2.0",
|
|
42
42
|
"@atlaskit/link-datasource": "^4.23.0",
|
|
43
43
|
"@atlaskit/media-card": "^79.5.0",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"@atlaskit/status": "^3.0.0",
|
|
55
55
|
"@atlaskit/task-decision": "^19.2.0",
|
|
56
56
|
"@atlaskit/theme": "^21.0.0",
|
|
57
|
-
"@atlaskit/tmp-editor-statsig": "^12.
|
|
57
|
+
"@atlaskit/tmp-editor-statsig": "^12.22.0",
|
|
58
58
|
"@atlaskit/tokens": "^6.3.0",
|
|
59
59
|
"@atlaskit/tooltip": "^20.4.0",
|
|
60
60
|
"@atlaskit/visually-hidden": "^3.0.0",
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"uuid": "^3.1.0"
|
|
69
69
|
},
|
|
70
70
|
"peerDependencies": {
|
|
71
|
-
"@atlaskit/editor-common": "^109.
|
|
71
|
+
"@atlaskit/editor-common": "^109.7.0",
|
|
72
72
|
"@atlaskit/link-provider": "^4.0.0",
|
|
73
73
|
"@atlaskit/media-core": "^37.0.0",
|
|
74
74
|
"react": "^18.2.0",
|
|
@@ -82,7 +82,7 @@
|
|
|
82
82
|
"@atlaskit/css-reset": "^7.3.0",
|
|
83
83
|
"@atlaskit/link-provider": "^4.0.0",
|
|
84
84
|
"@atlaskit/link-test-helpers": "^8.3.0",
|
|
85
|
-
"@atlaskit/linking-common": "^9.
|
|
85
|
+
"@atlaskit/linking-common": "^9.6.0",
|
|
86
86
|
"@atlaskit/media-core": "^37.0.0",
|
|
87
87
|
"@atlaskit/media-integration-test-helpers": "workspace:^",
|
|
88
88
|
"@atlaskit/media-test-helpers": "^39.0.0",
|
|
@@ -125,9 +125,6 @@
|
|
|
125
125
|
"confluence_frontend_table_scrollbar_ttvc_fix": {
|
|
126
126
|
"type": "boolean"
|
|
127
127
|
},
|
|
128
|
-
"cc_comments_improve_apply_draft_errors": {
|
|
129
|
-
"type": "boolean"
|
|
130
|
-
},
|
|
131
128
|
"cc_comments_create_inline_experience_entry_point": {
|
|
132
129
|
"type": "boolean"
|
|
133
130
|
},
|
|
@@ -242,9 +239,6 @@
|
|
|
242
239
|
"issue_table_single_line_row_height_fast_follows": {
|
|
243
240
|
"type": "boolean"
|
|
244
241
|
},
|
|
245
|
-
"confluence_frontend_comments_panel_editor_focus": {
|
|
246
|
-
"type": "boolean"
|
|
247
|
-
},
|
|
248
242
|
"platform_custom_number_column": {
|
|
249
243
|
"type": "boolean"
|
|
250
244
|
},
|