@react-fabric/form 1.0.0-beta.9 → 1.0.1

package/dist/cjs/select/useSelect.js

@@ -9,28 +9,34 @@ var react = require('react');
 var helpers = require('./helpers.js');
 
 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 useSelect = function useSelect(_ref) {
-  var _ref$options = _ref.options,
-    options = _ref$options === void 0 ? utilities.EMPTY_ARRAY : _ref$options,
-    value = _ref.value,
-    autoComplete = _ref.autoComplete,
-    _ref$multiple = _ref.multiple,
-    multiple = _ref$multiple === void 0 ? false : _ref$multiple,
-    _ref$allowCreate = _ref.allowCreate,
-    allowCreate = _ref$allowCreate === void 0 ? false : _ref$allowCreate,
-    _ref$groupProperty = _ref.groupProperty,
-    groupProperty = _ref$groupProperty === void 0 ? "" : _ref$groupProperty,
-    _ref$valueProperty = _ref.valueProperty,
-    valueProperty = _ref$valueProperty === void 0 ? "id" : _ref$valueProperty,
-    _ref$labelProperty = _ref.labelProperty,
-    labelProperty = _ref$labelProperty === void 0 ? "label" : _ref$labelProperty,
-    _ref$createOption = _ref.createOption,
-    createOption = _ref$createOption === void 0 ? helpers.makeOption : _ref$createOption,
-    matcher = _ref.matcher,
-    onQuery = _ref.onQuery,
-    onChange = _ref.onChange,
-    onSelect = _ref.onSelect;
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), true).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; }
+function useSelect(props) {
+  var _props$options = props.options,
+    options = _props$options === void 0 ? utilities.EMPTY_ARRAY : _props$options,
+    value = props.value,
+    autoComplete = props.autoComplete,
+    _props$alwaysOpen = props.alwaysOpen,
+    alwaysOpen = _props$alwaysOpen === void 0 ? false : _props$alwaysOpen,
+    _props$defaultOpen = props.defaultOpen,
+    defaultOpen = _props$defaultOpen === void 0 ? false : _props$defaultOpen,
+    _props$multiple = props.multiple,
+    multiple = _props$multiple === void 0 ? false : _props$multiple,
+    _props$allowCreate = props.allowCreate,
+    allowCreate = _props$allowCreate === void 0 ? false : _props$allowCreate,
+    _props$groupProperty = props.groupProperty,
+    groupProperty = _props$groupProperty === void 0 ? "" : _props$groupProperty,
+    _props$valueProperty = props.valueProperty,
+    valueProperty = _props$valueProperty === void 0 ? "value" : _props$valueProperty,
+    _props$labelProperty = props.labelProperty,
+    labelProperty = _props$labelProperty === void 0 ? "label" : _props$labelProperty,
+    sortProperty = props.sortProperty,
+    _props$createOption = props.createOption,
+    createOption = _props$createOption === void 0 ? helpers.makeOption : _props$createOption,
+    matcher = props.matcher,
+    onQuery = props.onQuery,
+    onChange = props.onChange,
+    onSelect = props.onSelect;
+
   // value state
   var emptyValue = react.useMemo(function () {
     return multiple ? [] : "";
@@ -42,16 +48,17 @@ var useSelect = function useSelect(_ref) {
   var focusableRef = react.useRef(null);
   var listContentRef = react.useRef([]);
   var optionsRef = react.useRef([]);
-  var macthOption = react.useCallback(function (item, query) {
+  var matchOption = react.useCallback(function (item, query) {
     var _matcher, _item$labelProperty;
     return (_matcher = matcher === null || matcher === void 0 ? void 0 : matcher(item, query)) !== null && _matcher !== void 0 ? _matcher : utilities.matchString((_item$labelProperty = item[labelProperty]) !== null && _item$labelProperty !== void 0 ? _item$labelProperty : item, query);
-  }, [matcher]);
+  }, [labelProperty, matcher]);
   var fireChange = react.useCallback(function (value) {
     setTimeout(function () {
       onSelect === null || onSelect === void 0 || onSelect(value !== null && value !== void 0 ? value : emptyValue);
+      // @ts-expect-error ignore
       onChange === null || onChange === void 0 || onChange(helpers.getSelectedValue(value, emptyValue, valueProperty));
     }, 50);
-  }, [emptyValue, onSelect, onChange]);
+  }, [onSelect, emptyValue, onChange, valueProperty]);
   var _useReducer = react.useReducer(function (state, action) {
       if (action.type === "open") {
         var index = state.items.indexOf(state.multiple ? state.value[0] : state.value);
@@ -63,13 +70,15 @@ var useSelect = function useSelect(_ref) {
       if (action.type === "close") {
         return _objectSpread(_objectSpread({}, state), {}, {
           activeIndex: null,
+          activeItem: null,
           open: false
         });
       }
       if (action.type === "active" && state.open) {
         if (autoComplete && action.index !== null) state.query = state.items[action.index];
         return _objectSpread(_objectSpread({}, state), {}, {
-          activeIndex: action.index
+          activeIndex: action.index,
+          activeItem: action.index !== null ? state.items[action.index] : null
         });
       }
       if (action.type === "setValue") {
@@ -83,6 +92,7 @@ var useSelect = function useSelect(_ref) {
         var newState = _objectSpread(_objectSpread({}, state), {}, {
           value: state.emptyValue,
           activeIndex: null,
+          activeItem: null,
           selectedIndex: autoComplete ? state.multiple ? (_action$value = action.value) === null || _action$value === void 0 ? void 0 : _action$value.length : 0 : state.items.indexOf(action.value)
         });
         if (action.value !== undefined) {
@@ -100,7 +110,7 @@ var useSelect = function useSelect(_ref) {
             newState.value = action.value;
           }
         }
-        if (!state.multiple) newState.open = false;
+        if (!state.multiple) newState.open = alwaysOpen;
         fireChange(newState.value);
         return newState;
       }
@@ -133,19 +143,20 @@ var useSelect = function useSelect(_ref) {
         if (autoComplete && action.query !== undefined) {
           optionList = utilities.dedupe([action.query].concat(_toConsumableArray(optionList)));
         }
+        if (sortProperty) optionList = optionList.sort(utilities.compareValues("asc", sortProperty !== true ? sortProperty : undefined));
         var grouped = utilities.groupBy(optionList, groupProperty, "");
         if (action.open) _newState.open = true;
         _newState.items = [];
         // add new item if allowCreate
         if (allowCreate && action.query) _newState.items.push({
           ___create___: true,
-          value: createOption(action.query)
+          value: action.query
         });
-        Object.entries(grouped).forEach(function (_ref2) {
+        Object.entries(grouped).forEach(function (_ref) {
           var _newState$items;
-          var _ref3 = _slicedToArray(_ref2, 2),
-            key = _ref3[0],
-            list = _ref3[1];
+          var _ref2 = _slicedToArray(_ref, 2),
+            key = _ref2[0],
+            list = _ref2[1];
           if (key) {
             _newState.items.push({
               ___group___: true,
@@ -159,32 +170,38 @@ var useSelect = function useSelect(_ref) {
             return !opt.___group___;
           });
           _newState.activeIndex = _index >= 0 ? _index : null;
+          _newState.activeItem = _index >= 0 ? _newState.items[_index] : null;
         } else {
           _newState.activeIndex = null;
+          _newState.activeItem = null;
         }
         listContentRef.current = _newState.items;
         return _newState;
       }
       return state;
-    }, {
-      multiple: multiple,
-      emptyValue: emptyValue,
-      open: false,
-      loading: false,
-      activeIndex: null,
-      selectedIndex: null,
-      value: emptyValue,
-      // filter
-      query: undefined,
-      // dropdown items
-      items: []
+    }, {}, function () {
+      return {
+        multiple: multiple,
+        emptyValue: emptyValue,
+        open: alwaysOpen || defaultOpen,
+        loading: false,
+        activeIndex: null,
+        activeItem: null,
+        selectedIndex: null,
+        value: emptyValue,
+        // filter
+        query: undefined,
+        // dropdown items
+        items: []
+      };
     }),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
   react.useEffect(function () {
     if (!multiple) {
-      var _ref4;
+      var _ref3;
+      // @ts-expect-error ignore
       var newOption = (allowCreate || autoComplete) && deferred ? createOption(deferred) : undefined;
       var hasValue = options.find(function (opt) {
         var _opt$valueProperty;
@@ -201,22 +218,22 @@ var useSelect = function useSelect(_ref) {
       });
       dispatch({
         type: "setValue",
-        value: (_ref4 = hasValue !== null && hasValue !== void 0 ? hasValue : newOption) !== null && _ref4 !== void 0 ? _ref4 : ""
+        value: (_ref3 = hasValue !== null && hasValue !== void 0 ? hasValue : newOption) !== null && _ref3 !== void 0 ? _ref3 : deferred
       });
     }
     if (multiple) {
       optionsRef.current = [];
       var _value = (utilities.isArray(deferred) ? deferred : []).map(function (item) {
-        var _ref5;
+        var _ref4;
         var newOption = (allowCreate || autoComplete) && item ? createOption(item) : undefined;
         var hasValue = options.find(function (opt) {
           var _opt$valueProperty2;
-          return ((_opt$valueProperty2 = opt[valueProperty]) !== null && _opt$valueProperty2 !== void 0 ? _opt$valueProperty2 : opt) === deferred;
+          return ((_opt$valueProperty2 = opt[valueProperty]) !== null && _opt$valueProperty2 !== void 0 ? _opt$valueProperty2 : opt) === item;
         });
         if (!hasValue && newOption) {
           optionsRef.current.push(newOption);
         }
-        return (_ref5 = hasValue !== null && hasValue !== void 0 ? hasValue : newOption) !== null && _ref5 !== void 0 ? _ref5 : "";
+        return (_ref4 = hasValue !== null && hasValue !== void 0 ? hasValue : newOption) !== null && _ref4 !== void 0 ? _ref4 : item;
       });
       optionsRef.current = [].concat(_toConsumableArray(optionsRef.current), _toConsumableArray(options !== null && options !== void 0 ? options : []));
       dispatch({
@@ -228,14 +245,15 @@ var useSelect = function useSelect(_ref) {
         value: _value
       });
     }
-  }, [deferred, options, multiple, allowCreate, autoComplete, createOption]);
+  }, [deferred, options, multiple, allowCreate, autoComplete, createOption, valueProperty]);
   var fireQuery = core.useDebounce(function (query) {
     void Promise.resolve(onQuery === null || onQuery === void 0 ? void 0 : onQuery(query)).then(function (options) {
+      // @ts-expect-error ignore
       var newOptions = _toConsumableArray(options);
       // if autocomplete inject other filtered options from history
       if (autoComplete) {
         newOptions.push.apply(newOptions, _toConsumableArray(optionsRef.current.filter(function (opt) {
-          return macthOption === null || macthOption === void 0 ? void 0 : macthOption(opt, query);
+          return matchOption === null || matchOption === void 0 ? void 0 : matchOption(opt, query);
         })));
       }
       dispatch({
@@ -246,7 +264,7 @@ var useSelect = function useSelect(_ref) {
         setActive: true
       });
     });
-  }, [onQuery]);
+  }, [onQuery], 300);
 
   // handlers
   var handleQuery = react.useCallback(function (query) {
@@ -270,11 +288,11 @@ var useSelect = function useSelect(_ref) {
         open: true,
         setActive: true,
         options: optionsRef.current.filter(function (opt) {
-          return macthOption === null || macthOption === void 0 ? void 0 : macthOption(opt, query);
+          return matchOption === null || matchOption === void 0 ? void 0 : matchOption(opt, query);
         })
       });
     }
-  }, [macthOption, onQuery]);
+  }, [fireQuery, matchOption, onQuery]);
   var handleChange = react.useCallback(function (value) {
     var values = value;
     if (autoComplete && multiple && value) {
@@ -298,7 +316,7 @@ var useSelect = function useSelect(_ref) {
       type: "options",
       options: optionsRef.current
     });
-  }, []);
+  }, [autoComplete, createOption, multiple]);
   var handleRemove = react.useCallback(function (index) {
     dispatch({
       type: "removeItem",
@@ -316,11 +334,17 @@ var useSelect = function useSelect(_ref) {
     });
   }, []);
   var setActiveIndex = react.useCallback(function (index) {
-    dispatch({
+    if (index && index > -1) dispatch({
       type: "active",
       index: index
     });
   }, []);
+  var clearActiveIndex = react.useCallback(function () {
+    dispatch({
+      type: "active",
+      index: null
+    });
+  }, []);
   return {
     state: state,
     listRef: listRef,
@@ -329,13 +353,14 @@ var useSelect = function useSelect(_ref) {
     handleChange: handleChange,
     handleRemove: handleRemove,
     handleQuery: handleQuery,
-    macthOption: macthOption,
+    clearActiveIndex: clearActiveIndex,
+    macthOption: matchOption,
     setActiveIndex: setActiveIndex,
     setOpen: setOpen,
     setItemRef: function setItemRef(index, node) {
       listRef.current[index] = node;
     }
   };
-};
+}
 
 exports.useSelect = useSelect;

package/dist/cjs/types/schema.js

@@ -0,0 +1,43 @@
+'use strict';
+
+/*
+ * React Fabric
+ * @version: 1.0.0
+ *
+ *
+ * The MIT License (MIT)
+ * Copyright (c) 2024 Adarsh Pastakia
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+var DATA_TYPES = /*#__PURE__*/function (DATA_TYPES) {
+  DATA_TYPES["TEXT"] = "text";
+  DATA_TYPES["COLOR"] = "color";
+  DATA_TYPES["BOOL"] = "bool";
+  DATA_TYPES["DATE"] = "date";
+  DATA_TYPES["DATETIME"] = "datetime";
+  DATA_TYPES["STRING"] = "string";
+  DATA_TYPES["NUMBER"] = "number";
+  DATA_TYPES["RANGE"] = "range";
+  DATA_TYPES["FILE"] = "file";
+  DATA_TYPES["AVATAR"] = "avatar";
+  DATA_TYPES["SCHEMA"] = "schema";
+  return DATA_TYPES;
+}({});
+var SCHEMA_CUSTOM_LIST = "--CUSTOM--";
+
+exports.DATA_TYPES = DATA_TYPES;
+exports.SCHEMA_CUSTOM_LIST = SCHEMA_CUSTOM_LIST;

package/dist/cjs/utils/eventHandlers.js

@@ -1,6 +1,7 @@
 'use strict';
 
-var utilities = require('@react-fabric/utilities');
+var react = require('@floating-ui/react');
+var core = require('@react-fabric/core');
 
 /*
  * React Fabric
@@ -26,16 +27,25 @@ var utilities = require('@react-fabric/utilities');
  */
 
 /** ***************** common handler for enter press *******************/
-var handleEnter = function handleEnter(callback) {
+function useHandleEnter(callback) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
     _ref$stopPropagation = _ref.stopPropagation,
     stopPropagation = _ref$stopPropagation === void 0 ? false : _ref$stopPropagation,
     _ref$preventDefault = _ref.preventDefault,
     preventDefault = _ref$preventDefault === void 0 ? false : _ref$preventDefault;
-  var cbHandle = utilities.debounce(callback !== null && callback !== void 0 ? callback : function () {
+  var cbHandle = core.useDebounce(callback !== null && callback !== void 0 ? callback : function () {
     return undefined;
-  }, 100);
+  }, [callback], 100);
+  var tree = react.useFloatingTree();
   return function (e) {
+    // prevent propagation of event if input within dropdown (work around for floating-ui typeahead)
+    if (tree && e.key !== "Escape") {
+      e === null || e === void 0 || e.stopPropagation();
+    }
+    // blur input on escape key press
+    if (e.key === "Escape") {
+      e.currentTarget.blur();
+    }
     if (!e.shiftKey && !e.altKey && !e.metaKey && e.key === "Enter" && callback) {
       if (stopPropagation) e === null || e === void 0 || e.stopPropagation();
       cbHandle(e);
@@ -45,6 +55,6 @@ var handleEnter = function handleEnter(callback) {
       }
     }
   };
-};
+}
 
-exports.handleEnter = handleEnter;
+exports.useHandleEnter = useHandleEnter;

package/dist/cjs/utils/getColor.js

@@ -25,21 +25,21 @@ var utilities = require('@react-fabric/utilities');
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-var getColor = function getColor(color) {
+function getColor(color) {
   if (color && utilities.isColor(color)) {
     return color;
   }
-};
-var getBgClass = function getBgClass(bg) {
+}
+function getBgClass(bg) {
   if (bg && !utilities.isColor(bg)) {
     return "bg-".concat(bg);
   }
-};
-var getColorClass = function getColorClass(color) {
+}
+function getColorClass(color) {
   if (color && !utilities.isColor(color)) {
     return "text-".concat(color);
   }
-};
+}
 
 exports.getBgClass = getBgClass;
 exports.getColor = getColor;

package/dist/cjs/utils/getProps.js

@@ -0,0 +1,49 @@
+'use strict';
+
+/**
+ * React Fabric
+ * @version 1.0.0
+ * @license MIT
+ * @copyright 2024 Adarsh Pastakia
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+function getWrapperProps(props) {
+  return {
+    appendLabel: props.appendLabel,
+    name: props.name,
+    info: props.info,
+    inline: props.inline,
+    label: props.label,
+    labelWidth: props.labelWidth,
+    required: props.required,
+    disabled: props.disabled,
+    width: props.width,
+    error: props.error,
+    invalid: props.invalid,
+    borderless: props.borderless,
+    decorateEnd: props.decorateEnd,
+    decorateEndHideWhenEmpty: props.decorateEndHideWhenEmpty,
+    decorateEndShowWhenEmpty: props.decorateEndShowWhenEmpty,
+    decorateStart: props.decorateStart
+  };
+}
+
+exports.getWrapperProps = getWrapperProps;