@cntrl-site/sdk-nextjs 0.8.4 → 0.8.5

package/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,15 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myValues">
+        <value>
+          <list size="1">
+            <item index="0" class="java.lang.String" itemvalue="jsx" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

package/lib/utils/RichTextConverter/RichTextConverter.js

@@ -11,8 +11,7 @@ exports.FontStyles = {
 };
 class RichTextConverter {
     toHtml(richText, layouts, hasPreset) {
-        const { text: rawText, blocks = [] } = richText.commonParams;
-        const text = Array.from(rawText); // because of emoji
+        const { text, blocks = [] } = richText.commonParams;
         const root = [];
         const styleRules = layouts.reduce((rec, layout) => {
             rec[layout.id] = [];
@@ -71,18 +70,18 @@ class RichTextConverter {
                 for (const entity of entitiesGroups) {
                     const entityKids = [];
                     if (offset < entity.start) {
-                        kids.push(content.slice(offset, entity.start).join(''));
+                        kids.push(sliceSymbols(content, offset, entity.start));
                         offset = entity.start;
                     }
                     for (const style of entity.stylesGroup) {
                         if (offset < style.start) {
-                            entityKids.push(content.slice(offset, style.start).join(''));
+                            entityKids.push(sliceSymbols(content, offset, style.start));
                         }
-                        entityKids.push((0, jsx_runtime_1.jsx)("span", { className: `s-${style.start}-${style.end}`, children: content.slice(style.start, style.end).join('') }, style.start));
+                        entityKids.push((0, jsx_runtime_1.jsx)("span", { className: `s-${style.start}-${style.end}`, children: sliceSymbols(content, style.start, style.end) }, style.start));
                         offset = style.end;
                     }
                     if (offset < entity.end) {
-                        entityKids.push(content.slice(offset, entity.end).join(''));
+                        entityKids.push(sliceSymbols(content, offset, entity.end));
                         offset = entity.end;
                     }
                     if (entity.link) {
@@ -91,8 +90,8 @@ class RichTextConverter {
                     }
                     kids.push(...entityKids);
                 }
-                if (offset < content.length) {
-                    kids.push(content.slice(offset).join(''));
+                if (offset < getSymbolsCount(content)) {
+                    kids.push(sliceSymbols(content, offset));
                 }
                 for (const item of group) {
                     const entitiesGroups = this.groupEntities(entities, item.styles) ?? [];
@@ -224,3 +223,28 @@ function getResolvedValue(value, name) {
         return value;
     return value ? sdk_1.CntrlColor.parse(value).toCss() : value;
 }
+function sliceSymbols(text, start, end = NaN) {
+    let startOffset = NaN;
+    let endOffset = 0;
+    let count = -1;
+    for (const ch of text) {
+        count += 1;
+        if (count === start) {
+            startOffset = endOffset;
+        }
+        if (count === end)
+            break;
+        endOffset += ch.length;
+    }
+    if (isNaN(startOffset))
+        return '';
+    return text.slice(startOffset, endOffset + 1);
+}
+function getSymbolsCount(input) {
+    let count = 0;
+    let ch;
+    for (ch of input) {
+        count += 1;
+    }
+    return count;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cntrl-site/sdk-nextjs",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "description": "SDK for Next.js",
   "main": "lib/index.js",
   "types": "src/index.js",

package/src/utils/RichTextConverter/RichTextConverter.tsx

@@ -41,8 +41,7 @@ export class RichTextConverter {
     layouts: TLayout[],
     hasPreset: boolean
   ): [ReactNode[], string] {
-    const { text: rawText, blocks = [] } = richText.commonParams;
-    const text = Array.from(rawText); // because of emoji
+    const { text, blocks = [] } = richText.commonParams;
     const root: ReactElement[] = [];
     const styleRules = layouts.reduce<Record<string, string[]>>((rec, layout) => {
       rec[layout.id] = [];
@@ -102,18 +101,18 @@ export class RichTextConverter {
         for (const entity of entitiesGroups) {
           const entityKids: ReactNode[] = [];
           if (offset < entity.start) {
-            kids.push(content.slice(offset, entity.start).join(''));
+            kids.push(sliceSymbols(content, offset, entity.start));
             offset = entity.start;
           }
           for (const style of entity.stylesGroup) {
             if (offset < style.start) {
-              entityKids.push(content.slice(offset, style.start).join(''));
+              entityKids.push(sliceSymbols(content, offset, style.start));
             }
-            entityKids.push(<span key={style.start} className={`s-${style.start}-${style.end}`}>{content.slice(style.start, style.end).join('')}</span>);
+            entityKids.push(<span key={style.start} className={`s-${style.start}-${style.end}`}>{sliceSymbols(content, style.start, style.end)}</span>);
             offset = style.end;
           }
           if (offset < entity.end) {
-            entityKids.push(content.slice(offset, entity.end).join(''));
+            entityKids.push(sliceSymbols(content, offset, entity.end));
             offset = entity.end;
           }
           if (entity.link) {
@@ -122,8 +121,8 @@ export class RichTextConverter {
           }
           kids.push(...entityKids);
         }
-        if (offset < content.length) {
-          kids.push(content.slice(offset).join(''));
+        if (offset < getSymbolsCount(content)) {
+          kids.push(sliceSymbols(content, offset));
         }
         for (const item of group) {
           const entitiesGroups = this.groupEntities(entities, item.styles) ?? [];
@@ -258,3 +257,28 @@ function getResolvedValue(value: string | undefined, name: string) {
   if (name !== 'COLOR') return value;
   return value ? CntrlColor.parse(value).toCss() : value;
 }
+
+function sliceSymbols(text: string, start: number, end: number = NaN): string {
+  let startOffset = NaN;
+  let endOffset = 0;
+  let count = -1;
+  for (const ch of text) {
+    count += 1;
+    if (count === start) {
+      startOffset = endOffset;
+    }
+    if (count === end) break;
+    endOffset += ch.length;
+  }
+  if (isNaN(startOffset)) return '';
+  return text.slice(startOffset, endOffset + 1);
+}
+
+function getSymbolsCount(input: string): number {
+  let count = 0;
+  let ch: string;
+  for (ch of input) {
+    count += 1;
+  }
+  return count;
+}