@atlaskit/renderer 111.1.2 → 111.1.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/renderer
 
+## 111.1.4
+
+### Patch Changes
+
+- [#148229](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/148229)
+  [`e79a40a7122b6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e79a40a7122b6) -
+  Fix table offset in renderer when SSR fix is enabled
+- Updated dependencies
+
+## 111.1.3
+
+### Patch Changes
+
+- [#148476](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/148476)
+  [`4a3547a1691e2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4a3547a1691e2) -
+  Reverting change to add onLoadComplete callback for useLoadAnnotations annotations hook
+
 ## 111.1.2
 
 ### Patch Changes

package/dist/cjs/react/nodes/table.js

@@ -124,9 +124,6 @@ var isHeaderRowEnabled = function isHeaderRowEnabled(rows) {
 var tableCanBeSticky = function tableCanBeSticky(node, children) {
   return isHeaderRowEnabled(children) && node && node.firstChild && !hasRowspan(node.firstChild);
 };
-var canUseLinelength = function canUseLinelength(appearance) {
-  return appearance === 'full-page';
-};
 var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(TableContainer, _React$Component);
   var _super = _createSuper(TableContainer);
@@ -363,9 +360,17 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
         left = (tableWidth - lineLength) / 2;
         leftCSS = "(".concat(tableWidthCSS, " - ").concat(lineLengthCSS, ") / 2");
       }
-      if (!shouldCalculateLeftForAlignment && canUseLinelength(rendererAppearance) && tableWidthNew > lineLengthFixedWidth) {
-        left = lineLengthFixedWidth / 2 - tableWidth / 2;
-        leftCSS = "".concat(lineLengthCSS, " / 2 - ").concat(tableWidthCSS, " / 2");
+      if (fixTableSSRResizing) {
+        if (!shouldCalculateLeftForAlignment && (0, _appearance.isFullPageAppearance)(rendererAppearance)) {
+          // Note tableWidthCSS here is the renderer width
+          // When the screen is super wide we want table to break out.
+          // However if screen is smaller than 760px. We want table align to left.
+          leftCSS = "min(0px, ".concat(lineLengthCSS, " - ").concat(tableWidthCSS, ") / 2");
+        }
+      } else {
+        if (!shouldCalculateLeftForAlignment && (0, _appearance.isFullPageAppearance)(rendererAppearance) && tableWidthNew > lineLengthFixedWidth) {
+          left = lineLengthFixedWidth / 2 - tableWidth / 2;
+        }
       }
       var children = _react.default.Children.toArray(this.props.children);
 

package/dist/cjs/ui/Renderer/index.js

@@ -65,7 +65,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "111.1.2";
+var packageVersion = "111.1.4";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

package/dist/cjs/ui/annotations/hooks/use-load-annotations.js

@@ -14,8 +14,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 var useLoadAnnotations = exports.useLoadAnnotations = function useLoadAnnotations(_ref) {
   var adfDocument = _ref.adfDocument,
-    isNestedRender = _ref.isNestedRender,
-    onLoadComplete = _ref.onLoadComplete;
+    isNestedRender = _ref.isNestedRender;
   var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
   var providers = (0, _react.useContext)(_context.ProvidersContext);
   (0, _react.useEffect)(function () {
@@ -28,9 +27,6 @@ var useLoadAnnotations = exports.useLoadAnnotations = function useLoadAnnotation
     var annotations = actions.getAnnotationMarks();
     // we don't want to request integrators for state with an empty list of ids.
     if (!annotations.length) {
-      onLoadComplete && onLoadComplete({
-        numberOfUnresolvedInlineComments: 0
-      });
       return;
     }
     var ids = annotations.map(function (mark) {
@@ -44,12 +40,7 @@ var useLoadAnnotations = exports.useLoadAnnotations = function useLoadAnnotation
         return _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2.default)({}, value.id, value));
       }, {});
       updateSubscriberInlineComment.emit(_types.AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
-      onLoadComplete && onLoadComplete({
-        numberOfUnresolvedInlineComments: data.filter(function (data) {
-          return data.state === 'active';
-        }).length
-      });
     };
     inlineCommentGetState(ids, isNestedRender).then(cb);
-  }, [actions, providers, adfDocument, isNestedRender, onLoadComplete]);
+  }, [actions, providers, adfDocument, isNestedRender]);
 };

package/dist/cjs/ui/annotations/index.js

@@ -31,12 +31,10 @@ var _draft = require("./draft");
 var _element = require("./element");
 var LoadAnnotations = /*#__PURE__*/_react.default.memo(function (_ref) {
   var adfDocument = _ref.adfDocument,
-    isNestedRender = _ref.isNestedRender,
-    onLoadComplete = _ref.onLoadComplete;
+    isNestedRender = _ref.isNestedRender;
   (0, _useLoadAnnotations.useLoadAnnotations)({
     adfDocument: adfDocument,
-    isNestedRender: isNestedRender,
-    onLoadComplete: onLoadComplete
+    isNestedRender: isNestedRender
   });
   return null;
 });
