@react-fabric/form 1.0.0-beta.6 → 1.0.0-beta.60

package/dist/esm/form/Form.js

@@ -7,8 +7,9 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import _regeneratorRuntime from '@babel/runtime/regenerator';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useDebounce } from '@react-fabric/core';
+import { EMPTY_OBJECT } from '@react-fabric/utilities';
 import { useRef, useTransition, useEffect, useCallback, useImperativeHandle } from 'react';
-import { useForm, FormProvider } from 'react-hook-form';
+import { useForm as useForm$1, FormProvider, useFormContext, useWatch } from 'react-hook-form';
 import { jsx, jsxs } from 'react/jsx-runtime';
 
 var _excluded = ["formRef", "schema", "children", "defaultValues", "onSubmit", "onChange"];
@@ -17,17 +18,50 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var DEFAULT_SUBMIT = function DEFAULT_SUBMIT() {
   return undefined;
 };
+
+/**
+ * Form component for managing form state and validation using react-hook-form and yup.
+ * It provides a simple interface for form handling, including submission, validation, and value management.
+ * It supports nested form structures and allows for custom validation schemas using Yup.
+ *
+ * @param {FormProps<K>} props - The properties for the Form component.
+ * @returns {JSX.Element} The rendered Form component.
+ *
+ * @example
+ * ```jsx
+ * <Form
+ *   formRef={formRef}
+ *   schema={yup.object().shape({
+ *     name: yup.string().required("Name is required"),
+ *     email: yup.string().email("Invalid email").required("Email is required"),
+ *   })}
+ *   defaultValues={{ name: "", email: "" }}
+ *   onSubmit={(values) => {
+ *     console.log("Form submitted with values:", values);
+ *   }}
+ * >
+ *   <input name="name" ref={form.register} placeholder="Name" />
+ *   <input name="email" ref={form.register} placeholder="Email" />
+ *   <button type="submit">Submit</button>
+ * </Form>
+ * ```
+ *
+ * @see {@link https://adarshpastakia.github.io/react-fabric/?path=/docs/form-form--docs} for the properties that can be passed to this component.
+ * @see {@link https://react-hook-form.com/docs/useform} for more details on the properties.
+ * @see {@link https://github.com/jquense/yup} for more details on the Yup validation schema.
+ */
 var Form = function Form(_ref) {
   var formRef = _ref.formRef,
     schema = _ref.schema,
     children = _ref.children,
-    defaultValues = _ref.defaultValues,
+    _ref$defaultValues = _ref.defaultValues,
+    defaultValues = _ref$defaultValues === void 0 ? EMPTY_OBJECT : _ref$defaultValues,
     _ref$onSubmit = _ref.onSubmit,
-    onSubmit = _ref$onSubmit === void 0 ? DEFAULT_SUBMIT : _ref$onSubmit,
+    _onSubmit = _ref$onSubmit === void 0 ? DEFAULT_SUBMIT : _ref$onSubmit,
     onChange = _ref.onChange,
     rest = _objectWithoutProperties(_ref, _excluded);
   var ref = useRef(null);
-  var form = useForm({
+  var form = useForm$1({
     shouldFocusError: true,
     resolver: schema && yupResolver(schema),
     defaultValues: defaultValues
@@ -35,7 +69,7 @@ var Form = function Form(_ref) {
   var _useTransition = useTransition(),
     _useTransition2 = _slicedToArray(_useTransition, 2),
     startTransition = _useTransition2[1];
-  var changeHandler = useDebounce(onChange, [onChange]);
+  var changeHandler = useDebounce(onChange, [onChange], 300);
   useEffect(function () {
     var subscription = form.watch(function (value) {
       startTransition(function () {
@@ -63,15 +97,15 @@ var Form = function Form(_ref) {
         return handleReset();
       },
       submit: function submit() {
-        return form.handleSubmit(onSubmit);
+        return form.handleSubmit(_onSubmit);
       },
       validate: function () {
-        var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(fields) {
           return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return form.trigger();
+                return form.trigger(fields);
               case 2:
                 return _context.abrupt("return", _context.sent);
               case 3:
@@ -80,7 +114,7 @@ var Form = function Form(_ref) {
             }
           }, _callee);
         }));
-        function validate() {
+        function validate(_x) {
           return _validate.apply(this, arguments);
         }
         return validate;
@@ -102,7 +136,7 @@ var Form = function Form(_ref) {
         }, 50);
       }
     };
-  }, [onSubmit, form, form.formState, defaultValues]);
+  }, [_onSubmit, form, form.formState, defaultValues]);
   var onInvalid = useCallback(function (_, e) {
     var el = e.target;
     setTimeout(function () {
@@ -116,7 +150,10 @@ var Form = function Form(_ref) {
       onReset: function onReset() {
         return handleReset(defaultValues);
       },
-      onSubmit: form.handleSubmit(onSubmit, onInvalid),
+      onSubmit: function onSubmit(e) {
+        e.stopPropagation();
+        void form.handleSubmit(_onSubmit, onInvalid)(e);
+      },
       "data-loading": form.formState.isSubmitting,
       className: "contents",
       autoComplete: "off"
@@ -128,5 +165,28 @@ var Form = function Form(_ref) {
     }))
   }));
 };
+var useForm = function useForm() {
+  var _useFormContext = useFormContext(),
+    formState = _useFormContext.formState,
+    getValues = _useFormContext.getValues,
+    setValue = _useFormContext.setValue,
+    watch = _useFormContext.watch,
+    reset = _useFormContext.reset,
+    resetField = _useFormContext.resetField,
+    setError = _useFormContext.setError,
+    setFocus = _useFormContext.setFocus;
+  var values = useWatch();
+  return {
+    values: _objectSpread(_objectSpread({}, values), getValues()),
+    formState: formState,
+    getValues: getValues,
+    setValue: setValue,
+    watch: watch,
+    reset: reset,
+    resetField: resetField,
+    setError: setError,
+    setFocus: setFocus
+  };
+};
 
-export { Form };
+export { Form, useForm };

package/dist/esm/hooks/useFileUploader.js

@@ -12,6 +12,22 @@ var _excluded = ["progress", "abort"],
   _excluded2 = ["file", "progress", "abort"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+/**
+ * useFileUploader hook provides a way to handle file uploads
+ * with progress tracking, error handling, and file management.
+ * It uses a reducer to manage the state of uploaded files and their statuses.
+ *
+ * @param uploader - The function that handles the file upload.
+ * @param initialList - Initial list of files to be managed by the uploader.
+ * @param multiple - Whether to allow multiple file uploads or not.
+ * @returns An object containing methods to upload, remove, retry files,
+ *          and the current state of the uploader including pending uploads and file list.
+ *
+ * @example
+ * ```jsx
+ * const { upload, remove, retry, state } = useFileUploader(uploader, initialList, multiple);
+ * ```
+ */
 var useFileUploader = function useFileUploader(uploader, initialList) {
   var multiple = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var _useReducer = useReducer(function (state, action) {

package/dist/esm/hooks/useFormBuilder.js

@@ -1,33 +1,42 @@
 'use client';
 
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import { EmptyContent } from '@react-fabric/core';
 import { yup, isNil, isEmpty } from '@react-fabric/utilities';
 import { useMemo, Fragment } from 'react';
 import { FormField } from '../builder/FormField.js';
-import { jsx } from 'react/jsx-runtime';
+import { DATA_TYPES } from '../types/schema.js';
+import { jsxs, jsx } from 'react/jsx-runtime';
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var makeYupField = function makeYupField(field) {
-  var yupField = yup.string();
-  if (field.datatype === "schema") {
+  var yupField = yup.string().trim();
+  if (field.datatype === DATA_TYPES.SCHEMA) {
     var child = Object.fromEntries(field.schema.map(function (field) {
       return [field.id, makeYupField(field)];
     }));
     yupField = yup.object(child);
   }
-  if (field.datatype === "boolean") yupField = yup["boolean"]();
-  if (field.datatype === "decimal" || field.datatype === "number" || field.datatype === "range") {
+  if (field.datatype === DATA_TYPES.BOOL) {
+    yupField = yup["boolean"]();
+    if (field.required) yupField = yupField.test({
+      test: function test(value) {
+        return !!value;
+      }
+    });
+  }
+  if (field.datatype === DATA_TYPES.NUMBER || field.datatype === DATA_TYPES.RANGE) {
     yupField = yup.number();
     !isNil(field.min) && (yupField = yupField.min(field.min));
     !isNil(field.max) && (yupField = yupField.max(field.max));
-    if (field.datatype === "range") yupField = yup.array(yupField);
+    if (field.datatype === DATA_TYPES.RANGE) yupField = yup.array(yupField);
   }
-  if (field.datatype === "string") {
-    field.options && (yupField = yupField.oneOf(field.options));
+  if (field.datatype === DATA_TYPES.STRING) {
+    field.options && !field.allowCustom && (yupField = yupField.oneOf(field.options));
     field.regex && (yupField = yupField.matches(new RegExp(field.regex)));
   }
-  if (field.datatype === "file") {
+  if (field.datatype === DATA_TYPES.FILE) {
     yupField = yup.object({
       filename: yup.string().required(),
       path: yup.string().required()
@@ -53,6 +62,36 @@ var makeYupField = function makeYupField(field) {
   }
   return yupField.label(field.label);
 };
+
+/**
+ * useFormBuilder hook to create a form definition based on a schema.
+ * It generates a Yup validation schema and a form definition component.
+ *
+ * @param {FormSchema} schema - The schema defining the form fields.
+ * @param {Object} options - Optional parameters for the form builder.
+ * @returns An object containing the form definition and the Yup validation schema.
+ *
+ * @example
+ * ```jsx
+ * const { formDef, schemaDef } = useFormBuilder(schema, {
+ *   prefix: "form",
+ *   inline: true,
+ *   fileUrl: (path) => `/files/${path}`,
+ *   uploadHandler: async (file) => {
+ *    // handle file upload
+ *   },
+ *  optionLists: {
+ *    // define option lists for select fields
+ *  }
+ * * });
+ * <FormBuilder
+ *   schema={schemaDef}
+ *   onSubmit={(data) => console.log(data)}
+ * >
+ *   {formDef}
+ * </FormBuilder>
+ * ```
+ */
 var useFormBuilder = function useFormBuilder(schema) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var filteredSchema = useMemo(function () {
@@ -64,19 +103,22 @@ var useFormBuilder = function useFormBuilder(schema) {
   var schemaDef = yup.object(Object.fromEntries(filteredSchema.map(function (field) {
     return [field.id, makeYupField(field)];
   })));
-  var formDef = /*#__PURE__*/jsx(Fragment, {
-    children: filteredSchema.map(function (field, idx) {
+  var formDef = /*#__PURE__*/jsxs(Fragment, {
+    children: [filteredSchema.map(function (field, idx) {
       return /*#__PURE__*/jsx("div", {
         className: "mb-4",
-        children: field.datatype === "schema" ? null : /*#__PURE__*/jsx(FormField, _objectSpread(_objectSpread({}, field), {}, {
+        children: field.datatype === DATA_TYPES.SCHEMA ? null : /*#__PURE__*/jsx(FormField, _objectSpread(_objectSpread({}, field), {}, {
           autoFocus: idx === 0,
           fileUrl: options.fileUrl,
+          optionLists: options.optionLists,
           uploadHandler: options.uploadHandler,
           inline: options.inline,
           prefix: options.prefix
         }))
       }, field.id);
-    })
+    }), filteredSchema.length === 0 && /*#__PURE__*/jsx(EmptyContent, {
+      message: "No schema defined"
+    })]
   });
   return {
     formDef: formDef,

package/dist/esm/i18n/ar.json.js

@@ -2,17 +2,18 @@
 
 var addArray = "اضافة عنصر";
 var password = {
-	show: "عرض كلمة المرور",
-	hide: "اخفاء كلمة المرور"
+	hide: "اخفاء كلمة المرور",
+	show: "عرض كلمة المرور"
 };
 var select = {
+	createOption: "إنشاء خيار جديد ل ",
 	emptyList: "لا توجد خيارات متاحة",
-	notFound: "لم يتم العثور على خيارات ل ",
-	createOption: "إنشاء خيار جديد ل "
+	notFound: "لم يتم العثور على خيارات ل "
 };
 var yup = {
 	arrayMax: "{{label}} حدد ما يصل {{max}} غرض",
 	arrayMin: "{{label}} اختر على الأقل {{min}} غرض",
+	empty: "{{label}} يجب ألا يكون فارغًا",
 	invalid: "{{label}} نوع بيانات غير صالح",
 	invalidType: "{{label}} غير صالح",
 	numberMax: "{{label}} الحد الأقصى {{max}}",

package/dist/esm/i18n/en.json.js

@@ -2,19 +2,19 @@
 
 var addArray = "Add Item";
 var password = {
-	show: "Show password",
-	hide: "Hide password"
+	hide: "Hide password",
+	show: "Show password"
 };
 var select = {
+	createOption: "Create new option for <0>{{query}}</0>",
 	emptyList: "No options available",
-	notFound: "No options found for <0>{{query}}</0>",
-	createOption: "Create new option for <0>{{query}}</0>"
+	notFound: "No options found for <0>{{query}}</0>"
 };
 var yup = {
 	arrayMax: "{{label}} must contain upto {{max}} item",
 	arrayMin: "{{label}} must contain atleast {{min}} item",
-	invalid: "{{label}} invalid",
 	empty: "{{label}} must not be empty",
+	invalid: "{{label}} invalid",
 	invalidType: "{{label}} invalid datatype",
 	numberMax: "{{label}} maximum {{max}}",
 	numberMin: "{{label}} minimum {{min}}",

package/dist/esm/index.js

@@ -2,13 +2,17 @@
 
 import './i18n/index.js';
 export { Controller } from './form/Controller.js';
-export { Form } from './form/Form.js';
+export { Form, useForm } from './form/Form.js';
+export { SchemaEditor } from './builder/SchemaEditor.js';
 export { useFileUploader } from './hooks/useFileUploader.js';
 export { useFormBuilder } from './hooks/useFormBuilder.js';
+export { DATA_TYPES, SCHEMA_CUSTOM_LIST } from './types/schema.js';
 export { ArrayInput } from './input/ArrayInput.js';
+export { AvatarInput } from './input/AvatarInput.js';
 export { Checkbox } from './input/Checkbox.js';
 export { ColorInput } from './input/ColorInput.js';
 export { ColorPicker } from './input/ColorPicker.js';
+export { DateInput } from './input/DateInput.js';
 export { Field } from './input/Field.js';
 export { FileInput } from './input/File.js';
 export { HiddenInput } from './input/Hidden.js';
@@ -17,7 +21,7 @@ export { Number } from './input/Number.js';
 export { Password } from './input/Password.js';
 export { Radio } from './input/Radio.js';
 export { RadioGroup } from './input/RadioGroup.js';
-export { Range } from './input/Range.js';
+export { RangeSlider } from './input/RangeSlider.js';
 export { Search } from './input/Search.js';
 export { Slider } from './input/Slider.js';
 export { Switch } from './input/Switch.js';

package/dist/esm/input/ArrayInput.js

@@ -1,33 +1,75 @@
 'use client';
 
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { DndContext } from '@dnd-kit/core';
 import { SortableContext, useSortable } from '@dnd-kit/sortable';
-import { Icon, CoreIcons, Button, Tooltip } from '@react-fabric/core';
-import { isString } from '@react-fabric/utilities';
+import { Icon, CoreIcons, Tooltip, Button, cloneChildren } from '@react-fabric/core';
+import { isFalse, isString } from '@react-fabric/utilities';
 import classNames from 'classnames';
-import { useMemo, useCallback, useImperativeHandle, Children, cloneElement } from 'react';
+import { useState, useEffect, useMemo, useCallback, useImperativeHandle, cloneElement } from 'react';
 import { useFormContext, useFieldArray } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { FieldWrapper } from '../internal/FieldWrapper.js';
-import classes from './ArrayInput.module.css';
 import { restrictToVerticalAxis } from '@dnd-kit/modifiers';
 import { CSS } from '@dnd-kit/utilities';
 import { jsx, jsxs } from 'react/jsx-runtime';
 
-var _excluded = ["name", "children", "addLabel", "fixedList", "focusName", "onAdd", "arrayRef", "enableSorting", "disabled", "readOnly", "minItems"];
+var _excluded = ["name", "children", "addLabel", "focusName", "buttonPosition", "onAdd", "onRemove", "onBeforeRemove", "canRemove", "arrayRef", "enableSorting", "disabled", "readOnly", "minItems", "maxItems"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+/**
+ * ArrayInput component for managing an array of items in a form.
+ * It allows adding, removing, and sorting items within the array.
+ * It integrates with react-hook-form for form state management and validation.
+ * It supports fixed-length lists, custom add/remove handlers, and can display validation errors.
+ * It also provides options for inline display and custom button positioning.
+ *
+ * It uses the `useFieldArray` hook from `react-hook-form` to manage the array state and provides a simple interface for adding and removing items.
+ *
+ * It also supports drag-and-drop sorting using `@dnd-kit/core` and `@dnd-kit/sortable` for a better user experience when reordering items.
+ *
+ * @param {ArrayInputProps<T>} props - The properties for the ArrayInput component.
+ * @returns {JSX.Element} The rendered ArrayInput component.
+ *
+ * @example
+ * ```jsx
+ * <ArrayInput
+ *   name="items"
+ *   label="Items"
+ *   addLabel="Add Item"
+ *   onAdd={() => ({ name: "", value: "" })}
+ *   onRemove={(item, index) => console.log("Removed item:", item, "at index:", index)}
+ *   onBeforeRemove={(item, index) => confirm(`Are you sure you want to remove item at index ${index}?`)}
+ *   canRemove={({ item, index, lastItem }) => !lastItem} // Prevent removing the last item
+ * >
+ *   {({ index, name }) => (
+ *     <Input
+ *       name={name}
+ *       label={`Item ${index + 1}`}
+ *       placeholder="Enter item value"
+ *       required={index === 0} // Make the first item required
+ *     />
+ *   )}
+ * </ArrayInput>
+ * ```
+ *
+ * @see {@link https://react-hook-form.com/api/usefieldarray} for more details on `useFieldArray`.
+ * @see {@link https://react-dnd.github.io/react-dnd/about} for more details on DnD context and sorting.
+ */
 var ArrayInput = function ArrayInput(_ref) {
-  var _error$values$label, _error$values, _error$values2;
   var name = _ref.name,
     children = _ref.children,
     addLabel = _ref.addLabel,
-    fixedList = _ref.fixedList,
     _ref$focusName = _ref.focusName,
     focusName = _ref$focusName === void 0 ? "" : _ref$focusName,
+    _ref$buttonPosition = _ref.buttonPosition,
+    buttonPosition = _ref$buttonPosition === void 0 ? "bottom" : _ref$buttonPosition,
     onAdd = _ref.onAdd,
+    onRemove = _ref.onRemove,
+    onBeforeRemove = _ref.onBeforeRemove,
+    canRemove = _ref.canRemove,
     arrayRef = _ref.arrayRef,
     enableSorting = _ref.enableSorting,
     _ref$disabled = _ref.disabled,
@@ -36,6 +78,8 @@ var ArrayInput = function ArrayInput(_ref) {
     readOnly = _ref$readOnly === void 0 ? false : _ref$readOnly,
     _ref$minItems = _ref.minItems,
     minItems = _ref$minItems === void 0 ? 0 : _ref$minItems,
+    _ref$maxItems = _ref.maxItems,
+    maxItems = _ref$maxItems === void 0 ? Number.MAX_SAFE_INTEGER : _ref$maxItems,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useTranslation = useTranslation("form"),
     t = _useTranslation.t;
@@ -43,34 +87,70 @@ var ArrayInput = function ArrayInput(_ref) {
   if (!(form !== null && form !== void 0 && form.control)) throw new Error("ArrayInput must be contained within a Form element");
   var _useFieldArray = useFieldArray({
       name: name,
+      keyName: "__ID__",
       control: form.control
     }),
     fields = _useFieldArray.fields,
     append = _useFieldArray.append,
     remove = _useFieldArray.remove,
     move = _useFieldArray.move;
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    initialList = _useState2[0],
+    setInitialList = _useState2[1];
+  useEffect(function () {
+    setInitialList(fields.map(function (f) {
+      return f.__ID__;
+    }));
+  }, []);
   var error = useMemo(function () {
     var _form$formState$error, _form$formState$error2, _form$formState$error3;
     return (_form$formState$error = (_form$formState$error2 = form.formState.errors[name]) === null || _form$formState$error2 === void 0 ? void 0 : _form$formState$error2.message) !== null && _form$formState$error !== void 0 ? _form$formState$error : (_form$formState$error3 = form.formState.errors[name]) === null || _form$formState$error3 === void 0 || (_form$formState$error3 = _form$formState$error3.root) === null || _form$formState$error3 === void 0 ? void 0 : _form$formState$error3.message;
   }, [form.formState.errors]);
+  var removeCheck = useCallback(function (item, index) {
+    if (canRemove === false) return false;
+    if (canRemove === "newonly") {
+      return !initialList.includes(item.__ID__);
+    }
+    if (typeof canRemove === "function") {
+      return canRemove({
+        item: item,
+        index: index,
+        lastItem: index + 1 === fields.length
+      });
+    }
+    return true;
+  }, [canRemove, initialList, fields]);
   var handleAdd = useCallback(function (item) {
+    if (!item) return;
     append(item);
     setTimeout(function () {
       form.setFocus("".concat(name, ".").concat(fields.length).concat(focusName ? "." + focusName : ""));
     }, 100);
   }, [name, fields, focusName]);
+  var handleRemove = useCallback(function (item, index) {
+    var ret = onBeforeRemove === null || onBeforeRemove === void 0 ? void 0 : onBeforeRemove(item, index);
+    void Promise.resolve(ret).then(function (b) {
+      if (!isFalse(b)) {
+        remove(index);
+        onRemove === null || onRemove === void 0 || onRemove(item, index);
+      }
+    });
+  }, [remove, onRemove, onBeforeRemove]);
   useImperativeHandle(arrayRef, function () {
     return {
       addItem: handleAdd,
       removeItem: remove
     };
   });
-  var Wrapper = useCallback(function (_ref2) {
+  var Wrapper = useCallback(
+  // eslint-disable-next-line @typescript-eslint/promise-function-async
+  function (_ref2) {
     var children = _ref2.children;
     if (enableSorting) {
       // pass id list to dnd context
       var idMap = fields.map(function (item) {
-        return item.id;
+        return item.__ID__;
       });
       var handleDragEnd = function handleDragEnd(e) {
         if (e.over && e.active.id !== e.over.id) {
@@ -127,18 +207,47 @@ var ArrayInput = function ArrayInput(_ref) {
   }, [enableSorting]);
   // @ts-expect-error ignore
   SortableItem.displayName = "SortableItem";
+  var addButton = useMemo(function () {
+    var _error$values$label, _error$values, _error$values2;
+    return /*#__PURE__*/jsx("div", {
+      className: "flex justify-end",
+      children: /*#__PURE__*/jsx(Tooltip, {
+        color: "danger-200",
+        content: isString(error) ? "".concat(error) : t(error === null || error === void 0 ? void 0 : error.key, error !== null && error !== void 0 && error.values ? _objectSpread(_objectSpread({}, error === null || error === void 0 ? void 0 : error.values), {}, {
+          label: t((_error$values$label = (_error$values = error.values) === null || _error$values === void 0 ? void 0 : _error$values.label) !== null && _error$values$label !== void 0 ? _error$values$label : "form:badkey", (_error$values2 = error.values) === null || _error$values2 === void 0 ? void 0 : _error$values2.path)
+        }) : {}),
+        children: /*#__PURE__*/jsx(Button, {
+          size: "sm",
+          "aria-label": "Add item",
+          icon: CoreIcons.insert,
+          onClick: function onClick() {
+            return handleAdd(onAdd === null || onAdd === void 0 ? void 0 : onAdd());
+          },
+          "data-invalid": !!error,
+          disabled: !!disabled || readOnly || fields.length > maxItems,
+          className: classNames("fabric-addButton", canRemove !== false && "me-10"),
+          children: addLabel !== null && addLabel !== void 0 ? addLabel : t("form:addArray")
+        })
+      })
+    });
+  }, [error, fields, handleAdd, canRemove, disabled, readOnly, addLabel, maxItems]);
   return /*#__PURE__*/jsxs("div", {
-    className: classes.arrayInput,
+    className: "fabric-arrayInput",
     children: [/*#__PURE__*/jsx(FieldWrapper, _objectSpread(_objectSpread({}, rest), {}, {
+      appendLabel: /*#__PURE__*/jsx("div", {
+        className: "-me-2",
+        children: onAdd && buttonPosition !== "bottom" && addButton
+      }),
       children: /*#__PURE__*/jsx(Wrapper, {
         children: fields.map(function (item, index) {
           return /*#__PURE__*/jsxs(SortableItem, {
-            id: item.id,
+            id: item.__ID__,
             className: "flex items-center flex-nowrap gap-2 mb-1",
             children: [typeof children === "function" ? children({
               index: index,
+              item: item,
               name: "".concat(name, ".").concat(index)
-            }) : Children.map(children, function (child) {
+            }) : cloneChildren(children, function (child) {
               return /*#__PURE__*/cloneElement(child, Object.assign({
                 disabled: disabled,
                 readOnly: readOnly,
@@ -149,40 +258,21 @@ var ArrayInput = function ArrayInput(_ref) {
                 required: undefined,
                 appendLabel: undefined
               }));
-            }), !fixedList && /*#__PURE__*/jsx(Button, {
+            }), canRemove !== false && /*#__PURE__*/jsx(Button, {
               "aria-label": "Remove item",
               icon: CoreIcons.remove,
               color: "danger",
               variant: "link",
               className: "self-end",
-              disabled: disabled || readOnly || fields.length <= minItems,
+              disabled: disabled || readOnly || fields.length <= minItems || !removeCheck(item, index),
               onClick: function onClick() {
-                return remove(index);
+                return handleRemove(item, index);
               }
             })]
-          }, item.id);
-        })
-      })
-    })), !fixedList && onAdd && /*#__PURE__*/jsx("div", {
-      className: "flex justify-end",
-      children: /*#__PURE__*/jsx(Tooltip, {
-        color: "danger",
-        content: isString(error) ? "".concat(error) : t(error === null || error === void 0 ? void 0 : error.key, error !== null && error !== void 0 && error.values ? _objectSpread(_objectSpread({}, error === null || error === void 0 ? void 0 : error.values), {}, {
-          label: t((_error$values$label = (_error$values = error.values) === null || _error$values === void 0 ? void 0 : _error$values.label) !== null && _error$values$label !== void 0 ? _error$values$label : "form:badkey", (_error$values2 = error.values) === null || _error$values2 === void 0 ? void 0 : _error$values2.path)
-        }) : {}),
-        children: /*#__PURE__*/jsx(Button, {
-          "aria-label": "Add item",
-          icon: CoreIcons.insert,
-          onClick: function onClick() {
-            return handleAdd(onAdd());
-          },
-          "data-invalid": !!error,
-          disabled: !!disabled || readOnly,
-          className: classNames(classes.addButton, "me-10"),
-          children: addLabel !== null && addLabel !== void 0 ? addLabel : t("addArray")
+          }, item.__ID__);
         })
       })
-    })]
+    })), onAdd && buttonPosition !== "top" && addButton]
   });
 };