@atlaskit/editor-common 96.6.1 → 96.7.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 +9 -0
- package/dist/cjs/extensibility/Extension/Extension/extension-utils.js +19 -0
- package/dist/cjs/extensibility/Extension/Extension/index.js +7 -1
- package/dist/cjs/extensibility/Extension/Lozenge/ExtensionLabel.js +6 -4
- package/dist/cjs/extensibility/Extension/Lozenge/LozengeComponent.js +2 -0
- package/dist/cjs/extensibility/Extension/Lozenge/index.js +2 -0
- package/dist/cjs/extensibility/Extension.js +2 -0
- package/dist/cjs/extensibility/ExtensionComponent.js +8 -16
- package/dist/cjs/extensibility/extensionNodeView.js +3 -1
- package/dist/cjs/monitoring/error.js +1 -1
- package/dist/cjs/ui/DropList/index.js +1 -1
- package/dist/es2019/extensibility/Extension/Extension/extension-utils.js +13 -0
- package/dist/es2019/extensibility/Extension/Extension/index.js +7 -1
- package/dist/es2019/extensibility/Extension/Lozenge/ExtensionLabel.js +6 -4
- package/dist/es2019/extensibility/Extension/Lozenge/LozengeComponent.js +2 -0
- package/dist/es2019/extensibility/Extension/Lozenge/index.js +2 -0
- package/dist/es2019/extensibility/Extension.js +2 -0
- package/dist/es2019/extensibility/ExtensionComponent.js +6 -14
- package/dist/es2019/extensibility/extensionNodeView.js +3 -1
- package/dist/es2019/monitoring/error.js +1 -1
- package/dist/es2019/ui/DropList/index.js +1 -1
- package/dist/esm/extensibility/Extension/Extension/extension-utils.js +13 -0
- package/dist/esm/extensibility/Extension/Extension/index.js +7 -1
- package/dist/esm/extensibility/Extension/Lozenge/ExtensionLabel.js +6 -4
- package/dist/esm/extensibility/Extension/Lozenge/LozengeComponent.js +2 -0
- package/dist/esm/extensibility/Extension/Lozenge/index.js +2 -0
- package/dist/esm/extensibility/Extension.js +2 -0
- package/dist/esm/extensibility/ExtensionComponent.js +6 -14
- package/dist/esm/extensibility/extensionNodeView.js +3 -1
- package/dist/esm/monitoring/error.js +1 -1
- package/dist/esm/ui/DropList/index.js +1 -1
- package/dist/types/extensibility/Extension/Extension/extension-utils.d.ts +2 -0
- package/dist/types/extensibility/Extension/Extension/index.d.ts +1 -0
- package/dist/types/extensibility/Extension/Lozenge/ExtensionLabel.d.ts +3 -2
- package/dist/types/extensibility/Extension/Lozenge/LozengeComponent.d.ts +2 -1
- package/dist/types/extensibility/Extension/Lozenge/index.d.ts +1 -0
- package/dist/types/extensibility/Extension.d.ts +1 -0
- package/dist/types/extensibility/ExtensionComponent.d.ts +1 -0
- package/dist/types/extensibility/extensionNodeView.d.ts +2 -1
- package/dist/types-ts4.5/extensibility/Extension/Extension/extension-utils.d.ts +2 -0
- package/dist/types-ts4.5/extensibility/Extension/Extension/index.d.ts +1 -0
- package/dist/types-ts4.5/extensibility/Extension/Lozenge/ExtensionLabel.d.ts +3 -2
- package/dist/types-ts4.5/extensibility/Extension/Lozenge/LozengeComponent.d.ts +2 -1
- package/dist/types-ts4.5/extensibility/Extension/Lozenge/index.d.ts +1 -0
- package/dist/types-ts4.5/extensibility/Extension.d.ts +1 -0
- package/dist/types-ts4.5/extensibility/ExtensionComponent.d.ts +1 -0
- package/dist/types-ts4.5/extensibility/extensionNodeView.d.ts +2 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
# @atlaskit/editor-common
|
|
2
2
|
|
|
3
|
+
## 96.7.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#181279](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/181279)
|
|
8
|
+
[`2b71646184e76`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2b71646184e76) -
|
|
9
|
+
[ux] Sends in new parameter from Confluence to editor to hide default border around 1P bodied
|
|
10
|
+
extensions in live pages if the parameter is true
|
|
11
|
+
|
|
3
12
|
## 96.6.1
|
|
4
13
|
|
|
5
14
|
### Patch Changes
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.isEmptyBodiedMacro = void 0;
|
|
7
|
+
var isEmptyBodiedMacro = exports.isEmptyBodiedMacro = function isEmptyBodiedMacro(node) {
|
|
8
|
+
var _node$content, _firstGrandChildNode$;
|
|
9
|
+
if (node.type.name !== 'bodiedExtension') {
|
|
10
|
+
return false;
|
|
11
|
+
}
|
|
12
|
+
var firstChildNode = node === null || node === void 0 || (_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.firstChild;
|
|
13
|
+
var firstGrandChildNode = firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.firstChild;
|
|
14
|
+
|
|
15
|
+
// If firstChildNode?.childCount > 1 means there is content along with the placeholder.
|
|
16
|
+
var isEmptyWithPlacholder = (firstGrandChildNode === null || firstGrandChildNode === void 0 || (_firstGrandChildNode$ = firstGrandChildNode.type) === null || _firstGrandChildNode$ === void 0 ? void 0 : _firstGrandChildNode$.name) === 'placeholder' && (firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.childCount) === 1;
|
|
17
|
+
var isEmptyWithNoContent = !firstGrandChildNode && node.childCount === 1;
|
|
18
|
+
return isEmptyWithPlacholder || isEmptyWithNoContent;
|
|
19
|
+
};
|
|
@@ -18,6 +18,7 @@ var _ui = require("../../../ui");
|
|
|
18
18
|
var _utils = require("../../../utils");
|
|
19
19
|
var _Lozenge = _interopRequireDefault(require("../Lozenge"));
|
|
20
20
|
var _styles = require("../styles");
|
|
21
|
+
var _extensionUtils = require("./extension-utils");
|
|
21
22
|
var _styles2 = require("./styles");
|
|
22
23
|
var _excluded = ["type"];
|
|
23
24
|
/**
|
|
@@ -47,6 +48,7 @@ function ExtensionWithPluginState(props) {
|
|
|
47
48
|
isNodeNested = props.isNodeNested,
|
|
48
49
|
setIsNodeHovered = props.setIsNodeHovered,
|
|
49
50
|
showLivePagesBodiedMacrosRendererView = props.showLivePagesBodiedMacrosRendererView,
|
|
51
|
+
showUpdatedLivePages1PBodiedExtensionUI = props.showUpdatedLivePages1PBodiedExtensionUI,
|
|
50
52
|
showBodiedExtensionRendererView = props.showBodiedExtensionRendererView,
|
|
51
53
|
setShowBodiedExtensionRendererView = props.setShowBodiedExtensionRendererView;
|
|
52
54
|
var _ref = macroInteractionDesignFeatureFlags || {},
|
|
@@ -68,9 +70,12 @@ function ExtensionWithPluginState(props) {
|
|
|
68
70
|
isTopLevelNode &&
|
|
69
71
|
// Extension breakout state should not be respected when the editor appearance is full-width mode
|
|
70
72
|
editorAppearance !== 'full-width';
|
|
73
|
+
|
|
74
|
+
// We don't want to show border for non-empty 1p bodied extensions in live pages
|
|
75
|
+
var show1PBodiedExtensionBorder = showUpdatedLivePages1PBodiedExtensionUI ? (0, _extensionUtils.isEmptyBodiedMacro)(node) : true;
|
|
71
76
|
var classNames = (0, _classnames2.default)('extension-container', 'block', shadowClassNames, (0, _defineProperty2.default)({
|
|
72
77
|
'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
|
|
73
|
-
'with-bodied-border': showMacroInteractionDesignUpdates && hasBody && !showBodiedExtensionRendererView,
|
|
78
|
+
'with-bodied-border': showMacroInteractionDesignUpdates && hasBody && !showBodiedExtensionRendererView && show1PBodiedExtensionBorder,
|
|
74
79
|
'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested && !showBodiedExtensionRendererView,
|
|
75
80
|
'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
|
|
76
81
|
'with-danger-overlay': showMacroInteractionDesignUpdates,
|
|
@@ -126,6 +131,7 @@ function ExtensionWithPluginState(props) {
|
|
|
126
131
|
setIsNodeHovered: setIsNodeHovered,
|
|
127
132
|
isBodiedMacro: hasBody,
|
|
128
133
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
134
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
129
135
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
130
136
|
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
131
137
|
}), (0, _react2.jsx)("div", {
|
|
@@ -124,10 +124,11 @@ var i18n = (0, _reactIntlNext.defineMessages)({
|
|
|
124
124
|
description: 'Text in tooltip that tells user they can configure the specific macro.'
|
|
125
125
|
}
|
|
126
126
|
});
|
|
127
|
-
var getShouldShowBodiedMacroLabel = exports.getShouldShowBodiedMacroLabel = function getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView) {
|
|
128
|
-
|
|
127
|
+
var getShouldShowBodiedMacroLabel = exports.getShouldShowBodiedMacroLabel = function getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI) {
|
|
128
|
+
// Bodied macros show the label by default except for the new live pages 1P bodied macro experience where we only show it on hover
|
|
129
|
+
if (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI) {
|
|
129
130
|
return isNodeHovered;
|
|
130
|
-
}
|
|
131
|
+
}
|
|
131
132
|
if (!showLivePagesBodiedMacrosRendererView) {
|
|
132
133
|
return true;
|
|
133
134
|
} // Keep showing labels as usual for default experience for bodied macros
|
|
@@ -143,10 +144,11 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
|
|
|
143
144
|
isBodiedMacro = _ref.isBodiedMacro,
|
|
144
145
|
showMacroButtonUpdates = _ref.showMacroButtonUpdates,
|
|
145
146
|
showLivePagesBodiedMacrosRendererView = _ref.showLivePagesBodiedMacrosRendererView,
|
|
147
|
+
showUpdatedLivePages1PBodiedExtensionUI = _ref.showUpdatedLivePages1PBodiedExtensionUI,
|
|
146
148
|
showBodiedExtensionRendererView = _ref.showBodiedExtensionRendererView;
|
|
147
149
|
var isInlineExtension = extensionName === 'inlineExtension';
|
|
148
150
|
var showDefaultBodiedStyles = isBodiedMacro && !isNodeHovered;
|
|
149
|
-
var shouldShowBodiedMacroLabel = getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView);
|
|
151
|
+
var shouldShowBodiedMacroLabel = getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI);
|
|
150
152
|
var containerClassNames = (0, _classnames.default)({
|
|
151
153
|
bodied: isBodiedMacro
|
|
152
154
|
});
|
|
@@ -35,6 +35,7 @@ var LozengeComponent = exports.LozengeComponent = function LozengeComponent(_ref
|
|
|
35
35
|
setIsNodeHovered = _ref.setIsNodeHovered,
|
|
36
36
|
isBodiedMacro = _ref.isBodiedMacro,
|
|
37
37
|
showLivePagesBodiedMacrosRendererView = _ref.showLivePagesBodiedMacrosRendererView,
|
|
38
|
+
showUpdatedLivePages1PBodiedExtensionUI = _ref.showUpdatedLivePages1PBodiedExtensionUI,
|
|
38
39
|
showBodiedExtensionRendererView = _ref.showBodiedExtensionRendererView,
|
|
39
40
|
setShowBodiedExtensionRendererView = _ref.setShowBodiedExtensionRendererView;
|
|
40
41
|
var capitalizedTitle = capitalizeFirstLetter(title);
|
|
@@ -49,6 +50,7 @@ var LozengeComponent = exports.LozengeComponent = function LozengeComponent(_ref
|
|
|
49
50
|
isBodiedMacro: isBodiedMacro,
|
|
50
51
|
showMacroButtonUpdates: showMacroButtonUpdates,
|
|
51
52
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
53
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
52
54
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView
|
|
53
55
|
}), showLivePagesBodiedMacrosRendererView && isBodiedMacro && (0, _react2.jsx)(_EditToggle.EditToggle, {
|
|
54
56
|
isNodeHovered: isNodeHovered,
|
|
@@ -55,6 +55,7 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
|
|
|
55
55
|
setIsNodeHovered = _this$props.setIsNodeHovered,
|
|
56
56
|
isBodiedMacro = _this$props.isBodiedMacro,
|
|
57
57
|
showLivePagesBodiedMacrosRendererView = _this$props.showLivePagesBodiedMacrosRendererView,
|
|
58
|
+
showUpdatedLivePages1PBodiedExtensionUI = _this$props.showUpdatedLivePages1PBodiedExtensionUI,
|
|
58
59
|
showBodiedExtensionRendererView = _this$props.showBodiedExtensionRendererView,
|
|
59
60
|
setShowBodiedExtensionRendererView = _this$props.setShowBodiedExtensionRendererView;
|
|
60
61
|
var _this$props$node$attr = _this.props.node.attrs,
|
|
@@ -78,6 +79,7 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
|
|
|
78
79
|
setIsNodeHovered: setIsNodeHovered,
|
|
79
80
|
isBodiedMacro: isBodiedMacro,
|
|
80
81
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
82
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
81
83
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
82
84
|
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
83
85
|
});
|
|
@@ -38,6 +38,7 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
|
|
|
38
38
|
eventDispatcher = _this$props.eventDispatcher,
|
|
39
39
|
macroInteractionDesignFeatureFlags = _this$props.macroInteractionDesignFeatureFlags,
|
|
40
40
|
showLivePagesBodiedMacrosRendererView = _this$props.showLivePagesBodiedMacrosRendererView,
|
|
41
|
+
showUpdatedLivePages1PBodiedExtensionUI = _this$props.showUpdatedLivePages1PBodiedExtensionUI,
|
|
41
42
|
rendererExtensionHandlers = _this$props.rendererExtensionHandlers;
|
|
42
43
|
return /*#__PURE__*/_react.default.createElement(_ExtensionComponent.ExtensionComponent, {
|
|
43
44
|
editorView: editorView,
|
|
@@ -52,6 +53,7 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
|
|
|
52
53
|
eventDispatcher: eventDispatcher,
|
|
53
54
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
54
55
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
56
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
55
57
|
rendererExtensionHandlers: rendererExtensionHandlers
|
|
56
58
|
});
|
|
57
59
|
});
|
|
@@ -24,6 +24,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
|
24
24
|
var _extensions = require("../extensions");
|
|
25
25
|
var _utils = require("../utils");
|
|
26
26
|
var _Extension = _interopRequireDefault(require("./Extension/Extension"));
|
|
27
|
+
var _extensionUtils = require("./Extension/Extension/extension-utils");
|
|
27
28
|
var _InlineExtension = _interopRequireDefault(require("./Extension/InlineExtension"));
|
|
28
29
|
var _MultiBodiedExtension = _interopRequireDefault(require("./MultiBodiedExtension"));
|
|
29
30
|
var _excluded = ["extensionProvider", "showLivePagesBodiedMacrosRendererView", "node"];
|
|
@@ -35,19 +36,6 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
35
36
|
|
|
36
37
|
/* temporary type until FG cleaned up */
|
|
37
38
|
|
|
38
|
-
var isEmptyBodiedMacro = function isEmptyBodiedMacro(node) {
|
|
39
|
-
var _node$content, _firstGrandChildNode$;
|
|
40
|
-
if (node.type.name !== 'bodiedExtension') {
|
|
41
|
-
return false;
|
|
42
|
-
}
|
|
43
|
-
var firstChildNode = node === null || node === void 0 || (_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.firstChild;
|
|
44
|
-
var firstGrandChildNode = firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.firstChild;
|
|
45
|
-
|
|
46
|
-
// If firstChildNode?.childCount > 1 means there is content along with the placeholder.
|
|
47
|
-
var isEmptyWithPlacholder = (firstGrandChildNode === null || firstGrandChildNode === void 0 || (_firstGrandChildNode$ = firstGrandChildNode.type) === null || _firstGrandChildNode$ === void 0 ? void 0 : _firstGrandChildNode$.name) === 'placeholder' && (firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.childCount) === 1;
|
|
48
|
-
var isEmptyWithNoContent = !firstGrandChildNode && node.childCount === 1;
|
|
49
|
-
return isEmptyWithPlacholder || isEmptyWithNoContent;
|
|
50
|
-
};
|
|
51
39
|
var getBodiedExtensionContent = function getBodiedExtensionContent(node) {
|
|
52
40
|
var bodiedExtensionContent = [];
|
|
53
41
|
node.content.forEach(function (childNode) {
|
|
@@ -206,7 +194,7 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
|
|
|
206
194
|
node = _this$props2.node,
|
|
207
195
|
showLivePagesBodiedMacrosRendererView = _this$props2.showLivePagesBodiedMacrosRendererView;
|
|
208
196
|
// We only care about this empty state on first page load or insertion to determine the view
|
|
209
|
-
if (!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))) && !isEmptyBodiedMacro(node)) {
|
|
197
|
+
if (!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))) && !(0, _extensionUtils.isEmptyBodiedMacro)(node)) {
|
|
210
198
|
this.setState({
|
|
211
199
|
showBodiedExtensionRendererView: true
|
|
212
200
|
});
|
|
@@ -252,7 +240,8 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
|
|
|
252
240
|
getPos = _this$props3.getPos,
|
|
253
241
|
eventDispatcher = _this$props3.eventDispatcher,
|
|
254
242
|
macroInteractionDesignFeatureFlags = _this$props3.macroInteractionDesignFeatureFlags,
|
|
255
|
-
showLivePagesBodiedMacrosRendererView = _this$props3.showLivePagesBodiedMacrosRendererView
|
|
243
|
+
showLivePagesBodiedMacrosRendererView = _this$props3.showLivePagesBodiedMacrosRendererView,
|
|
244
|
+
showUpdatedLivePages1PBodiedExtensionUI = _this$props3.showUpdatedLivePages1PBodiedExtensionUI;
|
|
256
245
|
var selection = editorView.state.selection;
|
|
257
246
|
var selectedNode = selection instanceof _state.NodeSelection && selection.node;
|
|
258
247
|
var position = typeof getPos === 'function' && getPos();
|
|
@@ -295,6 +284,7 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
|
|
|
295
284
|
isNodeNested: isNodeNested,
|
|
296
285
|
setIsNodeHovered: this.setIsNodeHovered,
|
|
297
286
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))),
|
|
287
|
+
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI((0, _utils.nodeToJSON)(node))),
|
|
298
288
|
showBodiedExtensionRendererView: this.state.showBodiedExtensionRendererView,
|
|
299
289
|
setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView
|
|
300
290
|
}, extensionHandlerResult);
|
|
@@ -339,7 +329,7 @@ var ExtensionComponentNew = exports.ExtensionComponentNew = function ExtensionCo
|
|
|
339
329
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
340
330
|
extensionProvider = _useState2[0],
|
|
341
331
|
setExtensionProvider = _useState2[1];
|
|
342
|
-
var _useState3 = (0, _react.useState)(!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))) && !isEmptyBodiedMacro(node)),
|
|
332
|
+
var _useState3 = (0, _react.useState)(!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))) && !(0, _extensionUtils.isEmptyBodiedMacro)(node)),
|
|
343
333
|
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
344
334
|
showBodiedExtensionRendererView = _useState4[0],
|
|
345
335
|
setShowBodiedExtensionRendererView = _useState4[1];
|
|
@@ -515,6 +505,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
515
505
|
macroInteractionDesignFeatureFlags = _this$props4.macroInteractionDesignFeatureFlags,
|
|
516
506
|
extensionProvider = _this$props4.extensionProvider,
|
|
517
507
|
showLivePagesBodiedMacrosRendererView = _this$props4.showLivePagesBodiedMacrosRendererView,
|
|
508
|
+
showUpdatedLivePages1PBodiedExtensionUI = _this$props4.showUpdatedLivePages1PBodiedExtensionUI,
|
|
518
509
|
showBodiedExtensionRendererView = _this$props4.showBodiedExtensionRendererView,
|
|
519
510
|
setShowBodiedExtensionRendererView = _this$props4.setShowBodiedExtensionRendererView;
|
|
520
511
|
var selection = editorView.state.selection;
|
|
@@ -559,6 +550,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
559
550
|
isNodeNested: isNodeNested,
|
|
560
551
|
setIsNodeHovered: this.setIsNodeHovered,
|
|
561
552
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))),
|
|
553
|
+
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI((0, _utils.nodeToJSON)(node))),
|
|
562
554
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
563
555
|
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
564
556
|
}, extensionHandlerResult);
|
|
@@ -75,12 +75,13 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
|
|
|
75
75
|
pluginInjectionApi: props.pluginInjectionApi,
|
|
76
76
|
macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
|
|
77
77
|
showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,
|
|
78
|
+
showUpdatedLivePages1PBodiedExtensionUI: props.showUpdatedLivePages1PBodiedExtensionUI,
|
|
78
79
|
rendererExtensionHandlers: props.rendererExtensionHandlers
|
|
79
80
|
}));
|
|
80
81
|
}
|
|
81
82
|
}]);
|
|
82
83
|
}(_reactNodeView.default);
|
|
83
|
-
function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, rendererExtensionHandlers) {
|
|
84
|
+
function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, rendererExtensionHandlers) {
|
|
84
85
|
return function (node, view, getPos) {
|
|
85
86
|
return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
|
|
86
87
|
providerFactory: providerFactory,
|
|
@@ -89,6 +90,7 @@ function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory,
|
|
|
89
90
|
pluginInjectionApi: pluginInjectionApi,
|
|
90
91
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
91
92
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
93
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
92
94
|
rendererExtensionHandlers: rendererExtensionHandlers
|
|
93
95
|
}).init();
|
|
94
96
|
};
|
|
@@ -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 = "96.
|
|
20
|
+
var packageVersion = "96.7.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 = "96.
|
|
26
|
+
var packageVersion = "96.7.0";
|
|
27
27
|
var halfFocusRing = 1;
|
|
28
28
|
var dropOffset = '0, 8';
|
|
29
29
|
var DropList = /*#__PURE__*/function (_Component) {
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export const isEmptyBodiedMacro = node => {
|
|
2
|
+
var _node$content, _firstGrandChildNode$;
|
|
3
|
+
if (node.type.name !== 'bodiedExtension') {
|
|
4
|
+
return false;
|
|
5
|
+
}
|
|
6
|
+
const firstChildNode = node === null || node === void 0 ? void 0 : (_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.firstChild;
|
|
7
|
+
const firstGrandChildNode = firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.firstChild;
|
|
8
|
+
|
|
9
|
+
// If firstChildNode?.childCount > 1 means there is content along with the placeholder.
|
|
10
|
+
const isEmptyWithPlacholder = (firstGrandChildNode === null || firstGrandChildNode === void 0 ? void 0 : (_firstGrandChildNode$ = firstGrandChildNode.type) === null || _firstGrandChildNode$ === void 0 ? void 0 : _firstGrandChildNode$.name) === 'placeholder' && (firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.childCount) === 1;
|
|
11
|
+
const isEmptyWithNoContent = !firstGrandChildNode && node.childCount === 1;
|
|
12
|
+
return isEmptyWithPlacholder || isEmptyWithNoContent;
|
|
13
|
+
};
|
|
@@ -15,6 +15,7 @@ import { overflowShadow } from '../../../ui';
|
|
|
15
15
|
import { calculateBreakoutStyles } from '../../../utils';
|
|
16
16
|
import ExtensionLozenge from '../Lozenge';
|
|
17
17
|
import { overlay } from '../styles';
|
|
18
|
+
import { isEmptyBodiedMacro } from './extension-utils';
|
|
18
19
|
import { content, contentWrapper, header, overflowWrapperStyles, widerLayoutClassName, wrapperStyle, wrapperStyleInheritedCursor } from './styles';
|
|
19
20
|
function ExtensionWithPluginState(props) {
|
|
20
21
|
const {
|
|
@@ -34,6 +35,7 @@ function ExtensionWithPluginState(props) {
|
|
|
34
35
|
isNodeNested,
|
|
35
36
|
setIsNodeHovered,
|
|
36
37
|
showLivePagesBodiedMacrosRendererView,
|
|
38
|
+
showUpdatedLivePages1PBodiedExtensionUI,
|
|
37
39
|
showBodiedExtensionRendererView,
|
|
38
40
|
setShowBodiedExtensionRendererView
|
|
39
41
|
} = props;
|
|
@@ -59,9 +61,12 @@ function ExtensionWithPluginState(props) {
|
|
|
59
61
|
isTopLevelNode &&
|
|
60
62
|
// Extension breakout state should not be respected when the editor appearance is full-width mode
|
|
61
63
|
editorAppearance !== 'full-width';
|
|
64
|
+
|
|
65
|
+
// We don't want to show border for non-empty 1p bodied extensions in live pages
|
|
66
|
+
const show1PBodiedExtensionBorder = showUpdatedLivePages1PBodiedExtensionUI ? isEmptyBodiedMacro(node) : true;
|
|
62
67
|
const classNames = classnames('extension-container', 'block', shadowClassNames, {
|
|
63
68
|
'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
|
|
64
|
-
'with-bodied-border': showMacroInteractionDesignUpdates && hasBody && !showBodiedExtensionRendererView,
|
|
69
|
+
'with-bodied-border': showMacroInteractionDesignUpdates && hasBody && !showBodiedExtensionRendererView && show1PBodiedExtensionBorder,
|
|
65
70
|
'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested && !showBodiedExtensionRendererView,
|
|
66
71
|
'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
|
|
67
72
|
'with-danger-overlay': showMacroInteractionDesignUpdates,
|
|
@@ -124,6 +129,7 @@ function ExtensionWithPluginState(props) {
|
|
|
124
129
|
setIsNodeHovered: setIsNodeHovered,
|
|
125
130
|
isBodiedMacro: hasBody,
|
|
126
131
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
132
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
127
133
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
128
134
|
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
129
135
|
}), jsx("div", {
|
|
@@ -115,10 +115,11 @@ const i18n = defineMessages({
|
|
|
115
115
|
description: 'Text in tooltip that tells user they can configure the specific macro.'
|
|
116
116
|
}
|
|
117
117
|
});
|
|
118
|
-
export const getShouldShowBodiedMacroLabel = (isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView) => {
|
|
119
|
-
|
|
118
|
+
export const getShouldShowBodiedMacroLabel = (isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI) => {
|
|
119
|
+
// Bodied macros show the label by default except for the new live pages 1P bodied macro experience where we only show it on hover
|
|
120
|
+
if (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI) {
|
|
120
121
|
return isNodeHovered;
|
|
121
|
-
}
|
|
122
|
+
}
|
|
122
123
|
if (!showLivePagesBodiedMacrosRendererView) {
|
|
123
124
|
return true;
|
|
124
125
|
} // Keep showing labels as usual for default experience for bodied macros
|
|
@@ -134,11 +135,12 @@ export const ExtensionLabel = ({
|
|
|
134
135
|
isBodiedMacro,
|
|
135
136
|
showMacroButtonUpdates,
|
|
136
137
|
showLivePagesBodiedMacrosRendererView,
|
|
138
|
+
showUpdatedLivePages1PBodiedExtensionUI,
|
|
137
139
|
showBodiedExtensionRendererView
|
|
138
140
|
}) => {
|
|
139
141
|
const isInlineExtension = extensionName === 'inlineExtension';
|
|
140
142
|
const showDefaultBodiedStyles = isBodiedMacro && !isNodeHovered;
|
|
141
|
-
const shouldShowBodiedMacroLabel = getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView);
|
|
143
|
+
const shouldShowBodiedMacroLabel = getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI);
|
|
142
144
|
const containerClassNames = classnames({
|
|
143
145
|
bodied: isBodiedMacro
|
|
144
146
|
});
|
|
@@ -27,6 +27,7 @@ export const LozengeComponent = ({
|
|
|
27
27
|
setIsNodeHovered,
|
|
28
28
|
isBodiedMacro,
|
|
29
29
|
showLivePagesBodiedMacrosRendererView,
|
|
30
|
+
showUpdatedLivePages1PBodiedExtensionUI,
|
|
30
31
|
showBodiedExtensionRendererView,
|
|
31
32
|
setShowBodiedExtensionRendererView
|
|
32
33
|
}) => {
|
|
@@ -42,6 +43,7 @@ export const LozengeComponent = ({
|
|
|
42
43
|
isBodiedMacro: isBodiedMacro,
|
|
43
44
|
showMacroButtonUpdates: showMacroButtonUpdates,
|
|
44
45
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
46
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
45
47
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView
|
|
46
48
|
}), showLivePagesBodiedMacrosRendererView && isBodiedMacro && jsx(EditToggle, {
|
|
47
49
|
isNodeHovered: isNodeHovered,
|
|
@@ -40,6 +40,7 @@ export default class ExtensionLozenge extends Component {
|
|
|
40
40
|
setIsNodeHovered,
|
|
41
41
|
isBodiedMacro,
|
|
42
42
|
showLivePagesBodiedMacrosRendererView,
|
|
43
|
+
showUpdatedLivePages1PBodiedExtensionUI,
|
|
43
44
|
showBodiedExtensionRendererView,
|
|
44
45
|
setShowBodiedExtensionRendererView
|
|
45
46
|
} = this.props;
|
|
@@ -67,6 +68,7 @@ export default class ExtensionLozenge extends Component {
|
|
|
67
68
|
setIsNodeHovered: setIsNodeHovered,
|
|
68
69
|
isBodiedMacro: isBodiedMacro,
|
|
69
70
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
71
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
70
72
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
71
73
|
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
72
74
|
});
|
|
@@ -20,6 +20,7 @@ export class Extension extends Component {
|
|
|
20
20
|
eventDispatcher,
|
|
21
21
|
macroInteractionDesignFeatureFlags,
|
|
22
22
|
showLivePagesBodiedMacrosRendererView,
|
|
23
|
+
showUpdatedLivePages1PBodiedExtensionUI,
|
|
23
24
|
rendererExtensionHandlers
|
|
24
25
|
} = this.props;
|
|
25
26
|
return /*#__PURE__*/React.createElement(ExtensionComponent, {
|
|
@@ -35,6 +36,7 @@ export class Extension extends Component {
|
|
|
35
36
|
eventDispatcher: eventDispatcher,
|
|
36
37
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
37
38
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
39
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
38
40
|
rendererExtensionHandlers: rendererExtensionHandlers
|
|
39
41
|
});
|
|
40
42
|
});
|
|
@@ -8,6 +8,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
|
|
|
8
8
|
import { getExtensionModuleNodePrivateProps, getNodeRenderer } from '../extensions';
|
|
9
9
|
import { getExtensionRenderer, nodeToJSON, toJSON } from '../utils';
|
|
10
10
|
import Extension from './Extension/Extension';
|
|
11
|
+
import { isEmptyBodiedMacro } from './Extension/Extension/extension-utils';
|
|
11
12
|
import InlineExtension from './Extension/InlineExtension';
|
|
12
13
|
import MultiBodiedExtension from './MultiBodiedExtension';
|
|
13
14
|
|
|
@@ -15,19 +16,6 @@ import MultiBodiedExtension from './MultiBodiedExtension';
|
|
|
15
16
|
|
|
16
17
|
/* temporary type until FG cleaned up */
|
|
17
18
|
|
|
18
|
-
const isEmptyBodiedMacro = node => {
|
|
19
|
-
var _node$content, _firstGrandChildNode$;
|
|
20
|
-
if (node.type.name !== 'bodiedExtension') {
|
|
21
|
-
return false;
|
|
22
|
-
}
|
|
23
|
-
const firstChildNode = node === null || node === void 0 ? void 0 : (_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.firstChild;
|
|
24
|
-
const firstGrandChildNode = firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.firstChild;
|
|
25
|
-
|
|
26
|
-
// If firstChildNode?.childCount > 1 means there is content along with the placeholder.
|
|
27
|
-
const isEmptyWithPlacholder = (firstGrandChildNode === null || firstGrandChildNode === void 0 ? void 0 : (_firstGrandChildNode$ = firstGrandChildNode.type) === null || _firstGrandChildNode$ === void 0 ? void 0 : _firstGrandChildNode$.name) === 'placeholder' && (firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.childCount) === 1;
|
|
28
|
-
const isEmptyWithNoContent = !firstGrandChildNode && node.childCount === 1;
|
|
29
|
-
return isEmptyWithPlacholder || isEmptyWithNoContent;
|
|
30
|
-
};
|
|
31
19
|
const getBodiedExtensionContent = node => {
|
|
32
20
|
const bodiedExtensionContent = [];
|
|
33
21
|
node.content.forEach(childNode => {
|
|
@@ -208,7 +196,8 @@ export class ExtensionComponentOld extends Component {
|
|
|
208
196
|
getPos,
|
|
209
197
|
eventDispatcher,
|
|
210
198
|
macroInteractionDesignFeatureFlags,
|
|
211
|
-
showLivePagesBodiedMacrosRendererView
|
|
199
|
+
showLivePagesBodiedMacrosRendererView,
|
|
200
|
+
showUpdatedLivePages1PBodiedExtensionUI
|
|
212
201
|
} = this.props;
|
|
213
202
|
const {
|
|
214
203
|
selection
|
|
@@ -254,6 +243,7 @@ export class ExtensionComponentOld extends Component {
|
|
|
254
243
|
isNodeNested: isNodeNested,
|
|
255
244
|
setIsNodeHovered: this.setIsNodeHovered,
|
|
256
245
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
246
|
+
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI(nodeToJSON(node))),
|
|
257
247
|
showBodiedExtensionRendererView: this.state.showBodiedExtensionRendererView,
|
|
258
248
|
setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView
|
|
259
249
|
}, extensionHandlerResult);
|
|
@@ -444,6 +434,7 @@ class ExtensionComponentInner extends Component {
|
|
|
444
434
|
macroInteractionDesignFeatureFlags,
|
|
445
435
|
extensionProvider,
|
|
446
436
|
showLivePagesBodiedMacrosRendererView,
|
|
437
|
+
showUpdatedLivePages1PBodiedExtensionUI,
|
|
447
438
|
showBodiedExtensionRendererView,
|
|
448
439
|
setShowBodiedExtensionRendererView
|
|
449
440
|
} = this.props;
|
|
@@ -491,6 +482,7 @@ class ExtensionComponentInner extends Component {
|
|
|
491
482
|
isNodeNested: isNodeNested,
|
|
492
483
|
setIsNodeHovered: this.setIsNodeHovered,
|
|
493
484
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
485
|
+
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI(nodeToJSON(node))),
|
|
494
486
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
495
487
|
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
496
488
|
}, extensionHandlerResult);
|
|
@@ -49,11 +49,12 @@ export class ExtensionNode extends ReactNodeView {
|
|
|
49
49
|
pluginInjectionApi: props.pluginInjectionApi,
|
|
50
50
|
macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
|
|
51
51
|
showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,
|
|
52
|
+
showUpdatedLivePages1PBodiedExtensionUI: props.showUpdatedLivePages1PBodiedExtensionUI,
|
|
52
53
|
rendererExtensionHandlers: props.rendererExtensionHandlers
|
|
53
54
|
}));
|
|
54
55
|
}
|
|
55
56
|
}
|
|
56
|
-
export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, rendererExtensionHandlers) {
|
|
57
|
+
export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, rendererExtensionHandlers) {
|
|
57
58
|
return (node, view, getPos) => {
|
|
58
59
|
return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
|
|
59
60
|
providerFactory,
|
|
@@ -62,6 +63,7 @@ export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, pr
|
|
|
62
63
|
pluginInjectionApi,
|
|
63
64
|
macroInteractionDesignFeatureFlags,
|
|
64
65
|
showLivePagesBodiedMacrosRendererView,
|
|
66
|
+
showUpdatedLivePages1PBodiedExtensionUI,
|
|
65
67
|
rendererExtensionHandlers
|
|
66
68
|
}).init();
|
|
67
69
|
};
|
|
@@ -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 = "96.
|
|
4
|
+
const packageVersion = "96.7.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 = "96.
|
|
16
|
+
const packageVersion = "96.7.0";
|
|
17
17
|
const halfFocusRing = 1;
|
|
18
18
|
const dropOffset = '0, 8';
|
|
19
19
|
class DropList extends Component {
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export var isEmptyBodiedMacro = function isEmptyBodiedMacro(node) {
|
|
2
|
+
var _node$content, _firstGrandChildNode$;
|
|
3
|
+
if (node.type.name !== 'bodiedExtension') {
|
|
4
|
+
return false;
|
|
5
|
+
}
|
|
6
|
+
var firstChildNode = node === null || node === void 0 || (_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.firstChild;
|
|
7
|
+
var firstGrandChildNode = firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.firstChild;
|
|
8
|
+
|
|
9
|
+
// If firstChildNode?.childCount > 1 means there is content along with the placeholder.
|
|
10
|
+
var isEmptyWithPlacholder = (firstGrandChildNode === null || firstGrandChildNode === void 0 || (_firstGrandChildNode$ = firstGrandChildNode.type) === null || _firstGrandChildNode$ === void 0 ? void 0 : _firstGrandChildNode$.name) === 'placeholder' && (firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.childCount) === 1;
|
|
11
|
+
var isEmptyWithNoContent = !firstGrandChildNode && node.childCount === 1;
|
|
12
|
+
return isEmptyWithPlacholder || isEmptyWithNoContent;
|
|
13
|
+
};
|
|
@@ -20,6 +20,7 @@ import { overflowShadow } from '../../../ui';
|
|
|
20
20
|
import { calculateBreakoutStyles } from '../../../utils';
|
|
21
21
|
import ExtensionLozenge from '../Lozenge';
|
|
22
22
|
import { overlay } from '../styles';
|
|
23
|
+
import { isEmptyBodiedMacro } from './extension-utils';
|
|
23
24
|
import { content, contentWrapper, header, overflowWrapperStyles, widerLayoutClassName, wrapperStyle, wrapperStyleInheritedCursor } from './styles';
|
|
24
25
|
function ExtensionWithPluginState(props) {
|
|
25
26
|
var node = props.node,
|
|
@@ -39,6 +40,7 @@ function ExtensionWithPluginState(props) {
|
|
|
39
40
|
isNodeNested = props.isNodeNested,
|
|
40
41
|
setIsNodeHovered = props.setIsNodeHovered,
|
|
41
42
|
showLivePagesBodiedMacrosRendererView = props.showLivePagesBodiedMacrosRendererView,
|
|
43
|
+
showUpdatedLivePages1PBodiedExtensionUI = props.showUpdatedLivePages1PBodiedExtensionUI,
|
|
42
44
|
showBodiedExtensionRendererView = props.showBodiedExtensionRendererView,
|
|
43
45
|
setShowBodiedExtensionRendererView = props.setShowBodiedExtensionRendererView;
|
|
44
46
|
var _ref = macroInteractionDesignFeatureFlags || {},
|
|
@@ -60,9 +62,12 @@ function ExtensionWithPluginState(props) {
|
|
|
60
62
|
isTopLevelNode &&
|
|
61
63
|
// Extension breakout state should not be respected when the editor appearance is full-width mode
|
|
62
64
|
editorAppearance !== 'full-width';
|
|
65
|
+
|
|
66
|
+
// We don't want to show border for non-empty 1p bodied extensions in live pages
|
|
67
|
+
var show1PBodiedExtensionBorder = showUpdatedLivePages1PBodiedExtensionUI ? isEmptyBodiedMacro(node) : true;
|
|
63
68
|
var classNames = classnames('extension-container', 'block', shadowClassNames, _defineProperty({
|
|
64
69
|
'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
|
|
65
|
-
'with-bodied-border': showMacroInteractionDesignUpdates && hasBody && !showBodiedExtensionRendererView,
|
|
70
|
+
'with-bodied-border': showMacroInteractionDesignUpdates && hasBody && !showBodiedExtensionRendererView && show1PBodiedExtensionBorder,
|
|
66
71
|
'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested && !showBodiedExtensionRendererView,
|
|
67
72
|
'with-hover-border': showMacroInteractionDesignUpdates && isNodeHovered,
|
|
68
73
|
'with-danger-overlay': showMacroInteractionDesignUpdates,
|
|
@@ -118,6 +123,7 @@ function ExtensionWithPluginState(props) {
|
|
|
118
123
|
setIsNodeHovered: setIsNodeHovered,
|
|
119
124
|
isBodiedMacro: hasBody,
|
|
120
125
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
126
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
121
127
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
122
128
|
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
123
129
|
}), jsx("div", {
|
|
@@ -115,10 +115,11 @@ var i18n = defineMessages({
|
|
|
115
115
|
description: 'Text in tooltip that tells user they can configure the specific macro.'
|
|
116
116
|
}
|
|
117
117
|
});
|
|
118
|
-
export var getShouldShowBodiedMacroLabel = function getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView) {
|
|
119
|
-
|
|
118
|
+
export var getShouldShowBodiedMacroLabel = function getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI) {
|
|
119
|
+
// Bodied macros show the label by default except for the new live pages 1P bodied macro experience where we only show it on hover
|
|
120
|
+
if (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI) {
|
|
120
121
|
return isNodeHovered;
|
|
121
|
-
}
|
|
122
|
+
}
|
|
122
123
|
if (!showLivePagesBodiedMacrosRendererView) {
|
|
123
124
|
return true;
|
|
124
125
|
} // Keep showing labels as usual for default experience for bodied macros
|
|
@@ -134,10 +135,11 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
|
|
|
134
135
|
isBodiedMacro = _ref.isBodiedMacro,
|
|
135
136
|
showMacroButtonUpdates = _ref.showMacroButtonUpdates,
|
|
136
137
|
showLivePagesBodiedMacrosRendererView = _ref.showLivePagesBodiedMacrosRendererView,
|
|
138
|
+
showUpdatedLivePages1PBodiedExtensionUI = _ref.showUpdatedLivePages1PBodiedExtensionUI,
|
|
137
139
|
showBodiedExtensionRendererView = _ref.showBodiedExtensionRendererView;
|
|
138
140
|
var isInlineExtension = extensionName === 'inlineExtension';
|
|
139
141
|
var showDefaultBodiedStyles = isBodiedMacro && !isNodeHovered;
|
|
140
|
-
var shouldShowBodiedMacroLabel = getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView);
|
|
142
|
+
var shouldShowBodiedMacroLabel = getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI);
|
|
141
143
|
var containerClassNames = classnames({
|
|
142
144
|
bodied: isBodiedMacro
|
|
143
145
|
});
|
|
@@ -30,6 +30,7 @@ export var LozengeComponent = function LozengeComponent(_ref) {
|
|
|
30
30
|
setIsNodeHovered = _ref.setIsNodeHovered,
|
|
31
31
|
isBodiedMacro = _ref.isBodiedMacro,
|
|
32
32
|
showLivePagesBodiedMacrosRendererView = _ref.showLivePagesBodiedMacrosRendererView,
|
|
33
|
+
showUpdatedLivePages1PBodiedExtensionUI = _ref.showUpdatedLivePages1PBodiedExtensionUI,
|
|
33
34
|
showBodiedExtensionRendererView = _ref.showBodiedExtensionRendererView,
|
|
34
35
|
setShowBodiedExtensionRendererView = _ref.setShowBodiedExtensionRendererView;
|
|
35
36
|
var capitalizedTitle = capitalizeFirstLetter(title);
|
|
@@ -44,6 +45,7 @@ export var LozengeComponent = function LozengeComponent(_ref) {
|
|
|
44
45
|
isBodiedMacro: isBodiedMacro,
|
|
45
46
|
showMacroButtonUpdates: showMacroButtonUpdates,
|
|
46
47
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
48
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
47
49
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView
|
|
48
50
|
}), showLivePagesBodiedMacrosRendererView && isBodiedMacro && jsx(EditToggle, {
|
|
49
51
|
isNodeHovered: isNodeHovered,
|
|
@@ -50,6 +50,7 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
|
|
|
50
50
|
setIsNodeHovered = _this$props.setIsNodeHovered,
|
|
51
51
|
isBodiedMacro = _this$props.isBodiedMacro,
|
|
52
52
|
showLivePagesBodiedMacrosRendererView = _this$props.showLivePagesBodiedMacrosRendererView,
|
|
53
|
+
showUpdatedLivePages1PBodiedExtensionUI = _this$props.showUpdatedLivePages1PBodiedExtensionUI,
|
|
53
54
|
showBodiedExtensionRendererView = _this$props.showBodiedExtensionRendererView,
|
|
54
55
|
setShowBodiedExtensionRendererView = _this$props.setShowBodiedExtensionRendererView;
|
|
55
56
|
var _this$props$node$attr = _this.props.node.attrs,
|
|
@@ -73,6 +74,7 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
|
|
|
73
74
|
setIsNodeHovered: setIsNodeHovered,
|
|
74
75
|
isBodiedMacro: isBodiedMacro,
|
|
75
76
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
77
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
76
78
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
77
79
|
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
78
80
|
});
|
|
@@ -28,6 +28,7 @@ export var Extension = /*#__PURE__*/function (_Component) {
|
|
|
28
28
|
eventDispatcher = _this$props.eventDispatcher,
|
|
29
29
|
macroInteractionDesignFeatureFlags = _this$props.macroInteractionDesignFeatureFlags,
|
|
30
30
|
showLivePagesBodiedMacrosRendererView = _this$props.showLivePagesBodiedMacrosRendererView,
|
|
31
|
+
showUpdatedLivePages1PBodiedExtensionUI = _this$props.showUpdatedLivePages1PBodiedExtensionUI,
|
|
31
32
|
rendererExtensionHandlers = _this$props.rendererExtensionHandlers;
|
|
32
33
|
return /*#__PURE__*/React.createElement(ExtensionComponent, {
|
|
33
34
|
editorView: editorView,
|
|
@@ -42,6 +43,7 @@ export var Extension = /*#__PURE__*/function (_Component) {
|
|
|
42
43
|
eventDispatcher: eventDispatcher,
|
|
43
44
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
44
45
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
46
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
45
47
|
rendererExtensionHandlers: rendererExtensionHandlers
|
|
46
48
|
});
|
|
47
49
|
});
|
|
@@ -20,6 +20,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
|
|
|
20
20
|
import { getExtensionModuleNodePrivateProps, getNodeRenderer } from '../extensions';
|
|
21
21
|
import { getExtensionRenderer, nodeToJSON, toJSON } from '../utils';
|
|
22
22
|
import Extension from './Extension/Extension';
|
|
23
|
+
import { isEmptyBodiedMacro } from './Extension/Extension/extension-utils';
|
|
23
24
|
import InlineExtension from './Extension/InlineExtension';
|
|
24
25
|
import MultiBodiedExtension from './MultiBodiedExtension';
|
|
25
26
|
|
|
@@ -27,19 +28,6 @@ import MultiBodiedExtension from './MultiBodiedExtension';
|
|
|
27
28
|
|
|
28
29
|
/* temporary type until FG cleaned up */
|
|
29
30
|
|
|
30
|
-
var isEmptyBodiedMacro = function isEmptyBodiedMacro(node) {
|
|
31
|
-
var _node$content, _firstGrandChildNode$;
|
|
32
|
-
if (node.type.name !== 'bodiedExtension') {
|
|
33
|
-
return false;
|
|
34
|
-
}
|
|
35
|
-
var firstChildNode = node === null || node === void 0 || (_node$content = node.content) === null || _node$content === void 0 ? void 0 : _node$content.firstChild;
|
|
36
|
-
var firstGrandChildNode = firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.firstChild;
|
|
37
|
-
|
|
38
|
-
// If firstChildNode?.childCount > 1 means there is content along with the placeholder.
|
|
39
|
-
var isEmptyWithPlacholder = (firstGrandChildNode === null || firstGrandChildNode === void 0 || (_firstGrandChildNode$ = firstGrandChildNode.type) === null || _firstGrandChildNode$ === void 0 ? void 0 : _firstGrandChildNode$.name) === 'placeholder' && (firstChildNode === null || firstChildNode === void 0 ? void 0 : firstChildNode.childCount) === 1;
|
|
40
|
-
var isEmptyWithNoContent = !firstGrandChildNode && node.childCount === 1;
|
|
41
|
-
return isEmptyWithPlacholder || isEmptyWithNoContent;
|
|
42
|
-
};
|
|
43
31
|
var getBodiedExtensionContent = function getBodiedExtensionContent(node) {
|
|
44
32
|
var bodiedExtensionContent = [];
|
|
45
33
|
node.content.forEach(function (childNode) {
|
|
@@ -244,7 +232,8 @@ export var ExtensionComponentOld = /*#__PURE__*/function (_Component) {
|
|
|
244
232
|
getPos = _this$props3.getPos,
|
|
245
233
|
eventDispatcher = _this$props3.eventDispatcher,
|
|
246
234
|
macroInteractionDesignFeatureFlags = _this$props3.macroInteractionDesignFeatureFlags,
|
|
247
|
-
showLivePagesBodiedMacrosRendererView = _this$props3.showLivePagesBodiedMacrosRendererView
|
|
235
|
+
showLivePagesBodiedMacrosRendererView = _this$props3.showLivePagesBodiedMacrosRendererView,
|
|
236
|
+
showUpdatedLivePages1PBodiedExtensionUI = _this$props3.showUpdatedLivePages1PBodiedExtensionUI;
|
|
248
237
|
var selection = editorView.state.selection;
|
|
249
238
|
var selectedNode = selection instanceof NodeSelection && selection.node;
|
|
250
239
|
var position = typeof getPos === 'function' && getPos();
|
|
@@ -287,6 +276,7 @@ export var ExtensionComponentOld = /*#__PURE__*/function (_Component) {
|
|
|
287
276
|
isNodeNested: isNodeNested,
|
|
288
277
|
setIsNodeHovered: this.setIsNodeHovered,
|
|
289
278
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
279
|
+
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI(nodeToJSON(node))),
|
|
290
280
|
showBodiedExtensionRendererView: this.state.showBodiedExtensionRendererView,
|
|
291
281
|
setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView
|
|
292
282
|
}, extensionHandlerResult);
|
|
@@ -507,6 +497,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
507
497
|
macroInteractionDesignFeatureFlags = _this$props4.macroInteractionDesignFeatureFlags,
|
|
508
498
|
extensionProvider = _this$props4.extensionProvider,
|
|
509
499
|
showLivePagesBodiedMacrosRendererView = _this$props4.showLivePagesBodiedMacrosRendererView,
|
|
500
|
+
showUpdatedLivePages1PBodiedExtensionUI = _this$props4.showUpdatedLivePages1PBodiedExtensionUI,
|
|
510
501
|
showBodiedExtensionRendererView = _this$props4.showBodiedExtensionRendererView,
|
|
511
502
|
setShowBodiedExtensionRendererView = _this$props4.setShowBodiedExtensionRendererView;
|
|
512
503
|
var selection = editorView.state.selection;
|
|
@@ -551,6 +542,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
551
542
|
isNodeNested: isNodeNested,
|
|
552
543
|
setIsNodeHovered: this.setIsNodeHovered,
|
|
553
544
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
545
|
+
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI(nodeToJSON(node))),
|
|
554
546
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
555
547
|
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
556
548
|
}, extensionHandlerResult);
|
|
@@ -67,12 +67,13 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
|
|
|
67
67
|
pluginInjectionApi: props.pluginInjectionApi,
|
|
68
68
|
macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
|
|
69
69
|
showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,
|
|
70
|
+
showUpdatedLivePages1PBodiedExtensionUI: props.showUpdatedLivePages1PBodiedExtensionUI,
|
|
70
71
|
rendererExtensionHandlers: props.rendererExtensionHandlers
|
|
71
72
|
}));
|
|
72
73
|
}
|
|
73
74
|
}]);
|
|
74
75
|
}(ReactNodeView);
|
|
75
|
-
export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, rendererExtensionHandlers) {
|
|
76
|
+
export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, rendererExtensionHandlers) {
|
|
76
77
|
return function (node, view, getPos) {
|
|
77
78
|
return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
|
|
78
79
|
providerFactory: providerFactory,
|
|
@@ -81,6 +82,7 @@ export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, pr
|
|
|
81
82
|
pluginInjectionApi: pluginInjectionApi,
|
|
82
83
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
83
84
|
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
85
|
+
showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
|
|
84
86
|
rendererExtensionHandlers: rendererExtensionHandlers
|
|
85
87
|
}).init();
|
|
86
88
|
};
|
|
@@ -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 = "96.
|
|
10
|
+
var packageVersion = "96.7.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 = "96.
|
|
23
|
+
var packageVersion = "96.7.0";
|
|
24
24
|
var halfFocusRing = 1;
|
|
25
25
|
var dropOffset = '0, 8';
|
|
26
26
|
var DropList = /*#__PURE__*/function (_Component) {
|
|
@@ -22,6 +22,7 @@ export interface Props {
|
|
|
22
22
|
isNodeNested?: boolean;
|
|
23
23
|
setIsNodeHovered?: (isHovered: boolean) => void;
|
|
24
24
|
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
25
|
+
showUpdatedLivePages1PBodiedExtensionUI?: boolean;
|
|
25
26
|
showBodiedExtensionRendererView?: boolean;
|
|
26
27
|
setShowBodiedExtensionRendererView?: (showBodiedExtensionRendererView: boolean) => void;
|
|
27
28
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { CSSProperties } from 'react';
|
|
2
2
|
import { jsx } from '@emotion/react';
|
|
3
|
-
export declare const getShouldShowBodiedMacroLabel: (isBodiedMacro: boolean | undefined, isNodeHovered: boolean | undefined, showLivePagesBodiedMacrosRendererView: boolean | undefined, showBodiedExtensionRendererView: boolean | undefined) => boolean | undefined;
|
|
3
|
+
export declare const getShouldShowBodiedMacroLabel: (isBodiedMacro: boolean | undefined, isNodeHovered: boolean | undefined, showLivePagesBodiedMacrosRendererView: boolean | undefined, showBodiedExtensionRendererView: boolean | undefined, showUpdatedLivePages1PBodiedExtensionUI: boolean | undefined) => boolean | undefined;
|
|
4
4
|
type ExtensionLabelProps = {
|
|
5
5
|
text: string;
|
|
6
6
|
extensionName: string;
|
|
@@ -11,7 +11,8 @@ type ExtensionLabelProps = {
|
|
|
11
11
|
isBodiedMacro?: boolean;
|
|
12
12
|
showMacroButtonUpdates?: boolean;
|
|
13
13
|
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
14
|
+
showUpdatedLivePages1PBodiedExtensionUI?: boolean;
|
|
14
15
|
showBodiedExtensionRendererView?: boolean;
|
|
15
16
|
};
|
|
16
|
-
export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, isNodeNested, setIsNodeHovered, isBodiedMacro, showMacroButtonUpdates, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, }: ExtensionLabelProps) => jsx.JSX.Element;
|
|
17
|
+
export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, isNodeNested, setIsNodeHovered, isBodiedMacro, showMacroButtonUpdates, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, showBodiedExtensionRendererView, }: ExtensionLabelProps) => jsx.JSX.Element;
|
|
17
18
|
export {};
|
|
@@ -17,8 +17,9 @@ type LozengeComponentProps = {
|
|
|
17
17
|
setIsNodeHovered?: (isHovered: boolean) => void;
|
|
18
18
|
isBodiedMacro?: boolean;
|
|
19
19
|
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
20
|
+
showUpdatedLivePages1PBodiedExtensionUI?: boolean;
|
|
20
21
|
showBodiedExtensionRendererView?: boolean;
|
|
21
22
|
setShowBodiedExtensionRendererView?: (showBodiedExtensionRendererView: boolean) => void;
|
|
22
23
|
};
|
|
23
|
-
export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, showMacroButtonUpdates, customContainerStyles, isNodeHovered, isNodeNested, setIsNodeHovered, isBodiedMacro, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, setShowBodiedExtensionRendererView, }: LozengeComponentProps) => jsx.JSX.Element;
|
|
24
|
+
export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, showMacroButtonUpdates, customContainerStyles, isNodeHovered, isNodeNested, setIsNodeHovered, isBodiedMacro, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, showBodiedExtensionRendererView, setShowBodiedExtensionRendererView, }: LozengeComponentProps) => jsx.JSX.Element;
|
|
24
25
|
export {};
|
|
@@ -17,6 +17,7 @@ export interface Props {
|
|
|
17
17
|
setIsNodeHovered?: (isHovered: boolean) => void;
|
|
18
18
|
isBodiedMacro?: boolean;
|
|
19
19
|
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
20
|
+
showUpdatedLivePages1PBodiedExtensionUI?: boolean;
|
|
20
21
|
showBodiedExtensionRendererView?: boolean;
|
|
21
22
|
setShowBodiedExtensionRendererView?: (showBodiedExtensionRendererView: boolean) => void;
|
|
22
23
|
}
|
|
@@ -21,6 +21,7 @@ export interface Props {
|
|
|
21
21
|
eventDispatcher?: EventDispatcher;
|
|
22
22
|
macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
|
|
23
23
|
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
24
|
+
showUpdatedLivePages1PBodiedExtensionUI?: (node: ADFEntity) => boolean;
|
|
24
25
|
rendererExtensionHandlers?: ExtensionHandlers;
|
|
25
26
|
}
|
|
26
27
|
export declare class Extension extends Component<Props, any> {
|
|
@@ -21,6 +21,7 @@ export interface Props {
|
|
|
21
21
|
eventDispatcher?: EventDispatcher;
|
|
22
22
|
macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
|
|
23
23
|
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
24
|
+
showUpdatedLivePages1PBodiedExtensionUI?: (node: ADFEntity) => boolean;
|
|
24
25
|
rendererExtensionHandlers?: ExtensionHandlers;
|
|
25
26
|
}
|
|
26
27
|
export interface State {
|
|
@@ -28,8 +28,9 @@ export declare class ExtensionNode extends ReactNodeView {
|
|
|
28
28
|
pluginInjectionApi: ExtensionsPluginInjectionAPI;
|
|
29
29
|
macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
|
|
30
30
|
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
31
|
+
showUpdatedLivePages1PBodiedExtensionUI?: (node: ADFEntity) => boolean;
|
|
31
32
|
rendererExtensionHandlers?: ExtensionHandlers;
|
|
32
33
|
}, forwardRef: ForwardRef): JSX.Element;
|
|
33
34
|
}
|
|
34
|
-
export default function ExtensionNodeView(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, extensionNodeViewOptions: ExtensionNodeViewOptions, pluginInjectionApi: ExtensionsPluginInjectionAPI, macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean, rendererExtensionHandlers?: ExtensionHandlers): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;
|
|
35
|
+
export default function ExtensionNodeView(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, extensionNodeViewOptions: ExtensionNodeViewOptions, pluginInjectionApi: ExtensionsPluginInjectionAPI, macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean, showUpdatedLivePages1PBodiedExtensionUI?: (node: ADFEntity) => boolean, rendererExtensionHandlers?: ExtensionHandlers): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;
|
|
35
36
|
export {};
|
|
@@ -22,6 +22,7 @@ export interface Props {
|
|
|
22
22
|
isNodeNested?: boolean;
|
|
23
23
|
setIsNodeHovered?: (isHovered: boolean) => void;
|
|
24
24
|
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
25
|
+
showUpdatedLivePages1PBodiedExtensionUI?: boolean;
|
|
25
26
|
showBodiedExtensionRendererView?: boolean;
|
|
26
27
|
setShowBodiedExtensionRendererView?: (showBodiedExtensionRendererView: boolean) => void;
|
|
27
28
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { CSSProperties } from 'react';
|
|
2
2
|
import { jsx } from '@emotion/react';
|
|
3
|
-
export declare const getShouldShowBodiedMacroLabel: (isBodiedMacro: boolean | undefined, isNodeHovered: boolean | undefined, showLivePagesBodiedMacrosRendererView: boolean | undefined, showBodiedExtensionRendererView: boolean | undefined) => boolean | undefined;
|
|
3
|
+
export declare const getShouldShowBodiedMacroLabel: (isBodiedMacro: boolean | undefined, isNodeHovered: boolean | undefined, showLivePagesBodiedMacrosRendererView: boolean | undefined, showBodiedExtensionRendererView: boolean | undefined, showUpdatedLivePages1PBodiedExtensionUI: boolean | undefined) => boolean | undefined;
|
|
4
4
|
type ExtensionLabelProps = {
|
|
5
5
|
text: string;
|
|
6
6
|
extensionName: string;
|
|
@@ -11,7 +11,8 @@ type ExtensionLabelProps = {
|
|
|
11
11
|
isBodiedMacro?: boolean;
|
|
12
12
|
showMacroButtonUpdates?: boolean;
|
|
13
13
|
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
14
|
+
showUpdatedLivePages1PBodiedExtensionUI?: boolean;
|
|
14
15
|
showBodiedExtensionRendererView?: boolean;
|
|
15
16
|
};
|
|
16
|
-
export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, isNodeNested, setIsNodeHovered, isBodiedMacro, showMacroButtonUpdates, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, }: ExtensionLabelProps) => jsx.JSX.Element;
|
|
17
|
+
export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, isNodeNested, setIsNodeHovered, isBodiedMacro, showMacroButtonUpdates, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, showBodiedExtensionRendererView, }: ExtensionLabelProps) => jsx.JSX.Element;
|
|
17
18
|
export {};
|
|
@@ -17,8 +17,9 @@ type LozengeComponentProps = {
|
|
|
17
17
|
setIsNodeHovered?: (isHovered: boolean) => void;
|
|
18
18
|
isBodiedMacro?: boolean;
|
|
19
19
|
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
20
|
+
showUpdatedLivePages1PBodiedExtensionUI?: boolean;
|
|
20
21
|
showBodiedExtensionRendererView?: boolean;
|
|
21
22
|
setShowBodiedExtensionRendererView?: (showBodiedExtensionRendererView: boolean) => void;
|
|
22
23
|
};
|
|
23
|
-
export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, showMacroButtonUpdates, customContainerStyles, isNodeHovered, isNodeNested, setIsNodeHovered, isBodiedMacro, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, setShowBodiedExtensionRendererView, }: LozengeComponentProps) => jsx.JSX.Element;
|
|
24
|
+
export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, showMacroButtonUpdates, customContainerStyles, isNodeHovered, isNodeNested, setIsNodeHovered, isBodiedMacro, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, showBodiedExtensionRendererView, setShowBodiedExtensionRendererView, }: LozengeComponentProps) => jsx.JSX.Element;
|
|
24
25
|
export {};
|
|
@@ -17,6 +17,7 @@ export interface Props {
|
|
|
17
17
|
setIsNodeHovered?: (isHovered: boolean) => void;
|
|
18
18
|
isBodiedMacro?: boolean;
|
|
19
19
|
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
20
|
+
showUpdatedLivePages1PBodiedExtensionUI?: boolean;
|
|
20
21
|
showBodiedExtensionRendererView?: boolean;
|
|
21
22
|
setShowBodiedExtensionRendererView?: (showBodiedExtensionRendererView: boolean) => void;
|
|
22
23
|
}
|
|
@@ -21,6 +21,7 @@ export interface Props {
|
|
|
21
21
|
eventDispatcher?: EventDispatcher;
|
|
22
22
|
macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
|
|
23
23
|
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
24
|
+
showUpdatedLivePages1PBodiedExtensionUI?: (node: ADFEntity) => boolean;
|
|
24
25
|
rendererExtensionHandlers?: ExtensionHandlers;
|
|
25
26
|
}
|
|
26
27
|
export declare class Extension extends Component<Props, any> {
|
|
@@ -21,6 +21,7 @@ export interface Props {
|
|
|
21
21
|
eventDispatcher?: EventDispatcher;
|
|
22
22
|
macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
|
|
23
23
|
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
24
|
+
showUpdatedLivePages1PBodiedExtensionUI?: (node: ADFEntity) => boolean;
|
|
24
25
|
rendererExtensionHandlers?: ExtensionHandlers;
|
|
25
26
|
}
|
|
26
27
|
export interface State {
|
|
@@ -28,8 +28,9 @@ export declare class ExtensionNode extends ReactNodeView {
|
|
|
28
28
|
pluginInjectionApi: ExtensionsPluginInjectionAPI;
|
|
29
29
|
macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
|
|
30
30
|
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
31
|
+
showUpdatedLivePages1PBodiedExtensionUI?: (node: ADFEntity) => boolean;
|
|
31
32
|
rendererExtensionHandlers?: ExtensionHandlers;
|
|
32
33
|
}, forwardRef: ForwardRef): JSX.Element;
|
|
33
34
|
}
|
|
34
|
-
export default function ExtensionNodeView(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, extensionNodeViewOptions: ExtensionNodeViewOptions, pluginInjectionApi: ExtensionsPluginInjectionAPI, macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean, rendererExtensionHandlers?: ExtensionHandlers): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;
|
|
35
|
+
export default function ExtensionNodeView(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, extensionNodeViewOptions: ExtensionNodeViewOptions, pluginInjectionApi: ExtensionsPluginInjectionAPI, macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean, showUpdatedLivePages1PBodiedExtensionUI?: (node: ADFEntity) => boolean, rendererExtensionHandlers?: ExtensionHandlers): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;
|
|
35
36
|
export {};
|
package/package.json
CHANGED