@atlaskit/renderer 109.40.11 → 109.42.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 +28 -0
- package/dist/cjs/react/nodes/mediaSingle/index.js +4 -2
- package/dist/cjs/react/nodes/table/colgroup.js +2 -3
- package/dist/cjs/react/nodes/task-item-with-providers.js +53 -104
- package/dist/cjs/ui/ExtensionRenderer.js +95 -120
- package/dist/cjs/ui/MediaCard.js +5 -5
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/es2019/react/nodes/mediaSingle/index.js +4 -2
- package/dist/es2019/react/nodes/table/colgroup.js +3 -4
- package/dist/es2019/react/nodes/task-item-with-providers.js +24 -46
- package/dist/es2019/ui/ExtensionRenderer.js +83 -98
- package/dist/es2019/ui/MediaCard.js +5 -5
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/esm/react/nodes/mediaSingle/index.js +4 -2
- package/dist/esm/react/nodes/table/colgroup.js +3 -4
- package/dist/esm/react/nodes/task-item-with-providers.js +50 -100
- package/dist/esm/ui/ExtensionRenderer.js +92 -121
- package/dist/esm/ui/MediaCard.js +5 -5
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/dist/types/react/nodes/mediaSingle/index.d.ts +2 -0
- package/dist/types/react/nodes/task-item-with-providers.d.ts +2 -8
- package/dist/types/ui/ExtensionRenderer.d.ts +2 -17
- package/dist/types/ui/MediaCard.d.ts +1 -1
- package/dist/types-ts4.5/react/nodes/mediaSingle/index.d.ts +2 -0
- package/dist/types-ts4.5/react/nodes/task-item-with-providers.d.ts +2 -8
- package/dist/types-ts4.5/ui/ExtensionRenderer.d.ts +2 -17
- package/dist/types-ts4.5/ui/MediaCard.d.ts +1 -1
- package/package.json +3 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,33 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 109.42.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#118585](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/118585)
|
|
8
|
+
[`88aa7acfd24eb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/88aa7acfd24eb) -
|
|
9
|
+
refactor: remove all UNSAFE\_ react APIs from @atlaskit/renderer
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- Updated dependencies
|
|
14
|
+
|
|
15
|
+
## 109.41.0
|
|
16
|
+
|
|
17
|
+
### Minor Changes
|
|
18
|
+
|
|
19
|
+
- [#118748](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/118748)
|
|
20
|
+
[`10bb9e2def098`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/10bb9e2def098) -
|
|
21
|
+
[ux] Reduce media single max width padding for all editors except full page
|
|
22
|
+
|
|
23
|
+
### Patch Changes
|
|
24
|
+
|
|
25
|
+
- [#118372](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/118372)
|
|
26
|
+
[`9f3d530e68972`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9f3d530e68972) -
|
|
27
|
+
Cleanup of table ff, when table is resized and num column is enabled, the table is not in
|
|
28
|
+
overflow.
|
|
29
|
+
- Updated dependencies
|
|
30
|
+
|
|
3
31
|
## 109.40.11
|
|
4
32
|
|
|
5
33
|
### Patch Changes
|
|
@@ -76,7 +76,8 @@ var MediaSingleWithChildren = function MediaSingleWithChildren(props) {
|
|
|
76
76
|
isInsideOfInlineExtension = _props$isInsideOfInli === void 0 ? false : _props$isInsideOfInli,
|
|
77
77
|
dataAttributes = props.dataAttributes,
|
|
78
78
|
media = props.media,
|
|
79
|
-
caption = props.caption
|
|
79
|
+
caption = props.caption,
|
|
80
|
+
editorAppearance = props.editorAppearance;
|
|
80
81
|
var _React$useState = _react.default.useState({
|
|
81
82
|
width: 0,
|
|
82
83
|
height: 0
|
|
@@ -216,7 +217,8 @@ var MediaSingleWithChildren = function MediaSingleWithChildren(props) {
|
|
|
216
217
|
},
|
|
217
218
|
fullWidthMode: isFullWidth,
|
|
218
219
|
isInsideOfInlineExtension: isInsideOfInlineExtension,
|
|
219
|
-
dataAttributes: dataAttributes
|
|
220
|
+
dataAttributes: dataAttributes,
|
|
221
|
+
editorAppearance: editorAppearance
|
|
220
222
|
}, (0, _react2.jsx)(_react.Fragment, null, mediaComponent), allowCaptions && caption);
|
|
221
223
|
};
|
|
222
224
|
return renderMediaSingle();
|
|
@@ -85,8 +85,7 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
|
|
|
85
85
|
// tables in the wild may be smaller than table container width (col resizing bugs, created before custom widths etc.)
|
|
86
86
|
// this causes issues with num column scaling as we add a new table column in renderer
|
|
87
87
|
var isTableSmallerThanContainer = sumOfColumns < tableContainerWidth - 1;
|
|
88
|
-
var forceScaleForNumColumn =
|
|
89
|
-
|
|
88
|
+
var forceScaleForNumColumn = isTableScalingEnabled && isNumberColumnEnabled && tableResized;
|
|
90
89
|
// when table resized and number column is enabled, we need to scale down the table in render
|
|
91
90
|
if (forceScaleForNumColumn) {
|
|
92
91
|
var scalePercentage = +((tableContainerWidth - _editorSharedStyles.akEditorTableNumberColumnWidth) / tableContainerWidth);
|
|
@@ -131,7 +130,7 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
|
|
|
131
130
|
var scaleDownPercent = 0;
|
|
132
131
|
var isTableScalingWithFixedColumnWidthsOptionEnabled = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled;
|
|
133
132
|
var isTableWidthFixed = isTableScalingWithFixedColumnWidthsOptionEnabled && ((_props$tableNode = props.tableNode) === null || _props$tableNode === void 0 ? void 0 : _props$tableNode.attrs.displayMode) === 'fixed';
|
|
134
|
-
var maxScalingPercent = (0, _platformFeatureFlags.
|
|
133
|
+
var maxScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') ? MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION : MAX_SCALING_PERCENT;
|
|
135
134
|
|
|
136
135
|
// fixes migration tables with zero-width columns
|
|
137
136
|
if (zeroWidthColumnsCount > 0) {
|
|
@@ -1,116 +1,65 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
|
-
exports.default =
|
|
9
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
10
|
-
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
7
|
+
exports.default = TaskItemWithProviders;
|
|
11
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
|
+
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
12
10
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
13
|
-
var
|
|
14
|
-
var
|
|
15
|
-
var
|
|
16
|
-
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
17
|
-
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
18
|
-
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
19
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
20
|
-
var _react = _interopRequireWildcard(require("react"));
|
|
11
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
12
|
+
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
13
|
+
var _react = _interopRequireDefault(require("react"));
|
|
21
14
|
var _taskDecision = require("@atlaskit/task-decision");
|
|
22
15
|
var _excluded = ["contextIdentifierProvider", "objectAri", "isRenderer"];
|
|
23
|
-
function
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
});
|
|
40
|
-
return _this;
|
|
41
|
-
}
|
|
42
|
-
(0, _createClass2.default)(TaskItemWithProviders, [{
|
|
43
|
-
key: "UNSAFE_componentWillMount",
|
|
44
|
-
value: function UNSAFE_componentWillMount() {
|
|
45
|
-
this.updateContextIdentifierProvider(this.props);
|
|
46
|
-
}
|
|
47
|
-
}, {
|
|
48
|
-
key: "UNSAFE_componentWillReceiveProps",
|
|
49
|
-
value: function UNSAFE_componentWillReceiveProps(nextProps) {
|
|
50
|
-
if (nextProps.contextIdentifierProvider !== this.props.contextIdentifierProvider) {
|
|
51
|
-
this.updateContextIdentifierProvider(nextProps);
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
}, {
|
|
55
|
-
key: "updateContextIdentifierProvider",
|
|
56
|
-
value: function () {
|
|
57
|
-
var _updateContextIdentifierProvider = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(props) {
|
|
58
|
-
var resolvedContextProvider;
|
|
59
|
-
return _regenerator.default.wrap(function _callee$(_context) {
|
|
60
|
-
while (1) switch (_context.prev = _context.next) {
|
|
61
|
-
case 0:
|
|
62
|
-
if (!props.contextIdentifierProvider) {
|
|
63
|
-
_context.next = 13;
|
|
64
|
-
break;
|
|
65
|
-
}
|
|
66
|
-
_context.prev = 1;
|
|
67
|
-
_context.next = 4;
|
|
68
|
-
return props.contextIdentifierProvider;
|
|
69
|
-
case 4:
|
|
70
|
-
resolvedContextProvider = _context.sent;
|
|
71
|
-
this.setState({
|
|
72
|
-
resolvedContextProvider: resolvedContextProvider
|
|
73
|
-
});
|
|
16
|
+
function TaskItemWithProviders(props) {
|
|
17
|
+
var contextIdentifierProvider = props.contextIdentifierProvider,
|
|
18
|
+
objectAri = props.objectAri,
|
|
19
|
+
isRenderer = props.isRenderer,
|
|
20
|
+
otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
|
|
21
|
+
var _React$useState = _react.default.useState(undefined),
|
|
22
|
+
_React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
|
|
23
|
+
resolvedContextProvider = _React$useState2[0],
|
|
24
|
+
setResolvedContextProvider = _React$useState2[1];
|
|
25
|
+
var updateContextIdentifierProvider = _react.default.useCallback( /*#__PURE__*/function () {
|
|
26
|
+
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(contextIdentifierProvider) {
|
|
27
|
+
var _resolvedContextProvider;
|
|
28
|
+
return _regenerator.default.wrap(function _callee$(_context) {
|
|
29
|
+
while (1) switch (_context.prev = _context.next) {
|
|
30
|
+
case 0:
|
|
31
|
+
if (!contextIdentifierProvider) {
|
|
74
32
|
_context.next = 11;
|
|
75
33
|
break;
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
var resolvedObjectId = this.state.resolvedContextProvider && this.state.resolvedContextProvider.objectId || objectAri;
|
|
109
|
-
return /*#__PURE__*/_react.default.createElement(_taskDecision.ResourcedTaskItem, (0, _extends2.default)({}, otherProps, {
|
|
110
|
-
objectAri: resolvedObjectId,
|
|
111
|
-
isRenderer: isRenderer
|
|
112
|
-
}));
|
|
113
|
-
}
|
|
114
|
-
}]);
|
|
115
|
-
return TaskItemWithProviders;
|
|
116
|
-
}(_react.Component);
|
|
34
|
+
}
|
|
35
|
+
_context.prev = 1;
|
|
36
|
+
_context.next = 4;
|
|
37
|
+
return contextIdentifierProvider;
|
|
38
|
+
case 4:
|
|
39
|
+
_resolvedContextProvider = _context.sent;
|
|
40
|
+
setResolvedContextProvider(_resolvedContextProvider);
|
|
41
|
+
return _context.abrupt("return");
|
|
42
|
+
case 9:
|
|
43
|
+
_context.prev = 9;
|
|
44
|
+
_context.t0 = _context["catch"](1);
|
|
45
|
+
case 11:
|
|
46
|
+
setResolvedContextProvider(undefined);
|
|
47
|
+
case 12:
|
|
48
|
+
case "end":
|
|
49
|
+
return _context.stop();
|
|
50
|
+
}
|
|
51
|
+
}, _callee, null, [[1, 9]]);
|
|
52
|
+
}));
|
|
53
|
+
return function (_x) {
|
|
54
|
+
return _ref.apply(this, arguments);
|
|
55
|
+
};
|
|
56
|
+
}(), []);
|
|
57
|
+
_react.default.useMemo(function () {
|
|
58
|
+
updateContextIdentifierProvider(props.contextIdentifierProvider);
|
|
59
|
+
}, [props.contextIdentifierProvider, updateContextIdentifierProvider]);
|
|
60
|
+
var resolvedObjectId = resolvedContextProvider && resolvedContextProvider.objectId || objectAri;
|
|
61
|
+
return /*#__PURE__*/_react.default.createElement(_taskDecision.ResourcedTaskItem, (0, _extends2.default)({}, otherProps, {
|
|
62
|
+
objectAri: resolvedObjectId,
|
|
63
|
+
isRenderer: isRenderer
|
|
64
|
+
}));
|
|
65
|
+
}
|
|
@@ -5,14 +5,8 @@ var _typeof = require("@babel/runtime/helpers/typeof");
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports.default =
|
|
9
|
-
var
|
|
10
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
11
|
-
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
12
|
-
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
13
|
-
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
14
|
-
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
15
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
8
|
+
exports.default = ExtensionRenderer;
|
|
9
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
16
10
|
var _react = require("@emotion/react");
|
|
17
11
|
var _react2 = _interopRequireWildcard(require("react"));
|
|
18
12
|
var _memoizeOne = _interopRequireDefault(require("memoize-one"));
|
|
@@ -22,8 +16,9 @@ var _utils = require("@atlaskit/editor-common/utils");
|
|
|
22
16
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
23
17
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
24
18
|
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; }
|
|
25
|
-
|
|
26
|
-
|
|
19
|
+
/** @jsx jsx */
|
|
20
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
21
|
+
|
|
27
22
|
var inlineExtensionStyle = (0, _react.css)({
|
|
28
23
|
display: 'inline-block',
|
|
29
24
|
maxWidth: '100%',
|
|
@@ -35,123 +30,103 @@ var inlineExtensionStyle = (0, _react.css)({
|
|
|
35
30
|
maxWidth: '100%'
|
|
36
31
|
}
|
|
37
32
|
});
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
extensionHandlers = _this$props.extensionHandlers,
|
|
64
|
-
rendererContext = _this$props.rendererContext,
|
|
65
|
-
extensionType = _this$props.extensionType,
|
|
66
|
-
extensionKey = _this$props.extensionKey,
|
|
67
|
-
parameters = _this$props.parameters,
|
|
68
|
-
content = _this$props.content,
|
|
69
|
-
text = _this$props.text,
|
|
70
|
-
type = _this$props.type,
|
|
71
|
-
localId = _this$props.localId,
|
|
72
|
-
marks = _this$props.marks,
|
|
73
|
-
actions = _this$props.actions;
|
|
74
|
-
var fragmentLocalId = marks === null || marks === void 0 || (_marks$find = marks.find(function (m) {
|
|
75
|
-
return m.type.name === 'fragment';
|
|
76
|
-
})) === null || _marks$find === void 0 || (_marks$find = _marks$find.attrs) === null || _marks$find === void 0 ? void 0 : _marks$find.localId;
|
|
77
|
-
var node = {
|
|
78
|
-
type: type,
|
|
79
|
-
extensionKey: extensionKey,
|
|
80
|
-
extensionType: extensionType,
|
|
81
|
-
parameters: parameters,
|
|
82
|
-
content: content || text,
|
|
83
|
-
localId: localId,
|
|
84
|
-
fragmentLocalId: fragmentLocalId
|
|
85
|
-
};
|
|
86
|
-
var result = null;
|
|
87
|
-
try {
|
|
88
|
-
if (extensionHandlers && extensionHandlers[extensionType]) {
|
|
89
|
-
var render = (0, _utils.getExtensionRenderer)(extensionHandlers[extensionType]);
|
|
90
|
-
result = render(node, rendererContext.adDoc);
|
|
91
|
-
}
|
|
92
|
-
if (!result && extensionProvider) {
|
|
93
|
-
var NodeRenderer = _this.getNodeRenderer(extensionProvider, extensionType, extensionKey);
|
|
94
|
-
if (node.type === 'multiBodiedExtension') {
|
|
95
|
-
result = (0, _react.jsx)(NodeRenderer, {
|
|
96
|
-
node: node,
|
|
97
|
-
actions: actions
|
|
98
|
-
});
|
|
99
|
-
} else if (node.type === 'inlineExtension') {
|
|
100
|
-
result = (0, _react.jsx)(InlineNodeRendererWrapper, null, (0, _react.jsx)(NodeRenderer, {
|
|
101
|
-
node: node
|
|
102
|
-
}));
|
|
103
|
-
} else {
|
|
104
|
-
result = (0, _react.jsx)(NodeRenderer, {
|
|
105
|
-
node: node
|
|
106
|
-
});
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
} catch (e) {
|
|
110
|
-
/** We don't want this error to block renderer */
|
|
111
|
-
/** We keep rendering the default content */
|
|
33
|
+
function ExtensionRenderer(props) {
|
|
34
|
+
var extensionHandlers = props.extensionHandlers,
|
|
35
|
+
rendererContext = props.rendererContext,
|
|
36
|
+
extensionType = props.extensionType,
|
|
37
|
+
extensionKey = props.extensionKey,
|
|
38
|
+
parameters = props.parameters,
|
|
39
|
+
content = props.content,
|
|
40
|
+
text = props.text,
|
|
41
|
+
type = props.type,
|
|
42
|
+
localId = props.localId,
|
|
43
|
+
marks = props.marks,
|
|
44
|
+
actions = props.actions,
|
|
45
|
+
children = props.children;
|
|
46
|
+
var isMounted = _react2.default.useRef(true);
|
|
47
|
+
var localGetNodeRenderer = _react2.default.useMemo(function () {
|
|
48
|
+
return (0, _memoizeOne.default)(_extensions.getNodeRenderer);
|
|
49
|
+
}, []);
|
|
50
|
+
var _React$useState = _react2.default.useState(null),
|
|
51
|
+
_React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
|
|
52
|
+
extensionProvider = _React$useState2[0],
|
|
53
|
+
setExtensionProvider = _React$useState2[1];
|
|
54
|
+
var handleProvider = _react2.default.useCallback(function (name, providerPromise) {
|
|
55
|
+
providerPromise && providerPromise.then(function (provider) {
|
|
56
|
+
if (isMounted.current) {
|
|
57
|
+
setExtensionProvider(provider);
|
|
112
58
|
}
|
|
113
|
-
return _this.props.children({
|
|
114
|
-
result: result
|
|
115
|
-
});
|
|
116
59
|
});
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
60
|
+
}, []);
|
|
61
|
+
var renderExtensionNode = _react2.default.useCallback(function (extensionProvider) {
|
|
62
|
+
var _marks$find;
|
|
63
|
+
var fragmentLocalId = marks === null || marks === void 0 || (_marks$find = marks.find(function (m) {
|
|
64
|
+
return m.type.name === 'fragment';
|
|
65
|
+
})) === null || _marks$find === void 0 || (_marks$find = _marks$find.attrs) === null || _marks$find === void 0 ? void 0 : _marks$find.localId;
|
|
66
|
+
var node = {
|
|
67
|
+
type: type,
|
|
68
|
+
extensionKey: extensionKey,
|
|
69
|
+
extensionType: extensionType,
|
|
70
|
+
parameters: parameters,
|
|
71
|
+
content: content || text,
|
|
72
|
+
localId: localId,
|
|
73
|
+
fragmentLocalId: fragmentLocalId
|
|
74
|
+
};
|
|
75
|
+
var result = null;
|
|
76
|
+
try {
|
|
77
|
+
if (extensionHandlers && extensionHandlers[extensionType]) {
|
|
78
|
+
var render = (0, _utils.getExtensionRenderer)(extensionHandlers[extensionType]);
|
|
79
|
+
result = render(node, rendererContext.adDoc);
|
|
121
80
|
}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
value: function render() {
|
|
139
|
-
var providers = this.props.providers;
|
|
140
|
-
if (!providers) {
|
|
141
|
-
return this.setupAndRenderExtensionNode({});
|
|
81
|
+
if (!result && extensionProvider) {
|
|
82
|
+
var NodeRenderer = localGetNodeRenderer(extensionProvider, extensionType, extensionKey);
|
|
83
|
+
if (node.type === 'multiBodiedExtension') {
|
|
84
|
+
result = (0, _react.jsx)(NodeRenderer, {
|
|
85
|
+
node: node,
|
|
86
|
+
actions: actions
|
|
87
|
+
});
|
|
88
|
+
} else if (node.type === 'inlineExtension') {
|
|
89
|
+
result = (0, _react.jsx)(InlineNodeRendererWrapper, null, (0, _react.jsx)(NodeRenderer, {
|
|
90
|
+
node: node
|
|
91
|
+
}));
|
|
92
|
+
} else {
|
|
93
|
+
result = (0, _react.jsx)(NodeRenderer, {
|
|
94
|
+
node: node
|
|
95
|
+
});
|
|
96
|
+
}
|
|
142
97
|
}
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
renderNode: this.setupAndRenderExtensionNode
|
|
147
|
-
});
|
|
98
|
+
} catch (e) {
|
|
99
|
+
/** We don't want this error to block renderer */
|
|
100
|
+
/** We keep rendering the default content */
|
|
148
101
|
}
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
}
|
|
102
|
+
return children({
|
|
103
|
+
result: result
|
|
104
|
+
});
|
|
105
|
+
}, [actions, children, content, extensionHandlers, extensionKey, extensionType, localGetNodeRenderer, localId, marks, parameters, rendererContext === null || rendererContext === void 0 ? void 0 : rendererContext.adDoc, text, type]);
|
|
106
|
+
var setupAndRenderExtensionNode = _react2.default.useCallback(function (providers) {
|
|
107
|
+
if (!extensionProvider && providers.extensionProvider) {
|
|
108
|
+
handleProvider('extensionProvider', providers.extensionProvider);
|
|
109
|
+
}
|
|
110
|
+
return renderExtensionNode(extensionProvider);
|
|
111
|
+
}, [extensionProvider, handleProvider, renderExtensionNode]);
|
|
112
|
+
_react2.default.useEffect(function () {
|
|
113
|
+
isMounted.current = true;
|
|
114
|
+
return function () {
|
|
115
|
+
isMounted.current = false;
|
|
116
|
+
};
|
|
117
|
+
}, []);
|
|
118
|
+
if (!props.providers) {
|
|
119
|
+
return setupAndRenderExtensionNode({});
|
|
120
|
+
}
|
|
121
|
+
return (0, _react.jsx)(_providerFactory.WithProviders, {
|
|
122
|
+
providers: ['extensionProvider'],
|
|
123
|
+
providerFactory: props.providers,
|
|
124
|
+
renderNode: setupAndRenderExtensionNode
|
|
125
|
+
});
|
|
126
|
+
}
|
|
152
127
|
var InlineNodeRendererWrapper = function InlineNodeRendererWrapper(_ref) {
|
|
153
128
|
var children = _ref.children;
|
|
154
|
-
if ((0, _platformFeatureFlags.
|
|
129
|
+
if ((0, _platformFeatureFlags.fg)('platform.editor.inline_extension.extended_lcqdn')) {
|
|
155
130
|
return (
|
|
156
131
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
157
132
|
(0, _react.jsx)("div", {
|
package/dist/cjs/ui/MediaCard.js
CHANGED
|
@@ -182,11 +182,11 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
|
|
|
182
182
|
return componentDidMount;
|
|
183
183
|
}()
|
|
184
184
|
}, {
|
|
185
|
-
key: "
|
|
186
|
-
value: function
|
|
187
|
-
var
|
|
188
|
-
if (
|
|
189
|
-
this.saveFileState(
|
|
185
|
+
key: "componentDidUpdate",
|
|
186
|
+
value: function componentDidUpdate(prevProps) {
|
|
187
|
+
var oldId = prevProps.id;
|
|
188
|
+
if (this.props.id && oldId !== this.props.id) {
|
|
189
|
+
this.saveFileState(this.props.id);
|
|
190
190
|
}
|
|
191
191
|
}
|
|
192
192
|
}, {
|
|
@@ -56,7 +56,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
56
56
|
var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
57
57
|
var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
58
58
|
var packageName = "@atlaskit/renderer";
|
|
59
|
-
var packageVersion = "109.
|
|
59
|
+
var packageVersion = "109.42.0";
|
|
60
60
|
var defaultNodeComponents = exports.defaultNodeComponents = _nodes.nodeToReact;
|
|
61
61
|
var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
|
|
62
62
|
(0, _inherits2.default)(Renderer, _PureComponent);
|
|
@@ -62,7 +62,8 @@ const MediaSingleWithChildren = props => {
|
|
|
62
62
|
isInsideOfInlineExtension = false,
|
|
63
63
|
dataAttributes,
|
|
64
64
|
media,
|
|
65
|
-
caption
|
|
65
|
+
caption,
|
|
66
|
+
editorAppearance
|
|
66
67
|
} = props;
|
|
67
68
|
const [externalImageDimensions, setExternalImageDimensions] = React.useState({
|
|
68
69
|
width: 0,
|
|
@@ -202,7 +203,8 @@ const MediaSingleWithChildren = props => {
|
|
|
202
203
|
},
|
|
203
204
|
fullWidthMode: isFullWidth,
|
|
204
205
|
isInsideOfInlineExtension: isInsideOfInlineExtension,
|
|
205
|
-
dataAttributes: dataAttributes
|
|
206
|
+
dataAttributes: dataAttributes,
|
|
207
|
+
editorAppearance: editorAppearance
|
|
206
208
|
}, jsx(Fragment, null, mediaComponent), allowCaptions && caption);
|
|
207
209
|
};
|
|
208
210
|
return renderMediaSingle();
|
|
@@ -3,7 +3,7 @@ import { tableCellBorderWidth, tableCellMinWidth } from '@atlaskit/editor-common
|
|
|
3
3
|
import { akEditorTableNumberColumnWidth, akEditorTableLegacyCellMinWidth } from '@atlaskit/editor-shared-styles';
|
|
4
4
|
import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
|
|
5
5
|
import { isTableResizingEnabled } from '../table';
|
|
6
|
-
import {
|
|
6
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
7
|
import { useFeatureFlags } from '../../../use-feature-flags';
|
|
8
8
|
// we allow scaling down column widths by no more than 30%
|
|
9
9
|
// this intends to reduce unwanted scrolling in the Renderer in these scenarios:
|
|
@@ -72,8 +72,7 @@ const renderScaleDownColgroup = props => {
|
|
|
72
72
|
// tables in the wild may be smaller than table container width (col resizing bugs, created before custom widths etc.)
|
|
73
73
|
// this causes issues with num column scaling as we add a new table column in renderer
|
|
74
74
|
const isTableSmallerThanContainer = sumOfColumns < tableContainerWidth - 1;
|
|
75
|
-
const forceScaleForNumColumn =
|
|
76
|
-
|
|
75
|
+
const forceScaleForNumColumn = isTableScalingEnabled && isNumberColumnEnabled && tableResized;
|
|
77
76
|
// when table resized and number column is enabled, we need to scale down the table in render
|
|
78
77
|
if (forceScaleForNumColumn) {
|
|
79
78
|
const scalePercentage = +((tableContainerWidth - akEditorTableNumberColumnWidth) / tableContainerWidth);
|
|
@@ -118,7 +117,7 @@ const renderScaleDownColgroup = props => {
|
|
|
118
117
|
let scaleDownPercent = 0;
|
|
119
118
|
const isTableScalingWithFixedColumnWidthsOptionEnabled = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled;
|
|
120
119
|
const isTableWidthFixed = isTableScalingWithFixedColumnWidthsOptionEnabled && ((_props$tableNode = props.tableNode) === null || _props$tableNode === void 0 ? void 0 : _props$tableNode.attrs.displayMode) === 'fixed';
|
|
121
|
-
const maxScalingPercent =
|
|
120
|
+
const maxScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && fg('platform.editor.table.use-increased-scaling-percent') ? MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION : MAX_SCALING_PERCENT;
|
|
122
121
|
|
|
123
122
|
// fixes migration tables with zero-width columns
|
|
124
123
|
if (zeroWidthColumnsCount > 0) {
|