@atlaskit/editor-common 115.7.0 → 115.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/dist/cjs/extensibility/Extension/Extension/index.js +1 -2
- package/dist/cjs/extensibility/Extension/InlineExtension/index.js +2 -3
- package/dist/cjs/extensibility/Extension/Lozenge/EditToggle.js +2 -6
- package/dist/cjs/extensibility/Extension/Lozenge/ExtensionLabel.js +4 -9
- package/dist/cjs/extensibility/ExtensionComponent.js +0 -7
- package/dist/cjs/extensibility/ExtensionNodeWrapper.js +1 -2
- package/dist/cjs/extensibility/MultiBodiedExtension/index.js +2 -3
- 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 +1 -2
- package/dist/es2019/extensibility/Extension/InlineExtension/index.js +2 -3
- package/dist/es2019/extensibility/Extension/Lozenge/EditToggle.js +1 -5
- package/dist/es2019/extensibility/Extension/Lozenge/ExtensionLabel.js +4 -8
- package/dist/es2019/extensibility/ExtensionComponent.js +0 -7
- package/dist/es2019/extensibility/ExtensionNodeWrapper.js +1 -2
- package/dist/es2019/extensibility/MultiBodiedExtension/index.js +2 -3
- 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 +1 -2
- package/dist/esm/extensibility/Extension/InlineExtension/index.js +2 -3
- package/dist/esm/extensibility/Extension/Lozenge/EditToggle.js +2 -6
- package/dist/esm/extensibility/Extension/Lozenge/ExtensionLabel.js +4 -9
- package/dist/esm/extensibility/ExtensionComponent.js +0 -7
- package/dist/esm/extensibility/ExtensionNodeWrapper.js +1 -2
- package/dist/esm/extensibility/MultiBodiedExtension/index.js +2 -3
- package/dist/esm/monitoring/error.js +1 -1
- package/dist/esm/ui/DropList/index.js +1 -1
- package/dist/types/extensibility/Extension/Lozenge/EditToggle.d.ts +1 -1
- package/dist/types/extensibility/Extension/Lozenge/ExtensionLabel.d.ts +1 -1
- package/dist/types-ts4.5/extensibility/Extension/Lozenge/EditToggle.d.ts +1 -1
- package/dist/types-ts4.5/extensibility/Extension/Lozenge/ExtensionLabel.d.ts +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# @atlaskit/editor-common
|
|
2
2
|
|
|
3
|
+
## 115.7.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`54136b334c25a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/54136b334c25a) -
|
|
8
|
+
Clean up experiment cc_editor_ttvc_release_bundle_one
|
|
9
|
+
- Updated dependencies
|
|
10
|
+
|
|
3
11
|
## 115.7.0
|
|
4
12
|
|
|
5
13
|
### Minor Changes
|
|
@@ -100,7 +100,6 @@ function ExtensionWithPluginState(props) {
|
|
|
100
100
|
'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
|
|
101
101
|
'with-bodied-border': showMacroInteractionDesignUpdates && (hasBody || isLegacyContentMacroExtension(node)) && !showBodiedExtensionRendererView && show1PBodiedExtensionBorder,
|
|
102
102
|
'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested && !showBodiedExtensionRendererView,
|
|
103
|
-
'with-hover-border': (0, _expValEquals.expValEquals)('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? false : showMacroInteractionDesignUpdates && isNodeHovered,
|
|
104
103
|
'with-danger-overlay': showMacroInteractionDesignUpdates,
|
|
105
104
|
'without-frame': removeBorder
|
|
106
105
|
}, _styles2.widerLayoutClassName, shouldBreakout));
|
|
@@ -167,7 +166,7 @@ function ExtensionWithPluginState(props) {
|
|
|
167
166
|
className: classNames,
|
|
168
167
|
css: [
|
|
169
168
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
170
|
-
_styles2.wrapperStyleInheritedCursor, showMacroInteractionDesignUpdates && !isLivePageViewMode &&
|
|
169
|
+
_styles2.wrapperStyleInheritedCursor, showMacroInteractionDesignUpdates && !isLivePageViewMode && hoverStyles]
|
|
171
170
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
172
171
|
,
|
|
173
172
|
style: customContainerStyles,
|
|
@@ -63,8 +63,7 @@ var InlineExtension = function InlineExtension(props) {
|
|
|
63
63
|
var classNames = (0, _classnames.default)('extension-container', 'inline', {
|
|
64
64
|
'with-overlay': !showMacroInteractionDesignUpdates,
|
|
65
65
|
'with-children': hasChildren,
|
|
66
|
-
'with-danger-overlay': showMacroInteractionDesignUpdates
|
|
67
|
-
'with-hover-border': (0, _expValEquals.expValEquals)('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? false : showMacroInteractionDesignUpdates && isNodeHovered
|
|
66
|
+
'with-danger-overlay': showMacroInteractionDesignUpdates
|
|
68
67
|
});
|
|
69
68
|
var rendererContainerWidth = 0;
|
|
70
69
|
if ((0, _experiments.editorExperiment)('platform_editor_preview_panel_responsiveness', true, {
|
|
@@ -93,7 +92,7 @@ var InlineExtension = function InlineExtension(props) {
|
|
|
93
92
|
"data-testid": "inline-extension-wrapper",
|
|
94
93
|
css: [
|
|
95
94
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
96
|
-
_styles2.wrapperStyle, inlineWrapperStyles, showMacroInteractionDesignUpdates && !isLivePageViewMode &&
|
|
95
|
+
_styles2.wrapperStyle, inlineWrapperStyles, showMacroInteractionDesignUpdates && !isLivePageViewMode && hoverStyles]
|
|
97
96
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
98
97
|
,
|
|
99
98
|
className: classNames,
|
|
@@ -51,9 +51,6 @@ var buttonStyles = (0, _react2.css)({
|
|
|
51
51
|
backgroundColor: "var(--ds-background-input, #FFFFFF)",
|
|
52
52
|
color: "var(--ds-text-subtle, #505258)"
|
|
53
53
|
});
|
|
54
|
-
var showButtonContainerStyle = (0, _react2.css)({
|
|
55
|
-
opacity: 1
|
|
56
|
-
});
|
|
57
54
|
var iconStyles = (0, _primitives.xcss)({
|
|
58
55
|
marginRight: 'space.075'
|
|
59
56
|
});
|
|
@@ -71,8 +68,7 @@ var i18n = (0, _reactIntl.defineMessages)({
|
|
|
71
68
|
});
|
|
72
69
|
// Used to toggle between edit and renderer mode for bodied macros in live pages
|
|
73
70
|
var EditToggle = exports.EditToggle = function EditToggle(_ref) {
|
|
74
|
-
var
|
|
75
|
-
customContainerStyles = _ref.customContainerStyles,
|
|
71
|
+
var customContainerStyles = _ref.customContainerStyles,
|
|
76
72
|
setIsNodeHovered = _ref.setIsNodeHovered,
|
|
77
73
|
showBodiedExtensionRendererView = _ref.showBodiedExtensionRendererView,
|
|
78
74
|
setShowBodiedExtensionRendererView = _ref.setShowBodiedExtensionRendererView;
|
|
@@ -97,7 +93,7 @@ var EditToggle = exports.EditToggle = function EditToggle(_ref) {
|
|
|
97
93
|
"data-testid": "extension-edit-toggle-container"
|
|
98
94
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
99
95
|
,
|
|
100
|
-
css: [buttonContainerStyles
|
|
96
|
+
css: [buttonContainerStyles]
|
|
101
97
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
102
98
|
,
|
|
103
99
|
style: customContainerStyles
|
|
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.getShouldShowBodiedMacroLabel = exports.ExtensionLabel = void 0;
|
|
8
|
-
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
9
8
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
10
9
|
var _react = require("react");
|
|
11
10
|
var _react2 = require("@emotion/react");
|
|
@@ -131,7 +130,6 @@ var getShouldShowBodiedMacroLabel = exports.getShouldShowBodiedMacroLabel = func
|
|
|
131
130
|
var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
|
|
132
131
|
var text = _ref.text,
|
|
133
132
|
extensionName = _ref.extensionName,
|
|
134
|
-
isNodeHovered = _ref.isNodeHovered,
|
|
135
133
|
customContainerStyles = _ref.customContainerStyles,
|
|
136
134
|
isNodeNested = _ref.isNodeNested,
|
|
137
135
|
setIsNodeHovered = _ref.setIsNodeHovered,
|
|
@@ -141,8 +139,7 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
|
|
|
141
139
|
showBodiedExtensionRendererView = _ref.showBodiedExtensionRendererView,
|
|
142
140
|
_pluginInjectionApi = _ref.pluginInjectionApi;
|
|
143
141
|
var isInlineExtension = extensionName === 'inlineExtension';
|
|
144
|
-
var showDefaultBodiedStyles =
|
|
145
|
-
var shouldShowBodiedMacroLabel = getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI);
|
|
142
|
+
var showDefaultBodiedStyles = isBodiedMacro;
|
|
146
143
|
var containerClassNames = (0, _classnames.default)({
|
|
147
144
|
bodied: isBodiedMacro
|
|
148
145
|
});
|
|
@@ -152,7 +149,6 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
|
|
|
152
149
|
bodied: isBodiedMacro,
|
|
153
150
|
'bodied-border': showDefaultBodiedStyles,
|
|
154
151
|
'bodied-background': showDefaultBodiedStyles,
|
|
155
|
-
'show-label': (0, _expValEquals.expValEquals)('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? false : shouldShowBodiedMacroLabel,
|
|
156
152
|
'with-bodied-macro-live-page-styles': isBodiedMacro && showLivePagesBodiedMacrosRendererView,
|
|
157
153
|
'always-hide-label': isBodiedMacro && showBodiedExtensionRendererView,
|
|
158
154
|
// Need this separate class since we don't ever want to show the label during view mode
|
|
@@ -160,8 +156,7 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
|
|
|
160
156
|
'remove-nested-left-margin': isNodeNested && !isBodiedMacro && !isInlineExtension
|
|
161
157
|
});
|
|
162
158
|
var iconClassNames = (0, _classnames.default)({
|
|
163
|
-
'
|
|
164
|
-
'extension-icon': (0, _expValEquals.expValEquals)('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true)
|
|
159
|
+
'extension-icon': true
|
|
165
160
|
});
|
|
166
161
|
var memoizedTooltipValues = (0, _react.useMemo)(function () {
|
|
167
162
|
return {
|
|
@@ -210,12 +205,12 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
|
|
|
210
205
|
// Ignored via go/ees005
|
|
211
206
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
212
207
|
}, tooltipProps, {
|
|
213
|
-
css: [labelStyles
|
|
208
|
+
css: [labelStyles, !showLivePagesBodiedMacrosRendererView && showLabelStyles, (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI) && hideLabelStyles]
|
|
214
209
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
215
210
|
,
|
|
216
211
|
className: labelClassNames
|
|
217
212
|
}), text, (0, _react2.jsx)("span", {
|
|
218
|
-
css: [iconStyles, isBodiedMacro &&
|
|
213
|
+
css: [iconStyles, isBodiedMacro && bodiedMacroIconStyles]
|
|
219
214
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
220
215
|
,
|
|
221
216
|
className: iconClassNames,
|
|
@@ -21,7 +21,6 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
21
21
|
var _memoizeOne = _interopRequireDefault(require("memoize-one"));
|
|
22
22
|
var _state = require("@atlaskit/editor-prosemirror/state");
|
|
23
23
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
24
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
25
24
|
var _extensions = require("../extensions");
|
|
26
25
|
var _utils = require("../utils");
|
|
27
26
|
var _Extension = _interopRequireDefault(require("./Extension/Extension"));
|
|
@@ -258,8 +257,6 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component) {
|
|
|
258
257
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
259
258
|
isNodeSelected: selectedNode === node,
|
|
260
259
|
isNodeNested: isNodeNested,
|
|
261
|
-
isNodeHovered: (0, _expValEquals.expValEquals)('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.state.isNodeHovered,
|
|
262
|
-
setIsNodeHovered: (0, _expValEquals.expValEquals)('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.setIsNodeHovered,
|
|
263
260
|
isLivePageViewMode: isLivePageViewMode,
|
|
264
261
|
allowBodiedOverride: allowBodiedOverride
|
|
265
262
|
});
|
|
@@ -280,9 +277,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component) {
|
|
|
280
277
|
pluginInjectionApi: pluginInjectionApi,
|
|
281
278
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
282
279
|
isNodeSelected: selectedNode === node,
|
|
283
|
-
isNodeHovered: (0, _expValEquals.expValEquals)('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.state.isNodeHovered,
|
|
284
280
|
isNodeNested: isNodeNested,
|
|
285
|
-
setIsNodeHovered: (0, _expValEquals.expValEquals)('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.setIsNodeHovered,
|
|
286
281
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))),
|
|
287
282
|
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI((0, _utils.nodeToJSON)(node))),
|
|
288
283
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
@@ -295,8 +290,6 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component) {
|
|
|
295
290
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
296
291
|
isNodeSelected: selectedNode === node,
|
|
297
292
|
pluginInjectionApi: pluginInjectionApi,
|
|
298
|
-
isNodeHovered: (0, _expValEquals.expValEquals)('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.state.isNodeHovered,
|
|
299
|
-
setIsNodeHovered: (0, _expValEquals.expValEquals)('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.setIsNodeHovered,
|
|
300
293
|
isLivePageViewMode: isLivePageViewMode
|
|
301
294
|
}, extensionHandlerResult);
|
|
302
295
|
default:
|
|
@@ -8,7 +8,6 @@ exports.ExtensionNodeWrapper = void 0;
|
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
var _react2 = require("@emotion/react");
|
|
10
10
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
11
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
12
11
|
var _whitespace = require("../whitespace");
|
|
13
12
|
var _ExtensionSSRReactContextsProvider = require("./ExtensionSSRReactContextsProvider");
|
|
14
13
|
/**
|
|
@@ -86,6 +85,6 @@ var ExtensionNodeWrapper = exports.ExtensionNodeWrapper = function ExtensionNode
|
|
|
86
85
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
|
|
87
86
|
,
|
|
88
87
|
className: wrapperClassNames,
|
|
89
|
-
css: [styles,
|
|
88
|
+
css: [styles, hoverStyles]
|
|
90
89
|
}, children, nodeType === 'inlineExtension' && _whitespace.ZERO_WIDTH_SPACE));
|
|
91
90
|
};
|
|
@@ -179,8 +179,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
|
|
|
179
179
|
'with-border': showMacroInteractionDesignUpdates,
|
|
180
180
|
'with-danger-overlay': showMacroInteractionDesignUpdates,
|
|
181
181
|
'with-padding-background-styles': showMacroInteractionDesignUpdates,
|
|
182
|
-
'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested
|
|
183
|
-
'with-hover-border': (0, _expValEquals.expValEquals)('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? false : showMacroInteractionDesignUpdates && isNodeHovered
|
|
182
|
+
'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested
|
|
184
183
|
});
|
|
185
184
|
var containerClassNames = (0, _classnames.default)('multiBodiedExtension--container', {
|
|
186
185
|
'remove-padding': showMacroInteractionDesignUpdates
|
|
@@ -213,7 +212,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
|
|
|
213
212
|
className: wrapperClassNames,
|
|
214
213
|
css: [/* eslint-disable @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766 */
|
|
215
214
|
(0, _platformFeatureFlags.fg)('confluence_frontend_native_tabs_extension') ? _styles.mbeExtensionWrapperCSSStyles : _styles.mbeExtensionWrapperCSSStylesOld, /* eslint-enable @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage */
|
|
216
|
-
showMacroInteractionDesignUpdates && !isLivePageViewMode &&
|
|
215
|
+
showMacroInteractionDesignUpdates && !isLivePageViewMode && hoverStyles],
|
|
217
216
|
"data-testid": "multiBodiedExtension--wrapper-editor",
|
|
218
217
|
"data-layout": node.attrs.layout
|
|
219
218
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
@@ -19,7 +19,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
19
19
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
|
|
20
20
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
21
21
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
22
|
-
var packageVersion = "115.
|
|
22
|
+
var packageVersion = "115.7.0";
|
|
23
23
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
24
24
|
// Remove URL as it has UGC
|
|
25
25
|
// Ignored via go/ees007
|
|
@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
24
24
|
* @jsx jsx
|
|
25
25
|
*/ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
26
26
|
var packageName = "@atlaskit/editor-common";
|
|
27
|
-
var packageVersion = "115.
|
|
27
|
+
var packageVersion = "115.7.0";
|
|
28
28
|
var halfFocusRing = 1;
|
|
29
29
|
var dropOffset = '0, 8';
|
|
30
30
|
var fadeIn = (0, _react2.keyframes)({
|
|
@@ -93,7 +93,6 @@ function ExtensionWithPluginState(props) {
|
|
|
93
93
|
'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
|
|
94
94
|
'with-bodied-border': showMacroInteractionDesignUpdates && (hasBody || isLegacyContentMacroExtension(node)) && !showBodiedExtensionRendererView && show1PBodiedExtensionBorder,
|
|
95
95
|
'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested && !showBodiedExtensionRendererView,
|
|
96
|
-
'with-hover-border': expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? false : showMacroInteractionDesignUpdates && isNodeHovered,
|
|
97
96
|
'with-danger-overlay': showMacroInteractionDesignUpdates,
|
|
98
97
|
'without-frame': removeBorder,
|
|
99
98
|
[widerLayoutClassName]: shouldBreakout
|
|
@@ -167,7 +166,7 @@ function ExtensionWithPluginState(props) {
|
|
|
167
166
|
className: classNames,
|
|
168
167
|
css: [
|
|
169
168
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
170
|
-
wrapperStyleInheritedCursor, showMacroInteractionDesignUpdates && !isLivePageViewMode &&
|
|
169
|
+
wrapperStyleInheritedCursor, showMacroInteractionDesignUpdates && !isLivePageViewMode && hoverStyles]
|
|
171
170
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
172
171
|
,
|
|
173
172
|
style: customContainerStyles,
|
|
@@ -57,8 +57,7 @@ const InlineExtension = props => {
|
|
|
57
57
|
const classNames = classnames('extension-container', 'inline', {
|
|
58
58
|
'with-overlay': !showMacroInteractionDesignUpdates,
|
|
59
59
|
'with-children': hasChildren,
|
|
60
|
-
'with-danger-overlay': showMacroInteractionDesignUpdates
|
|
61
|
-
'with-hover-border': expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? false : showMacroInteractionDesignUpdates && isNodeHovered
|
|
60
|
+
'with-danger-overlay': showMacroInteractionDesignUpdates
|
|
62
61
|
});
|
|
63
62
|
let rendererContainerWidth = 0;
|
|
64
63
|
if (editorExperiment('platform_editor_preview_panel_responsiveness', true, {
|
|
@@ -87,7 +86,7 @@ const InlineExtension = props => {
|
|
|
87
86
|
"data-testid": "inline-extension-wrapper",
|
|
88
87
|
css: [
|
|
89
88
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
90
|
-
wrapperStyle, inlineWrapperStyles, showMacroInteractionDesignUpdates && !isLivePageViewMode &&
|
|
89
|
+
wrapperStyle, inlineWrapperStyles, showMacroInteractionDesignUpdates && !isLivePageViewMode && hoverStyles]
|
|
91
90
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
92
91
|
,
|
|
93
92
|
className: classNames,
|
|
@@ -43,9 +43,6 @@ const buttonStyles = css({
|
|
|
43
43
|
backgroundColor: "var(--ds-background-input, #FFFFFF)",
|
|
44
44
|
color: "var(--ds-text-subtle, #505258)"
|
|
45
45
|
});
|
|
46
|
-
const showButtonContainerStyle = css({
|
|
47
|
-
opacity: 1
|
|
48
|
-
});
|
|
49
46
|
const iconStyles = xcss({
|
|
50
47
|
marginRight: 'space.075'
|
|
51
48
|
});
|
|
@@ -63,7 +60,6 @@ const i18n = defineMessages({
|
|
|
63
60
|
});
|
|
64
61
|
// Used to toggle between edit and renderer mode for bodied macros in live pages
|
|
65
62
|
export const EditToggle = ({
|
|
66
|
-
isNodeHovered,
|
|
67
63
|
customContainerStyles,
|
|
68
64
|
setIsNodeHovered,
|
|
69
65
|
showBodiedExtensionRendererView,
|
|
@@ -90,7 +86,7 @@ export const EditToggle = ({
|
|
|
90
86
|
"data-testid": "extension-edit-toggle-container"
|
|
91
87
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
92
88
|
,
|
|
93
|
-
css: [buttonContainerStyles
|
|
89
|
+
css: [buttonContainerStyles]
|
|
94
90
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
95
91
|
,
|
|
96
92
|
style: customContainerStyles
|
|
@@ -121,7 +121,6 @@ export const getShouldShowBodiedMacroLabel = (isBodiedMacro, isNodeHovered, show
|
|
|
121
121
|
export const ExtensionLabel = ({
|
|
122
122
|
text,
|
|
123
123
|
extensionName,
|
|
124
|
-
isNodeHovered,
|
|
125
124
|
customContainerStyles,
|
|
126
125
|
isNodeNested,
|
|
127
126
|
setIsNodeHovered,
|
|
@@ -132,8 +131,7 @@ export const ExtensionLabel = ({
|
|
|
132
131
|
pluginInjectionApi: _pluginInjectionApi
|
|
133
132
|
}) => {
|
|
134
133
|
const isInlineExtension = extensionName === 'inlineExtension';
|
|
135
|
-
const showDefaultBodiedStyles =
|
|
136
|
-
const shouldShowBodiedMacroLabel = getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI);
|
|
134
|
+
const showDefaultBodiedStyles = isBodiedMacro;
|
|
137
135
|
const containerClassNames = classnames({
|
|
138
136
|
bodied: isBodiedMacro
|
|
139
137
|
});
|
|
@@ -143,7 +141,6 @@ export const ExtensionLabel = ({
|
|
|
143
141
|
bodied: isBodiedMacro,
|
|
144
142
|
'bodied-border': showDefaultBodiedStyles,
|
|
145
143
|
'bodied-background': showDefaultBodiedStyles,
|
|
146
|
-
'show-label': expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? false : shouldShowBodiedMacroLabel,
|
|
147
144
|
'with-bodied-macro-live-page-styles': isBodiedMacro && showLivePagesBodiedMacrosRendererView,
|
|
148
145
|
'always-hide-label': isBodiedMacro && showBodiedExtensionRendererView,
|
|
149
146
|
// Need this separate class since we don't ever want to show the label during view mode
|
|
@@ -151,8 +148,7 @@ export const ExtensionLabel = ({
|
|
|
151
148
|
'remove-nested-left-margin': isNodeNested && !isBodiedMacro && !isInlineExtension
|
|
152
149
|
});
|
|
153
150
|
const iconClassNames = classnames({
|
|
154
|
-
'
|
|
155
|
-
'extension-icon': expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true)
|
|
151
|
+
'extension-icon': true
|
|
156
152
|
});
|
|
157
153
|
const memoizedTooltipValues = useMemo(() => ({
|
|
158
154
|
macroName: text
|
|
@@ -198,12 +194,12 @@ export const ExtensionLabel = ({
|
|
|
198
194
|
// Ignored via go/ees005
|
|
199
195
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
200
196
|
}, tooltipProps, {
|
|
201
|
-
css: [labelStyles,
|
|
197
|
+
css: [labelStyles, !showLivePagesBodiedMacrosRendererView && showLabelStyles, (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI) && hideLabelStyles]
|
|
202
198
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
203
199
|
,
|
|
204
200
|
className: labelClassNames
|
|
205
201
|
}), text, jsx("span", {
|
|
206
|
-
css: [iconStyles, isBodiedMacro &&
|
|
202
|
+
css: [iconStyles, isBodiedMacro && bodiedMacroIconStyles]
|
|
207
203
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
208
204
|
,
|
|
209
205
|
className: iconClassNames,
|
|
@@ -5,7 +5,6 @@ import React, { Component, useEffect, useLayoutEffect, useRef, useState } from '
|
|
|
5
5
|
import memoizeOne from 'memoize-one';
|
|
6
6
|
import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
|
|
7
7
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
8
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
9
8
|
import { getExtensionModuleNodePrivateProps, getNodeRenderer } from '../extensions';
|
|
10
9
|
import { getExtensionRenderer, nodeToJSON, toJSON } from '../utils';
|
|
11
10
|
import Extension from './Extension/Extension';
|
|
@@ -213,8 +212,6 @@ class ExtensionComponentInner extends Component {
|
|
|
213
212
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
214
213
|
isNodeSelected: selectedNode === node,
|
|
215
214
|
isNodeNested: isNodeNested,
|
|
216
|
-
isNodeHovered: expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.state.isNodeHovered,
|
|
217
|
-
setIsNodeHovered: expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.setIsNodeHovered,
|
|
218
215
|
isLivePageViewMode: isLivePageViewMode,
|
|
219
216
|
allowBodiedOverride: allowBodiedOverride
|
|
220
217
|
});
|
|
@@ -235,9 +232,7 @@ class ExtensionComponentInner extends Component {
|
|
|
235
232
|
pluginInjectionApi: pluginInjectionApi,
|
|
236
233
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
237
234
|
isNodeSelected: selectedNode === node,
|
|
238
|
-
isNodeHovered: expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.state.isNodeHovered,
|
|
239
235
|
isNodeNested: isNodeNested,
|
|
240
|
-
setIsNodeHovered: expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.setIsNodeHovered,
|
|
241
236
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
242
237
|
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI(nodeToJSON(node))),
|
|
243
238
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
@@ -250,8 +245,6 @@ class ExtensionComponentInner extends Component {
|
|
|
250
245
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
251
246
|
isNodeSelected: selectedNode === node,
|
|
252
247
|
pluginInjectionApi: pluginInjectionApi,
|
|
253
|
-
isNodeHovered: expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.state.isNodeHovered,
|
|
254
|
-
setIsNodeHovered: expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.setIsNodeHovered,
|
|
255
248
|
isLivePageViewMode: isLivePageViewMode
|
|
256
249
|
}, extensionHandlerResult);
|
|
257
250
|
default:
|
|
@@ -8,7 +8,6 @@ import React from 'react';
|
|
|
8
8
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports -- Ignored via go/DSP-18766; jsx required at runtime for @jsxRuntime classic
|
|
9
9
|
import { css, jsx } from '@emotion/react';
|
|
10
10
|
import classnames from 'classnames';
|
|
11
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
12
11
|
import { ZERO_WIDTH_SPACE } from '../whitespace';
|
|
13
12
|
import { ExtensionSSRReactContextsProvider } from './ExtensionSSRReactContextsProvider';
|
|
14
13
|
const styles = css({
|
|
@@ -80,6 +79,6 @@ export const ExtensionNodeWrapper = ({
|
|
|
80
79
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
|
|
81
80
|
,
|
|
82
81
|
className: wrapperClassNames,
|
|
83
|
-
css: [styles,
|
|
82
|
+
css: [styles, hoverStyles]
|
|
84
83
|
}, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE));
|
|
85
84
|
};
|
|
@@ -170,8 +170,7 @@ const MultiBodiedExtensionWithWidth = ({
|
|
|
170
170
|
'with-border': showMacroInteractionDesignUpdates,
|
|
171
171
|
'with-danger-overlay': showMacroInteractionDesignUpdates,
|
|
172
172
|
'with-padding-background-styles': showMacroInteractionDesignUpdates,
|
|
173
|
-
'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested
|
|
174
|
-
'with-hover-border': expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? false : showMacroInteractionDesignUpdates && isNodeHovered
|
|
173
|
+
'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested
|
|
175
174
|
});
|
|
176
175
|
const containerClassNames = classnames('multiBodiedExtension--container', {
|
|
177
176
|
'remove-padding': showMacroInteractionDesignUpdates
|
|
@@ -204,7 +203,7 @@ const MultiBodiedExtensionWithWidth = ({
|
|
|
204
203
|
className: wrapperClassNames,
|
|
205
204
|
css: [/* eslint-disable @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766 */
|
|
206
205
|
fg('confluence_frontend_native_tabs_extension') ? mbeExtensionWrapperCSSStyles : mbeExtensionWrapperCSSStylesOld, /* eslint-enable @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage */
|
|
207
|
-
showMacroInteractionDesignUpdates && !isLivePageViewMode &&
|
|
206
|
+
showMacroInteractionDesignUpdates && !isLivePageViewMode && hoverStyles],
|
|
208
207
|
"data-testid": "multiBodiedExtension--wrapper-editor",
|
|
209
208
|
"data-layout": node.attrs.layout
|
|
210
209
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
@@ -4,7 +4,7 @@ import { isFedRamp } from './environment';
|
|
|
4
4
|
import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
|
|
5
5
|
const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
6
6
|
const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
7
|
-
const packageVersion = "115.
|
|
7
|
+
const packageVersion = "115.7.0";
|
|
8
8
|
const sanitiseSentryEvents = (data, _hint) => {
|
|
9
9
|
// Remove URL as it has UGC
|
|
10
10
|
// Ignored via go/ees007
|
|
@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
|
14
14
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
15
15
|
import Layer from '../Layer';
|
|
16
16
|
const packageName = "@atlaskit/editor-common";
|
|
17
|
-
const packageVersion = "115.
|
|
17
|
+
const packageVersion = "115.7.0";
|
|
18
18
|
const halfFocusRing = 1;
|
|
19
19
|
const dropOffset = '0, 8';
|
|
20
20
|
const fadeIn = keyframes({
|
|
@@ -93,7 +93,6 @@ function ExtensionWithPluginState(props) {
|
|
|
93
93
|
'with-overlay': !hasBody && !showMacroInteractionDesignUpdates,
|
|
94
94
|
'with-bodied-border': showMacroInteractionDesignUpdates && (hasBody || isLegacyContentMacroExtension(node)) && !showBodiedExtensionRendererView && show1PBodiedExtensionBorder,
|
|
95
95
|
'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested && !showBodiedExtensionRendererView,
|
|
96
|
-
'with-hover-border': expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? false : showMacroInteractionDesignUpdates && isNodeHovered,
|
|
97
96
|
'with-danger-overlay': showMacroInteractionDesignUpdates,
|
|
98
97
|
'without-frame': removeBorder
|
|
99
98
|
}, widerLayoutClassName, shouldBreakout));
|
|
@@ -160,7 +159,7 @@ function ExtensionWithPluginState(props) {
|
|
|
160
159
|
className: classNames,
|
|
161
160
|
css: [
|
|
162
161
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
163
|
-
wrapperStyleInheritedCursor, showMacroInteractionDesignUpdates && !isLivePageViewMode &&
|
|
162
|
+
wrapperStyleInheritedCursor, showMacroInteractionDesignUpdates && !isLivePageViewMode && hoverStyles]
|
|
164
163
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
165
164
|
,
|
|
166
165
|
style: customContainerStyles,
|
|
@@ -53,8 +53,7 @@ var InlineExtension = function InlineExtension(props) {
|
|
|
53
53
|
var classNames = classnames('extension-container', 'inline', {
|
|
54
54
|
'with-overlay': !showMacroInteractionDesignUpdates,
|
|
55
55
|
'with-children': hasChildren,
|
|
56
|
-
'with-danger-overlay': showMacroInteractionDesignUpdates
|
|
57
|
-
'with-hover-border': expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? false : showMacroInteractionDesignUpdates && isNodeHovered
|
|
56
|
+
'with-danger-overlay': showMacroInteractionDesignUpdates
|
|
58
57
|
});
|
|
59
58
|
var rendererContainerWidth = 0;
|
|
60
59
|
if (editorExperiment('platform_editor_preview_panel_responsiveness', true, {
|
|
@@ -83,7 +82,7 @@ var InlineExtension = function InlineExtension(props) {
|
|
|
83
82
|
"data-testid": "inline-extension-wrapper",
|
|
84
83
|
css: [
|
|
85
84
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
86
|
-
wrapperStyle, inlineWrapperStyles, showMacroInteractionDesignUpdates && !isLivePageViewMode &&
|
|
85
|
+
wrapperStyle, inlineWrapperStyles, showMacroInteractionDesignUpdates && !isLivePageViewMode && hoverStyles]
|
|
87
86
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
88
87
|
,
|
|
89
88
|
className: classNames,
|
|
@@ -43,9 +43,6 @@ var buttonStyles = css({
|
|
|
43
43
|
backgroundColor: "var(--ds-background-input, #FFFFFF)",
|
|
44
44
|
color: "var(--ds-text-subtle, #505258)"
|
|
45
45
|
});
|
|
46
|
-
var showButtonContainerStyle = css({
|
|
47
|
-
opacity: 1
|
|
48
|
-
});
|
|
49
46
|
var iconStyles = xcss({
|
|
50
47
|
marginRight: 'space.075'
|
|
51
48
|
});
|
|
@@ -63,8 +60,7 @@ var i18n = defineMessages({
|
|
|
63
60
|
});
|
|
64
61
|
// Used to toggle between edit and renderer mode for bodied macros in live pages
|
|
65
62
|
export var EditToggle = function EditToggle(_ref) {
|
|
66
|
-
var
|
|
67
|
-
customContainerStyles = _ref.customContainerStyles,
|
|
63
|
+
var customContainerStyles = _ref.customContainerStyles,
|
|
68
64
|
setIsNodeHovered = _ref.setIsNodeHovered,
|
|
69
65
|
showBodiedExtensionRendererView = _ref.showBodiedExtensionRendererView,
|
|
70
66
|
setShowBodiedExtensionRendererView = _ref.setShowBodiedExtensionRendererView;
|
|
@@ -89,7 +85,7 @@ export var EditToggle = function EditToggle(_ref) {
|
|
|
89
85
|
"data-testid": "extension-edit-toggle-container"
|
|
90
86
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
91
87
|
,
|
|
92
|
-
css: [buttonContainerStyles
|
|
88
|
+
css: [buttonContainerStyles]
|
|
93
89
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
94
90
|
,
|
|
95
91
|
style: customContainerStyles
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
|
|
2
1
|
import _extends from "@babel/runtime/helpers/extends";
|
|
3
2
|
/**
|
|
4
3
|
* @jsxRuntime classic
|
|
@@ -122,7 +121,6 @@ export var getShouldShowBodiedMacroLabel = function getShouldShowBodiedMacroLabe
|
|
|
122
121
|
export var ExtensionLabel = function ExtensionLabel(_ref) {
|
|
123
122
|
var text = _ref.text,
|
|
124
123
|
extensionName = _ref.extensionName,
|
|
125
|
-
isNodeHovered = _ref.isNodeHovered,
|
|
126
124
|
customContainerStyles = _ref.customContainerStyles,
|
|
127
125
|
isNodeNested = _ref.isNodeNested,
|
|
128
126
|
setIsNodeHovered = _ref.setIsNodeHovered,
|
|
@@ -132,8 +130,7 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
|
|
|
132
130
|
showBodiedExtensionRendererView = _ref.showBodiedExtensionRendererView,
|
|
133
131
|
_pluginInjectionApi = _ref.pluginInjectionApi;
|
|
134
132
|
var isInlineExtension = extensionName === 'inlineExtension';
|
|
135
|
-
var showDefaultBodiedStyles =
|
|
136
|
-
var shouldShowBodiedMacroLabel = getShouldShowBodiedMacroLabel(isBodiedMacro, isNodeHovered, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, showUpdatedLivePages1PBodiedExtensionUI);
|
|
133
|
+
var showDefaultBodiedStyles = isBodiedMacro;
|
|
137
134
|
var containerClassNames = classnames({
|
|
138
135
|
bodied: isBodiedMacro
|
|
139
136
|
});
|
|
@@ -143,7 +140,6 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
|
|
|
143
140
|
bodied: isBodiedMacro,
|
|
144
141
|
'bodied-border': showDefaultBodiedStyles,
|
|
145
142
|
'bodied-background': showDefaultBodiedStyles,
|
|
146
|
-
'show-label': expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? false : shouldShowBodiedMacroLabel,
|
|
147
143
|
'with-bodied-macro-live-page-styles': isBodiedMacro && showLivePagesBodiedMacrosRendererView,
|
|
148
144
|
'always-hide-label': isBodiedMacro && showBodiedExtensionRendererView,
|
|
149
145
|
// Need this separate class since we don't ever want to show the label during view mode
|
|
@@ -151,8 +147,7 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
|
|
|
151
147
|
'remove-nested-left-margin': isNodeNested && !isBodiedMacro && !isInlineExtension
|
|
152
148
|
});
|
|
153
149
|
var iconClassNames = classnames({
|
|
154
|
-
'
|
|
155
|
-
'extension-icon': expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true)
|
|
150
|
+
'extension-icon': true
|
|
156
151
|
});
|
|
157
152
|
var memoizedTooltipValues = useMemo(function () {
|
|
158
153
|
return {
|
|
@@ -201,12 +196,12 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
|
|
|
201
196
|
// Ignored via go/ees005
|
|
202
197
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
203
198
|
}, tooltipProps, {
|
|
204
|
-
css: [labelStyles
|
|
199
|
+
css: [labelStyles, !showLivePagesBodiedMacrosRendererView && showLabelStyles, (!isBodiedMacro || showUpdatedLivePages1PBodiedExtensionUI) && hideLabelStyles]
|
|
205
200
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
206
201
|
,
|
|
207
202
|
className: labelClassNames
|
|
208
203
|
}), text, jsx("span", {
|
|
209
|
-
css: [iconStyles, isBodiedMacro &&
|
|
204
|
+
css: [iconStyles, isBodiedMacro && bodiedMacroIconStyles]
|
|
210
205
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
211
206
|
,
|
|
212
207
|
className: iconClassNames,
|
|
@@ -17,7 +17,6 @@ import React, { Component, useEffect, useLayoutEffect, useRef, useState } from '
|
|
|
17
17
|
import memoizeOne from 'memoize-one';
|
|
18
18
|
import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
|
|
19
19
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
20
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
21
20
|
import { getExtensionModuleNodePrivateProps, getNodeRenderer } from '../extensions';
|
|
22
21
|
import { getExtensionRenderer, nodeToJSON, toJSON } from '../utils';
|
|
23
22
|
import Extension from './Extension/Extension';
|
|
@@ -249,8 +248,6 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component) {
|
|
|
249
248
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
250
249
|
isNodeSelected: selectedNode === node,
|
|
251
250
|
isNodeNested: isNodeNested,
|
|
252
|
-
isNodeHovered: expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.state.isNodeHovered,
|
|
253
|
-
setIsNodeHovered: expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.setIsNodeHovered,
|
|
254
251
|
isLivePageViewMode: isLivePageViewMode,
|
|
255
252
|
allowBodiedOverride: allowBodiedOverride
|
|
256
253
|
});
|
|
@@ -271,9 +268,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component) {
|
|
|
271
268
|
pluginInjectionApi: pluginInjectionApi,
|
|
272
269
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
273
270
|
isNodeSelected: selectedNode === node,
|
|
274
|
-
isNodeHovered: expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.state.isNodeHovered,
|
|
275
271
|
isNodeNested: isNodeNested,
|
|
276
|
-
setIsNodeHovered: expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.setIsNodeHovered,
|
|
277
272
|
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
278
273
|
showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI(nodeToJSON(node))),
|
|
279
274
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
@@ -286,8 +281,6 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component) {
|
|
|
286
281
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
287
282
|
isNodeSelected: selectedNode === node,
|
|
288
283
|
pluginInjectionApi: pluginInjectionApi,
|
|
289
|
-
isNodeHovered: expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.state.isNodeHovered,
|
|
290
|
-
setIsNodeHovered: expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? undefined : this.setIsNodeHovered,
|
|
291
284
|
isLivePageViewMode: isLivePageViewMode
|
|
292
285
|
}, extensionHandlerResult);
|
|
293
286
|
default:
|
|
@@ -8,7 +8,6 @@ import React from 'react';
|
|
|
8
8
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports -- Ignored via go/DSP-18766; jsx required at runtime for @jsxRuntime classic
|
|
9
9
|
import { css, jsx } from '@emotion/react';
|
|
10
10
|
import classnames from 'classnames';
|
|
11
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
12
11
|
import { ZERO_WIDTH_SPACE } from '../whitespace';
|
|
13
12
|
import { ExtensionSSRReactContextsProvider } from './ExtensionSSRReactContextsProvider';
|
|
14
13
|
var styles = css({
|
|
@@ -78,6 +77,6 @@ export var ExtensionNodeWrapper = function ExtensionNodeWrapper(_ref) {
|
|
|
78
77
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
|
|
79
78
|
,
|
|
80
79
|
className: wrapperClassNames,
|
|
81
|
-
css: [styles,
|
|
80
|
+
css: [styles, hoverStyles]
|
|
82
81
|
}, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE));
|
|
83
82
|
};
|
|
@@ -172,8 +172,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
|
|
|
172
172
|
'with-border': showMacroInteractionDesignUpdates,
|
|
173
173
|
'with-danger-overlay': showMacroInteractionDesignUpdates,
|
|
174
174
|
'with-padding-background-styles': showMacroInteractionDesignUpdates,
|
|
175
|
-
'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested
|
|
176
|
-
'with-hover-border': expValEquals('cc_editor_ttvc_release_bundle_one', 'extensionHoverRefactor', true) ? false : showMacroInteractionDesignUpdates && isNodeHovered
|
|
175
|
+
'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested
|
|
177
176
|
});
|
|
178
177
|
var containerClassNames = classnames('multiBodiedExtension--container', {
|
|
179
178
|
'remove-padding': showMacroInteractionDesignUpdates
|
|
@@ -206,7 +205,7 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
|
|
|
206
205
|
className: wrapperClassNames,
|
|
207
206
|
css: [/* eslint-disable @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766 */
|
|
208
207
|
fg('confluence_frontend_native_tabs_extension') ? mbeExtensionWrapperCSSStyles : mbeExtensionWrapperCSSStylesOld, /* eslint-enable @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage */
|
|
209
|
-
showMacroInteractionDesignUpdates && !isLivePageViewMode &&
|
|
208
|
+
showMacroInteractionDesignUpdates && !isLivePageViewMode && hoverStyles],
|
|
210
209
|
"data-testid": "multiBodiedExtension--wrapper-editor",
|
|
211
210
|
"data-layout": node.attrs.layout
|
|
212
211
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
@@ -10,7 +10,7 @@ import { isFedRamp } from './environment';
|
|
|
10
10
|
import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
|
|
11
11
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
12
12
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
13
|
-
var packageVersion = "115.
|
|
13
|
+
var packageVersion = "115.7.0";
|
|
14
14
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
15
15
|
// Remove URL as it has UGC
|
|
16
16
|
// Ignored via go/ees007
|
|
@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
|
21
21
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
22
22
|
import Layer from '../Layer';
|
|
23
23
|
var packageName = "@atlaskit/editor-common";
|
|
24
|
-
var packageVersion = "115.
|
|
24
|
+
var packageVersion = "115.7.0";
|
|
25
25
|
var halfFocusRing = 1;
|
|
26
26
|
var dropOffset = '0, 8';
|
|
27
27
|
var fadeIn = keyframes({
|
|
@@ -11,5 +11,5 @@ type EditToggleProps = {
|
|
|
11
11
|
setShowBodiedExtensionRendererView?: (showBodiedExtensionRendererView: boolean) => void;
|
|
12
12
|
showBodiedExtensionRendererView?: boolean;
|
|
13
13
|
};
|
|
14
|
-
export declare const EditToggle: ({
|
|
14
|
+
export declare const EditToggle: ({ customContainerStyles, setIsNodeHovered, showBodiedExtensionRendererView, setShowBodiedExtensionRendererView, }: EditToggleProps) => jsx.JSX.Element;
|
|
15
15
|
export {};
|
|
@@ -19,5 +19,5 @@ type ExtensionLabelProps = {
|
|
|
19
19
|
showUpdatedLivePages1PBodiedExtensionUI?: boolean;
|
|
20
20
|
text: string;
|
|
21
21
|
};
|
|
22
|
-
export declare const ExtensionLabel: ({ text, extensionName,
|
|
22
|
+
export declare const ExtensionLabel: ({ text, extensionName, customContainerStyles, isNodeNested, setIsNodeHovered, isBodiedMacro, showUpdatedLivePages1PBodiedExtensionUI, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, pluginInjectionApi: _pluginInjectionApi, }: ExtensionLabelProps) => jsx.JSX.Element;
|
|
23
23
|
export {};
|
|
@@ -11,5 +11,5 @@ type EditToggleProps = {
|
|
|
11
11
|
setShowBodiedExtensionRendererView?: (showBodiedExtensionRendererView: boolean) => void;
|
|
12
12
|
showBodiedExtensionRendererView?: boolean;
|
|
13
13
|
};
|
|
14
|
-
export declare const EditToggle: ({
|
|
14
|
+
export declare const EditToggle: ({ customContainerStyles, setIsNodeHovered, showBodiedExtensionRendererView, setShowBodiedExtensionRendererView, }: EditToggleProps) => jsx.JSX.Element;
|
|
15
15
|
export {};
|
|
@@ -19,5 +19,5 @@ type ExtensionLabelProps = {
|
|
|
19
19
|
showUpdatedLivePages1PBodiedExtensionUI?: boolean;
|
|
20
20
|
text: string;
|
|
21
21
|
};
|
|
22
|
-
export declare const ExtensionLabel: ({ text, extensionName,
|
|
22
|
+
export declare const ExtensionLabel: ({ text, extensionName, customContainerStyles, isNodeNested, setIsNodeHovered, isBodiedMacro, showUpdatedLivePages1PBodiedExtensionUI, showLivePagesBodiedMacrosRendererView, showBodiedExtensionRendererView, pluginInjectionApi: _pluginInjectionApi, }: ExtensionLabelProps) => jsx.JSX.Element;
|
|
23
23
|
export {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-common",
|
|
3
|
-
"version": "115.7.
|
|
3
|
+
"version": "115.7.1",
|
|
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/"
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
"@atlaskit/task-decision": "^20.1.0",
|
|
88
88
|
"@atlaskit/teams-app-config": "^1.12.0",
|
|
89
89
|
"@atlaskit/textfield": "^8.3.0",
|
|
90
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
90
|
+
"@atlaskit/tmp-editor-statsig": "^90.0.0",
|
|
91
91
|
"@atlaskit/tokens": "^13.3.0",
|
|
92
92
|
"@atlaskit/tooltip": "^22.6.0",
|
|
93
93
|
"@atlaskit/width-detector": "^5.1.0",
|