@react-fabric/form 1.0.0-beta.5 → 1.0.0-beta.51

package/dist/cjs/hooks/useFormBuilder.js

@@ -1,33 +1,42 @@
 'use strict';
 
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var core = require('@react-fabric/core');
 var utilities = require('@react-fabric/utilities');
 var react = require('react');
 var FormField = require('../builder/FormField.js');
+var schema = require('../types/schema.js');
 var jsxRuntime = require('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 = utilities.yup.string();
-  if (field.datatype === "schema") {
+  var yupField = utilities.yup.string().trim();
+  if (field.datatype === schema.DATA_TYPES.SCHEMA) {
     var child = Object.fromEntries(field.schema.map(function (field) {
       return [field.id, makeYupField(field)];
     }));
     yupField = utilities.yup.object(child);
   }
-  if (field.datatype === "boolean") yupField = utilities.yup["boolean"]();
-  if (field.datatype === "decimal" || field.datatype === "number" || field.datatype === "range") {
+  if (field.datatype === schema.DATA_TYPES.BOOL) {
+    yupField = utilities.yup["boolean"]();
+    if (field.required) yupField = yupField.test({
+      test: function test(value) {
+        return !!value;
+      }
+    });
+  }
+  if (field.datatype === schema.DATA_TYPES.NUMBER || field.datatype === schema.DATA_TYPES.RANGE) {
     yupField = utilities.yup.number();
     !utilities.isNil(field.min) && (yupField = yupField.min(field.min));
     !utilities.isNil(field.max) && (yupField = yupField.max(field.max));
-    if (field.datatype === "range") yupField = utilities.yup.array(yupField);
+    if (field.datatype === schema.DATA_TYPES.RANGE) yupField = utilities.yup.array(yupField);
   }
-  if (field.datatype === "string") {
-    field.options && (yupField = yupField.oneOf(field.options));
+  if (field.datatype === schema.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 === schema.DATA_TYPES.FILE) {
     yupField = utilities.yup.object({
       filename: utilities.yup.string().required(),
       path: utilities.yup.string().required()
@@ -53,30 +62,33 @@ var makeYupField = function makeYupField(field) {
   }
   return yupField.label(field.label);
 };
-var useFormBuilder = function useFormBuilder(schema) {
+var useFormBuilder = function useFormBuilder(schema$1) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var filteredSchema = react.useMemo(function () {
     var _schema$filter, _schema$filter2;
-    return (_schema$filter = (_schema$filter2 = schema.filter) === null || _schema$filter2 === void 0 ? void 0 : _schema$filter2.call(schema, function (schm) {
+    return (_schema$filter = (_schema$filter2 = schema$1.filter) === null || _schema$filter2 === void 0 ? void 0 : _schema$filter2.call(schema$1, function (schm) {
       return !!schm.id;
     })) !== null && _schema$filter !== void 0 ? _schema$filter : [];
-  }, [schema]);
+  }, [schema$1]);
   var schemaDef = utilities.yup.object(Object.fromEntries(filteredSchema.map(function (field) {
     return [field.id, makeYupField(field)];
   })));
-  var formDef = /*#__PURE__*/jsxRuntime.jsx(react.Fragment, {
-    children: filteredSchema.map(function (field, idx) {
+  var formDef = /*#__PURE__*/jsxRuntime.jsxs(react.Fragment, {
+    children: [filteredSchema.map(function (field, idx) {
       return /*#__PURE__*/jsxRuntime.jsx("div", {
         className: "mb-4",
-        children: field.datatype === "schema" ? null : /*#__PURE__*/jsxRuntime.jsx(FormField.FormField, _objectSpread(_objectSpread({}, field), {}, {
+        children: field.datatype === schema.DATA_TYPES.SCHEMA ? null : /*#__PURE__*/jsxRuntime.jsx(FormField.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__*/jsxRuntime.jsx(core.EmptyContent, {
+      message: "No schema defined"
+    })]
   });
   return {
     formDef: formDef,

package/dist/cjs/index.js

@@ -3,12 +3,16 @@
 require('./i18n/index.js');
 var Controller = require('./form/Controller.js');
 var Form = require('./form/Form.js');
+var SchemaEditor = require('./builder/SchemaEditor.js');
 var useFileUploader = require('./hooks/useFileUploader.js');
 var useFormBuilder = require('./hooks/useFormBuilder.js');
+var schema = require('./types/schema.js');
 var ArrayInput = require('./input/ArrayInput.js');
+var AvatarInput = require('./input/AvatarInput.js');
 var Checkbox = require('./input/Checkbox.js');
 var ColorInput = require('./input/ColorInput.js');
 var ColorPicker = require('./input/ColorPicker.js');
+var DateInput = require('./input/DateInput.js');
 var Field = require('./input/Field.js');
 var File = require('./input/File.js');
 var Hidden = require('./input/Hidden.js');
@@ -17,7 +21,7 @@ var Number = require('./input/Number.js');
 var Password = require('./input/Password.js');
 var Radio = require('./input/Radio.js');
 var RadioGroup = require('./input/RadioGroup.js');
-var Range = require('./input/Range.js');
+var RangeSlider = require('./input/RangeSlider.js');
 var Search = require('./input/Search.js');
 var Slider = require('./input/Slider.js');
 var Switch = require('./input/Switch.js');
@@ -31,12 +35,17 @@ var Select = require('./select/Select.js');
 
 exports.Controller = Controller.Controller;
 exports.Form = Form.Form;
+exports.SchemaEditor = SchemaEditor.SchemaEditor;
 exports.useFileUploader = useFileUploader.useFileUploader;
 exports.useFormBuilder = useFormBuilder.useFormBuilder;
+exports.DATA_TYPES = schema.DATA_TYPES;
+exports.SCHEMA_CUSTOM_LIST = schema.SCHEMA_CUSTOM_LIST;
 exports.ArrayInput = ArrayInput.ArrayInput;
+exports.AvatarInput = AvatarInput.AvatarInput;
 exports.Checkbox = Checkbox.Checkbox;
 exports.ColorInput = ColorInput.ColorInput;
 exports.ColorPicker = ColorPicker.ColorPicker;
+exports.DateInput = DateInput.DateInput;
 exports.Field = Field.Field;
 exports.FileInput = File.FileInput;
 exports.HiddenInput = Hidden.HiddenInput;
@@ -45,7 +54,7 @@ exports.Number = Number.Number;
 exports.Password = Password.Password;
 exports.Radio = Radio.Radio;
 exports.RadioGroup = RadioGroup.RadioGroup;
-exports.Range = Range.Range;
+exports.RangeSlider = RangeSlider.RangeSlider;
 exports.Search = Search.Search;
 exports.Slider = Slider.Slider;
 exports.Switch = Switch.Switch;

package/dist/cjs/input/ArrayInput.js

@@ -5,29 +5,32 @@ var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProp
 var core = require('@dnd-kit/core');
 var sortable = require('@dnd-kit/sortable');
 var core$1 = require('@react-fabric/core');
-var utilities$1 = require('@react-fabric/utilities');
+var utilities = require('@react-fabric/utilities');
 var classNames = require('classnames');
 var react = require('react');
 var reactHookForm = require('react-hook-form');
 var reactI18next = require('react-i18next');
 var FieldWrapper = require('../internal/FieldWrapper.js');
-var ArrayInput_module = require('./ArrayInput.module.css');
 var modifiers = require('@dnd-kit/modifiers');
-var utilities = require('@dnd-kit/utilities');
+var utilities$1 = require('@dnd-kit/utilities');
 var jsxRuntime = require('react/jsx-runtime');
 
-var _excluded = ["name", "children", "addLabel", "fixedList", "focusName", "onAdd", "arrayRef", "enableSorting", "disabled", "readOnly", "minItems"];
+var _excluded = ["name", "children", "addLabel", "fixedList", "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; }
 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 +39,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 = reactI18next.useTranslation("form"),
     t = _useTranslation.t;
@@ -43,6 +48,7 @@ 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 = reactHookForm.useFieldArray({
       name: name,
+      keyName: "__ID__",
       control: form.control
     }),
     fields = _useFieldArray.fields,
@@ -59,6 +65,15 @@ var ArrayInput = function ArrayInput(_ref) {
       form.setFocus("".concat(name, ".").concat(fields.length).concat(focusName ? "." + focusName : ""));
     }, 100);
   }, [name, fields, focusName]);
+  var handleRemove = react.useCallback(function (item, index) {
+    var ret = onBeforeRemove === null || onBeforeRemove === void 0 ? void 0 : onBeforeRemove(item, index);
+    void Promise.resolve(ret).then(function (b) {
+      if (!utilities.isFalse(b)) {
+        remove(index);
+        onRemove === null || onRemove === void 0 || onRemove(item, index);
+      }
+    });
+  }, [remove, onRemove, onBeforeRemove]);
   react.useImperativeHandle(arrayRef, function () {
     return {
       addItem: handleAdd,
@@ -70,7 +85,7 @@ var ArrayInput = function ArrayInput(_ref) {
     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) {
@@ -111,7 +126,7 @@ var ArrayInput = function ArrayInput(_ref) {
         className: className,
         ref: setNodeRef,
         style: {
-          transform: utilities.CSS.Transform.toString(transform),
+          transform: utilities$1.CSS.Transform.toString(transform),
           transition: transition
         },
         children: [/*#__PURE__*/jsxRuntime.jsx(core$1.Icon, _objectSpread(_objectSpread({
@@ -127,18 +142,46 @@ var ArrayInput = function ArrayInput(_ref) {
   }, [enableSorting]);
   // @ts-expect-error ignore
   SortableItem.displayName = "SortableItem";
+  var addButton = react.useMemo(function () {
+    var _error$values$label, _error$values, _error$values2;
+    return /*#__PURE__*/jsxRuntime.jsx("div", {
+      className: "flex justify-end",
+      children: /*#__PURE__*/jsxRuntime.jsx(core$1.Tooltip, {
+        color: "danger-200",
+        content: utilities.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__*/jsxRuntime.jsx(core$1.Button, {
+          size: "sm",
+          "aria-label": "Add item",
+          icon: core$1.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", "me-10"),
+          children: addLabel !== null && addLabel !== void 0 ? addLabel : t("addArray")
+        })
+      })
+    });
+  }, [error, fields, handleAdd, disabled, readOnly, addLabel, maxItems]);
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
-    className: ArrayInput_module.arrayInput,
+    className: "fabric-arrayInput",
     children: [/*#__PURE__*/jsxRuntime.jsx(FieldWrapper.FieldWrapper, _objectSpread(_objectSpread({}, rest), {}, {
+      appendLabel: /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "-me-2",
+        children: !fixedList && onAdd && buttonPosition !== "bottom" && addButton
+      }),
       children: /*#__PURE__*/jsxRuntime.jsx(Wrapper, {
         children: fields.map(function (item, index) {
           return /*#__PURE__*/jsxRuntime.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,
               name: "".concat(name, ".").concat(index)
-            }) : react.Children.map(children, function (child) {
+            }) : core$1.cloneChildren(children, function (child) {
               return /*#__PURE__*/react.cloneElement(child, Object.assign({
                 disabled: disabled,
                 readOnly: readOnly,
@@ -155,34 +198,19 @@ var ArrayInput = function ArrayInput(_ref) {
               color: "danger",
               variant: "link",
               className: "self-end",
-              disabled: disabled || readOnly || fields.length <= minItems,
+              disabled: disabled || readOnly || fields.length <= minItems || (canRemove === null || canRemove === void 0 ? void 0 : canRemove({
+                item: item,
+                index: index,
+                lastItem: index + 1 === fields.length
+              })) !== false,
               onClick: function onClick() {
-                return remove(index);
+                return handleRemove(item, index);
               }
             })]
-          }, item.id);
-        })
-      })
-    })), !fixedList && onAdd && /*#__PURE__*/jsxRuntime.jsx("div", {
-      className: "flex justify-end",
-      children: /*#__PURE__*/jsxRuntime.jsx(core$1.Tooltip, {
-        color: "danger",
-        content: utilities$1.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__*/jsxRuntime.jsx(core$1.Button, {
-          "aria-label": "Add item",
-          icon: core$1.CoreIcons.insert,
-          onClick: function onClick() {
-            return handleAdd(onAdd());
-          },
-          "data-invalid": !!error,
-          disabled: !!disabled || readOnly,
-          className: classNames(ArrayInput_module.addButton, "me-10"),
-          children: addLabel !== null && addLabel !== void 0 ? addLabel : t("addArray")
+          }, item.__ID__);
         })
       })
-    })]
+    })), !fixedList && onAdd && buttonPosition !== "top" && addButton]
   });
 };
 

package/dist/cjs/input/AvatarInput.js

@@ -11,14 +11,15 @@ var useFileUploader = require('../hooks/useFileUploader.js');
 var Hidden = require('./Hidden.js');
 var jsxRuntime = require('react/jsx-runtime');
 
-var _excluded = ["src", "size", "fileUrl", "uploadHandler"];
+var _excluded = ["size", "avatarName", "value", "fileUrl", "uploadHandler"];
 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 AvatarInput = function AvatarInput(_ref) {
   var _list$;
-  var src = _ref.src,
-    _ref$size = _ref.size,
+  var _ref$size = _ref.size,
     size = _ref$size === void 0 ? "6rem" : _ref$size,
+    avatarName = _ref.avatarName,
+    value = _ref.value,
     fileUrl = _ref.fileUrl,
     uploadHandler = _ref.uploadHandler,
     rest = _objectWithoutProperties(_ref, _excluded);
@@ -40,7 +41,7 @@ var AvatarInput = function AvatarInput(_ref) {
       return function (_x, _x2) {
         return _ref2.apply(this, arguments);
       };
-    }(), rest.value, false),
+    }(), value, false),
     files = _useFileUploader.files,
     list = _useFileUploader.list,
     upload = _useFileUploader.upload,
@@ -69,18 +70,18 @@ var AvatarInput = function AvatarInput(_ref) {
   }, [files, list]);
   react.useEffect(function () {
     var _fileUrl;
-    src && setBase64((_fileUrl = fileUrl === null || fileUrl === void 0 ? void 0 : fileUrl(src)) !== null && _fileUrl !== void 0 ? _fileUrl : src);
-  }, [src]);
+    value && setBase64((_fileUrl = fileUrl === null || fileUrl === void 0 ? void 0 : fileUrl(value)) !== null && _fileUrl !== void 0 ? _fileUrl : value);
+  }, [value]);
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "flex flex-nowrap items-end",
     children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "inline-block leading-none rounded-full relative outline overflow-hidden",
       children: [/*#__PURE__*/jsxRuntime.jsx(core.Avatar, {
-        name: "temp",
+        name: avatarName !== null && avatarName !== void 0 ? avatarName : "temp",
         size: size,
         avatar: base64
       }), /*#__PURE__*/jsxRuntime.jsxs("div", {
-        className: "absolute inset-x-0 bottom-0 cursor-pointer bg-opacity-20 hover:bg-opacity-50 bg-black text-white text-xs text-center py-1",
+        className: "absolute inset-x-0 bottom-0 cursor-pointer bg-black/20 hover:bg-black/50 text-white text-xs text-center py-1",
         children: [/*#__PURE__*/jsxRuntime.jsx("span", {
           children: "Edit"
         }), /*#__PURE__*/jsxRuntime.jsx("input", {

package/dist/cjs/input/Checkbox.js

@@ -9,7 +9,7 @@ var react = require('react');
 var ErrorIcon = require('../internal/ErrorIcon.js');
 var jsxRuntime = require('react/jsx-runtime');
 
-var _excluded = ["ref", "label", "value", "name", "checked", "invalid", "disabled", "error", "width", "icon", "iconChecked", "onChange"];
+var _excluded = ["ref", "label", "value", "name", "checked", "invalid", "disabled", "error", "width", "icon", "iconChecked", "required", "onChange"];
 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 Checkbox = function Checkbox(_ref) {
@@ -23,8 +23,9 @@ var Checkbox = function Checkbox(_ref) {
     error = _ref.error,
     width = _ref.width,
     icon = _ref.icon,
-    iconChecked = _ref.iconChecked,
-    onChange = _ref.onChange,
+    iconChecked = _ref.iconChecked;
+    _ref.required;
+    var onChange = _ref.onChange,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useState = react.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -66,7 +67,7 @@ var Checkbox = function Checkbox(_ref) {
       checked: actualValue,
       onChange: handleChange
     }, rest)), /*#__PURE__*/jsxRuntime.jsx(core.Icon, {
-      className: classNames("p-0.5", actualValue && icon && !iconChecked && "bg-primary-500 text-white"),
+      className: classNames("p-0.5", actualValue && icon && !iconChecked && "bg-primary-500 text-white!"),
       size: "1.25em",
       color: invalid ? "danger" : "primary",
       icon: actualValue ? iconOn : iconOff
@@ -74,7 +75,7 @@ var Checkbox = function Checkbox(_ref) {
       invalid: invalid,
       error: error
     }), label && /*#__PURE__*/jsxRuntime.jsx("span", {
-      className: "flex-initial leading-none truncate",
+      className: "flex-initial leading-tight truncate",
       children: label
     })]
   });

package/dist/cjs/input/ColorInput.js

@@ -3,32 +3,32 @@
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
+var react$1 = require('@floating-ui/react');
 var core = require('@react-fabric/core');
-var utilities = require('@react-fabric/utilities');
-var classNames = require('classnames');
 var react = require('react');
+var InputWrapper = require('../internal/InputWrapper.js');
 var ColorPicker = require('./ColorPicker.js');
 var jsxRuntime = require('react/jsx-runtime');
 
-var _excluded = ["ref", "required", "disabled", "allowClear", "invalid", "error", "value", "showPicker", "defaultColor", "decorateEnd", "decorateStart", "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,
-    onChange = _ref.onChange,
-    noOutline = _ref.noOutline,
-    rest = _objectWithoutProperties(_ref, _excluded);
+    onBlur = _ref.onBlur,
+    onFocus = _ref.onFocus,
+    onChange = _ref.onChange;
+    _ref.noOutline;
+    var rest = _objectWithoutProperties(_ref, _excluded);
   var _useState = react.useState(""),
     _useState2 = _slicedToArray(_useState, 2),
     actualValue = _useState2[0],
@@ -40,61 +40,100 @@ var ColorInput = function ColorInput(_ref) {
   var handleChange = react.useCallback(function (e) {
     setActualValue(e !== null && e !== void 0 ? e : defaultColor);
     onChange != null && react.startTransition(function () {
-      return onChange(e);
+      return onChange(e !== null && e !== void 0 ? e : null);
     });
   }, [onChange]);
-  return /*#__PURE__*/jsxRuntime.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-[var(--fabric-input)] outline overflow-hidden"),
-    children: [decorateStart && /*#__PURE__*/jsxRuntime.jsx("div", {
-      className: classNames("text-muted leading-none flex-content", utilities.isString(decorateStart) && "px-2"),
-      children: decorateStart
-    }), /*#__PURE__*/jsxRuntime.jsxs(core.Dropdown, {
-      showArrow: true,
-      disabled: disabled,
-      children: [/*#__PURE__*/jsxRuntime.jsx("button", {
-        "data-ref": "button",
-        className: "flex-1 flex items-center",
-        children: /*#__PURE__*/jsxRuntime.jsx("div", {
-          role: "none",
-          className: "h-[1.5em] min-w-[1.5em] flex-1 flex items-center justify-center self-stretch cursor-pointer m-[0.25em] rounded outline outline-tint-100",
-          style: {
-            backgroundColor: actualValue,
-            opacity: disabled ? 0.65 : 1,
-            pointerEvents: disabled ? "none" : undefined
-          },
-          onClick: function onClick(e) {
-            var _e$currentTarget$next;
-            return (_e$currentTarget$next = e.currentTarget.nextElementSibling) === null || _e$currentTarget$next === void 0 ? void 0 : _e$currentTarget$next.focus();
-          },
-          children: !actualValue && /*#__PURE__*/jsxRuntime.jsx(core.Icon, {
-            size: "md",
-            className: "text-muted",
-            icon: core.CoreIcons.colorSwatch
-          })
+  var arrowRef = react.useRef(null);
+  var _useState3 = react.useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isOpen = _useState4[0],
+    setIsOpen = _useState4[1];
+  var _useFloating = react$1.useFloating({
+      open: isOpen,
+      onOpenChange: function onOpenChange(open, _, reason) {
+        if (reason === "reference-press") return;
+        setIsOpen(open);
+      },
+      strategy: "fixed",
+      placement: "bottom",
+      whileElementsMounted: react$1.autoUpdate,
+      middleware: [react$1.shift({
+        padding: 8
+      }), react$1.flip(), react$1.offset(9), react$1.arrow({
+        element: arrowRef
+      })]
+    }),
+    refs = _useFloating.refs,
+    floatingStyles = _useFloating.floatingStyles,
+    context = _useFloating.context;
+  var click = react$1.useClick(context, {
+    enabled: !disabled && !readOnly
+  });
+  var dismiss = react$1.useDismiss(context, {
+    referencePress: true
+  });
+  var _useInteractions = react$1.useInteractions([dismiss, click]),
+    getReferenceProps = _useInteractions.getReferenceProps,
+    getFloatingProps = _useInteractions.getFloatingProps;
+  return /*#__PURE__*/jsxRuntime.jsxs(InputWrapper.InputWrapper, _objectSpread(_objectSpread({
+    showClear: actualValue !== defaultColor && !disabled && !readOnly,
+    onClear: handleChange,
+    invalid: invalid,
+    readOnly: readOnly,
+    disabled: disabled,
+    required: required,
+    error: error
+  }, rest), {}, {
+    children: [/*#__PURE__*/jsxRuntime.jsx("button", _objectSpread(_objectSpread({
+      "data-ref": "button",
+      className: "flex-1 flex items-center",
+      ref: refs.setReference
+    }, getReferenceProps({
+      onBlur: onBlur,
+      onFocus: onFocus
+    })), {}, {
+      "data-inner-clickable": "true",
+      "data-dropdown-open": isOpen ? true : undefined,
+      children: /*#__PURE__*/jsxRuntime.jsx("div", {
+        role: "none",
+        className: "h-[1.5em] min-w-[1.5em] flex-1 flex items-center justify-center self-stretch cursor-pointer m-[0.25em] rounded outline outline-tint-100",
+        style: {
+          backgroundColor: actualValue,
+          opacity: disabled ? 0.65 : 1,
+          pointerEvents: disabled ? "none" : undefined
+        },
+        children: !actualValue && /*#__PURE__*/jsxRuntime.jsx(core.Icon, {
+          size: "md",
+          className: "text-muted",
+          icon: core.CoreIcons.colorSwatch
         })
-      }), /*#__PURE__*/jsxRuntime.jsx(ColorPicker.ColorPicker, _objectSpread(_objectSpread({}, rest), {}, {
+      })
+    })), isOpen && /*#__PURE__*/jsxRuntime.jsxs("div", _objectSpread(_objectSpread({
+      ref: refs.setFloating,
+      style: _objectSpread({
+        zIndex: "var(--z-popover)"
+      }, floatingStyles),
+      "data-ref": "dropdownBody"
+    }, getFloatingProps()), {}, {
+      children: [/*#__PURE__*/jsxRuntime.jsx(ColorPicker.ColorPicker, _objectSpread(_objectSpread({}, rest), {}, {
         onChange: handleChange,
         defaultColor: defaultColor,
         value: actualValue
-      }))]
-    }), !disabled && showPicker && /*#__PURE__*/jsxRuntime.jsx(core.Icon, {
+      })), /*#__PURE__*/jsxRuntime.jsx(react$1.FloatingArrow, {
+        ref: arrowRef,
+        context: context,
+        strokeWidth: 0.5,
+        className: "fill-base stroke-muted"
+      })]
+    })), !disabled && showPicker && /*#__PURE__*/jsxRuntime.jsx(core.Icon, {
       icon: core.CoreIcons.colorPicker,
       onClick: function onClick() {
         return window.EyeDropper && new window.EyeDropper().open().then(function (resp) {
           return handleChange(resp.sRGBHex);
         });
       }
-    }), decorateEnd && /*#__PURE__*/jsxRuntime.jsx("div", {
-      className: classNames("text-muted leading-none flex-content", utilities.isString(decorateEnd) && "px-2"),
-      children: decorateEnd
-    }), !disabled && allowClear && actualValue !== defaultColor && /*#__PURE__*/jsxRuntime.jsx(core.Icon, {
-      icon: core.CoreIcons.close,
-      onClick: function onClick() {
-        return handleChange();
-      },
-      className: classNames("text-tint-500 hover:text-tint-700 p-[0.25em] flex-content")
     })]
-  });
+  }));
 };
 
 exports.ColorInput = ColorInput;