@atlaskit/renderer 153.1.0 → 153.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,30 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 153.2.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [`e217b926e88f6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e217b926e88f6) -
8
+ Enable standard node width and comment margin styles for the wiv_modernization_cohort gate, in
9
+ addition to platform_editor_expand_standard_width_fix, platform_editor_comment_margin_cq and the
10
+ work_item_modernization experiment
11
+ - Updated dependencies
12
+
13
+ ## 153.2.0
14
+
15
+ ### Minor Changes
16
+
17
+ - [`5af22a8293751`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5af22a8293751) -
18
+ Add optional host callbacks for temporary extension sizing: getExtensionPresetHeight supplies CSS
19
+ height in pixels alongside the existing getExtensionHeight min-height callback, and
20
+ scheduleExtensionHeightRemoval schedules expiry. Standard extension and bodied extension nodes
21
+ expire height and min-height independently, clean up timers, and prevent viewport fallback after
22
+ expiry.
23
+
24
+ ### Patch Changes
25
+
26
+ - Updated dependencies
27
+
3
28
  ## 153.1.0
4
29
 
5
30
  ### Minor Changes
@@ -118,9 +118,6 @@
118
118
  {
119
119
  "path": "../../../platform/feature-flags-react/afm-products/tsconfig.json"
120
120
  },
121
- {
122
- "path": "../../../pragmatic-drag-and-drop/core/afm-products/tsconfig.json"
123
- },
124
121
  {
125
122
  "path": "../../../react-compiler/react-compiler-gating/afm-products/tsconfig.json"
126
123
  },
@@ -136,9 +133,6 @@
136
133
  {
137
134
  "path": "../../../elements/task-decision/afm-products/tsconfig.json"
138
135
  },
139
- {
140
- "path": "../../../design-system/theme/afm-products/tsconfig.json"
141
- },
142
136
  {
143
137
  "path": "../../tmp-editor-statsig/afm-products/tsconfig.json"
144
138
  },
@@ -230,7 +230,9 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
230
230
  this.smartLinks = init.smartLinks;
231
231
  this.extensionViewportSizes = init.extensionViewportSizes;
232
232
  this.hideExtensionKeysWhilePending = init.hideExtensionKeysWhilePending;
233
+ this.getExtensionPresetHeight = init.getExtensionPresetHeight;
233
234
  this.getExtensionHeight = init.getExtensionHeight;
235
+ this.scheduleExtensionHeightRemoval = init.scheduleExtensionHeightRemoval;
234
236
  this.allowSelectAllTrap = init.allowSelectAllTrap;
235
237
  this.nodeComponents = init.nodeComponents;
236
238
  this.allowWindowedCodeBlock = init.allowWindowedCodeBlock;
@@ -577,9 +579,9 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
577
579
  }, {
578
580
  key: "getExtensionProps",
579
581
  value: function getExtensionProps(node) {
580
- var _this$getExtensionHei;
582
+ var _this$getExtensionHei, _this$getExtensionPre;
581
583
  var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
582
- return _objectSpread(_objectSpread({}, this.getProps(node, path)), {}, {
584
+ var extensionProps = _objectSpread(_objectSpread({}, this.getProps(node, path)), {}, {
583
585
  allowAnnotations: this.allowAnnotations,
584
586
  allowAnnotationsDraftMode: this.surroundTextNodesWithTextWrapper,
585
587
  extensionNode: node,
@@ -588,6 +590,12 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
588
590
  nodeHeight: (_this$getExtensionHei = this.getExtensionHeight) === null || _this$getExtensionHei === void 0 ? void 0 : _this$getExtensionHei.call(this, node),
589
591
  shouldDisplayExtensionAsInline: this.shouldDisplayExtensionAsInline
590
592
  });
593
+ if (!this.scheduleExtensionHeightRemoval) return extensionProps;
594
+ return _objectSpread(_objectSpread({}, extensionProps), {}, {
595
+ nodePresetMinHeight: extensionProps.nodeHeight,
596
+ nodePresetHeight: (_this$getExtensionPre = this.getExtensionPresetHeight) === null || _this$getExtensionPre === void 0 ? void 0 : _this$getExtensionPre.call(this, node),
597
+ scheduleExtensionHeightRemoval: this.scheduleExtensionHeightRemoval
598
+ });
591
599
  }
592
600
  }, {
593
601
  key: "getEmojiProps",
@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
10
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
10
11
  var _react = _interopRequireWildcard(require("react"));
11
12
  var _useAnalyticsEvents2 = require("@atlaskit/analytics-next/useAnalyticsEvents");
12
13
  var _enums = require("@atlaskit/editor-common/analytics/types/enums");
@@ -19,8 +20,11 @@ var _ValidationContext = require("../../ui/Renderer/ValidationContext");
19
20
  var _extension = require("./extension");
20
21
  var _ForgeBodiedExtensionHandoff = _interopRequireDefault(require("./ForgeBodiedExtensionHandoff"));
21
22
  var _forgeBodiedExtensionHandoffConfig = require("./forgeBodiedExtensionHandoffConfig");
23
+ var _useNodeHeight2 = require("./useNodeHeight");
22
24
  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); }
23
- var BodiedExtension = function BodiedExtension(props) {
25
+ 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; }
26
+ 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; }
27
+ var BodiedExtensionContent = function BodiedExtensionContent(props) {
24
28
  var children = props.children,
25
29
  _props$layout = props.layout,
26
30
  layout = _props$layout === void 0 ? 'default' : _props$layout,
@@ -33,6 +37,10 @@ var BodiedExtension = function BodiedExtension(props) {
33
37
  localId = props.localId,
34
38
  shouldDisplayExtensionAsInline = props.shouldDisplayExtensionAsInline,
35
39
  fireAnalyticsEvent = props.fireAnalyticsEvent;
40
+ var presetOptions = props.scheduleExtensionHeightRemoval ? {
41
+ height: props.nodePresetHeight
42
+ } : {};
43
+ var presetMinHeight = props.scheduleExtensionHeightRemoval ? props.nodePresetMinHeight : undefined;
36
44
  var _useAnalyticsEvents = (0, _useAnalyticsEvents2.useAnalyticsEvents)(),
37
45
  createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
38
46
  var removeOverflow = _react.default.Children.toArray(children)
@@ -80,11 +88,11 @@ var BodiedExtension = function BodiedExtension(props) {
80
88
  try {
81
89
  if (result && /*#__PURE__*/_react.default.isValidElement(result)) {
82
90
  // Return the content directly if it's a valid JSX.Element
83
- return (0, _extension.renderExtension)(result, layout, {
91
+ return (0, _extension.renderExtension)(result, layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
84
92
  isTopLevel: path.length < 1,
85
93
  rendererAppearance: props.rendererAppearance,
86
94
  fireAnalyticsEvent: fireAnalyticsEvent
87
- }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, undefined, localId, shouldDisplayExtensionAsInline, node);
95
+ }), removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
88
96
  }
89
97
  } catch (_unused) {
90
98
  /** We don't want this error to block renderer */
@@ -92,11 +100,39 @@ var BodiedExtension = function BodiedExtension(props) {
92
100
  }
93
101
 
94
102
  // Always return default content if anything goes wrong
95
- return (0, _extension.renderExtension)(children, layout, {
103
+ return (0, _extension.renderExtension)(children, layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
96
104
  isTopLevel: path.length < 1,
97
105
  rendererAppearance: props.rendererAppearance,
98
106
  fireAnalyticsEvent: fireAnalyticsEvent
99
- }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, undefined, localId, shouldDisplayExtensionAsInline, node);
107
+ }), removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
100
108
  }))));
101
109
  };
110
+ var BodiedExtensionWithTemporarySizing = function BodiedExtensionWithTemporarySizing(props) {
111
+ var _props$parameters;
112
+ var _useNodeHeight = (0, _useNodeHeight2.useNodeHeight)({
113
+ nodePresetMinHeight: props.nodePresetMinHeight,
114
+ node: props.extensionNode,
115
+ scheduleRemoval: props.scheduleExtensionHeightRemoval,
116
+ nodePresetHeight: props.nodePresetHeight,
117
+ hasViewportSize: (0, _extension.hasExtensionViewportSize)((_props$parameters = props.parameters) === null || _props$parameters === void 0 ? void 0 : _props$parameters.extensionId, props.extensionViewportSizes)
118
+ }),
119
+ presetMinHeight = _useNodeHeight.presetMinHeight,
120
+ presetHeight = _useNodeHeight.presetHeight,
121
+ hasExpired = _useNodeHeight.hasExpired;
122
+ return /*#__PURE__*/_react.default.createElement(BodiedExtensionContent
123
+ // eslint-disable-next-line react/jsx-props-no-spreading
124
+ , (0, _extends2.default)({}, props, {
125
+ nodePresetMinHeight: presetMinHeight,
126
+ nodePresetHeight: presetHeight,
127
+ extensionViewportSizes: hasExpired || presetHeight !== undefined ? undefined : props.extensionViewportSizes
128
+ }));
129
+ };
130
+ var BodiedExtension = function BodiedExtension(props) {
131
+ if (props.scheduleExtensionHeightRemoval) {
132
+ // eslint-disable-next-line react/jsx-props-no-spreading
133
+ return /*#__PURE__*/_react.default.createElement(BodiedExtensionWithTemporarySizing, props);
134
+ }
135
+ // eslint-disable-next-line react/jsx-props-no-spreading
136
+ return /*#__PURE__*/_react.default.createElement(BodiedExtensionContent, props);
137
+ };
102
138
  var _default = exports.default = BodiedExtension;
@@ -5,11 +5,11 @@ var _typeof = require("@babel/runtime/helpers/typeof");
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.renderExtension = exports.default = void 0;
9
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
8
+ exports.renderExtension = exports.hasExtensionViewportSize = exports.default = void 0;
10
9
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
11
10
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
12
11
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
12
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
13
13
  var _react = _interopRequireWildcard(require("react"));
14
14
  var _react2 = require("@emotion/react");
15
15
  var _enums = require("@atlaskit/editor-common/analytics/types/enums");
@@ -23,15 +23,14 @@ var _AnnotationRangeContext = require("../../ui/annotations/contexts/AnnotationR
23
23
  var _ExtensionRenderer = _interopRequireDefault(require("../../ui/ExtensionRenderer"));
24
24
  var _breakout = require("../utils/breakout");
25
25
  var _extensionComments = require("./extension-comments");
26
+ var _useNodeHeight2 = require("./useNodeHeight");
26
27
  var _excluded = ["commentProps", "commentTargetOptions"];
27
- /**
28
- * @jsxRuntime classic
29
- * @jsx jsx
30
- */
31
- // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
32
28
  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); }
33
29
  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; }
34
- 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
+ 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; } /**
31
+ * @jsxRuntime classic
32
+ * @jsx jsx
33
+ */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
35
34
  var FORGE_EXTENSION_TYPE = 'com.atlassian.ecosystem';
36
35
  /**
37
36
  * Mirrors `FORGE_INLINE_BODIED_PARAM` in `@atlassian/xen-editor-provider`. Duplicated rather than
@@ -48,6 +47,11 @@ var macroHeights = {
48
47
  large: '524px',
49
48
  xlarge: '1048px'
50
49
  };
50
+ var hasExtensionViewportSize = exports.hasExtensionViewportSize = function hasExtensionViewportSize(extensionId, extensionViewportSizes) {
51
+ return Boolean(extensionId && (extensionViewportSizes === null || extensionViewportSizes === void 0 ? void 0 : extensionViewportSizes.some(function (extension) {
52
+ return extension.extensionId === extensionId && Boolean(extension.viewportSize);
53
+ })));
54
+ };
51
55
  var getViewportSize = function getViewportSize(extensionId, extensionViewportSizes) {
52
56
  if (!Array.isArray(extensionViewportSizes) || !extensionId) {
53
57
  return;
@@ -91,7 +95,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
91
95
  var removeOverflow = arguments.length > 3 ? arguments[3] : undefined;
92
96
  var extensionId = arguments.length > 4 ? arguments[4] : undefined;
93
97
  var extensionViewportSizes = arguments.length > 5 ? arguments[5] : undefined;
94
- var nodeHeight = arguments.length > 6 ? arguments[6] : undefined;
98
+ var nodePresetMinHeight = arguments.length > 6 ? arguments[6] : undefined;
95
99
  var localId = arguments.length > 7 ? arguments[7] : undefined;
96
100
  var shouldDisplayExtensionAsInline = arguments.length > 8 ? arguments[8] : undefined;
97
101
  var node = arguments.length > 9 ? arguments[9] : undefined;
@@ -116,7 +120,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
116
120
  * as the extension handler in CFE for legacy macros and Connect.
117
121
  */
118
122
  var viewportSize = getViewportSize(extensionId, extensionViewportSizes);
119
- var extensionHeight = nodeHeight || viewportSize;
123
+ var extensionHeight = nodePresetMinHeight || viewportSize;
120
124
  // Forge manifest heights already include px; Connect node heights are numeric strings.
121
125
  var extensionMinHeight = extensionHeight !== null && extensionHeight !== void 0 && extensionHeight.endsWith('px') && (0, _fg.fg)('confluence_forge_early_render_reserve_height') ? extensionHeight : extensionHeight && "".concat(extensionHeight, "px");
122
126
  /**
@@ -162,13 +166,15 @@ var renderExtension = exports.renderExtension = function renderExtension(content
162
166
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
163
167
  ,
164
168
  className: "".concat(_consts.RendererCssClassName.EXTENSION, " ").concat(inlineClassName, " ").concat(options.shadowClassNames, " ").concat(centerAlignClass),
165
- style: {
169
+ style: _objectSpread(_objectSpread({}, !isInline && options.height !== undefined ? {
170
+ height: options.height
171
+ } : {}), {}, {
166
172
  width: isInline ? undefined : ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_important_in_render_ext') ? isCustomLayout : isTopLevel) ?
167
173
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
168
174
  (0, _breakout.calcBreakoutWidthCss)(layout) : (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_important_in_render_ext') ? undefined : '100%',
169
175
  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
170
176
  minHeight: isInline ? undefined : extensionMinHeight
171
- },
177
+ }),
172
178
  "data-layout": layout,
173
179
  "data-local-id": localId,
174
180
  "data-renderer-start-pos": (_options$dataAttribut = options.dataAttributes) === null || _options$dataAttribut === void 0 ? void 0 : _options$dataAttribut['data-renderer-start-pos'],
@@ -312,6 +318,9 @@ var ExtensionContent = function ExtensionContent(_ref3) {
312
318
  nodeHeight = props.nodeHeight,
313
319
  localId = props.localId,
314
320
  isInsideOfInlineExtension = props.isInsideOfInlineExtension;
321
+ var presetOptions = props.scheduleExtensionHeightRemoval ? {
322
+ height: props.nodePresetHeight
323
+ } : {};
315
324
  return (0, _react2.jsx)(_ExtensionRenderer.default
316
325
  // Ignored via go/ees005
317
326
  // eslint-disable-next-line react/jsx-props-no-spreading
@@ -330,7 +339,7 @@ var ExtensionContent = function ExtensionContent(_ref3) {
330
339
  allowAnnotationsDraftMode: commentProps.allowAnnotationsDraftMode,
331
340
  startPos: commentProps.startPos,
332
341
  marks: commentProps.marks
333
- }, result), layout, _objectSpread({
342
+ }, result), layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
334
343
  dataAttributes: props.dataAttributes,
335
344
  isTopLevel: path.length < 1,
336
345
  handleRef: handleRef,
@@ -355,7 +364,7 @@ var ExtensionContent = function ExtensionContent(_ref3) {
355
364
  allowAnnotationsDraftMode: commentProps.allowAnnotationsDraftMode,
356
365
  startPos: commentProps.startPos,
357
366
  marks: commentProps.marks
358
- }, text || 'extension'), layout, _objectSpread({
367
+ }, text || 'extension'), layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
359
368
  dataAttributes: props.dataAttributes,
360
369
  isTopLevel: path.length < 1,
361
370
  handleRef: handleRef,
@@ -365,7 +374,7 @@ var ExtensionContent = function ExtensionContent(_ref3) {
365
374
  }, commentTargetOptions), undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
366
375
  });
367
376
  };
368
- var Extension = function Extension(props) {
377
+ var ExtensionView = function ExtensionView(props) {
369
378
  // Keep annotation context subscriptions out of the gate-off render path.
370
379
  if ((0, _fg.fg)('cc_maui_annotations_on_extensions')) {
371
380
  // eslint-disable-next-line react/jsx-props-no-spreading
@@ -374,6 +383,34 @@ var Extension = function Extension(props) {
374
383
  // eslint-disable-next-line react/jsx-props-no-spreading
375
384
  return (0, _react2.jsx)(ExtensionContent, props);
376
385
  };
386
+ var ExtensionWithTemporarySizing = function ExtensionWithTemporarySizing(props) {
387
+ var _props$parameters;
388
+ var _useNodeHeight = (0, _useNodeHeight2.useNodeHeight)({
389
+ nodePresetMinHeight: props.nodePresetMinHeight,
390
+ node: props.extensionNode,
391
+ scheduleRemoval: props.scheduleExtensionHeightRemoval,
392
+ nodePresetHeight: props.nodePresetHeight,
393
+ hasViewportSize: hasExtensionViewportSize((_props$parameters = props.parameters) === null || _props$parameters === void 0 ? void 0 : _props$parameters.extensionId, props.extensionViewportSizes)
394
+ }),
395
+ presetMinHeight = _useNodeHeight.presetMinHeight,
396
+ presetHeight = _useNodeHeight.presetHeight,
397
+ hasExpired = _useNodeHeight.hasExpired;
398
+ return (0, _react2.jsx)(ExtensionView
399
+ // eslint-disable-next-line react/jsx-props-no-spreading
400
+ , (0, _extends2.default)({}, props, {
401
+ nodeHeight: presetMinHeight,
402
+ nodePresetHeight: presetHeight,
403
+ extensionViewportSizes: hasExpired || presetHeight !== undefined ? undefined : props.extensionViewportSizes
404
+ }));
405
+ };
406
+ var Extension = function Extension(props) {
407
+ if (props.scheduleExtensionHeightRemoval) {
408
+ // eslint-disable-next-line react/jsx-props-no-spreading
409
+ return (0, _react2.jsx)(ExtensionWithTemporarySizing, props);
410
+ }
411
+ // eslint-disable-next-line react/jsx-props-no-spreading
412
+ return (0, _react2.jsx)(ExtensionView, props);
413
+ };
377
414
  var _default_1 = (0, _OverflowShadow.default)(Extension, {
378
415
  overflowSelector: ".".concat(_consts.RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER)
379
416
  });
@@ -0,0 +1,43 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.useNodeHeight = void 0;
8
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
9
+ var _react = require("react");
10
+ /** Hosts independently schedule each sizing property and return cleanup when scheduled. */
11
+
12
+ var useHeightExpiry = function useHeightExpiry(value, property, node, scheduleRemoval) {
13
+ var _useState = (0, _react.useState)(false),
14
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
15
+ expired = _useState2[0],
16
+ setExpired = _useState2[1];
17
+ (0, _react.useEffect)(function () {
18
+ setExpired(false);
19
+ if (value === undefined || !node || !scheduleRemoval) return;
20
+ return scheduleRemoval(node, function () {
21
+ return setExpired(true);
22
+ }, property);
23
+ }, [value, property, node, scheduleRemoval]);
24
+ return expired;
25
+ };
26
+ var useNodeHeight = exports.useNodeHeight = function useNodeHeight(_ref) {
27
+ var nodePresetMinHeight = _ref.nodePresetMinHeight,
28
+ nodePresetHeight = _ref.nodePresetHeight,
29
+ node = _ref.node,
30
+ scheduleRemoval = _ref.scheduleRemoval,
31
+ _ref$hasViewportSize = _ref.hasViewportSize,
32
+ hasViewportSize = _ref$hasViewportSize === void 0 ? false : _ref$hasViewportSize;
33
+ var ignorePresets = hasViewportSize && !!scheduleRemoval;
34
+ var presetMinHeight = ignorePresets ? undefined : nodePresetMinHeight;
35
+ var presetHeight = ignorePresets ? undefined : nodePresetHeight;
36
+ var minHeightExpired = useHeightExpiry(presetMinHeight, 'minHeight', node, scheduleRemoval);
37
+ var heightExpired = useHeightExpiry(presetHeight, 'height', node, scheduleRemoval);
38
+ return {
39
+ presetMinHeight: minHeightExpired ? undefined : presetMinHeight,
40
+ presetHeight: heightExpired ? undefined : presetHeight,
41
+ hasExpired: minHeightExpired || heightExpired
42
+ };
43
+ };
@@ -399,7 +399,7 @@ function Expand(_ref) {
399
399
  focused: focused
400
400
  // Comment surfaces (Jira description and comments) have no gutter for the expand to sit in.
401
401
  ,
402
- useStandardWidth: ((0, _fg.fg)('platform_editor_expand_standard_width_fix') || (0, _isExperimentEnabled.isExperimentEnabled)('work_item_modernization')) && rendererAppearance === 'comment'
402
+ useStandardWidth: ((0, _fg.fg)('platform_editor_expand_standard_width_fix') || (0, _isExperimentEnabled.isExperimentEnabled)('work_item_modernization') || (0, _fg.fg)('wiv_modernization_cohort')) && rendererAppearance === 'comment'
403
403
  }, nestedHeaderIds && nestedHeaderIds.length > 0 ? (0, _react2.jsx)(_activeHeaderIdProvider.ActiveHeaderIdConsumer, {
404
404
  nestedHeaderIds: nestedHeaderIds,
405
405
  onNestedHeaderIdMatch: openBody
@@ -80,7 +80,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
80
80
  var TABLE_INFO_TIMEOUT = 10000;
81
81
  var RENDER_EVENT_SAMPLE_RATE = 0.1;
82
82
  var packageName = "@atlaskit/renderer";
83
- var packageVersion = "153.0.8";
83
+ var packageVersion = "153.2.0";
84
84
  var setAsQueryContainerStyles = (0, _react2.css)({
85
85
  containerName: 'ak-renderer-wrapper',
86
86
  containerType: 'inline-size'
@@ -275,7 +275,9 @@ var RendererFunctionalComponent = exports.RendererFunctionalComponent = function
275
275
  emojiResourceConfig: props.emojiResourceConfig,
276
276
  smartLinks: props.smartLinks,
277
277
  extensionViewportSizes: props.extensionViewportSizes,
278
+ getExtensionPresetHeight: props.getExtensionPresetHeight,
278
279
  getExtensionHeight: props.getExtensionHeight,
280
+ scheduleExtensionHeightRemoval: props.scheduleExtensionHeightRemoval,
279
281
  allowCopyToClipboard: props.allowCopyToClipboard,
280
282
  allowDownloadCodeBlock: props.allowDownloadCodeBlock,
281
283
  allowWrapCodeBlock: props.allowWrapCodeBlock,
@@ -217,7 +217,9 @@ export default class ReactSerializer {
217
217
  this.smartLinks = init.smartLinks;
218
218
  this.extensionViewportSizes = init.extensionViewportSizes;
219
219
  this.hideExtensionKeysWhilePending = init.hideExtensionKeysWhilePending;
220
+ this.getExtensionPresetHeight = init.getExtensionPresetHeight;
220
221
  this.getExtensionHeight = init.getExtensionHeight;
222
+ this.scheduleExtensionHeightRemoval = init.scheduleExtensionHeightRemoval;
221
223
  this.allowSelectAllTrap = init.allowSelectAllTrap;
222
224
  this.nodeComponents = init.nodeComponents;
223
225
  this.allowWindowedCodeBlock = init.allowWindowedCodeBlock;
@@ -524,8 +526,8 @@ export default class ReactSerializer {
524
526
  };
525
527
  }
526
528
  getExtensionProps(node, path = []) {
527
- var _this$getExtensionHei;
528
- return {
529
+ var _this$getExtensionHei, _this$getExtensionPre;
530
+ const extensionProps = {
529
531
  ...this.getProps(node, path),
530
532
  allowAnnotations: this.allowAnnotations,
531
533
  allowAnnotationsDraftMode: this.surroundTextNodesWithTextWrapper,
@@ -535,6 +537,13 @@ export default class ReactSerializer {
535
537
  nodeHeight: (_this$getExtensionHei = this.getExtensionHeight) === null || _this$getExtensionHei === void 0 ? void 0 : _this$getExtensionHei.call(this, node),
536
538
  shouldDisplayExtensionAsInline: this.shouldDisplayExtensionAsInline
537
539
  };
540
+ if (!this.scheduleExtensionHeightRemoval) return extensionProps;
541
+ return {
542
+ ...extensionProps,
543
+ nodePresetMinHeight: extensionProps.nodeHeight,
544
+ nodePresetHeight: (_this$getExtensionPre = this.getExtensionPresetHeight) === null || _this$getExtensionPre === void 0 ? void 0 : _this$getExtensionPre.call(this, node),
545
+ scheduleExtensionHeightRemoval: this.scheduleExtensionHeightRemoval
546
+ };
538
547
  }
539
548
  getEmojiProps(node, path = []) {
540
549
  return {
@@ -8,10 +8,11 @@ import { AnnotationsPositionContext } from '../../ui/annotations';
8
8
  import ExtensionRenderer from '../../ui/ExtensionRenderer';
9
9
  import { ErrorBoundary } from '../../ui/Renderer/ErrorBoundary';
10
10
  import { ValidationContextProvider } from '../../ui/Renderer/ValidationContext';
11
- import { renderExtension } from './extension';
11
+ import { hasExtensionViewportSize, renderExtension } from './extension';
12
12
  import ForgeBodiedExtensionHandoff from './ForgeBodiedExtensionHandoff';
13
13
  import { FORGE_BODIED_EXTENSION_HANDOFF_KEYS } from './forgeBodiedExtensionHandoffConfig';
14
- const BodiedExtension = props => {
14
+ import { useNodeHeight } from './useNodeHeight';
15
+ const BodiedExtensionContent = props => {
15
16
  const {
16
17
  children,
17
18
  layout = 'default',
@@ -24,6 +25,10 @@ const BodiedExtension = props => {
24
25
  shouldDisplayExtensionAsInline,
25
26
  fireAnalyticsEvent
26
27
  } = props;
28
+ const presetOptions = props.scheduleExtensionHeightRemoval ? {
29
+ height: props.nodePresetHeight
30
+ } : {};
31
+ const presetMinHeight = props.scheduleExtensionHeightRemoval ? props.nodePresetMinHeight : undefined;
27
32
  const {
28
33
  createAnalyticsEvent
29
34
  } = useAnalyticsEvents();
@@ -70,10 +75,11 @@ const BodiedExtension = props => {
70
75
  if (result && /*#__PURE__*/React.isValidElement(result)) {
71
76
  // Return the content directly if it's a valid JSX.Element
72
77
  return renderExtension(result, layout, {
78
+ ...presetOptions,
73
79
  isTopLevel: path.length < 1,
74
80
  rendererAppearance: props.rendererAppearance,
75
81
  fireAnalyticsEvent
76
- }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, undefined, localId, shouldDisplayExtensionAsInline, node);
82
+ }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
77
83
  }
78
84
  } catch {
79
85
  /** We don't want this error to block renderer */
@@ -82,10 +88,40 @@ const BodiedExtension = props => {
82
88
 
83
89
  // Always return default content if anything goes wrong
84
90
  return renderExtension(children, layout, {
91
+ ...presetOptions,
85
92
  isTopLevel: path.length < 1,
86
93
  rendererAppearance: props.rendererAppearance,
87
94
  fireAnalyticsEvent
88
- }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, undefined, localId, shouldDisplayExtensionAsInline, node);
95
+ }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
89
96
  }))));
90
97
  };
98
+ const BodiedExtensionWithTemporarySizing = props => {
99
+ var _props$parameters;
100
+ const {
101
+ presetMinHeight,
102
+ presetHeight,
103
+ hasExpired
104
+ } = useNodeHeight({
105
+ nodePresetMinHeight: props.nodePresetMinHeight,
106
+ node: props.extensionNode,
107
+ scheduleRemoval: props.scheduleExtensionHeightRemoval,
108
+ nodePresetHeight: props.nodePresetHeight,
109
+ hasViewportSize: hasExtensionViewportSize((_props$parameters = props.parameters) === null || _props$parameters === void 0 ? void 0 : _props$parameters.extensionId, props.extensionViewportSizes)
110
+ });
111
+ return /*#__PURE__*/React.createElement(BodiedExtensionContent
112
+ // eslint-disable-next-line react/jsx-props-no-spreading
113
+ , _extends({}, props, {
114
+ nodePresetMinHeight: presetMinHeight,
115
+ nodePresetHeight: presetHeight,
116
+ extensionViewportSizes: hasExpired || presetHeight !== undefined ? undefined : props.extensionViewportSizes
117
+ }));
118
+ };
119
+ const BodiedExtension = props => {
120
+ if (props.scheduleExtensionHeightRemoval) {
121
+ // eslint-disable-next-line react/jsx-props-no-spreading
122
+ return /*#__PURE__*/React.createElement(BodiedExtensionWithTemporarySizing, props);
123
+ }
124
+ // eslint-disable-next-line react/jsx-props-no-spreading
125
+ return /*#__PURE__*/React.createElement(BodiedExtensionContent, props);
126
+ };
91
127
  export default BodiedExtension;
@@ -19,6 +19,7 @@ import { useAnnotationRangeDispatch } from '../../ui/annotations/contexts/Annota
19
19
  import ExtensionRenderer from '../../ui/ExtensionRenderer';
20
20
  import { calcBreakoutWidthCss } from '../utils/breakout';
21
21
  import { ExtensionComments } from './extension-comments';
22
+ import { useNodeHeight } from './useNodeHeight';
22
23
  const FORGE_EXTENSION_TYPE = 'com.atlassian.ecosystem';
23
24
  /**
24
25
  * Mirrors `FORGE_INLINE_BODIED_PARAM` in `@atlassian/xen-editor-provider`. Duplicated rather than
@@ -35,6 +36,7 @@ const macroHeights = {
35
36
  large: '524px',
36
37
  xlarge: '1048px'
37
38
  };
39
+ export const hasExtensionViewportSize = (extensionId, extensionViewportSizes) => Boolean(extensionId && (extensionViewportSizes === null || extensionViewportSizes === void 0 ? void 0 : extensionViewportSizes.some(extension => extension.extensionId === extensionId && Boolean(extension.viewportSize))));
38
40
  const getViewportSize = (extensionId, extensionViewportSizes) => {
39
41
  if (!Array.isArray(extensionViewportSizes) || !extensionId) {
40
42
  return;
@@ -71,7 +73,7 @@ const FireExtensionAsInlineAnalytics = ({
71
73
  }, [fireAnalyticsEvent]);
72
74
  return null;
73
75
  };
74
- export const renderExtension = (content, layout, options = {}, removeOverflow, extensionId, extensionViewportSizes, nodeHeight, localId, shouldDisplayExtensionAsInline, node, isInsideOfInlineExtension) => {
76
+ export const renderExtension = (content, layout, options = {}, removeOverflow, extensionId, extensionViewportSizes, nodePresetMinHeight, localId, shouldDisplayExtensionAsInline, node, isInsideOfInlineExtension) => {
75
77
  var _node$parameters, _node$parameters$gues, _node$parameters2, _options$dataAttribut;
76
78
  const overflowContainerClass = !removeOverflow ? RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER : '';
77
79
 
@@ -93,7 +95,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
93
95
  * as the extension handler in CFE for legacy macros and Connect.
94
96
  */
95
97
  const viewportSize = getViewportSize(extensionId, extensionViewportSizes);
96
- const extensionHeight = nodeHeight || viewportSize;
98
+ const extensionHeight = nodePresetMinHeight || viewportSize;
97
99
  // Forge manifest heights already include px; Connect node heights are numeric strings.
98
100
  const extensionMinHeight = extensionHeight !== null && extensionHeight !== void 0 && extensionHeight.endsWith('px') && fg('confluence_forge_early_render_reserve_height') ? extensionHeight : extensionHeight && `${extensionHeight}px`;
99
101
  /**
@@ -140,6 +142,10 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
140
142
  ,
141
143
  className: `${RendererCssClassName.EXTENSION} ${inlineClassName} ${options.shadowClassNames} ${centerAlignClass}`,
142
144
  style: {
145
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Runtime preset height is omitted from the legacy style object.
146
+ ...(!isInline && options.height !== undefined ? {
147
+ height: options.height
148
+ } : {}),
143
149
  width: isInline ? undefined : (isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? isCustomLayout : isTopLevel) ?
144
150
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
145
151
  calcBreakoutWidthCss(layout) : isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? undefined : '100%',
@@ -284,6 +290,9 @@ const ExtensionContent = ({
284
290
  localId,
285
291
  isInsideOfInlineExtension
286
292
  } = props;
293
+ const presetOptions = props.scheduleExtensionHeightRemoval ? {
294
+ height: props.nodePresetHeight
295
+ } : {};
287
296
  return jsx(ExtensionRenderer
288
297
  // Ignored via go/ees005
289
298
  // eslint-disable-next-line react/jsx-props-no-spreading
@@ -304,6 +313,7 @@ const ExtensionContent = ({
304
313
  startPos: commentProps.startPos,
305
314
  marks: commentProps.marks
306
315
  }, result), layout, {
316
+ ...presetOptions,
307
317
  dataAttributes: props.dataAttributes,
308
318
  isTopLevel: path.length < 1,
309
319
  handleRef,
@@ -330,6 +340,7 @@ const ExtensionContent = ({
330
340
  startPos: commentProps.startPos,
331
341
  marks: commentProps.marks
332
342
  }, text || 'extension'), layout, {
343
+ ...presetOptions,
333
344
  dataAttributes: props.dataAttributes,
334
345
  isTopLevel: path.length < 1,
335
346
  handleRef,
@@ -340,7 +351,7 @@ const ExtensionContent = ({
340
351
  }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
341
352
  });
342
353
  };
343
- const Extension = props => {
354
+ const ExtensionView = props => {
344
355
  // Keep annotation context subscriptions out of the gate-off render path.
345
356
  if (fg('cc_maui_annotations_on_extensions')) {
346
357
  // eslint-disable-next-line react/jsx-props-no-spreading
@@ -349,6 +360,35 @@ const Extension = props => {
349
360
  // eslint-disable-next-line react/jsx-props-no-spreading
350
361
  return jsx(ExtensionContent, props);
351
362
  };
363
+ const ExtensionWithTemporarySizing = props => {
364
+ var _props$parameters;
365
+ const {
366
+ presetMinHeight,
367
+ presetHeight,
368
+ hasExpired
369
+ } = useNodeHeight({
370
+ nodePresetMinHeight: props.nodePresetMinHeight,
371
+ node: props.extensionNode,
372
+ scheduleRemoval: props.scheduleExtensionHeightRemoval,
373
+ nodePresetHeight: props.nodePresetHeight,
374
+ hasViewportSize: hasExtensionViewportSize((_props$parameters = props.parameters) === null || _props$parameters === void 0 ? void 0 : _props$parameters.extensionId, props.extensionViewportSizes)
375
+ });
376
+ return jsx(ExtensionView
377
+ // eslint-disable-next-line react/jsx-props-no-spreading
378
+ , _extends({}, props, {
379
+ nodeHeight: presetMinHeight,
380
+ nodePresetHeight: presetHeight,
381
+ extensionViewportSizes: hasExpired || presetHeight !== undefined ? undefined : props.extensionViewportSizes
382
+ }));
383
+ };
384
+ const Extension = props => {
385
+ if (props.scheduleExtensionHeightRemoval) {
386
+ // eslint-disable-next-line react/jsx-props-no-spreading
387
+ return jsx(ExtensionWithTemporarySizing, props);
388
+ }
389
+ // eslint-disable-next-line react/jsx-props-no-spreading
390
+ return jsx(ExtensionView, props);
391
+ };
352
392
  const _default_1 = overflowShadow(Extension, {
353
393
  overflowSelector: `.${RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER}`
354
394
  });
@@ -0,0 +1,31 @@
1
+ import { useEffect, useState } from 'react';
2
+
3
+ /** Hosts independently schedule each sizing property and return cleanup when scheduled. */
4
+
5
+ const useHeightExpiry = (value, property, node, scheduleRemoval) => {
6
+ const [expired, setExpired] = useState(false);
7
+ useEffect(() => {
8
+ setExpired(false);
9
+ if (value === undefined || !node || !scheduleRemoval) return;
10
+ return scheduleRemoval(node, () => setExpired(true), property);
11
+ }, [value, property, node, scheduleRemoval]);
12
+ return expired;
13
+ };
14
+ export const useNodeHeight = ({
15
+ nodePresetMinHeight,
16
+ nodePresetHeight,
17
+ node,
18
+ scheduleRemoval,
19
+ hasViewportSize = false
20
+ }) => {
21
+ const ignorePresets = hasViewportSize && !!scheduleRemoval;
22
+ const presetMinHeight = ignorePresets ? undefined : nodePresetMinHeight;
23
+ const presetHeight = ignorePresets ? undefined : nodePresetHeight;
24
+ const minHeightExpired = useHeightExpiry(presetMinHeight, 'minHeight', node, scheduleRemoval);
25
+ const heightExpired = useHeightExpiry(presetHeight, 'height', node, scheduleRemoval);
26
+ return {
27
+ presetMinHeight: minHeightExpired ? undefined : presetMinHeight,
28
+ presetHeight: heightExpired ? undefined : presetHeight,
29
+ hasExpired: minHeightExpired || heightExpired
30
+ };
31
+ };
@@ -375,7 +375,7 @@ function Expand({
375
375
  focused: focused
376
376
  // Comment surfaces (Jira description and comments) have no gutter for the expand to sit in.
377
377
  ,
378
- useStandardWidth: (fg('platform_editor_expand_standard_width_fix') || isExperimentEnabled('work_item_modernization')) && rendererAppearance === 'comment'
378
+ useStandardWidth: (fg('platform_editor_expand_standard_width_fix') || isExperimentEnabled('work_item_modernization') || fg('wiv_modernization_cohort')) && rendererAppearance === 'comment'
379
379
  }, nestedHeaderIds && nestedHeaderIds.length > 0 ? jsx(ActiveHeaderIdConsumer, {
380
380
  nestedHeaderIds: nestedHeaderIds,
381
381
  onNestedHeaderIdMatch: openBody
@@ -65,7 +65,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
65
65
  const TABLE_INFO_TIMEOUT = 10000;
66
66
  const RENDER_EVENT_SAMPLE_RATE = 0.1;
67
67
  const packageName = "@atlaskit/renderer";
68
- const packageVersion = "153.0.8";
68
+ const packageVersion = "153.2.0";
69
69
  const setAsQueryContainerStyles = css({
70
70
  containerName: 'ak-renderer-wrapper',
71
71
  containerType: 'inline-size'
@@ -266,7 +266,9 @@ export const RendererFunctionalComponent = props => {
266
266
  emojiResourceConfig: props.emojiResourceConfig,
267
267
  smartLinks: props.smartLinks,
268
268
  extensionViewportSizes: props.extensionViewportSizes,
269
+ getExtensionPresetHeight: props.getExtensionPresetHeight,
269
270
  getExtensionHeight: props.getExtensionHeight,
271
+ scheduleExtensionHeightRemoval: props.scheduleExtensionHeightRemoval,
270
272
  allowCopyToClipboard: props.allowCopyToClipboard,
271
273
  allowDownloadCodeBlock: props.allowDownloadCodeBlock,
272
274
  allowWrapCodeBlock: props.allowWrapCodeBlock,
@@ -223,7 +223,9 @@ var ReactSerializer = /*#__PURE__*/function () {
223
223
  this.smartLinks = init.smartLinks;
224
224
  this.extensionViewportSizes = init.extensionViewportSizes;
225
225
  this.hideExtensionKeysWhilePending = init.hideExtensionKeysWhilePending;
226
+ this.getExtensionPresetHeight = init.getExtensionPresetHeight;
226
227
  this.getExtensionHeight = init.getExtensionHeight;
228
+ this.scheduleExtensionHeightRemoval = init.scheduleExtensionHeightRemoval;
227
229
  this.allowSelectAllTrap = init.allowSelectAllTrap;
228
230
  this.nodeComponents = init.nodeComponents;
229
231
  this.allowWindowedCodeBlock = init.allowWindowedCodeBlock;
@@ -570,9 +572,9 @@ var ReactSerializer = /*#__PURE__*/function () {
570
572
  }, {
571
573
  key: "getExtensionProps",
572
574
  value: function getExtensionProps(node) {
573
- var _this$getExtensionHei;
575
+ var _this$getExtensionHei, _this$getExtensionPre;
574
576
  var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
575
- return _objectSpread(_objectSpread({}, this.getProps(node, path)), {}, {
577
+ var extensionProps = _objectSpread(_objectSpread({}, this.getProps(node, path)), {}, {
576
578
  allowAnnotations: this.allowAnnotations,
577
579
  allowAnnotationsDraftMode: this.surroundTextNodesWithTextWrapper,
578
580
  extensionNode: node,
@@ -581,6 +583,12 @@ var ReactSerializer = /*#__PURE__*/function () {
581
583
  nodeHeight: (_this$getExtensionHei = this.getExtensionHeight) === null || _this$getExtensionHei === void 0 ? void 0 : _this$getExtensionHei.call(this, node),
582
584
  shouldDisplayExtensionAsInline: this.shouldDisplayExtensionAsInline
583
585
  });
586
+ if (!this.scheduleExtensionHeightRemoval) return extensionProps;
587
+ return _objectSpread(_objectSpread({}, extensionProps), {}, {
588
+ nodePresetMinHeight: extensionProps.nodeHeight,
589
+ nodePresetHeight: (_this$getExtensionPre = this.getExtensionPresetHeight) === null || _this$getExtensionPre === void 0 ? void 0 : _this$getExtensionPre.call(this, node),
590
+ scheduleExtensionHeightRemoval: this.scheduleExtensionHeightRemoval
591
+ });
584
592
  }
585
593
  }, {
586
594
  key: "getEmojiProps",
@@ -1,4 +1,7 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
+ import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
+ 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
+ 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; }
2
5
  import React, { useMemo } from 'react';
3
6
  import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
4
7
  import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics/types/enums';
@@ -8,10 +11,11 @@ import { AnnotationsPositionContext } from '../../ui/annotations';
8
11
  import ExtensionRenderer from '../../ui/ExtensionRenderer';
9
12
  import { ErrorBoundary } from '../../ui/Renderer/ErrorBoundary';
10
13
  import { ValidationContextProvider } from '../../ui/Renderer/ValidationContext';
11
- import { renderExtension } from './extension';
14
+ import { hasExtensionViewportSize, renderExtension } from './extension';
12
15
  import ForgeBodiedExtensionHandoff from './ForgeBodiedExtensionHandoff';
13
16
  import { FORGE_BODIED_EXTENSION_HANDOFF_KEYS } from './forgeBodiedExtensionHandoffConfig';
14
- var BodiedExtension = function BodiedExtension(props) {
17
+ import { useNodeHeight } from './useNodeHeight';
18
+ var BodiedExtensionContent = function BodiedExtensionContent(props) {
15
19
  var children = props.children,
16
20
  _props$layout = props.layout,
17
21
  layout = _props$layout === void 0 ? 'default' : _props$layout,
@@ -24,6 +28,10 @@ var BodiedExtension = function BodiedExtension(props) {
24
28
  localId = props.localId,
25
29
  shouldDisplayExtensionAsInline = props.shouldDisplayExtensionAsInline,
26
30
  fireAnalyticsEvent = props.fireAnalyticsEvent;
31
+ var presetOptions = props.scheduleExtensionHeightRemoval ? {
32
+ height: props.nodePresetHeight
33
+ } : {};
34
+ var presetMinHeight = props.scheduleExtensionHeightRemoval ? props.nodePresetMinHeight : undefined;
27
35
  var _useAnalyticsEvents = useAnalyticsEvents(),
28
36
  createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
29
37
  var removeOverflow = React.Children.toArray(children)
@@ -71,11 +79,11 @@ var BodiedExtension = function BodiedExtension(props) {
71
79
  try {
72
80
  if (result && /*#__PURE__*/React.isValidElement(result)) {
73
81
  // Return the content directly if it's a valid JSX.Element
74
- return renderExtension(result, layout, {
82
+ return renderExtension(result, layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
75
83
  isTopLevel: path.length < 1,
76
84
  rendererAppearance: props.rendererAppearance,
77
85
  fireAnalyticsEvent: fireAnalyticsEvent
78
- }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, undefined, localId, shouldDisplayExtensionAsInline, node);
86
+ }), removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
79
87
  }
80
88
  } catch (_unused) {
81
89
  /** We don't want this error to block renderer */
@@ -83,11 +91,39 @@ var BodiedExtension = function BodiedExtension(props) {
83
91
  }
84
92
 
85
93
  // Always return default content if anything goes wrong
86
- return renderExtension(children, layout, {
94
+ return renderExtension(children, layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
87
95
  isTopLevel: path.length < 1,
88
96
  rendererAppearance: props.rendererAppearance,
89
97
  fireAnalyticsEvent: fireAnalyticsEvent
90
- }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, undefined, localId, shouldDisplayExtensionAsInline, node);
98
+ }), removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, presetMinHeight, localId, shouldDisplayExtensionAsInline, node);
91
99
  }))));
92
100
  };
101
+ var BodiedExtensionWithTemporarySizing = function BodiedExtensionWithTemporarySizing(props) {
102
+ var _props$parameters;
103
+ var _useNodeHeight = useNodeHeight({
104
+ nodePresetMinHeight: props.nodePresetMinHeight,
105
+ node: props.extensionNode,
106
+ scheduleRemoval: props.scheduleExtensionHeightRemoval,
107
+ nodePresetHeight: props.nodePresetHeight,
108
+ hasViewportSize: hasExtensionViewportSize((_props$parameters = props.parameters) === null || _props$parameters === void 0 ? void 0 : _props$parameters.extensionId, props.extensionViewportSizes)
109
+ }),
110
+ presetMinHeight = _useNodeHeight.presetMinHeight,
111
+ presetHeight = _useNodeHeight.presetHeight,
112
+ hasExpired = _useNodeHeight.hasExpired;
113
+ return /*#__PURE__*/React.createElement(BodiedExtensionContent
114
+ // eslint-disable-next-line react/jsx-props-no-spreading
115
+ , _extends({}, props, {
116
+ nodePresetMinHeight: presetMinHeight,
117
+ nodePresetHeight: presetHeight,
118
+ extensionViewportSizes: hasExpired || presetHeight !== undefined ? undefined : props.extensionViewportSizes
119
+ }));
120
+ };
121
+ var BodiedExtension = function BodiedExtension(props) {
122
+ if (props.scheduleExtensionHeightRemoval) {
123
+ // eslint-disable-next-line react/jsx-props-no-spreading
124
+ return /*#__PURE__*/React.createElement(BodiedExtensionWithTemporarySizing, props);
125
+ }
126
+ // eslint-disable-next-line react/jsx-props-no-spreading
127
+ return /*#__PURE__*/React.createElement(BodiedExtensionContent, props);
128
+ };
93
129
  export default BodiedExtension;
@@ -1,7 +1,7 @@
1
- import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
1
  import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
3
2
  import _extends from "@babel/runtime/helpers/extends";
4
3
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
4
+ import _defineProperty from "@babel/runtime/helpers/defineProperty";
5
5
  var _excluded = ["commentProps", "commentTargetOptions"];
6
6
  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; }
7
7
  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; }
@@ -25,6 +25,7 @@ import { useAnnotationRangeDispatch } from '../../ui/annotations/contexts/Annota
25
25
  import ExtensionRenderer from '../../ui/ExtensionRenderer';
26
26
  import { calcBreakoutWidthCss } from '../utils/breakout';
27
27
  import { ExtensionComments } from './extension-comments';
28
+ import { useNodeHeight } from './useNodeHeight';
28
29
  var FORGE_EXTENSION_TYPE = 'com.atlassian.ecosystem';
29
30
  /**
30
31
  * Mirrors `FORGE_INLINE_BODIED_PARAM` in `@atlassian/xen-editor-provider`. Duplicated rather than
@@ -41,6 +42,11 @@ var macroHeights = {
41
42
  large: '524px',
42
43
  xlarge: '1048px'
43
44
  };
45
+ export var hasExtensionViewportSize = function hasExtensionViewportSize(extensionId, extensionViewportSizes) {
46
+ return Boolean(extensionId && (extensionViewportSizes === null || extensionViewportSizes === void 0 ? void 0 : extensionViewportSizes.some(function (extension) {
47
+ return extension.extensionId === extensionId && Boolean(extension.viewportSize);
48
+ })));
49
+ };
44
50
  var getViewportSize = function getViewportSize(extensionId, extensionViewportSizes) {
45
51
  if (!Array.isArray(extensionViewportSizes) || !extensionId) {
46
52
  return;
@@ -84,7 +90,7 @@ export var renderExtension = function renderExtension(content, layout) {
84
90
  var removeOverflow = arguments.length > 3 ? arguments[3] : undefined;
85
91
  var extensionId = arguments.length > 4 ? arguments[4] : undefined;
86
92
  var extensionViewportSizes = arguments.length > 5 ? arguments[5] : undefined;
87
- var nodeHeight = arguments.length > 6 ? arguments[6] : undefined;
93
+ var nodePresetMinHeight = arguments.length > 6 ? arguments[6] : undefined;
88
94
  var localId = arguments.length > 7 ? arguments[7] : undefined;
89
95
  var shouldDisplayExtensionAsInline = arguments.length > 8 ? arguments[8] : undefined;
90
96
  var node = arguments.length > 9 ? arguments[9] : undefined;
@@ -109,7 +115,7 @@ export var renderExtension = function renderExtension(content, layout) {
109
115
  * as the extension handler in CFE for legacy macros and Connect.
110
116
  */
111
117
  var viewportSize = getViewportSize(extensionId, extensionViewportSizes);
112
- var extensionHeight = nodeHeight || viewportSize;
118
+ var extensionHeight = nodePresetMinHeight || viewportSize;
113
119
  // Forge manifest heights already include px; Connect node heights are numeric strings.
114
120
  var extensionMinHeight = extensionHeight !== null && extensionHeight !== void 0 && extensionHeight.endsWith('px') && fg('confluence_forge_early_render_reserve_height') ? extensionHeight : extensionHeight && "".concat(extensionHeight, "px");
115
121
  /**
@@ -155,13 +161,15 @@ export var renderExtension = function renderExtension(content, layout) {
155
161
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
156
162
  ,
157
163
  className: "".concat(RendererCssClassName.EXTENSION, " ").concat(inlineClassName, " ").concat(options.shadowClassNames, " ").concat(centerAlignClass),
158
- style: {
164
+ style: _objectSpread(_objectSpread({}, !isInline && options.height !== undefined ? {
165
+ height: options.height
166
+ } : {}), {}, {
159
167
  width: isInline ? undefined : (isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? isCustomLayout : isTopLevel) ?
160
168
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
161
169
  calcBreakoutWidthCss(layout) : isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? undefined : '100%',
162
170
  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
163
171
  minHeight: isInline ? undefined : extensionMinHeight
164
- },
172
+ }),
165
173
  "data-layout": layout,
166
174
  "data-local-id": localId,
167
175
  "data-renderer-start-pos": (_options$dataAttribut = options.dataAttributes) === null || _options$dataAttribut === void 0 ? void 0 : _options$dataAttribut['data-renderer-start-pos'],
@@ -305,6 +313,9 @@ var ExtensionContent = function ExtensionContent(_ref3) {
305
313
  nodeHeight = props.nodeHeight,
306
314
  localId = props.localId,
307
315
  isInsideOfInlineExtension = props.isInsideOfInlineExtension;
316
+ var presetOptions = props.scheduleExtensionHeightRemoval ? {
317
+ height: props.nodePresetHeight
318
+ } : {};
308
319
  return jsx(ExtensionRenderer
309
320
  // Ignored via go/ees005
310
321
  // eslint-disable-next-line react/jsx-props-no-spreading
@@ -323,7 +334,7 @@ var ExtensionContent = function ExtensionContent(_ref3) {
323
334
  allowAnnotationsDraftMode: commentProps.allowAnnotationsDraftMode,
324
335
  startPos: commentProps.startPos,
325
336
  marks: commentProps.marks
326
- }, result), layout, _objectSpread({
337
+ }, result), layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
327
338
  dataAttributes: props.dataAttributes,
328
339
  isTopLevel: path.length < 1,
329
340
  handleRef: handleRef,
@@ -348,7 +359,7 @@ var ExtensionContent = function ExtensionContent(_ref3) {
348
359
  allowAnnotationsDraftMode: commentProps.allowAnnotationsDraftMode,
349
360
  startPos: commentProps.startPos,
350
361
  marks: commentProps.marks
351
- }, text || 'extension'), layout, _objectSpread({
362
+ }, text || 'extension'), layout, _objectSpread(_objectSpread({}, presetOptions), {}, {
352
363
  dataAttributes: props.dataAttributes,
353
364
  isTopLevel: path.length < 1,
354
365
  handleRef: handleRef,
@@ -358,7 +369,7 @@ var ExtensionContent = function ExtensionContent(_ref3) {
358
369
  }, commentTargetOptions), undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
359
370
  });
360
371
  };
361
- var Extension = function Extension(props) {
372
+ var ExtensionView = function ExtensionView(props) {
362
373
  // Keep annotation context subscriptions out of the gate-off render path.
363
374
  if (fg('cc_maui_annotations_on_extensions')) {
364
375
  // eslint-disable-next-line react/jsx-props-no-spreading
@@ -367,6 +378,34 @@ var Extension = function Extension(props) {
367
378
  // eslint-disable-next-line react/jsx-props-no-spreading
368
379
  return jsx(ExtensionContent, props);
369
380
  };
381
+ var ExtensionWithTemporarySizing = function ExtensionWithTemporarySizing(props) {
382
+ var _props$parameters;
383
+ var _useNodeHeight = useNodeHeight({
384
+ nodePresetMinHeight: props.nodePresetMinHeight,
385
+ node: props.extensionNode,
386
+ scheduleRemoval: props.scheduleExtensionHeightRemoval,
387
+ nodePresetHeight: props.nodePresetHeight,
388
+ hasViewportSize: hasExtensionViewportSize((_props$parameters = props.parameters) === null || _props$parameters === void 0 ? void 0 : _props$parameters.extensionId, props.extensionViewportSizes)
389
+ }),
390
+ presetMinHeight = _useNodeHeight.presetMinHeight,
391
+ presetHeight = _useNodeHeight.presetHeight,
392
+ hasExpired = _useNodeHeight.hasExpired;
393
+ return jsx(ExtensionView
394
+ // eslint-disable-next-line react/jsx-props-no-spreading
395
+ , _extends({}, props, {
396
+ nodeHeight: presetMinHeight,
397
+ nodePresetHeight: presetHeight,
398
+ extensionViewportSizes: hasExpired || presetHeight !== undefined ? undefined : props.extensionViewportSizes
399
+ }));
400
+ };
401
+ var Extension = function Extension(props) {
402
+ if (props.scheduleExtensionHeightRemoval) {
403
+ // eslint-disable-next-line react/jsx-props-no-spreading
404
+ return jsx(ExtensionWithTemporarySizing, props);
405
+ }
406
+ // eslint-disable-next-line react/jsx-props-no-spreading
407
+ return jsx(ExtensionView, props);
408
+ };
370
409
  var _default_1 = overflowShadow(Extension, {
371
410
  overflowSelector: ".".concat(RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER)
372
411
  });
@@ -0,0 +1,37 @@
1
+ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
2
+ import { useEffect, useState } from 'react';
3
+
4
+ /** Hosts independently schedule each sizing property and return cleanup when scheduled. */
5
+
6
+ var useHeightExpiry = function useHeightExpiry(value, property, node, scheduleRemoval) {
7
+ var _useState = useState(false),
8
+ _useState2 = _slicedToArray(_useState, 2),
9
+ expired = _useState2[0],
10
+ setExpired = _useState2[1];
11
+ useEffect(function () {
12
+ setExpired(false);
13
+ if (value === undefined || !node || !scheduleRemoval) return;
14
+ return scheduleRemoval(node, function () {
15
+ return setExpired(true);
16
+ }, property);
17
+ }, [value, property, node, scheduleRemoval]);
18
+ return expired;
19
+ };
20
+ export var useNodeHeight = function useNodeHeight(_ref) {
21
+ var nodePresetMinHeight = _ref.nodePresetMinHeight,
22
+ nodePresetHeight = _ref.nodePresetHeight,
23
+ node = _ref.node,
24
+ scheduleRemoval = _ref.scheduleRemoval,
25
+ _ref$hasViewportSize = _ref.hasViewportSize,
26
+ hasViewportSize = _ref$hasViewportSize === void 0 ? false : _ref$hasViewportSize;
27
+ var ignorePresets = hasViewportSize && !!scheduleRemoval;
28
+ var presetMinHeight = ignorePresets ? undefined : nodePresetMinHeight;
29
+ var presetHeight = ignorePresets ? undefined : nodePresetHeight;
30
+ var minHeightExpired = useHeightExpiry(presetMinHeight, 'minHeight', node, scheduleRemoval);
31
+ var heightExpired = useHeightExpiry(presetHeight, 'height', node, scheduleRemoval);
32
+ return {
33
+ presetMinHeight: minHeightExpired ? undefined : presetMinHeight,
34
+ presetHeight: heightExpired ? undefined : presetHeight,
35
+ hasExpired: minHeightExpired || heightExpired
36
+ };
37
+ };
@@ -390,7 +390,7 @@ function Expand(_ref) {
390
390
  focused: focused
391
391
  // Comment surfaces (Jira description and comments) have no gutter for the expand to sit in.
392
392
  ,
393
- useStandardWidth: (fg('platform_editor_expand_standard_width_fix') || isExperimentEnabled('work_item_modernization')) && rendererAppearance === 'comment'
393
+ useStandardWidth: (fg('platform_editor_expand_standard_width_fix') || isExperimentEnabled('work_item_modernization') || fg('wiv_modernization_cohort')) && rendererAppearance === 'comment'
394
394
  }, nestedHeaderIds && nestedHeaderIds.length > 0 ? jsx(ActiveHeaderIdConsumer, {
395
395
  nestedHeaderIds: nestedHeaderIds,
396
396
  onNestedHeaderIdMatch: openBody
@@ -70,7 +70,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
70
70
  var TABLE_INFO_TIMEOUT = 10000;
71
71
  var RENDER_EVENT_SAMPLE_RATE = 0.1;
72
72
  var packageName = "@atlaskit/renderer";
73
- var packageVersion = "153.0.8";
73
+ var packageVersion = "153.2.0";
74
74
  var setAsQueryContainerStyles = css({
75
75
  containerName: 'ak-renderer-wrapper',
76
76
  containerType: 'inline-size'
@@ -265,7 +265,9 @@ export var RendererFunctionalComponent = function RendererFunctionalComponent(pr
265
265
  emojiResourceConfig: props.emojiResourceConfig,
266
266
  smartLinks: props.smartLinks,
267
267
  extensionViewportSizes: props.extensionViewportSizes,
268
+ getExtensionPresetHeight: props.getExtensionPresetHeight,
268
269
  getExtensionHeight: props.getExtensionHeight,
270
+ scheduleExtensionHeightRemoval: props.scheduleExtensionHeightRemoval,
269
271
  allowCopyToClipboard: props.allowCopyToClipboard,
270
272
  allowDownloadCodeBlock: props.allowDownloadCodeBlock,
271
273
  allowWrapCodeBlock: props.allowWrapCodeBlock,
@@ -12,6 +12,7 @@ import type { Serializer } from '../serializer';
12
12
  import type { MediaOptions } from '../types/mediaOptions';
13
13
  import type { SmartLinksOptions } from '../types/smartLinksOptions';
14
14
  import type { HeadingAnchorLinksProps, NodeComponentsProps, RendererAppearance, RendererContentMode, StickyHeaderConfig } from '../ui/Renderer/types';
15
+ import type { ScheduleExtensionHeightRemoval } from './nodes/useNodeHeight';
15
16
  import type { ExtensionViewportSize, RendererContext, TextHighlighter } from './types';
16
17
  export interface ReactSerializerInit {
17
18
  allowAltTextOnImages?: boolean;
@@ -41,6 +42,7 @@ export interface ReactSerializerInit {
41
42
  extensionViewportSizes?: ExtensionViewportSize[];
42
43
  fireAnalyticsEvent?: (event: AnalyticsEventPayload) => void;
43
44
  getExtensionHeight?: GetPMNodeHeight;
45
+ getExtensionPresetHeight?: (node: Node) => number | undefined;
44
46
  headingIdPrefix?: string;
45
47
  hideExtensionKeysWhilePending?: string[];
46
48
  isInsideOfInlineExtension?: boolean;
@@ -54,6 +56,7 @@ export interface ReactSerializerInit {
54
56
  onSetLinkTarget?: (url: string) => '_blank' | undefined;
55
57
  portal?: HTMLElement;
56
58
  providers?: ProviderFactory;
59
+ scheduleExtensionHeightRemoval?: ScheduleExtensionHeightRemoval;
57
60
  shouldDisplayExtensionAsInline?: (extensionParams: ExtensionParams<Parameters>) => boolean;
58
61
  shouldOpenMediaViewer?: boolean;
59
62
  showHeadingNumbers?: boolean;
@@ -121,7 +124,9 @@ export default class ReactSerializer implements Serializer<JSX.Element> {
121
124
  private smartLinks?;
122
125
  private extensionViewportSizes?;
123
126
  private hideExtensionKeysWhilePending?;
127
+ private getExtensionPresetHeight?;
124
128
  private getExtensionHeight?;
129
+ private scheduleExtensionHeightRemoval?;
125
130
  private allowAnnotations;
126
131
  private allowSelectAllTrap?;
127
132
  private nodeComponents?;
@@ -8,9 +8,11 @@ import type { AnalyticsEventPayload } from '../../analytics/events';
8
8
  import type { Serializer } from '../../serializer';
9
9
  import type { RendererAppearance } from '../../ui/Renderer/types';
10
10
  import type { RendererContext, ExtensionViewportSize } from '../types';
11
+ import { type ScheduleExtensionHeightRemoval } from './useNodeHeight';
11
12
  interface Props {
12
13
  extensionHandlers?: ExtensionHandlers;
13
14
  extensionKey: string;
15
+ extensionNode?: PMNode;
14
16
  extensionType: string;
15
17
  extensionViewportSizes?: ExtensionViewportSize[];
16
18
  fireAnalyticsEvent?: (event: AnalyticsEventPayload) => void;
@@ -18,12 +20,15 @@ interface Props {
18
20
  layout?: ExtensionLayout;
19
21
  localId?: string;
20
22
  marks?: PMMark[];
23
+ nodePresetHeight?: number;
24
+ nodePresetMinHeight?: string;
21
25
  originalContent?: any;
22
26
  parameters?: any;
23
27
  path?: PMNode[];
24
28
  providers: ProviderFactory;
25
29
  rendererAppearance?: RendererAppearance;
26
30
  rendererContext: RendererContext;
31
+ scheduleExtensionHeightRemoval?: ScheduleExtensionHeightRemoval;
27
32
  serializer: Serializer<any>;
28
33
  shouldDisplayExtensionAsInline?: (extensionParams?: ExtensionParams<Parameters>) => boolean;
29
34
  startPos: number;
@@ -12,6 +12,7 @@ import type { Mark as PMMark, Node as PMNode } from '@atlaskit/editor-prosemirro
12
12
  import type { AnalyticsEventPayload } from '../../analytics/events';
13
13
  import type { RendererAppearance } from '../../ui/Renderer/types';
14
14
  import type { RendererContext, ExtensionViewportSize } from '../types';
15
+ import { type ScheduleExtensionHeightRemoval } from './useNodeHeight';
15
16
  interface Props {
16
17
  allowAnnotations?: boolean;
17
18
  allowAnnotationsDraftMode?: boolean;
@@ -35,11 +36,14 @@ interface Props {
35
36
  localId?: string;
36
37
  marks?: PMMark[];
37
38
  nodeHeight?: string;
39
+ nodePresetHeight?: number;
40
+ nodePresetMinHeight?: string;
38
41
  parameters?: any;
39
42
  path?: PMNode[];
40
43
  providers: ProviderFactory;
41
44
  rendererAppearance?: RendererAppearance;
42
45
  rendererContext: RendererContext;
46
+ scheduleExtensionHeightRemoval?: ScheduleExtensionHeightRemoval;
43
47
  shouldDisplayExtensionAsInline?: (extensionParams?: ExtensionParams<Parameters>) => boolean;
44
48
  text?: string;
45
49
  }
@@ -49,6 +53,7 @@ type AllOrNone<T> = T | {
49
53
  type RenderExtensionOptions = {
50
54
  dataAttributes?: Props['dataAttributes'];
51
55
  fireAnalyticsEvent?: (event: AnalyticsEventPayload) => void;
56
+ height?: number;
52
57
  isCommentTarget?: boolean;
53
58
  isTopLevel?: boolean;
54
59
  onBlur?: React.FocusEventHandler<HTMLDivElement>;
@@ -57,6 +62,7 @@ type RenderExtensionOptions = {
57
62
  onMouseLeave?: React.MouseEventHandler<HTMLDivElement>;
58
63
  rendererAppearance?: RendererAppearance;
59
64
  } & AllOrNone<OverflowShadowProps>;
60
- export declare const renderExtension: (content: any, layout: ExtensionLayout, options?: RenderExtensionOptions, removeOverflow?: boolean, extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[], nodeHeight?: string, localId?: string, shouldDisplayExtensionAsInline?: (extensionParams?: ExtensionParams<Parameters>) => boolean, node?: ExtensionParams<Parameters>, isInsideOfInlineExtension?: boolean) => React.JSX.Element;
65
+ export declare const hasExtensionViewportSize: (extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[]) => boolean;
66
+ export declare const renderExtension: (content: any, layout: ExtensionLayout, options?: RenderExtensionOptions, removeOverflow?: boolean, extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[], nodePresetMinHeight?: string, localId?: string, shouldDisplayExtensionAsInline?: (extensionParams?: ExtensionParams<Parameters>) => boolean, node?: ExtensionParams<Parameters>, isInsideOfInlineExtension?: boolean) => React.JSX.Element;
61
67
  declare const _default_1: React.ComponentClass<Props & OverflowShadowProps, OverflowShadowState>;
62
68
  export default _default_1;
@@ -0,0 +1,16 @@
1
+ import type { Node } from '@atlaskit/editor-prosemirror/model';
2
+ /** Hosts independently schedule each sizing property and return cleanup when scheduled. */
3
+ export type ScheduleExtensionHeightRemoval = (node: Node, remove: () => void, property: 'height' | 'minHeight') => (() => void) | undefined;
4
+ type UseNodeHeightOptions = {
5
+ hasViewportSize?: boolean;
6
+ node?: Node;
7
+ nodePresetHeight?: number;
8
+ nodePresetMinHeight?: string;
9
+ scheduleRemoval?: ScheduleExtensionHeightRemoval;
10
+ };
11
+ export declare const useNodeHeight: ({ nodePresetMinHeight, nodePresetHeight, node, scheduleRemoval, hasViewportSize, }: UseNodeHeightOptions) => {
12
+ hasExpired: boolean;
13
+ presetHeight: number | undefined;
14
+ presetMinHeight: string | undefined;
15
+ };
16
+ export {};
@@ -9,10 +9,11 @@ import type ProviderFactory from '@atlaskit/editor-common/provider-factory/provi
9
9
  import type { AnnotationProviders } from '@atlaskit/editor-common/types/annotation';
10
10
  import type { UnsupportedContentLevelsTracking } from '@atlaskit/editor-common/utils/get-unsupported-content-level-data';
11
11
  import type { ADFStage } from '@atlaskit/editor-common/utils/validator';
12
- import type { Schema } from '@atlaskit/editor-prosemirror/model';
12
+ import type { Node, Schema } from '@atlaskit/editor-prosemirror/model';
13
13
  import type { EmojiResourceConfig } from '@atlaskit/emoji/emoji-resource';
14
14
  import type { EmojiProviderLookupOrder } from '@atlaskit/emoji/types';
15
15
  import type { ReactSerializerInit, RendererContext, Serializer } from '../';
16
+ import type { ScheduleExtensionHeightRemoval } from '../react/nodes/useNodeHeight';
16
17
  import type { TextHighlighter, ExtensionViewportSize } from '../react/types';
17
18
  import type { RenderOutputStat } from '../render-document';
18
19
  import type { MediaOptions } from '../types/mediaOptions';
@@ -143,6 +144,8 @@ export interface RendererProps {
143
144
  [featureFlag: string]: boolean;
144
145
  } | Partial<RawObjectFeatureFlags>;
145
146
  getExtensionHeight?: GetPMNodeHeight;
147
+ /** Optional fixed CSS height in pixels, used when scheduleExtensionHeightRemoval is supplied. */
148
+ getExtensionPresetHeight?: (node: Node) => number | undefined;
146
149
  /**
147
150
  * Optional prefix to prepend to all generated heading IDs.
148
151
  * Used by nested renderers to namespace heading IDs and avoid collisions with the host page.
@@ -203,6 +206,8 @@ export interface RendererProps {
203
206
  onSetLinkTarget?: (url: string) => '_blank' | undefined;
204
207
  portal?: HTMLElement;
205
208
  rendererContext?: RendererContext;
209
+ /** Activates temporary extension sizing and schedules each height/min-height expiry independently after hydration; return cleanup when scheduled. */
210
+ scheduleExtensionHeightRemoval?: ScheduleExtensionHeightRemoval;
206
211
  schema?: Schema;
207
212
  /**
208
213
  * Optional callback to scroll an element into view when using block links (#block-xxx).
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "153.1.0",
3
+ "version": "153.2.1",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -49,14 +49,14 @@
49
49
  "@atlaskit/editor-prosemirror": "^9.0.0",
50
50
  "@atlaskit/editor-shared-styles": "^4.6.0",
51
51
  "@atlaskit/editor-smart-link-draggable": "^1.2.0",
52
- "@atlaskit/emoji": "^73.2.0",
53
- "@atlaskit/feature-gate-js-client": "^7.0.0",
52
+ "@atlaskit/emoji": "^73.3.0",
53
+ "@atlaskit/feature-gate-js-client": "^7.1.0",
54
54
  "@atlaskit/icon": "^38.0.0",
55
55
  "@atlaskit/link": "^5.1.0",
56
- "@atlaskit/link-datasource": "^7.8.0",
56
+ "@atlaskit/link-datasource": "^7.10.0",
57
57
  "@atlaskit/link-extractors": "^5.0.0",
58
58
  "@atlaskit/linking-common": "^13.0.0",
59
- "@atlaskit/media-card": "^82.1.0",
59
+ "@atlaskit/media-card": "^82.2.0",
60
60
  "@atlaskit/media-client": "^39.3.0",
61
61
  "@atlaskit/media-client-react": "^7.0.0",
62
62
  "@atlaskit/media-common": "^14.7.0",
@@ -68,10 +68,10 @@
68
68
  "@atlaskit/platform-feature-flags-react": "^1.2.0",
69
69
  "@atlaskit/react-compiler-gating": "^0.2.0",
70
70
  "@atlaskit/react-ufo": "^8.3.0",
71
- "@atlaskit/smart-card": "^46.10.0",
71
+ "@atlaskit/smart-card": "^46.11.0",
72
72
  "@atlaskit/status": "^5.15.0",
73
73
  "@atlaskit/task-decision": "^21.14.0",
74
- "@atlaskit/tmp-editor-statsig": "^248.0.0",
74
+ "@atlaskit/tmp-editor-statsig": "^248.1.0",
75
75
  "@atlaskit/tokens": "^20.8.0",
76
76
  "@atlaskit/tooltip": "^24.4.0",
77
77
  "@atlaskit/visually-hidden": "^4.4.0",
@@ -98,7 +98,7 @@
98
98
  "@af/visual-regression": "workspace:^",
99
99
  "@atlaskit/analytics-gas-types": "^6.2.0",
100
100
  "@atlaskit/checkbox": "^19.3.0",
101
- "@atlaskit/editor-plugin-media": "^32.1.0",
101
+ "@atlaskit/editor-plugin-media": "^32.2.0",
102
102
  "@atlaskit/editor-test-helpers": "workspace:^",
103
103
  "@atlaskit/inline-edit": "^16.4.0",
104
104
  "@atlaskit/json-ld-types": "^2.1.0",
@@ -109,7 +109,7 @@
109
109
  "@atlaskit/media-integration-test-helpers": "workspace:^",
110
110
  "@atlaskit/media-state": "^4.0.0",
111
111
  "@atlaskit/media-test-helpers": "^43.0.0",
112
- "@atlaskit/mention": "^30.6.0",
112
+ "@atlaskit/mention": "^30.7.0",
113
113
  "@atlaskit/modal-dialog": "^17.1.0",
114
114
  "@atlaskit/navigation-system": "^11.4.0",
115
115
  "@atlaskit/primitives": "^22.6.0",