@atlaskit/editor-common 99.8.0 → 99.9.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 +18 -0
- package/dist/cjs/extensibility/Extension/Extension/index.js +3 -2
- package/dist/cjs/extensibility/Extension/InlineExtension/index.js +3 -2
- package/dist/cjs/extensibility/Extension.js +11 -1
- package/dist/cjs/extensibility/ExtensionComponent.js +28 -14
- package/dist/cjs/extensibility/MultiBodiedExtension/index.js +3 -2
- package/dist/cjs/monitoring/error.js +1 -1
- package/dist/cjs/ui/DropList/index.js +1 -1
- package/dist/es2019/extensibility/Extension/Extension/index.js +3 -2
- package/dist/es2019/extensibility/Extension/InlineExtension/index.js +3 -2
- package/dist/es2019/extensibility/Extension.js +12 -1
- package/dist/es2019/extensibility/ExtensionComponent.js +28 -14
- package/dist/es2019/extensibility/MultiBodiedExtension/index.js +3 -2
- package/dist/es2019/monitoring/error.js +1 -1
- package/dist/es2019/ui/DropList/index.js +1 -1
- package/dist/esm/extensibility/Extension/Extension/index.js +3 -2
- package/dist/esm/extensibility/Extension/InlineExtension/index.js +3 -2
- package/dist/esm/extensibility/Extension.js +11 -1
- package/dist/esm/extensibility/ExtensionComponent.js +28 -14
- package/dist/esm/extensibility/MultiBodiedExtension/index.js +3 -2
- package/dist/esm/monitoring/error.js +1 -1
- package/dist/esm/ui/DropList/index.js +1 -1
- package/dist/types/extensibility/Extension/Extension/index.d.ts +1 -0
- package/dist/types/extensibility/Extension/InlineExtension/index.d.ts +1 -0
- package/dist/types/extensibility/ExtensionComponent.d.ts +1 -0
- package/dist/types/extensibility/MultiBodiedExtension/index.d.ts +1 -0
- package/dist/types/types/feature-flags.d.ts +0 -8
- package/dist/types-ts4.5/extensibility/Extension/Extension/index.d.ts +1 -0
- package/dist/types-ts4.5/extensibility/Extension/InlineExtension/index.d.ts +1 -0
- package/dist/types-ts4.5/extensibility/ExtensionComponent.d.ts +1 -0
- package/dist/types-ts4.5/extensibility/MultiBodiedExtension/index.d.ts +1 -0
- package/dist/types-ts4.5/types/feature-flags.d.ts +0 -8
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @atlaskit/editor-common
|
|
2
2
|
|
|
3
|
+
## 99.9.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#108912](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108912)
|
|
8
|
+
[`4f43a6293679e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4f43a6293679e) -
|
|
9
|
+
[ux] Adds logic to hide macro interactions during view mode of live pages
|
|
10
|
+
|
|
11
|
+
## 99.8.1
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- [#107782](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107782)
|
|
16
|
+
[`cccc7a8347929`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cccc7a8347929) -
|
|
17
|
+
[ux] ED-26378 Remove editor_nest_media_and_codeblock_in_quotes_jira and
|
|
18
|
+
nestMediaAndCodeblockInQuote
|
|
19
|
+
- Updated dependencies
|
|
20
|
+
|
|
3
21
|
## 99.8.0
|
|
4
22
|
|
|
5
23
|
### Minor Changes
|
|
@@ -51,7 +51,8 @@ function ExtensionWithPluginState(props) {
|
|
|
51
51
|
showUpdatedLivePages1PBodiedExtensionUI = props.showUpdatedLivePages1PBodiedExtensionUI,
|
|
52
52
|
showBodiedExtensionRendererView = props.showBodiedExtensionRendererView,
|
|
53
53
|
setShowBodiedExtensionRendererView = props.setShowBodiedExtensionRendererView,
|
|
54
|
-
pluginInjectionApi = props.pluginInjectionApi
|
|
54
|
+
pluginInjectionApi = props.pluginInjectionApi,
|
|
55
|
+
isLivePageViewMode = props.isLivePageViewMode;
|
|
55
56
|
var _ref = macroInteractionDesignFeatureFlags || {},
|
|
56
57
|
showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
|
|
57
58
|
var hasBody = ['bodiedExtension', 'multiBodiedExtension'].includes(node.type.name);
|
|
@@ -120,7 +121,7 @@ function ExtensionWithPluginState(props) {
|
|
|
120
121
|
setIsNodeHovered(didHover);
|
|
121
122
|
}
|
|
122
123
|
};
|
|
123
|
-
return (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && (0, _react2.jsx)(_Lozenge.default, {
|
|
124
|
+
return (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && (0, _react2.jsx)(_Lozenge.default, {
|
|
124
125
|
isNodeSelected: isNodeSelected,
|
|
125
126
|
isNodeHovered: isNodeHovered,
|
|
126
127
|
isNodeNested: isNodeNested,
|
|
@@ -31,7 +31,8 @@ var InlineExtension = function InlineExtension(props) {
|
|
|
31
31
|
isNodeSelected = props.isNodeSelected,
|
|
32
32
|
children = props.children,
|
|
33
33
|
isNodeHovered = props.isNodeHovered,
|
|
34
|
-
setIsNodeHovered = props.setIsNodeHovered
|
|
34
|
+
setIsNodeHovered = props.setIsNodeHovered,
|
|
35
|
+
isLivePageViewMode = props.isLivePageViewMode;
|
|
35
36
|
var _ref = macroInteractionDesignFeatureFlags || {},
|
|
36
37
|
showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
|
|
37
38
|
var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['width']),
|
|
@@ -49,7 +50,7 @@ var InlineExtension = function InlineExtension(props) {
|
|
|
49
50
|
setIsNodeHovered(didHover);
|
|
50
51
|
}
|
|
51
52
|
};
|
|
52
|
-
var inlineExtensionInternal = (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && (0, _react2.jsx)(_Lozenge.default, {
|
|
53
|
+
var inlineExtensionInternal = (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && (0, _react2.jsx)(_Lozenge.default, {
|
|
53
54
|
node: node,
|
|
54
55
|
isNodeSelected: isNodeSelected,
|
|
55
56
|
isNodeHovered: isNodeHovered,
|
|
@@ -27,6 +27,7 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
|
|
|
27
27
|
(0, _classCallCheck2.default)(this, Extension);
|
|
28
28
|
_this = _callSuper(this, Extension, [props]);
|
|
29
29
|
(0, _defineProperty2.default)(_this, "renderWithProvider", function (_ref) {
|
|
30
|
+
var _pluginInjectionApi$e;
|
|
30
31
|
var extensionProvider = _ref.extensionProvider;
|
|
31
32
|
var _this$props = _this.props,
|
|
32
33
|
node = _this$props.node,
|
|
@@ -42,6 +43,14 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
|
|
|
42
43
|
showLivePagesBodiedMacrosRendererView = _this$props.showLivePagesBodiedMacrosRendererView,
|
|
43
44
|
showUpdatedLivePages1PBodiedExtensionUI = _this$props.showUpdatedLivePages1PBodiedExtensionUI,
|
|
44
45
|
rendererExtensionHandlers = _this$props.rendererExtensionHandlers;
|
|
46
|
+
|
|
47
|
+
// Extensions are not yet using the new plugin architecture, and the use of the pluginInjectionApi
|
|
48
|
+
// is not type safe in editor-common.
|
|
49
|
+
// @ts-ignore
|
|
50
|
+
var currentState = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.sharedState) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.currentState();
|
|
51
|
+
var _ref2 = currentState || {},
|
|
52
|
+
contentMode = _ref2.contentMode;
|
|
53
|
+
var isLivePageViewMode = contentMode === 'live-view';
|
|
45
54
|
return /*#__PURE__*/_react.default.createElement(_ExtensionComponent.ExtensionComponent, {
|
|
46
55
|
editorView: editorView,
|
|
47
56
|
node: node,
|
|
@@ -56,7 +65,8 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
|
|
|
56
65
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
57
66
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
58
67
|
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
59
|
-
rendererExtensionHandlers: rendererExtensionHandlers
|
|
68
|
+
rendererExtensionHandlers: rendererExtensionHandlers,
|
|
69
|
+
isLivePageViewMode: isLivePageViewMode
|
|
60
70
|
});
|
|
61
71
|
});
|
|
62
72
|
_this.providerFactory = props.providerFactory || new _providerFactory.ProviderFactory();
|
|
@@ -58,9 +58,12 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
|
|
|
58
58
|
(0, _defineProperty2.default)(_this, "getNodeRenderer", (0, _memoizeOne.default)(_extensions.getNodeRenderer));
|
|
59
59
|
(0, _defineProperty2.default)(_this, "getExtensionModuleNodePrivateProps", (0, _memoizeOne.default)(_extensions.getExtensionModuleNodePrivateProps));
|
|
60
60
|
(0, _defineProperty2.default)(_this, "setIsNodeHovered", function (isHovered) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
61
|
+
// Don't want to show hover interactions for live page view mode
|
|
62
|
+
if (!_this.props.isLivePageViewMode) {
|
|
63
|
+
_this.setState({
|
|
64
|
+
isNodeHovered: isHovered
|
|
65
|
+
});
|
|
66
|
+
}
|
|
64
67
|
});
|
|
65
68
|
(0, _defineProperty2.default)(_this, "setShowBodiedExtensionRendererView", function (showRendererView) {
|
|
66
69
|
_this.setState({
|
|
@@ -249,7 +252,8 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
|
|
|
249
252
|
eventDispatcher = _this$props3.eventDispatcher,
|
|
250
253
|
macroInteractionDesignFeatureFlags = _this$props3.macroInteractionDesignFeatureFlags,
|
|
251
254
|
showLivePagesBodiedMacrosRendererView = _this$props3.showLivePagesBodiedMacrosRendererView,
|
|
252
|
-
showUpdatedLivePages1PBodiedExtensionUI = _this$props3.showUpdatedLivePages1PBodiedExtensionUI
|
|
255
|
+
showUpdatedLivePages1PBodiedExtensionUI = _this$props3.showUpdatedLivePages1PBodiedExtensionUI,
|
|
256
|
+
isLivePageViewMode = _this$props3.isLivePageViewMode;
|
|
253
257
|
var selection = editorView.state.selection;
|
|
254
258
|
var selectedNode = selection instanceof _state.NodeSelection && selection.node;
|
|
255
259
|
var position = typeof getPos === 'function' && getPos();
|
|
@@ -269,7 +273,8 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
|
|
|
269
273
|
isNodeSelected: selectedNode === node,
|
|
270
274
|
isNodeNested: isNodeNested,
|
|
271
275
|
isNodeHovered: this.state.isNodeHovered,
|
|
272
|
-
setIsNodeHovered: this.setIsNodeHovered
|
|
276
|
+
setIsNodeHovered: this.setIsNodeHovered,
|
|
277
|
+
isLivePageViewMode: isLivePageViewMode
|
|
273
278
|
});
|
|
274
279
|
}
|
|
275
280
|
var extensionHandlerResult = this.tryExtensionHandler(undefined);
|
|
@@ -294,7 +299,8 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
|
|
|
294
299
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))),
|
|
295
300
|
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI((0, _utils.nodeToJSON)(node))),
|
|
296
301
|
showBodiedExtensionRendererView: this.state.showBodiedExtensionRendererView,
|
|
297
|
-
setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView
|
|
302
|
+
setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView,
|
|
303
|
+
isLivePageViewMode: isLivePageViewMode
|
|
298
304
|
}, extensionHandlerResult);
|
|
299
305
|
case 'inlineExtension':
|
|
300
306
|
return /*#__PURE__*/_react.default.createElement(_InlineExtension.default, {
|
|
@@ -303,7 +309,8 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
|
|
|
303
309
|
isNodeSelected: selectedNode === node,
|
|
304
310
|
pluginInjectionApi: pluginInjectionApi,
|
|
305
311
|
isNodeHovered: this.state.isNodeHovered,
|
|
306
|
-
setIsNodeHovered: this.setIsNodeHovered
|
|
312
|
+
setIsNodeHovered: this.setIsNodeHovered,
|
|
313
|
+
isLivePageViewMode: isLivePageViewMode
|
|
307
314
|
}, extensionHandlerResult);
|
|
308
315
|
default:
|
|
309
316
|
return null;
|
|
@@ -380,9 +387,12 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
380
387
|
(0, _defineProperty2.default)(_this2, "getNodeRenderer", (0, _memoizeOne.default)(_extensions.getNodeRenderer));
|
|
381
388
|
(0, _defineProperty2.default)(_this2, "getExtensionModuleNodePrivateProps", (0, _memoizeOne.default)(_extensions.getExtensionModuleNodePrivateProps));
|
|
382
389
|
(0, _defineProperty2.default)(_this2, "setIsNodeHovered", function (isHovered) {
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
390
|
+
// Don't want to show hover interactions for live page view mode
|
|
391
|
+
if (!_this2.props.isLivePageViewMode) {
|
|
392
|
+
_this2.setState({
|
|
393
|
+
isNodeHovered: isHovered
|
|
394
|
+
});
|
|
395
|
+
}
|
|
386
396
|
});
|
|
387
397
|
/**
|
|
388
398
|
* Parses any private nodes once an extension provider is available.
|
|
@@ -518,7 +528,8 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
518
528
|
showLivePagesBodiedMacrosRendererView = _this$props4.showLivePagesBodiedMacrosRendererView,
|
|
519
529
|
showUpdatedLivePages1PBodiedExtensionUI = _this$props4.showUpdatedLivePages1PBodiedExtensionUI,
|
|
520
530
|
showBodiedExtensionRendererView = _this$props4.showBodiedExtensionRendererView,
|
|
521
|
-
setShowBodiedExtensionRendererView = _this$props4.setShowBodiedExtensionRendererView
|
|
531
|
+
setShowBodiedExtensionRendererView = _this$props4.setShowBodiedExtensionRendererView,
|
|
532
|
+
isLivePageViewMode = _this$props4.isLivePageViewMode;
|
|
522
533
|
var selection = editorView.state.selection;
|
|
523
534
|
var selectedNode = selection instanceof _state.NodeSelection && selection.node;
|
|
524
535
|
var position = typeof getPos === 'function' && getPos();
|
|
@@ -538,7 +549,8 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
538
549
|
isNodeSelected: selectedNode === node,
|
|
539
550
|
isNodeNested: isNodeNested,
|
|
540
551
|
isNodeHovered: this.state.isNodeHovered,
|
|
541
|
-
setIsNodeHovered: this.setIsNodeHovered
|
|
552
|
+
setIsNodeHovered: this.setIsNodeHovered,
|
|
553
|
+
isLivePageViewMode: isLivePageViewMode
|
|
542
554
|
});
|
|
543
555
|
}
|
|
544
556
|
var extensionHandlerResult = this.tryExtensionHandler(undefined);
|
|
@@ -563,7 +575,8 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
563
575
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))),
|
|
564
576
|
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI((0, _utils.nodeToJSON)(node))),
|
|
565
577
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
566
|
-
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
578
|
+
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView,
|
|
579
|
+
isLivePageViewMode: isLivePageViewMode
|
|
567
580
|
}, extensionHandlerResult);
|
|
568
581
|
case 'inlineExtension':
|
|
569
582
|
return /*#__PURE__*/_react.default.createElement(_InlineExtension.default, {
|
|
@@ -572,7 +585,8 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
572
585
|
isNodeSelected: selectedNode === node,
|
|
573
586
|
pluginInjectionApi: pluginInjectionApi,
|
|
574
587
|
isNodeHovered: this.state.isNodeHovered,
|
|
575
|
-
setIsNodeHovered: this.setIsNodeHovered
|
|
588
|
+
setIsNodeHovered: this.setIsNodeHovered,
|
|
589
|
+
isLivePageViewMode: isLivePageViewMode
|
|
576
590
|
}, extensionHandlerResult);
|
|
577
591
|
default:
|
|
578
592
|
return null;
|
|
@@ -90,7 +90,8 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
|
|
|
90
90
|
isNodeHovered = _ref.isNodeHovered,
|
|
91
91
|
isNodeNested = _ref.isNodeNested,
|
|
92
92
|
setIsNodeHovered = _ref.setIsNodeHovered,
|
|
93
|
-
pluginInjectionApi = _ref.pluginInjectionApi
|
|
93
|
+
pluginInjectionApi = _ref.pluginInjectionApi,
|
|
94
|
+
isLivePageViewMode = _ref.isLivePageViewMode;
|
|
94
95
|
var _ref2 = macroInteractionDesignFeatureFlags || {},
|
|
95
96
|
showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates;
|
|
96
97
|
var _node$attrs = node.attrs,
|
|
@@ -164,7 +165,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
|
|
|
164
165
|
setIsNodeHovered(didHover);
|
|
165
166
|
}
|
|
166
167
|
};
|
|
167
|
-
return (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && (0, _react2.jsx)(_Lozenge.default, {
|
|
168
|
+
return (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && (0, _react2.jsx)(_Lozenge.default, {
|
|
168
169
|
isNodeSelected: isNodeSelected,
|
|
169
170
|
node: node,
|
|
170
171
|
showMacroInteractionDesignUpdates: true,
|
|
@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
|
|
|
17
17
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
18
18
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
19
19
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
20
|
-
var packageVersion = "99.
|
|
20
|
+
var packageVersion = "99.9.0";
|
|
21
21
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
22
22
|
// Remove URL as it has UGC
|
|
23
23
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
23
23
|
* @jsx jsx
|
|
24
24
|
*/ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
25
25
|
var packageName = "@atlaskit/editor-common";
|
|
26
|
-
var packageVersion = "99.
|
|
26
|
+
var packageVersion = "99.9.0";
|
|
27
27
|
var halfFocusRing = 1;
|
|
28
28
|
var dropOffset = '0, 8';
|
|
29
29
|
// Ignored via go/ees005
|
|
@@ -38,7 +38,8 @@ function ExtensionWithPluginState(props) {
|
|
|
38
38
|
showUpdatedLivePages1PBodiedExtensionUI,
|
|
39
39
|
showBodiedExtensionRendererView,
|
|
40
40
|
setShowBodiedExtensionRendererView,
|
|
41
|
-
pluginInjectionApi
|
|
41
|
+
pluginInjectionApi,
|
|
42
|
+
isLivePageViewMode
|
|
42
43
|
} = props;
|
|
43
44
|
const {
|
|
44
45
|
showMacroInteractionDesignUpdates
|
|
@@ -118,7 +119,7 @@ function ExtensionWithPluginState(props) {
|
|
|
118
119
|
setIsNodeHovered(didHover);
|
|
119
120
|
}
|
|
120
121
|
};
|
|
121
|
-
return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
|
|
122
|
+
return jsx(Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
|
|
122
123
|
isNodeSelected: isNodeSelected,
|
|
123
124
|
isNodeHovered: isNodeHovered,
|
|
124
125
|
isNodeNested: isNodeNested,
|
|
@@ -21,7 +21,8 @@ const InlineExtension = props => {
|
|
|
21
21
|
isNodeSelected,
|
|
22
22
|
children,
|
|
23
23
|
isNodeHovered,
|
|
24
|
-
setIsNodeHovered
|
|
24
|
+
setIsNodeHovered,
|
|
25
|
+
isLivePageViewMode
|
|
25
26
|
} = props;
|
|
26
27
|
const {
|
|
27
28
|
showMacroInteractionDesignUpdates
|
|
@@ -42,7 +43,7 @@ const InlineExtension = props => {
|
|
|
42
43
|
setIsNodeHovered(didHover);
|
|
43
44
|
}
|
|
44
45
|
};
|
|
45
|
-
const inlineExtensionInternal = jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
|
|
46
|
+
const inlineExtensionInternal = jsx(Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
|
|
46
47
|
node: node,
|
|
47
48
|
isNodeSelected: isNodeSelected,
|
|
48
49
|
isNodeHovered: isNodeHovered,
|
|
@@ -10,6 +10,7 @@ export class Extension extends Component {
|
|
|
10
10
|
_defineProperty(this, "renderWithProvider", ({
|
|
11
11
|
extensionProvider
|
|
12
12
|
}) => {
|
|
13
|
+
var _pluginInjectionApi$e, _pluginInjectionApi$e2;
|
|
13
14
|
const {
|
|
14
15
|
node,
|
|
15
16
|
getPos,
|
|
@@ -25,6 +26,15 @@ export class Extension extends Component {
|
|
|
25
26
|
showUpdatedLivePages1PBodiedExtensionUI,
|
|
26
27
|
rendererExtensionHandlers
|
|
27
28
|
} = this.props;
|
|
29
|
+
|
|
30
|
+
// Extensions are not yet using the new plugin architecture, and the use of the pluginInjectionApi
|
|
31
|
+
// is not type safe in editor-common.
|
|
32
|
+
// @ts-ignore
|
|
33
|
+
const currentState = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 ? void 0 : (_pluginInjectionApi$e2 = _pluginInjectionApi$e.sharedState) === null || _pluginInjectionApi$e2 === void 0 ? void 0 : _pluginInjectionApi$e2.currentState();
|
|
34
|
+
const {
|
|
35
|
+
contentMode
|
|
36
|
+
} = currentState || {};
|
|
37
|
+
const isLivePageViewMode = contentMode === 'live-view';
|
|
28
38
|
return /*#__PURE__*/React.createElement(ExtensionComponent, {
|
|
29
39
|
editorView: editorView,
|
|
30
40
|
node: node,
|
|
@@ -39,7 +49,8 @@ export class Extension extends Component {
|
|
|
39
49
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
40
50
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
41
51
|
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
42
|
-
rendererExtensionHandlers: rendererExtensionHandlers
|
|
52
|
+
rendererExtensionHandlers: rendererExtensionHandlers,
|
|
53
|
+
isLivePageViewMode: isLivePageViewMode
|
|
43
54
|
});
|
|
44
55
|
});
|
|
45
56
|
this.providerFactory = props.providerFactory || new ProviderFactory();
|
|
@@ -33,9 +33,12 @@ export class ExtensionComponentOld extends Component {
|
|
|
33
33
|
_defineProperty(this, "getNodeRenderer", memoizeOne(getNodeRenderer));
|
|
34
34
|
_defineProperty(this, "getExtensionModuleNodePrivateProps", memoizeOne(getExtensionModuleNodePrivateProps));
|
|
35
35
|
_defineProperty(this, "setIsNodeHovered", isHovered => {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
// Don't want to show hover interactions for live page view mode
|
|
37
|
+
if (!this.props.isLivePageViewMode) {
|
|
38
|
+
this.setState({
|
|
39
|
+
isNodeHovered: isHovered
|
|
40
|
+
});
|
|
41
|
+
}
|
|
39
42
|
});
|
|
40
43
|
_defineProperty(this, "setShowBodiedExtensionRendererView", showRendererView => {
|
|
41
44
|
this.setState({
|
|
@@ -204,7 +207,8 @@ export class ExtensionComponentOld extends Component {
|
|
|
204
207
|
eventDispatcher,
|
|
205
208
|
macroInteractionDesignFeatureFlags,
|
|
206
209
|
showLivePagesBodiedMacrosRendererView,
|
|
207
|
-
showUpdatedLivePages1PBodiedExtensionUI
|
|
210
|
+
showUpdatedLivePages1PBodiedExtensionUI,
|
|
211
|
+
isLivePageViewMode
|
|
208
212
|
} = this.props;
|
|
209
213
|
const {
|
|
210
214
|
selection
|
|
@@ -227,7 +231,8 @@ export class ExtensionComponentOld extends Component {
|
|
|
227
231
|
isNodeSelected: selectedNode === node,
|
|
228
232
|
isNodeNested: isNodeNested,
|
|
229
233
|
isNodeHovered: this.state.isNodeHovered,
|
|
230
|
-
setIsNodeHovered: this.setIsNodeHovered
|
|
234
|
+
setIsNodeHovered: this.setIsNodeHovered,
|
|
235
|
+
isLivePageViewMode: isLivePageViewMode
|
|
231
236
|
});
|
|
232
237
|
}
|
|
233
238
|
const extensionHandlerResult = this.tryExtensionHandler(undefined);
|
|
@@ -252,7 +257,8 @@ export class ExtensionComponentOld extends Component {
|
|
|
252
257
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
253
258
|
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI(nodeToJSON(node))),
|
|
254
259
|
showBodiedExtensionRendererView: this.state.showBodiedExtensionRendererView,
|
|
255
|
-
setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView
|
|
260
|
+
setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView,
|
|
261
|
+
isLivePageViewMode: isLivePageViewMode
|
|
256
262
|
}, extensionHandlerResult);
|
|
257
263
|
case 'inlineExtension':
|
|
258
264
|
return /*#__PURE__*/React.createElement(InlineExtension, {
|
|
@@ -261,7 +267,8 @@ export class ExtensionComponentOld extends Component {
|
|
|
261
267
|
isNodeSelected: selectedNode === node,
|
|
262
268
|
pluginInjectionApi: pluginInjectionApi,
|
|
263
269
|
isNodeHovered: this.state.isNodeHovered,
|
|
264
|
-
setIsNodeHovered: this.setIsNodeHovered
|
|
270
|
+
setIsNodeHovered: this.setIsNodeHovered,
|
|
271
|
+
isLivePageViewMode: isLivePageViewMode
|
|
265
272
|
}, extensionHandlerResult);
|
|
266
273
|
default:
|
|
267
274
|
return null;
|
|
@@ -328,9 +335,12 @@ class ExtensionComponentInner extends Component {
|
|
|
328
335
|
_defineProperty(this, "getNodeRenderer", memoizeOne(getNodeRenderer));
|
|
329
336
|
_defineProperty(this, "getExtensionModuleNodePrivateProps", memoizeOne(getExtensionModuleNodePrivateProps));
|
|
330
337
|
_defineProperty(this, "setIsNodeHovered", isHovered => {
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
338
|
+
// Don't want to show hover interactions for live page view mode
|
|
339
|
+
if (!this.props.isLivePageViewMode) {
|
|
340
|
+
this.setState({
|
|
341
|
+
isNodeHovered: isHovered
|
|
342
|
+
});
|
|
343
|
+
}
|
|
334
344
|
});
|
|
335
345
|
/**
|
|
336
346
|
* Parses any private nodes once an extension provider is available.
|
|
@@ -446,7 +456,8 @@ class ExtensionComponentInner extends Component {
|
|
|
446
456
|
showLivePagesBodiedMacrosRendererView,
|
|
447
457
|
showUpdatedLivePages1PBodiedExtensionUI,
|
|
448
458
|
showBodiedExtensionRendererView,
|
|
449
|
-
setShowBodiedExtensionRendererView
|
|
459
|
+
setShowBodiedExtensionRendererView,
|
|
460
|
+
isLivePageViewMode
|
|
450
461
|
} = this.props;
|
|
451
462
|
const {
|
|
452
463
|
selection
|
|
@@ -469,7 +480,8 @@ class ExtensionComponentInner extends Component {
|
|
|
469
480
|
isNodeSelected: selectedNode === node,
|
|
470
481
|
isNodeNested: isNodeNested,
|
|
471
482
|
isNodeHovered: this.state.isNodeHovered,
|
|
472
|
-
setIsNodeHovered: this.setIsNodeHovered
|
|
483
|
+
setIsNodeHovered: this.setIsNodeHovered,
|
|
484
|
+
isLivePageViewMode: isLivePageViewMode
|
|
473
485
|
});
|
|
474
486
|
}
|
|
475
487
|
const extensionHandlerResult = this.tryExtensionHandler(undefined);
|
|
@@ -494,7 +506,8 @@ class ExtensionComponentInner extends Component {
|
|
|
494
506
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
495
507
|
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI(nodeToJSON(node))),
|
|
496
508
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
497
|
-
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
509
|
+
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView,
|
|
510
|
+
isLivePageViewMode: isLivePageViewMode
|
|
498
511
|
}, extensionHandlerResult);
|
|
499
512
|
case 'inlineExtension':
|
|
500
513
|
return /*#__PURE__*/React.createElement(InlineExtension, {
|
|
@@ -503,7 +516,8 @@ class ExtensionComponentInner extends Component {
|
|
|
503
516
|
isNodeSelected: selectedNode === node,
|
|
504
517
|
pluginInjectionApi: pluginInjectionApi,
|
|
505
518
|
isNodeHovered: this.state.isNodeHovered,
|
|
506
|
-
setIsNodeHovered: this.setIsNodeHovered
|
|
519
|
+
setIsNodeHovered: this.setIsNodeHovered,
|
|
520
|
+
isLivePageViewMode: isLivePageViewMode
|
|
507
521
|
}, extensionHandlerResult);
|
|
508
522
|
default:
|
|
509
523
|
return null;
|
|
@@ -79,7 +79,8 @@ const MultiBodiedExtensionWithWidth = ({
|
|
|
79
79
|
isNodeHovered,
|
|
80
80
|
isNodeNested,
|
|
81
81
|
setIsNodeHovered,
|
|
82
|
-
pluginInjectionApi
|
|
82
|
+
pluginInjectionApi,
|
|
83
|
+
isLivePageViewMode
|
|
83
84
|
}) => {
|
|
84
85
|
const {
|
|
85
86
|
showMacroInteractionDesignUpdates
|
|
@@ -154,7 +155,7 @@ const MultiBodiedExtensionWithWidth = ({
|
|
|
154
155
|
setIsNodeHovered(didHover);
|
|
155
156
|
}
|
|
156
157
|
};
|
|
157
|
-
return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
|
|
158
|
+
return jsx(Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
|
|
158
159
|
isNodeSelected: isNodeSelected,
|
|
159
160
|
node: node,
|
|
160
161
|
showMacroInteractionDesignUpdates: true,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isFedRamp } from './environment';
|
|
2
2
|
const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
3
3
|
const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
4
|
-
const packageVersion = "99.
|
|
4
|
+
const packageVersion = "99.9.0";
|
|
5
5
|
const sanitiseSentryEvents = (data, _hint) => {
|
|
6
6
|
// Remove URL as it has UGC
|
|
7
7
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
|
|
|
13
13
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
14
14
|
import Layer from '../Layer';
|
|
15
15
|
const packageName = "@atlaskit/editor-common";
|
|
16
|
-
const packageVersion = "99.
|
|
16
|
+
const packageVersion = "99.9.0";
|
|
17
17
|
const halfFocusRing = 1;
|
|
18
18
|
const dropOffset = '0, 8';
|
|
19
19
|
// Ignored via go/ees005
|
|
@@ -43,7 +43,8 @@ function ExtensionWithPluginState(props) {
|
|
|
43
43
|
showUpdatedLivePages1PBodiedExtensionUI = props.showUpdatedLivePages1PBodiedExtensionUI,
|
|
44
44
|
showBodiedExtensionRendererView = props.showBodiedExtensionRendererView,
|
|
45
45
|
setShowBodiedExtensionRendererView = props.setShowBodiedExtensionRendererView,
|
|
46
|
-
pluginInjectionApi = props.pluginInjectionApi
|
|
46
|
+
pluginInjectionApi = props.pluginInjectionApi,
|
|
47
|
+
isLivePageViewMode = props.isLivePageViewMode;
|
|
47
48
|
var _ref = macroInteractionDesignFeatureFlags || {},
|
|
48
49
|
showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
|
|
49
50
|
var hasBody = ['bodiedExtension', 'multiBodiedExtension'].includes(node.type.name);
|
|
@@ -112,7 +113,7 @@ function ExtensionWithPluginState(props) {
|
|
|
112
113
|
setIsNodeHovered(didHover);
|
|
113
114
|
}
|
|
114
115
|
};
|
|
115
|
-
return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
|
|
116
|
+
return jsx(Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
|
|
116
117
|
isNodeSelected: isNodeSelected,
|
|
117
118
|
isNodeHovered: isNodeHovered,
|
|
118
119
|
isNodeNested: isNodeNested,
|
|
@@ -20,7 +20,8 @@ var InlineExtension = function InlineExtension(props) {
|
|
|
20
20
|
isNodeSelected = props.isNodeSelected,
|
|
21
21
|
children = props.children,
|
|
22
22
|
isNodeHovered = props.isNodeHovered,
|
|
23
|
-
setIsNodeHovered = props.setIsNodeHovered
|
|
23
|
+
setIsNodeHovered = props.setIsNodeHovered,
|
|
24
|
+
isLivePageViewMode = props.isLivePageViewMode;
|
|
24
25
|
var _ref = macroInteractionDesignFeatureFlags || {},
|
|
25
26
|
showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
|
|
26
27
|
var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['width']),
|
|
@@ -38,7 +39,7 @@ var InlineExtension = function InlineExtension(props) {
|
|
|
38
39
|
setIsNodeHovered(didHover);
|
|
39
40
|
}
|
|
40
41
|
};
|
|
41
|
-
var inlineExtensionInternal = jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
|
|
42
|
+
var inlineExtensionInternal = jsx(Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
|
|
42
43
|
node: node,
|
|
43
44
|
isNodeSelected: isNodeSelected,
|
|
44
45
|
isNodeHovered: isNodeHovered,
|
|
@@ -17,6 +17,7 @@ export var Extension = /*#__PURE__*/function (_Component) {
|
|
|
17
17
|
_classCallCheck(this, Extension);
|
|
18
18
|
_this = _callSuper(this, Extension, [props]);
|
|
19
19
|
_defineProperty(_this, "renderWithProvider", function (_ref) {
|
|
20
|
+
var _pluginInjectionApi$e;
|
|
20
21
|
var extensionProvider = _ref.extensionProvider;
|
|
21
22
|
var _this$props = _this.props,
|
|
22
23
|
node = _this$props.node,
|
|
@@ -32,6 +33,14 @@ export var Extension = /*#__PURE__*/function (_Component) {
|
|
|
32
33
|
showLivePagesBodiedMacrosRendererView = _this$props.showLivePagesBodiedMacrosRendererView,
|
|
33
34
|
showUpdatedLivePages1PBodiedExtensionUI = _this$props.showUpdatedLivePages1PBodiedExtensionUI,
|
|
34
35
|
rendererExtensionHandlers = _this$props.rendererExtensionHandlers;
|
|
36
|
+
|
|
37
|
+
// Extensions are not yet using the new plugin architecture, and the use of the pluginInjectionApi
|
|
38
|
+
// is not type safe in editor-common.
|
|
39
|
+
// @ts-ignore
|
|
40
|
+
var currentState = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.sharedState) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.currentState();
|
|
41
|
+
var _ref2 = currentState || {},
|
|
42
|
+
contentMode = _ref2.contentMode;
|
|
43
|
+
var isLivePageViewMode = contentMode === 'live-view';
|
|
35
44
|
return /*#__PURE__*/React.createElement(ExtensionComponent, {
|
|
36
45
|
editorView: editorView,
|
|
37
46
|
node: node,
|
|
@@ -46,7 +55,8 @@ export var Extension = /*#__PURE__*/function (_Component) {
|
|
|
46
55
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
47
56
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
48
57
|
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
49
|
-
rendererExtensionHandlers: rendererExtensionHandlers
|
|
58
|
+
rendererExtensionHandlers: rendererExtensionHandlers,
|
|
59
|
+
isLivePageViewMode: isLivePageViewMode
|
|
50
60
|
});
|
|
51
61
|
});
|
|
52
62
|
_this.providerFactory = props.providerFactory || new ProviderFactory();
|
|
@@ -50,9 +50,12 @@ export var ExtensionComponentOld = /*#__PURE__*/function (_Component) {
|
|
|
50
50
|
_defineProperty(_this, "getNodeRenderer", memoizeOne(getNodeRenderer));
|
|
51
51
|
_defineProperty(_this, "getExtensionModuleNodePrivateProps", memoizeOne(getExtensionModuleNodePrivateProps));
|
|
52
52
|
_defineProperty(_this, "setIsNodeHovered", function (isHovered) {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
53
|
+
// Don't want to show hover interactions for live page view mode
|
|
54
|
+
if (!_this.props.isLivePageViewMode) {
|
|
55
|
+
_this.setState({
|
|
56
|
+
isNodeHovered: isHovered
|
|
57
|
+
});
|
|
58
|
+
}
|
|
56
59
|
});
|
|
57
60
|
_defineProperty(_this, "setShowBodiedExtensionRendererView", function (showRendererView) {
|
|
58
61
|
_this.setState({
|
|
@@ -241,7 +244,8 @@ export var ExtensionComponentOld = /*#__PURE__*/function (_Component) {
|
|
|
241
244
|
eventDispatcher = _this$props3.eventDispatcher,
|
|
242
245
|
macroInteractionDesignFeatureFlags = _this$props3.macroInteractionDesignFeatureFlags,
|
|
243
246
|
showLivePagesBodiedMacrosRendererView = _this$props3.showLivePagesBodiedMacrosRendererView,
|
|
244
|
-
showUpdatedLivePages1PBodiedExtensionUI = _this$props3.showUpdatedLivePages1PBodiedExtensionUI
|
|
247
|
+
showUpdatedLivePages1PBodiedExtensionUI = _this$props3.showUpdatedLivePages1PBodiedExtensionUI,
|
|
248
|
+
isLivePageViewMode = _this$props3.isLivePageViewMode;
|
|
245
249
|
var selection = editorView.state.selection;
|
|
246
250
|
var selectedNode = selection instanceof NodeSelection && selection.node;
|
|
247
251
|
var position = typeof getPos === 'function' && getPos();
|
|
@@ -261,7 +265,8 @@ export var ExtensionComponentOld = /*#__PURE__*/function (_Component) {
|
|
|
261
265
|
isNodeSelected: selectedNode === node,
|
|
262
266
|
isNodeNested: isNodeNested,
|
|
263
267
|
isNodeHovered: this.state.isNodeHovered,
|
|
264
|
-
setIsNodeHovered: this.setIsNodeHovered
|
|
268
|
+
setIsNodeHovered: this.setIsNodeHovered,
|
|
269
|
+
isLivePageViewMode: isLivePageViewMode
|
|
265
270
|
});
|
|
266
271
|
}
|
|
267
272
|
var extensionHandlerResult = this.tryExtensionHandler(undefined);
|
|
@@ -286,7 +291,8 @@ export var ExtensionComponentOld = /*#__PURE__*/function (_Component) {
|
|
|
286
291
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
287
292
|
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI(nodeToJSON(node))),
|
|
288
293
|
showBodiedExtensionRendererView: this.state.showBodiedExtensionRendererView,
|
|
289
|
-
setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView
|
|
294
|
+
setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView,
|
|
295
|
+
isLivePageViewMode: isLivePageViewMode
|
|
290
296
|
}, extensionHandlerResult);
|
|
291
297
|
case 'inlineExtension':
|
|
292
298
|
return /*#__PURE__*/React.createElement(InlineExtension, {
|
|
@@ -295,7 +301,8 @@ export var ExtensionComponentOld = /*#__PURE__*/function (_Component) {
|
|
|
295
301
|
isNodeSelected: selectedNode === node,
|
|
296
302
|
pluginInjectionApi: pluginInjectionApi,
|
|
297
303
|
isNodeHovered: this.state.isNodeHovered,
|
|
298
|
-
setIsNodeHovered: this.setIsNodeHovered
|
|
304
|
+
setIsNodeHovered: this.setIsNodeHovered,
|
|
305
|
+
isLivePageViewMode: isLivePageViewMode
|
|
299
306
|
}, extensionHandlerResult);
|
|
300
307
|
default:
|
|
301
308
|
return null;
|
|
@@ -372,9 +379,12 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
372
379
|
_defineProperty(_this2, "getNodeRenderer", memoizeOne(getNodeRenderer));
|
|
373
380
|
_defineProperty(_this2, "getExtensionModuleNodePrivateProps", memoizeOne(getExtensionModuleNodePrivateProps));
|
|
374
381
|
_defineProperty(_this2, "setIsNodeHovered", function (isHovered) {
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
382
|
+
// Don't want to show hover interactions for live page view mode
|
|
383
|
+
if (!_this2.props.isLivePageViewMode) {
|
|
384
|
+
_this2.setState({
|
|
385
|
+
isNodeHovered: isHovered
|
|
386
|
+
});
|
|
387
|
+
}
|
|
378
388
|
});
|
|
379
389
|
/**
|
|
380
390
|
* Parses any private nodes once an extension provider is available.
|
|
@@ -510,7 +520,8 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
510
520
|
showLivePagesBodiedMacrosRendererView = _this$props4.showLivePagesBodiedMacrosRendererView,
|
|
511
521
|
showUpdatedLivePages1PBodiedExtensionUI = _this$props4.showUpdatedLivePages1PBodiedExtensionUI,
|
|
512
522
|
showBodiedExtensionRendererView = _this$props4.showBodiedExtensionRendererView,
|
|
513
|
-
setShowBodiedExtensionRendererView = _this$props4.setShowBodiedExtensionRendererView
|
|
523
|
+
setShowBodiedExtensionRendererView = _this$props4.setShowBodiedExtensionRendererView,
|
|
524
|
+
isLivePageViewMode = _this$props4.isLivePageViewMode;
|
|
514
525
|
var selection = editorView.state.selection;
|
|
515
526
|
var selectedNode = selection instanceof NodeSelection && selection.node;
|
|
516
527
|
var position = typeof getPos === 'function' && getPos();
|
|
@@ -530,7 +541,8 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
530
541
|
isNodeSelected: selectedNode === node,
|
|
531
542
|
isNodeNested: isNodeNested,
|
|
532
543
|
isNodeHovered: this.state.isNodeHovered,
|
|
533
|
-
setIsNodeHovered: this.setIsNodeHovered
|
|
544
|
+
setIsNodeHovered: this.setIsNodeHovered,
|
|
545
|
+
isLivePageViewMode: isLivePageViewMode
|
|
534
546
|
});
|
|
535
547
|
}
|
|
536
548
|
var extensionHandlerResult = this.tryExtensionHandler(undefined);
|
|
@@ -555,7 +567,8 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
555
567
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
556
568
|
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI(nodeToJSON(node))),
|
|
557
569
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
558
|
-
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
570
|
+
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView,
|
|
571
|
+
isLivePageViewMode: isLivePageViewMode
|
|
559
572
|
}, extensionHandlerResult);
|
|
560
573
|
case 'inlineExtension':
|
|
561
574
|
return /*#__PURE__*/React.createElement(InlineExtension, {
|
|
@@ -564,7 +577,8 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
564
577
|
isNodeSelected: selectedNode === node,
|
|
565
578
|
pluginInjectionApi: pluginInjectionApi,
|
|
566
579
|
isNodeHovered: this.state.isNodeHovered,
|
|
567
|
-
setIsNodeHovered: this.setIsNodeHovered
|
|
580
|
+
setIsNodeHovered: this.setIsNodeHovered,
|
|
581
|
+
isLivePageViewMode: isLivePageViewMode
|
|
568
582
|
}, extensionHandlerResult);
|
|
569
583
|
default:
|
|
570
584
|
return null;
|
|
@@ -82,7 +82,8 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
|
|
|
82
82
|
isNodeHovered = _ref.isNodeHovered,
|
|
83
83
|
isNodeNested = _ref.isNodeNested,
|
|
84
84
|
setIsNodeHovered = _ref.setIsNodeHovered,
|
|
85
|
-
pluginInjectionApi = _ref.pluginInjectionApi
|
|
85
|
+
pluginInjectionApi = _ref.pluginInjectionApi,
|
|
86
|
+
isLivePageViewMode = _ref.isLivePageViewMode;
|
|
86
87
|
var _ref2 = macroInteractionDesignFeatureFlags || {},
|
|
87
88
|
showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates;
|
|
88
89
|
var _node$attrs = node.attrs,
|
|
@@ -156,7 +157,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
|
|
|
156
157
|
setIsNodeHovered(didHover);
|
|
157
158
|
}
|
|
158
159
|
};
|
|
159
|
-
return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
|
|
160
|
+
return jsx(Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
|
|
160
161
|
isNodeSelected: isNodeSelected,
|
|
161
162
|
node: node,
|
|
162
163
|
showMacroInteractionDesignUpdates: true,
|
|
@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
7
7
|
import { isFedRamp } from './environment';
|
|
8
8
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
9
9
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
10
|
-
var packageVersion = "99.
|
|
10
|
+
var packageVersion = "99.9.0";
|
|
11
11
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
12
12
|
// Remove URL as it has UGC
|
|
13
13
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
|
|
|
20
20
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
21
21
|
import Layer from '../Layer';
|
|
22
22
|
var packageName = "@atlaskit/editor-common";
|
|
23
|
-
var packageVersion = "99.
|
|
23
|
+
var packageVersion = "99.9.0";
|
|
24
24
|
var halfFocusRing = 1;
|
|
25
25
|
var dropOffset = '0, 8';
|
|
26
26
|
// Ignored via go/ees005
|
|
@@ -25,6 +25,7 @@ export interface Props {
|
|
|
25
25
|
showUpdatedLivePages1PBodiedExtensionUI?: boolean;
|
|
26
26
|
showBodiedExtensionRendererView?: boolean;
|
|
27
27
|
setShowBodiedExtensionRendererView?: (showBodiedExtensionRendererView: boolean) => void;
|
|
28
|
+
isLivePageViewMode?: boolean;
|
|
28
29
|
}
|
|
29
30
|
declare const _default: {
|
|
30
31
|
new (props: Props | Readonly<Props>): {
|
|
@@ -14,6 +14,7 @@ export interface Props {
|
|
|
14
14
|
isNodeSelected?: boolean;
|
|
15
15
|
isNodeHovered?: boolean;
|
|
16
16
|
setIsNodeHovered?: (isHovered: boolean) => void;
|
|
17
|
+
isLivePageViewMode?: boolean;
|
|
17
18
|
}
|
|
18
19
|
declare const InlineExtension: (props: Props) => jsx.JSX.Element;
|
|
19
20
|
export default InlineExtension;
|
|
@@ -23,6 +23,7 @@ export interface Props {
|
|
|
23
23
|
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
24
24
|
showUpdatedLivePages1PBodiedExtensionUI?: (node: ADFEntity) => boolean;
|
|
25
25
|
rendererExtensionHandlers?: ExtensionHandlers;
|
|
26
|
+
isLivePageViewMode?: boolean;
|
|
26
27
|
}
|
|
27
28
|
export interface State {
|
|
28
29
|
extensionProvider?: ExtensionProvider;
|
|
@@ -26,6 +26,7 @@ type Props = {
|
|
|
26
26
|
isNodeHovered?: boolean;
|
|
27
27
|
isNodeNested?: boolean;
|
|
28
28
|
setIsNodeHovered?: (isHovered: boolean) => void;
|
|
29
|
+
isLivePageViewMode?: boolean;
|
|
29
30
|
};
|
|
30
31
|
declare const MultiBodiedExtension: (props: Props & OverflowShadowProps) => jsx.JSX.Element;
|
|
31
32
|
export default MultiBodiedExtension;
|
|
@@ -256,14 +256,6 @@ export type FeatureFlags = {
|
|
|
256
256
|
* @default false
|
|
257
257
|
*/
|
|
258
258
|
nestedExpandInExpandEx?: boolean;
|
|
259
|
-
/**
|
|
260
|
-
* @description
|
|
261
|
-
* Enables nesting media and codeblock in blockquotes
|
|
262
|
-
*
|
|
263
|
-
* @see https://hello.jira.atlassian.cloud/browse/FD-73720
|
|
264
|
-
* @default false
|
|
265
|
-
*/
|
|
266
|
-
nestMediaAndCodeblockInQuote?: boolean;
|
|
267
259
|
};
|
|
268
260
|
export type FeatureFlagKey = keyof FeatureFlags;
|
|
269
261
|
export type GetEditorFeatureFlags = () => FeatureFlags;
|
|
@@ -25,6 +25,7 @@ export interface Props {
|
|
|
25
25
|
showUpdatedLivePages1PBodiedExtensionUI?: boolean;
|
|
26
26
|
showBodiedExtensionRendererView?: boolean;
|
|
27
27
|
setShowBodiedExtensionRendererView?: (showBodiedExtensionRendererView: boolean) => void;
|
|
28
|
+
isLivePageViewMode?: boolean;
|
|
28
29
|
}
|
|
29
30
|
declare const _default: {
|
|
30
31
|
new (props: Props | Readonly<Props>): {
|
|
@@ -14,6 +14,7 @@ export interface Props {
|
|
|
14
14
|
isNodeSelected?: boolean;
|
|
15
15
|
isNodeHovered?: boolean;
|
|
16
16
|
setIsNodeHovered?: (isHovered: boolean) => void;
|
|
17
|
+
isLivePageViewMode?: boolean;
|
|
17
18
|
}
|
|
18
19
|
declare const InlineExtension: (props: Props) => jsx.JSX.Element;
|
|
19
20
|
export default InlineExtension;
|
|
@@ -23,6 +23,7 @@ export interface Props {
|
|
|
23
23
|
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
24
24
|
showUpdatedLivePages1PBodiedExtensionUI?: (node: ADFEntity) => boolean;
|
|
25
25
|
rendererExtensionHandlers?: ExtensionHandlers;
|
|
26
|
+
isLivePageViewMode?: boolean;
|
|
26
27
|
}
|
|
27
28
|
export interface State {
|
|
28
29
|
extensionProvider?: ExtensionProvider;
|
|
@@ -26,6 +26,7 @@ type Props = {
|
|
|
26
26
|
isNodeHovered?: boolean;
|
|
27
27
|
isNodeNested?: boolean;
|
|
28
28
|
setIsNodeHovered?: (isHovered: boolean) => void;
|
|
29
|
+
isLivePageViewMode?: boolean;
|
|
29
30
|
};
|
|
30
31
|
declare const MultiBodiedExtension: (props: Props & OverflowShadowProps) => jsx.JSX.Element;
|
|
31
32
|
export default MultiBodiedExtension;
|
|
@@ -256,14 +256,6 @@ export type FeatureFlags = {
|
|
|
256
256
|
* @default false
|
|
257
257
|
*/
|
|
258
258
|
nestedExpandInExpandEx?: boolean;
|
|
259
|
-
/**
|
|
260
|
-
* @description
|
|
261
|
-
* Enables nesting media and codeblock in blockquotes
|
|
262
|
-
*
|
|
263
|
-
* @see https://hello.jira.atlassian.cloud/browse/FD-73720
|
|
264
|
-
* @default false
|
|
265
|
-
*/
|
|
266
|
-
nestMediaAndCodeblockInQuote?: boolean;
|
|
267
259
|
};
|
|
268
260
|
export type FeatureFlagKey = keyof FeatureFlags;
|
|
269
261
|
export type GetEditorFeatureFlags = () => FeatureFlags;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-common",
|
|
3
|
-
"version": "99.
|
|
3
|
+
"version": "99.9.0",
|
|
4
4
|
"description": "A package that contains common classes and components for editor and renderer",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -119,7 +119,7 @@
|
|
|
119
119
|
"@atlaskit/analytics-namespaced-context": "^6.13.0",
|
|
120
120
|
"@atlaskit/analytics-next": "^10.3.0",
|
|
121
121
|
"@atlaskit/atlassian-context": "^0.1.0",
|
|
122
|
-
"@atlaskit/button": "^20.
|
|
122
|
+
"@atlaskit/button": "^20.5.0",
|
|
123
123
|
"@atlaskit/code": "^15.7.0",
|
|
124
124
|
"@atlaskit/codemod-utils": "^4.2.0",
|
|
125
125
|
"@atlaskit/custom-steps": "^0.9.0",
|
|
@@ -130,7 +130,7 @@
|
|
|
130
130
|
"@atlaskit/editor-shared-styles": "^3.2.0",
|
|
131
131
|
"@atlaskit/editor-tables": "^2.8.0",
|
|
132
132
|
"@atlaskit/emoji": "^67.13.0",
|
|
133
|
-
"@atlaskit/icon": "^23.
|
|
133
|
+
"@atlaskit/icon": "^23.7.0",
|
|
134
134
|
"@atlaskit/icon-object": "^6.10.0",
|
|
135
135
|
"@atlaskit/link-datasource": "^3.18.0",
|
|
136
136
|
"@atlaskit/link-picker": "^1.48.0",
|
|
@@ -155,7 +155,7 @@
|
|
|
155
155
|
"@atlaskit/spinner": "^17.1.0",
|
|
156
156
|
"@atlaskit/task-decision": "^17.12.0",
|
|
157
157
|
"@atlaskit/textfield": "^6.8.0",
|
|
158
|
-
"@atlaskit/tmp-editor-statsig": "^2.
|
|
158
|
+
"@atlaskit/tmp-editor-statsig": "^2.42.0",
|
|
159
159
|
"@atlaskit/tokens": "^3.3.0",
|
|
160
160
|
"@atlaskit/tooltip": "^19.1.0",
|
|
161
161
|
"@atlaskit/width-detector": "^4.4.0",
|