@maif/react-forms 1.0.54 → 1.0.55

package/lib/esm/index.js

@@ -3,7 +3,7 @@ import React, { useState, useEffect, useRef, useImperativeHandle } from 'react';
 import { yupResolver } from '@hookform/resolvers/yup';
 import classNames from 'classnames';
 import { Eye, EyeOff, PlusCircle, MinusCircle, Trash2, ChevronDown, ChevronUp, HelpCircle, Loader, Upload } from 'react-feather';
-import { useController, useFormContext, useForm, FormProvider, Controller, useFieldArray, useWatch } from 'react-hook-form';
+import { useFormContext, useController, useForm, FormProvider, Controller, useFieldArray, useWatch } from 'react-hook-form';
 import { DatePicker } from 'react-rainbow-components';
 import ReactToolTip from 'react-tooltip';
 import { v4 } from 'uuid';
@@ -970,6 +970,9 @@ var valueToSelectOption = function valueToSelectOption(value) {
 };
 
 var SelectInput = /*#__PURE__*/React.forwardRef(function (props, _) {
+  var _useFormContext = useFormContext(),
+      getValues = _useFormContext.getValues;
+
   var classes = useCustomStyle();
   var possibleValues = (props.possibleValues || []).map(function (v) {
     return props.transformer ? typeof props.transformer === 'function' ? props.transformer(v) : {
@@ -1009,9 +1012,24 @@ var SelectInput = /*#__PURE__*/React.forwardRef(function (props, _) {
 
       if (cond) {
         setLoading(true);
-        var promise = isPromise(props.optionsFrom) ? props.optionsFrom : props.httpClient(props.optionsFrom, 'GET').then(function (r) {
-          return r.json();
-        });
+        var promise;
+
+        if (isPromise(props.optionsFrom)) {
+          promise = props.optionsFrom;
+        } else if (typeof props.optionsFrom === 'function') {
+          var result = props.optionsFrom({
+            rawValues: getValues(),
+            value: getValues(props.id)
+          });
+          promise = isPromise(result) ? result : props.httpClient(result, 'GET').then(function (r) {
+            return r.json();
+          });
+        } else {
+          promise = props.httpClient(props.optionsFrom, 'GET').then(function (r) {
+            return r.json();
+          });
+        }
+
         promise.then(function (values) {
           return values.map(function (x) {
             return props.transformer ? props.transformer(x) : valueToSelectOption(x, values, props.isMulti, props.transformer);

package/lib/index.js

@@ -1004,6 +1004,9 @@ var valueToSelectOption = function valueToSelectOption(value) {
 };
 
 var SelectInput = /*#__PURE__*/React__default["default"].forwardRef(function (props, _) {
+  var _useFormContext = reactHookForm.useFormContext(),
+      getValues = _useFormContext.getValues;
+
   var classes = useCustomStyle();
   var possibleValues = (props.possibleValues || []).map(function (v) {
     return props.transformer ? typeof props.transformer === 'function' ? props.transformer(v) : {
@@ -1043,9 +1046,24 @@ var SelectInput = /*#__PURE__*/React__default["default"].forwardRef(function (pr
 
       if (cond) {
         setLoading(true);
-        var promise = isPromise(props.optionsFrom) ? props.optionsFrom : props.httpClient(props.optionsFrom, 'GET').then(function (r) {
-          return r.json();
-        });
+        var promise;
+
+        if (isPromise(props.optionsFrom)) {
+          promise = props.optionsFrom;
+        } else if (typeof props.optionsFrom === 'function') {
+          var result = props.optionsFrom({
+            rawValues: getValues(),
+            value: getValues(props.id)
+          });
+          promise = isPromise(result) ? result : props.httpClient(result, 'GET').then(function (r) {
+            return r.json();
+          });
+        } else {
+          promise = props.httpClient(props.optionsFrom, 'GET').then(function (r) {
+            return r.json();
+          });
+        }
+
         promise.then(function (values) {
           return values.map(function (x) {
             return props.transformer ? props.transformer(x) : valueToSelectOption(x, values, props.isMulti, props.transformer);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maif/react-forms",
   "description": "Build react safe forms as fast as possible",
-  "version": "1.0.54",
+  "version": "1.0.55",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
   "types": "lib/index.js",