@trackunit/custom-field-components 0.0.109 → 0.0.111

package/DropdownCustomField.d.ts

@@ -90,9 +90,5 @@ export interface DropdownCustomFieldProps extends FormGroupExposedProps {
 }
 declare type OnChange = (event?: React.ChangeEvent<HTMLInputElement>) => void;
 declare type OnBlur = (event: React.FocusEvent<HTMLDivElement>) => void;
-export declare type SelectValue = {
-    label: string;
-    value: string;
-};
 export declare const DropdownCustomField: ({ defaultValue, dataTestId, onChange, onBlur, id, disabled, allValues, multiSelect, register, validationRules, setValue, label, tip, errorMessage, helpText, isInvalid, helpAddon, }: DropdownCustomFieldProps) => JSX.Element;
 export {};

package/index.js

@@ -1890,15 +1890,16 @@ const DropdownCustomField = ({
 }) => {
   const renderAsInvalid = isInvalid || Boolean(errorMessage);
   const [selectedValue, setSelectedValue] = React.useState(defaultValue ? defaultValue.map(convertToValueFormat) : []);
-  const onChangeHandler = React.useCallback((selected, e) => {
-    const values = Array.isArray(selected) ? selected : [selected];
-    setSelectedValue(values);
-    setValue && setValue(id, values);
-    onChange && onChange(e);
+  const onChangeHandler = React.useCallback(selected => {
+    if (selected) {
+      const values = Array.isArray(selected) ? selected : [selected];
+      setSelectedValue(values);
+      setValue && setValue(id, values);
+    } else {
+      setSelectedValue([]);
+      setValue && setValue(id, []);
+    }
   }, [onChange]);
-  const onBlurHandler = React.useCallback(e => {
-    onBlur && onBlur(e);
-  }, [onBlur]);
   const options = React.useMemo(() => {
     return allValues ? allValues.map(convertToValueFormat) : [];
   }, [allValues]);
@@ -1916,12 +1917,11 @@ const DropdownCustomField = ({
     dataTestId: `${dataTestId}-FormGroup`
   }, {
     children: jsx(Select, {
-      isDisabled: _disabled,
+      disabled: _disabled,
       dataTestId: dataTestId,
       onChange: onChangeHandler,
-      isInvalid: renderAsInvalid,
+      hasError: renderAsInvalid,
       options: options,
-      onBlur: onBlurHandler,
       value: selectedValue,
       isMulti: _multiSelect,
       isClearable: true
@@ -2447,7 +2447,7 @@ const getPhoneNumberValidationRules = definition => {
 };
 
 const useCustomFieldResolver = (field, validation, unitPreference = "SI", fieldId) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
 
   if ((field === null || field === void 0 ? void 0 : field.definition) === undefined || ((_a = field === null || field === void 0 ? void 0 : field.definition) === null || _a === void 0 ? void 0 : _a.type) === undefined) {
     return null;
@@ -2600,10 +2600,18 @@ const useCustomFieldResolver = (field, validation, unitPreference = "SI", fieldI
         const typedDefinition = field.definition;
         const typedValue = field.value;
         const rules = getDateValidationRules();
+        let defaultValue;
+
+        if (typedValue.dateValue !== undefined && typedValue.dateValue !== null && typedValue.dateValue !== "") {
+          defaultValue = new Date(typedValue.dateValue);
+        } else if (typedDefinition.defaultDateValue !== undefined && typedDefinition.defaultDateValue !== null && typedDefinition.defaultDateValue !== "") {
+          defaultValue = new Date(typedDefinition.defaultDateValue);
+        }
+
         return jsx(DateCustomField, {
           dataTestId: "dateField",
           id: key || "date-field",
-          defaultValue: (_3 = (_2 = typedValue.dateValue) !== null && _2 !== void 0 ? _2 : typedDefinition.defaultDateValue) !== null && _3 !== void 0 ? _3 : undefined,
+          defaultValue: defaultValue,
           readOnly: !typedDefinition.uiEditable,
           register: validation.register,
           label: typedDefinition.title || "",

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@trackunit/custom-field-components",
-  "version": "0.0.109",
+  "version": "0.0.111",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "dependencies": {
-    "@trackunit/react-core-contexts-test": "0.0.32",
-    "@trackunit/react-components": "0.0.124",
+    "@trackunit/react-core-contexts-test": "0.0.33",
+    "@trackunit/react-components": "0.0.125",
     "react": "17.0.1",
     "react-hook-form": "^7.29.0",
-    "@trackunit/iris-app-runtime-core": "0.0.62",
-    "@trackunit/iris-app-runtime-core-api": "0.0.60",
+    "@trackunit/iris-app-runtime-core": "0.0.63",
+    "@trackunit/iris-app-runtime-core-api": "0.0.61",
     "react-select": "^5.4.0",
     "libphonenumber-js": "^1.10.7"
   },