@react-fabric/form 1.0.0-beta.19 → 1.0.0-beta.21

package/dist/cjs/input/ColorInput.js

@@ -3,6 +3,7 @@
 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');
@@ -43,41 +44,86 @@ var ColorInput = function ColorInput(_ref) {
       return onChange(e);
     });
   }, [onChange]);
+  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
+  });
+  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("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
-          })
+    }), /*#__PURE__*/jsxRuntime.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__*/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-testid": "dropdown-body"
+    }, getFloatingProps({
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
+    })), {}, {
+      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) {

package/dist/cjs/input/Hidden.js

@@ -36,7 +36,9 @@ var HiddenInput = function HiddenInput(_ref) {
     value = _ref$value === void 0 ? "" : _ref$value,
     name = _ref.name;
   react.useEffect(function () {
-    onChange === null || onChange === void 0 || onChange(hiddenValue);
+    setTimeout(function () {
+      onChange === null || onChange === void 0 || onChange(hiddenValue);
+    }, 50);
   }, [hiddenValue]);
   return /*#__PURE__*/jsxRuntime.jsxs(react.Fragment, {
     children: [/*#__PURE__*/jsxRuntime.jsx("input", {

package/dist/cjs/input/Textarea.js

@@ -9,7 +9,7 @@ var eventHandlers = require('../utils/eventHandlers.js');
 require('@react-fabric/utilities');
 var jsxRuntime = require('react/jsx-runtime');
 
-var _excluded = ["ref", "value", "name", "invalid", "readOnly", "disabled", "required", "placeholder", "autoFocus", "rows", "maxRows", "variableRows", "onChange", "onEnterPressed"];
+var _excluded = ["ref", "value", "name", "invalid", "readOnly", "disabled", "required", "placeholder", "autoFocus", "rows", "maxRows", "variableRows", "expandable", "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 Textarea = function Textarea(_ref) {
@@ -27,6 +27,7 @@ var Textarea = function Textarea(_ref) {
     _ref$maxRows = _ref.maxRows,
     maxRows = _ref$maxRows === void 0 ? 12 : _ref$maxRows,
     variableRows = _ref.variableRows,
+    expandable = _ref.expandable,
     onChange = _ref.onChange,
     onEnterPressed = _ref.onEnterPressed,
     rest = _objectWithoutProperties(_ref, _excluded);
@@ -65,6 +66,7 @@ var Textarea = function Textarea(_ref) {
     disabled: disabled,
     required: required,
     wrapperRef: wrapperRef,
+    textareaExpandable: expandable,
     textarea: true
   }, rest), {}, {
     children: /*#__PURE__*/jsxRuntime.jsx("textarea", {
@@ -83,7 +85,9 @@ var Textarea = function Textarea(_ref) {
       autoFocus: autoFocus,
       value: actualValue,
       onChange: handleChange,
-      onKeyDown: eventHandlers.handleEnter(onEnterPressed)
+      onKeyDown: eventHandlers.handleEnter(onEnterPressed, {
+        preventDefault: !!onEnterPressed
+      })
     })
   }));
 };

package/dist/cjs/internal/InputWrapper.js

@@ -3,7 +3,6 @@
 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');
@@ -13,11 +12,10 @@ var ErrorIcon = require('./ErrorIcon.js');
 var Field_module = require('./Field.module.css');
 var FieldWrapper = require('./FieldWrapper.js');
 
-var _excluded = ["invalid", "error", "allowClear", "showClear", "decorateStart", "decorateEnd", "children", "onClear", "noOutline", "noBorder", "textarea", "data-inner", "data-open", "floatingExpand", "wrapperRef", "width"];
+var _excluded = ["invalid", "error", "allowClear", "showClear", "decorateStart", "decorateEnd", "children", "onClear", "noOutline", "noBorder", "textarea", "textareaExpandable", "data-inner", "data-open", "floatingExpand", "wrapperRef", "width"];
 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 InputWrapper = function InputWrapper(_ref) {
-  var _elRef$current;
   var invalid = _ref.invalid,
     error = _ref.error,
     allowClear = _ref.allowClear,
@@ -30,6 +28,8 @@ var InputWrapper = function InputWrapper(_ref) {
     noBorder = _ref.noBorder,
     _ref$textarea = _ref.textarea,
     textarea = _ref$textarea === void 0 ? false : _ref$textarea,
+    _ref$textareaExpandab = _ref.textareaExpandable,
+    textareaExpandable = _ref$textareaExpandab === void 0 ? false : _ref$textareaExpandab,
     isInner = _ref["data-inner"];
     _ref["data-open"];
     var floatingExpand = _ref.floatingExpand,
@@ -69,7 +69,7 @@ var InputWrapper = function InputWrapper(_ref) {
     ref: wrapperRef,
     className: classNames(Field_module.inputWrapper, invalid && Field_module.invalidWrapper, !noOutline && !noBorder && "bg-[var(--fabric-input)] outline overflow-hidden", "flex flex-nowrap items-center", 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" && setExpanded(false);
+      return e.key === "Escape" && isExpanded && (setExpanded(false), e.stopPropagation());
     },
     children: [decorateStart && /*#__PURE__*/jsxRuntime.jsx("div", {
       onClickCapture: doFocus,
@@ -86,7 +86,7 @@ var InputWrapper = function InputWrapper(_ref) {
       onClickCapture: doFocus,
       className: classNames(Field_module.decorate, "text-muted leading-none flex-content", utilities.isString(decorateEnd) && "px-1"),
       children: decorateEnd
-    }), textarea && /*#__PURE__*/jsxRuntime.jsx(core.Icon, {
+    }), textareaExpandable && /*#__PURE__*/jsxRuntime.jsx(core.Icon, {
       onClick: function onClick() {
         return setExpanded(!isExpanded);
       },
@@ -95,17 +95,14 @@ var InputWrapper = function InputWrapper(_ref) {
     })]
   });
   return /*#__PURE__*/jsxRuntime.jsx(Wrapper, _objectSpread(_objectSpread({}, wrapperProps), {}, {
-    children: /*#__PURE__*/jsxRuntime.jsxs("div", {
+    children: /*#__PURE__*/jsxRuntime.jsx("div", {
       ref: elRef,
       className: "flex-1 relative min-h-8",
       style: {
         width: width,
         flexBasis: width
       },
-      children: [!isExpanded && el, isExpanded && /*#__PURE__*/jsxRuntime.jsx(react$1.FloatingPortal, {
-        root: (_elRef$current = elRef.current) === null || _elRef$current === void 0 ? void 0 : _elRef$current.closest(".theme-base"),
-        children: el
-      })]
+      children: el
     })
   }));
 };

package/dist/cjs/select/useSelect.js

@@ -133,6 +133,7 @@ var useSelect = function useSelect(_ref) {
         if (autoComplete && action.query !== undefined) {
           optionList = utilities.dedupe([action.query].concat(_toConsumableArray(optionList)));
         }
+        optionList = optionList.sort(utilities.compareValues("asc", labelProperty));
         var grouped = utilities.groupBy(optionList, groupProperty, "");
         if (action.open) _newState.open = true;
         _newState.items = [];
@@ -201,7 +202,7 @@ var useSelect = function useSelect(_ref) {
       });
       dispatch({
         type: "setValue",
-        value: (_ref4 = hasValue !== null && hasValue !== void 0 ? hasValue : newOption) !== null && _ref4 !== void 0 ? _ref4 : ""
+        value: (_ref4 = hasValue !== null && hasValue !== void 0 ? hasValue : newOption) !== null && _ref4 !== void 0 ? _ref4 : deferred
       });
     }
     if (multiple) {
@@ -216,7 +217,7 @@ var useSelect = function useSelect(_ref) {
         if (!hasValue && newOption) {
           optionsRef.current.push(newOption);
         }
-        return (_ref5 = hasValue !== null && hasValue !== void 0 ? hasValue : newOption) !== null && _ref5 !== void 0 ? _ref5 : "";
+        return (_ref5 = hasValue !== null && hasValue !== void 0 ? hasValue : newOption) !== null && _ref5 !== void 0 ? _ref5 : item;
       });
       optionsRef.current = [].concat(_toConsumableArray(optionsRef.current), _toConsumableArray(options !== null && options !== void 0 ? options : []));
       dispatch({

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';
 
@@ -43,41 +44,86 @@ var ColorInput = function ColorInput(_ref) {
       return onChange(e);
     });
   }, [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"),
     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-testid": "dropdown-body"
+    }, getFloatingProps({
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
+    })), {}, {
+      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/Hidden.js

@@ -36,7 +36,9 @@ var HiddenInput = function HiddenInput(_ref) {
     value = _ref$value === void 0 ? "" : _ref$value,
     name = _ref.name;
   useEffect(function () {
-    onChange === null || onChange === void 0 || onChange(hiddenValue);
+    setTimeout(function () {
+      onChange === null || onChange === void 0 || onChange(hiddenValue);
+    }, 50);
   }, [hiddenValue]);
   return /*#__PURE__*/jsxs(Fragment, {
     children: [/*#__PURE__*/jsx("input", {

package/dist/esm/input/Textarea.js

@@ -9,7 +9,7 @@ import { handleEnter } from '../utils/eventHandlers.js';
 import '@react-fabric/utilities';
 import { jsx } from 'react/jsx-runtime';
 
-var _excluded = ["ref", "value", "name", "invalid", "readOnly", "disabled", "required", "placeholder", "autoFocus", "rows", "maxRows", "variableRows", "onChange", "onEnterPressed"];
+var _excluded = ["ref", "value", "name", "invalid", "readOnly", "disabled", "required", "placeholder", "autoFocus", "rows", "maxRows", "variableRows", "expandable", "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 Textarea = function Textarea(_ref) {
@@ -27,6 +27,7 @@ var Textarea = function Textarea(_ref) {
     _ref$maxRows = _ref.maxRows,
     maxRows = _ref$maxRows === void 0 ? 12 : _ref$maxRows,
     variableRows = _ref.variableRows,
+    expandable = _ref.expandable,
     onChange = _ref.onChange,
     onEnterPressed = _ref.onEnterPressed,
     rest = _objectWithoutProperties(_ref, _excluded);
@@ -65,6 +66,7 @@ var Textarea = function Textarea(_ref) {
     disabled: disabled,
     required: required,
     wrapperRef: wrapperRef,
+    textareaExpandable: expandable,
     textarea: true
   }, rest), {}, {
     children: /*#__PURE__*/jsx("textarea", {
@@ -83,7 +85,9 @@ var Textarea = function Textarea(_ref) {
       autoFocus: autoFocus,
       value: actualValue,
       onChange: handleChange,
-      onKeyDown: handleEnter(onEnterPressed)
+      onKeyDown: handleEnter(onEnterPressed, {
+        preventDefault: !!onEnterPressed
+      })
     })
   }));
 };

package/dist/esm/internal/InputWrapper.js

@@ -3,7 +3,6 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
-import { FloatingPortal } from '@floating-ui/react';
 import { Icon, CoreIcons } from '@react-fabric/core';
 import { isString } from '@react-fabric/utilities';
 import classNames from 'classnames';
@@ -13,11 +12,10 @@ import { ErrorIcon } from './ErrorIcon.js';
 import classes from './Field.module.css';
 import { FieldWrapper } from './FieldWrapper.js';
 
-var _excluded = ["invalid", "error", "allowClear", "showClear", "decorateStart", "decorateEnd", "children", "onClear", "noOutline", "noBorder", "textarea", "data-inner", "data-open", "floatingExpand", "wrapperRef", "width"];
+var _excluded = ["invalid", "error", "allowClear", "showClear", "decorateStart", "decorateEnd", "children", "onClear", "noOutline", "noBorder", "textarea", "textareaExpandable", "data-inner", "data-open", "floatingExpand", "wrapperRef", "width"];
 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 InputWrapper = function InputWrapper(_ref) {
-  var _elRef$current;
   var invalid = _ref.invalid,
     error = _ref.error,
     allowClear = _ref.allowClear,
@@ -30,6 +28,8 @@ var InputWrapper = function InputWrapper(_ref) {
     noBorder = _ref.noBorder,
     _ref$textarea = _ref.textarea,
     textarea = _ref$textarea === void 0 ? false : _ref$textarea,
+    _ref$textareaExpandab = _ref.textareaExpandable,
+    textareaExpandable = _ref$textareaExpandab === void 0 ? false : _ref$textareaExpandab,
     isInner = _ref["data-inner"];
     _ref["data-open"];
     var floatingExpand = _ref.floatingExpand,
@@ -69,7 +69,7 @@ var InputWrapper = function InputWrapper(_ref) {
     ref: wrapperRef,
     className: classNames(classes.inputWrapper, invalid && classes.invalidWrapper, !noOutline && !noBorder && "bg-[var(--fabric-input)] outline overflow-hidden", "flex flex-nowrap items-center", 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" && setExpanded(false);
+      return e.key === "Escape" && isExpanded && (setExpanded(false), e.stopPropagation());
     },
     children: [decorateStart && /*#__PURE__*/jsx("div", {
       onClickCapture: doFocus,
@@ -86,7 +86,7 @@ var InputWrapper = function InputWrapper(_ref) {
       onClickCapture: doFocus,
       className: classNames(classes.decorate, "text-muted leading-none flex-content", isString(decorateEnd) && "px-1"),
       children: decorateEnd
-    }), textarea && /*#__PURE__*/jsx(Icon, {
+    }), textareaExpandable && /*#__PURE__*/jsx(Icon, {
       onClick: function onClick() {
         return setExpanded(!isExpanded);
       },
@@ -95,17 +95,14 @@ var InputWrapper = function InputWrapper(_ref) {
     })]
   });
   return /*#__PURE__*/jsx(Wrapper, _objectSpread(_objectSpread({}, wrapperProps), {}, {
-    children: /*#__PURE__*/jsxs("div", {
+    children: /*#__PURE__*/jsx("div", {
       ref: elRef,
       className: "flex-1 relative min-h-8",
       style: {
         width: width,
         flexBasis: width
       },
-      children: [!isExpanded && el, isExpanded && /*#__PURE__*/jsx(FloatingPortal, {
-        root: (_elRef$current = elRef.current) === null || _elRef$current === void 0 ? void 0 : _elRef$current.closest(".theme-base"),
-        children: el
-      })]
+      children: el
     })
   }));
 };

package/dist/esm/select/useSelect.js

@@ -4,7 +4,7 @@ import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import { useDebounce } from '@react-fabric/core';
-import { matchString, isString, dedupe, groupBy, isArray, EMPTY_ARRAY } from '@react-fabric/utilities';
+import { matchString, isString, dedupe, compareValues, groupBy, isArray, EMPTY_ARRAY } from '@react-fabric/utilities';
 import { useMemo, useDeferredValue, useRef, useCallback, useReducer, useEffect } from 'react';
 import { getSelectedValue, makeOption } from './helpers.js';
 
@@ -133,6 +133,7 @@ var useSelect = function useSelect(_ref) {
         if (autoComplete && action.query !== undefined) {
           optionList = dedupe([action.query].concat(_toConsumableArray(optionList)));
         }
+        optionList = optionList.sort(compareValues("asc", labelProperty));
         var grouped = groupBy(optionList, groupProperty, "");
         if (action.open) _newState.open = true;
         _newState.items = [];
@@ -201,7 +202,7 @@ var useSelect = function useSelect(_ref) {
       });
       dispatch({
         type: "setValue",
-        value: (_ref4 = hasValue !== null && hasValue !== void 0 ? hasValue : newOption) !== null && _ref4 !== void 0 ? _ref4 : ""
+        value: (_ref4 = hasValue !== null && hasValue !== void 0 ? hasValue : newOption) !== null && _ref4 !== void 0 ? _ref4 : deferred
       });
     }
     if (multiple) {
@@ -216,7 +217,7 @@ var useSelect = function useSelect(_ref) {
         if (!hasValue && newOption) {
           optionsRef.current.push(newOption);
         }
-        return (_ref5 = hasValue !== null && hasValue !== void 0 ? hasValue : newOption) !== null && _ref5 !== void 0 ? _ref5 : "";
+        return (_ref5 = hasValue !== null && hasValue !== void 0 ? hasValue : newOption) !== null && _ref5 !== void 0 ? _ref5 : item;
       });
       optionsRef.current = [].concat(_toConsumableArray(optionsRef.current), _toConsumableArray(options !== null && options !== void 0 ? options : []));
       dispatch({

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

@@ -13,5 +13,9 @@ export interface TextareaProps extends InputProps, RefProp<HTMLTextAreaElement>
      * increment rows on value change
      */
     variableRows?: boolean;
+    /**
+     * expandable textarea
+     */
+    expandable?: boolean;
 }
-export declare const Textarea: ({ ref, value, name, invalid, readOnly, disabled, required, placeholder, autoFocus, rows, maxRows, variableRows, onChange, onEnterPressed, ...rest }: TextareaProps) => import("react/jsx-runtime").JSX.Element;
+export declare const Textarea: ({ ref, value, name, invalid, readOnly, disabled, required, placeholder, autoFocus, rows, maxRows, variableRows, expandable, onChange, onEnterPressed, ...rest }: TextareaProps) => import("react/jsx-runtime").JSX.Element;

package/dist/types/internal/InputWrapper.d.ts

@@ -1 +1 @@
-export declare const InputWrapper: ({ invalid, error, allowClear, showClear, decorateStart, decorateEnd, children, onClear, noOutline, noBorder, textarea, "data-inner": isInner, "data-open": isOpen, floatingExpand, wrapperRef, width, ...rest }: KeyValue) => import("react/jsx-runtime").JSX.Element;
+export declare const InputWrapper: ({ invalid, error, allowClear, showClear, decorateStart, decorateEnd, children, onClear, noOutline, noBorder, textarea, textareaExpandable, "data-inner": isInner, "data-open": isOpen, floatingExpand, wrapperRef, width, ...rest }: KeyValue) => import("react/jsx-runtime").JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-fabric/form",
-  "version": "1.0.0-beta.19",
+  "version": "1.0.0-beta.21",
   "description": "RUF: Form package",
   "author": "Adarsh Pastakia <adarshpastakia@outlook.com>",
   "license": "MIT",
@@ -39,8 +39,8 @@
     "@dnd-kit/utilities": "^3.2.2",
     "@floating-ui/react": "^0.26.24",
     "@hookform/resolvers": "^3.9.0",
-    "@react-fabric/core": "^1.0.0-beta.19",
-    "@react-fabric/utilities": "^1.0.0-beta.19",
+    "@react-fabric/core": "^1.0.0-beta.21",
+    "@react-fabric/utilities": "^1.0.0-beta.21",
     "classnames": "^2.5.1",
     "color": "^4.2.3",
     "react-color": "^2.19.3",
@@ -60,5 +60,5 @@
     "node": ">=18.12.0",
     "npm": ">=8.19.0"
   },
-  "gitHead": "1757660f7f30590d1bf5c7f2bd3526f6052dccd5"
+  "gitHead": "31c3d5c19bce7df519a62bd43efd1c9e6341be04"
 }

package/src/input/ColorInput.tsx

@@ -21,7 +21,19 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { CoreIcons, Dropdown, Icon } from "@react-fabric/core";
+import {
+  arrow,
+  autoUpdate,
+  flip,
+  FloatingArrow,
+  offset,
+  shift,
+  useClick,
+  useDismiss,
+  useFloating,
+  useInteractions,
+} 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";
@@ -30,6 +42,7 @@ import {
   useCallback,
   useDeferredValue,
   useEffect,
+  useRef,
   useState,
 } from "react";
 import { type InputProps } from "../types";
@@ -74,6 +87,38 @@ export const ColorInput = ({
     [onChange],
   );
 
+  const arrowRef = useRef(null);
+  const [isOpen, setIsOpen] = useState(false);
+  const { refs, floatingStyles, context } = useFloating({
+    open: isOpen,
+    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,
+      }),
+    ],
+  });
+  const click = useClick(context, {
+    enabled: !disabled,
+  });
+  const dismiss = useDismiss(context, {
+    referencePress: true,
+  });
+
+  const { getReferenceProps, getFloatingProps } = useInteractions([
+    dismiss,
+    click,
+  ]);
+
   return (
     <div
       className={classNames(
@@ -92,36 +137,58 @@ export const ColorInput = ({
           {decorateStart}
         </div>
       )}
-      <Dropdown showArrow disabled={disabled}>
-        <button data-ref="button" className="flex-1 flex items-center">
-          <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={(e) =>
-              (e.currentTarget.nextElementSibling as HTMLElement)?.focus()
-            }
-          >
-            {!actualValue && (
-              <Icon
-                size="md"
-                className="text-muted"
-                icon={CoreIcons.colorSwatch}
-              />
-            )}
-          </div>
-        </button>
-        <ColorPicker
-          {...rest}
-          onChange={handleChange}
-          defaultColor={defaultColor}
-          value={actualValue}
-        />
-      </Dropdown>
+      <button
+        data-ref="button"
+        className="flex-1 flex items-center"
+        ref={refs.setReference}
+        {...getReferenceProps()}
+        data-inner-clickable="true"
+        data-dropdown-open={isOpen ? true : undefined}
+      >
+        <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,
+          }}
+        >
+          {!actualValue && (
+            <Icon
+              size="md"
+              className="text-muted"
+              icon={CoreIcons.colorSwatch}
+            />
+          )}
+        </div>
+      </button>
+      {isOpen && (
+        <div
+          ref={refs.setFloating}
+          style={{
+            zIndex: "var(--z-popover)",
+            ...floatingStyles,
+          }}
+          data-testid="dropdown-body"
+          {...getFloatingProps({
+            onClick: (e) => e.stopPropagation(),
+          })}
+        >
+          <ColorPicker
+            {...rest}
+            onChange={handleChange}
+            defaultColor={defaultColor}
+            value={actualValue}
+          />
+          <FloatingArrow
+            ref={arrowRef}
+            context={context}
+            strokeWidth={0.5}
+            className="fill-base stroke-muted"
+          />
+        </div>
+      )}
       {!disabled && showPicker && (
         <Icon
           icon={CoreIcons.colorPicker}

package/src/input/Hidden.tsx

@@ -54,7 +54,9 @@ export const HiddenInput = ({
   name,
 }: Props) => {
   useEffect(() => {
-    onChange?.(hiddenValue);
+    setTimeout(() => {
+      onChange?.(hiddenValue);
+    }, 50);
   }, [hiddenValue]);
   return (
     <Fragment>

package/src/input/Input.tsx

@@ -104,7 +104,7 @@ export const Input = ({
         type={type}
         ref={ref}
         autoComplete="off"
-        {...{ autoFocus }}
+        autoFocus={autoFocus}
         value={actualValue}
         onChange={handleChange}
         onKeyDown={handleEnterPressed}

package/src/input/Number.tsx

@@ -116,7 +116,7 @@ export const Number = ({
         step={step}
         ref={ref}
         autoComplete="off"
-        {...{ autoFocus }}
+        autoFocus={autoFocus}
         value={actualValue}
         onChange={handleChange}
         onKeyDown={handleEnterPressed}

package/src/input/Password.tsx

@@ -129,7 +129,7 @@ export const Password = ({
         type={show ? "text" : "password"}
         ref={ref}
         autoComplete="off"
-        {...{ autoFocus }}
+        autoFocus={autoFocus}
         value={actualValue}
         onChange={handleChange}
         onKeyDown={handleEnterPressed}

package/src/input/Search.tsx

@@ -150,7 +150,7 @@ export const Search = ({
         type="search"
         ref={ref}
         autoComplete="off"
-        {...{ autoFocus }}
+        autoFocus={autoFocus}
         value={actualValue}
         onChange={handleChange}
         onKeyDown={handleEnterPressed}

package/src/input/Textarea.tsx

@@ -49,6 +49,10 @@ export interface TextareaProps
    * increment rows on value change
    */
   variableRows?: boolean;
+  /**
+   * expandable textarea
+   */
+  expandable?: boolean;
 }
 
 export const Textarea = ({
@@ -64,6 +68,7 @@ export const Textarea = ({
   rows = 5,
   maxRows = 12,
   variableRows,
+  expandable,
   onChange,
   onEnterPressed,
   ...rest
@@ -104,6 +109,7 @@ export const Textarea = ({
       disabled={disabled}
       required={required}
       wrapperRef={wrapperRef}
+      textareaExpandable={expandable}
       textarea
       {...rest}
     >
@@ -120,10 +126,12 @@ export const Textarea = ({
         name={name}
         ref={ref}
         autoComplete="off"
-        {...{ autoFocus }}
+        autoFocus={autoFocus}
         value={actualValue}
         onChange={handleChange}
-        onKeyDown={handleEnter(onEnterPressed)}
+        onKeyDown={handleEnter(onEnterPressed, {
+          preventDefault: !!onEnterPressed,
+        })}
       />
     </InputWrapper>
   );

package/src/internal/InputWrapper.tsx

@@ -21,7 +21,6 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { FloatingPortal } from "@floating-ui/react";
 import { CoreIcons, Icon } from "@react-fabric/core";
 import { isString } from "@react-fabric/utilities";
 import classNames from "classnames";
@@ -50,6 +49,7 @@ export const InputWrapper = ({
   noOutline,
   noBorder,
   textarea = false,
+  textareaExpandable = false,
   "data-inner": isInner,
   "data-open": isOpen,
   // expand autocomplete
@@ -117,7 +117,11 @@ export const InputWrapper = ({
         !noOutline &&
           "after:absolute after:bottom-0 after:h-px after:bg-primary-500 after:mx-auto",
       )}
-      onKeyDown={(e) => e.key === "Escape" && setExpanded(false)}
+      onKeyDown={(e) =>
+        e.key === "Escape" &&
+        isExpanded &&
+        (setExpanded(false), e.stopPropagation())
+      }
     >
       {decorateStart && (
         <div
@@ -156,7 +160,7 @@ export const InputWrapper = ({
           {decorateEnd}
         </div>
       )}
-      {textarea && (
+      {textareaExpandable && (
         <Icon
           onClick={() => setExpanded(!isExpanded)}
           icon={isExpanded ? CoreIcons.arrowCollapse : CoreIcons.arrowExpand}
@@ -173,14 +177,7 @@ export const InputWrapper = ({
         className="flex-1 relative min-h-8"
         style={{ width, flexBasis: width }}
       >
-        {!isExpanded && el}
-        {isExpanded && (
-          <FloatingPortal
-            root={elRef.current?.closest<HTMLElement>(".theme-base")}
-          >
-            {el}
-          </FloatingPortal>
-        )}
+        {el}
       </div>
     </Wrapper>
   );

package/src/select/useSelect.tsx

@@ -23,6 +23,7 @@
 
 import { useDebounce } from "@react-fabric/core";
 import {
+  compareValues,
   dedupe,
   EMPTY_ARRAY,
   groupBy,
@@ -223,6 +224,7 @@ export const useSelect = ({
         if (autoComplete && action.query !== undefined) {
           optionList = dedupe([action.query, ...optionList]);
         }
+        optionList = optionList.sort(compareValues("asc", labelProperty));
         const grouped = groupBy(optionList, groupProperty, "");
         if (action.open) newState.open = true;
         newState.items = [];
@@ -283,7 +285,7 @@ export const useSelect = ({
       dispatch({ type: "options", options: optionsRef.current });
       dispatch({
         type: "setValue",
-        value: hasValue ?? newOption ?? "",
+        value: hasValue ?? newOption ?? deferred,
       });
     }
     if (multiple) {
@@ -300,7 +302,7 @@ export const useSelect = ({
           if (!hasValue && newOption) {
             optionsRef.current.push(newOption);
           }
-          return hasValue ?? newOption ?? "";
+          return hasValue ?? newOption ?? item;
         },
       );
       optionsRef.current = [...optionsRef.current, ...(options ?? [])];