@atlaskit/renderer 109.12.2 → 109.12.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/renderer
 
+## 109.12.4
+
+### Patch Changes
+
+- [#85294](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/85294) [`be63992e342e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/be63992e342e) - Fixes bug regarding datasources not expanding to full width in renderer
+
+## 109.12.3
+
+### Patch Changes
+
+- [#85984](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/85984) [`3689328bd7c4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3689328bd7c4) - Fix resolvePos for renderer TextHighlight
+
 ## 109.12.2
 
 ### Patch Changes

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

@@ -22,11 +22,10 @@ var _utils2 = require("@atlaskit/editor-common/utils");
 
 var datasourceContainerStyle = (0, _react2.css)({
   borderRadius: "var(--ds-border-radius-200, 8px)",
-  border: "1px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")"))
-});
-var parentContainerStyle = (0, _react2.css)({
-  display: 'flex',
-  justifyContent: 'center'
+  border: "1px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")")),
+  // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
+  marginLeft: '50%',
+  transform: 'translateX(-50%)'
 });
 function BlockCard(props) {
   var url = props.url,
@@ -104,8 +103,6 @@ function BlockCard(props) {
       }, cardProps), (0, _react2.jsx)(_ui.WidthConsumer, null, function (_ref5) {
         var width = _ref5.width;
         return (0, _react2.jsx)("div", {
-          css: parentContainerStyle
-        }, (0, _react2.jsx)("div", {
           css: datasourceContainerStyle,
           "data-testid": "renderer-datasource-table",
           style: {
@@ -118,7 +115,7 @@ function BlockCard(props) {
           columnCustomSizes: columnCustomSizes,
           wrappedColumnKeys: wrappedColumnKeys && wrappedColumnKeys.length > 0 ? wrappedColumnKeys : undefined,
           url: url
-        })));
+        }));
       })));
     }
     return (0, _react2.jsx)(_inlineCard.default, {

package/dist/cjs/steps/index.js

@@ -41,7 +41,7 @@ function isTextNode(node) {
 }
 function isHighlightTextNode(node) {
   var _dataset;
-  return !!((_dataset = node.dataset) !== null && _dataset !== void 0 && _dataset.highlighted);
+  return !!(node !== null && node !== void 0 && (_dataset = node.dataset) !== null && _dataset !== void 0 && _dataset.highlighted);
 }
 function isNodeInlineMark(node) {
   return isElementNode(node) && Boolean(node.dataset.rendererMark);
@@ -70,7 +70,7 @@ function isRoot(element) {
   return !!element && element.classList.contains('ak-renderer-document');
 }
 function resolvePos(node, offset) {
-  // If the passed node doesnt exist, we should abort
+  // If the passed node doesn't exist, we should abort
   if (!node) {
     return false;
   }
@@ -88,12 +88,12 @@ function resolvePos(node, offset) {
   var current = node;
   if (current.parentElement && current.parentElement !== parent) {
     // Find the parent element that is a direct child of the position pointer
-    // the outter most element from our text position.
+    // the outer most element from our text position.
     var preParentPointer = findParentBeforePointer(current.parentElement);
     // If our range is inside an inline node
     // We need to move our pointers to parent element
-    // since we dont want to count text inside inline nodes at all
-    if (!isElementInlineMark(preParentPointer)) {
+    // since we don't want to count text inside inline nodes at all
+    if (!(isElementInlineMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
       current = current.parentElement;
       offset = 0;
     }

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

@@ -55,7 +55,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 = "109.12.2";
+var packageVersion = "109.12.4";
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

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

@@ -14,11 +14,10 @@ import { N40 } from '@atlaskit/theme/colors';
 import { calcBreakoutWidth, canRenderDatasource } from '@atlaskit/editor-common/utils';
 const datasourceContainerStyle = css({
   borderRadius: `${"var(--ds-border-radius-200, 8px)"}`,
-  border: `1px solid ${`var(--ds-border, ${N40})`}`
-});
-const parentContainerStyle = css({
-  display: 'flex',
-  justifyContent: 'center'
+  border: `1px solid ${`var(--ds-border, ${N40})`}`,
+  // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
+  marginLeft: '50%',
+  transform: 'translateX(-50%)'
 });
 export default function BlockCard(props) {
   const {
@@ -90,8 +89,6 @@ export default function BlockCard(props) {
       }, cardProps), jsx(WidthConsumer, null, ({
         width
       }) => jsx("div", {
-        css: parentContainerStyle
-      }, jsx("div", {
         css: datasourceContainerStyle,
         "data-testid": "renderer-datasource-table",
         style: {
@@ -104,7 +101,7 @@ export default function BlockCard(props) {
         columnCustomSizes: columnCustomSizes,
         wrappedColumnKeys: wrappedColumnKeys && wrappedColumnKeys.length > 0 ? wrappedColumnKeys : undefined,
         url: url
-      }))))));
+      })))));
     }
     return jsx(InlineCard, {
       data: data,

package/dist/es2019/steps/index.js

@@ -37,7 +37,7 @@ function isTextNode(node) {
 }
 function isHighlightTextNode(node) {
   var _dataset;
-  return !!((_dataset = node.dataset) !== null && _dataset !== void 0 && _dataset.highlighted);
+  return !!(node !== null && node !== void 0 && (_dataset = node.dataset) !== null && _dataset !== void 0 && _dataset.highlighted);
 }
 function isNodeInlineMark(node) {
   return isElementNode(node) && Boolean(node.dataset.rendererMark);
@@ -66,7 +66,7 @@ function isRoot(element) {
   return !!element && element.classList.contains('ak-renderer-document');
 }
 export function resolvePos(node, offset) {
-  // If the passed node doesnt exist, we should abort
+  // If the passed node doesn't exist, we should abort
   if (!node) {
     return false;
   }
@@ -84,12 +84,12 @@ export function resolvePos(node, offset) {
   let current = node;
   if (current.parentElement && current.parentElement !== parent) {
     // Find the parent element that is a direct child of the position pointer
-    // the outter most element from our text position.
+    // the outer most element from our text position.
     const preParentPointer = findParentBeforePointer(current.parentElement);
     // If our range is inside an inline node
     // We need to move our pointers to parent element
-    // since we dont want to count text inside inline nodes at all
-    if (!isElementInlineMark(preParentPointer)) {
+    // since we don't want to count text inside inline nodes at all
+    if (!(isElementInlineMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
       current = current.parentElement;
       offset = 0;
     }

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

@@ -36,7 +36,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "109.12.2";
+const packageVersion = "109.12.4";
 export class Renderer extends PureComponent {
   constructor(props) {
     super(props);

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

@@ -14,11 +14,10 @@ import { N40 } from '@atlaskit/theme/colors';
 import { calcBreakoutWidth, canRenderDatasource } from '@atlaskit/editor-common/utils';
 var datasourceContainerStyle = css({
   borderRadius: "var(--ds-border-radius-200, 8px)",
-  border: "1px solid ".concat("var(--ds-border, ".concat(N40, ")"))
-});
-var parentContainerStyle = css({
-  display: 'flex',
-  justifyContent: 'center'
+  border: "1px solid ".concat("var(--ds-border, ".concat(N40, ")")),
+  // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
+  marginLeft: '50%',
+  transform: 'translateX(-50%)'
 });
 export default function BlockCard(props) {
   var url = props.url,
@@ -96,8 +95,6 @@ export default function BlockCard(props) {
       }, cardProps), jsx(WidthConsumer, null, function (_ref5) {
         var width = _ref5.width;
         return jsx("div", {
-          css: parentContainerStyle
-        }, jsx("div", {
           css: datasourceContainerStyle,
           "data-testid": "renderer-datasource-table",
           style: {
@@ -110,7 +107,7 @@ export default function BlockCard(props) {
           columnCustomSizes: columnCustomSizes,
           wrappedColumnKeys: wrappedColumnKeys && wrappedColumnKeys.length > 0 ? wrappedColumnKeys : undefined,
           url: url
-        })));
+        }));
       })));
     }
     return jsx(InlineCard, {

package/dist/esm/steps/index.js

@@ -33,7 +33,7 @@ function isTextNode(node) {
 }
 function isHighlightTextNode(node) {
   var _dataset;
-  return !!((_dataset = node.dataset) !== null && _dataset !== void 0 && _dataset.highlighted);
+  return !!(node !== null && node !== void 0 && (_dataset = node.dataset) !== null && _dataset !== void 0 && _dataset.highlighted);
 }
 function isNodeInlineMark(node) {
   return isElementNode(node) && Boolean(node.dataset.rendererMark);
@@ -62,7 +62,7 @@ function isRoot(element) {
   return !!element && element.classList.contains('ak-renderer-document');
 }
 export function resolvePos(node, offset) {
-  // If the passed node doesnt exist, we should abort
+  // If the passed node doesn't exist, we should abort
   if (!node) {
     return false;
   }
@@ -80,12 +80,12 @@ export function resolvePos(node, offset) {
   var current = node;
   if (current.parentElement && current.parentElement !== parent) {
     // Find the parent element that is a direct child of the position pointer
-    // the outter most element from our text position.
+    // the outer most element from our text position.
     var preParentPointer = findParentBeforePointer(current.parentElement);
     // If our range is inside an inline node
     // We need to move our pointers to parent element
-    // since we dont want to count text inside inline nodes at all
-    if (!isElementInlineMark(preParentPointer)) {
+    // since we don't want to count text inside inline nodes at all
+    if (!(isElementInlineMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
       current = current.parentElement;
       offset = 0;
     }

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

@@ -46,7 +46,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "109.12.2";
+var packageVersion = "109.12.4";
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "109.12.2",
+  "version": "109.12.4",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"