@react-fabric/form 1.0.0-beta.4 → 1.0.0-beta.40

package/dist/esm/form/Controller.js

@@ -46,7 +46,7 @@ var Controller = function Controller(_ref) {
           (_children$props$onCha = (_children$props = children.props).onChange) === null || _children$props$onCha === void 0 || _children$props$onCha.call(_children$props, v);
         }
       })) : children(_objectSpread(_objectSpread(_objectSpread({}, field), rest), {}, {
-        inputRef: function inputRef(el) {
+        ref: function ref(el) {
           el && _ref3(el);
         },
         readOnly: isSubmitting,

package/dist/esm/form/Form.js

@@ -7,6 +7,7 @@ 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 { jsx, jsxs } from 'react/jsx-runtime';
@@ -21,9 +22,10 @@ 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);
@@ -63,7 +65,7 @@ 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() {
@@ -89,16 +91,20 @@ var Form = function Form(_ref) {
         return form.getValues();
       },
       setValues: function setValues(v) {
-        return form.reset(v);
+        return setTimeout(function () {
+          return form.reset(v);
+        }, 50);
       },
       setValue: function setValue(k, v) {
-        return form.setValue(k, v, {
-          shouldDirty: false,
-          shouldTouch: false
-        });
+        return setTimeout(function () {
+          return form.setValue(k, v, {
+            shouldDirty: false,
+            shouldTouch: false
+          });
+        }, 50);
       }
     };
-  }, [onSubmit, form, form.formState, defaultValues]);
+  }, [_onSubmit, form, form.formState, defaultValues]);
   var onInvalid = useCallback(function (_, e) {
     var el = e.target;
     setTimeout(function () {
@@ -112,7 +118,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"

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()
@@ -64,19 +73,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/index.js

@@ -3,12 +3,15 @@
 import './i18n/index.js';
 export { Controller } from './form/Controller.js';
 export { Form } 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 { 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 +20,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

@@ -4,29 +4,29 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 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 { Icon, CoreIcons, Tooltip, Button, cloneChildren } from '@react-fabric/core';
 import { isString } from '@react-fabric/utilities';
 import classNames from 'classnames';
-import { useMemo, useCallback, useImperativeHandle, Children, cloneElement } from 'react';
+import { 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", "fixedList", "focusName", "buttonPosition", "onAdd", "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,
     arrayRef = _ref.arrayRef,
     enableSorting = _ref.enableSorting,
@@ -36,6 +36,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;
@@ -127,9 +129,37 @@ 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", "me-10"),
+          children: addLabel !== null && addLabel !== void 0 ? addLabel : t("addArray")
+        })
+      })
+    });
+  }, [error, fields, handleAdd, 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: !fixedList && onAdd && buttonPosition !== "bottom" && addButton
+      }),
       children: /*#__PURE__*/jsx(Wrapper, {
         children: fields.map(function (item, index) {
           return /*#__PURE__*/jsxs(SortableItem, {
@@ -138,7 +168,7 @@ var ArrayInput = function ArrayInput(_ref) {
             children: [typeof children === "function" ? children({
               index: index,
               name: "".concat(name, ".").concat(index)
-            }) : Children.map(children, function (child) {
+            }) : cloneChildren(children, function (child) {
               return /*#__PURE__*/cloneElement(child, Object.assign({
                 disabled: disabled,
                 readOnly: readOnly,
@@ -163,26 +193,7 @@ var ArrayInput = function ArrayInput(_ref) {
           }, 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")
-        })
-      })
-    })]
+    })), !fixedList && onAdd && buttonPosition !== "top" && addButton]
   });
 };
 

package/dist/esm/input/AvatarInput.js

@@ -80,7 +80,7 @@ var AvatarInput = function AvatarInput(_ref) {
         size: size,
         avatar: base64
       }), /*#__PURE__*/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__*/jsx("span", {
           children: "Edit"
         }), /*#__PURE__*/jsx("input", {

package/dist/esm/input/Checkbox.js

@@ -9,7 +9,7 @@ import { useState, useDeferredValue, useMemo, useEffect, useCallback } from 'rea
 import { ErrorIcon } from '../internal/ErrorIcon.js';
 import { jsxs, jsx } from '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 = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -66,7 +67,7 @@ var Checkbox = function Checkbox(_ref) {
       checked: actualValue,
       onChange: handleChange
     }, rest)), /*#__PURE__*/jsx(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

package/dist/esm/input/ColorInput.js

@@ -3,10 +3,11 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
-import { Dropdown, Icon, CoreIcons } from '@react-fabric/core';
+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 } from 'react';
+import { useState, useDeferredValue, useEffect, useCallback, startTransition, useRef } from 'react';
 import { ColorPicker } from './ColorPicker.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
