@evershop/evershop 2.1.0 → 2.1.2

package/dist/components/common/form/DateField.js

@@ -1,17 +1,14 @@
 import { Tooltip } from '@components/common/form/Tooltip.js';
 import { getNestedError } from '@components/common/form/utils/getNestedError.js';
+import { Field, FieldError, FieldLabel } from '@components/common/ui/Field.js';
+import { InputGroup, InputGroupInput } from '@components/common/ui/InputGroup.js';
 import { _ } from '@evershop/evershop/lib/locale/translate/_';
 import React from 'react';
-import { useFormContext } from 'react-hook-form';
-export function DateField({ name, label, error, wrapperClassName, helperText, required, validation, className, min, max, ...props }) {
-    const { register, unregister, formState: { errors } } = useFormContext();
+import { useFormContext, Controller } from 'react-hook-form';
+export function DateField({ name, label, error, wrapperClassName, helperText, required, validation, className, min, max, defaultValue, ...props }) {
+    const { control, formState: { errors } } = useFormContext();
     const fieldError = getNestedError(name, errors, error);
     const fieldId = `field-${name}`;
-    React.useEffect(() => {
-        return () => {
-            unregister(name);
-        };
-    }, [name, unregister]);
     const { valueAsNumber, ...cleanValidation } = validation || {};
     const validationRules = {
         ...cleanValidation,
@@ -34,12 +31,17 @@ export function DateField({ name, label, error, wrapperClassName, helperText, re
             }
         }
     };
-    return (React.createElement("div", { className: `form-field ${wrapperClassName}` },
-        label && (React.createElement("label", { htmlFor: fieldId },
-            label,
-            required && React.createElement("span", { className: "required-indicator" }, "*"),
-            helperText && React.createElement(Tooltip, { content: helperText, position: "top" }))),
-        React.createElement("input", { id: fieldId, type: "date", min: min, max: max, ...register(name, validationRules), className: `${fieldError !== undefined ? 'error' : ''} ${className || ''}`, "aria-invalid": fieldError !== undefined ? 'true' : 'false', "aria-describedby": fieldError !== undefined ? `${fieldId}-error` : undefined, ...props }),
-        fieldError && (React.createElement("p", { id: `${fieldId}-error`, className: "field-error" }, fieldError))));
+    return (React.createElement(Field, { "data-invalid": fieldError ? 'true' : 'false', className: wrapperClassName },
+        label && (React.createElement(FieldLabel, { htmlFor: fieldId },
+            React.createElement(React.Fragment, null,
+                label,
+                required && React.createElement("span", { className: "text-destructive" }, "*"),
+                helperText && React.createElement(Tooltip, { content: helperText, position: "top" })))),
+        React.createElement(Controller, { name: name, control: control, defaultValue: defaultValue, rules: validationRules, render: ({ field }) => {
+                var _a;
+                return (React.createElement(InputGroup, null,
+                    React.createElement(InputGroupInput, { ...field, value: (_a = field.value) !== null && _a !== void 0 ? _a : '', id: fieldId, type: "date", min: min, max: max, className: className, "aria-invalid": fieldError !== undefined ? 'true' : 'false', "aria-describedby": fieldError !== undefined ? `${fieldId}-error` : undefined, ...props })));
+            } }),
+        fieldError && React.createElement(FieldError, null, fieldError)));
 }
 //# sourceMappingURL=DateField.js.map

package/dist/components/common/form/DateField.js.map

@@ -1 +1 @@
-{"version":3,"file":"DateField.js","sourceRoot":"","sources":["../../../../src/components/common/form/DateField.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"DateField.js","sourceRoot":"","sources":["../../../../src/components/common/form/DateField.tsx"],"names":[],"mappings":"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"}

package/dist/components/common/form/DateTimeLocalField.js

@@ -1,17 +1,14 @@
 import { Tooltip } from '@components/common/form/Tooltip.js';
 import { getNestedError } from '@components/common/form/utils/getNestedError.js';
+import { Field, FieldError, FieldLabel } from '@components/common/ui/Field.js';
+import { InputGroup, InputGroupInput } from '@components/common/ui/InputGroup.js';
 import { _ } from '@evershop/evershop/lib/locale/translate/_';
 import React from 'react';
-import { useFormContext } from 'react-hook-form';
+import { useFormContext, Controller } from 'react-hook-form';
 export function DateTimeLocalField({ name, label, error, wrapperClassName, helperText, required, validation, className, min, max, step, ...props }) {
-    const { register, unregister, formState: { errors } } = useFormContext();
+    const { control, formState: { errors } } = useFormContext();
     const fieldError = getNestedError(name, errors, error);
     const fieldId = `field-${name}`;
-    React.useEffect(() => {
-        return () => {
-            unregister(name);
-        };
-    }, [name, unregister]);
     const { valueAsNumber, valueAsDate, ...cleanValidation } = validation || {};
     const validationRules = {
         ...cleanValidation,
@@ -34,12 +31,17 @@ export function DateTimeLocalField({ name, label, error, wrapperClassName, helpe
             }
         }
     };
-    return (React.createElement("div", { className: `form-field ${wrapperClassName} ${fieldError ? 'error' : ''}` },
-        label && (React.createElement("label", { htmlFor: fieldId },
-            label,
-            required && React.createElement("span", { className: "required-indicator" }, "*"),
-            helperText && React.createElement(Tooltip, { content: helperText, position: "top" }))),
-        React.createElement("input", { id: fieldId, type: "datetime-local", min: min, max: max, step: step, ...register(name, validationRules), className: className, "aria-invalid": fieldError !== undefined ? 'true' : 'false', "aria-describedby": fieldError !== undefined ? `${fieldId}-error` : undefined, ...props }),
-        fieldError && (React.createElement("p", { id: `${fieldId}-error`, className: "field-error" }, fieldError))));
+    return (React.createElement(Field, { "data-invalid": fieldError ? 'true' : 'false', className: wrapperClassName },
+        label && (React.createElement(FieldLabel, { htmlFor: fieldId },
+            React.createElement(React.Fragment, null,
+                label,
+                required && React.createElement("span", { className: "text-destructive" }, "*"),
+                helperText && React.createElement(Tooltip, { content: helperText, position: "top" })))),
+        React.createElement(Controller, { name: name, control: control, rules: validationRules, render: ({ field }) => {
+                var _a;
+                return (React.createElement(InputGroup, null,
+                    React.createElement(InputGroupInput, { ...field, value: (_a = field.value) !== null && _a !== void 0 ? _a : '', id: fieldId, type: "datetime-local", min: min, max: max, step: step, className: className, "aria-invalid": fieldError !== undefined ? 'true' : 'false', "aria-describedby": fieldError !== undefined ? `${fieldId}-error` : undefined, ...props })));
+            } }),
+        fieldError && React.createElement(FieldError, null, fieldError)));
 }
 //# sourceMappingURL=DateTimeLocalField.js.map

package/dist/components/common/form/DateTimeLocalField.js.map

@@ -1 +1 @@
-{"version":3,"file":"DateTimeLocalField.js","sourceRoot":"","sources":["../../../../src/components/common/form/DateTimeLocalField.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"DateTimeLocalField.js","sourceRoot":"","sources":["../../../../src/components/common/form/DateTimeLocalField.tsx"],"names":[],"mappings":"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"}

package/dist/components/common/form/Editor.js

@@ -1,10 +1,12 @@
 import { FileBrowser } from '@components/admin/FileBrowser.js';
 import { getColumnClasses } from '@components/common/form/editor/GetColumnClasses.js';
 import { getRowClasses } from '@components/common/form/editor/GetRowClasses.js';
+import { RawToolWrapper } from '@components/common/form/editor/RawToolWrapper.js';
 import { RowTemplates } from '@components/common/form/editor/RowTemplates.js';
+import { Field, FieldLabel } from '@components/common/ui/Field.js';
 import { DndContext, closestCenter, KeyboardSensor, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
 import { arrayMove, SortableContext, sortableKeyboardCoordinates, useSortable, verticalListSortingStrategy } from '@dnd-kit/sortable';
-import { XCircleIcon } from '@heroicons/react/24/outline';
+import { CircleX } from 'lucide-react';
 import React from 'react';
 import { useFormContext } from 'react-hook-form';
 import { v4 as uuidv4 } from 'uuid';
@@ -29,10 +31,11 @@ async function loadEditorJSQuote() {
     const { default: Quote } = await import('@editorjs/quote');
     return Quote;
 }
-async function loadEditorJSRaw() {
-    const { default: RawTool } = await import('@editorjs/raw');
-    return RawTool;
-}
+// Using custom RawToolWrapper instead to fix backspace issues
+// async function loadEditorJSRaw(): Promise<any> {
+//   const { default: RawTool } = await import('@editorjs/raw');
+//   return RawTool;
+// }
 const SortableRow = ({ row, removeRow, children }) => {
     const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
         id: row.id
@@ -41,11 +44,10 @@ const SortableRow = ({ row, removeRow, children }) => {
         transform: transform ? `translateY(${transform.y}px)` : undefined,
         transition,
         opacity: isDragging ? 0.5 : 1,
-        position: 'relative',
-        zIndex: isDragging ? 1 : 0
+        position: 'relative'
     };
-    return (React.createElement("div", { className: "border row__container mt-5", id: row.id, ref: setNodeRef, style: style },
-        React.createElement("div", { className: "config p-3 flex justify-between bg-[#cccccc] items-center" },
+    return (React.createElement("div", { className: "border border-border row__container mt-3 first:mt-0 rounded-md", id: row.id, ref: setNodeRef, style: style },
+        React.createElement("div", { className: "config p-3 flex justify-between bg-muted items-center" },
             React.createElement("div", { className: "drag__icon cursor-move", ...attributes, ...listeners },
                 React.createElement("svg", { viewBox: "0 0 24 24", xmlns: "http://www.w3.org/2000/svg", fill: "#949494", width: 20, height: 20 },
                     React.createElement("g", null,
@@ -56,7 +58,7 @@ const SortableRow = ({ row, removeRow, children }) => {
                         e.preventDefault();
                         removeRow(row.id);
                     } },
-                    React.createElement(XCircleIcon, { color: "#d72c0d", width: 20, height: 20 })))),
+                    React.createElement(CircleX, { width: 20, height: 20 })))),
         children));
 };
 export const Editor = ({ name, value = [], label }) => {
@@ -109,7 +111,7 @@ export const Editor = ({ name, value = [], label }) => {
             const Header = await loadEditorJSHeader();
             const List = await loadEditorJSList();
             const Quote = await loadEditorJSQuote();
-            const RawTool = await loadEditorJSRaw();
+            // Using RawToolWrapper instead of loading from @editorjs/raw
             setValue(name, rows);
             rows.forEach((row) => {
                 row.columns.forEach((column) => {
@@ -122,7 +124,10 @@ export const Editor = ({ name, value = [], label }) => {
                             tools: {
                                 header: Header,
                                 list: List,
-                                raw: RawTool,
+                                raw: {
+                                    class: RawToolWrapper,
+                                    inlineToolbar: false
+                                },
                                 quote: Quote,
                                 image: {
                                     class: ImageTool,
@@ -171,8 +176,8 @@ export const Editor = ({ name, value = [], label }) => {
     const addRow = (row) => {
         setRows(rows.concat(row));
     };
-    return (React.createElement("div", { className: "editor form-field-container" },
-        React.createElement("label", { htmlFor: "description mt-4" }, label),
+    return (React.createElement(Field, { className: "editor form-field-container" },
+        React.createElement(FieldLabel, { htmlFor: "description mt-4" }, label),
         React.createElement("div", { className: "prose prose-xl max-w-none" },
             React.createElement(DndContext, { sensors: sensors, collisionDetection: closestCenter, onDragEnd: handleDragEnd },
                 React.createElement(SortableContext, { items: rows.map((row) => row.id), strategy: verticalListSortingStrategy },

package/dist/components/common/form/Editor.js.map

@@ -1 +1 @@
-{"version":3,"file":"Editor.js","sourceRoot":"","sources":["../../../../src/components/common/form/Editor.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Editor.js","sourceRoot":"","sources":["../../../../src/components/common/form/Editor.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oDAAoD,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,gDAAgD,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EACL,UAAU,EACV,aAAa,EACb,cAAc,EACd,aAAa,EACb,SAAS,EACT,UAAU,EACX,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,SAAS,EACT,eAAe,EACf,2BAA2B,EAC3B,WAAW,EACX,2BAA2B,EAC5B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,eAAe,CAAC;AAEvB,KAAK,UAAU,YAAY;IACzB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACjE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,iBAAiB;IAC9B,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;IACxE,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,kBAAkB;IAC/B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAC7D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,gBAAgB;IAC7B,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACzD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,iBAAiB;IAC9B,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC3D,OAAO,KAAK,CAAC;AACf,CAAC;AAED,8DAA8D;AAC9D,mDAAmD;AACnD,gEAAgE;AAChE,oBAAoB;AACpB,IAAI;AAEJ,MAAM,WAAW,GAIZ,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;IACpC,MAAM,EACJ,UAAU,EACV,SAAS,EACT,UAAU,EACV,SAAS,EACT,UAAU,EACV,UAAU,EACX,GAAG,WAAW,CAAC;QACd,EAAE,EAAE,GAAG,CAAC,EAAE;KACX,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG;QACZ,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,cAAc,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;QACjE,UAAU;QACV,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC7B,QAAQ,EAAE,UAAU;KACE,CAAC;IAEzB,OAAO,CACL,6BACE,SAAS,EAAC,gEAAgE,EAC1E,EAAE,EAAE,GAAG,CAAC,EAAE,EACV,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,KAAK;QAEZ,6BAAK,SAAS,EAAC,uDAAuD;YACpE,6BAAK,SAAS,EAAC,wBAAwB,KAAK,UAAU,KAAM,SAAS;gBACnE,6BACE,OAAO,EAAC,WAAW,EACnB,KAAK,EAAC,4BAA4B,EAClC,IAAI,EAAC,SAAS,EACd,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,EAAE;oBAEV;wBACE,8BAAM,IAAI,EAAC,MAAM,EAAC,CAAC,EAAC,eAAe,GAAG;wBACtC,8BACE,QAAQ,EAAC,SAAS,EAClB,CAAC,EAAC,0QAA0Q,GAC5Q,CACA,CACA,CACF;YACN;gBACE,2BACE,IAAI,EAAC,GAAG,EACR,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;wBACb,CAAC,CAAC,cAAc,EAAE,CAAC;wBACnB,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACpB,CAAC;oBAED,oBAAC,OAAO,IAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,GAAI,CAChC,CACA,CACF;QACL,QAAQ,CACL,CACP,CAAC;AACJ,CAAC,CAAC;AAkBF,MAAM,CAAC,MAAM,MAAM,GAA0B,CAAC,EAAE,IAAI,EAAE,KAAK,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;IAC3E,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpE,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,KAAK,CAAC,QAAQ,CAG1C,IAAI,CAAC,CAAC;IAChB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,cAAc,EAAE,CAAC;IAChD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,QAAQ,CACpC,KAAK;QACH,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAChB,MAAM,KAAK,GAAG,MAAM,MAAM,EAAE,EAAE,CAAC;YAC/B,OAAO;gBACL,GAAG,GAAG;gBACN,SAAS,EAAE,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC;gBAClC,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,KAAK;gBACnB,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBAClC,MAAM,KAAK,GAAG,MAAM,MAAM,EAAE,EAAE,CAAC;oBAC/B,OAAO;wBACL,GAAG,MAAM;wBACT,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC;wBACxC,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,KAAK;qBACvB,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC;QACJ,CAAC,CAAC;QACJ,CAAC,CAAC,EAAE,CACP,CAAC;IACF,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAEjC,MAAM,OAAO,GAAG,UAAU,CACxB,SAAS,CAAC,aAAa,EAAE;QACvB,oBAAoB,EAAE;YACpB,QAAQ,EAAE,CAAC;SACZ;KACF,CAAC,EACF,SAAS,CAAC,cAAc,EAAE;QACxB,gBAAgB,EAAE,2BAA2B;KAC9C,CAAC,CACH,CAAC;IAEF,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,EAAE;QAC9B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;QAE/B,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;YAC5C,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAChB,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC;gBAChE,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC;gBAE9D,IAAI,QAAQ,KAAK,CAAC,CAAC,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;oBACvC,OAAO,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBAC9C,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IAEF,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;YAC7B,MAAM,QAAQ,GAAG,MAAM,YAAY,EAAE,CAAC;YACtC,MAAM,SAAS,GAAG,MAAM,iBAAiB,EAAE,CAAC;YAC5C,MAAM,MAAM,GAAG,MAAM,kBAAkB,EAAE,CAAC;YAC1C,MAAM,IAAI,GAAG,MAAM,gBAAgB,EAAE,CAAC;YACtC,MAAM,KAAK,GAAG,MAAM,iBAAiB,EAAE,CAAC;YACxC,6DAA6D;YAC7D,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACrB,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACnB,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;oBAC7B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;wBAChC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAChC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC;4BACjD,MAAM,EAAE,MAAM,CAAC,EAAE;4BACjB,WAAW,EAAE,oCAAoC;4BACjD,SAAS,EAAE,CAAC;4BACZ,KAAK,EAAE;gCACL,MAAM,EAAE,MAAM;gCACd,IAAI,EAAE,IAAI;gCACV,GAAG,EAAE;oCACH,KAAK,EAAE,cAAc;oCACrB,aAAa,EAAE,KAAK;iCACrB;gCACD,KAAK,EAAE,KAAK;gCACZ,KAAK,EAAE;oCACL,KAAK,EAAE,SAAS;oCAChB,MAAM,EAAE;wCACN,YAAY,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE;4CAClC,cAAc,CAAC;gDACb,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE;oDACpB,QAAQ,CAAC;wDACP,OAAO,EAAE,CAAC;wDACV,IAAI,EAAE;4DACJ,GAAG,EAAE,OAAO;yDACb;qDACF,CAAC,CAAC;gDACL,CAAC;gDACD,OAAO;6CACR,CAAC,CAAC;4CACH,kBAAkB,CAAC,IAAI,CAAC,CAAC;wCAC3B,CAAC;qCACF;iCACF;6BACF;4BACD,IAAI,EAAE,MAAM,CAAC,IAAI;4BACjB,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE;gCAChB,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;oCACnC,sDAAsD;oCACtD,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;wCACnB,MAAM,OAAO,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;wCAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC;wCACzD,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAC1B,CAAC;wCACF,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,GAAG,UAAU,CAAC;wCACrD,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;wCACxB,OAAO,OAAO,CAAC;oCACjB,CAAC,CAAC,CAAC;gCACL,CAAC,CAAC,CAAC;4BACL,CAAC;yBACF,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,WAAW,EAAE,CAAC;IAChB,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAElB,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE;QAC1B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,EAAE;QACrB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,KAAK,IAAC,SAAS,EAAC,6BAA6B;QAC5C,oBAAC,UAAU,IAAC,OAAO,EAAC,kBAAkB,IAAE,KAAK,CAAc;QAC3D,6BAAK,SAAS,EAAC,2BAA2B;YACxC,oBAAC,UAAU,IACT,OAAO,EAAE,OAAO,EAChB,kBAAkB,EAAE,aAAa,EACjC,SAAS,EAAE,aAAa;gBAExB,oBAAC,eAAe,IACd,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAChC,QAAQ,EAAE,2BAA2B;oBAErC,6BAAK,EAAE,EAAC,MAAM,IACX,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC;oBACjB,kEAAkE;oBAClE,oBAAC,WAAW,IAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS;wBACtD,6BACE,SAAS,EAAE,uCAAuC,GAAG,CAAC,SAAS,EAAE,EACjE,KAAK,EAAE;gCACL,SAAS,EAAE,MAAM;6BAClB,IAEA,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAC3B,6BACE,SAAS,EAAE,cAAc,MAAM,CAAC,SAAS,EAAE,EAC3C,GAAG,EAAE,MAAM,CAAC,EAAE;4BAEd,6BAAK,EAAE,EAAE,MAAM,CAAC,EAAE,GAAI,CAClB,CACP,CAAC,CACE,CACM,CACf,CAAC,CACE,CACU,CACP;YACb,6BAAK,SAAS,EAAC,qBAAqB;gBAClC,6BAAK,SAAS,EAAC,mCAAmC;oBAChD,oBAAC,YAAY,IAAC,MAAM,EAAE,MAAM,GAAI,CAC5B,CACF,CACF;QACN,+BAAO,IAAI,EAAC,QAAQ,KAAK,QAAQ,CAAC,IAAI,CAAC,GAAI;QAC1C,eAAe,IAAI,CAClB,oBAAC,WAAW,IACV,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE;gBAChB,WAAW,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACzC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC,EACD,KAAK,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,EACtC,UAAU,EAAE,KAAK,GACjB,CACH,CACK,CACT,CAAC;AACJ,CAAC,CAAC"}

package/dist/components/common/form/Editor.scss

@@ -1,18 +1,26 @@
 body .codex-editor {
   z-index: 99;
 }
-
+body .codex-editor:not(.codex-editor--toolbox-opened) {
+  z-index: 1 !important;
+}
 #rows {
   .row {
     background-color: #fff;
   }
 
+  .row__container {
+    &:hover,
+    &:focus-within {
+      z-index: 100 !important;
+    }
+  }
+
   .drag__icon {
     cursor: move;
     display: flex;
     align-items: center;
     justify-content: center;
-    padding: 8px;
     border-radius: 4px;
 
     &:hover {
@@ -25,10 +33,6 @@ body .codex-editor {
   }
 }
 
-#rows > * {
-  margin-top: 10px;
-}
-
 .item {
   padding: 10px;
   background: var(--divider);
@@ -46,4 +50,23 @@ body .codex-editor {
 
 .ce-rawtool__textarea {
   z-index: 0;
+  min-height: 200px;
+  width: 100%;
+  padding: 12px;
+  border: 1px solid #e5e7eb;
+  border-radius: 6px;
+  font-family: 'Courier New', monospace;
+  font-size: 14px;
+  line-height: 1.6;
+  resize: vertical;
+
+  &:focus {
+    outline: none;
+    border-color: #3b82f6;
+    box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
+  }
+}
+
+.ce-rawtool {
+  margin: 0.5em 0;
 }

package/dist/components/common/form/EmailField.d.ts

@@ -1,20 +1,15 @@
 import React from 'react';
-import { RegisterOptions } from 'react-hook-form';
-interface EmailFieldProps {
-    name: string;
+import { RegisterOptions, FieldPath, FieldValues } from 'react-hook-form';
+interface EmailFieldProps<T extends FieldValues = FieldValues> extends Omit<React.InputHTMLAttributes<HTMLInputElement>, 'name' | 'type'> {
+    name: FieldPath<T>;
     label?: string;
-    placeholder?: string;
-    className?: string;
-    required?: boolean;
-    disabled?: boolean;
-    defaultValue?: string;
     error?: string;
     helperText?: string;
-    validation?: RegisterOptions;
-    onChange?: (value: string) => void;
+    required?: boolean;
+    validation?: RegisterOptions<T>;
     wrapperClassName?: string;
     prefixIcon?: React.ReactNode;
     suffixIcon?: React.ReactNode;
 }
-export declare function EmailField({ name, label, placeholder, className, wrapperClassName, required, disabled, defaultValue, error, helperText, validation, onChange, prefixIcon, suffixIcon, ...props }: EmailFieldProps): React.JSX.Element;
+export declare function EmailField<T extends FieldValues = FieldValues>({ name, label, error, helperText, required, validation, wrapperClassName, className, defaultValue, prefixIcon, suffixIcon, ...props }: EmailFieldProps<T>): React.JSX.Element;
 export {};

package/dist/components/common/form/EmailField.js

@@ -1,55 +1,39 @@
 import { Tooltip } from '@components/common/form/Tooltip.js';
 import { getNestedError } from '@components/common/form/utils/getNestedError.js';
+import { Field, FieldError, FieldLabel } from '@components/common/ui/Field.js';
+import { InputGroup, InputGroupAddon, InputGroupInput } from '@components/common/ui/InputGroup.js';
 import { _ } from '@evershop/evershop/lib/locale/translate/_';
 import React from 'react';
-import { useFormContext } from 'react-hook-form';
-export function EmailField({ name, label, placeholder, className = '', wrapperClassName, required = false, disabled = false, defaultValue, error, helperText, validation, onChange, prefixIcon, suffixIcon, ...props }) {
-    const { register, unregister, formState: { errors } } = useFormContext();
+import { useFormContext, Controller } from 'react-hook-form';
+export function EmailField({ name, label, error, helperText, required, validation, wrapperClassName, className, defaultValue, prefixIcon, suffixIcon, ...props }) {
+    const { control, formState: { errors } } = useFormContext();
     const fieldError = getNestedError(name, errors, error);
-    React.useEffect(() => {
-        return () => {
-            unregister(name);
-        };
-    }, [name, unregister]);
     const fieldId = `field-${name}`;
-    const validationRules = {};
-    if (defaultValue !== undefined) {
-        validationRules.value = defaultValue;
-    }
-    if (validation) {
-        Object.assign(validationRules, validation);
-    }
-    if (required && !validationRules.required) {
-        validationRules.required = _('${field} is required', {
-            field: label || 'This field'
-        });
-    }
-    if (!validationRules.pattern) {
-        validationRules.pattern = {
+    const validationRules = {
+        ...validation,
+        ...(required &&
+            !(validation === null || validation === void 0 ? void 0 : validation.required) && {
+            required: _('${field} is required', { field: label || name })
+        }),
+        pattern: (validation === null || validation === void 0 ? void 0 : validation.pattern) || {
             value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
             message: _('Please enter a valid email address')
-        };
-    }
-    const handleChange = (e) => {
-        if (onChange) {
-            onChange(e.target.value);
         }
     };
-    const hasIcons = prefixIcon || suffixIcon;
-    const inputClassName = `${fieldError !== undefined ? 'error' : ''} ${className || ''} ${hasIcons ? '!pr-3' : ''} ${prefixIcon ? '!pl-10' : ''} ${suffixIcon ? '!pr-10' : ''}`.trim();
-    const renderInput = () => (React.createElement("input", { id: fieldId, type: "email", placeholder: placeholder, disabled: disabled, className: inputClassName, "aria-invalid": fieldError !== undefined ? 'true' : 'false', "aria-describedby": fieldError !== undefined ? `${fieldId}-error` : undefined, ...register(name, validationRules), onChange: (e) => {
-            register(name).onChange(e);
-            handleChange(e);
-        }, ...props }));
-    return (React.createElement("div", { className: `form-field ${wrapperClassName || ''}`.trim() },
-        label && (React.createElement("label", { htmlFor: fieldId },
-            label,
-            required && React.createElement("span", { className: "required-indicator" }, "*"),
-            helperText && React.createElement(Tooltip, { content: helperText, position: "top" }))),
-        hasIcons ? (React.createElement("div", { className: `input__wrapper relative flex group items-center`.trim() },
-            prefixIcon && (React.createElement("div", { className: "prefix absolute left-3 z-10 flex items-center justify-center" }, prefixIcon)),
+    const renderInput = () => (React.createElement(Controller, { name: name, control: control, defaultValue: defaultValue, rules: validationRules, render: ({ field }) => {
+            var _a;
+            return (React.createElement(InputGroupInput, { ...field, value: (_a = field.value) !== null && _a !== void 0 ? _a : '', id: fieldId, type: "email", "aria-invalid": fieldError !== undefined ? 'true' : 'false', "aria-describedby": fieldError !== undefined ? `${fieldId}-error` : undefined, ...props }));
+        } }));
+    return (React.createElement(Field, { "data-invalid": fieldError ? 'true' : 'false', className: wrapperClassName },
+        label && (React.createElement(FieldLabel, { htmlFor: fieldId },
+            React.createElement(React.Fragment, null,
+                label,
+                required && React.createElement("span", { className: "text-destructive" }, "*"),
+                helperText && React.createElement(Tooltip, { content: helperText, position: "top" })))),
+        React.createElement(InputGroup, null,
             renderInput(),
-            suffixIcon && (React.createElement("div", { className: "suffix absolute right-3 z-10 flex items-center justify-center" }, suffixIcon)))) : (renderInput()),
-        fieldError && (React.createElement("p", { id: `${fieldId}-error`, className: "field-error" }, fieldError))));
+            prefixIcon && (React.createElement(InputGroupAddon, { align: 'inline-start' }, prefixIcon)),
+            suffixIcon && (React.createElement(InputGroupAddon, { align: 'inline-end' }, suffixIcon))),
+        fieldError && React.createElement(FieldError, null, fieldError)));
 }
 //# sourceMappingURL=EmailField.js.map

package/dist/components/common/form/EmailField.js.map

@@ -1 +1 @@
-{"version":3,"file":"EmailField.js","sourceRoot":"","sources":["../../../../src/components/common/form/EmailField.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"EmailField.js","sourceRoot":"","sources":["../../../../src/components/common/form/EmailField.tsx"],"names":[],"mappings":"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"}

package/dist/components/common/form/FileField.js

@@ -1,10 +1,12 @@
 import { Tooltip } from '@components/common/form/Tooltip.js';
 import { getNestedError } from '@components/common/form/utils/getNestedError.js';
+import { Field, FieldError, FieldLabel } from '@components/common/ui/Field.js';
+import { InputGroupInput } from '@components/common/ui/InputGroup.js';
 import { _ } from '@evershop/evershop/lib/locale/translate/_';
 import React from 'react';
-import { useFormContext } from 'react-hook-form';
+import { useFormContext, Controller } from 'react-hook-form';
 export function FileField({ name, label, error, wrapperClassName, helperText, required, validation, maxSize, className, accept, multiple = false, ...props }) {
-    const { register, formState: { errors }, watch } = useFormContext();
+    const { control, formState: { errors }, watch } = useFormContext();
     const fieldError = getNestedError(name, errors, error);
     const fieldId = `field-${name}`;
     const files = watch(name);
@@ -39,12 +41,15 @@ export function FileField({ name, label, error, wrapperClassName, helperText, re
             }
         }
     };
-    return (React.createElement("div", { className: `form-field ${wrapperClassName} ${fieldError ? 'error' : ''}` },
-        label && (React.createElement("label", { htmlFor: fieldId },
-            label,
-            required && React.createElement("span", { className: "required-indicator" }, "*"),
-            helperText && React.createElement(Tooltip, { content: helperText, position: "top" }))),
-        React.createElement("input", { id: fieldId, type: "file", accept: accept, multiple: multiple, ...register(name, validationRules), className: className, "aria-invalid": fieldError !== undefined ? 'true' : 'false', "aria-describedby": fieldError !== undefined ? `${fieldId}-error` : undefined, ...props }),
+    return (React.createElement(Field, { "data-invalid": fieldError ? 'true' : 'false', className: wrapperClassName },
+        label && (React.createElement(FieldLabel, { htmlFor: fieldId },
+            React.createElement(React.Fragment, null,
+                label,
+                required && React.createElement("span", { className: "text-destructive" }, "*"),
+                helperText && React.createElement(Tooltip, { content: helperText, position: "top" })))),
+        React.createElement(Controller, { name: name, control: control, rules: validationRules, render: ({ field: { onChange, value, ...field } }) => (React.createElement(InputGroupInput, { ...field, id: fieldId, type: "file", accept: accept, multiple: multiple, className: className, "aria-invalid": fieldError !== undefined ? 'true' : 'false', "aria-describedby": fieldError !== undefined ? `${fieldId}-error` : undefined, onChange: (e) => {
+                    onChange(e.target.files);
+                }, ...props })) }),
         maxSize && (React.createElement("p", { className: "file-size-hint" },
             "Maximum file size: ",
             formatFileSize(maxSize))),
@@ -55,6 +60,6 @@ export function FileField({ name, label, error, wrapperClassName, helperText, re
                 " (",
                 formatFileSize(file.size),
                 ")")))))),
-        fieldError && (React.createElement("p", { id: `${fieldId}-error`, className: "field-error" }, fieldError))));
+        fieldError && React.createElement(FieldError, null, fieldError)));
 }
 //# sourceMappingURL=FileField.js.map

package/dist/components/common/form/FileField.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileField.js","sourceRoot":"","sources":["../../../../src/components/common/form/FileField.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"FileField.js","sourceRoot":"","sources":["../../../../src/components/common/form/FileField.tsx"],"names":[],"mappings":"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"}

package/dist/components/common/form/Form.js

@@ -1,12 +1,13 @@
-import Button from '@components/common/Button.js';
+import { Button } from '@components/common/ui/Button.js';
 import { _ } from '@evershop/evershop/lib/locale/translate/_';
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { useForm, FormProvider } from 'react-hook-form';
 import { toast } from 'react-toastify';
 export function Form({ form: externalForm, action, method = 'POST', formOptions, onSubmit, onSuccess, onError, successMessage = _('Saved successfully!'), errorMessage = _('Something went wrong! Please try again.'), submitBtn = true, submitBtnText = _('Save'), loading = false, children, className, noValidate = true, ...props }) {
     const theForm = externalForm ||
         useForm({
             shouldUnregister: true,
+            shouldFocusError: false,
             ...formOptions
         });
     const { handleSubmit, formState: { isSubmitting } } = theForm;
@@ -25,7 +26,7 @@ export function Form({ form: externalForm, action, method = 'POST', formOptions,
             const result = await response.json();
             if (result.error) {
                 if (onError) {
-                    onError(result.error, data);
+                    onError(result.error.message, data);
                 }
                 else {
                     toast.error(result.error.message || errorMessage);
@@ -47,14 +48,30 @@ export function Form({ form: externalForm, action, method = 'POST', formOptions,
             }
         }
     };
+    const [canFocus, setCanFocus] = useState(true);
+    const onValidationError = () => {
+        setCanFocus(true);
+    };
+    useEffect(() => {
+        if (theForm.formState.errors && canFocus) {
+            const elements = Array.from(document.querySelectorAll('[aria-invalid="true"]'));
+            elements.sort((a, b) => a.getBoundingClientRect().top - b.getBoundingClientRect().top);
+            if (elements.length > 0) {
+                const errorElement = elements[0];
+                errorElement.scrollIntoView({ behavior: 'smooth', block: 'center' });
+                errorElement.focus({ preventScroll: true });
+                setCanFocus(false);
+            }
+        }
+    }, [theForm.formState, canFocus]);
     const handleFormSubmit = onSubmit || defaultSubmit;
     return (React.createElement(FormProvider, { ...theForm },
-        React.createElement("form", { onSubmit: handleSubmit(handleFormSubmit), className: className, noValidate: noValidate, ...props },
+        React.createElement("form", { onSubmit: handleSubmit(handleFormSubmit, onValidationError), className: className, noValidate: noValidate, ...props },
             React.createElement("fieldset", { disabled: loading }, children),
             submitBtn && (React.createElement("div", { className: "mt-4" },
-                React.createElement(Button, { title: submitBtnText, type: "submit", onAction: () => {
-                        handleSubmit(handleFormSubmit);
-                    }, isLoading: isSubmitting || loading }))))));
+                React.createElement(Button, { title: submitBtnText, type: "submit", onClick: () => {
+                        handleSubmit(handleFormSubmit, onValidationError)();
+                    }, isLoading: isSubmitting || loading }, submitBtnText))))));
 }
 export { useFormContext } from 'react-hook-form';
 export { Controller } from 'react-hook-form';

package/dist/components/common/form/Form.js.map

@@ -1 +1 @@
-{"version":3,"file":"Form.js","sourceRoot":"","sources":["../../../../src/components/common/form/Form.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Form.js","sourceRoot":"","sources":["../../../../src/components/common/form/Form.tsx"],"names":[],"mappings":"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"}

package/dist/components/common/form/InputField.d.ts

@@ -11,5 +11,5 @@ interface InputFieldProps<T extends FieldValues = FieldValues> extends Omit<Reac
     prefixIcon?: React.ReactNode;
     suffixIcon?: React.ReactNode;
 }
-export declare function InputField<T extends FieldValues = FieldValues>({ name, label, error, helperText, required, validation, wrapperClassName, className, type, prefixIcon, suffixIcon, ...props }: InputFieldProps<T>): React.JSX.Element;
+export declare function InputField<T extends FieldValues = FieldValues>({ name, label, error, helperText, required, validation, wrapperClassName, className, type, prefixIcon, suffixIcon, defaultValue, ...props }: InputFieldProps<T>): React.JSX.Element;
 export {};