@atlaskit/renderer 109.12.0 → 109.12.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/renderer
 
+## 109.12.1
+
+### Patch Changes
+
+- [#85780](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/85780) [`f9127d5f97ed`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f9127d5f97ed) - Add marks to TextHighlighter component
+
 ## 109.12.0
 
 ### Minor Changes

package/dist/cjs/react/index.js

@@ -315,15 +315,18 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
           key: textKey,
           startPos: startPos + parentDepth,
           endPos: endPos + parentDepth
-        }, this.renderTextSegments(segments, textKey));
+        }, this.renderTextSegments(segments, textKey, mark));
       }
-      return this.renderTextSegments(segments, textKey);
+      return this.renderTextSegments(segments, textKey, mark);
     }
   }, {
     key: "renderTextSegments",
-    value: function renderTextSegments(segments, key) {
+    value: function renderTextSegments(segments, key, text) {
       var _this$textHighlighter;
       var Component = (_this$textHighlighter = this.textHighlighter) === null || _this$textHighlighter === void 0 ? void 0 : _this$textHighlighter.component;
+      var marks = new Set(text.marks.map(function (m) {
+        return m.type.name;
+      }));
       function renderSegment(segment) {
         var idx = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
         if (segment.type === 'plain' || !Component) {
@@ -332,6 +335,7 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
         return /*#__PURE__*/_react.default.createElement(Component, {
           match: segment.text,
           groups: segment.groups,
+          marks: marks,
           key: "".concat(segment.text, "_").concat(idx)
         }, segment.text);
       }
@@ -370,14 +374,14 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
       // TODO: https://product-fabric.atlassian.net/browse/CEMS-1048
       var stickyHeaders = !(0, _rendererNode.insideBreakoutLayout)(path) ? this.stickyHeaders : undefined;
       var isInsideOfBlockNode = (0, _rendererNode.insideBlockNode)(path, node.type.schema);
-      var isinsideMultiBodiedExtension = (0, _rendererNode.insideMultiBodiedExtension)(path, node.type.schema);
+      var isInsideMultiBodiedExtension = (0, _rendererNode.insideMultiBodiedExtension)(path, node.type.schema);
       return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
         allowColumnSorting: this.allowColumnSorting,
         columnWidths: (0, _utils.calcTableColumnWidths)(node),
         tableNode: node,
         stickyHeaders: stickyHeaders,
         isInsideOfBlockNode: isInsideOfBlockNode,
-        isinsideMultiBodiedExtension: isinsideMultiBodiedExtension
+        isInsideMultiBodiedExtension: isInsideMultiBodiedExtension
       });
     }
   }, {

package/dist/cjs/react/utils/segment-text.js

@@ -17,8 +17,8 @@ function segmentText(text, highlighter) {
   var segments = [];
   var pos = 0;
   try {
-    var markTextSeggmentMatches = text.matchAll(highlighter.pattern);
-    var _iterator = _createForOfIteratorHelper(markTextSeggmentMatches),
+    var markTextSegmentMatches = text.matchAll(highlighter.pattern);
+    var _iterator = _createForOfIteratorHelper(markTextSegmentMatches),
       _step;
     try {
       var _loop = function _loop() {

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

package/dist/es2019/react/index.js

@@ -283,13 +283,14 @@ export default class ReactSerializer {
         key: textKey,
         startPos: startPos + parentDepth,
         endPos: endPos + parentDepth
-      }, this.renderTextSegments(segments, textKey));
+      }, this.renderTextSegments(segments, textKey, mark));
     }
-    return this.renderTextSegments(segments, textKey);
+    return this.renderTextSegments(segments, textKey, mark);
   }
