@atlaskit/renderer 153.5.1 → 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 CHANGED
@@ -1,5 +1,14 @@
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
+
3
12
  ## 153.5.1
4
13
 
5
14
  ### Patch 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 (_ref) {
78
- var node = _ref.node,
79
- result = _ref.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
- try {
104
- if (result && /*#__PURE__*/_react.default.isValidElement(result)) {
105
- // Return the content directly if it's a valid JSX.Element
106
- return (0, _extension.renderExtension)(result, layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
107
- isTopLevel: path.length < 1,
108
- marks: isBreakoutResizingEnabled ? props.marks : undefined,
109
- rendererAppearance: props.rendererAppearance,
110
- fireAnalyticsEvent: fireAnalyticsEvent
111
- }), removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
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
- // Always return default content if anything goes wrong
119
- return (0, _extension.renderExtension)(children, layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
120
- isTopLevel: path.length < 1,
121
- marks: isBreakoutResizingEnabled ? props.marks : undefined,
122
- rendererAppearance: props.rendererAppearance,
123
- fireAnalyticsEvent: fireAnalyticsEvent
124
- }), removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
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) {
@@ -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.5.0";
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
- try {
88
- if (result && /*#__PURE__*/React.isValidElement(result)) {
89
- // Return the content directly if it's a valid JSX.Element
90
- return renderExtension(result, layout, {
91
- ...presetOptions,
92
- isTopLevel: path.length < 1,
93
- marks: isBreakoutResizingEnabled ? props.marks : undefined,
94
- rendererAppearance: props.rendererAppearance,
95
- fireAnalyticsEvent
96
- }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
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
- // Always return default content if anything goes wrong
104
- return renderExtension(children, layout, {
105
- ...presetOptions,
106
- isTopLevel: path.length < 1,
107
- marks: isBreakoutResizingEnabled ? props.marks : undefined,
108
- rendererAppearance: props.rendererAppearance,
109
- fireAnalyticsEvent
110
- }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
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 => {
@@ -64,7 +64,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
64
64
  const TABLE_INFO_TIMEOUT = 10000;
65
65
  const RENDER_EVENT_SAMPLE_RATE = 0.1;
66
66
  const packageName = "@atlaskit/renderer";
67
- const packageVersion = "153.5.0";
67
+ const packageVersion = "153.5.1";
68
68
  const setAsQueryContainerStyles = css({
69
69
  containerName: 'ak-renderer-wrapper',
70
70
  containerType: 'inline-size'
@@ -17,7 +17,9 @@ export default function ForgeBodiedExtensionHandoff(_ref) {
17
17
  localId = _ref.localId,
18
18
  result = _ref.result,
19
19
  _ref$preserveContentU = _ref.preserveContentUntilReady,
20
- preserveContentUntilReady = _ref$preserveContentU === void 0 ? false : _ref$preserveContentU;
20
+ preserveContentUntilReady = _ref$preserveContentU === void 0 ? false : _ref$preserveContentU,
21
+ _ref$suppressInitialF = _ref.suppressInitialFallback,
22
+ suppressInitialFallback = _ref$suppressInitialF === void 0 ? false : _ref$suppressInitialF;
21
23
  var _useState = useState(false),
22
24
  _useState2 = _slicedToArray(_useState, 2),
23
25
  ready = _useState2[0],
@@ -60,7 +62,7 @@ export default function ForgeBodiedExtensionHandoff(_ref) {
60
62
  }, (!ready || !hasResult) && /*#__PURE__*/React.createElement("div", {
61
63
  "aria-hidden": hasResult && !showNativeBody || undefined,
62
64
  className: ax([styles.layer, hasResult && !showNativeBody && styles.reservation])
63
- }, fallback), /*#__PURE__*/React.createElement("div", {
65
+ }, suppressInitialFallback && !ready ? null : fallback), /*#__PURE__*/React.createElement("div", {
64
66
  "aria-hidden": showNativeBody || undefined,
65
67
  className: ax([styles.layer, showNativeBody && styles.reservation])
66
68
  }, /*#__PURE__*/React.createElement(ForgeBodiedExtensionHandoffReadyContext.Provider, {
@@ -1,8 +1,9 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
+ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
3
4
  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; }
4
5
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
5
- import React, { useContext, useMemo } from 'react';
6
+ import React, { useContext, useEffect, useMemo, useState } from 'react';
6
7
  import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
7
8
  import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics/types/enums';
8
9
  import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
@@ -17,8 +18,26 @@ import ForgeBodiedExtensionHandoff from './ForgeBodiedExtensionHandoff';
17
18
  import { getForgeBodiedExtensionHandoffMode } from './forgeBodiedExtensionHandoffConfig';
18
19
  import { ForgeBodiedExtensionHandoffContext } from './forgeBodiedExtensionHandoffContext';
19
20
  import { useNodeHeight } from './useNodeHeight';
21
+ /** Restore the normal fallback after the renderer has committed its first app result. */
22
+ var InitialBodiedExtensionFallback = function InitialBodiedExtensionFallback(_ref) {
23
+ var hasResult = _ref.hasResult,
24
+ fallback = _ref.fallback,
25
+ render = _ref.render;
26
+ var _useState = useState(false),
27
+ _useState2 = _slicedToArray(_useState, 2),
28
+ hasRenderedApp = _useState2[0],
29
+ setHasRenderedApp = _useState2[1];
30
+ useEffect(function () {
31
+ if (hasResult) {
32
+ setHasRenderedApp(true);
33
+ }
34
+ }, [hasResult]);
35
+ return render(hasRenderedApp ? fallback : null);
36
+ };
20
37
  var BodiedExtensionContent = function BodiedExtensionContent(props) {
21
38
  var children = props.children,
39
+ _props$suppressInitia = props.suppressInitialFallback,
40
+ suppressInitialFallback = _props$suppressInitia === void 0 ? false : _props$suppressInitia,
22
41
  _props$layout = props.layout,
23
42
  layout = _props$layout === void 0 ? 'default' : _props$layout,
24
43
  _props$path = props.path,
@@ -65,9 +84,9 @@ var BodiedExtensionContent = function BodiedExtensionContent(props) {
65
84
  // eslint-disable-next-line react/jsx-props-no-spreading
66
85
  , _extends({}, props, {
67
86
  type: "bodiedExtension"
68
- }), function (_ref) {
69
- var node = _ref.node,
70
- result = _ref.result;
87
+ }), function (_ref2) {
88
+ var node = _ref2.node,
89
+ result = _ref2.result;
71
90
  var handoffMode = getForgeBodiedExtensionHandoffMode({
72
91
  extensionType: extensionType,
73
92
  extensionKey: extensionKey,
@@ -83,6 +102,7 @@ var BodiedExtensionContent = function BodiedExtensionContent(props) {
83
102
  localId: localId,
84
103
  preserveContentUntilReady: handoffMode === 'preserve-until-ready',
85
104
  fallback: children,
105
+ suppressInitialFallback: suppressInitialFallback,
86
106
  result: /*#__PURE__*/React.isValidElement(result) ? result : null
87
107
  }), layout, {
88
108
  isTopLevel: path.length < 1,
@@ -91,28 +111,35 @@ var BodiedExtensionContent = function BodiedExtensionContent(props) {
91
111
  fireAnalyticsEvent: fireAnalyticsEvent
92
112
  }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, undefined, localId, shouldDisplayExtensionAsInline, node);
93
113
  }
94
- try {
95
- if (result && /*#__PURE__*/React.isValidElement(result)) {
96
- // Return the content directly if it's a valid JSX.Element
97
- return renderExtension(result, layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
98
- isTopLevel: path.length < 1,
99
- marks: isBreakoutResizingEnabled ? props.marks : undefined,
100
- rendererAppearance: props.rendererAppearance,
101
- fireAnalyticsEvent: fireAnalyticsEvent
102
- }), removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
114
+ var renderResult = function renderResult(fallbackBody) {
115
+ try {
116
+ if (result && /*#__PURE__*/React.isValidElement(result)) {
117
+ // Return the content directly if it's a valid JSX.Element
118
+ return renderExtension(result, layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
119
+ isTopLevel: path.length < 1,
120
+ marks: isBreakoutResizingEnabled ? props.marks : undefined,
121
+ rendererAppearance: props.rendererAppearance,
122
+ fireAnalyticsEvent: fireAnalyticsEvent
123
+ }), removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
124
+ }
125
+ } catch (_unused) {
126
+ /** We don't want this error to block renderer */
127
+ /** Keep rendering the configured fallback. */
103
128
  }
104
- } catch (_unused) {
105
- /** We don't want this error to block renderer */
106
- /** We keep rendering the default content */
107
- }
108
129
 
109
- // Always return default content if anything goes wrong
110
- return renderExtension(children, layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
111
- isTopLevel: path.length < 1,
112
- marks: isBreakoutResizingEnabled ? props.marks : undefined,
113
- rendererAppearance: props.rendererAppearance,
114
- fireAnalyticsEvent: fireAnalyticsEvent
115
- }), removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
130
+ // Render the configured body fallback when no app output is available.
131
+ return renderExtension(fallbackBody, layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
132
+ isTopLevel: path.length < 1,
133
+ marks: isBreakoutResizingEnabled ? props.marks : undefined,
134
+ rendererAppearance: props.rendererAppearance,
135
+ fireAnalyticsEvent: fireAnalyticsEvent
136
+ }), removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
137
+ };
138
+ return suppressInitialFallback ? /*#__PURE__*/React.createElement(InitialBodiedExtensionFallback, {
139
+ hasResult: /*#__PURE__*/React.isValidElement(result),
140
+ fallback: children,
141
+ render: renderResult
142
+ }) : renderResult(children);
116
143
  }))));
117
144
  };
118
145
  var BodiedExtensionWithTemporarySizing = function BodiedExtensionWithTemporarySizing(props) {
@@ -69,7 +69,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
69
69
  var TABLE_INFO_TIMEOUT = 10000;
70
70
  var RENDER_EVENT_SAMPLE_RATE = 0.1;
71
71
  var packageName = "@atlaskit/renderer";
72
- var packageVersion = "153.5.0";
72
+ var packageVersion = "153.5.1";
73
73
  var setAsQueryContainerStyles = css({
74
74
  containerName: 'ak-renderer-wrapper',
75
75
  containerType: 'inline-size'
@@ -8,7 +8,8 @@ interface Props {
8
8
  localId: string;
9
9
  preserveContentUntilReady?: boolean;
10
10
  result: ReactNode;
11
+ suppressInitialFallback?: boolean;
11
12
  }
12
13
  /** Keep the native body in layout until Forge finishes its initial rendering. */
13
- export default function ForgeBodiedExtensionHandoff({ fallback, localId, result, preserveContentUntilReady, }: Props): ReactElement;
14
+ export default function ForgeBodiedExtensionHandoff({ fallback, localId, result, preserveContentUntilReady, suppressInitialFallback, }: Props): ReactElement;
14
15
  export {};
@@ -32,6 +32,8 @@ interface Props {
32
32
  serializer: Serializer<any>;
33
33
  shouldDisplayExtensionAsInline?: (extensionParams?: ExtensionParams<Parameters>) => boolean;
34
34
  startPos: number;
35
+ /** Omit the raw SSR body until the initial app handoff. Later fallbacks and app input are unchanged. */
36
+ suppressInitialFallback?: boolean;
35
37
  }
36
38
  declare const BodiedExtension: (props: React.PropsWithChildren<Props>) => React.JSX.Element;
37
39
  export default BodiedExtension;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "153.5.1",
3
+ "version": "153.6.0",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"