@@ -40,44 +41,85 @@ var ColorInput = function ColorInput(_ref) {
   var handleChange = useCallback(function (e) {
     setActualValue(e !== null && e !== void 0 ? e : defaultColor);
     onChange != null && startTransition(function () {
-      return onChange(e);
+      return onChange(e !== null && e !== void 0 ? e : null);
     });
   }, [onChange]);
+  var arrowRef = useRef(null);
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isOpen = _useState4[0],
+    setIsOpen = _useState4[1];
+  var _useFloating = useFloating({
+      open: isOpen,
+      onOpenChange: function onOpenChange(open, _, reason) {
+        if (reason === "reference-press") return;
+        setIsOpen(open);
+      },
+      strategy: "fixed",
+      placement: "bottom",
+      whileElementsMounted: autoUpdate,
+      middleware: [shift({
+        padding: 8
+      }), flip(), offset(9), arrow({
+        element: arrowRef
+      })]
+    }),
+    refs = _useFloating.refs,
+    floatingStyles = _useFloating.floatingStyles,
+    context = _useFloating.context;
+  var click = useClick(context, {
+    enabled: !disabled
+  });
+  var dismiss = useDismiss(context, {
+    referencePress: true
+  });
+  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-[var(--fabric-input)] outline overflow-hidden"),
+    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__*/jsxs(Dropdown, {
-      showArrow: true,
-      disabled: disabled,
-      children: [/*#__PURE__*/jsx("button", {
-        "data-ref": "button",
-        className: "flex-1 flex items-center",
-        children: /*#__PURE__*/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__*/jsx(Icon, {
-            size: "md",
-            className: "text-muted",
-            icon: CoreIcons.colorSwatch
-          })
+    }), /*#__PURE__*/jsx("button", _objectSpread(_objectSpread({
+      "data-ref": "button",
+      className: "flex-1 flex items-center",
+      ref: refs.setReference
+    }, getReferenceProps()), {}, {
+      "data-inner-clickable": "true",
+      "data-dropdown-open": isOpen ? true : undefined,
+      children: /*#__PURE__*/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__*/jsx(Icon, {
+          size: "md",
+          className: "text-muted",
+          icon: CoreIcons.colorSwatch
         })
-      }), /*#__PURE__*/jsx(ColorPicker, _objectSpread(_objectSpread({}, rest), {}, {
+      })
+    })), isOpen && /*#__PURE__*/jsxs("div", _objectSpread(_objectSpread({
+      ref: refs.setFloating,
+      style: _objectSpread({
+        zIndex: "var(--z-popover)"
+      }, floatingStyles),
+      "data-ref": "dropdownBody"
+    }, getFloatingProps()), {}, {
+      children: [/*#__PURE__*/jsx(ColorPicker, _objectSpread(_objectSpread({}, rest), {}, {
         onChange: handleChange,
         defaultColor: defaultColor,
         value: actualValue
-      }))]
-    }), !disabled && showPicker && /*#__PURE__*/jsx(Icon, {
+      })), /*#__PURE__*/jsx(FloatingArrow, {
+        ref: arrowRef,
+        context: context,
+        strokeWidth: 0.5,
+        className: "fill-base stroke-muted"
+      })]
+    })), !disabled && showPicker && /*#__PURE__*/jsx(Icon, {
       icon: CoreIcons.colorPicker,
       onClick: function onClick() {
         return window.EyeDropper && new window.EyeDropper().open().then(function (resp) {

package/dist/esm/input/ColorPicker.js

@@ -5,7 +5,6 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import Color from 'color';
 import { memo, useState, useDeferredValue, useEffect, useCallback, startTransition } from 'react';
 import { SketchPicker } from 'react-color';
-import classes from './ColorPicker.module.css';
 import { jsx } from 'react/jsx-runtime';
 
 var _excluded = ["a"],
@@ -37,16 +36,13 @@ var ColorPicker = /*#__PURE__*/memo(function (_ref) {
   }, [onChange]);
   return /*#__PURE__*/jsx(SketchPicker, {
     width: "16rem",
-    className: classes.colorPicker,
+    className: "fabric-colorPicker",
     styles: {
       "default": {
         hue: {
-          borderRadius: "99px",
           boxShadow: "0 0 1px 1px var(--color-shadow)"
         },
         alpha: {
-          height: "1rem",
-          borderRadius: "99px",
           backgroundColor: "var(--fabric-bg)",
           boxShadow: "0 0 1px 1px var(--color-shadow)"
         },
@@ -63,36 +59,6 @@ var ColorPicker = /*#__PURE__*/memo(function (_ref) {
           backgroundColor: "var(--fabric-bg)",
           boxShadow: "0 0 0 1px var(--color-shadow), 0 0 8px var(--fabric-shadow)"
         },
-        Alpha: {
-          alpha: {
-            paddingRight: "calc(1rem - 2px)"
-          },
-          slider: {
-            width: "calc(1rem - 2px)",
-            borderRadius: "99px",
-            height: "calc(1rem - 2px)",
-            transform: "none"
-          }
-        },
-        Hue: {
-          hue: {
-            paddingRight: "calc(1rem - 2px)"
-          },
-          slider: {
-            width: "calc(1rem - 2px)",
-            borderRadius: "99px",
-            height: "calc(1rem - 2px)",
-            transform: "none"
-          }
-        },
-        Saturation: {
-          circle: {
-            width: "0.5rem",
-            borderRadius: "99px",
-            height: "0.5rem",
-            transform: "translate(-0.25rem, -0.25rem)"
-          }
-        },
         checkboard: {
           white: "transparent",
           black: "red"