@arkyn/components 1.3.116 → 1.3.118

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

@@ -6,9 +6,10 @@ type RichTextProps = {
     enforceCharacterLimit?: boolean;
     defaultValue?: string;
     isError?: boolean;
+    onChangeCharactersCount: (e: number) => void;
     onChange?: (value: Descendant[]) => void;
     onValueChange?: (value: string) => void;
 };
-declare function RichText({ name, defaultValue, enforceCharacterLimit, maxLimit, onValueChange, onChange, isError: baseIsError, }: RichTextProps): import("react/jsx-runtime").JSX.Element;
+declare function RichText({ name, defaultValue, enforceCharacterLimit, onChangeCharactersCount, maxLimit, onValueChange, onChange, isError: baseIsError, }: RichTextProps): import("react/jsx-runtime").JSX.Element;
 export { RichText };
 //# sourceMappingURL=index.d.ts.map

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,EAAoB,MAAM,OAAO,CAAC;AAanE,OAAO,cAAc,CAAC;AAGtB,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,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,QAAe,EACf,aAAa,EACb,QAAQ,EACR,OAAO,EAAE,WAAW,GACrB,EAAE,aAAa,2CA8Gf;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,EAAoB,MAAM,OAAO,CAAC;AAanE,OAAO,cAAc,CAAC;AAGtB,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,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,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,2CAqHf;AAED,OAAO,EAAE,QAAQ,EAAE,CAAC"}

package/dist/components/RichText/index.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import isHotkey from "is-hotkey";
 import { AlignCenter, AlignJustify, AlignLeft, AlignRight, Bold, Code, Heading1, Heading2, Italic, Quote, Underline, } from "lucide-react";
 import { useCallback, useMemo, useRef, useState } from "react";
 import { createEditor, Transforms, Node } from "slate";
@@ -9,12 +10,18 @@ import { Element } from "./components/Element";
 import { Leaf } from "./components/Leaf";
 import { MarkButton } from "./components/MarkButton";
 import { Toolbar } from "./components/Toolbar";
+import { toggleMark } from "./functions/toggleMark";
+import { HOTKEYS } from "./template/HOTKEYS";
 import { INITIAL_VALUE } from "./template/INITIAL_VALUE";
 import "./styles.css";
 import { useFormController } from "../Form/FormController";