@@ -54,8 +52,7 @@ var AnnotationsWrapper = exports.AnnotationsWrapper = function AnnotationsWrappe
     annotationProvider = props.annotationProvider,
     rendererRef = props.rendererRef,
     adfDocument = props.adfDocument,
-    isNestedRender = props.isNestedRender,
-    onLoadComplete = props.onLoadComplete;
+    isNestedRender = props.isNestedRender;
   var updateSubscriber = annotationProvider && annotationProvider.inlineComment && annotationProvider.inlineComment.updateSubscriber;
   var inlineCommentAnnotationsState = (0, _useEvents.useAnnotationStateByTypeEvent)({
     type: _adfSchema.AnnotationTypes.INLINE_COMMENT,
@@ -74,8 +71,7 @@ var AnnotationsWrapper = exports.AnnotationsWrapper = function AnnotationsWrappe
     rendererRef: rendererRef
   }, /*#__PURE__*/_react.default.createElement(LoadAnnotations, {
     adfDocument: adfDocument,
-    isNestedRender: isNestedRender,
-    onLoadComplete: onLoadComplete
+    isNestedRender: isNestedRender
   }), /*#__PURE__*/_react.default.createElement(_view.AnnotationView, {
     createAnalyticsEvent: createAnalyticsEvent
   }), children)))));

package/dist/es2019/react/nodes/table.js

@@ -92,7 +92,6 @@ const isHeaderRowEnabled = rows => {
 const tableCanBeSticky = (node, children) => {
   return isHeaderRowEnabled(children) && node && node.firstChild && !hasRowspan(node.firstChild);
 };
-const canUseLinelength = appearance => appearance === 'full-page';
 export class TableContainer extends React.Component {
   constructor(...args) {
     super(...args);
@@ -304,9 +303,17 @@ export class TableContainer extends React.Component {
       left = (tableWidth - lineLength) / 2;
       leftCSS = `(${tableWidthCSS} - ${lineLengthCSS}) / 2`;
     }
-    if (!shouldCalculateLeftForAlignment && canUseLinelength(rendererAppearance) && tableWidthNew > lineLengthFixedWidth) {
-      left = lineLengthFixedWidth / 2 - tableWidth / 2;
-      leftCSS = `${lineLengthCSS} / 2 - ${tableWidthCSS} / 2`;
+    if (fixTableSSRResizing) {
+      if (!shouldCalculateLeftForAlignment && isFullPageAppearance(rendererAppearance)) {
+        // Note tableWidthCSS here is the renderer width
+        // When the screen is super wide we want table to break out.
+        // However if screen is smaller than 760px. We want table align to left.
+        leftCSS = `min(0px, ${lineLengthCSS} - ${tableWidthCSS}) / 2`;
+      }
+    } else {
+      if (!shouldCalculateLeftForAlignment && isFullPageAppearance(rendererAppearance) && tableWidthNew > lineLengthFixedWidth) {
+        left = lineLengthFixedWidth / 2 - tableWidth / 2;
+      }
     }
     const children = React.Children.toArray(this.props.children);
 

package/dist/es2019/ui/Renderer/index.js

@@ -45,7 +45,7 @@ import { nodeToReact } from '../../react/nodes';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "111.1.2";
+const packageVersion = "111.1.4";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

package/dist/es2019/ui/annotations/hooks/use-load-annotations.js

@@ -4,8 +4,7 @@ import { ProvidersContext } from '../context';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';
 export const useLoadAnnotations = ({
   adfDocument,
-  isNestedRender,
-  onLoadComplete
+  isNestedRender
 }) => {
   const actions = useContext(ActionsContext);
   const providers = useContext(ProvidersContext);
@@ -22,9 +21,6 @@ export const useLoadAnnotations = ({
     const annotations = actions.getAnnotationMarks();
     // we don't want to request integrators for state with an empty list of ids.
     if (!annotations.length) {
-      onLoadComplete && onLoadComplete({
-        numberOfUnresolvedInlineComments: 0
-      });
       return;
     }
     const ids = annotations.map(mark => mark.attrs.id);
@@ -37,10 +33,7 @@ export const useLoadAnnotations = ({
         [value.id]: value
       }), {});
       updateSubscriberInlineComment.emit(AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
-      onLoadComplete && onLoadComplete({
-        numberOfUnresolvedInlineComments: data.filter(data => data.state === 'active').length
-      });
     };
     inlineCommentGetState(ids, isNestedRender).then(cb);
-  }, [actions, providers, adfDocument, isNestedRender, onLoadComplete]);
+  }, [actions, providers, adfDocument, isNestedRender]);
 };

package/dist/es2019/ui/annotations/index.js

@@ -10,13 +10,11 @@ import { AnnotationRangeProvider } from './contexts/AnnotationRangeContext';
 import { AnnotationHoverContext } from './contexts/AnnotationHoverContext';
 const LoadAnnotations = /*#__PURE__*/React.memo(({
   adfDocument,
-  isNestedRender,
-  onLoadComplete
+  isNestedRender
 }) => {
   useLoadAnnotations({
     adfDocument,
-    isNestedRender,
-    onLoadComplete
+    isNestedRender
   });
   return null;
 });
@@ -35,8 +33,7 @@ export const AnnotationsWrapper = props => {
     annotationProvider,
     rendererRef,
     adfDocument,
-    isNestedRender,
-    onLoadComplete
+    isNestedRender
   } = props;
   const updateSubscriber = annotationProvider && annotationProvider.inlineComment && annotationProvider.inlineComment.updateSubscriber;
   const inlineCommentAnnotationsState = useAnnotationStateByTypeEvent({
@@ -57,8 +54,7 @@ export const AnnotationsWrapper = props => {
     rendererRef: rendererRef
   }, /*#__PURE__*/React.createElement(LoadAnnotations, {
     adfDocument: adfDocument,
-    isNestedRender: isNestedRender,
-    onLoadComplete: onLoadComplete
+    isNestedRender: isNestedRender
   }), /*#__PURE__*/React.createElement(AnnotationView, {
     createAnalyticsEvent: createAnalyticsEvent
   }), children)))));

