@scaleflex/ui-tw 0.0.30 → 0.0.32

package/combobox/combobox-multi-inline/combobox-multi-inline.component.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import { ComboboxMultiInlineProps } from '../combobox.types';
-export declare function ComboboxMultiInline({ options, value, onChange, placeholder, className, disabled, size, readOnly, showClear, popoverClassName, }: ComboboxMultiInlineProps): React.JSX.Element;
+export declare function ComboboxMultiInline({ options, value, onChange, placeholder, className, disabled, size, readOnly, showClear, popoverClassName, ...rest }: ComboboxMultiInlineProps): React.JSX.Element;

package/combobox/combobox-multi-inline/combobox-multi-inline.component.js

@@ -1,5 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["options", "value", "onChange", "placeholder", "className", "disabled", "size", "readOnly", "showClear", "popoverClassName"];
 import { Popover } from '@scaleflex/ui-tw/popover';
 import { FormSize } from '@scaleflex/ui-tw/types/form-size';
 import React from 'react';
@@ -21,7 +23,8 @@ export function ComboboxMultiInline(_ref) {
     readOnly = _ref$readOnly === void 0 ? false : _ref$readOnly,
     _ref$showClear = _ref.showClear,
     showClear = _ref$showClear === void 0 ? true : _ref$showClear,
-    popoverClassName = _ref.popoverClassName;
+    popoverClassName = _ref.popoverClassName,
+    rest = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -56,7 +59,8 @@ export function ComboboxMultiInline(_ref) {
     selected: selectedLabels.length > 0,
     onClearAll: function onClearAll() {
       return onChange([]);
-    }
+    },
+    "aria-invalid": rest['aria-invalid']
   }, displayValue), /*#__PURE__*/React.createElement(ComboboxContent, {
     className: popoverClassName,
     options: options,

package/combobox/combobox-multi-tag/combobox-multi-tag.component.js

@@ -66,7 +66,7 @@ export function ComboboxMultiTag(_ref) {
   }, /*#__PURE__*/React.createElement("button", {
     role: "combobox",
     "aria-expanded": open,
-    "area-invalid": rest['aria-invalid'],
+    "aria-invalid": rest['aria-invalid'],
     className: cn.apply(void 0, ['flex w-full', isSelected ? 'flex-col' : 'items-center'].concat(_toConsumableArray(getBaseInputClasses()), [readOnly && readOnlyClassNames, selectionHighlightClassNames, focusRingClassNames, !isSelected && textareaVariants({
       size: size
     }), !isSelected && comboboxMultiTagsDefaultSizeOptions[size], className])),

package/combobox/combobox-single/combobox-single.component.d.ts

@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { ComboboxSingleProps } from '../combobox.types';
-export declare function ComboboxSingle({ options, value, onChange, placeholder, className, disabled, popoverClassName, size, readOnly, showClear, ...rest }: ComboboxSingleProps): React.JSX.Element;
+export declare function ComboboxSingle({ options, value, onChange, placeholder, className, disabled, popoverClassName, size, readOnly, showClear, formItemId, ...rest }: ComboboxSingleProps): React.JSX.Element;

package/combobox/combobox-single/combobox-single.component.js

@@ -1,6 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["options", "value", "onChange", "placeholder", "className", "disabled", "popoverClassName", "size", "readOnly", "showClear"];
+var _excluded = ["options", "value", "onChange", "placeholder", "className", "disabled", "popoverClassName", "size", "readOnly", "showClear", "formItemId"];
 import { Popover } from '@scaleflex/ui-tw/popover';
 import { FormSize } from '@scaleflex/ui-tw/types/form-size';
 import * as React from 'react';
@@ -25,6 +25,7 @@ export function ComboboxSingle(_ref) {
     readOnly = _ref$readOnly === void 0 ? false : _ref$readOnly,
     _ref$showClear = _ref.showClear,
     showClear = _ref$showClear === void 0 ? true : _ref$showClear,
+    formItemId = _ref.formItemId,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -47,7 +48,8 @@ export function ComboboxSingle(_ref) {
     },
     selected: !!selectedLabel,
     showClear: showClear,
-    "aria-invalid": rest['aria-invalid']
+    "aria-invalid": rest['aria-invalid'],
+    formItemId: formItemId
   }, selectedLabel || placeholder), /*#__PURE__*/React.createElement(ComboboxContent, {
     className: popoverClassName,
     options: options,

package/combobox/combobox.component.d.ts

@@ -1,4 +1,4 @@
 import * as React from 'react';
 import { ComboboxContentProps, ComboboxTriggerProps } from './combobox.types';
-export declare function ComboboxTrigger({ children, open, disabled, readOnly, size, className, selected, showClear, onClearAll, ...rest }: ComboboxTriggerProps): React.JSX.Element;
+export declare function ComboboxTrigger({ children, open, disabled, readOnly, size, className, selected, showClear, onClearAll, formItemId, ...rest }: ComboboxTriggerProps): React.JSX.Element;
 export declare function ComboboxContent({ options, value: selectedValue, onSelect, size, multiple, className, }: ComboboxContentProps): React.JSX.Element;

package/combobox/combobox.component.js

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "open", "disabled", "readOnly", "size", "className", "selected", "showClear", "onClearAll"];
+var _excluded = ["children", "open", "disabled", "readOnly", "size", "className", "selected", "showClear", "onClearAll", "formItemId"];
 import { buttonVariants } from '@scaleflex/ui-tw/button';
 import { ButtonVariant, buttonBaseClassNames } from '@scaleflex/ui-tw/button/button.constants';
 import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from '@scaleflex/ui-tw/command';
@@ -32,6 +32,7 @@ export function ComboboxTrigger(_ref) {
     _ref$showClear = _ref.showClear,
     showClear = _ref$showClear === void 0 ? false : _ref$showClear,
     onClearAll = _ref.onClearAll,
+    formItemId = _ref.formItemId,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _getToolbarSizes = getToolbarSizes(size),
     iconSize = _getToolbarSizes.iconSize;
@@ -41,6 +42,7 @@ export function ComboboxTrigger(_ref) {
   return /*#__PURE__*/React.createElement(PopoverTrigger, {
     asChild: true
   }, /*#__PURE__*/React.createElement("button", {
+    id: formItemId,
     role: "combobox",
     "aria-expanded": open,
     "aria-invalid": rest['aria-invalid'],

package/combobox/combobox.types.d.ts

@@ -6,6 +6,7 @@ export type ClearEvent = MouseEvent | KeyboardEvent;
 export type ComboboxTriggerProps = {
     children: ReactNode;
     open: boolean;
+    formItemId?: string;
     disabled?: boolean;
     readOnly?: boolean;
     size?: FormSizeType;
@@ -47,6 +48,7 @@ interface ComboboxCommonProps {
     size?: FormSizeType;
     popoverClassName?: string;
     'aria-invalid'?: boolean;
+    formItemId?: string;
 }
 export interface ComboboxSingleProps extends ComboboxCommonProps {
     value: string;

package/form/components/form-combobox-field.component.d.ts

@@ -0,0 +1,5 @@
+import { FormComboboxFieldProps } from '@scaleflex/ui-tw/form/form.types';
+import React from 'react';
+import { FieldValues, Path } from 'react-hook-form';
+declare function FormComboboxField<TFieldValues extends FieldValues, TName extends Path<TFieldValues>>({ variant, comboboxProps, ...rest }: FormComboboxFieldProps<TFieldValues, TName>): React.JSX.Element;
+export { FormComboboxField };

package/form/components/form-combobox-field.component.js

@@ -0,0 +1,49 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["variant", "comboboxProps"];
+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; }
+import { ComboboxMultiInline, ComboboxMultiTag, ComboboxSingle } from '@scaleflex/ui-tw/combobox';
+import { useFormField } from '@scaleflex/ui-tw/form';
+import { FormFieldGroup } from '@scaleflex/ui-tw/form';
+import React from 'react';
+function FormComboboxField(_ref) {
+  var _ref$variant = _ref.variant,
+    variant = _ref$variant === void 0 ? 'single' : _ref$variant,
+    _ref$comboboxProps = _ref.comboboxProps,
+    comboboxProps = _ref$comboboxProps === void 0 ? {} : _ref$comboboxProps,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  var readOnly = rest.readOnly,
+    disabled = rest.disabled;
+  return /*#__PURE__*/React.createElement(FormFieldGroup, rest, function (field, args) {
+    var _useFormField = useFormField(),
+      error = _useFormField.error,
+      formItemId = _useFormField.formItemId;
+    var commonProps = _objectSpread(_objectSpread({}, comboboxProps), {}, {
+      options: comboboxProps.options || [],
+      placeholder: comboboxProps.placeholder,
+      readOnly: readOnly,
+      disabled: disabled,
+      size: args === null || args === void 0 ? void 0 : args.size,
+      formItemId: formItemId,
+      value: field.value,
+      onChange: field.onChange,
+      'aria-invalid': !!error
+    });
+    switch (variant) {
+      case 'multi-inline':
+        return /*#__PURE__*/React.createElement(ComboboxMultiInline, _extends({}, commonProps, {
+          showClear: comboboxProps.showClear
+        }));
+      case 'multi-tags':
+        return /*#__PURE__*/React.createElement(ComboboxMultiTag, commonProps);
+      case 'single':
+      default:
+        return /*#__PURE__*/React.createElement(ComboboxSingle, _extends({}, commonProps, {
+          showClear: comboboxProps.showClear
+        }));
+    }
+  });
+}
+export { FormComboboxField };

package/form/form.types.d.ts

@@ -1,3 +1,4 @@
+import { ComboboxMultiInlineProps, ComboboxMultiTagProps, ComboboxSingleProps } from '@scaleflex/ui-tw/combobox/combobox.types';
 import { InputProps } from '@scaleflex/ui-tw/input';
 import { SelectProps } from '@scaleflex/ui-tw/select/select.types';
 import { SwitchProps } from '@scaleflex/ui-tw/switch/switch.types';
@@ -15,6 +16,7 @@ export type FormItemContextValue = {
 export type FormFieldContextValue<TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> = {
     name: TName;
 };
+export type ComboboxVariant = 'single' | 'multi-inline' | 'multi-tags';
 export interface FormFieldArgs {
     size?: FormSizeType;
     readOnly?: boolean;
@@ -68,6 +70,11 @@ export type FormSelectFieldProps<TFieldValues extends FieldValues, TName extends
     showGroupSeparator?: boolean;
     selectProps?: FormSelectProps;
 };
+export type FormComboboxFieldProps<TFieldValues extends FieldValues, TName extends Path<TFieldValues>> = Omit<FormFieldGroupProps<TFieldValues, TName>, 'children'> & {
+    showGroupSeparator?: boolean;
+    variant?: ComboboxVariant;
+    comboboxProps?: Partial<ComboboxSingleProps & ComboboxMultiInlineProps & ComboboxMultiTagProps>;
+};
 export interface FormSelectInnerProps<TFieldValues extends FieldValues, TName extends Path<TFieldValues>> {
     field: ControllerRenderProps<TFieldValues, TName>;
     args: FormFieldArgs | undefined;

package/form/index.d.ts

@@ -7,3 +7,4 @@ export { FormPasswordField } from './components/form-password-field.component';
 export { FormTextareaField } from './components/form-textarea-field.component';
 export { FormSwitchField } from './components/form-switch-field.component';
 export { FormSelectField } from './components/form-select-field.component';
+export { FormComboboxField } from './components/form-combobox-field.component';

package/form/index.js

@@ -6,4 +6,5 @@ export { FormInputField } from './components/form-input-field.component';
 export { FormPasswordField } from './components/form-password-field.component';
 export { FormTextareaField } from './components/form-textarea-field.component';
 export { FormSwitchField } from './components/form-switch-field.component';
-export { FormSelectField } from './components/form-select-field.component';
+export { FormSelectField } from './components/form-select-field.component';
+export { FormComboboxField } from './components/form-combobox-field.component';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scaleflex/ui-tw",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "author": "scaleflex",
   "repository": "github:scaleflex/ui",
   "homepage": "https://github.com/scaleflex/ui/blob/master/README.md",
@@ -20,7 +20,7 @@
     "@radix-ui/react-slot": "^1.1.2",
     "@radix-ui/react-switch": "^1.0.1",
     "@radix-ui/react-tooltip": "^1.2.6",
-    "@scaleflex/icons-tw": "^0.0.30",
+    "@scaleflex/icons-tw": "^0.0.32",
     "@types/lodash.merge": "^4.6.9",
     "class-variance-authority": "^0.7.1",
     "cmdk": "^1.1.1",

package/form/components/form-combobox-single-field.component.d.ts

@@ -1,5 +0,0 @@
-import React from 'react';
-import { FieldValues, Path } from 'react-hook-form';
-import { FormSelectFieldProps } from '../form.types';
-declare function FormSelectField<TFieldValues extends FieldValues, TName extends Path<TFieldValues>>({ selectProps, showGroupSeparator, ...rest }: FormSelectFieldProps<TFieldValues, TName>): React.JSX.Element;
-export { FormSelectField };

package/form/components/form-combobox-single-field.component.js

@@ -1,57 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["icon", "placeholder", "options"],
-  _excluded2 = ["selectProps", "showGroupSeparator"];
-import { useFormField } from '@scaleflex/ui-tw/form';
-import { FormFieldGroup } from '@scaleflex/ui-tw/form';
-import { Selector } from '@scaleflex/ui-tw/select';
-import React from 'react';
-function FormSelectInner(_ref) {
-  var field = _ref.field,
-    args = _ref.args,
-    selectProps = _ref.selectProps,
-    readOnly = _ref.readOnly,
-    disabled = _ref.disabled,
-    className = _ref.className,
-    showGroupSeparator = _ref.showGroupSeparator;
-  var _useFormField = useFormField(),
-    error = _useFormField.error,
-    formItemId = _useFormField.formItemId;
-  var _ref2 = selectProps || {},
-    icon = _ref2.icon,
-    placeholder = _ref2.placeholder,
-    options = _ref2.options,
-    restSelectProps = _objectWithoutProperties(_ref2, _excluded);
-  return /*#__PURE__*/React.createElement(Selector, _extends({
-    value: field.value,
-    onChange: field.onChange,
-    placeholder: placeholder,
-    disabled: disabled,
-    readOnly: readOnly,
-    size: args === null || args === void 0 ? void 0 : args.size,
-    className: className,
-    icon: icon,
-    options: options || [],
-    showGroupSeparator: showGroupSeparator,
-    formItemId: formItemId,
-    "aria-invalid": !!error
-  }, restSelectProps));
-}
-function FormSelectField(_ref3) {
-  var selectProps = _ref3.selectProps,
-    showGroupSeparator = _ref3.showGroupSeparator,
-    rest = _objectWithoutProperties(_ref3, _excluded2);
-  var readOnly = rest.readOnly,
-    disabled = rest.disabled;
-  return /*#__PURE__*/React.createElement(FormFieldGroup, rest, function (field, args) {
-    return /*#__PURE__*/React.createElement(FormSelectInner, {
-      field: field,
-      args: args,
-      selectProps: selectProps,
-      readOnly: readOnly,
-      disabled: disabled,
-      showGroupSeparator: showGroupSeparator
-    });
-  });
-}
-export { FormSelectField };