@cntrl-site/sdk-nextjs 0.0.10 → 0.0.13

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/components/LinkWrapper.js

@@ -2,5 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LinkWrapper = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const LinkWrapper = ({ url, children }) => (url ? (0, jsx_runtime_1.jsx)("a", { href: url, target: "_blank", rel: "noreferrer", children: children }) : (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children }));
+const LinkWrapper = ({ url, children }) => {
+    return url ? ((0, jsx_runtime_1.jsx)("a", { href: !url.startsWith('http://') && !url.startsWith('https://') && !url.startsWith('/') ? `//${url}` : url, target: url.startsWith('/') ? '_self' : '_blank', rel: "noreferrer", children: children })) : ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children }));
+};
 exports.LinkWrapper = LinkWrapper;

package/lib/utils/RichTextConverter.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RichTextConverter = exports.FontStyles = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const core_1 = require("@cntrl-site/core");
+const LinkWrapper_1 = require("../components/LinkWrapper");
 exports.FontStyles = {
     'normal': {},
     'bold': { 'font-weight': 'bold' },
@@ -81,7 +82,7 @@ class RichTextConverter {
                         offset = entity.end;
                     }
                     if (entity.link) {
-                        kids.push((0, jsx_runtime_1.jsx)("a", { target: "_blank", href: entity.link, rel: "noreferrer", children: entityKids }, entity.start));
+                        kids.push((0, jsx_runtime_1.jsx)(LinkWrapper_1.LinkWrapper, { url: entity.link, children: entityKids }, entity.start));
                         continue;
                     }
                     kids.push(...entityKids);
@@ -184,7 +185,7 @@ class RichTextConverter {
         const { value, name } = draftStyle;
         const map = {
             'COLOR': { 'color': value },
-            'TYPEFACE': { 'font-family': `"${value}"` },
+            'TYPEFACE': { 'font-family': `${value}` },
             'FONTSTYLE': value ? { ...exports.FontStyles[value] } : {},
             'FONTWEIGHT': { 'font-weight': value },
             'FONTSIZE': { 'font-size': `${parseFloat(value) * 100}vw` },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cntrl-site/sdk-nextjs",
-  "version": "0.0.10",
+  "version": "0.0.13",
   "description": "SDK for Next.js",
   "main": "lib/index.js",
   "types": "src/index.js",
@@ -21,8 +21,8 @@
   },
   "homepage": "https://github.com/cntrl-site/sdk-nextjs#readme",
   "dependencies": {
-    "@cntrl-site/core": "^1.0.7",
-    "@cntrl-site/sdk": "^0.0.3",
+    "@cntrl-site/core": "^1.0.9",
+    "@cntrl-site/sdk": "^0.0.7",
     "html-react-parser": "^3.0.1",
     "styled-jsx": "^5.0.2"
   },

package/src/components/LinkWrapper.tsx

@@ -1,9 +1,22 @@
-import React, { ReactElement } from 'react';
+import React, { MouseEvent, ReactElement, ReactNode, useEffect } from 'react';
 
 interface Props {
   url?: string;
-  children: ReactElement;
+  children: ReactElement | ReactNode[];
 }
 
-export const LinkWrapper: React.FC<Props> = ({ url, children }) => (
-    url ? <a href={url} target="_blank" rel="noreferrer">{children}</a> : <>{children}</>);
+export const LinkWrapper: React.FC<Props> = ({ url, children }) => {
+  return url ? (
+    <a
+      href={!url.startsWith('http://') && !url.startsWith('https://') && !url.startsWith('/') ? `//${url}`: url}
+      target={url.startsWith('/') ? '_self' : '_blank'}
+      rel="noreferrer"
+    >
+      {children}
+    </a>
+  ) : (
+    <>{children}</>
+  );
+};
+
+

package/src/utils/RichTextConverter.tsx

@@ -8,6 +8,7 @@ import {
   getClosestLayoutValue,
   getLayoutMediaQuery
 } from '@cntrl-site/core';
+import { LinkWrapper } from '../components/LinkWrapper';
 
 interface StyleGroup {
   start: number;
@@ -110,7 +111,7 @@ export class RichTextConverter {
             offset = entity.end;
           }
           if (entity.link) {
-            kids.push(<a key={entity.start} target="_blank" href={entity.link} rel="noreferrer">{entityKids}</a>);
+            kids.push(<LinkWrapper key={entity.start} url={entity.link} >{entityKids}</LinkWrapper>);
             continue;
           }
           kids.push(...entityKids);
@@ -216,7 +217,7 @@ export class RichTextConverter {
     const { value, name } = draftStyle;
     const map: Record<string, Record<string, string | undefined>> = {
       'COLOR': { 'color': value },
-      'TYPEFACE': { 'font-family': `"${value}"` },
+      'TYPEFACE': { 'font-family': `${value}` },
       'FONTSTYLE': value ? { ...FontStyles[value] } : {},
       'FONTWEIGHT': { 'font-weight': value },
       'FONTSIZE': { 'font-size': `${parseFloat(value!) * 100}vw` },