@atlaskit/editor-common 78.26.0 → 78.26.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 +6 -0
- package/dist/cjs/extensibility/Extension/Extension/index.js +1 -0
- package/dist/cjs/extensibility/Extension/Extension/styles.js +1 -2
- package/dist/cjs/extensibility/Extension/Lozenge/ExtensionLabel.js +10 -3
- package/dist/cjs/extensibility/Extension/Lozenge/LozengeComponent.js +3 -1
- package/dist/cjs/extensibility/Extension/Lozenge/index.js +2 -0
- package/dist/cjs/extensibility/MultiBodiedExtension/index.js +2 -1
- package/dist/cjs/extensibility/MultiBodiedExtension/styles.js +1 -2
- package/dist/cjs/monitoring/error.js +1 -1
- package/dist/cjs/ui/DropList/index.js +1 -1
- package/dist/es2019/extensibility/Extension/Extension/index.js +1 -0
- package/dist/es2019/extensibility/Extension/Extension/styles.js +2 -3
- package/dist/es2019/extensibility/Extension/Lozenge/ExtensionLabel.js +10 -3
- package/dist/es2019/extensibility/Extension/Lozenge/LozengeComponent.js +3 -1
- package/dist/es2019/extensibility/Extension/Lozenge/index.js +2 -0
- package/dist/es2019/extensibility/MultiBodiedExtension/index.js +2 -1
- package/dist/es2019/extensibility/MultiBodiedExtension/styles.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 -0
- package/dist/esm/extensibility/Extension/Extension/styles.js +2 -3
- package/dist/esm/extensibility/Extension/Lozenge/ExtensionLabel.js +10 -3
- package/dist/esm/extensibility/Extension/Lozenge/LozengeComponent.js +3 -1
- package/dist/esm/extensibility/Extension/Lozenge/index.js +2 -0
- package/dist/esm/extensibility/MultiBodiedExtension/index.js +2 -1
- package/dist/esm/extensibility/MultiBodiedExtension/styles.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/ExtensionLabel.d.ts +2 -1
- 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-ts4.5/extensibility/Extension/Lozenge/ExtensionLabel.d.ts +2 -1
- 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/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @atlaskit/editor-common
|
|
2
2
|
|
|
3
|
+
## 78.26.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#89487](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/89487) [`4aa7d85aa286`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4aa7d85aa286) - [ux] Fix extension label and opacity
|
|
8
|
+
|
|
3
9
|
## 78.26.0
|
|
4
10
|
|
|
5
11
|
### Minor Changes
|
|
@@ -106,6 +106,7 @@ function ExtensionWithPluginState(props) {
|
|
|
106
106
|
return (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && (0, _react2.jsx)(_Lozenge.default, {
|
|
107
107
|
isNodeSelected: isNodeSelected,
|
|
108
108
|
isNodeHovered: isNodeHovered,
|
|
109
|
+
isNodeNested: isNodeNested,
|
|
109
110
|
node: node,
|
|
110
111
|
showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
|
|
111
112
|
customContainerStyles: customContainerStyles
|
|
@@ -21,8 +21,7 @@ var wrapperStyle = exports.wrapperStyle = (0, _react.css)(_styles.wrapperDefault
|
|
|
21
21
|
border: "1px solid transparent" // adding this so macro doesn't jump when hover border is shown
|
|
22
22
|
},
|
|
23
23
|
'&.with-hover-border': {
|
|
24
|
-
border: "1px solid ".concat("var(--ds-border-
|
|
25
|
-
opacity: '86%'
|
|
24
|
+
border: "1px solid ".concat("var(--ds-border-input, ".concat(_colors.N500, ")"))
|
|
26
25
|
},
|
|
27
26
|
'&.with-margin-styles': {
|
|
28
27
|
margin: "0 ".concat("var(--ds-space-negative-150, -12px)"),
|
|
@@ -30,7 +30,12 @@ var labelStyles = (0, _react.css)({
|
|
|
30
30
|
opacity: 1
|
|
31
31
|
},
|
|
32
32
|
borderRadius: "var(--ds-border-radius, 3px)".concat(" ", "var(--ds-border-radius, 3px)", " 0 0"),
|
|
33
|
-
lineHeight: 1
|
|
33
|
+
lineHeight: 1,
|
|
34
|
+
'&.nested': {
|
|
35
|
+
// Need to add indent if the node is nested since we removed previous indentation styles to make it fit properly
|
|
36
|
+
// in the nested component
|
|
37
|
+
marginLeft: "var(--ds-space-150, 12px)"
|
|
38
|
+
}
|
|
34
39
|
});
|
|
35
40
|
var textStyles = (0, _react.css)({
|
|
36
41
|
fontSize: '14px',
|
|
@@ -41,10 +46,12 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
|
|
|
41
46
|
var text = _ref.text,
|
|
42
47
|
extensionName = _ref.extensionName,
|
|
43
48
|
isNodeHovered = _ref.isNodeHovered,
|
|
44
|
-
customContainerStyles = _ref.customContainerStyles
|
|
49
|
+
customContainerStyles = _ref.customContainerStyles,
|
|
50
|
+
isNodeNested = _ref.isNodeNested;
|
|
45
51
|
var classNames = (0, _classnames.default)('extension-title', 'extension-label', {
|
|
46
52
|
'inline-extension': extensionName === 'inlineExtension',
|
|
47
|
-
hovered: isNodeHovered
|
|
53
|
+
hovered: isNodeHovered,
|
|
54
|
+
nested: isNodeNested
|
|
48
55
|
});
|
|
49
56
|
return (0, _react.jsx)("div", {
|
|
50
57
|
style: customContainerStyles
|
|
@@ -24,13 +24,15 @@ var LozengeComponent = exports.LozengeComponent = function LozengeComponent(_ref
|
|
|
24
24
|
renderImage = _ref.renderImage,
|
|
25
25
|
showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
|
|
26
26
|
customContainerStyles = _ref.customContainerStyles,
|
|
27
|
-
isNodeHovered = _ref.isNodeHovered
|
|
27
|
+
isNodeHovered = _ref.isNodeHovered,
|
|
28
|
+
isNodeNested = _ref.isNodeNested;
|
|
28
29
|
var capitalizedTitle = capitalizeFirstLetter(title);
|
|
29
30
|
if (showMacroInteractionDesignUpdates) {
|
|
30
31
|
return (0, _react.jsx)(_ExtensionLabel.ExtensionLabel, {
|
|
31
32
|
text: capitalizedTitle,
|
|
32
33
|
extensionName: extensionName,
|
|
33
34
|
isNodeHovered: isNodeHovered,
|
|
35
|
+
isNodeNested: isNodeNested,
|
|
34
36
|
customContainerStyles: customContainerStyles
|
|
35
37
|
});
|
|
36
38
|
}
|
|
@@ -48,6 +48,7 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
|
|
|
48
48
|
showMacroInteractionDesignUpdates = _this$props.showMacroInteractionDesignUpdates,
|
|
49
49
|
isNodeSelected = _this$props.isNodeSelected,
|
|
50
50
|
isNodeHovered = _this$props.isNodeHovered,
|
|
51
|
+
isNodeNested = _this$props.isNodeNested,
|
|
51
52
|
customContainerStyles = _this$props.customContainerStyles;
|
|
52
53
|
var _this$props$node$attr = _this.props.node.attrs,
|
|
53
54
|
parameters = _this$props$node$attr.parameters,
|
|
@@ -58,6 +59,7 @@ var ExtensionLozenge = exports.default = /*#__PURE__*/function (_Component) {
|
|
|
58
59
|
return (0, _react2.jsx)(_LozengeComponent.LozengeComponent, {
|
|
59
60
|
isNodeHovered: isNodeHovered,
|
|
60
61
|
isNodeSelected: isNodeSelected,
|
|
62
|
+
isNodeNested: isNodeNested,
|
|
61
63
|
showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
|
|
62
64
|
extensionName: name,
|
|
63
65
|
lozengeData: lozengeData,
|
|
@@ -144,7 +144,8 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
|
|
|
144
144
|
node: node,
|
|
145
145
|
showMacroInteractionDesignUpdates: true,
|
|
146
146
|
customContainerStyles: mbeWrapperStyles,
|
|
147
|
-
isNodeHovered: isNodeHovered
|
|
147
|
+
isNodeHovered: isNodeHovered,
|
|
148
|
+
isNodeNested: isNodeNested
|
|
148
149
|
}), (0, _react2.jsx)("div", {
|
|
149
150
|
className: wrapperClassNames,
|
|
150
151
|
css: _styles.mbeExtensionWrapperCSSStyles,
|
|
@@ -30,8 +30,7 @@ var mbeExtensionWrapperCSSStyles = exports.mbeExtensionWrapperCSSStyles = (0, _r
|
|
|
30
30
|
border: "1px solid ".concat("var(--ds-border-inverse, ".concat(_colors.N0, ")")) // adding this so macro doesn't jump when hover border is shown
|
|
31
31
|
},
|
|
32
32
|
'&.with-hover-border': {
|
|
33
|
-
border: "1px solid ".concat("var(--ds-border-
|
|
34
|
-
opacity: '86%'
|
|
33
|
+
border: "1px solid ".concat("var(--ds-border-input, ".concat(_colors.N500, ")"))
|
|
35
34
|
}
|
|
36
35
|
});
|
|
37
36
|
var overlayStyles = exports.overlayStyles = (0, _react.css)({
|
|
@@ -16,7 +16,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
|
|
|
16
16
|
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 && Object.prototype.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; }
|
|
17
17
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
18
18
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
19
|
-
var packageVersion = "78.26.
|
|
19
|
+
var packageVersion = "78.26.1";
|
|
20
20
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
21
21
|
// Remove URL as it has UGC
|
|
22
22
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -22,7 +22,7 @@ var _templateObject, _templateObject2, _templateObject3;
|
|
|
22
22
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
23
23
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /** @jsx jsx */
|
|
24
24
|
var packageName = "@atlaskit/editor-common";
|
|
25
|
-
var packageVersion = "78.26.
|
|
25
|
+
var packageVersion = "78.26.1";
|
|
26
26
|
var halfFocusRing = 1;
|
|
27
27
|
var dropOffset = '0, 8';
|
|
28
28
|
var DropList = /*#__PURE__*/function (_Component) {
|
|
@@ -102,6 +102,7 @@ function ExtensionWithPluginState(props) {
|
|
|
102
102
|
return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
|
|
103
103
|
isNodeSelected: isNodeSelected,
|
|
104
104
|
isNodeHovered: isNodeHovered,
|
|
105
|
+
isNodeNested: isNodeNested,
|
|
105
106
|
node: node,
|
|
106
107
|
showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
|
|
107
108
|
customContainerStyles: customContainerStyles
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { css } from '@emotion/react';
|
|
2
|
-
import {
|
|
2
|
+
import { N30, N500 } from '@atlaskit/theme/colors';
|
|
3
3
|
import { wrapperDefault } from '../styles';
|
|
4
4
|
export const widerLayoutClassName = 'wider-layout';
|
|
5
5
|
export const wrapperStyle = css(wrapperDefault, {
|
|
@@ -15,8 +15,7 @@ export const wrapperStyle = css(wrapperDefault, {
|
|
|
15
15
|
border: `1px solid transparent` // adding this so macro doesn't jump when hover border is shown
|
|
16
16
|
},
|
|
17
17
|
'&.with-hover-border': {
|
|
18
|
-
border: `1px solid ${`var(--ds-border-
|
|
19
|
-
opacity: '86%'
|
|
18
|
+
border: `1px solid ${`var(--ds-border-input, ${N500})`}`
|
|
20
19
|
},
|
|
21
20
|
'&.with-margin-styles': {
|
|
22
21
|
margin: `0 ${"var(--ds-space-negative-150, -12px)"}`,
|
|
@@ -23,7 +23,12 @@ const labelStyles = css({
|
|
|
23
23
|
opacity: 1
|
|
24
24
|
},
|
|
25
25
|
borderRadius: `${"var(--ds-border-radius, 3px)"} ${"var(--ds-border-radius, 3px)"} 0 0`,
|
|
26
|
-
lineHeight: 1
|
|
26
|
+
lineHeight: 1,
|
|
27
|
+
'&.nested': {
|
|
28
|
+
// Need to add indent if the node is nested since we removed previous indentation styles to make it fit properly
|
|
29
|
+
// in the nested component
|
|
30
|
+
marginLeft: "var(--ds-space-150, 12px)"
|
|
31
|
+
}
|
|
27
32
|
});
|
|
28
33
|
const textStyles = css({
|
|
29
34
|
fontSize: '14px',
|
|
@@ -34,11 +39,13 @@ export const ExtensionLabel = ({
|
|
|
34
39
|
text,
|
|
35
40
|
extensionName,
|
|
36
41
|
isNodeHovered,
|
|
37
|
-
customContainerStyles
|
|
42
|
+
customContainerStyles,
|
|
43
|
+
isNodeNested
|
|
38
44
|
}) => {
|
|
39
45
|
const classNames = classnames('extension-title', 'extension-label', {
|
|
40
46
|
'inline-extension': extensionName === 'inlineExtension',
|
|
41
|
-
hovered: isNodeHovered
|
|
47
|
+
hovered: isNodeHovered,
|
|
48
|
+
nested: isNodeNested
|
|
42
49
|
});
|
|
43
50
|
return jsx("div", {
|
|
44
51
|
style: customContainerStyles
|
|
@@ -16,7 +16,8 @@ export const LozengeComponent = ({
|
|
|
16
16
|
renderImage,
|
|
17
17
|
showMacroInteractionDesignUpdates,
|
|
18
18
|
customContainerStyles,
|
|
19
|
-
isNodeHovered
|
|
19
|
+
isNodeHovered,
|
|
20
|
+
isNodeNested
|
|
20
21
|
}) => {
|
|
21
22
|
const capitalizedTitle = capitalizeFirstLetter(title);
|
|
22
23
|
if (showMacroInteractionDesignUpdates) {
|
|
@@ -24,6 +25,7 @@ export const LozengeComponent = ({
|
|
|
24
25
|
text: capitalizedTitle,
|
|
25
26
|
extensionName: extensionName,
|
|
26
27
|
isNodeHovered: isNodeHovered,
|
|
28
|
+
isNodeNested: isNodeNested,
|
|
27
29
|
customContainerStyles: customContainerStyles
|
|
28
30
|
});
|
|
29
31
|
}
|
|
@@ -29,6 +29,7 @@ export default class ExtensionLozenge extends Component {
|
|
|
29
29
|
showMacroInteractionDesignUpdates,
|
|
30
30
|
isNodeSelected,
|
|
31
31
|
isNodeHovered,
|
|
32
|
+
isNodeNested,
|
|
32
33
|
customContainerStyles
|
|
33
34
|
} = this.props;
|
|
34
35
|
const {
|
|
@@ -43,6 +44,7 @@ export default class ExtensionLozenge extends Component {
|
|
|
43
44
|
return jsx(LozengeComponent, {
|
|
44
45
|
isNodeHovered: isNodeHovered,
|
|
45
46
|
isNodeSelected: isNodeSelected,
|
|
47
|
+
isNodeNested: isNodeNested,
|
|
46
48
|
showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
|
|
47
49
|
extensionName: name,
|
|
48
50
|
lozengeData: lozengeData,
|
|
@@ -132,7 +132,8 @@ const MultiBodiedExtensionWithWidth = ({
|
|
|
132
132
|
node: node,
|
|
133
133
|
showMacroInteractionDesignUpdates: true,
|
|
134
134
|
customContainerStyles: mbeWrapperStyles,
|
|
135
|
-
isNodeHovered: isNodeHovered
|
|
135
|
+
isNodeHovered: isNodeHovered,
|
|
136
|
+
isNodeNested: isNodeNested
|
|
136
137
|
}), jsx("div", {
|
|
137
138
|
className: wrapperClassNames,
|
|
138
139
|
css: mbeExtensionWrapperCSSStyles,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { css } from '@emotion/react';
|
|
2
|
-
import { N0,
|
|
2
|
+
import { N0, N500 } from '@atlaskit/theme/colors';
|
|
3
3
|
import { wrapperDefault } from '../Extension/styles';
|
|
4
4
|
|
|
5
5
|
// Wrapper the extension title and extensionContainer
|
|
@@ -25,8 +25,7 @@ export const mbeExtensionWrapperCSSStyles = css(wrapperDefault, {
|
|
|
25
25
|
border: `1px solid ${`var(--ds-border-inverse, ${N0})`}` // adding this so macro doesn't jump when hover border is shown
|
|
26
26
|
},
|
|
27
27
|
'&.with-hover-border': {
|
|
28
|
-
border: `1px solid ${`var(--ds-border-
|
|
29
|
-
opacity: '86%'
|
|
28
|
+
border: `1px solid ${`var(--ds-border-input, ${N500})`}`
|
|
30
29
|
}
|
|
31
30
|
});
|
|
32
31
|
export const overlayStyles = css({
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
2
2
|
const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
3
|
-
const packageVersion = "78.26.
|
|
3
|
+
const packageVersion = "78.26.1";
|
|
4
4
|
const sanitiseSentryEvents = (data, _hint) => {
|
|
5
5
|
// Remove URL as it has UGC
|
|
6
6
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -7,7 +7,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
|
|
|
7
7
|
import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
|
|
8
8
|
import Layer from '../Layer';
|
|
9
9
|
const packageName = "@atlaskit/editor-common";
|
|
10
|
-
const packageVersion = "78.26.
|
|
10
|
+
const packageVersion = "78.26.1";
|
|
11
11
|
const halfFocusRing = 1;
|
|
12
12
|
const dropOffset = '0, 8';
|
|
13
13
|
class DropList extends Component {
|
|
@@ -97,6 +97,7 @@ function ExtensionWithPluginState(props) {
|
|
|
97
97
|
return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
|
|
98
98
|
isNodeSelected: isNodeSelected,
|
|
99
99
|
isNodeHovered: isNodeHovered,
|
|
100
|
+
isNodeNested: isNodeNested,
|
|
100
101
|
node: node,
|
|
101
102
|
showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
|
|
102
103
|
customContainerStyles: customContainerStyles
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { css } from '@emotion/react';
|
|
2
|
-
import {
|
|
2
|
+
import { N30, N500 } from '@atlaskit/theme/colors';
|
|
3
3
|
import { wrapperDefault } from '../styles';
|
|
4
4
|
export var widerLayoutClassName = 'wider-layout';
|
|
5
5
|
export var wrapperStyle = css(wrapperDefault, {
|
|
@@ -15,8 +15,7 @@ export var wrapperStyle = css(wrapperDefault, {
|
|
|
15
15
|
border: "1px solid transparent" // adding this so macro doesn't jump when hover border is shown
|
|
16
16
|
},
|
|
17
17
|
'&.with-hover-border': {
|
|
18
|
-
border: "1px solid ".concat("var(--ds-border-
|
|
19
|
-
opacity: '86%'
|
|
18
|
+
border: "1px solid ".concat("var(--ds-border-input, ".concat(N500, ")"))
|
|
20
19
|
},
|
|
21
20
|
'&.with-margin-styles': {
|
|
22
21
|
margin: "0 ".concat("var(--ds-space-negative-150, -12px)"),
|
|
@@ -23,7 +23,12 @@ var labelStyles = css({
|
|
|
23
23
|
opacity: 1
|
|
24
24
|
},
|
|
25
25
|
borderRadius: "var(--ds-border-radius, 3px)".concat(" ", "var(--ds-border-radius, 3px)", " 0 0"),
|
|
26
|
-
lineHeight: 1
|
|
26
|
+
lineHeight: 1,
|
|
27
|
+
'&.nested': {
|
|
28
|
+
// Need to add indent if the node is nested since we removed previous indentation styles to make it fit properly
|
|
29
|
+
// in the nested component
|
|
30
|
+
marginLeft: "var(--ds-space-150, 12px)"
|
|
31
|
+
}
|
|
27
32
|
});
|
|
28
33
|
var textStyles = css({
|
|
29
34
|
fontSize: '14px',
|
|
@@ -34,10 +39,12 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
|
|
|
34
39
|
var text = _ref.text,
|
|
35
40
|
extensionName = _ref.extensionName,
|
|
36
41
|
isNodeHovered = _ref.isNodeHovered,
|
|
37
|
-
customContainerStyles = _ref.customContainerStyles
|
|
42
|
+
customContainerStyles = _ref.customContainerStyles,
|
|
43
|
+
isNodeNested = _ref.isNodeNested;
|
|
38
44
|
var classNames = classnames('extension-title', 'extension-label', {
|
|
39
45
|
'inline-extension': extensionName === 'inlineExtension',
|
|
40
|
-
hovered: isNodeHovered
|
|
46
|
+
hovered: isNodeHovered,
|
|
47
|
+
nested: isNodeNested
|
|
41
48
|
});
|
|
42
49
|
return jsx("div", {
|
|
43
50
|
style: customContainerStyles
|
|
@@ -19,13 +19,15 @@ export var LozengeComponent = function LozengeComponent(_ref) {
|
|
|
19
19
|
renderImage = _ref.renderImage,
|
|
20
20
|
showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
|
|
21
21
|
customContainerStyles = _ref.customContainerStyles,
|
|
22
|
-
isNodeHovered = _ref.isNodeHovered
|
|
22
|
+
isNodeHovered = _ref.isNodeHovered,
|
|
23
|
+
isNodeNested = _ref.isNodeNested;
|
|
23
24
|
var capitalizedTitle = capitalizeFirstLetter(title);
|
|
24
25
|
if (showMacroInteractionDesignUpdates) {
|
|
25
26
|
return jsx(ExtensionLabel, {
|
|
26
27
|
text: capitalizedTitle,
|
|
27
28
|
extensionName: extensionName,
|
|
28
29
|
isNodeHovered: isNodeHovered,
|
|
30
|
+
isNodeNested: isNodeNested,
|
|
29
31
|
customContainerStyles: customContainerStyles
|
|
30
32
|
});
|
|
31
33
|
}
|
|
@@ -42,6 +42,7 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
|
|
|
42
42
|
showMacroInteractionDesignUpdates = _this$props.showMacroInteractionDesignUpdates,
|
|
43
43
|
isNodeSelected = _this$props.isNodeSelected,
|
|
44
44
|
isNodeHovered = _this$props.isNodeHovered,
|
|
45
|
+
isNodeNested = _this$props.isNodeNested,
|
|
45
46
|
customContainerStyles = _this$props.customContainerStyles;
|
|
46
47
|
var _this$props$node$attr = _this.props.node.attrs,
|
|
47
48
|
parameters = _this$props$node$attr.parameters,
|
|
@@ -52,6 +53,7 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
|
|
|
52
53
|
return jsx(LozengeComponent, {
|
|
53
54
|
isNodeHovered: isNodeHovered,
|
|
54
55
|
isNodeSelected: isNodeSelected,
|
|
56
|
+
isNodeNested: isNodeNested,
|
|
55
57
|
showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
|
|
56
58
|
extensionName: name,
|
|
57
59
|
lozengeData: lozengeData,
|
|
@@ -135,7 +135,8 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
|
|
|
135
135
|
node: node,
|
|
136
136
|
showMacroInteractionDesignUpdates: true,
|
|
137
137
|
customContainerStyles: mbeWrapperStyles,
|
|
138
|
-
isNodeHovered: isNodeHovered
|
|
138
|
+
isNodeHovered: isNodeHovered,
|
|
139
|
+
isNodeNested: isNodeNested
|
|
139
140
|
}), jsx("div", {
|
|
140
141
|
className: wrapperClassNames,
|
|
141
142
|
css: mbeExtensionWrapperCSSStyles,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { css } from '@emotion/react';
|
|
2
|
-
import { N0,
|
|
2
|
+
import { N0, N500 } from '@atlaskit/theme/colors';
|
|
3
3
|
import { wrapperDefault } from '../Extension/styles';
|
|
4
4
|
|
|
5
5
|
// Wrapper the extension title and extensionContainer
|
|
@@ -25,8 +25,7 @@ export var mbeExtensionWrapperCSSStyles = css(wrapperDefault, {
|
|
|
25
25
|
border: "1px solid ".concat("var(--ds-border-inverse, ".concat(N0, ")")) // adding this so macro doesn't jump when hover border is shown
|
|
26
26
|
},
|
|
27
27
|
'&.with-hover-border': {
|
|
28
|
-
border: "1px solid ".concat("var(--ds-border-
|
|
29
|
-
opacity: '86%'
|
|
28
|
+
border: "1px solid ".concat("var(--ds-border-input, ".concat(N500, ")"))
|
|
30
29
|
}
|
|
31
30
|
});
|
|
32
31
|
export var overlayStyles = css({
|
|
@@ -6,7 +6,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
|
|
|
6
6
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
7
7
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
8
8
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
9
|
-
var packageVersion = "78.26.
|
|
9
|
+
var packageVersion = "78.26.1";
|
|
10
10
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
11
11
|
// Remove URL as it has UGC
|
|
12
12
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -17,7 +17,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
|
|
|
17
17
|
import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
|
|
18
18
|
import Layer from '../Layer';
|
|
19
19
|
var packageName = "@atlaskit/editor-common";
|
|
20
|
-
var packageVersion = "78.26.
|
|
20
|
+
var packageVersion = "78.26.1";
|
|
21
21
|
var halfFocusRing = 1;
|
|
22
22
|
var dropOffset = '0, 8';
|
|
23
23
|
var DropList = /*#__PURE__*/function (_Component) {
|
|
@@ -5,7 +5,8 @@ type ExtensionLabelProps = {
|
|
|
5
5
|
text: string;
|
|
6
6
|
extensionName: string;
|
|
7
7
|
isNodeHovered?: boolean;
|
|
8
|
+
isNodeNested?: boolean;
|
|
8
9
|
customContainerStyles?: CSSProperties;
|
|
9
10
|
};
|
|
10
|
-
export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, }: ExtensionLabelProps) => jsx.JSX.Element;
|
|
11
|
+
export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, isNodeNested, }: ExtensionLabelProps) => jsx.JSX.Element;
|
|
11
12
|
export {};
|
|
@@ -13,6 +13,7 @@ type LozengeComponentProps = {
|
|
|
13
13
|
showMacroInteractionDesignUpdates?: boolean;
|
|
14
14
|
customContainerStyles?: CSSProperties;
|
|
15
15
|
isNodeHovered?: boolean;
|
|
16
|
+
isNodeNested?: boolean;
|
|
16
17
|
};
|
|
17
|
-
export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, customContainerStyles, isNodeHovered, }: LozengeComponentProps) => jsx.JSX.Element;
|
|
18
|
+
export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, customContainerStyles, isNodeHovered, isNodeNested, }: LozengeComponentProps) => jsx.JSX.Element;
|
|
18
19
|
export {};
|
|
@@ -5,7 +5,8 @@ type ExtensionLabelProps = {
|
|
|
5
5
|
text: string;
|
|
6
6
|
extensionName: string;
|
|
7
7
|
isNodeHovered?: boolean;
|
|
8
|
+
isNodeNested?: boolean;
|
|
8
9
|
customContainerStyles?: CSSProperties;
|
|
9
10
|
};
|
|
10
|
-
export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, }: ExtensionLabelProps) => jsx.JSX.Element;
|
|
11
|
+
export declare const ExtensionLabel: ({ text, extensionName, isNodeHovered, customContainerStyles, isNodeNested, }: ExtensionLabelProps) => jsx.JSX.Element;
|
|
11
12
|
export {};
|
|
@@ -13,6 +13,7 @@ type LozengeComponentProps = {
|
|
|
13
13
|
showMacroInteractionDesignUpdates?: boolean;
|
|
14
14
|
customContainerStyles?: CSSProperties;
|
|
15
15
|
isNodeHovered?: boolean;
|
|
16
|
+
isNodeNested?: boolean;
|
|
16
17
|
};
|
|
17
|
-
export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, customContainerStyles, isNodeHovered, }: LozengeComponentProps) => jsx.JSX.Element;
|
|
18
|
+
export declare const LozengeComponent: ({ lozengeData, extensionName, title, params, renderImage, showMacroInteractionDesignUpdates, customContainerStyles, isNodeHovered, isNodeNested, }: LozengeComponentProps) => jsx.JSX.Element;
|
|
18
19
|
export {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-common",
|
|
3
|
-
"version": "78.26.
|
|
3
|
+
"version": "78.26.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/"
|
|
@@ -121,7 +121,7 @@
|
|
|
121
121
|
"@atlaskit/media-common": "^11.1.0",
|
|
122
122
|
"@atlaskit/media-file-preview": "^0.5.0",
|
|
123
123
|
"@atlaskit/media-picker": "^66.4.0",
|
|
124
|
-
"@atlaskit/media-ui": "^25.
|
|
124
|
+
"@atlaskit/media-ui": "^25.7.0",
|
|
125
125
|
"@atlaskit/media-viewer": "48.4.4",
|
|
126
126
|
"@atlaskit/mention": "^23.0.0",
|
|
127
127
|
"@atlaskit/menu": "^2.1.0",
|