@react-fabric/form 1.0.0-beta.45 → 1.0.0-beta.47

package/dist/esm/input/ColorInput.js

@@ -5,33 +5,30 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { useFloating, autoUpdate, shift, flip, offset, arrow, useClick, useDismiss, useInteractions, FloatingArrow } from '@floating-ui/react';
 import { Icon, CoreIcons } from '@react-fabric/core';
-import { isString } from '@react-fabric/utilities';
-import classNames from 'classnames';
 import { useState, useDeferredValue, useEffect, useCallback, startTransition, useRef } from 'react';
+import { InputWrapper } from '../internal/InputWrapper.js';
 import { ColorPicker } from './ColorPicker.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
-var _excluded = ["ref", "required", "disabled", "allowClear", "invalid", "error", "value", "showPicker", "defaultColor", "decorateEnd", "decorateStart", "onBlur", "onFocus", "onChange", "noOutline"];
+var _excluded = ["ref", "required", "disabled", "readOnly", "invalid", "error", "value", "showPicker", "defaultColor", "onBlur", "onFocus", "onChange", "noOutline"];
 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 ColorInput = function ColorInput(_ref) {
   _ref.ref;
-    _ref.required;
-    var disabled = _ref.disabled,
-    allowClear = _ref.allowClear;
-    _ref.invalid;
-    _ref.error;
-    var value = _ref.value,
+    var required = _ref.required,
+    disabled = _ref.disabled,
+    readOnly = _ref.readOnly,
+    invalid = _ref.invalid,
+    error = _ref.error,
+    value = _ref.value,
     showPicker = _ref.showPicker,
     _ref$defaultColor = _ref.defaultColor,
     defaultColor = _ref$defaultColor === void 0 ? "" : _ref$defaultColor,
-    decorateEnd = _ref.decorateEnd,
-    decorateStart = _ref.decorateStart,
     onBlur = _ref.onBlur,
     onFocus = _ref.onFocus,
-    onChange = _ref.onChange,
-    noOutline = _ref.noOutline,
-    rest = _objectWithoutProperties(_ref, _excluded);
+    onChange = _ref.onChange;
+    _ref.noOutline;
+    var rest = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(""),
     _useState2 = _slicedToArray(_useState, 2),
     actualValue = _useState2[0],
@@ -70,7 +67,7 @@ var ColorInput = function ColorInput(_ref) {
     floatingStyles = _useFloating.floatingStyles,
     context = _useFloating.context;
   var click = useClick(context, {
-    enabled: !disabled
+    enabled: !disabled && !readOnly
   });
   var dismiss = useDismiss(context, {
     referencePress: true
@@ -78,12 +75,16 @@ var ColorInput = function ColorInput(_ref) {
   var _useInteractions = useInteractions([dismiss, click]),
     getReferenceProps = _useInteractions.getReferenceProps,
     getFloatingProps = _useInteractions.getFloatingProps;
-  return /*#__PURE__*/jsxs("div", {
-    className: classNames("flex-content min-h-[1.5em] min-w-[3.5em] self-stretch flex items-center outline-tint-200 rounded", !disabled && "bg-base", !noOutline && "bg-(--fabric-input) outline overflow-hidden"),
-    children: [decorateStart && /*#__PURE__*/jsx("div", {
-      className: classNames("text-muted leading-none flex-content", isString(decorateStart) && "px-2"),
-      children: decorateStart
-    }), /*#__PURE__*/jsx("button", _objectSpread(_objectSpread({
+  return /*#__PURE__*/jsxs(InputWrapper, _objectSpread(_objectSpread({
+    showClear: actualValue !== defaultColor && !disabled && !readOnly,
+    onClear: handleChange,
+    invalid: invalid,
+    readOnly: readOnly,
+    disabled: disabled,
+    required: required,
+    error: error
+  }, rest), {}, {
+    children: [/*#__PURE__*/jsx("button", _objectSpread(_objectSpread({
       "data-ref": "button",
       className: "flex-1 flex items-center",
       ref: refs.setReference
@@ -131,17 +132,8 @@ var ColorInput = function ColorInput(_ref) {
           return handleChange(resp.sRGBHex);
         });
       }
-    }), decorateEnd && /*#__PURE__*/jsx("div", {
-      className: classNames("text-muted leading-none flex-content", isString(decorateEnd) && "px-2"),
-      children: decorateEnd
-    }), !disabled && allowClear && actualValue !== defaultColor && /*#__PURE__*/jsx(Icon, {
-      icon: CoreIcons.close,
-      onClick: function onClick() {
-        return handleChange();
-      },
-      className: classNames("text-tint-500 hover:text-tint-700 p-[0.25em] flex-content")
     })]
-  });
+  }));
 };
 
 export { ColorInput };

package/dist/esm/input/DateInput.js

@@ -130,7 +130,7 @@ var DateInput = function DateInput(_ref) {
     getReferenceProps = _useInteractions.getReferenceProps,
     getFloatingProps = _useInteractions.getFloatingProps;
   return /*#__PURE__*/jsxs(InputWrapper, _objectSpread(_objectSpread({
-    showClear: !!actualValue,
+    showClear: !!actualValue && !disabled && !readOnly,
     onClear: handleChange,
     invalid: invalid,
     readOnly: readOnly,

package/dist/esm/input/Field.js

@@ -20,6 +20,7 @@ var Field = function Field(_ref) {
   return /*#__PURE__*/jsx(FieldWrapper, _objectSpread(_objectSpread({}, rest), {}, {
     children: /*#__PURE__*/jsx("div", {
       className: classNames("fabric-fieldGroup", !plain && !noOutline && "outline", !plain && "bg-base", plain && "flex-wrap", "flex-1 rounded", !vertical && "flex"),
+      "data-vertical": !!vertical,
       children: cloneChildren(children, function (child) {
         return /*#__PURE__*/cloneElement(child, {
           "data-inner": true

package/dist/esm/input/File.js

@@ -99,7 +99,7 @@ var FileInput = function FileInput(_ref) {
     onChange === null || onChange === void 0 || onChange(listRef.current);
   }, [onChange]);
   return /*#__PURE__*/jsx(InputWrapper, _objectSpread(_objectSpread({
-    showClear: !isEmpty(actualValue),
+    showClear: !isEmpty(actualValue) && !disabled && !readOnly,
     onClear: handleChange,
     invalid: invalid,
     readOnly: readOnly,

package/dist/esm/input/Input.js

@@ -7,9 +7,10 @@ import { useState, useDeferredValue, useMemo, useEffect, useCallback } from 'rea
 import { InputWrapper } from '../internal/InputWrapper.js';
 import { handleEnter } from '../utils/eventHandlers.js';
 import '@react-fabric/utilities';
+import classNames from 'classnames';
 import { jsx } from 'react/jsx-runtime';
 
-var _excluded = ["ref", "name", "value", "invalid", "readOnly", "disabled", "required", "placeholder", "autoFocus", "error", "type", "onBlur", "onFocus", "onChange", "onEnterPressed"];
+var _excluded = ["ref", "name", "value", "invalid", "readOnly", "disabled", "required", "placeholder", "autoFocus", "error", "monospace", "type", "onBlur", "onFocus", "onChange", "onEnterPressed"];
 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 Input = function Input(_ref) {
@@ -23,6 +24,7 @@ var Input = function Input(_ref) {
     placeholder = _ref.placeholder,
     autoFocus = _ref.autoFocus,
     error = _ref.error,
+    monospace = _ref.monospace,
     _ref$type = _ref.type,
     type = _ref$type === void 0 ? "text" : _ref$type,
     onBlur = _ref.onBlur,
@@ -47,7 +49,7 @@ var Input = function Input(_ref) {
     onChange === null || onChange === void 0 || onChange(value !== null && value !== void 0 ? value : null);
   }, [onchange]);
   return /*#__PURE__*/jsx(InputWrapper, _objectSpread(_objectSpread({
-    showClear: !!actualValue,
+    showClear: !!actualValue && !disabled && !readOnly,
     onClear: handleChange,
     invalid: invalid,
     readOnly: readOnly,
@@ -56,7 +58,7 @@ var Input = function Input(_ref) {
     error: error
   }, rest), {}, {
     children: /*#__PURE__*/jsx("input", {
-      className: "appearance-none bg-transparent py-1 px-2 flex-1 border-none outline-none ring-0 peer",
+      className: classNames("appearance-none bg-transparent py-1 px-2 flex-1 border-none outline-none ring-0 peer", monospace && "font-mono text-sm"),
       "aria-invalid": invalid,
       "aria-disabled": disabled,
       "aria-readonly": readOnly,

package/dist/esm/input/Number.js

@@ -47,7 +47,7 @@ var Number = function Number(_ref) {
     onChange === null || onChange === void 0 || onChange(number !== null && number !== void 0 ? number : null);
   }, [onChange]);
   return /*#__PURE__*/jsx(InputWrapper, _objectSpread(_objectSpread({
-    showClear: !!actualValue,
+    showClear: !!actualValue && !disabled && !readOnly,
     onClear: handleChange,
     invalid: invalid,
     readOnly: readOnly,

package/dist/esm/input/Password.js

@@ -55,7 +55,7 @@ var Password = function Password(_ref) {
     onChange === null || onChange === void 0 || onChange(value !== null && value !== void 0 ? value : null);
   }, [onChange]);
   return /*#__PURE__*/jsxs(InputWrapper, _objectSpread(_objectSpread({
-    showClear: !!actualValue,
+    showClear: !!actualValue && !disabled && !readOnly,
     onClear: handleChange,
     invalid: invalid,
     readOnly: readOnly,

package/dist/esm/input/RangeSlider.js

@@ -114,14 +114,14 @@ var RangeSlider = function RangeSlider(_ref) {
     isReadOnly: readOnly,
     canClear: !!actualValue,
     children: /*#__PURE__*/jsxs("div", {
-      className: classNames("flex-auto order-3 flex items-center select-none z-0", vertical && "flex-col w-8", invalid ? "text-danger-500" : "text-primary-600"),
+      className: classNames("flex-1 order-3 flex items-center select-none z-0", vertical && "flex-col w-8", invalid ? "text-danger-500" : "text-primary-600"),
       "data-vertical": !!vertical,
       style: invalid ? undefined : {
         color: color
       },
       children: [showLabels && (vertical ? maxDisplay : minDisplay), /*#__PURE__*/jsxs("div", {
         ref: rangerInstance.trackElRef,
-        className: classNames("flex-auto relative flex items-center", vertical ? "my-2 w-8" : "mx-2 h-8"),
+        className: classNames("flex-1 relative flex items-center", vertical ? "my-2 w-8" : "mx-2 h-8"),
         style: {
           height: vertical ? height : undefined
         },

package/dist/esm/input/Search.js

@@ -62,7 +62,7 @@ var Search = function Search(_ref) {
     }
   }, [onChange, searchOnChange, handleSearch]);
   return /*#__PURE__*/jsx(InputWrapper, _objectSpread(_objectSpread({
-    showClear: !!actualValue,
+    showClear: !!actualValue && !disabled && !readOnly,
     onClear: handleChange,
     allowClear: allowClear,
     invalid: invalid,

package/dist/esm/input/Slider.js

@@ -116,14 +116,14 @@ var Slider = function Slider(_ref) {
     isReadOnly: readOnly,
     canClear: !!actualValue,
     children: /*#__PURE__*/jsxs("div", {
-      className: classNames("flex-auto order-3 flex items-center select-none relative z-0", vertical && "flex-col w-8", invalid ? "text-danger-500" : "text-primary-600"),
+      className: classNames("flex-1 order-3 flex items-center select-none relative z-0", vertical && "flex-col w-8", invalid ? "text-danger-500" : "text-primary-600"),
       "data-vertical": !!vertical,
       style: invalid ? undefined : {
         color: color
       },
       children: [showLabels && (vertical ? maxDisplay : minDisplay), /*#__PURE__*/jsxs("div", {
         ref: rangerInstance.trackElRef,
-        className: classNames("flex-auto relative flex items-center", vertical ? "my-2 w-8" : "mx-2 h-8"),
+        className: classNames("flex-1 relative flex items-center", vertical ? "my-2 w-8" : "mx-2 h-8"),
         style: {
           height: vertical ? height : undefined
         },

package/dist/esm/input/Textarea.js

@@ -61,7 +61,7 @@ var Textarea = function Textarea(_ref) {
     }
   }, [actualValue, variableRows, rows, maxRows]);
   return /*#__PURE__*/jsx(InputWrapper, _objectSpread(_objectSpread({
-    showClear: !!actualValue,
+    showClear: !!actualValue && !disabled && !readOnly,
     onClear: handleChange,
     invalid: invalid,
     readOnly: readOnly,

package/dist/esm/internal/InputWrapper.js

@@ -69,7 +69,7 @@ var InputWrapper = function InputWrapper(_ref) {
   var el = /*#__PURE__*/jsxs("div", {
     role: "none",
     ref: wrapperRef,
-    className: classNames("fabric-inputWrapper", invalid && "fabric-invalidWrapper", !noOutline && !noBorder && "bg-(--fabric-input) outline -outline-offset-1 overflow-hidden", "flex flex-nowrap items-center flex-1", textarea ? "rounded-capped group" : "rounded", isExpanded ? "fixed inset-4 z-[99]" : floatingExpand ? "absolute inset-x-0" : "relative", !noOutline && "after:absolute after:bottom-0 after:h-[2px] after:bg-primary-500 after:mx-auto"),
+    className: classNames("fabric-inputWrapper", invalid && "fabric-invalidWrapper", !noOutline && !noBorder && "bg-(--fabric-input) outline overflow-hidden", "flex flex-nowrap items-center flex-1", textarea ? "rounded-capped group" : "rounded", isExpanded ? "fixed inset-4 z-[99]" : floatingExpand ? "absolute inset-x-0" : "relative", !noOutline && "after:absolute after:bottom-0 after:h-px after:bg-primary-500 after:mx-auto"),
     onKeyDown: function onKeyDown(e) {
       return e.key === "Escape" && isExpanded && (setExpanded(false), e.stopPropagation());
     },
@@ -103,7 +103,7 @@ var InputWrapper = function InputWrapper(_ref) {
   return /*#__PURE__*/jsx(Wrapper, _objectSpread(_objectSpread({}, wrapperProps), {}, {
     children: /*#__PURE__*/jsx("div", {
       ref: elRef,
-      className: "flex-1 relative min-h-8 flex flex-col flex-nowrap",
+      className: classNames("relative min-h-8 flex flex-col flex-nowrap", width ? "flex-auto" : "flex-1"),
       style: {
         width: width,
         flexBasis: width

package/dist/esm/select/useSelect.js

@@ -249,7 +249,7 @@ var useSelect = function useSelect(_ref) {
         setActive: true
       });
     });
-  }, [onQuery]);
+  }, [onQuery], 300);
 
   // handlers
   var handleQuery = useCallback(function (query) {

package/dist/types/index.d.ts

@@ -6,6 +6,7 @@ export { useFileUploader } from "./hooks/useFileUploader";
 export { useFormBuilder } from "./hooks/useFormBuilder";
 export { DATA_TYPES, SCHEMA_CUSTOM_LIST, type FormSchema, type SchemaDef, } from "./types/schema";
 export { ArrayInput } from "./input/ArrayInput";
+export { AvatarInput } from "./input/AvatarInput";
 export { Checkbox } from "./input/Checkbox";
 export { ColorInput } from "./input/ColorInput";
 export { ColorPicker } from "./input/ColorPicker";

package/dist/types/input/ArrayInput.d.ts

@@ -1,5 +1,5 @@
 import { type ReactNode, type Ref } from "react";
-export interface ArrayInputProps {
+export interface ArrayInputProps<T extends AnyObject = string> {
     /**
      * input label
      */
@@ -58,13 +58,29 @@ export interface ArrayInputProps {
      */
     fixedList?: boolean;
     arrayRef?: Ref<{
-        addItem: (item: AnyObject) => void;
+        addItem: (item: T) => void;
         removeItem: (idx: number) => void;
     }>;
     /**
-     * Add item
+     * add new item
      */
     onAdd?: () => AnyObject;
+    /**
+     * on item remove
+     */
+    onRemove?: (item: T, idx: number) => void;
+    /**
+     * before item remove
+     */
+    onBeforeRemove?: (item: T, idx: number) => Promise<boolean> | boolean;
+    /**
+     * can remove item
+     */
+    canRemove?: (props: {
+        item: T;
+        index: number;
+        lastItem: boolean;
+    }) => boolean;
     /**
      * field width
      */
@@ -78,4 +94,4 @@ export interface ArrayInputProps {
      */
     labelWidth?: string;
 }
-export declare const ArrayInput: ({ name, children, addLabel, fixedList, focusName, buttonPosition, onAdd, arrayRef, enableSorting, disabled, readOnly, minItems, maxItems, ...rest }: ArrayInputProps) => import("react/jsx-runtime").JSX.Element;
+export declare const ArrayInput: <T extends unknown = string>({ name, children, addLabel, fixedList, focusName, buttonPosition, onAdd, onRemove, onBeforeRemove, canRemove, arrayRef, enableSorting, disabled, readOnly, minItems, maxItems, ...rest }: ArrayInputProps<T>) => import("react/jsx-runtime").JSX.Element;

package/dist/types/input/ColorInput.d.ts

@@ -7,4 +7,4 @@ export interface ColorInputProps extends InputProps, Omit<ColorProps, "onChange"
      */
     showPicker?: boolean;
 }
-export declare const ColorInput: ({ ref, required, disabled, allowClear, invalid, error, value, showPicker, defaultColor, decorateEnd, decorateStart, onBlur, onFocus, onChange, noOutline, ...rest }: ColorInputProps) => import("react/jsx-runtime").JSX.Element;
+export declare const ColorInput: ({ ref, required, disabled, readOnly, invalid, error, value, showPicker, defaultColor, onBlur, onFocus, onChange, noOutline, ...rest }: ColorInputProps) => import("react/jsx-runtime").JSX.Element;

package/dist/types/input/Input.d.ts

@@ -6,4 +6,4 @@ export interface TextInputProps extends InputProps, RefProp<HTMLInputElement> {
      */
     type?: "email" | "file" | "search" | "tel" | "text" | "url";
 }
-export declare const Input: ({ ref, name, value, invalid, readOnly, disabled, required, placeholder, autoFocus, error, type, onBlur, onFocus, onChange, onEnterPressed, ...rest }: TextInputProps) => import("react/jsx-runtime").JSX.Element;
+export declare const Input: ({ ref, name, value, invalid, readOnly, disabled, required, placeholder, autoFocus, error, monospace, type, onBlur, onFocus, onChange, onEnterPressed, ...rest }: TextInputProps) => import("react/jsx-runtime").JSX.Element;

package/dist/types/types/index.d.ts

@@ -51,6 +51,7 @@ export interface InputProps<V = string> extends TestProps {
      * info label at bottom
      */
     info?: string;
+    monospace?: boolean;
     /**
      * required
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-fabric/form",
-  "version": "1.0.0-beta.45",
+  "version": "1.0.0-beta.47",
   "description": "RUF: Form package",
   "author": "Adarsh Pastakia <adarshpastakia@outlook.com>",
   "license": "MIT",
@@ -41,9 +41,9 @@
     "@dnd-kit/utilities": "^3.2.2",
     "@floating-ui/react": "^0.26.24",
     "@hookform/resolvers": "^3.9.0",
-    "@react-fabric/core": "^1.0.0-beta.45",
-    "@react-fabric/date": "^1.0.0-beta.45",
-    "@react-fabric/utilities": "^1.0.0-beta.45",
+    "@react-fabric/core": "^1.0.0-beta.47",
+    "@react-fabric/date": "^1.0.0-beta.47",
+    "@react-fabric/utilities": "^1.0.0-beta.47",
     "classnames": "^2.5.1",
     "color": "^4.2.3",
     "react-color": "^2.19.3",
@@ -63,5 +63,5 @@
     "node": ">=18.12.0",
     "npm": ">=8.19.0"
   },
-  "gitHead": "37d7cbcd99da40553f4ac775c3332d5281565936"
+  "gitHead": "832a1bce055337127ba17c505731f419248cc15e"
 }

package/src/form/Form.tsx

@@ -90,7 +90,7 @@ export const Form = <K extends KeyValue>({
   });
 
   const [, startTransition] = useTransition();
-  const changeHandler = useDebounce(onChange, [onChange]);
+  const changeHandler = useDebounce(onChange, [onChange], 300);
   useEffect(() => {
     const subscription = form.watch((value) => {
       startTransition(() => changeHandler?.(value as K));

package/src/index.ts

@@ -39,6 +39,7 @@ export {
 } from "./types/schema";
 
 export { ArrayInput } from "./input/ArrayInput";
+export { AvatarInput } from "./input/AvatarInput";
 export { Checkbox } from "./input/Checkbox";
 export { ColorInput } from "./input/ColorInput";
 export { ColorPicker } from "./input/ColorPicker";

package/src/input/ArrayInput.tsx

@@ -30,7 +30,7 @@ import {
   Icon,
   Tooltip,
 } from "@react-fabric/core";
-import { isString } from "@react-fabric/utilities";
+import { isFalse, isString } from "@react-fabric/utilities";
 import classNames from "classnames";
 import {
   cloneElement,
@@ -48,7 +48,7 @@ import { FieldWrapper } from "../internal/FieldWrapper";
 import { restrictToVerticalAxis } from "@dnd-kit/modifiers";
 import { CSS } from "@dnd-kit/utilities";
 
-export interface ArrayInputProps {
+export interface ArrayInputProps<T extends AnyObject = string> {
   /**
    * input label
    */
@@ -107,13 +107,25 @@ export interface ArrayInputProps {
    */
   fixedList?: boolean;
   arrayRef?: Ref<{
-    addItem: (item: AnyObject) => void;
+    addItem: (item: T) => void;
     removeItem: (idx: number) => void;
   }>;
   /**
-   * Add item
+   * add new item
    */
   onAdd?: () => AnyObject;
+  /**
+   * on item remove
+   */
+  onRemove?: (item: T, idx: number) => void;
+  /**
+   * before item remove
+   */
+  onBeforeRemove?: (item: T, idx: number) => Promise<boolean> | boolean;
+  /**
+   * can remove item
+   */
+  canRemove?: (props: { item: T; index: number; lastItem: boolean }) => boolean;
 
   /**
    * field width
@@ -129,7 +141,7 @@ export interface ArrayInputProps {
   labelWidth?: string;
 }
 
-export const ArrayInput = ({
+export const ArrayInput = <T extends AnyObject = string>({
   name,
   children,
   addLabel,
@@ -137,6 +149,9 @@ export const ArrayInput = ({
   focusName = "",
   buttonPosition = "bottom",
   onAdd,
+  onRemove,
+  onBeforeRemove,
+  canRemove,
   arrayRef,
   enableSorting,
   disabled = false,
@@ -144,7 +159,7 @@ export const ArrayInput = ({
   minItems = 0,
   maxItems = Number.MAX_SAFE_INTEGER,
   ...rest
-}: ArrayInputProps) => {
+}: ArrayInputProps<T>) => {
   const { t } = useTranslation("form");
   const form = useFormContext();
 
@@ -153,6 +168,7 @@ export const ArrayInput = ({
 
   const { fields, append, remove, move } = useFieldArray({
     name,
+    keyName: "__ID__",
     control: form.control,
   });
 
@@ -164,7 +180,7 @@ export const ArrayInput = ({
   );
 
   const handleAdd = useCallback(
-    (item: AnyObject) => {
+    (item: T) => {
       append(item);
       setTimeout(() => {
         form.setFocus(
@@ -175,6 +191,19 @@ export const ArrayInput = ({
     [name, fields, focusName],
   );
 
+  const handleRemove = useCallback(
+    (item: T, index: number) => {
+      const ret = onBeforeRemove?.(item, index);
+      void Promise.resolve(ret).then((b) => {
+        if (!isFalse(b)) {
+          remove(index);
+          onRemove?.(item, index);
+        }
+      });
+    },
+    [remove, onRemove, onBeforeRemove],
+  );
+
   useImperativeHandle(arrayRef, () => ({
     addItem: handleAdd,
     removeItem: remove,
@@ -184,7 +213,7 @@ export const ArrayInput = ({
     ({ children }: PropsWithChildren) => {
       if (enableSorting) {
         // pass id list to dnd context
-        const idMap = fields.map((item) => item.id);
+        const idMap = fields.map((item) => item.__ID__);
         const handleDragEnd = (e: DragEndEvent) => {
           if (e.over && e.active.id !== e.over.id) {
             // find index of item and drop over
@@ -304,8 +333,8 @@ export const ArrayInput = ({
         <Wrapper>
           {fields.map((item, index) => (
             <SortableItem
-              key={item.id}
-              id={item.id}
+              key={item.__ID__}
+              id={item.__ID__}
               className="flex items-center flex-nowrap gap-2 mb-1"
             >
               {typeof children === "function"
@@ -342,8 +371,17 @@ export const ArrayInput = ({
                   color="danger"
                   variant="link"
                   className="self-end"
-                  disabled={disabled || readOnly || fields.length <= minItems}
-                  onClick={() => remove(index)}
+                  disabled={
+                    disabled ||
+                    readOnly ||
+                    fields.length <= minItems ||
+                    canRemove?.({
+                      item: item as T,
+                      index,
+                      lastItem: index + 1 === fields.length,
+                    }) !== false
+                  }
+                  onClick={() => handleRemove(item as T, index)}
                 />
               )}
             </SortableItem>

package/src/input/ColorInput.tsx

@@ -35,8 +35,6 @@ import {
 } from "@floating-ui/react";
 import { CoreIcons, Icon } from "@react-fabric/core";
 import { type RefProp } from "@react-fabric/core/dist/types/types";
-import { isString } from "@react-fabric/utilities";
-import classNames from "classnames";
 import {
   startTransition,
   useCallback,
@@ -45,6 +43,7 @@ import {
   useRef,
   useState,
 } from "react";
+import { InputWrapper } from "../internal/InputWrapper";
 import { type InputProps } from "../types";
 import { ColorPicker, type ColorProps } from "./ColorPicker";
 
@@ -62,14 +61,12 @@ export const ColorInput = ({
   ref,
   required,
   disabled,
-  allowClear,
+  readOnly,
   invalid,
   error,
   value,
   showPicker,
   defaultColor = "",
-  decorateEnd,
-  decorateStart,
   onBlur,
   onFocus,
   onChange,
@@ -113,7 +110,7 @@ export const ColorInput = ({
     ],
   });
   const click = useClick(context, {
-    enabled: !disabled,
+    enabled: !disabled && !readOnly,
   });
   const dismiss = useDismiss(context, {
     referencePress: true,
@@ -125,23 +122,16 @@ export const ColorInput = ({
   ]);
 
   return (
-    <div
-      className={classNames(
-        "flex-content min-h-[1.5em] min-w-[3.5em] self-stretch flex items-center outline-tint-200 rounded",
-        !disabled && "bg-base",
-        !noOutline && "bg-(--fabric-input) outline overflow-hidden",
-      )}
+    <InputWrapper
+      showClear={actualValue !== defaultColor && !disabled && !readOnly}
+      onClear={handleChange}
+      invalid={invalid}
+      readOnly={readOnly}
+      disabled={disabled}
+      required={required}
+      error={error}
+      {...rest}
     >
-      {decorateStart && (
-        <div
-          className={classNames(
-            "text-muted leading-none flex-content",
-            isString(decorateStart) && "px-2",
-          )}
-        >
-          {decorateStart}
-        </div>
-      )}
       <button
         data-ref="button"
         className="flex-1 flex items-center"
@@ -206,25 +196,6 @@ export const ColorInput = ({
           }
         />
       )}
-      {decorateEnd && (
-        <div
-          className={classNames(
-            "text-muted leading-none flex-content",
-            isString(decorateEnd) && "px-2",
-          )}
-        >
-          {decorateEnd}
-        </div>
-      )}
-      {!disabled && allowClear && actualValue !== defaultColor && (
-        <Icon
-          icon={CoreIcons.close}
-          onClick={() => handleChange()}
-          className={classNames(
-            "text-tint-500 hover:text-tint-700 p-[0.25em] flex-content",
-          )}
-        />
-      )}
-    </div>
+    </InputWrapper>
   );
 };

package/src/input/DateInput.tsx

@@ -186,7 +186,7 @@ export const DateInput = ({
 
   return (
     <InputWrapper
-      showClear={!!actualValue}
+      showClear={!!actualValue && !disabled && !readOnly}
       onClear={handleChange}
       invalid={invalid}
       readOnly={readOnly}