@atlaskit/renderer 153.5.0 → 153.6.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 +22 -0
- package/dist/cjs/react/nodes/ForgeBodiedExtensionHandoff.js +4 -2
- package/dist/cjs/react/nodes/bodiedExtension.js +50 -23
- package/dist/cjs/react/nodes/table/colgroup.js +36 -16
- package/dist/cjs/react/nodes/table/table.js +16 -1
- package/dist/cjs/react/nodes/table.js +83 -18
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/es2019/react/nodes/ForgeBodiedExtensionHandoff.js +3 -2
- package/dist/es2019/react/nodes/bodiedExtension.js +46 -23
- package/dist/es2019/react/nodes/table/colgroup.js +34 -17
- package/dist/es2019/react/nodes/table/table.js +17 -2
- package/dist/es2019/react/nodes/table.js +70 -10
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/esm/react/nodes/ForgeBodiedExtensionHandoff.js +4 -2
- package/dist/esm/react/nodes/bodiedExtension.js +51 -24
- package/dist/esm/react/nodes/table/colgroup.js +36 -16
- package/dist/esm/react/nodes/table/table.js +17 -2
- package/dist/esm/react/nodes/table.js +79 -14
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/dist/types/react/nodes/ForgeBodiedExtensionHandoff.d.ts +2 -1
- package/dist/types/react/nodes/bodiedExtension.d.ts +2 -0
- package/dist/types/react/nodes/table/types.d.ts +3 -0
- package/dist/types/react/nodes/table.d.ts +2 -0
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 153.6.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`f8377a1c386f2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f8377a1c386f2) -
|
|
8
|
+
Add an optional suppressInitialFallback prop to BodiedExtension. Hosts can omit incorrect SSR body
|
|
9
|
+
output through the initial app handoff while preserving app input, mounted app state, and later
|
|
10
|
+
fallback behavior. Confluence opts in through confluence_forge_bodied_ssr_blocklist.
|
|
11
|
+
|
|
12
|
+
## 153.5.1
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- [`2828e9853e1d1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2828e9853e1d1) -
|
|
17
|
+
Disable table sticky headers, overflow shadow tracking, and automatic table scaling when
|
|
18
|
+
Confluence View Page Performance Mode is active, controlled by
|
|
19
|
+
`confluence_view_page_performance_mode`. Preserve authored widths, horizontal scrolling, and
|
|
20
|
+
existing behavior outside Performance Mode. Share saved-width column normalization between full
|
|
21
|
+
and light tables, including number-column space, and preserve fit-to-content sizing in light
|
|
22
|
+
tables. Preserve inherited comment table sizing when no numeric table width is available.
|
|
23
|
+
- Updated dependencies
|
|
24
|
+
|
|
3
25
|
## 153.5.0
|
|
4
26
|
|
|
5
27
|
### Minor Changes
|
|
@@ -26,7 +26,9 @@ function ForgeBodiedExtensionHandoff(_ref) {
|
|
|
26
26
|
localId = _ref.localId,
|
|
27
27
|
result = _ref.result,
|
|
28
28
|
_ref$preserveContentU = _ref.preserveContentUntilReady,
|
|
29
|
-
preserveContentUntilReady = _ref$preserveContentU === void 0 ? false : _ref$preserveContentU
|
|
29
|
+
preserveContentUntilReady = _ref$preserveContentU === void 0 ? false : _ref$preserveContentU,
|
|
30
|
+
_ref$suppressInitialF = _ref.suppressInitialFallback,
|
|
31
|
+
suppressInitialFallback = _ref$suppressInitialF === void 0 ? false : _ref$suppressInitialF;
|
|
30
32
|
var _useState = (0, _react.useState)(false),
|
|
31
33
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
32
34
|
ready = _useState2[0],
|
|
@@ -69,7 +71,7 @@ function ForgeBodiedExtensionHandoff(_ref) {
|
|
|
69
71
|
}, (!ready || !hasResult) && /*#__PURE__*/React.createElement("div", {
|
|
70
72
|
"aria-hidden": hasResult && !showNativeBody || undefined,
|
|
71
73
|
className: (0, _runtime.ax)([styles.layer, hasResult && !showNativeBody && styles.reservation])
|
|
72
|
-
}, fallback), /*#__PURE__*/React.createElement("div", {
|
|
74
|
+
}, suppressInitialFallback && !ready ? null : fallback), /*#__PURE__*/React.createElement("div", {
|
|
73
75
|
"aria-hidden": showNativeBody || undefined,
|
|
74
76
|
className: (0, _runtime.ax)([styles.layer, showNativeBody && styles.reservation])
|
|
75
77
|
}, /*#__PURE__*/React.createElement(_forgeBodiedExtensionHandoffContext.ForgeBodiedExtensionHandoffReadyContext.Provider, {
|
|
@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
8
8
|
exports.default = void 0;
|
|
9
9
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
10
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
11
12
|
var _react = _interopRequireWildcard(require("react"));
|
|
12
13
|
var _useAnalyticsEvents2 = require("@atlaskit/analytics-next/useAnalyticsEvents");
|
|
13
14
|
var _enums = require("@atlaskit/editor-common/analytics/types/enums");
|
|
@@ -26,8 +27,26 @@ var _useNodeHeight2 = require("./useNodeHeight");
|
|
|
26
27
|
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 _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
27
28
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
28
29
|
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; }
|
|
30
|
+
/** Restore the normal fallback after the renderer has committed its first app result. */
|
|
31
|
+
var InitialBodiedExtensionFallback = function InitialBodiedExtensionFallback(_ref) {
|
|
32
|
+
var hasResult = _ref.hasResult,
|
|
33
|
+
fallback = _ref.fallback,
|
|
34
|
+
render = _ref.render;
|
|
35
|
+
var _useState = (0, _react.useState)(false),
|
|
36
|
+
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
37
|
+
hasRenderedApp = _useState2[0],
|
|
38
|
+
setHasRenderedApp = _useState2[1];
|
|
39
|
+
(0, _react.useEffect)(function () {
|
|
40
|
+
if (hasResult) {
|
|
41
|
+
setHasRenderedApp(true);
|
|
42
|
+
}
|
|
43
|
+
}, [hasResult]);
|
|
44
|
+
return render(hasRenderedApp ? fallback : null);
|
|
45
|
+
};
|
|
29
46
|
var BodiedExtensionContent = function BodiedExtensionContent(props) {
|
|
30
47
|
var children = props.children,
|
|
48
|
+
_props$suppressInitia = props.suppressInitialFallback,
|
|
49
|
+
suppressInitialFallback = _props$suppressInitia === void 0 ? false : _props$suppressInitia,
|
|
31
50
|
_props$layout = props.layout,
|
|
32
51
|
layout = _props$layout === void 0 ? 'default' : _props$layout,
|
|
33
52
|
_props$path = props.path,
|
|
@@ -74,9 +93,9 @@ var BodiedExtensionContent = function BodiedExtensionContent(props) {
|
|
|
74
93
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
75
94
|
, (0, _extends2.default)({}, props, {
|
|
76
95
|
type: "bodiedExtension"
|
|
77
|
-
}), function (
|
|
78
|
-
var node =
|
|
79
|
-
result =
|
|
96
|
+
}), function (_ref2) {
|
|
97
|
+
var node = _ref2.node,
|
|
98
|
+
result = _ref2.result;
|
|
80
99
|
var handoffMode = (0, _forgeBodiedExtensionHandoffConfig.getForgeBodiedExtensionHandoffMode)({
|
|
81
100
|
extensionType: extensionType,
|
|
82
101
|
extensionKey: extensionKey,
|
|
@@ -92,6 +111,7 @@ var BodiedExtensionContent = function BodiedExtensionContent(props) {
|
|
|
92
111
|
localId: localId,
|
|
93
112
|
preserveContentUntilReady: handoffMode === 'preserve-until-ready',
|
|
94
113
|
fallback: children,
|
|
114
|
+
suppressInitialFallback: suppressInitialFallback,
|
|
95
115
|
result: /*#__PURE__*/_react.default.isValidElement(result) ? result : null
|
|
96
116
|
}), layout, {
|
|
97
117
|
isTopLevel: path.length < 1,
|
|
@@ -100,28 +120,35 @@ var BodiedExtensionContent = function BodiedExtensionContent(props) {
|
|
|
100
120
|
fireAnalyticsEvent: fireAnalyticsEvent
|
|
101
121
|
}, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, undefined, localId, shouldDisplayExtensionAsInline, node);
|
|
102
122
|
}
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
123
|
+
var renderResult = function renderResult(fallbackBody) {
|
|
124
|
+
try {
|
|
125
|
+
if (result && /*#__PURE__*/_react.default.isValidElement(result)) {
|
|
126
|
+
// Return the content directly if it's a valid JSX.Element
|
|
127
|
+
return (0, _extension.renderExtension)(result, layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
|
|
128
|
+
isTopLevel: path.length < 1,
|
|
129
|
+
marks: isBreakoutResizingEnabled ? props.marks : undefined,
|
|
130
|
+
rendererAppearance: props.rendererAppearance,
|
|
131
|
+
fireAnalyticsEvent: fireAnalyticsEvent
|
|
132
|
+
}), removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
|
|
133
|
+
}
|
|
134
|
+
} catch (_unused) {
|
|
135
|
+
/** We don't want this error to block renderer */
|
|
136
|
+
/** Keep rendering the configured fallback. */
|
|
112
137
|
}
|
|
113
|
-
} catch (_unused) {
|
|
114
|
-
/** We don't want this error to block renderer */
|
|
115
|
-
/** We keep rendering the default content */
|
|
116
|
-
}
|
|
117
138
|
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
139
|
+
// Render the configured body fallback when no app output is available.
|
|
140
|
+
return (0, _extension.renderExtension)(fallbackBody, layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
|
|
141
|
+
isTopLevel: path.length < 1,
|
|
142
|
+
marks: isBreakoutResizingEnabled ? props.marks : undefined,
|
|
143
|
+
rendererAppearance: props.rendererAppearance,
|
|
144
|
+
fireAnalyticsEvent: fireAnalyticsEvent
|
|
145
|
+
}), removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
|
|
146
|
+
};
|
|
147
|
+
return suppressInitialFallback ? /*#__PURE__*/_react.default.createElement(InitialBodiedExtensionFallback, {
|
|
148
|
+
hasResult: /*#__PURE__*/_react.default.isValidElement(result),
|
|
149
|
+
fallback: children,
|
|
150
|
+
render: renderResult
|
|
151
|
+
}) : renderResult(children);
|
|
125
152
|
}))));
|
|
126
153
|
};
|
|
127
154
|
var BodiedExtensionWithTemporarySizing = function BodiedExtensionWithTemporarySizing(props) {
|
|
@@ -10,6 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
10
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
11
11
|
var _nodeWidth = require("@atlaskit/editor-common/node-width");
|
|
12
12
|
var _table = require("@atlaskit/editor-common/styles/table");
|
|
13
|
+
var _normalizeColumnWidths = require("@atlaskit/editor-common/table/normalize-column-widths");
|
|
13
14
|
var _WidthProvider = require("@atlaskit/editor-common/WidthProvider");
|
|
14
15
|
var _constants = require("@atlaskit/editor-shared-styles/constants");
|
|
15
16
|
var _rendererContext = require("../../../renderer-context");
|
|
@@ -337,10 +338,12 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
|
|
|
337
338
|
});
|
|
338
339
|
};
|
|
339
340
|
var Colgroup = exports.Colgroup = function Colgroup(props) {
|
|
340
|
-
var _props$allowFixedColu
|
|
341
|
+
var _props$allowFixedColu;
|
|
341
342
|
var _useRendererContext = (0, _rendererContext.useRendererContext)(),
|
|
342
343
|
isTopLevelRenderer = _useRendererContext.isTopLevelRenderer,
|
|
343
|
-
nestedRendererType = _useRendererContext.nestedRendererType
|
|
344
|
+
nestedRendererType = _useRendererContext.nestedRendererType,
|
|
345
|
+
_useRendererContext$i = _useRendererContext.isPerformanceModeActive,
|
|
346
|
+
isPerformanceModeActive = _useRendererContext$i === void 0 ? false : _useRendererContext$i;
|
|
344
347
|
var columnWidths = props.columnWidths,
|
|
345
348
|
isNumberColumnEnabled = props.isNumberColumnEnabled;
|
|
346
349
|
var _useContext = (0, _react.useContext)(_WidthProvider.WidthContext),
|
|
@@ -357,20 +360,37 @@ var Colgroup = exports.Colgroup = function Colgroup(props) {
|
|
|
357
360
|
|
|
358
361
|
// renderSyncBlockColgroup returns null when not applicable (flag off, SSR, not a sync block),
|
|
359
362
|
// in which case ?? falls back to the standard renderScaleDownColgroup path.
|
|
360
|
-
var colStyles
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
363
|
+
var colStyles;
|
|
364
|
+
if (isPerformanceModeActive) {
|
|
365
|
+
var _props$tableWidth;
|
|
366
|
+
// Keep authored widths without viewport-driven scaling, including sync blocks.
|
|
367
|
+
colStyles = (0, _normalizeColumnWidths.normalizeTableColumnWidths)({
|
|
368
|
+
columnWidths: columnWidths,
|
|
369
|
+
isNumberColumnEnabled: !!isNumberColumnEnabled,
|
|
370
|
+
skipMinWidth: !!(props.isInsideOfTable && isInsideOfSyncBlock),
|
|
371
|
+
tableWidth: (_props$tableWidth = props.tableWidth) !== null && _props$tableWidth !== void 0 ? _props$tableWidth : (0, _nodeWidth.getTableContainerWidth)(props.tableNode)
|
|
372
|
+
}).map(function (width) {
|
|
373
|
+
return {
|
|
374
|
+
width: "".concat(width, "px")
|
|
375
|
+
};
|
|
376
|
+
});
|
|
377
|
+
} else {
|
|
378
|
+
var _renderSyncBlockColgr;
|
|
379
|
+
colStyles = (_renderSyncBlockColgr = renderSyncBlockColgroup({
|
|
380
|
+
isInsideOfSyncBlock: isInsideOfSyncBlock,
|
|
381
|
+
isInsideOfTable: !!props.isInsideOfTable,
|
|
382
|
+
tableNode: props.tableNode,
|
|
383
|
+
columnWidths: columnWidths,
|
|
384
|
+
isNumberColumnEnabled: !!isNumberColumnEnabled,
|
|
385
|
+
renderWidth: props.renderWidth,
|
|
386
|
+
contextWidth: contextWidth
|
|
387
|
+
})) !== null && _renderSyncBlockColgr !== void 0 ? _renderSyncBlockColgr : renderScaleDownColgroup(_objectSpread(_objectSpread({}, props), {}, {
|
|
388
|
+
isTopLevelRenderer: isTopLevelRenderer,
|
|
389
|
+
isInsideOfSyncBlock: isInsideOfSyncBlock,
|
|
390
|
+
isTableScalingEnabled: props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width' || props.rendererAppearance === 'max' || props.rendererAppearance === 'comment',
|
|
391
|
+
isTableFixedColumnWidthsOptionEnabled: isTableFixedColumnWidthsOptionEnabled && (props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width' || props.rendererAppearance === 'max')
|
|
392
|
+
}));
|
|
393
|
+
}
|
|
374
394
|
if (!colStyles) {
|
|
375
395
|
return null;
|
|
376
396
|
}
|
|
@@ -11,6 +11,7 @@ var _nodeWidth = require("@atlaskit/editor-common/node-width");
|
|
|
11
11
|
var _contentMode = require("@atlaskit/editor-common/table/content-mode");
|
|
12
12
|
var _constants = require("@atlaskit/editor-shared-styles/constants");
|
|
13
13
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
14
|
+
var _rendererContext = require("../../../renderer-context");
|
|
14
15
|
var _colgroup = require("./colgroup");
|
|
15
16
|
var _contentMode2 = require("./content-mode");
|
|
16
17
|
var Table = exports.Table = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
@@ -33,7 +34,17 @@ var Table = exports.Table = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
33
34
|
fixTableSSRResizing = _ref$fixTableSSRResiz === void 0 ? false : _ref$fixTableSSRResiz,
|
|
34
35
|
_ref$allowFixedColumn = _ref.allowFixedColumnWidthOption,
|
|
35
36
|
allowFixedColumnWidthOption = _ref$allowFixedColumn === void 0 ? false : _ref$allowFixedColumn;
|
|
37
|
+
var _useRendererContext = (0, _rendererContext.useRendererContext)(),
|
|
38
|
+
_useRendererContext$i = _useRendererContext.isPerformanceModeActive,
|
|
39
|
+
isPerformanceModeActive = _useRendererContext$i === void 0 ? false : _useRendererContext$i;
|
|
36
40
|
var tableWidth = tableNode ? (0, _nodeWidth.getTableContainerWidth)(tableNode) : _constants.akEditorDefaultLayoutWidth;
|
|
41
|
+
if (isPerformanceModeActive && !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width)) {
|
|
42
|
+
if (rendererAppearance === 'full-width') {
|
|
43
|
+
tableWidth = _constants.akEditorFullWidthLayoutWidth;
|
|
44
|
+
} else if (rendererAppearance === 'max') {
|
|
45
|
+
tableWidth = _constants.akEditorMaxWidthLayoutWidth;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
37
48
|
var tableColumnWidths = columnWidths;
|
|
38
49
|
if (rendererAppearance === 'comment' && allowTableResizing && tableNode && !((_tableNode$attrs = tableNode.attrs) !== null && _tableNode$attrs !== void 0 && _tableNode$attrs.width)) {
|
|
39
50
|
tableWidth = 'inherit';
|
|
@@ -64,9 +75,13 @@ var Table = exports.Table = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
64
75
|
"data-initial-width-mode": isContentMode ? 'content' : undefined,
|
|
65
76
|
ref: innerRef,
|
|
66
77
|
style: {
|
|
67
|
-
marginTop: fixTableSSRResizing ? '0px' : ''
|
|
78
|
+
marginTop: fixTableSSRResizing ? '0px' : '',
|
|
79
|
+
// Keep the table's saved width while its outer viewport can still shrink and scroll.
|
|
80
|
+
minWidth: isPerformanceModeActive && !isContentMode && typeof tableWidth === 'number' ? tableWidth : undefined,
|
|
81
|
+
width: isPerformanceModeActive && !isContentMode && typeof tableWidth === 'number' ? tableWidth : undefined
|
|
68
82
|
}
|
|
69
83
|
}), /*#__PURE__*/_react.default.createElement(_colgroup.Colgroup, {
|
|
84
|
+
tableWidth: isPerformanceModeActive && typeof tableWidth === 'number' ? tableWidth : undefined,
|
|
70
85
|
columnWidths: tableColumnWidths,
|
|
71
86
|
layout: layout,
|
|
72
87
|
isNumberColumnEnabled: isNumberColumnEnabled,
|
|
@@ -14,10 +14,12 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
|
|
|
14
14
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
15
15
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
16
16
|
var _react = _interopRequireDefault(require("react"));
|
|
17
|
+
var _reactIntl = require("react-intl");
|
|
18
|
+
var _table = require("@atlaskit/editor-common/messages/table");
|
|
17
19
|
var _nodeWidth = require("@atlaskit/editor-common/node-width");
|
|
18
20
|
var _OverflowShadow = _interopRequireDefault(require("@atlaskit/editor-common/OverflowShadow"));
|
|
19
21
|
var _styles = require("@atlaskit/editor-common/styles");
|
|
20
|
-
var
|
|
22
|
+
var _table2 = require("@atlaskit/editor-common/styles/table");
|
|
21
23
|
var _contentMode = require("@atlaskit/editor-common/table/content-mode");
|
|
22
24
|
var _types = require("@atlaskit/editor-common/types");
|
|
23
25
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
@@ -35,7 +37,7 @@ var _appearance = require("../utils/appearance");
|
|
|
35
37
|
var _cachedCellEdges = require("./table/cached-cell-edges");
|
|
36
38
|
var _contentMode2 = require("./table/content-mode");
|
|
37
39
|
var _sticky = require("./table/sticky");
|
|
38
|
-
var
|
|
40
|
+
var _table3 = require("./table/table");
|
|
39
41
|
var _tableCell = require("./tableCell");
|
|
40
42
|
var _TableStickyScrollbar = require("./TableStickyScrollbar");
|
|
41
43
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
@@ -227,6 +229,9 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
227
229
|
(0, _defineProperty2.default)(_this, "lastComputedStyle", {});
|
|
228
230
|
(0, _defineProperty2.default)(_this, "resizeObserver", null);
|
|
229
231
|
(0, _defineProperty2.default)(_this, "applyResizerChange", function (entries) {
|
|
232
|
+
if (_this.props.isPerformanceModeActive) {
|
|
233
|
+
return;
|
|
234
|
+
}
|
|
230
235
|
var wrapperWidth = _this.state.wrapperWidth;
|
|
231
236
|
var headerRowHeight = _this.state.headerRowHeight;
|
|
232
237
|
var _iterator = _createForOfIteratorHelper(entries),
|
|
@@ -293,6 +298,9 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
293
298
|
return (_this.overflowParent ? _this.overflowParent.top : 0) + offsetTop;
|
|
294
299
|
});
|
|
295
300
|
(0, _defineProperty2.default)(_this, "updateSticky", function () {
|
|
301
|
+
if (_this.props.isPerformanceModeActive) {
|
|
302
|
+
return;
|
|
303
|
+
}
|
|
296
304
|
var tableElem = _this.tableRef.current;
|
|
297
305
|
var refElem = _this.stickyHeaderRef.current;
|
|
298
306
|
if (!tableElem || !refElem) {
|
|
@@ -322,6 +330,12 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
322
330
|
}
|
|
323
331
|
});
|
|
324
332
|
(0, _defineProperty2.default)(_this, "onWrapperScrolled", function () {
|
|
333
|
+
if (_this.props.isPerformanceModeActive) {
|
|
334
|
+
if (_this.wrapperRef.current && _this.stickyScrollbarRef.current) {
|
|
335
|
+
_this.stickyScrollbarRef.current.scrollLeft = _this.wrapperRef.current.scrollLeft;
|
|
336
|
+
}
|
|
337
|
+
return;
|
|
338
|
+
}
|
|
325
339
|
if (!_this.wrapperRef.current || !_this.stickyWrapperRef.current) {
|
|
326
340
|
return;
|
|
327
341
|
}
|
|
@@ -459,17 +473,12 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
459
473
|
* @example
|
|
460
474
|
*/
|
|
461
475
|
function componentDidMount() {
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
this.resizeObserver.observe(this.wrapperRef.current);
|
|
465
|
-
}
|
|
466
|
-
if (this.stickyHeaderRef.current) {
|
|
467
|
-
this.resizeObserver.observe(this.stickyHeaderRef.current);
|
|
476
|
+
if (!this.props.isPerformanceModeActive) {
|
|
477
|
+
this.observeDimensions();
|
|
468
478
|
}
|
|
469
479
|
if (this.props.stickyHeaders) {
|
|
470
480
|
var _this$props$stickyHea;
|
|
471
481
|
this.overflowParent = _sticky.OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.defaultScrollRootId_DO_NOT_USE);
|
|
472
|
-
// Ignored via go/ees005
|
|
473
482
|
// eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
|
|
474
483
|
this.overflowParent.addEventListener('scroll', this.onScroll);
|
|
475
484
|
}
|
|
@@ -478,7 +487,20 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
478
487
|
}
|
|
479
488
|
this.applyNestedRendererTableFix();
|
|
480
489
|
}
|
|
481
|
-
|
|
490
|
+
}, {
|
|
491
|
+
key: "observeDimensions",
|
|
492
|
+
value: function observeDimensions() {
|
|
493
|
+
this.resizeObserver = new ResizeObserver(this.applyResizerChange);
|
|
494
|
+
if (this.wrapperRef.current) {
|
|
495
|
+
this.resizeObserver.observe(this.wrapperRef.current);
|
|
496
|
+
}
|
|
497
|
+
if (this.stickyHeaderRef.current) {
|
|
498
|
+
this.resizeObserver.observe(this.stickyHeaderRef.current);
|
|
499
|
+
}
|
|
500
|
+
}
|
|
501
|
+
}, {
|
|
502
|
+
key: "componentDidUpdate",
|
|
503
|
+
value:
|
|
482
504
|
/**
|
|
483
505
|
* Updates sticky header wiring and scroll synchronization after prop or state changes.
|
|
484
506
|
*
|
|
@@ -486,13 +508,28 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
486
508
|
* @param prevState
|
|
487
509
|
* @example
|
|
488
510
|
*/
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
511
|
+
function componentDidUpdate(prevProps, prevState) {
|
|
512
|
+
if (this.props.isPerformanceModeActive !== prevProps.isPerformanceModeActive) {
|
|
513
|
+
if (this.props.isPerformanceModeActive) {
|
|
514
|
+
var _this$resizeObserver;
|
|
515
|
+
(_this$resizeObserver = this.resizeObserver) === null || _this$resizeObserver === void 0 || _this$resizeObserver.disconnect();
|
|
516
|
+
this.resizeObserver = null;
|
|
517
|
+
if (this.nextFrame) {
|
|
518
|
+
cancelAnimationFrame(this.nextFrame);
|
|
519
|
+
this.nextFrame = undefined;
|
|
520
|
+
}
|
|
521
|
+
} else if (prevProps.isPerformanceModeActive) {
|
|
522
|
+
this.observeDimensions();
|
|
523
|
+
}
|
|
524
|
+
}
|
|
492
525
|
// toggling sticky headers visiblity
|
|
493
526
|
if (this.props.stickyHeaders && !this.overflowParent) {
|
|
494
527
|
var _this$props$stickyHea2;
|
|
495
528
|
this.overflowParent = _sticky.OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.defaultScrollRootId_DO_NOT_USE);
|
|
529
|
+
if (prevProps.isPerformanceModeActive) {
|
|
530
|
+
// eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
|
|
531
|
+
this.overflowParent.addEventListener('scroll', this.onScroll);
|
|
532
|
+
}
|
|
496
533
|
} else if (!this.props.stickyHeaders && this.overflowParent) {
|
|
497
534
|
// Ignored via go/ees005
|
|
498
535
|
// eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
|
|
@@ -524,7 +561,7 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
524
561
|
if (!this.tableRef.current || !this.stickyHeaderRef.current) {
|
|
525
562
|
return;
|
|
526
563
|
}
|
|
527
|
-
return this.tableRef.current.offsetHeight - this.stickyHeaderRef.current.offsetHeight +
|
|
564
|
+
return this.tableRef.current.offsetHeight - this.stickyHeaderRef.current.offsetHeight + _table2.tableMarginTop - _sticky.tableStickyPadding;
|
|
528
565
|
}
|
|
529
566
|
|
|
530
567
|
/**
|
|
@@ -725,8 +762,11 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
725
762
|
"data-table-local-id": tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.localId,
|
|
726
763
|
"data-table-width": tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.width,
|
|
727
764
|
"data-vc": "table-node-wrapper",
|
|
728
|
-
|
|
729
|
-
|
|
765
|
+
tabIndex: this.props.isPerformanceModeActive ? 0 : undefined,
|
|
766
|
+
role: this.props.isPerformanceModeActive ? 'region' : undefined,
|
|
767
|
+
"aria-label": this.props.isPerformanceModeActive ? this.props.scrollRegionLabel : undefined,
|
|
768
|
+
onScroll: (this.props.isPerformanceModeActive || this.props.stickyHeaders) && this.onWrapperScrolled
|
|
769
|
+
}, /*#__PURE__*/_react.default.createElement(_table3.Table, {
|
|
730
770
|
innerRef: this.tableRef,
|
|
731
771
|
columnWidths: columnWidths,
|
|
732
772
|
layout: layout,
|
|
@@ -761,6 +801,16 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
761
801
|
isNumberColumnEnabled: isNumberColumnEnabled
|
|
762
802
|
})));
|
|
763
803
|
}
|
|
804
|
+
}], [{
|
|
805
|
+
key: "getDerivedStateFromProps",
|
|
806
|
+
value: function getDerivedStateFromProps(props, state) {
|
|
807
|
+
if (props.isPerformanceModeActive && state.stickyMode !== 'none') {
|
|
808
|
+
return {
|
|
809
|
+
stickyMode: 'none'
|
|
810
|
+
};
|
|
811
|
+
}
|
|
812
|
+
return null;
|
|
813
|
+
}
|
|
764
814
|
}]);
|
|
765
815
|
}(_react.default.Component);
|
|
766
816
|
var getCellEdgePropsByCellOffset = function getCellEdgePropsByCellOffset(tableNode, isNumberColumnEnabled) {
|
|
@@ -953,6 +1003,8 @@ var TableProcessorWithContainerStyles = exports.TableProcessorWithContainerStyle
|
|
|
953
1003
|
isNumberColumnEnabled = _this$props2.isNumberColumnEnabled,
|
|
954
1004
|
isPresentational = _this$props2.isPresentational,
|
|
955
1005
|
layout = _this$props2.layout,
|
|
1006
|
+
isPerformanceModeActive = _this$props2.isPerformanceModeActive,
|
|
1007
|
+
scrollRegionLabel = _this$props2.scrollRegionLabel,
|
|
956
1008
|
rendererAppearance = _this$props2.rendererAppearance,
|
|
957
1009
|
renderWidth = _this$props2.renderWidth,
|
|
958
1010
|
shadowClassNames = _this$props2.shadowClassNames,
|
|
@@ -982,6 +1034,8 @@ var TableProcessorWithContainerStyles = exports.TableProcessorWithContainerStyle
|
|
|
982
1034
|
isInsideOfTable: isInsideOfTable,
|
|
983
1035
|
isNumberColumnEnabled: isNumberColumnEnabled,
|
|
984
1036
|
isPresentational: isPresentational,
|
|
1037
|
+
isPerformanceModeActive: isPerformanceModeActive,
|
|
1038
|
+
scrollRegionLabel: scrollRegionLabel,
|
|
985
1039
|
layout: layout,
|
|
986
1040
|
rendererAppearance: rendererAppearance,
|
|
987
1041
|
renderWidth: renderWidth,
|
|
@@ -1004,10 +1058,14 @@ var TableWithShadowsAndContainerStyles = (0, _OverflowShadow.default)(TableProce
|
|
|
1004
1058
|
useShadowObserver: true
|
|
1005
1059
|
});
|
|
1006
1060
|
var TableWithWidth = function TableWithWidth(props) {
|
|
1007
|
-
var _props$columnWidths;
|
|
1061
|
+
var _intl$formatMessage, _props$columnWidths;
|
|
1008
1062
|
var _useRendererContext2 = (0, _rendererContext.useRendererContext)(),
|
|
1009
|
-
isTopLevelRenderer = _useRendererContext2.isTopLevelRenderer
|
|
1063
|
+
isTopLevelRenderer = _useRendererContext2.isTopLevelRenderer,
|
|
1064
|
+
_useRendererContext2$ = _useRendererContext2.isPerformanceModeActive,
|
|
1065
|
+
isPerformanceModeActive = _useRendererContext2$ === void 0 ? false : _useRendererContext2$;
|
|
1066
|
+
var intl = _react.default.useContext(_reactIntl.IntlContext);
|
|
1010
1067
|
var isInsideOfNestedRenderer = isTopLevelRenderer === false;
|
|
1068
|
+
var scrollRegionLabel = isPerformanceModeActive ? (_intl$formatMessage = intl === null || intl === void 0 ? void 0 : intl.formatMessage(_table.messages.tableScrollRegion)) !== null && _intl$formatMessage !== void 0 ? _intl$formatMessage : _table.messages.tableScrollRegion.defaultMessage : undefined;
|
|
1011
1069
|
var colWidthsSum =
|
|
1012
1070
|
// eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
|
|
1013
1071
|
((_props$columnWidths = props.columnWidths) === null || _props$columnWidths === void 0 ? void 0 : _props$columnWidths.reduce(function (total, val) {
|
|
@@ -1018,6 +1076,10 @@ var TableWithWidth = function TableWithWidth(props) {
|
|
|
1018
1076
|
// Ignored via go/ees005
|
|
1019
1077
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
1020
1078
|
, (0, _extends2.default)({}, props, {
|
|
1079
|
+
isPerformanceModeActive: isPerformanceModeActive,
|
|
1080
|
+
scrollRegionLabel: scrollRegionLabel,
|
|
1081
|
+
stickyHeaders: isPerformanceModeActive ? undefined : props.stickyHeaders,
|
|
1082
|
+
disableShadowTracking: isPerformanceModeActive,
|
|
1021
1083
|
isInsideOfNestedRenderer: isInsideOfNestedRenderer
|
|
1022
1084
|
}));
|
|
1023
1085
|
}
|
|
@@ -1025,6 +1087,9 @@ var TableWithWidth = function TableWithWidth(props) {
|
|
|
1025
1087
|
// Ignored via go/ees005
|
|
1026
1088
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
1027
1089
|
, (0, _extends2.default)({}, props, {
|
|
1090
|
+
isPerformanceModeActive: isPerformanceModeActive,
|
|
1091
|
+
scrollRegionLabel: scrollRegionLabel,
|
|
1092
|
+
stickyHeaders: isPerformanceModeActive ? undefined : props.stickyHeaders,
|
|
1028
1093
|
isInsideOfNestedRenderer: isInsideOfNestedRenderer
|
|
1029
1094
|
}));
|
|
1030
1095
|
};
|
|
@@ -79,7 +79,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
79
79
|
var TABLE_INFO_TIMEOUT = 10000;
|
|
80
80
|
var RENDER_EVENT_SAMPLE_RATE = 0.1;
|
|
81
81
|
var packageName = "@atlaskit/renderer";
|
|
82
|
-
var packageVersion = "153.
|
|
82
|
+
var packageVersion = "153.5.1";
|
|
83
83
|
var setAsQueryContainerStyles = (0, _react2.css)({
|
|
84
84
|
containerName: 'ak-renderer-wrapper',
|
|
85
85
|
containerType: 'inline-size'
|
|
@@ -15,7 +15,8 @@ export default function ForgeBodiedExtensionHandoff({
|
|
|
15
15
|
fallback,
|
|
16
16
|
localId,
|
|
17
17
|
result,
|
|
18
|
-
preserveContentUntilReady = false
|
|
18
|
+
preserveContentUntilReady = false,
|
|
19
|
+
suppressInitialFallback = false
|
|
19
20
|
}) {
|
|
20
21
|
const [ready, setReady] = useState(false);
|
|
21
22
|
const hasResult = Boolean(result);
|
|
@@ -50,7 +51,7 @@ export default function ForgeBodiedExtensionHandoff({
|
|
|
50
51
|
}, (!ready || !hasResult) && /*#__PURE__*/React.createElement("div", {
|
|
51
52
|
"aria-hidden": hasResult && !showNativeBody || undefined,
|
|
52
53
|
className: ax([styles.layer, hasResult && !showNativeBody && styles.reservation])
|
|
53
|
-
}, fallback), /*#__PURE__*/React.createElement("div", {
|
|
54
|
+
}, suppressInitialFallback && !ready ? null : fallback), /*#__PURE__*/React.createElement("div", {
|
|
54
55
|
"aria-hidden": showNativeBody || undefined,
|
|
55
56
|
className: ax([styles.layer, showNativeBody && styles.reservation])
|
|
56
57
|
}, /*#__PURE__*/React.createElement(ForgeBodiedExtensionHandoffReadyContext.Provider, {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
|
2
|
-
import React, { useContext, useMemo } from 'react';
|
|
2
|
+
import React, { useContext, useEffect, useMemo, useState } from 'react';
|
|
3
3
|
import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
|
|
4
4
|
import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics/types/enums';
|
|
5
5
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
@@ -14,9 +14,24 @@ import ForgeBodiedExtensionHandoff from './ForgeBodiedExtensionHandoff';
|
|
|
14
14
|
import { getForgeBodiedExtensionHandoffMode } from './forgeBodiedExtensionHandoffConfig';
|
|
15
15
|
import { ForgeBodiedExtensionHandoffContext } from './forgeBodiedExtensionHandoffContext';
|
|
16
16
|
import { useNodeHeight } from './useNodeHeight';
|
|
17
|
+
/** Restore the normal fallback after the renderer has committed its first app result. */
|
|
18
|
+
const InitialBodiedExtensionFallback = ({
|
|
19
|
+
hasResult,
|
|
20
|
+
fallback,
|
|
21
|
+
render
|
|
22
|
+
}) => {
|
|
23
|
+
const [hasRenderedApp, setHasRenderedApp] = useState(false);
|
|
24
|
+
useEffect(() => {
|
|
25
|
+
if (hasResult) {
|
|
26
|
+
setHasRenderedApp(true);
|
|
27
|
+
}
|
|
28
|
+
}, [hasResult]);
|
|
29
|
+
return render(hasRenderedApp ? fallback : null);
|
|
30
|
+
};
|
|
17
31
|
const BodiedExtensionContent = props => {
|
|
18
32
|
const {
|
|
19
33
|
children,
|
|
34
|
+
suppressInitialFallback = false,
|
|
20
35
|
layout = 'default',
|
|
21
36
|
path = [],
|
|
22
37
|
extensionKey,
|
|
@@ -76,6 +91,7 @@ const BodiedExtensionContent = props => {
|
|
|
76
91
|
localId: localId,
|
|
77
92
|
preserveContentUntilReady: handoffMode === 'preserve-until-ready',
|
|
78
93
|
fallback: children,
|
|
94
|
+
suppressInitialFallback: suppressInitialFallback,
|
|
79
95
|
result: /*#__PURE__*/React.isValidElement(result) ? result : null
|
|
80
96
|
}), layout, {
|
|
81
97
|
isTopLevel: path.length < 1,
|
|
@@ -84,30 +100,37 @@ const BodiedExtensionContent = props => {
|
|
|
84
100
|
fireAnalyticsEvent
|
|
85
101
|
}, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, undefined, localId, shouldDisplayExtensionAsInline, node);
|
|
86
102
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
103
|
+
const renderResult = fallbackBody => {
|
|
104
|
+
try {
|
|
105
|
+
if (result && /*#__PURE__*/React.isValidElement(result)) {
|
|
106
|
+
// Return the content directly if it's a valid JSX.Element
|
|
107
|
+
return renderExtension(result, layout, {
|
|
108
|
+
...presetOptions,
|
|
109
|
+
isTopLevel: path.length < 1,
|
|
110
|
+
marks: isBreakoutResizingEnabled ? props.marks : undefined,
|
|
111
|
+
rendererAppearance: props.rendererAppearance,
|
|
112
|
+
fireAnalyticsEvent
|
|
113
|
+
}, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
|
|
114
|
+
}
|
|
115
|
+
} catch {
|
|
116
|
+
/** We don't want this error to block renderer */
|
|
117
|
+
/** Keep rendering the configured fallback. */
|
|
97
118
|
}
|
|
98
|
-
} catch {
|
|
99
|
-
/** We don't want this error to block renderer */
|
|
100
|
-
/** We keep rendering the default content */
|
|
101
|
-
}
|
|
102
119
|
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
120
|
+
// Render the configured body fallback when no app output is available.
|
|
121
|
+
return renderExtension(fallbackBody, layout, {
|
|
122
|
+
...presetOptions,
|
|
123
|
+
isTopLevel: path.length < 1,
|
|
124
|
+
marks: isBreakoutResizingEnabled ? props.marks : undefined,
|
|
125
|
+
rendererAppearance: props.rendererAppearance,
|
|
126
|
+
fireAnalyticsEvent
|
|
127
|
+
}, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
|
|
128
|
+
};
|
|
129
|
+
return suppressInitialFallback ? /*#__PURE__*/React.createElement(InitialBodiedExtensionFallback, {
|
|
130
|
+
hasResult: /*#__PURE__*/React.isValidElement(result),
|
|
131
|
+
fallback: children,
|
|
132
|
+
render: renderResult
|
|
133
|
+
}) : renderResult(children);
|
|
111
134
|
}))));
|
|
112
135
|
};
|
|
113
136
|
const BodiedExtensionWithTemporarySizing = props => {
|