@atlaskit/renderer 114.0.0 → 114.2.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/renderer
 
+## 114.2.0
+
+### Minor Changes
+
+- [#125286](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/125286)
+  [`c930e08d002dd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c930e08d002dd) -
+  Include non paragraph nodes when rendering comment without surrounding whitespace
+
+### Patch Changes
+
+- Updated dependencies
+
+## 114.1.0
+
+### Minor Changes
+
+- [#124272](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/124272)
+  [`5b434be943575`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5b434be943575) -
+  [ux] Added logic to not render empty text spaces around comment content
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 114.0.0
 
 ### Major Changes

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

@@ -50,6 +50,9 @@ var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_re
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       getChildren: function getChildren() {
         return [];
+      },
+      getChildrenContainer: function getChildrenContainer() {
+        return null;
       }
     };
   }, [updateActiveChild, children]);

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

@@ -67,7 +67,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 = "114.0.0";
+var packageVersion = "114.2.0";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

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

@@ -13,22 +13,29 @@ var removeEmptySpaceAroundContent = exports.removeEmptySpaceAroundContent = func
   if (!document || !document.content || !Array.isArray(document.content)) {
     return document;
   }
-  var isParagraphWithContent = function isParagraphWithContent(node) {
-    if (node.type !== 'paragraph' || !node.content || node.content.length === 0) {
+
+  // Check if the node is a meaningful content node meaning it is not an empty paragraph or a paragraph with only whitespace
+  var isMeaningfulContentNode = function isMeaningfulContentNode(node) {
+    // Check if the node is a non-empty paragraph or a non-paragraph node
+    if (node.type !== 'paragraph') {
+      return true;
+    }
+    // If the paragraph is empty, return false
+    if (!node.content || node.content.length === 0) {
       return false;
     }
-    // Check if paragraph has any content other than `hardBreak`
+    // Check if paragraph has any content other than `hardBreak` or whitespace text nodes
     return node.content.some(function (child) {
-      return (child === null || child === void 0 ? void 0 : child.type) !== 'hardBreak';
+      return !((child === null || child === void 0 ? void 0 : child.type) === 'hardBreak' || (child === null || child === void 0 ? void 0 : child.type) === 'text' && typeof child.text === 'string' && child.text.trim() === '');
     });
   };
   var content = document.content;
   var firstContentIndex = -1;
   var lastContentIndex = -1;
 
-  // Find the first and last paragraphs with content
+  // Find the first and last paragraphs with content and check if they are meaningful
   for (var i = 0; i < content.length; i++) {
-    if (isParagraphWithContent(content[i])) {
+    if (isMeaningfulContentNode(content[i])) {
       if (firstContentIndex === -1) {
         firstContentIndex = i;
       }

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

@@ -39,6 +39,9 @@ const useMultiBodiedExtensionActions = ({
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       getChildren() {
         return [];
+      },
+      getChildrenContainer() {
+        return null;
       }
     };
   }, [updateActiveChild, children]);

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

@@ -48,7 +48,7 @@ import { removeEmptySpaceAroundContent } from './rendererHelper';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "114.0.0";
+const packageVersion = "114.2.0";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

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

@@ -3,20 +3,29 @@ export const removeEmptySpaceAroundContent = document => {
   if (!document || !document.content || !Array.isArray(document.content)) {
     return document;
   }
-  const isParagraphWithContent = node => {
-    if (node.type !== 'paragraph' || !node.content || node.content.length === 0) {
+
+  // Check if the node is a meaningful content node meaning it is not an empty paragraph or a paragraph with only whitespace
+  const isMeaningfulContentNode = node => {
+    // Check if the node is a non-empty paragraph or a non-paragraph node
+    if (node.type !== 'paragraph') {
+      return true;
+    }
+    // If the paragraph is empty, return false
+    if (!node.content || node.content.length === 0) {
       return false;
     }
-    // Check if paragraph has any content other than `hardBreak`
-    return node.content.some(child => (child === null || child === void 0 ? void 0 : child.type) !== 'hardBreak');
+    // Check if paragraph has any content other than `hardBreak` or whitespace text nodes
+    return node.content.some(child => {
+      return !((child === null || child === void 0 ? void 0 : child.type) === 'hardBreak' || (child === null || child === void 0 ? void 0 : child.type) === 'text' && typeof child.text === 'string' && child.text.trim() === '');
+    });
   };
   const content = document.content;
   let firstContentIndex = -1;
   let lastContentIndex = -1;
 
-  // Find the first and last paragraphs with content
+  // Find the first and last paragraphs with content and check if they are meaningful
   for (let i = 0; i < content.length; i++) {
-    if (isParagraphWithContent(content[i])) {
+    if (isMeaningfulContentNode(content[i])) {
       if (firstContentIndex === -1) {
         firstContentIndex = i;
       }

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

@@ -41,6 +41,9 @@ var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_re
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       getChildren: function getChildren() {
         return [];
+      },
+      getChildrenContainer: function getChildrenContainer() {
+        return null;
       }
     };
   }, [updateActiveChild, children]);

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

@@ -57,7 +57,7 @@ import { removeEmptySpaceAroundContent } from './rendererHelper';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "114.0.0";
+var packageVersion = "114.2.0";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

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

@@ -6,22 +6,29 @@ export var removeEmptySpaceAroundContent = function removeEmptySpaceAroundConten
   if (!document || !document.content || !Array.isArray(document.content)) {
     return document;
   }
-  var isParagraphWithContent = function isParagraphWithContent(node) {
-    if (node.type !== 'paragraph' || !node.content || node.content.length === 0) {
+
+  // Check if the node is a meaningful content node meaning it is not an empty paragraph or a paragraph with only whitespace
+  var isMeaningfulContentNode = function isMeaningfulContentNode(node) {
+    // Check if the node is a non-empty paragraph or a non-paragraph node
+    if (node.type !== 'paragraph') {
+      return true;
+    }
+    // If the paragraph is empty, return false
+    if (!node.content || node.content.length === 0) {
       return false;
     }
-    // Check if paragraph has any content other than `hardBreak`
+    // Check if paragraph has any content other than `hardBreak` or whitespace text nodes
     return node.content.some(function (child) {
-      return (child === null || child === void 0 ? void 0 : child.type) !== 'hardBreak';
+      return !((child === null || child === void 0 ? void 0 : child.type) === 'hardBreak' || (child === null || child === void 0 ? void 0 : child.type) === 'text' && typeof child.text === 'string' && child.text.trim() === '');
     });
   };
   var content = document.content;
   var firstContentIndex = -1;
   var lastContentIndex = -1;
 
-  // Find the first and last paragraphs with content
+  // Find the first and last paragraphs with content and check if they are meaningful
   for (var i = 0; i < content.length; i++) {
-    if (isParagraphWithContent(content[i])) {
+    if (isMeaningfulContentNode(content[i])) {
       if (firstContentIndex === -1) {
         firstContentIndex = i;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "114.0.0",
+	"version": "114.2.0",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -31,14 +31,14 @@
 		"@atlaskit/analytics-next": "^11.0.0",
 		"@atlaskit/button": "^21.1.0",
 		"@atlaskit/code": "^16.0.0",
-		"@atlaskit/editor-common": "^102.3.0",
+		"@atlaskit/editor-common": "^102.4.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-palette": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/emoji": "^68.0.0",
 		"@atlaskit/feature-gate-js-client": "^4.26.0",
-		"@atlaskit/icon": "^24.1.0",
+		"@atlaskit/icon": "^25.0.0",
 		"@atlaskit/link-datasource": "^3.22.0",
 		"@atlaskit/media-card": "^79.0.0",
 		"@atlaskit/media-client": "^32.0.0",
@@ -53,7 +53,7 @@
 		"@atlaskit/status": "^3.0.0",
 		"@atlaskit/task-decision": "^19.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^3.5.0",
+		"@atlaskit/tmp-editor-statsig": "^3.6.0",
 		"@atlaskit/tokens": "^4.4.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@atlaskit/visually-hidden": "^3.0.0",