package/dist/esm/react/nodes/table.js

@@ -117,9 +117,6 @@ var isHeaderRowEnabled = function isHeaderRowEnabled(rows) {
 var tableCanBeSticky = function tableCanBeSticky(node, children) {
   return isHeaderRowEnabled(children) && node && node.firstChild && !hasRowspan(node.firstChild);
 };
-var canUseLinelength = function canUseLinelength(appearance) {
-  return appearance === 'full-page';
-};
 export var TableContainer = /*#__PURE__*/function (_React$Component) {
   _inherits(TableContainer, _React$Component);
   var _super = _createSuper(TableContainer);
@@ -356,9 +353,17 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
         left = (tableWidth - lineLength) / 2;
         leftCSS = "(".concat(tableWidthCSS, " - ").concat(lineLengthCSS, ") / 2");
       }
-      if (!shouldCalculateLeftForAlignment && canUseLinelength(rendererAppearance) && tableWidthNew > lineLengthFixedWidth) {
-        left = lineLengthFixedWidth / 2 - tableWidth / 2;
-        leftCSS = "".concat(lineLengthCSS, " / 2 - ").concat(tableWidthCSS, " / 2");
+      if (fixTableSSRResizing) {
+        if (!shouldCalculateLeftForAlignment && isFullPageAppearance(rendererAppearance)) {
+          // Note tableWidthCSS here is the renderer width
+          // When the screen is super wide we want table to break out.
+          // However if screen is smaller than 760px. We want table align to left.
+          leftCSS = "min(0px, ".concat(lineLengthCSS, " - ").concat(tableWidthCSS, ") / 2");
+        }
+      } else {
+        if (!shouldCalculateLeftForAlignment && isFullPageAppearance(rendererAppearance) && tableWidthNew > lineLengthFixedWidth) {
+          left = lineLengthFixedWidth / 2 - tableWidth / 2;
+        }
       }
       var children = React.Children.toArray(this.props.children);
 

package/dist/esm/ui/Renderer/index.js

@@ -55,7 +55,7 @@ import { nodeToReact } from '../../react/nodes';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "111.1.2";
+var packageVersion = "111.1.4";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

package/dist/esm/ui/annotations/hooks/use-load-annotations.js

@@ -7,8 +7,7 @@ import { ProvidersContext } from '../context';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';
 export var useLoadAnnotations = function useLoadAnnotations(_ref) {
   var adfDocument = _ref.adfDocument,
-    isNestedRender = _ref.isNestedRender,
-    onLoadComplete = _ref.onLoadComplete;
+    isNestedRender = _ref.isNestedRender;
   var actions = useContext(ActionsContext);
   var providers = useContext(ProvidersContext);
   useEffect(function () {
@@ -21,9 +20,6 @@ export var useLoadAnnotations = function useLoadAnnotations(_ref) {
     var annotations = actions.getAnnotationMarks();
     // we don't want to request integrators for state with an empty list of ids.
     if (!annotations.length) {
-      onLoadComplete && onLoadComplete({
-        numberOfUnresolvedInlineComments: 0
-      });
       return;
     }
     var ids = annotations.map(function (mark) {
@@ -37,12 +33,7 @@ export var useLoadAnnotations = function useLoadAnnotations(_ref) {
         return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, value.id, value));
       }, {});
       updateSubscriberInlineComment.emit(AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
-      onLoadComplete && onLoadComplete({
-        numberOfUnresolvedInlineComments: data.filter(function (data) {
-          return data.state === 'active';
-        }).length
-      });
     };
     inlineCommentGetState(ids, isNestedRender).then(cb);
-  }, [actions, providers, adfDocument, isNestedRender, onLoadComplete]);
+  }, [actions, providers, adfDocument, isNestedRender]);
 };

