@engagebay/engagebay-form-module 1.0.2-beta.8 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@engagebay/engagebay-form-module",
-    "version": "1.0.2-beta.8",
+    "version": "1.0.3",
     "description": "Provide base form components to reacho",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"
@@ -16,6 +16,7 @@
         "@heroicons/react": ">=2.1.5",
         "@reduxjs/toolkit": ">=2.2.7",
         "@tippyjs/react": ">=4.2.6",
+        "@types/lodash": ">=4.17.7",
         "@types/react-redux": ">=7.1.33",
         "axios": ">=1.7.2",
         "clsx": ">=2.1.1",
@@ -31,6 +32,7 @@
         "@heroicons/react": ">=2.1.5",
         "@reduxjs/toolkit": ">=2.2.7",
         "@tippyjs/react": ">=4.2.6",
+        "@types/lodash": ">=4.17.7",
         "@types/react-redux": ">=7.1.33",
         "axios": ">=1.7.2",
         "clsx": ">=2.1.1",

package/src/form/FormFieldUtils.ts

@@ -34,7 +34,6 @@ import {
     FormFieldType,
     OptionMappingConfig,
 } from "./schema/FormFieldSchema";
-import Typeahead2 from "./formfields/Typeahead2";
 
 /**
  * @property {React.FC<FormFieldComponentPropSchema>} component - React component for a form field.
@@ -140,9 +139,6 @@ const formFieldComponents: FormComponentSchema = {
     [FormFieldType[FormFieldType.TYPEAHEAD_MULTI_SELECT]]: {
         component: TypeaheadMultiSelect,
     },
-    [FormFieldType[FormFieldType.TYPEAHEAD_2]]: {
-        component: Typeahead2,
-    },
     [FormFieldType[FormFieldType.COMBO_SELECT]]: {
         component: ComboSelect,
     },

package/src/form/formfields/BusinessHoursField.tsx

@@ -21,6 +21,7 @@ import FormField from "../FormField";
 import RenderFormField from "../util/RenderFormField";
 import { TrashIcon, XMarkIcon } from "@heroicons/react/24/outline";
 import Tippy from "@tippyjs/react";
+import { set } from "lodash";
 
 const defaultBusinessHours = {
   MONDAY: {
@@ -123,8 +124,9 @@ export const BusinessHoursField: React.FC<FormFieldComponentPropSchema> = (
             <div className="w-full sm:w-full text-end mr-[2.3em]">
               <button
                 type="button"
-                className={`text-end text-primary cursor-pointer font-[13px] font-medium ${getValues(`${mappedName}.sessions`)?.length > 1 ? "mr-9" : ""
-                  }`}
+                className={`text-end text-primary cursor-pointer font-[13px] font-medium ${
+                  getValues(`${mappedName}.sessions`)?.length > 1 ? "mr-9" : ""
+                }`}
                 onClick={() => {
                   const lastEndTime =
                     getValues(`${mappedName}.sessions`)?.[

package/src/form/formfields/DatePickerField.tsx

@@ -8,7 +8,7 @@ import { handleChange, registerFormField } from "../util";
 import moment from "moment";
 
 const DatePicker: React.FC<FormFieldComponentPropSchema> = (
-  props: FormFieldComponentPropSchema,
+  props: FormFieldComponentPropSchema
 ) => {
   const formContext = useContext(FormContext);
   const initialDate = formContext.getValues(props.fieldConfig.name)
@@ -25,38 +25,24 @@ const DatePicker: React.FC<FormFieldComponentPropSchema> = (
     ) {
       formContext.setValue(
         props.fieldConfig.name,
-        props.fieldConfig.defaultValue,
+        props.fieldConfig.defaultValue
       );
     }
   }, [props.fieldConfig.forceUpdate]);
 
   let registerOptions: RegisterOptions = registerFormField(props.fieldConfig);
-  //registerOptions.valueAsDate = true;
+
   let hookProps = formContext.register(props.fieldConfig.name, registerOptions);
 
   function getInput() {
-    const rawStart =
-      initialDate?.startDate ||
-      props.fieldConfig.defaultValue ||
-      "";
-    const rawEnd =
-      initialDate?.endDate ||
-      props.fieldConfig.defaultValue ||
-      "";
-    const toDate = (v: string | Date | null | undefined): Date | null => {
-      if (v == null || v === "") return null;
-      return moment(v).isValid() ? moment(v).toDate() : null;
-    };
-    const value = {
-      startDate: toDate(rawStart),
-      endDate: toDate(rawEnd),
-    };
-    // Calendar opens on selected date's month/year (must be a Date instance)
-    const startFrom = value.startDate instanceof Date ? value.startDate : new Date();
     return (
       <Datepicker
-        value={value}
-        startFrom={startFrom}
+        value={
+          initialDate || {
+            startDate: props.fieldConfig.defaultValue,
+            endDate: props.fieldConfig.defaultValue,
+          }
+        }
         {...hookProps}
         placeholder={
           props.fieldConfig.placeholder
@@ -67,7 +53,13 @@ const DatePicker: React.FC<FormFieldComponentPropSchema> = (
         popoverDirection="down"
         useRange={false}
         inputName={props.fieldConfig.name}
-        key={props.fieldConfig.name + "_" + rawStart + "_" + rawEnd}
+        key={
+          props.fieldConfig.name +
+          "_" +
+          initialDate.startDate +
+          "_" +
+          initialDate.endDate
+        }
         containerClassName={"relative"}
         minDate={props.fieldConfig.minDate}
         maxDate={props.fieldConfig.maxDate}

package/src/form/formfields/NumberField.tsx

@@ -1,62 +1,61 @@
-import React, { useContext } from "react";
-import { RegisterOptions } from "react-hook-form";
-import { FormContext } from "../context/FormContext";
-import { FormFieldComponentPropSchema } from "../schema/FormFieldSchema";
-import { handleChange, registerFormField } from "../util";
+import React, {useContext} from "react";
+import {RegisterOptions} from "react-hook-form";
+import {FormContext} from "../context/FormContext";
+import {FormFieldComponentPropSchema} from "../schema/FormFieldSchema";
+import {handleChange, registerFormField} from "../util";
 import RenderFormField from "../util/RenderFormField";
 
 const NumberField: React.FC<FormFieldComponentPropSchema> = (
-  props: FormFieldComponentPropSchema,
+    props: FormFieldComponentPropSchema
 ) => {
-  const formContext = useContext(FormContext);
+    const formContext = useContext(FormContext);
 
-  let registerOptions: RegisterOptions = registerFormField(props.fieldConfig);
-  registerOptions.valueAsNumber = true;
-  let hookProps = formContext.register(props.fieldConfig.name, registerOptions);
+    let registerOptions: RegisterOptions = registerFormField(props.fieldConfig);
+
+    let hookProps = formContext.register(props.fieldConfig.name, registerOptions);
+
+    function getInput() {
+        return (
+            <input
+                type="number"
+                {...hookProps}
+                placeholder={props.fieldConfig?.placeholder}
+                readOnly={props.fieldConfig?.readOnly}
+                disabled={props.fieldConfig?.disabled}
+                autoComplete={props.fieldConfig?.autoComplete}
+                min={props.fieldConfig?.min}
+                max={props.fieldConfig?.max}
+                step={props.fieldConfig.decimalAllowed ? 0.01 : 1}
+                defaultValue={props.fieldConfig.defaultValue as string}
+                className={`form-input ${
+                    props.fieldConfig.customClassNames?.fieldClassName || "flex-1 !w-60"
+                }`}
+                onKeyDown={(e) => {
+                    props.fieldConfig.onKeyDown && props.fieldConfig.onKeyDown(e);
+                }}
+                onChange={(e) => {
+                    let value = e.target.value;
+                    let numericValue = parseFloat(value);
+                    if (props.fieldConfig.max !== undefined && numericValue > props.fieldConfig.max) {
+                        numericValue = props.fieldConfig.max;
+                    }
+                    if (props.fieldConfig.min !== undefined && numericValue < props.fieldConfig.min) {
+                        numericValue = props.fieldConfig.min;
+                    }
+                    value = numericValue.toString();
+                    handleChange(
+                        value,
+                        formContext,
+                        props.fieldConfig,
+                        props.onChange
+                    );
+                }}
+            />
+        );
+    }
 
-  function getInput() {
     return (
-      <input
-        type="number"
-        {...hookProps}
-        placeholder={props.fieldConfig?.placeholder}
-        readOnly={props.fieldConfig?.readOnly}
-        disabled={props.fieldConfig?.disabled}
-        autoComplete={props.fieldConfig?.autoComplete}
-        min={props.fieldConfig?.min}
-        max={props.fieldConfig?.max}
-        step={props.fieldConfig.decimalAllowed ? 0.01 : 1}
-        defaultValue={props.fieldConfig.defaultValue as string}
-        className={`form-input ${
-          props.fieldConfig.customClassNames?.fieldClassName || "flex-1"
-        }`}
-        onKeyDown={(e) => {
-          props.fieldConfig.onKeyDown && props.fieldConfig.onKeyDown(e);
-        }}
-        onChange={(e) => {
-          let value = e.target.value;
-          let numericValue = parseFloat(value);
-          if (
-            props.fieldConfig.max !== undefined &&
-            numericValue > props.fieldConfig.max
-          ) {
-            numericValue = props.fieldConfig.max;
-          }
-          if (
-            props.fieldConfig.min !== undefined &&
-            numericValue < props.fieldConfig.min
-          ) {
-            numericValue = props.fieldConfig.min;
-          }
-          value = numericValue.toString();
-          handleChange(value, formContext, props.fieldConfig, props.onChange);
-        }}
-      />
+        <RenderFormField fieldConfig={props.fieldConfig} getInput={getInput}/>
     );
-  }
-
-  return (
-    <RenderFormField fieldConfig={props.fieldConfig} getInput={getInput} />
-  );
 };
 export default NumberField;

package/src/form/formfields/Typeahead.tsx

@@ -1,9 +1,9 @@
 import React, {
-  useCallback,
-  useContext,
-  useEffect,
-  useRef,
-  useState,
+    useCallback,
+    useContext,
+    useEffect,
+    useRef,
+    useState,
 } from "react";
 
 import { Listbox, ListboxButton } from "@headlessui/react";
@@ -12,185 +12,199 @@ import { RegisterOptions } from "react-hook-form";
 import { FormContext } from "../context/FormContext";
 import { getListOption, getListOptions } from "../FormFieldUtils";
 import {
-  FieldOptionsSchema,
-  FormFieldComponentPropSchema,
-  FormFieldType,
-  OutputFormatType,
+    FieldOptionsSchema,
+    FormFieldComponentPropSchema,
+    FormFieldType,
+    OutputFormatType,
 } from "../schema/FormFieldSchema";
 import { handleChange, registerFormField } from "../util";
 import RenderFormField from "../util/RenderFormField";
 import RenderListOptions, {
-  renderListBoxValue,
+    renderListBoxValue,
 } from "../util/RenderListOptions";
 
 const Typeahead: React.FC<FormFieldComponentPropSchema> = (
-  props: FormFieldComponentPropSchema,
+    props: FormFieldComponentPropSchema
 ) => {
-  const dynamicSelectRef = useRef<HTMLUListElement>(null);
-  const formContext = useContext(FormContext);
-  let registerOptions: RegisterOptions = registerFormField(props.fieldConfig);
-  let hookProps = formContext.register(props.fieldConfig.name, registerOptions);
-  const [listOptions, setListOptions] = useState<FieldOptionsSchema[]>([]);
-  const [selectedValues, setSelectedValues] = useState<FieldOptionsSchema[]>(
-    [],
-  );
-  const [loading, setLoading] = useState<boolean>(true);
-
-  useEffect(() => {
-    if (
-      !formContext.getValues(props.fieldConfig.name) &&
-      props.fieldConfig.defaultValue
-    ) {
-      formContext.setValue(
+    const dynamicSelectRef = useRef<HTMLUListElement>(null);
+    const formContext = useContext(FormContext);
+    let registerOptions: RegisterOptions = registerFormField(props.fieldConfig);
+    let hookProps = formContext.register(
         props.fieldConfig.name,
-        props.fieldConfig.defaultValue,
-      );
-    }
-    fetchData(undefined);
-  }, []);
-
-  const fetchData = useCallback(
-    async (_query: string | undefined) => {
-      setLoading(true);
-      try {
-        if (!props.fieldConfig.fetchUrl) return;
+        registerOptions
+    );
+    const [listOptions, setListOptions] = useState<FieldOptionsSchema[]>([]);
+    const [selectedValues, setSelectedValues] = useState<FieldOptionsSchema[]>(
+        []
+    );
+    const [loading, setLoading] = useState<boolean>(true);
 
-        let url = props.fieldConfig.fetchUrl;
-        if (_query) {
-          url = url.includes("?") ? url + "&q=" + _query : url + "?q=" + _query;
+    useEffect(() => {
+        if (
+            !formContext.getValues(props.fieldConfig.name) &&
+            props.fieldConfig.defaultValue
+        ) {
+            formContext.setValue(
+                props.fieldConfig.name,
+                props.fieldConfig.defaultValue
+            );
         }
+        fetchData(undefined);
+    }, []);
 
-        let response = await (props.fieldConfig.disableHeaderInFetch
-          ? axios.get(url)
-          : formContext.axiosInstance?.get(url));
-        if (response?.data) {
-          const data: FieldOptionsSchema[] = getListOptions(
-            response.data,
-            props.fieldConfig.optionsConfig,
-          );
-          setListOptions([...data]);
-          let value = formContext.getValues(props.fieldConfig.name);
-          if (value && data.find((i) => i.value !== value)) {
-            if (selectedValues.find((i) => i.value !== value))
-              fetchValue(value);
-          }
-          if (props.fieldConfig.fetchCallback) {
-            props.fieldConfig.fetchCallback(response);
-          }
-        } else {
-          console.error(response?.statusText);
-        }
-      } catch (err) {
-      } finally {
-        setLoading(false);
-      }
-    },
-    [props.fieldConfig.fetchUrl],
-  );
+    const fetchData = useCallback(
+        async (_query: string | undefined) => {
+            setLoading(true);
+            try {
+                if (!props.fieldConfig.fetchUrl) return;
+
+                let url = props.fieldConfig.fetchUrl;
+                if (_query) {
+                    url = url.includes("?")
+                        ? url + "&q=" + _query
+                        : url + "?q=" + _query;
+                }
+
+                let response = await (props.fieldConfig.disableHeaderInFetch
+                    ? axios.get(url)
+                    : formContext.axiosInstance?.get(url));
+                if (response?.data) {
+                    const data: FieldOptionsSchema[] = getListOptions(
+                        response.data,
+                        props.fieldConfig.optionsConfig
+                    );
+                    setListOptions([...data]);
+                    let value = formContext.getValues(props.fieldConfig.name);
+                    if (
+                        value &&
+                        data.find((i) => i.value !== value)
+                    ) {
+                        if (selectedValues.find((i) => i.value !== value))
+                            fetchValue(value);
+                    }
+                    if (props.fieldConfig.fetchCallback) {
+                        props.fieldConfig.fetchCallback(response);
+                    }
+                } else {
+                    console.error(response?.statusText);
+                }
+            } catch (err) {
+            } finally {
+                setLoading(false);
+            }
+        },
+        [props.fieldConfig.fetchUrl]
+    );
 
-  const fetchValue = async (value: string) => {
-    try {
-      if (props.fieldConfig.ignoreFetchValue || !props.fieldConfig.fetchUrl) {
-        return;
-      }
+    const fetchValue = async (value: string) => {
+        try {
+            if (
+                props.fieldConfig.ignoreFetchValue ||
+                !props.fieldConfig.fetchUrl
+            ) {
+                return;
+            }
 
-      let url = props.fieldConfig.fetchUrl;
+            let url = props.fieldConfig.fetchUrl;
 
-      if (value)
-        url = url.includes("?")
-          ? url + "&values=" + value
-          : url + "?values=" + value;
+            if (value)
+                url = url.includes("?")
+                    ? url + "&values=" + value
+                    : url + "?values=" + value;
 
-      let response = await (props.fieldConfig.disableHeaderInFetch
-        ? axios.get(url)
-        : formContext.axiosInstance?.get(url));
-      if (response?.data) {
-        const data: FieldOptionsSchema[] = getListOptions(
-          response?.data,
-          props.fieldConfig.optionsConfig,
+            let response = await (
+                props.fieldConfig.disableHeaderInFetch
+                    ? axios.get(url)
+                    : formContext.axiosInstance?.get(url)
+            );
+            if (response?.data) {
+                const data: FieldOptionsSchema[] = getListOptions(
+                    response?.data,
+                    props.fieldConfig.optionsConfig
+                );
+                setSelectedValues([...data]);
+            }
+        } catch (err) { }
+    };
+
+    const updateListOptions = (data: any) => {
+        const resData: FieldOptionsSchema = getListOption(
+            data,
+            props.fieldConfig.optionsConfig
         );
-        setSelectedValues([...data]);
-      }
-    } catch (err) {}
-  };
+        setSelectedValues((perv) => [resData]);
+        formContext.setValue(props.fieldConfig.name, resData.value);
+    };
 
-  const updateListOptions = (data: any) => {
-    const resData: FieldOptionsSchema = getListOption(
-      data,
-      props.fieldConfig.optionsConfig,
-    );
-    setSelectedValues((perv) => [resData]);
-    formContext.setValue(props.fieldConfig.name, resData.value);
-  };
+    function getInput() {
+        return (
+            <Listbox
+                as={"div"}
+                {...hookProps}
+                className={`relative form-listbox flex-1`}
+                value={
+                    formContext.getValues(props.fieldConfig.name)
+                        ? props.fieldConfig.outputFormat ===
+                            OutputFormatType.ARRAY
+                            ? formContext.getValues(props.fieldConfig.name)[0]
+                            : formContext.getValues(props.fieldConfig.name)
+                        : undefined
+                }
+                onChange={(val) => {
+                    const currentValue = formContext.getValues(
+                        props.fieldConfig.name
+                    );
 
-  function getInput() {
-    return (
-      <Listbox
-        as={"div"}
-        {...hookProps}
-        className={`relative form-listbox flex-1`}
-        value={
-          formContext.getValues(props.fieldConfig.name)
-            ? props.fieldConfig.outputFormat === OutputFormatType.ARRAY
-              ? formContext.getValues(props.fieldConfig.name)[0]
-              : formContext.getValues(props.fieldConfig.name)
-            : undefined
-        }
-        onChange={(val) => {
-          const currentValue = formContext.getValues(props.fieldConfig.name);
+                    // If the value matches, set it to null, otherwise set it to val
+                    const newValue = currentValue === val ? null : val;
 
-          // If the value matches, set it to null, otherwise set it to val
-          const newValue = currentValue === val ? null : val;
+                    const selected = listOptions.find(o => o.value == newValue);
+                    selected && setSelectedValues([selected]);
+                    handleChange(
+                        newValue,
+                        formContext,
+                        props.fieldConfig,
+                        props.onChange
+                    );
+                }}
+                name={props.fieldConfig.name}
+                disabled={props.fieldConfig.disabled}>
+                <ListboxButton
+                    className={
+                        props.fieldConfig.customClassNames?.fieldClassName
+                            ? "form-listbox-select " +
+                            props.fieldConfig.customClassNames?.fieldClassName
+                            : "form-listbox-select"
+                    }>
+                    {renderListBoxValue(
+                        formContext,
+                        props.fieldConfig,
+                        [...selectedValues, ...listOptions],
+                        props.onChange
+                    )}
+                </ListboxButton>
+                <RenderListOptions
+                    formContext={formContext}
+                    onChange={props.onChange}
+                    formField={FormFieldType.TYPEAHEAD}
+                    ref={dynamicSelectRef}
+                    fieldConfig={props.fieldConfig}
+                    listOptions={[...selectedValues, ...listOptions]}
+                    setListOptions={setListOptions}
+                    loading={loading}
+                    setLoading={setLoading}
+                    createCallback={(data) => updateListOptions(data)}
+                    queryCallback={(query) => fetchData(query)}
+                />
+            </Listbox>
+        );
+    }
+    if (props.fieldConfig.hideWhenNoResults && listOptions.length == 0) {
+        return <></>;
+    }
 
-          const selected = listOptions.find((o) => o.value == newValue);
-          selected && setSelectedValues([selected]);
-          handleChange(
-            newValue,
-            formContext,
-            props.fieldConfig,
-            props.onChange,
-          );
-        }}
-        name={props.fieldConfig.name}
-        disabled={props.fieldConfig.disabled}
-      >
-        <ListboxButton
-          className={
-            props.fieldConfig.customClassNames?.fieldClassName
-              ? "form-listbox-select " +
-                props.fieldConfig.customClassNames?.fieldClassName
-              : "form-listbox-select"
-          }
-        >
-          {renderListBoxValue(
-            formContext,
-            props.fieldConfig,
-            [...selectedValues, ...listOptions],
-            props.onChange,
-          )}
-        </ListboxButton>
-        <RenderListOptions
-          formContext={formContext}
-          onChange={props.onChange}
-          formField={FormFieldType.TYPEAHEAD}
-          ref={dynamicSelectRef}
-          fieldConfig={props.fieldConfig}
-          listOptions={[...selectedValues, ...listOptions]}
-          setListOptions={setListOptions}
-          loading={loading}
-          setLoading={setLoading}
-          createCallback={(data) => updateListOptions(data)}
-          queryCallback={(query) => fetchData(query)}
-        />
-      </Listbox>
+    return (
+        <RenderFormField fieldConfig={props.fieldConfig} getInput={getInput} />
     );
-  }
-  if (props.fieldConfig.hideWhenNoResults && listOptions.length == 0) {
-    return <></>;
-  }
-
-  return (
-    <RenderFormField fieldConfig={props.fieldConfig} getInput={getInput} />
-  );
 };
 export default Typeahead;

package/src/form/formfields/TypeaheadMultiSelect.tsx

@@ -23,10 +23,9 @@ import RenderListOptions, {
 } from "../util/RenderListOptions";
 // import _ from "lodash";
 import axios from "axios";
-import { getAxiosInstance } from "../../api";
 
 const TypeaheadMultiSelect: React.FC<FormFieldComponentPropSchema> = (
-  props: FormFieldComponentPropSchema,
+  props: FormFieldComponentPropSchema
 ) => {
   const dynamicSelectRef = useRef<HTMLUListElement>(null);
   const formContext = useContext(FormContext);
@@ -34,7 +33,7 @@ const TypeaheadMultiSelect: React.FC<FormFieldComponentPropSchema> = (
   let hookProps = formContext.register(props.fieldConfig.name, registerOptions);
   const [listOptions, setListOptions] = useState<FieldOptionsSchema[]>([]);
   const [selectedValues, setSelectedValues] = useState<FieldOptionsSchema[]>(
-    [],
+    []
   );
   const [loading, setLoading] = useState<boolean>(true);
 
@@ -45,7 +44,7 @@ const TypeaheadMultiSelect: React.FC<FormFieldComponentPropSchema> = (
     ) {
       formContext.setValue(
         props.fieldConfig.name,
-        props.fieldConfig.defaultValue,
+        props.fieldConfig.defaultValue
       );
     }
     fetchData(undefined);
@@ -61,16 +60,14 @@ const TypeaheadMultiSelect: React.FC<FormFieldComponentPropSchema> = (
         if (_query) {
           url = url.includes("?") ? url + "&q=" + _query : url + "?q=" + _query;
         }
-        const axiosInstance = getAxiosInstance(
-          formContext.axiosInstance,
-          props.fieldConfig,
-        );
 
-        let response = await axiosInstance.get(url);
+        let response = await (props.fieldConfig.disableHeaderInFetch
+          ? axios.get(url)
+          : formContext.axiosInstance?.get(url));
         if (response?.data) {
           const data: FieldOptionsSchema[] = getListOptions(
             response?.data,
-            props.fieldConfig.optionsConfig,
+            props.fieldConfig.optionsConfig
           );
           setListOptions([...data]);
           let values = formContext.getValues(props.fieldConfig.name) || [];
@@ -80,7 +77,7 @@ const TypeaheadMultiSelect: React.FC<FormFieldComponentPropSchema> = (
             (data.length === 0 || // If 'data' is empty
               (!values.every((v: string) => data.some((i) => i.value === v)) && // Ensure none of 'values' match 'data'
                 !values.every((v: string) =>
-                  selectedValues.some((i) => i.value === v),
+                  selectedValues.some((i) => i.value === v)
                 ))) // Ensure none of 'values' match 'selectedValues'
           ) {
             fetchValue(values); // Call 'fetchValue()' if all conditions are met
@@ -97,7 +94,7 @@ const TypeaheadMultiSelect: React.FC<FormFieldComponentPropSchema> = (
         setLoading(false);
       }
     },
-    [props.fieldConfig.fetchUrl],
+    [props.fieldConfig.fetchUrl]
   );
 
   const fetchValue = async (value: string) => {
@@ -108,7 +105,7 @@ const TypeaheadMultiSelect: React.FC<FormFieldComponentPropSchema> = (
 
       let url = props.fieldConfig.fetchUrl;
 
-      url = url.includes("?")
+      url = url = url.includes("?")
         ? url + "&values=" + value
         : url + "?values=" + value;
 
@@ -118,7 +115,7 @@ const TypeaheadMultiSelect: React.FC<FormFieldComponentPropSchema> = (
       if (response?.data) {
         const data: FieldOptionsSchema[] = getListOptions(
           response?.data,
-          props.fieldConfig.optionsConfig,
+          props.fieldConfig.optionsConfig
         );
         let values: any[] = formContext.getValues(props.fieldConfig.name) || [];
         setSelectedValues(
@@ -126,22 +123,22 @@ const TypeaheadMultiSelect: React.FC<FormFieldComponentPropSchema> = (
             ...data,
             props.fieldConfig.dropdownFieldConfig?.isSuggestionBox && values
               ? values
-                .filter(
-                  (value) =>
-                    data.some((d) => d.value !== value) || data.length == 0,
-                )
-                .map((val) => ({ label: val, value: val }))
+                  .filter(
+                    (value) =>
+                      data.some((d) => d.value !== value) || data.length == 0
+                  )
+                  .map((val) => ({ label: val, value: val }))
               : [],
-          ].flat(),
+          ].flat()
         );
       }
-    } catch (err) { }
+    } catch (err) {}
   };
 
   const updateListOptions = (data: any) => {
     const resData: FieldOptionsSchema = getListOption(
       data,
-      props.fieldConfig.optionsConfig,
+      props.fieldConfig.optionsConfig
     );
     setSelectedValues((prev) => [...prev, resData]);
     let result = formContext.getValues(props.fieldConfig.name) || [];
@@ -163,14 +160,14 @@ const TypeaheadMultiSelect: React.FC<FormFieldComponentPropSchema> = (
         className={"relative form-listbox flex-1 overflow-hidden"}
         onChange={(selectedOptions) => {
           const chossenOptions = listOptions.filter((op) =>
-            selectedOptions.includes(op.value),
+            selectedOptions.includes(op.value)
           );
           setSelectedValues((prev) => [...prev, ...chossenOptions]);
           handleChange(
             selectedOptions,
             formContext,
             props.fieldConfig,
-            props.onChange,
+            props.onChange
           );
         }}
         multiple
@@ -179,7 +176,7 @@ const TypeaheadMultiSelect: React.FC<FormFieldComponentPropSchema> = (
           className={
             props.fieldConfig.customClassNames?.fieldClassName
               ? "form-listbox-select " +
-              props.fieldConfig.customClassNames?.fieldClassName
+                props.fieldConfig.customClassNames?.fieldClassName
               : "form-listbox-select"
           }
         >
@@ -187,7 +184,7 @@ const TypeaheadMultiSelect: React.FC<FormFieldComponentPropSchema> = (
             formContext,
             props.fieldConfig,
             [...selectedValues, ...listOptions],
-            props.onChange,
+            props.onChange
           )}
         </ListboxButton>
         <RenderListOptions

package/src/form/schema/FormFieldSchema.ts

@@ -37,7 +37,6 @@ export enum FormFieldType {
     DYNAMIC_MULTI_SELECT = "DYNAMIC_MULTI_SELECT",
 
     TYPEAHEAD = "TYPEAHEAD",
-    TYPEAHEAD_2 = "TYPEAHEAD_2",
     TYPEAHEAD_MULTI_SELECT = "TYPEAHEAD_MULTI_SELECT",
     PHONE_NUMBER_INPUT = "PHONE_NUMBER_INPUT",
     SWITCH = "SWITCH",
@@ -130,13 +129,10 @@ export type FormFieldSchema = {
     submitOnChange?: boolean;
     formFieldPattern?: FormFieldPatternsImpl[];
     fetchUrl?: string;
-    fetchSavedDataUrl?: string;
     postUrl?: string;
     fileAccept?: string;
     icon?: ReactNode;
     outputFormat?: OutputFormatType;
-    isMultiple?: boolean;
-    allowedMinQueryLength?: number;
     children?: FormFieldSchema[];
     defaultOptions?: FieldOptionsSchema[];
     optionsConfig?: OptionMappingConfig;
@@ -205,7 +201,6 @@ export type FieldOptionsSchema = {
     isDisabled?: boolean;
     helpText?: string;
     groupName?: string;
-    tooltip?: string;
     icon?: React.ReactNode;
 };
 

package/src/form/util/RenderListOptions.tsx

@@ -17,7 +17,6 @@ import {
   FormFieldType,
   OutputFormatType,
 } from "../schema/FormFieldSchema";
-import Tippy from "@tippyjs/react";
 
 type RenderListOptionsProps = {
   formContext: FormContextType;
@@ -102,15 +101,15 @@ const RenderListOptions = forwardRef<HTMLUListElement, RenderListOptionsProps>(
 
     const filteredList = query
       ? resultList.filter((item) => {
-        const normalizedLabel = fieldConfig.dropdownFieldConfig
-          ?.isCaseSensitive
-          ? item.label
-          : item.label.toLowerCase();
+          const normalizedLabel = fieldConfig.dropdownFieldConfig
+            ?.isCaseSensitive
+            ? item.label
+            : item.label.toLowerCase();
 
-        return normalizedLabel
-          .replace(/\s+/g, "")
-          .includes(caseSensitive.replace(/\s+/g, ""));
-      })
+          return normalizedLabel
+            .replace(/\s+/g, "")
+            .includes(caseSensitive.replace(/\s+/g, ""));
+        })
       : resultList;
 
     let nullGroupOptions: any[] = [];
@@ -127,15 +126,13 @@ const RenderListOptions = forwardRef<HTMLUListElement, RenderListOptionsProps>(
     }, {});
 
     const handleQueryCallback = useCallback(() => {
-      if (filteredList.length < 5 && isTypeahead) {
+      if (filteredList.length == 0 && isTypeahead) {
         queryCallback && queryCallback(query);
       }
     }, [filteredList]);
 
     useEffect(() => {
-      if (formField == FormFieldType.TYPEAHEAD_2)
-        queryCallback && queryCallback(query);
-      else handleQueryCallback();
+      handleQueryCallback();
     }, [query]);
 
     let enableCreateFlag =
@@ -145,7 +142,6 @@ const RenderListOptions = forwardRef<HTMLUListElement, RenderListOptionsProps>(
 
     let validTypeaheadFields = [
       FormFieldType.TYPEAHEAD,
-      FormFieldType.TYPEAHEAD_2,
       FormFieldType.TYPEAHEAD_MULTI_SELECT,
     ];
     let isTypeahead: boolean = validTypeaheadFields.indexOf(formField) > -1;
@@ -169,10 +165,11 @@ const RenderListOptions = forwardRef<HTMLUListElement, RenderListOptionsProps>(
           key={option.value}
           disabled={option.isDisabled}
           onClick={() => setTimeout(resetToDefault, 300)}
-          className={`form-listbox-option ${selected
-            ? " bg-gray-100 text-gray-900"
-            : "hover:bg-gray-100 text-gray-700"
-            }`}
+          className={`form-listbox-option ${
+            selected
+              ? " bg-gray-100 text-gray-900"
+              : "hover:bg-gray-100 text-gray-700"
+          }`}
           value={option.value}
         >
           {fieldConfig.fieldOptionWrapper ? (
@@ -181,30 +178,17 @@ const RenderListOptions = forwardRef<HTMLUListElement, RenderListOptionsProps>(
             <>
               <div className="flex items-center justify-between gap-x-1.5">
                 <span
-                  className={`block truncate w-full ${fieldConfig.customClassNames?.optionClassName} space-x-2 ${selected ? "font-medium" : "font-normal"
-                    }`}
+                  className={`block truncate w-full ${fieldConfig.customClassNames?.optionClassName} space-x-2 ${
+                    selected ? "font-medium" : "font-normal"
+                  }`}
                 >
                   {option.icon && (
                     <span className="listbox-svg">{option.icon}</span>
                   )}
-                  {option.tooltip ? (
-                    <Tippy
-                      content={
-                        <>
-                          {option.label}
-                          <br />
-                          {option.helpText}
-                        </>
-                      }
-                    >
-                      <div className="truncate">{option.label}</div>
-                    </Tippy>
-                  ) : (
-                    option.label
-                  )}
+                  {option.label}
                 </span>
                 {isTypeahead &&
-                  !fieldConfig.dropdownFieldConfig?.isSuggestionBox ? (
+                !fieldConfig.dropdownFieldConfig?.isSuggestionBox ? (
                   <input
                     type="checkbox"
                     className="form-checkbox"
@@ -220,30 +204,11 @@ const RenderListOptions = forwardRef<HTMLUListElement, RenderListOptionsProps>(
                   )
                 )}
               </div>
-              {option.helpText &&
-                (option.tooltip ? (
-                  <Tippy
-                    content={
-                      <>
-                        {option.label}
-                        <br />
-                        {option.helpText}
-                      </>
-                    }
-                  >
-                    <div
-                      className={`mt-0 text-xs text-gray-500 font-normal truncate w-full ${fieldConfig.customClassNames?.optionClassName}`}
-                    >
-                      {option.helpText}
-                    </div>
-                  </Tippy>
-                ) : (
-                  <div
-                    className={`mt-0 text-xs text-gray-500 font-normal truncate w-full ${fieldConfig.customClassNames?.optionClassName}`}
-                  >
-                    {option.helpText}
-                  </div>
-                ))}
+              {option.helpText && (
+                <div className="mt-0 text-xs text-gray-500 font-normal truncate w-full !max-w-[150px]">
+                  {option.helpText}
+                </div>
+              )}
             </>
           )}
         </ListboxOption>
@@ -400,28 +365,28 @@ export function renderListBoxValue(
           {values.length > 1
             ? `${values.length} selected`
             : listOptions.find((option) => option.value == value[0])?.label ||
-            values[0]}
+              values[0]}
         </span>
         {getDeleteButton()}
       </span>
     ) : (
       Array.isArray(values) &&
-      values.map((opt: any) => {
-        const option = listOptions.find((option) => option.value == opt);
-        if (!option && values.length == 0) return getPlaceholder();
+        values.map((opt: any) => {
+          const option = listOptions.find((option) => option.value == opt);
+          if (!option && values.length == 0) return getPlaceholder();
 
-        return (
-          <span key={option?.value} className="form-selected-badge">
-            <Tippy content={option?.label} delay={500}>
-              <span className="form-selected-badge-name">
-                {option?.label}
-              </span>
-            </Tippy>
+          return (
+            <span key={option?.value} className="form-selected-badge">
+              <Tippy content={option?.label} delay={500}>
+                <span className="form-selected-badge-name">
+                  {option?.label}
+                </span>
+              </Tippy>
 
-            {getDeleteButton(opt)}
-          </span>
-        );
-      })
+              {getDeleteButton(opt)}
+            </span>
+          );
+        })
     );
   };
   const getDeleteButton = (option?: string) => {
@@ -453,10 +418,9 @@ export function renderListBoxValue(
       )
     );
   };
-  let outputFormat =
-    fieldConfig.outputFormat != undefined
-      ? fieldConfig.outputFormat === OutputFormatType.STRING
-      : false;
+  let outputFormat = fieldConfig.outputFormat
+    ? fieldConfig.outputFormat === OutputFormatType.ARRAY
+    : false;
   const getPlaceholder = () => (
     <span className="form-placeholder">
       {fieldConfig.placeholder || "Select any option"}

package/src/form/formfields/Typeahead2.tsx

@@ -1,283 +0,0 @@
-import React, {
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-
-import { Listbox, ListboxButton } from "@headlessui/react";
-import { RegisterOptions } from "react-hook-form";
-
-import { FormContext } from "../context/FormContext";
-import { getListOption, getListOptions } from "../FormFieldUtils";
-import {
-  FieldOptionsSchema,
-  FormFieldComponentPropSchema,
-  FormFieldType,
-} from "../schema/FormFieldSchema";
-import { handleChange, registerFormField } from "../util";
-import RenderFormField from "../util/RenderFormField";
-import RenderListOptions, {
-  renderListBoxValue,
-} from "../util/RenderListOptions";
-import axios from "axios";
-import { getAxiosInstance } from "../../api";
-
-const Typeahead2: React.FC<FormFieldComponentPropSchema> = (
-  props: FormFieldComponentPropSchema,
-) => {
-  const dynamicSelectRef = useRef<HTMLUListElement>(null);
-  const abortControllerRef = useRef<AbortController | null>(null);
-  const formContext = useContext(FormContext);
-  let registerOptions: RegisterOptions = registerFormField(props.fieldConfig);
-  let hookProps = formContext.register(props.fieldConfig.name, registerOptions);
-  const [listOptions, setListOptions] = useState<FieldOptionsSchema[]>([]);
-  const [selectedValues, setSelectedValues] = useState<FieldOptionsSchema[]>(
-    [],
-  );
-  const [loading, setLoading] = useState<boolean>(false);
-
-  useEffect(() => {
-    if (
-      !formContext.getValues(props.fieldConfig.name) &&
-      props.fieldConfig.defaultValue
-    ) {
-      formContext.setValue(
-        props.fieldConfig.name,
-        props.fieldConfig.defaultValue,
-      );
-    }
-    let values: any | any[] | undefined =
-      formContext.getValues(props.fieldConfig.name) ||
-      props.fieldConfig.defaultValue;
-
-    if (values && selectedValues.length < 1) {
-      if (props.fieldConfig.fetchSavedDataUrl) {
-        fetchValue(values);
-      } else {
-        setSelectedValues(
-          Array.isArray(values)
-            ? values.map((val: any) => ({ label: val, value: val }))
-            : [values],
-        );
-      }
-    }
-  }, []);
-
-
-
-  const fetchData = useMemo(() => {
-    let timeoutId: ReturnType<typeof setTimeout>;
-
-    return (_query: string | undefined) => {
-      // Clear the previous timer
-      if (timeoutId) clearTimeout(timeoutId);
-
-      // Set a new timer
-      timeoutId = setTimeout(async () => {
-        // 1. Cancel the previous request if it's still pending
-        if (abortControllerRef.current) {
-          abortControllerRef.current.abort();
-        }
-
-        // 2. Create a new controller for the current request
-        const controller = new AbortController();
-        abortControllerRef.current = controller;
-
-        if (!_query || (props.fieldConfig.allowedMinQueryLength && _query.length < props.fieldConfig.allowedMinQueryLength) || _query.length < 3) {
-          setListOptions([]);
-          setLoading(false);
-          return;
-        }
-        setLoading(true);
-        try {
-          if (!props.fieldConfig.fetchUrl) return;
-
-          let url = props.fieldConfig.fetchUrl;
-
-          url = url.includes("?") ? url + "&q=" + _query : url + "?q=" + _query;
-
-          const axiosInstance = getAxiosInstance(
-            formContext.axiosInstance,
-            props.fieldConfig,
-          );
-          const response = await axiosInstance.get(url);
-
-          if (controller === abortControllerRef.current) {
-            if (response?.data) {
-              const data: FieldOptionsSchema[] = getListOptions(
-                response?.data,
-                props.fieldConfig.optionsConfig,
-              );
-              setListOptions([...data]);
-
-              if (props.fieldConfig.fetchCallback) {
-                props.fieldConfig.fetchCallback(response);
-              }
-            }
-          }
-        } catch (err) {
-          console.error("Fetch error:", err);
-        } finally {
-          // Only stop loading if this was the "active" request
-          if (controller === abortControllerRef.current) {
-            setLoading(false);
-          }
-        }
-      }, 250);
-    };
-  }, []);
-
-  // Cleanup on unmount
-  useEffect(() => {
-    return () => {
-      abortControllerRef.current?.abort();
-    };
-  }, []);
-
-  const fetchValue = async (value: string | any | any[]) => {
-    try {
-      if (
-        props.fieldConfig.ignoreFetchValue ||
-        !props.fieldConfig.fetchSavedDataUrl
-      ) {
-        return;
-      }
-
-      let url = props.fieldConfig.fetchSavedDataUrl;
-
-      // url = url.includes("?")
-      //   ? url + "&values=" + value
-      //   : url + "?values=" + value;
-
-      let response = await (props.fieldConfig.disableHeaderInFetch
-        ? axios.post(url, Array.isArray(value) ? value : [value])
-        : formContext.axiosInstance?.post(
-          url,
-          Array.isArray(value) ? value : [value],
-        ));
-      if (response?.data) {
-        const data: FieldOptionsSchema[] = getListOptions(
-          response?.data,
-          props.fieldConfig.optionsConfig,
-        );
-        let values: any[] = formContext.getValues(props.fieldConfig.name) || [];
-        setSelectedValues(
-          [
-            ...data,
-            props.fieldConfig.dropdownFieldConfig?.isSuggestionBox &&
-              values &&
-              Array.isArray(values)
-              ? values
-                .filter(
-                  (value) =>
-                    data.some((d) => d.value !== value) || data.length == 0,
-                )
-                .map((val) => ({ label: val, value: val }))
-              : [],
-          ].flat(),
-        );
-      }
-    } catch (err) { }
-  };
-
-  const updateListOptions = (data: any) => {
-    const resData: FieldOptionsSchema = getListOption(
-      data,
-      props.fieldConfig.optionsConfig,
-    );
-    setListOptions([]);
-    setSelectedValues((prev) =>
-      props.fieldConfig.isMultiple ? [...prev, resData] : [resData],
-    );
-    let result = formContext.getValues(props.fieldConfig.name) || [];
-    result = !props.fieldConfig.isMultiple
-      ? resData.value
-      : result.includes(resData.value)
-        ? [...result.filter((v: string) => v != resData.value), resData.value]
-        : [...result, resData.value];
-    formContext.setValue(props.fieldConfig.name, result);
-  };
-
-  const getInput = () => {
-    return (
-      <Listbox
-        as={"div"}
-        {...hookProps}
-        value={
-          props.fieldConfig.isMultiple
-            ? formContext.getValues(props.fieldConfig.name)
-              ? formContext.getValues(props.fieldConfig.name)
-              : []
-            : formContext.getValues(props.fieldConfig.name)
-        }
-        name={props.fieldConfig.name}
-        defaultValue={props.fieldConfig.defaultValue}
-        key={props.fieldConfig.name}
-        className={"relative form-listbox flex-1 overflow-hidden"}
-        onChange={(selectedOptions) => {
-          let currentValue = formContext.getValues(props.fieldConfig.name);
-          const newValue =
-            currentValue === selectedOptions ? null : selectedOptions;
-
-          if (props.fieldConfig.isMultiple) {
-            currentValue = listOptions.filter((op) =>
-              selectedOptions.includes(op.value),
-            );
-            setSelectedValues((prev) => [...prev, ...currentValue]);
-          } else {
-            const selected = listOptions.find((o) => o.value == newValue);
-            selected && setSelectedValues([selected]);
-          }
-          setListOptions([]);
-          handleChange(
-            newValue,
-            formContext,
-            props.fieldConfig,
-            props.onChange,
-          );
-        }}
-        multiple={props.fieldConfig.isMultiple}
-      >
-        <ListboxButton
-          className={
-            props.fieldConfig.customClassNames?.fieldClassName
-              ? "form-listbox-select " +
-              props.fieldConfig.customClassNames?.fieldClassName
-              : "form-listbox-select"
-          }
-        >
-          {renderListBoxValue(
-            formContext,
-            props.fieldConfig,
-            [...selectedValues, ...listOptions],
-            props.onChange,
-          )}
-        </ListboxButton>
-        <RenderListOptions
-          formContext={formContext}
-          onChange={props.onChange}
-          formField={FormFieldType.TYPEAHEAD_2}
-          ref={dynamicSelectRef}
-          fieldConfig={props.fieldConfig}
-          listOptions={listOptions}
-          setListOptions={setListOptions}
-          loading={loading}
-          setLoading={setLoading}
-          createCallback={(data) => updateListOptions(data)}
-          queryCallback={(query) => fetchData(query)}
-        />
-      </Listbox>
-    );
-  };
-  if (props.fieldConfig.hideWhenNoResults && listOptions.length == 0) {
-    return <></>;
-  }
-
-  return (
-    <RenderFormField fieldConfig={props.fieldConfig} getInput={getInput} />
-  );
-};
-export default Typeahead2;