-  renderTextSegments(segments, key) {
+  renderTextSegments(segments, key, text) {
     var _this$textHighlighter;
     const Component = (_this$textHighlighter = this.textHighlighter) === null || _this$textHighlighter === void 0 ? void 0 : _this$textHighlighter.component;
+    const marks = new Set(text.marks.map(m => m.type.name));
     function renderSegment(segment, idx = 0) {
       if (segment.type === 'plain' || !Component) {
         return segment.text;
@@ -297,6 +298,7 @@ export default class ReactSerializer {
       return /*#__PURE__*/React.createElement(Component, {
         match: segment.text,
         groups: segment.groups,
+        marks: marks,
         key: `${segment.text}_${idx}`
       }, segment.text);
     }
@@ -327,7 +329,7 @@ export default class ReactSerializer {
     // TODO: https://product-fabric.atlassian.net/browse/CEMS-1048
     const stickyHeaders = !insideBreakoutLayout(path) ? this.stickyHeaders : undefined;
     const isInsideOfBlockNode = insideBlockNode(path, node.type.schema);
-    const isinsideMultiBodiedExtension = insideMultiBodiedExtension(path, node.type.schema);
+    const isInsideMultiBodiedExtension = insideMultiBodiedExtension(path, node.type.schema);
     return {
       ...this.getProps(node),
       allowColumnSorting: this.allowColumnSorting,
@@ -335,7 +337,7 @@ export default class ReactSerializer {
       tableNode: node,
       stickyHeaders,
       isInsideOfBlockNode,
-      isinsideMultiBodiedExtension
+      isInsideMultiBodiedExtension
     };
   }
   getDateProps(node, parentInfo) {

package/dist/es2019/react/utils/segment-text.js

@@ -8,8 +8,8 @@ export function segmentText(text, highlighter) {
   const segments = [];
   let pos = 0;
   try {
-    const markTextSeggmentMatches = text.matchAll(highlighter.pattern);
-    for (const markTextMatch of markTextSeggmentMatches) {
+    const markTextSegmentMatches = text.matchAll(highlighter.pattern);
+    for (const markTextMatch of markTextSegmentMatches) {
       if (markTextMatch.index !== 0) {
         segments.push({
           type: 'plain',

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.0";
+const packageVersion = "109.12.1";
 export class Renderer extends PureComponent {
   constructor(props) {
     super(props);

package/dist/esm/react/index.js

@@ -308,15 +308,18 @@ var ReactSerializer = /*#__PURE__*/function () {
           key: textKey,
           startPos: startPos + parentDepth,
           endPos: endPos + parentDepth
-        }, this.renderTextSegments(segments, textKey));
+        }, this.renderTextSegments(segments, textKey, mark));
       }
-      return this.renderTextSegments(segments, textKey);
+      return this.renderTextSegments(segments, textKey, mark);
     }
   }, {
     key: "renderTextSegments",
-    value: function renderTextSegments(segments, key) {
+    value: function renderTextSegments(segments, key, text) {
       var _this$textHighlighter;
       var Component = (_this$textHighlighter = this.textHighlighter) === null || _this$textHighlighter === void 0 ? void 0 : _this$textHighlighter.component;
+      var marks = new Set(text.marks.map(function (m) {
+        return m.type.name;
+      }));
       function renderSegment(segment) {
         var idx = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
         if (segment.type === 'plain' || !Component) {
@@ -325,6 +328,7 @@ var ReactSerializer = /*#__PURE__*/function () {
         return /*#__PURE__*/React.createElement(Component, {
           match: segment.text,
           groups: segment.groups,
+          marks: marks,
           key: "".concat(segment.text, "_").concat(idx)
         }, segment.text);
       }
@@ -363,14 +367,14 @@ var ReactSerializer = /*#__PURE__*/function () {
       // TODO: https://product-fabric.atlassian.net/browse/CEMS-1048
       var stickyHeaders = !insideBreakoutLayout(path) ? this.stickyHeaders : undefined;
       var isInsideOfBlockNode = insideBlockNode(path, node.type.schema);
-      var isinsideMultiBodiedExtension = insideMultiBodiedExtension(path, node.type.schema);
+      var isInsideMultiBodiedExtension = insideMultiBodiedExtension(path, node.type.schema);
       return _objectSpread(_objectSpread({}, this.getProps(node)), {}, {
         allowColumnSorting: this.allowColumnSorting,
         columnWidths: calcTableColumnWidths(node),
         tableNode: node,
         stickyHeaders: stickyHeaders,
         isInsideOfBlockNode: isInsideOfBlockNode,
-        isinsideMultiBodiedExtension: isinsideMultiBodiedExtension
+        isInsideMultiBodiedExtension: isInsideMultiBodiedExtension
       });
     }
   }, {

package/dist/esm/react/utils/segment-text.js

@@ -11,8 +11,8 @@ export function segmentText(text, highlighter) {
   var segments = [];
   var pos = 0;
   try {
-    var markTextSeggmentMatches = text.matchAll(highlighter.pattern);
-    var _iterator = _createForOfIteratorHelper(markTextSeggmentMatches),
+    var markTextSegmentMatches = text.matchAll(highlighter.pattern);
+    var _iterator = _createForOfIteratorHelper(markTextSegmentMatches),
       _step;
     try {
       var _loop = function _loop() {

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.0";
+var packageVersion = "109.12.1";
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

package/dist/types/react/types.d.ts

@@ -62,6 +62,7 @@ export type TextHighlighter = {
     component: React.ComponentType<{
         children: React.ReactNode;
         match: string;
+        marks: Set<string>;
         groups: Array<string> | undefined;
     }>;
 };

package/dist/types-ts4.5/react/types.d.ts

@@ -62,6 +62,7 @@ export type TextHighlighter = {
     component: React.ComponentType<{
         children: React.ReactNode;
         match: string;
+        marks: Set<string>;
         groups: Array<string> | undefined;
     }>;
 };

package/package.json

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