@atlaskit/renderer 109.1.6 → 109.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +13 -0
- package/dist/cjs/react/nodes/codeBlock/components/codeBlockContainer.js +4 -13
- package/dist/cjs/react/nodes/mediaInline.js +77 -114
- package/dist/cjs/react/nodes/multiBodiedExtension.js +14 -9
- package/dist/cjs/react/nodes/panel.js +2 -16
- package/dist/cjs/react/nodes/table/colgroup.js +5 -12
- package/dist/cjs/react/nodes/table.js +1 -1
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/cjs/ui/Renderer/style.js +7 -58
- package/dist/es2019/react/nodes/codeBlock/components/codeBlockContainer.js +22 -29
- package/dist/es2019/react/nodes/mediaInline.js +66 -88
- package/dist/es2019/react/nodes/multiBodiedExtension.js +43 -37
- package/dist/es2019/react/nodes/panel.js +11 -23
- package/dist/es2019/react/nodes/table/colgroup.js +5 -12
- package/dist/es2019/react/nodes/table.js +1 -1
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/es2019/ui/Renderer/style.js +27 -79
- package/dist/esm/react/nodes/codeBlock/components/codeBlockContainer.js +5 -14
- package/dist/esm/react/nodes/mediaInline.js +82 -119
- package/dist/esm/react/nodes/multiBodiedExtension.js +16 -10
- package/dist/esm/react/nodes/panel.js +3 -17
- package/dist/esm/react/nodes/table/colgroup.js +5 -12
- package/dist/esm/react/nodes/table.js +1 -1
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/dist/esm/ui/Renderer/style.js +9 -59
- package/dist/types/react/nodes/mediaInline.d.ts +5 -8
- package/dist/types-ts4.5/react/nodes/mediaInline.d.ts +5 -8
- package/package.json +3 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 109.2.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#64836](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64836) [`f3e1604287a9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f3e1604287a9) - ED-20879 add ssr support for mediaInline
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- [#64281](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64281) [`b523d60b380c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b523d60b380c) - Remove legacy theming logic from @atlaskit/editor-core and @atlaskit/renderer. Theming is still available via @atlaskit/tokens.
|
|
12
|
+
- [#64694](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64694) [`8d601c3ee546`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8d601c3ee546) - ED-21174 Cleaned up FF from ED-19147 and updated testcases
|
|
13
|
+
- [#63266](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/63266) [`630f6c9fc80c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/630f6c9fc80c) - ED-21576: Added new Example for MBE - Interactive Fake Tabs
|
|
14
|
+
- Updated dependencies
|
|
15
|
+
|
|
3
16
|
## 109.1.6
|
|
4
17
|
|
|
5
18
|
### Patch Changes
|
|
@@ -9,24 +9,15 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
|
|
|
9
9
|
var _react = require("@emotion/react");
|
|
10
10
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
11
11
|
var _colors = require("@atlaskit/theme/colors");
|
|
12
|
-
var _components = require("@atlaskit/theme/components");
|
|
13
12
|
var _constants = require("@atlaskit/theme/constants");
|
|
14
13
|
var _styles = require("@atlaskit/editor-common/styles");
|
|
15
14
|
var _codeBlockButtonContainer = _interopRequireDefault(require("./codeBlockButtonContainer"));
|
|
16
15
|
var _templateObject;
|
|
17
16
|
/** @jsx jsx */
|
|
18
|
-
var codeBlockStyleOverrides =
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
})(props), _styles.CodeBlockSharedCssClassName.DS_CODEBLOCK, (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), (0, _editorSharedStyles.overflowShadow)({
|
|
23
|
-
background: (0, _components.themed)({
|
|
24
|
-
light: "var(--ds-background-neutral, ".concat(_colors.N20, ")"),
|
|
25
|
-
dark: "var(--ds-background-neutral, ".concat(_colors.DN50, ")")
|
|
26
|
-
})(props),
|
|
27
|
-
leftCoverWidth: "var(--ds-space-300, 24px)"
|
|
28
|
-
}));
|
|
29
|
-
};
|
|
17
|
+
var codeBlockStyleOverrides = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n tab-size: 4;\n background-color: ", ";\n\n &:hover {\n button {\n opacity: 1;\n }\n }\n\n button {\n opacity: 0;\n transition: opacity 0.2s ease 0s;\n }\n\n ", " {\n font-size: ", ";\n line-height: 1.5rem;\n background-image: ", ";\n background-attachment: local, local, local, local, scroll, scroll, scroll,\n scroll;\n background-position: 0 0, 0 0, 100% 0, 100% 0, 100% 0, 100% 0, 0 0, 0 0;\n }\n"])), "var(--ds-surface-raised, ".concat(_colors.N20, ")"), _styles.CodeBlockSharedCssClassName.DS_CODEBLOCK, (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), (0, _editorSharedStyles.overflowShadow)({
|
|
18
|
+
background: "var(--ds-background-neutral, ".concat(_colors.N20, ")"),
|
|
19
|
+
leftCoverWidth: "var(--ds-space-300, 24px)"
|
|
20
|
+
}));
|
|
30
21
|
var CodeBlockContainer = function CodeBlockContainer(_ref) {
|
|
31
22
|
var allowCopyToClipboard = _ref.allowCopyToClipboard,
|
|
32
23
|
allowWrapCodeBlock = _ref.allowWrapCodeBlock,
|
|
@@ -25,85 +25,62 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
|
|
|
25
25
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
26
26
|
var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_ref) {
|
|
27
27
|
var rendererAppearance = _ref.rendererAppearance,
|
|
28
|
-
intl = _ref.intl,
|
|
29
28
|
clipboardAttrs = _ref.clipboardAttrs,
|
|
30
|
-
mediaInlineProviders = _ref.mediaInlineProviders,
|
|
31
29
|
collectionName = _ref.collection,
|
|
32
30
|
eventHandlers = _ref.eventHandlers,
|
|
33
|
-
identifier = _ref.identifier
|
|
34
|
-
alt = _ref.alt,
|
|
35
|
-
width = _ref.width,
|
|
36
|
-
height = _ref.height,
|
|
37
|
-
type = _ref.type,
|
|
38
|
-
borderSize = _ref.borderSize,
|
|
39
|
-
borderColor = _ref.borderColor;
|
|
31
|
+
identifier = _ref.identifier;
|
|
40
32
|
var _useState = (0, _react.useState)(),
|
|
41
33
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
42
|
-
|
|
43
|
-
|
|
34
|
+
contextIdentifier = _useState2[0],
|
|
35
|
+
setContextIdentifier = _useState2[1];
|
|
44
36
|
var _useState3 = (0, _react.useState)(),
|
|
45
37
|
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
46
38
|
fileState = _useState4[0],
|
|
47
39
|
setFileState = _useState4[1];
|
|
48
|
-
var mediaClient = _react.
|
|
49
|
-
var
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
if (!contextIdentifierProvider) {
|
|
56
|
-
_context.next = 5;
|
|
57
|
-
break;
|
|
58
|
-
}
|
|
59
|
-
_context.next = 3;
|
|
60
|
-
return contextIdentifierProvider;
|
|
61
|
-
case 3:
|
|
62
|
-
resolvedContextID = _context.sent;
|
|
63
|
-
setContextIdentifierProvider(resolvedContextID);
|
|
64
|
-
case 5:
|
|
65
|
-
case "end":
|
|
66
|
-
return _context.stop();
|
|
40
|
+
var mediaClient = (0, _react.useContext)(_mediaClientReact.MediaClientContext);
|
|
41
|
+
var contextIdentifierProvider = (0, _providerFactory.useProvider)('contextIdentifierProvider');
|
|
42
|
+
(0, _react.useEffect)(function () {
|
|
43
|
+
if (contextIdentifierProvider) {
|
|
44
|
+
contextIdentifierProvider.then(function (resolvedContextID) {
|
|
45
|
+
if (contextIdentifier !== resolvedContextID) {
|
|
46
|
+
setContextIdentifier(resolvedContextID);
|
|
67
47
|
}
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
return _ref2.apply(this, arguments);
|
|
72
|
-
};
|
|
73
|
-
}();
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
}, [contextIdentifier, contextIdentifierProvider]);
|
|
74
51
|
var updateFileState = (0, _react.useCallback)( /*#__PURE__*/function () {
|
|
75
|
-
var
|
|
52
|
+
var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(id) {
|
|
76
53
|
var options, _fileState;
|
|
77
|
-
return _regenerator.default.wrap(function
|
|
78
|
-
while (1) switch (
|
|
54
|
+
return _regenerator.default.wrap(function _callee$(_context) {
|
|
55
|
+
while (1) switch (_context.prev = _context.next) {
|
|
79
56
|
case 0:
|
|
80
57
|
options = {
|
|
81
58
|
collectionName: collectionName
|
|
82
59
|
};
|
|
83
|
-
|
|
60
|
+
_context.prev = 1;
|
|
84
61
|
if (!mediaClient) {
|
|
85
|
-
|
|
62
|
+
_context.next = 7;
|
|
86
63
|
break;
|
|
87
64
|
}
|
|
88
|
-
|
|
65
|
+
_context.next = 5;
|
|
89
66
|
return mediaClient.file.getCurrentState(id, options);
|
|
90
67
|
case 5:
|
|
91
|
-
_fileState =
|
|
68
|
+
_fileState = _context.sent;
|
|
92
69
|
setFileState(_fileState);
|
|
93
70
|
case 7:
|
|
94
|
-
|
|
71
|
+
_context.next = 11;
|
|
95
72
|
break;
|
|
96
73
|
case 9:
|
|
97
|
-
|
|
98
|
-
|
|
74
|
+
_context.prev = 9;
|
|
75
|
+
_context.t0 = _context["catch"](1);
|
|
99
76
|
case 11:
|
|
100
77
|
case "end":
|
|
101
|
-
return
|
|
78
|
+
return _context.stop();
|
|
102
79
|
}
|
|
103
|
-
},
|
|
80
|
+
}, _callee, null, [[1, 9]]);
|
|
104
81
|
}));
|
|
105
|
-
return function (
|
|
106
|
-
return
|
|
82
|
+
return function (_x) {
|
|
83
|
+
return _ref2.apply(this, arguments);
|
|
107
84
|
};
|
|
108
85
|
}(), [collectionName, mediaClient]);
|
|
109
86
|
(0, _react.useEffect)(function () {
|
|
@@ -119,14 +96,12 @@ var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_
|
|
|
119
96
|
};
|
|
120
97
|
}, [identifier, collectionName]);
|
|
121
98
|
(0, _react.useEffect)(function () {
|
|
122
|
-
var contextIdentifierProvider = mediaInlineProviders.contextIdentifierProvider;
|
|
123
99
|
var id = clipboardAttrs.id;
|
|
124
|
-
updateContext(contextIdentifierProvider);
|
|
125
100
|
id && updateFileState(id);
|
|
126
|
-
}, [
|
|
101
|
+
}, [contextIdentifier, clipboardAttrs, updateFileState]);
|
|
127
102
|
|
|
128
103
|
/*
|
|
129
|
-
* Only show the loading view if the media
|
|
104
|
+
* Only show the loading view if the media client is not ready
|
|
130
105
|
* prevents calling the media API before the provider is ready
|
|
131
106
|
*/
|
|
132
107
|
if (!mediaClient) {
|
|
@@ -135,19 +110,6 @@ var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_
|
|
|
135
110
|
isSelected: false
|
|
136
111
|
});
|
|
137
112
|
}
|
|
138
|
-
if (type && (0, _mediaInline.shouldShowInlineImage)(type)) {
|
|
139
|
-
return /*#__PURE__*/_react.default.createElement(_mediaInline.MediaInlineImageCard, {
|
|
140
|
-
mediaClient: mediaClient,
|
|
141
|
-
identifier: identifier,
|
|
142
|
-
alt: alt,
|
|
143
|
-
width: width,
|
|
144
|
-
height: height,
|
|
145
|
-
border: {
|
|
146
|
-
borderSize: borderSize,
|
|
147
|
-
borderColor: borderColor
|
|
148
|
-
}
|
|
149
|
-
});
|
|
150
|
-
}
|
|
151
113
|
var handleMediaInlineClick = function handleMediaInlineClick(result) {
|
|
152
114
|
var _eventHandlers$media;
|
|
153
115
|
if (eventHandlers !== null && eventHandlers !== void 0 && (_eventHandlers$media = eventHandlers.media) !== null && _eventHandlers$media !== void 0 && _eventHandlers$media.onClick) {
|
|
@@ -157,34 +119,31 @@ var RenderMediaInline = exports.RenderMediaInline = function RenderMediaInline(_
|
|
|
157
119
|
};
|
|
158
120
|
var shouldOpenMediaViewer = rendererAppearance !== 'mobile';
|
|
159
121
|
var shouldDisplayToolTip = rendererAppearance !== 'mobile';
|
|
160
|
-
var mediaProvider = mediaInlineProviders.mediaProvider;
|
|
161
122
|
var id = clipboardAttrs.id,
|
|
162
123
|
collection = clipboardAttrs.collection;
|
|
163
|
-
return
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
}))
|
|
181
|
-
|
|
124
|
+
return (
|
|
125
|
+
/*#__PURE__*/
|
|
126
|
+
// eslint-disable-next-line @atlaskit/design-system/prefer-primitives
|
|
127
|
+
_react.default.createElement("span", (0, _extends2.default)({}, (0, _MediaCard.getClipboardAttrs)({
|
|
128
|
+
id: id,
|
|
129
|
+
collection: collection,
|
|
130
|
+
contextIdentifierProvider: contextIdentifier,
|
|
131
|
+
fileState: fileState
|
|
132
|
+
}), {
|
|
133
|
+
"data-node-type": "mediaInline"
|
|
134
|
+
}), /*#__PURE__*/_react.default.createElement(_mediaCard.MediaInlineCard, {
|
|
135
|
+
identifier: identifier,
|
|
136
|
+
onClick: handleMediaInlineClick,
|
|
137
|
+
shouldOpenMediaViewer: shouldOpenMediaViewer,
|
|
138
|
+
shouldDisplayToolTip: shouldDisplayToolTip,
|
|
139
|
+
mediaClientConfig: mediaClient.mediaClientConfig,
|
|
140
|
+
mediaViewerItems: Array.from(_MediaCard.mediaIdentifierMap.values())
|
|
141
|
+
}))
|
|
142
|
+
);
|
|
182
143
|
};
|
|
183
144
|
var MediaInline = function MediaInline(props) {
|
|
184
|
-
var _borderMark$attrs$col, _borderMark$attrs$siz;
|
|
185
145
|
var collection = props.collection,
|
|
186
146
|
id = props.id,
|
|
187
|
-
providerFactory = props.providers,
|
|
188
147
|
intl = props.intl,
|
|
189
148
|
rendererAppearance = props.rendererAppearance,
|
|
190
149
|
featureFlags = props.featureFlags,
|
|
@@ -192,7 +151,8 @@ var MediaInline = function MediaInline(props) {
|
|
|
192
151
|
alt = props.alt,
|
|
193
152
|
width = props.width,
|
|
194
153
|
height = props.height,
|
|
195
|
-
marks = props.marks
|
|
154
|
+
marks = props.marks,
|
|
155
|
+
ssr = props.ssr;
|
|
196
156
|
var clipboardAttrs = {
|
|
197
157
|
id: id,
|
|
198
158
|
collection: collection
|
|
@@ -202,32 +162,35 @@ var MediaInline = function MediaInline(props) {
|
|
|
202
162
|
mediaItemType: 'file',
|
|
203
163
|
collectionName: collection
|
|
204
164
|
};
|
|
205
|
-
var
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
collection: collection,
|
|
222
|
-
featureFlags: featureFlags,
|
|
223
|
-
type: fileType,
|
|
224
|
-
alt: alt,
|
|
225
|
-
width: width,
|
|
226
|
-
height: height,
|
|
165
|
+
var mediaClient = (0, _react.useContext)(_mediaClientReact.MediaClientContext);
|
|
166
|
+
if (fileType === 'image') {
|
|
167
|
+
var _borderMark$attrs$col, _borderMark$attrs$siz;
|
|
168
|
+
var borderMark = marks === null || marks === void 0 ? void 0 : marks.find(function (mark) {
|
|
169
|
+
return (mark === null || mark === void 0 ? void 0 : mark.type.name) === 'border';
|
|
170
|
+
});
|
|
171
|
+
var borderColor = (_borderMark$attrs$col = borderMark === null || borderMark === void 0 ? void 0 : borderMark.attrs.color) !== null && _borderMark$attrs$col !== void 0 ? _borderMark$attrs$col : '';
|
|
172
|
+
var borderSize = (_borderMark$attrs$siz = borderMark === null || borderMark === void 0 ? void 0 : borderMark.attrs.size) !== null && _borderMark$attrs$siz !== void 0 ? _borderMark$attrs$siz : 0;
|
|
173
|
+
return /*#__PURE__*/_react.default.createElement(_mediaInline.MediaInlineImageCard, {
|
|
174
|
+
mediaClient: mediaClient,
|
|
175
|
+
identifier: identifier,
|
|
176
|
+
alt: alt,
|
|
177
|
+
width: width,
|
|
178
|
+
height: height,
|
|
179
|
+
ssr: ssr,
|
|
180
|
+
border: {
|
|
227
181
|
borderSize: borderSize,
|
|
228
182
|
borderColor: borderColor
|
|
229
|
-
}
|
|
230
|
-
}
|
|
183
|
+
}
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
return /*#__PURE__*/_react.default.createElement(RenderMediaInline, {
|
|
187
|
+
identifier: identifier,
|
|
188
|
+
clipboardAttrs: clipboardAttrs,
|
|
189
|
+
eventHandlers: props.eventHandlers,
|
|
190
|
+
rendererAppearance: rendererAppearance,
|
|
191
|
+
intl: intl,
|
|
192
|
+
collection: collection,
|
|
193
|
+
featureFlags: featureFlags
|
|
231
194
|
});
|
|
232
195
|
};
|
|
233
196
|
var _default = exports.default = (0, _reactIntlNext.injectIntl)(MediaInline);
|
|
@@ -18,8 +18,10 @@ var _ui = require("@atlaskit/editor-common/ui");
|
|
|
18
18
|
var _consts = require("../../consts");
|
|
19
19
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
20
20
|
var _templateObject, _templateObject2;
|
|
21
|
+
/* eslint-disable @atlaskit/design-system/prefer-primitives */
|
|
21
22
|
/* eslint-disable @atlaskit/design-system/ensure-design-token-usage/preview */
|
|
22
23
|
/** @jsx jsx */
|
|
24
|
+
// eslint-disable-next-line @typescript-eslint/no-duplicate-imports
|
|
23
25
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
24
26
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
25
27
|
var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_ref) {
|
|
@@ -76,13 +78,7 @@ var MultiBodiedExtension = function MultiBodiedExtension(props) {
|
|
|
76
78
|
var containerCSS = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n min-height: 100px;\n\n .multiBodiedExtension--frames > [data-extension-frame='true'] {\n display: none;\n }\n\n .multiBodiedExtension--frames\n > [data-extension-frame='true']:nth-of-type(", ") {\n border: 1px solid ", ";\n display: block;\n min-height: 100px;\n }\n "])), activeChildIndex + 1, "var(--ds-border, ".concat(_colors.N50, ")"));
|
|
77
79
|
var isTopLevel = path.length < 1;
|
|
78
80
|
var centerAlignClass = isTopLevel && ['wide', 'full-width'].includes(layout) ? _consts.RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
|
|
79
|
-
|
|
80
|
-
className: "multiBodiedExtension--container",
|
|
81
|
-
css: containerCSS,
|
|
82
|
-
"data-testid": "multiBodiedExtension--container",
|
|
83
|
-
"data-active-child-index": activeChildIndex
|
|
84
|
-
}, (0, _react.jsx)(_ui.WidthConsumer, null, function (_ref2) {
|
|
85
|
-
var width = _ref2.width;
|
|
81
|
+
function renderMbeContent(width) {
|
|
86
82
|
return (0, _react.jsx)("div", {
|
|
87
83
|
className: "".concat(_consts.RendererCssClassName.EXTENSION, " ").concat(centerAlignClass),
|
|
88
84
|
style: {
|
|
@@ -96,8 +92,8 @@ var MultiBodiedExtension = function MultiBodiedExtension(props) {
|
|
|
96
92
|
}, (0, _react.jsx)(_ExtensionRenderer.default, (0, _extends2.default)({}, props, {
|
|
97
93
|
actions: actions,
|
|
98
94
|
type: "multiBodiedExtension"
|
|
99
|
-
}), function (
|
|
100
|
-
var result =
|
|
95
|
+
}), function (_ref2) {
|
|
96
|
+
var result = _ref2.result;
|
|
101
97
|
try {
|
|
102
98
|
if (result && /*#__PURE__*/_react2.default.isValidElement(result)) {
|
|
103
99
|
// Return the content directly if it's a valid JSX.Element
|
|
@@ -118,6 +114,15 @@ var MultiBodiedExtension = function MultiBodiedExtension(props) {
|
|
|
118
114
|
className: "multiBodiedExtension--frames",
|
|
119
115
|
"data-testid": "multiBodiedExtension--frames"
|
|
120
116
|
}, children));
|
|
117
|
+
}
|
|
118
|
+
return (0, _react.jsx)("section", {
|
|
119
|
+
className: "multiBodiedExtension--container",
|
|
120
|
+
css: containerCSS,
|
|
121
|
+
"data-testid": "multiBodiedExtension--container",
|
|
122
|
+
"data-active-child-index": activeChildIndex
|
|
123
|
+
}, (0, _react.jsx)(_ui.WidthConsumer, null, function (_ref3) {
|
|
124
|
+
var width = _ref3.width;
|
|
125
|
+
return renderMbeContent(width);
|
|
121
126
|
}));
|
|
122
127
|
};
|
|
123
128
|
var _default = exports.default = MultiBodiedExtension;
|
|
@@ -16,31 +16,17 @@ var _panel = require("@atlaskit/editor-common/panel");
|
|
|
16
16
|
var _editorPalette = require("@atlaskit/editor-palette");
|
|
17
17
|
var _emoji = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/emoji"));
|
|
18
18
|
var _emoji2 = _interopRequireDefault(require("./emoji"));
|
|
19
|
-
var _theme = require("@atlaskit/theme");
|
|
20
19
|
var _icons = require("@atlaskit/editor-common/icons");
|
|
21
20
|
var _templateObject, _templateObject2;
|
|
22
21
|
var _excluded = ["backgroundColor", "hasIcon"];
|
|
23
22
|
/** @jsx jsx */
|
|
24
|
-
// AFP-2532 TODO: Fix automatic suppressions below
|
|
25
|
-
// eslint-disable-next-line @atlassian/tangerine/import/entry-points
|
|
26
23
|
var PanelStyled = function PanelStyled(_ref) {
|
|
27
24
|
var backgroundColor = _ref.backgroundColor,
|
|
28
25
|
hasIcon = _ref.hasIcon,
|
|
29
26
|
props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
|
|
30
|
-
var styles =
|
|
31
|
-
return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n &.", " {\n ", "\n\n &[data-panel-type=", "] {\n ", "\n }\n }\n "])), _panel.PanelSharedCssClassName.prefix, (0, _panel.panelSharedStylesWithoutPrefix)(), _adfSchema.PanelType.CUSTOM, hasIcon ? '' : 'padding-left: 12px;');
|
|
32
|
-
};
|
|
27
|
+
var styles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n &.", " {\n ", "\n\n &[data-panel-type=", "] {\n ", "\n }\n }\n "])), _panel.PanelSharedCssClassName.prefix, (0, _panel.panelSharedStylesWithoutPrefix)(), _adfSchema.PanelType.CUSTOM, hasIcon ? '' : 'padding-left: 12px;');
|
|
33
28
|
if (props['data-panel-type'] === _adfSchema.PanelType.CUSTOM && backgroundColor) {
|
|
34
|
-
styles =
|
|
35
|
-
var tokenColor = (0, _editorPalette.hexToEditorBackgroundPaletteColor)(backgroundColor);
|
|
36
|
-
var customStyle = (0, _theme.themed)({
|
|
37
|
-
dark: _panel.getPanelBackgroundDarkModeColors,
|
|
38
|
-
light: "background-color: ".concat(tokenColor || backgroundColor, ";")
|
|
39
|
-
})({
|
|
40
|
-
theme: theme
|
|
41
|
-
});
|
|
42
|
-
return (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n &.", " {\n ", "\n }\n\n &[data-panel-type=", "] {\n ", ";\n ", "\n }\n "])), _panel.PanelSharedCssClassName.prefix, (0, _panel.panelSharedStylesWithoutPrefix)(), _adfSchema.PanelType.CUSTOM, customStyle, hasIcon ? '' : 'padding-left: 12px;');
|
|
43
|
-
};
|
|
29
|
+
styles = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n &.", " {\n ", "\n }\n\n &[data-panel-type=", "] {\n background-color: ", ";\n ", "\n }\n "])), _panel.PanelSharedCssClassName.prefix, (0, _panel.panelSharedStylesWithoutPrefix)(), _adfSchema.PanelType.CUSTOM, (0, _editorPalette.hexToEditorBackgroundPaletteColor)(backgroundColor) || backgroundColor, hasIcon ? '' : 'padding-left: 12px;');
|
|
44
30
|
}
|
|
45
31
|
return (0, _react2.jsx)("div", (0, _extends2.default)({
|
|
46
32
|
css: styles
|
|
@@ -9,7 +9,6 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
var _styles = require("@atlaskit/editor-common/styles");
|
|
10
10
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
11
11
|
var _nodeWidth = require("@atlaskit/editor-common/node-width");
|
|
12
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
13
12
|
var _table = require("../table");
|
|
14
13
|
// we allow scaling down column widths by no more than 30%
|
|
15
14
|
// this intends to reduce unwanted scrolling in the Renderer in these scenarios:
|
|
@@ -74,17 +73,11 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
|
|
|
74
73
|
tableContainerWidth = getTableLayoutWidth(layout);
|
|
75
74
|
}
|
|
76
75
|
if ((0, _table.isTableResizingEnabled)(rendererAppearance) && !isInsideOfBlockNode && !tableResized) {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
targetWidths = new Array(noOfColumns).fill(defaultColumnWidth);
|
|
83
|
-
} else {
|
|
84
|
-
return new Array(noOfColumns).fill({
|
|
85
|
-
minWidth: "".concat(_styles.tableCellMinWidth, "px")
|
|
86
|
-
});
|
|
87
|
-
}
|
|
76
|
+
// for tables with no column widths defined, assume that the real table width
|
|
77
|
+
// is defined by node.attrs.width
|
|
78
|
+
var _tableWidth2 = (isNumberColumnEnabled ? tableContainerWidth - _editorSharedStyles.akEditorTableNumberColumnWidth : tableContainerWidth) - 1;
|
|
79
|
+
var defaultColumnWidth = _tableWidth2 / noOfColumns;
|
|
80
|
+
targetWidths = new Array(noOfColumns).fill(defaultColumnWidth);
|
|
88
81
|
} else if (!tableResized) {
|
|
89
82
|
return null;
|
|
90
83
|
}
|
|
@@ -468,7 +468,7 @@ var TableWithWidth = function TableWithWidth(props) {
|
|
|
468
468
|
var colWidthsSum = ((_props$columnWidths = props.columnWidths) === null || _props$columnWidths === void 0 ? void 0 : _props$columnWidths.reduce(function (total, val) {
|
|
469
469
|
return total + val;
|
|
470
470
|
}, 0)) || 0;
|
|
471
|
-
if (colWidthsSum ||
|
|
471
|
+
if (colWidthsSum || isTableResizingEnabled(props.rendererAppearance)) {
|
|
472
472
|
return /*#__PURE__*/_react.default.createElement(TableWithShadows, (0, _extends2.default)({
|
|
473
473
|
renderWidth: renderWidth
|
|
474
474
|
}, props));
|
|
@@ -54,7 +54,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
|
|
|
54
54
|
var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
55
55
|
var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
56
56
|
var packageName = "@atlaskit/renderer";
|
|
57
|
-
var packageVersion = "109.
|
|
57
|
+
var packageVersion = "109.2.0";
|
|
58
58
|
var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
|
|
59
59
|
(0, _inherits2.default)(Renderer, _PureComponent);
|
|
60
60
|
var _super = _createSuper(Renderer);
|