package/dist/esm/ui/annotations/index.js

@@ -10,12 +10,10 @@ import { AnnotationRangeProvider } from './contexts/AnnotationRangeContext';
 import { AnnotationHoverContext } from './contexts/AnnotationHoverContext';
 var LoadAnnotations = /*#__PURE__*/React.memo(function (_ref) {
   var adfDocument = _ref.adfDocument,
-    isNestedRender = _ref.isNestedRender,
-    onLoadComplete = _ref.onLoadComplete;
+    isNestedRender = _ref.isNestedRender;
   useLoadAnnotations({
     adfDocument: adfDocument,
-    isNestedRender: isNestedRender,
-    onLoadComplete: onLoadComplete
+    isNestedRender: isNestedRender
   });
   return null;
 });
@@ -33,8 +31,7 @@ export var AnnotationsWrapper = function AnnotationsWrapper(props) {
     annotationProvider = props.annotationProvider,
     rendererRef = props.rendererRef,
     adfDocument = props.adfDocument,
-    isNestedRender = props.isNestedRender,
-    onLoadComplete = props.onLoadComplete;
+    isNestedRender = props.isNestedRender;
   var updateSubscriber = annotationProvider && annotationProvider.inlineComment && annotationProvider.inlineComment.updateSubscriber;
   var inlineCommentAnnotationsState = useAnnotationStateByTypeEvent({
     type: AnnotationTypes.INLINE_COMMENT,
@@ -53,8 +50,7 @@ export var AnnotationsWrapper = function AnnotationsWrapper(props) {
     rendererRef: rendererRef
   }, /*#__PURE__*/React.createElement(LoadAnnotations, {
     adfDocument: adfDocument,
-    isNestedRender: isNestedRender,
-    onLoadComplete: onLoadComplete
+    isNestedRender: isNestedRender
   }), /*#__PURE__*/React.createElement(AnnotationView, {
     createAnalyticsEvent: createAnalyticsEvent
   }), children)))));

package/dist/types/ui/annotations/hooks/use-load-annotations.d.ts

@@ -2,9 +2,6 @@ import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 type Props = {
     adfDocument: JSONDocNode;
     isNestedRender: boolean;
-    onLoadComplete?: ({ numberOfUnresolvedInlineComments, }: {
-        numberOfUnresolvedInlineComments: number;
-    }) => void;
 };
-export declare const useLoadAnnotations: ({ adfDocument, isNestedRender, onLoadComplete }: Props) => void;
+export declare const useLoadAnnotations: ({ adfDocument, isNestedRender }: Props) => void;
 export {};

package/dist/types-ts4.5/ui/annotations/hooks/use-load-annotations.d.ts

@@ -2,9 +2,6 @@ import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 type Props = {
     adfDocument: JSONDocNode;
     isNestedRender: boolean;
-    onLoadComplete?: ({ numberOfUnresolvedInlineComments, }: {
-        numberOfUnresolvedInlineComments: number;
-    }) => void;
 };
-export declare const useLoadAnnotations: ({ adfDocument, isNestedRender, onLoadComplete }: Props) => void;
+export declare const useLoadAnnotations: ({ adfDocument, isNestedRender }: Props) => void;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "111.1.2",
+	"version": "111.1.4",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/button": "^20.2.0",
 		"@atlaskit/code": "^15.6.0",
-		"@atlaskit/editor-common": "^93.0.0",
+		"@atlaskit/editor-common": "^93.1.0",
 		"@atlaskit/editor-json-transformer": "^8.18.0",
 		"@atlaskit/editor-palette": "1.6.1",
 		"@atlaskit/editor-prosemirror": "6.0.0",
@@ -37,7 +37,7 @@
 		"@atlaskit/emoji": "^67.8.0",
 		"@atlaskit/feature-gate-js-client": "^4.19.0",
 		"@atlaskit/icon": "^22.20.0",
-		"@atlaskit/link-datasource": "^3.3.0",
+		"@atlaskit/link-datasource": "^3.4.0",
 		"@atlaskit/media-card": "^78.5.0",
 		"@atlaskit/media-client": "^28.0.0",
 		"@atlaskit/media-client-react": "^2.2.0",