@arkyn/components 1.3.121 → 1.3.123

package/dist/components/RichText/functions/deserialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deserialize.d.ts","sourceRoot":"","sources":["../../../../src/components/RichText/functions/deserialize.ts"],"names":[],"mappings":"AA8CA,QAAA,MAAM,gBAAgB,SAAU,MAAM,mFAarC,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"deserialize.d.ts","sourceRoot":"","sources":["../../../../src/components/RichText/functions/deserialize.ts"],"names":[],"mappings":"AAiDA,QAAA,MAAM,gBAAgB,SAAU,MAAM,mFAarC,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/components/RichText/functions/deserialize.js

@@ -8,6 +8,7 @@ const deserialize = (el) => {
     const children = Array.isArray(el.props.children)
         ? parsedChildren(el.props.children)
         : [{ text: el.props.children }];
+    const childrenString = typeof el.props.children === "string" ? el.props.children : "";
     switch (el.type) {
         case "p":
             return { type: "paragraph", children };
@@ -24,15 +25,15 @@ const deserialize = (el) => {
         case "ol":
             return { type: "numberedList", children };
         case "strong":
-            return { text: "", children, bold: true };
+            return { text: childrenString, bold: true };
         case "code":
-            return { text: "", children, code: true };
+            return { text: childrenString, code: true };
         case "em":
-            return { text: "", children, italic: true };
+            return { text: childrenString, italic: true };
         case "u":
-            return { text: "", children, underline: true };
+            return { text: childrenString, underline: true };
         default:
-            return { text: "", children };
+            return { text: childrenString };
     }
 };
 const getSlateFromHtml = (html) => {

package/dist/components/RichText/functions/isHtml.d.ts

@@ -0,0 +1,3 @@
+declare const isHtml: (str: string) => boolean;
+export { isHtml };
+//# sourceMappingURL=isHtml.d.ts.map

package/dist/components/RichText/functions/isHtml.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isHtml.d.ts","sourceRoot":"","sources":["../../../../src/components/RichText/functions/isHtml.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,MAAM,QAAS,MAAM,KAAG,OAG7B,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,CAAC"}

package/dist/components/RichText/functions/isHtml.js

@@ -0,0 +1,5 @@
+const isHtml = (str) => {
+    const htmlRegex = /<\/?[a-z][\s\S]*>/i;
+    return htmlRegex.test(str);
+};
+export { isHtml };

package/dist/components/RichText/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/RichText/index.tsx"],"names":[],"mappings":"AAeA,OAAO,EAAgB,UAAU,EAAc,MAAM,OAAO,CAAC;AAc7D,OAAO,cAAc,CAAC;AAMtB,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,uBAAuB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,IAAI,CAAC;IACzC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC,CAAC;AAEF,iBAAS,QAAQ,CAAC,EAChB,IAAI,EACJ,YAAY,EACZ,qBAA6B,EAC7B,uBAAuB,EACvB,QAAe,EACf,aAAa,EACb,QAAQ,EACR,OAAO,EAAE,WAAW,GACrB,EAAE,aAAa,2CAwGf;AAED,OAAO,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/RichText/index.tsx"],"names":[],"mappings":"AAeA,OAAO,EAAgB,UAAU,EAAc,MAAM,OAAO,CAAC;AAc7D,OAAO,cAAc,CAAC;AAOtB,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,uBAAuB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,IAAI,CAAC;IACzC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC,CAAC;AAEF,iBAAS,QAAQ,CAAC,EAChB,IAAI,EACJ,YAAY,EACZ,qBAA6B,EAC7B,uBAAuB,EACvB,QAAe,EACf,aAAa,EACb,QAAQ,EACR,OAAO,EAAE,WAAW,GACrB,EAAE,aAAa,2CA2Gf;AAED,OAAO,EAAE,QAAQ,EAAE,CAAC"}

package/dist/components/RichText/index.js

@@ -18,16 +18,17 @@ import "./styles.css";
 import { getSlateFromHtml } from "./functions/deserialize";
 import { extractText } from "./functions/extractText";
 import { getHtmlFromSlate } from "./functions/serialize";
+import { isHtml } from "./functions/isHtml";
 function RichText({ name, defaultValue, enforceCharacterLimit = false, onChangeCharactersCount, maxLimit = 2000, onValueChange, onChange, isError: baseIsError, }) {
     const editor = useMemo(() => withHistory(withReact(createEditor())), []);
     const { id, inputRef, error } = useFormController();
     const baseRef = useRef(null);
-    const defaultNodes = defaultValue
+    const defaultNodes = isHtml(defaultValue)
         ? getSlateFromHtml(defaultValue)
         : INITIAL_VALUE;
     const textFromNodes = extractText(defaultNodes);
     const [charactersCount, setCharactersCount] = useState(textFromNodes.length);
-    const [inputValue, setInputValue] = useState(defaultValue);
+    const [inputValue, setInputValue] = useState(isHtml(defaultValue) ? defaultValue : "");
     const [onFocus, setOnFocus] = useState(false);
     const ref = inputRef || baseRef;
     const isError = baseIsError || !!error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkyn/components",
-  "version": "1.3.121",
+  "version": "1.3.123",
   "main": "./dist/bundle.js",
   "types": "./dist/index.d.ts",
   "author": "Lucas Gonçalves",

package/src/components/RichText/functions/deserialize.ts

@@ -16,6 +16,9 @@ const deserialize = (el: ParseElement): Descendant => {
     ? parsedChildren(el.props.children)
     : [{ text: el.props.children }];
 
+  const childrenString =
+    typeof el.props.children === "string" ? el.props.children : "";
+
   switch (el.type) {
     case "p":
       return { type: "paragraph", children };
@@ -32,15 +35,15 @@ const deserialize = (el: ParseElement): Descendant => {
     case "ol":
       return { type: "numberedList", children };
     case "strong":
-      return { text: "", children, bold: true };
+      return { text: childrenString, bold: true };
     case "code":
-      return { text: "", children, code: true };
+      return { text: childrenString, code: true };
     case "em":
-      return { text: "", children, italic: true };
+      return { text: childrenString, italic: true };
     case "u":
-      return { text: "", children, underline: true };
+      return { text: childrenString, underline: true };
     default:
-      return { text: "", children };
+      return { text: childrenString };
   }
 };
 

package/src/components/RichText/functions/isHtml.ts

@@ -0,0 +1,6 @@
+const isHtml = (str: string): boolean => {
+  const htmlRegex = /<\/?[a-z][\s\S]*>/i;
+  return htmlRegex.test(str);
+};
+
+export { isHtml };

package/src/components/RichText/index.tsx

@@ -32,6 +32,7 @@ import "./styles.css";
 import { getSlateFromHtml } from "./functions/deserialize";
 import { extractText } from "./functions/extractText";
 import { getHtmlFromSlate } from "./functions/serialize";
+import { isHtml } from "./functions/isHtml";
 
 type RichTextProps = {
   name: string;
@@ -59,14 +60,17 @@ function RichText({
 
   const baseRef = useRef<HTMLInputElement>(null);
 
-  const defaultNodes = defaultValue
+  const defaultNodes = isHtml(defaultValue)
     ? getSlateFromHtml(defaultValue)
     : INITIAL_VALUE;
 
   const textFromNodes = extractText(defaultNodes);
 
   const [charactersCount, setCharactersCount] = useState(textFromNodes.length);
-  const [inputValue, setInputValue] = useState(defaultValue);
+  const [inputValue, setInputValue] = useState(
+    isHtml(defaultValue) ? defaultValue : ""
+  );
+
   const [onFocus, setOnFocus] = useState(false);
 
   const ref = inputRef || baseRef;
@@ -77,8 +81,8 @@ function RichText({
 
   function handleChange(value: Descendant[]) {
     const text = extractText(value);
-    setCharactersCount(text.length);
 
+    setCharactersCount(text.length);
     onChangeCharactersCount && onChangeCharactersCount(text.length);
 
     if (enforceCharacterLimit && text.length >= maxLimit) {