@atlaskit/renderer 153.4.7 → 153.5.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,34 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 153.5.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [`2828e9853e1d1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2828e9853e1d1) -
8
+ Disable table sticky headers, overflow shadow tracking, and automatic table scaling when
9
+ Confluence View Page Performance Mode is active, controlled by
10
+ `confluence_view_page_performance_mode`. Preserve authored widths, horizontal scrolling, and
11
+ existing behavior outside Performance Mode. Share saved-width column normalization between full
12
+ and light tables, including number-column space, and preserve fit-to-content sizing in light
13
+ tables. Preserve inherited comment table sizing when no numeric table width is available.
14
+ - Updated dependencies
15
+
16
+ ## 153.5.0
17
+
18
+ ### Minor Changes
19
+
20
+ - [`2bf9b457b16ce`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2bf9b457b16ce) -
21
+ Track the range a draft targets explicitly in `AnnotationRangeContext`, behind
22
+ `platform_editor_comments_api_manager`. The selection and hover mounters can render at the same
23
+ time and the ambient `range` flips between them, so a draft could be built against whichever
24
+ surface updated last. The context now holds a `DraftTarget` per surface plus the surface the user
25
+ engaged (`draftIntentSource`), and the selection mounter publishes its target while it is mounted
26
+ and drops it when the selection is cleared. Nothing reads these yet, so behaviour is unchanged.
27
+
28
+ ### Patch Changes
29
+
30
+ - Updated dependencies
31
+
3
32
  ## 153.4.7
4
33
 
5
34
  ### Patch Changes
@@ -10,6 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
  var _nodeWidth = require("@atlaskit/editor-common/node-width");
12
12
  var _table = require("@atlaskit/editor-common/styles/table");
13
+ var _normalizeColumnWidths = require("@atlaskit/editor-common/table/normalize-column-widths");
13
14
  var _WidthProvider = require("@atlaskit/editor-common/WidthProvider");
14
15
  var _constants = require("@atlaskit/editor-shared-styles/constants");
15
16
  var _rendererContext = require("../../../renderer-context");
@@ -337,10 +338,12 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
337
338
  });
338
339
  };
339
340
  var Colgroup = exports.Colgroup = function Colgroup(props) {
340
- var _props$allowFixedColu, _renderSyncBlockColgr;
341
+ var _props$allowFixedColu;
341
342
  var _useRendererContext = (0, _rendererContext.useRendererContext)(),
342
343
  isTopLevelRenderer = _useRendererContext.isTopLevelRenderer,
343
- nestedRendererType = _useRendererContext.nestedRendererType;
344
+ nestedRendererType = _useRendererContext.nestedRendererType,
345
+ _useRendererContext$i = _useRendererContext.isPerformanceModeActive,
346
+ isPerformanceModeActive = _useRendererContext$i === void 0 ? false : _useRendererContext$i;
344
347
  var columnWidths = props.columnWidths,
345
348
  isNumberColumnEnabled = props.isNumberColumnEnabled;
346
349
  var _useContext = (0, _react.useContext)(_WidthProvider.WidthContext),
@@ -357,20 +360,37 @@ var Colgroup = exports.Colgroup = function Colgroup(props) {
357
360
 
358
361
  // renderSyncBlockColgroup returns null when not applicable (flag off, SSR, not a sync block),
359
362
  // in which case ?? falls back to the standard renderScaleDownColgroup path.
360
- var colStyles = (_renderSyncBlockColgr = renderSyncBlockColgroup({
361
- isInsideOfSyncBlock: isInsideOfSyncBlock,
362
- isInsideOfTable: !!props.isInsideOfTable,
363
- tableNode: props.tableNode,
364
- columnWidths: columnWidths,
365
- isNumberColumnEnabled: !!isNumberColumnEnabled,
366
- renderWidth: props.renderWidth,
367
- contextWidth: contextWidth
368
- })) !== null && _renderSyncBlockColgr !== void 0 ? _renderSyncBlockColgr : renderScaleDownColgroup(_objectSpread(_objectSpread({}, props), {}, {
369
- isTopLevelRenderer: isTopLevelRenderer,
370
- isInsideOfSyncBlock: isInsideOfSyncBlock,
371
- isTableScalingEnabled: props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width' || props.rendererAppearance === 'max' || props.rendererAppearance === 'comment',
372
- isTableFixedColumnWidthsOptionEnabled: isTableFixedColumnWidthsOptionEnabled && (props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width' || props.rendererAppearance === 'max')
373
- }));
363
+ var colStyles;
364
+ if (isPerformanceModeActive) {
365
+ var _props$tableWidth;
366
+ // Keep authored widths without viewport-driven scaling, including sync blocks.
367
+ colStyles = (0, _normalizeColumnWidths.normalizeTableColumnWidths)({
368
+ columnWidths: columnWidths,
369
+ isNumberColumnEnabled: !!isNumberColumnEnabled,
370
+ skipMinWidth: !!(props.isInsideOfTable && isInsideOfSyncBlock),
371
+ tableWidth: (_props$tableWidth = props.tableWidth) !== null && _props$tableWidth !== void 0 ? _props$tableWidth : (0, _nodeWidth.getTableContainerWidth)(props.tableNode)
372
+ }).map(function (width) {
373
+ return {
374
+ width: "".concat(width, "px")
375
+ };
376
+ });
377
+ } else {
378
+ var _renderSyncBlockColgr;
379
+ colStyles = (_renderSyncBlockColgr = renderSyncBlockColgroup({
380
+ isInsideOfSyncBlock: isInsideOfSyncBlock,
381
+ isInsideOfTable: !!props.isInsideOfTable,
382
+ tableNode: props.tableNode,
383
+ columnWidths: columnWidths,
384
+ isNumberColumnEnabled: !!isNumberColumnEnabled,
385
+ renderWidth: props.renderWidth,
386
+ contextWidth: contextWidth
387
+ })) !== null && _renderSyncBlockColgr !== void 0 ? _renderSyncBlockColgr : renderScaleDownColgroup(_objectSpread(_objectSpread({}, props), {}, {
388
+ isTopLevelRenderer: isTopLevelRenderer,
389
+ isInsideOfSyncBlock: isInsideOfSyncBlock,
390
+ isTableScalingEnabled: props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width' || props.rendererAppearance === 'max' || props.rendererAppearance === 'comment',
391
+ isTableFixedColumnWidthsOptionEnabled: isTableFixedColumnWidthsOptionEnabled && (props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width' || props.rendererAppearance === 'max')
392
+ }));
393
+ }
374
394
  if (!colStyles) {
375
395
  return null;
376
396
  }
@@ -11,6 +11,7 @@ var _nodeWidth = require("@atlaskit/editor-common/node-width");
11
11
  var _contentMode = require("@atlaskit/editor-common/table/content-mode");
12
12
  var _constants = require("@atlaskit/editor-shared-styles/constants");
13
13
  var _fg = require("@atlaskit/platform-feature-flags/fg");
14
+ var _rendererContext = require("../../../renderer-context");
14
15
  var _colgroup = require("./colgroup");
15
16
  var _contentMode2 = require("./content-mode");
16
17
  var Table = exports.Table = /*#__PURE__*/_react.default.memo(function (_ref) {
@@ -33,7 +34,17 @@ var Table = exports.Table = /*#__PURE__*/_react.default.memo(function (_ref) {
33
34
  fixTableSSRResizing = _ref$fixTableSSRResiz === void 0 ? false : _ref$fixTableSSRResiz,
34
35
  _ref$allowFixedColumn = _ref.allowFixedColumnWidthOption,
35
36
  allowFixedColumnWidthOption = _ref$allowFixedColumn === void 0 ? false : _ref$allowFixedColumn;
37
+ var _useRendererContext = (0, _rendererContext.useRendererContext)(),
38
+ _useRendererContext$i = _useRendererContext.isPerformanceModeActive,
39
+ isPerformanceModeActive = _useRendererContext$i === void 0 ? false : _useRendererContext$i;
36
40
  var tableWidth = tableNode ? (0, _nodeWidth.getTableContainerWidth)(tableNode) : _constants.akEditorDefaultLayoutWidth;
41
+ if (isPerformanceModeActive && !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width)) {
42
+ if (rendererAppearance === 'full-width') {
43
+ tableWidth = _constants.akEditorFullWidthLayoutWidth;
44
+ } else if (rendererAppearance === 'max') {
45
+ tableWidth = _constants.akEditorMaxWidthLayoutWidth;
46
+ }
47
+ }
37
48
  var tableColumnWidths = columnWidths;
38
49
  if (rendererAppearance === 'comment' && allowTableResizing && tableNode && !((_tableNode$attrs = tableNode.attrs) !== null && _tableNode$attrs !== void 0 && _tableNode$attrs.width)) {
39
50
  tableWidth = 'inherit';
@@ -64,9 +75,13 @@ var Table = exports.Table = /*#__PURE__*/_react.default.memo(function (_ref) {
64
75
  "data-initial-width-mode": isContentMode ? 'content' : undefined,
65
76
  ref: innerRef,
66
77
  style: {
67
- marginTop: fixTableSSRResizing ? '0px' : ''
78
+ marginTop: fixTableSSRResizing ? '0px' : '',
79
+ // Keep the table's saved width while its outer viewport can still shrink and scroll.
80
+ minWidth: isPerformanceModeActive && !isContentMode && typeof tableWidth === 'number' ? tableWidth : undefined,
81
+ width: isPerformanceModeActive && !isContentMode && typeof tableWidth === 'number' ? tableWidth : undefined
68
82
  }
69
83
  }), /*#__PURE__*/_react.default.createElement(_colgroup.Colgroup, {
84
+ tableWidth: isPerformanceModeActive && typeof tableWidth === 'number' ? tableWidth : undefined,
70
85
  columnWidths: tableColumnWidths,
71
86
  layout: layout,
72
87
  isNumberColumnEnabled: isNumberColumnEnabled,
@@ -14,10 +14,12 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
14
14
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
15
15
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
16
16
  var _react = _interopRequireDefault(require("react"));
17
+ var _reactIntl = require("react-intl");
18
+ var _table = require("@atlaskit/editor-common/messages/table");
17
19
  var _nodeWidth = require("@atlaskit/editor-common/node-width");
18
20
  var _OverflowShadow = _interopRequireDefault(require("@atlaskit/editor-common/OverflowShadow"));
19
21
  var _styles = require("@atlaskit/editor-common/styles");
20
- var _table = require("@atlaskit/editor-common/styles/table");
22
+ var _table2 = require("@atlaskit/editor-common/styles/table");
21
23
  var _contentMode = require("@atlaskit/editor-common/table/content-mode");
22
24
  var _types = require("@atlaskit/editor-common/types");
23
25
  var _utils = require("@atlaskit/editor-common/utils");
@@ -35,7 +37,7 @@ var _appearance = require("../utils/appearance");
35
37
  var _cachedCellEdges = require("./table/cached-cell-edges");
36
38
  var _contentMode2 = require("./table/content-mode");
37
39
  var _sticky = require("./table/sticky");
38
- var _table2 = require("./table/table");
40
+ var _table3 = require("./table/table");
39
41
  var _tableCell = require("./tableCell");
40
42
  var _TableStickyScrollbar = require("./TableStickyScrollbar");
41
43
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -227,6 +229,9 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
227
229
  (0, _defineProperty2.default)(_this, "lastComputedStyle", {});
228
230
  (0, _defineProperty2.default)(_this, "resizeObserver", null);
229
231
  (0, _defineProperty2.default)(_this, "applyResizerChange", function (entries) {
232
+ if (_this.props.isPerformanceModeActive) {
233
+ return;
234
+ }
230
235
  var wrapperWidth = _this.state.wrapperWidth;
231
236
  var headerRowHeight = _this.state.headerRowHeight;
232
237
  var _iterator = _createForOfIteratorHelper(entries),
@@ -293,6 +298,9 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
293
298
  return (_this.overflowParent ? _this.overflowParent.top : 0) + offsetTop;
294
299
  });
295
300
  (0, _defineProperty2.default)(_this, "updateSticky", function () {
301
+ if (_this.props.isPerformanceModeActive) {
302
+ return;
303
+ }
296
304
  var tableElem = _this.tableRef.current;
297
305
  var refElem = _this.stickyHeaderRef.current;
298
306
  if (!tableElem || !refElem) {
@@ -322,6 +330,12 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
322
330
  }
323
331
  });
324
332
  (0, _defineProperty2.default)(_this, "onWrapperScrolled", function () {
333
+ if (_this.props.isPerformanceModeActive) {
334
+ if (_this.wrapperRef.current && _this.stickyScrollbarRef.current) {
335
+ _this.stickyScrollbarRef.current.scrollLeft = _this.wrapperRef.current.scrollLeft;
336
+ }
337
+ return;
338
+ }
325
339
  if (!_this.wrapperRef.current || !_this.stickyWrapperRef.current) {
326
340
  return;
327
341
  }
@@ -459,17 +473,12 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
459
473
  * @example
460
474
  */
461
475
  function componentDidMount() {
462
- this.resizeObserver = new ResizeObserver(this.applyResizerChange);
463
- if (this.wrapperRef.current) {
464
- this.resizeObserver.observe(this.wrapperRef.current);
465
- }
466
- if (this.stickyHeaderRef.current) {
467
- this.resizeObserver.observe(this.stickyHeaderRef.current);
476
+ if (!this.props.isPerformanceModeActive) {
477
+ this.observeDimensions();
468
478
  }
469
479
  if (this.props.stickyHeaders) {
470
480
  var _this$props$stickyHea;
471
481
  this.overflowParent = _sticky.OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.defaultScrollRootId_DO_NOT_USE);
472
- // Ignored via go/ees005
473
482
  // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
474
483
  this.overflowParent.addEventListener('scroll', this.onScroll);
475
484
  }
@@ -478,7 +487,20 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
478
487
  }
479
488
  this.applyNestedRendererTableFix();
480
489
  }
481
-
490
+ }, {
491
+ key: "observeDimensions",
492
+ value: function observeDimensions() {
493
+ this.resizeObserver = new ResizeObserver(this.applyResizerChange);
494
+ if (this.wrapperRef.current) {
495
+ this.resizeObserver.observe(this.wrapperRef.current);
496
+ }
497
+ if (this.stickyHeaderRef.current) {
498
+ this.resizeObserver.observe(this.stickyHeaderRef.current);
499
+ }
500
+ }
501
+ }, {
502
+ key: "componentDidUpdate",
503
+ value:
482
504
  /**
483
505
  * Updates sticky header wiring and scroll synchronization after prop or state changes.
484
506
  *
@@ -486,13 +508,28 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
486
508
  * @param prevState
487
509
  * @example
488
510
  */
489
- }, {
490
- key: "componentDidUpdate",
491
- value: function componentDidUpdate(prevProps, prevState) {
511
+ function componentDidUpdate(prevProps, prevState) {
512
+ if (this.props.isPerformanceModeActive !== prevProps.isPerformanceModeActive) {
513
+ if (this.props.isPerformanceModeActive) {
514
+ var _this$resizeObserver;
515
+ (_this$resizeObserver = this.resizeObserver) === null || _this$resizeObserver === void 0 || _this$resizeObserver.disconnect();
516
+ this.resizeObserver = null;
517
+ if (this.nextFrame) {
518
+ cancelAnimationFrame(this.nextFrame);
519
+ this.nextFrame = undefined;
520
+ }
521
+ } else if (prevProps.isPerformanceModeActive) {
522
+ this.observeDimensions();
523
+ }
524
+ }
492
525
  // toggling sticky headers visiblity
493
526
  if (this.props.stickyHeaders && !this.overflowParent) {
494
527
  var _this$props$stickyHea2;
495
528
  this.overflowParent = _sticky.OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.defaultScrollRootId_DO_NOT_USE);
529
+ if (prevProps.isPerformanceModeActive) {
530
+ // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
531
+ this.overflowParent.addEventListener('scroll', this.onScroll);
532
+ }
496
533
  } else if (!this.props.stickyHeaders && this.overflowParent) {
497
534
  // Ignored via go/ees005
498
535
  // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
@@ -524,7 +561,7 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
524
561
  if (!this.tableRef.current || !this.stickyHeaderRef.current) {
525
562
  return;
526
563
  }
527
- return this.tableRef.current.offsetHeight - this.stickyHeaderRef.current.offsetHeight + _table.tableMarginTop - _sticky.tableStickyPadding;
564
+ return this.tableRef.current.offsetHeight - this.stickyHeaderRef.current.offsetHeight + _table2.tableMarginTop - _sticky.tableStickyPadding;
528
565
  }
529
566
 
530
567
  /**
@@ -725,8 +762,11 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
725
762
  "data-table-local-id": tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.localId,
726
763
  "data-table-width": tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.width,
727
764
  "data-vc": "table-node-wrapper",
728
- onScroll: this.props.stickyHeaders && this.onWrapperScrolled
729
- }, /*#__PURE__*/_react.default.createElement(_table2.Table, {
765
+ tabIndex: this.props.isPerformanceModeActive ? 0 : undefined,
766
+ role: this.props.isPerformanceModeActive ? 'region' : undefined,
767
+ "aria-label": this.props.isPerformanceModeActive ? this.props.scrollRegionLabel : undefined,
768
+ onScroll: (this.props.isPerformanceModeActive || this.props.stickyHeaders) && this.onWrapperScrolled
769
+ }, /*#__PURE__*/_react.default.createElement(_table3.Table, {
730
770
  innerRef: this.tableRef,
731
771
  columnWidths: columnWidths,
732
772
  layout: layout,
@@ -761,6 +801,16 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
761
801
  isNumberColumnEnabled: isNumberColumnEnabled
762
802
  })));
763
803
  }
804
+ }], [{
805
+ key: "getDerivedStateFromProps",
806
+ value: function getDerivedStateFromProps(props, state) {
807
+ if (props.isPerformanceModeActive && state.stickyMode !== 'none') {
808
+ return {
809
+ stickyMode: 'none'
810
+ };
811
+ }
812
+ return null;
813
+ }
764
814
  }]);
765
815
  }(_react.default.Component);
766
816
  var getCellEdgePropsByCellOffset = function getCellEdgePropsByCellOffset(tableNode, isNumberColumnEnabled) {
@@ -953,6 +1003,8 @@ var TableProcessorWithContainerStyles = exports.TableProcessorWithContainerStyle
953
1003
  isNumberColumnEnabled = _this$props2.isNumberColumnEnabled,
954
1004
  isPresentational = _this$props2.isPresentational,
955
1005
  layout = _this$props2.layout,
1006
+ isPerformanceModeActive = _this$props2.isPerformanceModeActive,
1007
+ scrollRegionLabel = _this$props2.scrollRegionLabel,
956
1008
  rendererAppearance = _this$props2.rendererAppearance,
957
1009
  renderWidth = _this$props2.renderWidth,
958
1010
  shadowClassNames = _this$props2.shadowClassNames,
@@ -982,6 +1034,8 @@ var TableProcessorWithContainerStyles = exports.TableProcessorWithContainerStyle
982
1034
  isInsideOfTable: isInsideOfTable,
983
1035
  isNumberColumnEnabled: isNumberColumnEnabled,
984
1036
  isPresentational: isPresentational,
1037
+ isPerformanceModeActive: isPerformanceModeActive,
1038
+ scrollRegionLabel: scrollRegionLabel,
985
1039
  layout: layout,
986
1040
  rendererAppearance: rendererAppearance,
987
1041
  renderWidth: renderWidth,
@@ -1004,10 +1058,14 @@ var TableWithShadowsAndContainerStyles = (0, _OverflowShadow.default)(TableProce
1004
1058
  useShadowObserver: true
1005
1059
  });
1006
1060
  var TableWithWidth = function TableWithWidth(props) {
1007
- var _props$columnWidths;
1061
+ var _intl$formatMessage, _props$columnWidths;
1008
1062
  var _useRendererContext2 = (0, _rendererContext.useRendererContext)(),
1009
- isTopLevelRenderer = _useRendererContext2.isTopLevelRenderer;
1063
+ isTopLevelRenderer = _useRendererContext2.isTopLevelRenderer,
1064
+ _useRendererContext2$ = _useRendererContext2.isPerformanceModeActive,
1065
+ isPerformanceModeActive = _useRendererContext2$ === void 0 ? false : _useRendererContext2$;
1066
+ var intl = _react.default.useContext(_reactIntl.IntlContext);
1010
1067
  var isInsideOfNestedRenderer = isTopLevelRenderer === false;
1068
+ var scrollRegionLabel = isPerformanceModeActive ? (_intl$formatMessage = intl === null || intl === void 0 ? void 0 : intl.formatMessage(_table.messages.tableScrollRegion)) !== null && _intl$formatMessage !== void 0 ? _intl$formatMessage : _table.messages.tableScrollRegion.defaultMessage : undefined;
1011
1069
  var colWidthsSum =
1012
1070
  // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
1013
1071
  ((_props$columnWidths = props.columnWidths) === null || _props$columnWidths === void 0 ? void 0 : _props$columnWidths.reduce(function (total, val) {
@@ -1018,6 +1076,10 @@ var TableWithWidth = function TableWithWidth(props) {
1018
1076
  // Ignored via go/ees005
1019
1077
  // eslint-disable-next-line react/jsx-props-no-spreading
1020
1078
  , (0, _extends2.default)({}, props, {
1079
+ isPerformanceModeActive: isPerformanceModeActive,
1080
+ scrollRegionLabel: scrollRegionLabel,
1081
+ stickyHeaders: isPerformanceModeActive ? undefined : props.stickyHeaders,
1082
+ disableShadowTracking: isPerformanceModeActive,
1021
1083
  isInsideOfNestedRenderer: isInsideOfNestedRenderer
1022
1084
  }));
1023
1085
  }
@@ -1025,6 +1087,9 @@ var TableWithWidth = function TableWithWidth(props) {
1025
1087
  // Ignored via go/ees005
1026
1088
  // eslint-disable-next-line react/jsx-props-no-spreading
1027
1089
  , (0, _extends2.default)({}, props, {
1090
+ isPerformanceModeActive: isPerformanceModeActive,
1091
+ scrollRegionLabel: scrollRegionLabel,
1092
+ stickyHeaders: isPerformanceModeActive ? undefined : props.stickyHeaders,
1028
1093
  isInsideOfNestedRenderer: isInsideOfNestedRenderer
1029
1094
  }));
1030
1095
  };
@@ -79,7 +79,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
79
79
  var TABLE_INFO_TIMEOUT = 10000;
80
80
  var RENDER_EVENT_SAMPLE_RATE = 0.1;
81
81
  var packageName = "@atlaskit/renderer";
82
- var packageVersion = "153.4.6";
82
+ var packageVersion = "153.5.0";
83
83
  var setAsQueryContainerStyles = (0, _react2.css)({
84
84
  containerName: 'ak-renderer-wrapper',
85
85
  containerType: 'inline-size'
@@ -13,6 +13,11 @@ var _fg = require("@atlaskit/platform-feature-flags/fg");
13
13
  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); }
14
14
  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; }
15
15
  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; }
16
+ /**
17
+ * The range a draft should act on, published by the selection/hover mounters so the manager can
18
+ * resolve its target without reading the ambient `range`, which flips between selection and hover.
19
+ */
20
+
16
21
  // oxlint-disable-next-line eslint/no-redeclare
17
22
 
18
23
  // oxlint-disable-next-line eslint/no-redeclare
@@ -24,7 +29,10 @@ var initialState = {
24
29
  selectionDraftRange: null,
25
30
  hoverDraftRange: null,
26
31
  selectionDraftDocumentPosition: null,
27
- hoverDraftDocumentPosition: null
32
+ hoverDraftDocumentPosition: null,
33
+ draftIntentSource: null,
34
+ selectionDraftTarget: null,
35
+ hoverDraftTarget: null
28
36
  };
29
37
  function reducer(state, action) {
30
38
  switch (action.type) {
@@ -101,6 +109,27 @@ function reducer(state, action) {
101
109
  });
102
110
  }
103
111
  return state;
112
+ case 'setDraftIntentSource':
113
+ if (state.draftIntentSource !== action.source) {
114
+ return _objectSpread(_objectSpread({}, state), {}, {
115
+ draftIntentSource: action.source
116
+ });
117
+ }
118
+ return state;
119
+ case 'setSelectionDraftTarget':
120
+ if (state.selectionDraftTarget !== action.target) {
121
+ return _objectSpread(_objectSpread({}, state), {}, {
122
+ selectionDraftTarget: action.target
123
+ });
124
+ }
125
+ return state;
126
+ case 'setHoverDraftTarget':
127
+ if (state.hoverDraftTarget !== action.target) {
128
+ return _objectSpread(_objectSpread({}, state), {}, {
129
+ hoverDraftTarget: action.target
130
+ });
131
+ }
132
+ return state;
104
133
  }
105
134
  }
106
135
  var AnnotationRangeStateContext = exports.AnnotationRangeStateContext = /*#__PURE__*/(0, _react.createContext)({
@@ -109,7 +138,10 @@ var AnnotationRangeStateContext = exports.AnnotationRangeStateContext = /*#__PUR
109
138
  selectionDraftRange: null,
110
139
  hoverDraftRange: null,
111
140
  selectionDraftDocumentPosition: null,
112
- hoverDraftDocumentPosition: null
141
+ hoverDraftDocumentPosition: null,
142
+ draftIntentSource: null,
143
+ selectionDraftTarget: null,
144
+ hoverDraftTarget: null
113
145
  });
114
146
  var AnnotationRangeDispatchContext = exports.AnnotationRangeDispatchContext = /*#__PURE__*/(0, _react.createContext)({
115
147
  clearSelectionRange: function clearSelectionRange() {},
@@ -118,7 +150,10 @@ var AnnotationRangeDispatchContext = exports.AnnotationRangeDispatchContext = /*
118
150
  promoteSelectionToDraft: function promoteSelectionToDraft() {},
119
151
  promoteHoverToDraft: function promoteHoverToDraft() {},
120
152
  clearSelectionDraft: function clearSelectionDraft() {},
121
- clearHoverDraft: function clearHoverDraft() {}
153
+ clearHoverDraft: function clearHoverDraft() {},
154
+ setDraftIntentSource: function setDraftIntentSource() {},
155
+ setSelectionDraftTarget: function setSelectionDraftTarget() {},
156
+ setHoverDraftTarget: function setHoverDraftTarget() {}
122
157
  });
123
158
  var AnnotationRangeProviderInner = exports.AnnotationRangeProviderInner = function AnnotationRangeProviderInner(_ref) {
124
159
  var children = _ref.children,
@@ -135,6 +170,9 @@ var AnnotationRangeProviderInner = exports.AnnotationRangeProviderInner = functi
135
170
  selectionDraftDocumentPosition = _useReducer2$.selectionDraftDocumentPosition,
136
171
  hoverDraftRange = _useReducer2$.hoverDraftRange,
137
172
  hoverDraftDocumentPosition = _useReducer2$.hoverDraftDocumentPosition,
173
+ draftIntentSource = _useReducer2$.draftIntentSource,
174
+ selectionDraftTarget = _useReducer2$.selectionDraftTarget,
175
+ hoverDraftTarget = _useReducer2$.hoverDraftTarget,
138
176
  dispatch = _useReducer2[1];
139
177
  var clearSelectionRange = (0, _react.useCallback)(function () {
140
178
  return dispatch({
@@ -202,6 +240,24 @@ var AnnotationRangeProviderInner = exports.AnnotationRangeProviderInner = functi
202
240
  type: 'clearHoverDraft'
203
241
  });
204
242
  }, []);
243
+ var setDraftIntentSource = (0, _react.useCallback)(function (source) {
244
+ dispatch({
245
+ type: 'setDraftIntentSource',
246
+ source: source
247
+ });
248
+ }, []);
249
+ var setSelectionDraftTarget = (0, _react.useCallback)(function (target) {
250
+ dispatch({
251
+ type: 'setSelectionDraftTarget',
252
+ target: target
253
+ });
254
+ }, []);
255
+ var setHoverDraftTarget = (0, _react.useCallback)(function (target) {
256
+ dispatch({
257
+ type: 'setHoverDraftTarget',
258
+ target: target
259
+ });
260
+ }, []);
205
261
  var stateData = (0, _react.useMemo)(function () {
206
262
  return {
207
263
  // We techinically have two ranges, however we only want to expose one of them at a time, because only one draft
@@ -211,9 +267,12 @@ var AnnotationRangeProviderInner = exports.AnnotationRangeProviderInner = functi
211
267
  selectionDraftRange: selectionDraftRange,
212
268
  hoverDraftRange: hoverDraftRange,
213
269
  selectionDraftDocumentPosition: selectionDraftDocumentPosition,
214
- hoverDraftDocumentPosition: hoverDraftDocumentPosition
270
+ hoverDraftDocumentPosition: hoverDraftDocumentPosition,
271
+ draftIntentSource: draftIntentSource,
272
+ selectionDraftTarget: selectionDraftTarget,
273
+ hoverDraftTarget: hoverDraftTarget
215
274
  };
216
- }, [selectionRange, hoverRange, type, selectionDraftRange, selectionDraftDocumentPosition, hoverDraftRange, hoverDraftDocumentPosition]);
275
+ }, [selectionRange, hoverRange, type, selectionDraftRange, selectionDraftDocumentPosition, hoverDraftRange, hoverDraftDocumentPosition, draftIntentSource, selectionDraftTarget, hoverDraftTarget]);
217
276
  var dispatchData = (0, _react.useMemo)(function () {
218
277
  return {
219
278
  clearSelectionRange: clearSelectionRange,
@@ -223,9 +282,12 @@ var AnnotationRangeProviderInner = exports.AnnotationRangeProviderInner = functi
223
282
  promoteSelectionToDraft: promoteSelectionToDraft,
224
283
  promoteHoverToDraft: promoteHoverToDraft,
225
284
  clearSelectionDraft: clearSelectionDraft,
226
- clearHoverDraft: clearHoverDraft
285
+ clearHoverDraft: clearHoverDraft,
286
+ setDraftIntentSource: setDraftIntentSource,
287
+ setSelectionDraftTarget: setSelectionDraftTarget,
288
+ setHoverDraftTarget: setHoverDraftTarget
227
289
  };
228
- }, [allowCommentsOnMedia, extensionCommentsEnabled, clearSelectionRange, clearHoverRange, setSelectionRange, setHoverTarget, promoteSelectionToDraft, promoteHoverToDraft, clearSelectionDraft, clearHoverDraft]);
290
+ }, [allowCommentsOnMedia, extensionCommentsEnabled, clearSelectionRange, clearHoverRange, setSelectionRange, setHoverTarget, promoteSelectionToDraft, promoteHoverToDraft, clearSelectionDraft, clearHoverDraft, setDraftIntentSource, setSelectionDraftTarget, setHoverDraftTarget]);
229
291
  return /*#__PURE__*/_react.default.createElement(AnnotationRangeStateContext.Provider, {
230
292
  value: stateData
231
293
  }, /*#__PURE__*/_react.default.createElement(AnnotationRangeDispatchContext.Provider, {
@@ -33,7 +33,9 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
33
33
  generateIndexMatch = props.generateIndexMatch;
34
34
  var _useAnnotationRangeDi = (0, _AnnotationRangeContext.useAnnotationRangeDispatch)(),
35
35
  promoteSelectionToDraft = _useAnnotationRangeDi.promoteSelectionToDraft,
36
- clearSelectionDraft = _useAnnotationRangeDi.clearSelectionDraft;
36
+ clearSelectionDraft = _useAnnotationRangeDi.clearSelectionDraft,
37
+ setSelectionDraftTarget = _useAnnotationRangeDi.setSelectionDraftTarget,
38
+ setDraftIntentSource = _useAnnotationRangeDi.setDraftIntentSource;
37
39
  var _useAnnotationRangeSt = (0, _AnnotationRangeContext.useAnnotationRangeState)(),
38
40
  selectionDraftDocumentPosition = _useAnnotationRangeSt.selectionDraftDocumentPosition;
39
41
  var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
@@ -188,6 +190,34 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
188
190
  removeDraftModeCallback();
189
191
  onCloseProps();
190
192
  }, [onCloseProps, removeDraftModeCallback, createAnalyticsEvent, inlineNodeTypes]);
193
+
194
+ // Publish the range this mounter owns, so a draft can be resolved against the surface the user
195
+ // engaged rather than the ambient range, which flips between selection and hover. During a draft
196
+ // the selection range has been promoted away, and skipping the publish then keeps the target a
197
+ // draft captured.
198
+ (0, _react.useEffect)(function () {
199
+ if (!annotationManager || !range) {
200
+ return;
201
+ }
202
+ setSelectionDraftTarget({
203
+ range: range,
204
+ documentPosition: documentPosition,
205
+ isAnnotationAllowed: isAnnotationAllowed,
206
+ source: 'selection'
207
+ });
208
+ setDraftIntentSource('selection');
209
+ }, [annotationManager, range, documentPosition, isAnnotationAllowed, setSelectionDraftTarget, setDraftIntentSource]);
210
+
211
+ // Unmounting means the selection was cleared, so drop the published target.
212
+ (0, _react.useEffect)(function () {
213
+ return function () {
214
+ if (annotationManager) {
215
+ setSelectionDraftTarget(null);
216
+ }
217
+ };
218
+ // Cleanup on unmount only; both dependencies are stable for this component's lifetime.
219
+ // eslint-disable-next-line react-hooks/exhaustive-deps
220
+ }, []);
191
221
  (0, _react.useEffect)(function () {
192
222
  if (annotationManager) {
193
223
  var allowAnnotation = function allowAnnotation() {
@@ -1,6 +1,7 @@
1
1
  import React, { useContext } from 'react';
2
2
  import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
3
3
  import { tableCellBorderWidth, tableCellMinWidth } from '@atlaskit/editor-common/styles/table';
4
+ import { normalizeTableColumnWidths } from '@atlaskit/editor-common/table/normalize-column-widths';
4
5
  import { WidthContext } from '@atlaskit/editor-common/WidthProvider';
5
6
  import { akEditorTableNumberColumnWidth, akEditorTableLegacyCellMinWidth, akEditorTableCellMinWidth } from '@atlaskit/editor-shared-styles/constants';
6
7
  import { useRendererContext } from '../../../renderer-context';
@@ -304,10 +305,11 @@ const renderScaleDownColgroup = props => {
304
305
  });
305
306
  };
306
307
  export const Colgroup = props => {
307
- var _props$allowFixedColu, _renderSyncBlockColgr;
308
+ var _props$allowFixedColu;
308
309
  const {
309
310
  isTopLevelRenderer,
310
- nestedRendererType
311
+ nestedRendererType,
312
+ isPerformanceModeActive = false
311
313
  } = useRendererContext();
312
314
  const {
313
315
  columnWidths,
@@ -328,21 +330,36 @@ export const Colgroup = props => {
328
330
 
329
331
  // renderSyncBlockColgroup returns null when not applicable (flag off, SSR, not a sync block),
330
332
  // in which case ?? falls back to the standard renderScaleDownColgroup path.
331
- const colStyles = (_renderSyncBlockColgr = renderSyncBlockColgroup({
332
- isInsideOfSyncBlock,
333
- isInsideOfTable: !!props.isInsideOfTable,
334
- tableNode: props.tableNode,
335
- columnWidths,
336
- isNumberColumnEnabled: !!isNumberColumnEnabled,
337
- renderWidth: props.renderWidth,
338
- contextWidth
339
- })) !== null && _renderSyncBlockColgr !== void 0 ? _renderSyncBlockColgr : renderScaleDownColgroup({
340
- ...props,
341
- isTopLevelRenderer,
342
- isInsideOfSyncBlock,
343
- isTableScalingEnabled: props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width' || props.rendererAppearance === 'max' || props.rendererAppearance === 'comment',
344
- isTableFixedColumnWidthsOptionEnabled: isTableFixedColumnWidthsOptionEnabled && (props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width' || props.rendererAppearance === 'max')
345
- });
333
+ let colStyles;
334
+ if (isPerformanceModeActive) {
335
+ var _props$tableWidth;
336
+ // Keep authored widths without viewport-driven scaling, including sync blocks.
337
+ colStyles = normalizeTableColumnWidths({
338
+ columnWidths,
339
+ isNumberColumnEnabled: !!isNumberColumnEnabled,
340
+ skipMinWidth: !!(props.isInsideOfTable && isInsideOfSyncBlock),
341
+ tableWidth: (_props$tableWidth = props.tableWidth) !== null && _props$tableWidth !== void 0 ? _props$tableWidth : getTableContainerWidth(props.tableNode)
342
+ }).map(width => ({
343
+ width: `${width}px`
344
+ }));
345
+ } else {
346
+ var _renderSyncBlockColgr;
347
+ colStyles = (_renderSyncBlockColgr = renderSyncBlockColgroup({
348
+ isInsideOfSyncBlock,
349
+ isInsideOfTable: !!props.isInsideOfTable,
350
+ tableNode: props.tableNode,
351
+ columnWidths,
352
+ isNumberColumnEnabled: !!isNumberColumnEnabled,
353
+ renderWidth: props.renderWidth,
354
+ contextWidth
355
+ })) !== null && _renderSyncBlockColgr !== void 0 ? _renderSyncBlockColgr : renderScaleDownColgroup({
356
+ ...props,
357
+ isTopLevelRenderer,
358
+ isInsideOfSyncBlock,
359
+ isTableScalingEnabled: props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width' || props.rendererAppearance === 'max' || props.rendererAppearance === 'comment',
360
+ isTableFixedColumnWidthsOptionEnabled: isTableFixedColumnWidthsOptionEnabled && (props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width' || props.rendererAppearance === 'max')
361
+ });
362
+ }
346
363
  if (!colStyles) {
347
364
  return null;
348
365
  }