-function RichText({ name, defaultValue, enforceCharacterLimit = false, maxLimit = 2000, onValueChange, onChange, isError: baseIsError, }) {
-    const [charactersCount, setCharactersCount] = useState(0);
-    const [editorValue, setEditorValue] = useState(defaultValue ? JSON.parse(defaultValue) : INITIAL_VALUE);
+function RichText({ name, defaultValue, enforceCharacterLimit = false, onChangeCharactersCount, maxLimit = 2000, onValueChange, onChange, isError: baseIsError, }) {
+    function extractText(nodes) {
+        return nodes.map((n) => Node.string(n)).join("");
+    }
+    const defaultNodes = defaultValue ? JSON.parse(defaultValue) : INITIAL_VALUE;
+    const [charactersCount, setCharactersCount] = useState(extractText(defaultNodes).length);
+    const [editorValue, setEditorValue] = useState(defaultNodes);
     const [onFocus, setOnFocus] = useState(false);
     const { id, inputRef, error } = useFormController();
     const baseRef = useRef(null);
@@ -23,12 +30,10 @@ function RichText({ name, defaultValue, enforceCharacterLimit = false, maxLimit
     const editor = useMemo(() => withHistory(withReact(createEditor())), []);
     const renderLeaf = useCallback(Leaf, []);
     const renderElement = useCallback(Element, []);
-    function extractText(nodes) {
-        return nodes.map((n) => Node.string(n)).join("");
-    }
     function handleChange(value) {
         const text = extractText(value);
         setCharactersCount(text.length);
+        onChangeCharactersCount && onChangeCharactersCount(text.length);
         if (enforceCharacterLimit && text.length >= maxLimit) {
             return;
         }
@@ -43,11 +48,19 @@ function RichText({ name, defaultValue, enforceCharacterLimit = false, maxLimit
     const focusClass = onFocus ? "focusTrue" : "focusFalse";
     const errorClass = isError
         ? "errorTrue"
-        : maxLimit === charactersCount
+        : maxLimit < charactersCount
             ? "errorTrue"
             : "errorFalse";
     const className = `arkynRichText ${errorClass} ${focusClass}`;
     const restatesCharacters = maxLimit - charactersCount;
-    return (_jsxs(Slate, { editor: editor, initialValue: defaultValue ? JSON.parse(defaultValue) : INITIAL_VALUE, onChange: handleChange, onValueChange: handleChange, children: [_jsxs("div", { className: className, children: [_jsxs(Toolbar, { children: [_jsx(BlockButton, { format: "headingOne", icon: Heading1 }), _jsx(BlockButton, { format: "headingTwo", icon: Heading2 }), _jsx(BlockButton, { format: "blockQuote", icon: Quote }), _jsx(MarkButton, { format: "bold", icon: Bold }), _jsx(MarkButton, { format: "italic", icon: Italic }), _jsx(MarkButton, { format: "underline", icon: Underline }), _jsx(MarkButton, { format: "code", icon: Code }), _jsx(BlockButton, { format: "left", icon: AlignLeft }), _jsx(BlockButton, { format: "right", icon: AlignRight }), _jsx(BlockButton, { format: "center", icon: AlignCenter }), _jsx(BlockButton, { format: "justify", icon: AlignJustify })] }), _jsx(Editable, { className: "editorContainer", renderElement: renderElement, renderLeaf: renderLeaf, spellCheck: true, id: id, onFocus: () => setOnFocus(true), onBlur: () => setOnFocus(false) }), restatesCharacters < 0 && (_jsx("div", { className: "restatesCharacters", children: restatesCharacters }))] }), _jsx("input", { ref: ref, type: "hidden", name: name, value: JSON.stringify(editorValue) })] }));
+    return (_jsxs(Slate, { editor: editor, initialValue: defaultValue ? JSON.parse(defaultValue) : INITIAL_VALUE, onChange: handleChange, onValueChange: handleChange, children: [_jsxs("div", { className: className, children: [_jsxs(Toolbar, { children: [_jsx(BlockButton, { format: "headingOne", icon: Heading1 }), _jsx(BlockButton, { format: "headingTwo", icon: Heading2 }), _jsx(BlockButton, { format: "blockQuote", icon: Quote }), _jsx(MarkButton, { format: "bold", icon: Bold }), _jsx(MarkButton, { format: "italic", icon: Italic }), _jsx(MarkButton, { format: "underline", icon: Underline }), _jsx(MarkButton, { format: "code", icon: Code }), _jsx(BlockButton, { format: "left", icon: AlignLeft }), _jsx(BlockButton, { format: "right", icon: AlignRight }), _jsx(BlockButton, { format: "center", icon: AlignCenter }), _jsx(BlockButton, { format: "justify", icon: AlignJustify })] }), _jsx(Editable, { className: "editorContainer", renderElement: renderElement, renderLeaf: renderLeaf, spellCheck: true, id: id, onFocus: () => setOnFocus(true), onBlur: () => setOnFocus(false), onKeyDown: (event) => {
+                            for (const hotkey in HOTKEYS) {
+                                if (isHotkey(hotkey, event)) {
+                                    event.preventDefault();
+                                    const mark = HOTKEYS[hotkey];
+                                    toggleMark(editor, mark);
+                                }
+                            }
+                        } }), restatesCharacters < 0 && (_jsx("div", { className: "restatesCharacters", children: restatesCharacters }))] }), _jsx("input", { ref: ref, type: "hidden", name: name, value: JSON.stringify(editorValue) }), _jsx("input", { type: "hidden", name: `${name}Count`, value: charactersCount })] }));
 }
 export { RichText };

package/package.json

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

package/src/components/RichText/index.tsx

@@ -35,6 +35,7 @@ type RichTextProps = {
   enforceCharacterLimit?: boolean;
   defaultValue?: string;
   isError?: boolean;
+  onChangeCharactersCount: (e: number) => void;
   onChange?: (value: Descendant[]) => void;
   onValueChange?: (value: string) => void;
 };
@@ -43,15 +44,23 @@ function RichText({
   name,
   defaultValue,
   enforceCharacterLimit = false,
+  onChangeCharactersCount,
   maxLimit = 2000,
   onValueChange,
   onChange,
   isError: baseIsError,
 }: RichTextProps) {
-  const [charactersCount, setCharactersCount] = useState(0);
-  const [editorValue, setEditorValue] = useState<Descendant[]>(
-    defaultValue ? JSON.parse(defaultValue) : INITIAL_VALUE
+  function extractText(nodes: Descendant[]) {
+    return nodes.map((n) => Node.string(n)).join("");
+  }
+
+  const defaultNodes = defaultValue ? JSON.parse(defaultValue) : INITIAL_VALUE;
+
+  const [charactersCount, setCharactersCount] = useState(
+    extractText(defaultNodes).length
   );
+
+  const [editorValue, setEditorValue] = useState<Descendant[]>(defaultNodes);
   const [onFocus, setOnFocus] = useState(false);
 
   const { id, inputRef, error } = useFormController();
@@ -66,14 +75,12 @@ function RichText({
   const renderLeaf = useCallback(Leaf, []);
   const renderElement = useCallback(Element, []);
 
-  function extractText(nodes: Descendant[]) {
-    return nodes.map((n) => Node.string(n)).join("");
-  }
-
   function handleChange(value: Descendant[]) {
     const text = extractText(value);
     setCharactersCount(text.length);
 
+    onChangeCharactersCount && onChangeCharactersCount(text.length);
+
     if (enforceCharacterLimit && text.length >= maxLimit) {
       return;
     } else {
@@ -90,7 +97,7 @@ function RichText({
   const focusClass = onFocus ? "focusTrue" : "focusFalse";
   const errorClass = isError
     ? "errorTrue"
-    : maxLimit === charactersCount
+    : maxLimit < charactersCount
     ? "errorTrue"
     : "errorFalse";
 
@@ -133,15 +140,15 @@ function RichText({
           id={id}
           onFocus={() => setOnFocus(true)}
           onBlur={() => setOnFocus(false)}
-          // onKeyDown={(event) => {
-          //   for (const hotkey in HOTKEYS) {
-          //     if (isHotkey(hotkey, event as any)) {
-          //       event.preventDefault();
-          //       const mark = HOTKEYS[hotkey as keyof typeof HOTKEYS];
-          //       toggleMark(editor, mark);
-          //     }
-          //   }
-          // }}
+          onKeyDown={(event) => {
+            for (const hotkey in HOTKEYS) {
+              if (isHotkey(hotkey, event as any)) {
+                event.preventDefault();
+                const mark = HOTKEYS[hotkey as keyof typeof HOTKEYS];
+                toggleMark(editor, mark);
+              }
+            }
+          }}
         />
 
         {restatesCharacters < 0 && (
@@ -155,6 +162,8 @@ function RichText({
         name={name}
         value={JSON.stringify(editorValue)}
       />
+
+      <input type="hidden" name={`${name}Count`} value={charactersCount} />
     </Slate>
   );
 }