@react-typed-forms/schemas 11.5.3 → 11.5.5

package/lib/components/ControlInput.d.ts

@@ -4,6 +4,10 @@ export declare function ControlInput({ control, convert, ...props }: React.Input
     control: Control<any>;
     convert: InputConversion;
 }): React.JSX.Element;
-type InputConversion = [string, (s: any) => any, (a: any) => string | number];
+type InputConversion = [
+    string,
+    (s: string) => any,
+    (a: any) => string | number
+];
 export declare function createInputConversion(ft: string): InputConversion;
 export {};

package/lib/index.js

@@ -16,6 +16,7 @@ exports.FieldType = void 0;
   FieldType["Int"] = "Int";
   FieldType["Date"] = "Date";
   FieldType["DateTime"] = "DateTime";
+  FieldType["Time"] = "Time";
   FieldType["Double"] = "Double";
   FieldType["EntityRef"] = "EntityRef";
   FieldType["Compound"] = "Compound";
@@ -703,6 +704,12 @@ function dateField(displayName, options) {
     displayName: displayName
   }, options));
 }
+function timeField(displayName, options) {
+  return makeScalarField(_extends({
+    type: exports.FieldType.Time,
+    displayName: displayName
+  }, options));
+}
 function dateTimeField(displayName, options) {
   return makeScalarField(_extends({
     type: exports.FieldType.DateTime,
@@ -1234,13 +1241,9 @@ function useValidationHook(definition, field) {
 }
 function useJsonataValidator(control, context, expr, hidden, i) {
   var errorMsg = useJsonataExpression(expr.expression, context);
-  core.useControlEffect(function () {
-    return [hidden, errorMsg.value];
-  }, function (_ref2) {
-    var hidden = _ref2[0],
-      msg = _ref2[1];
-    return control.setError("jsonata" + i, !hidden ? msg : null);
-  }, true);
+  core.useValidator(control, function () {
+    return !hidden ? errorMsg.value : null;
+  }, "jsonata" + i);
 }
 function useDateValidator(control, dv, i) {
   var comparisonDate;
@@ -2125,6 +2128,9 @@ var _excluded = ["control", "convert"],
 function ControlInput(_ref) {
   var _effect = core.useComponentTracking();
   try {
+    var toText = function toText(value) {
+      return value == null ? "" : convert[2](value);
+    };
     var control = _ref.control,
       convert = _ref.convert,
       props = _objectWithoutPropertiesLoose(_ref, _excluded);
@@ -2133,11 +2139,21 @@ function ControlInput(_ref) {
       value = _formControlProps.value,
       onChange = _formControlProps.onChange,
       inputProps = _objectWithoutPropertiesLoose(_formControlProps, _excluded2);
+    var textValue = core.useControl(function () {
+      return toText(value);
+    });
+    core.useControlEffect(function () {
+      return control.value;
+    }, function (v) {
+      return textValue.value = toText(v);
+    });
     return /*#__PURE__*/React__default["default"].createElement("input", _extends({}, inputProps, {
       type: convert[0],
-      value: value == null ? "" : convert[2](value),
+      value: textValue.value,
       onChange: function onChange(e) {
-        control.value = convert[1](e.target.value);
+        textValue.value = e.target.value;
+        var converted = convert[1](e.target.value);
+        if (converted !== undefined) control.value = converted;
       }
     }, props));
   } finally {
@@ -2154,7 +2170,7 @@ function createInputConversion(ft) {
       }];
     case exports.FieldType.Bool:
       return ["text", function (a) {
-        return a === "true";
+        return a === "true" ? true : a === "false" ? false : undefined;
       }, function (a) {
         var _a$toString;
         return (_a$toString = a == null ? void 0 : a.toString()) != null ? _a$toString : "";
@@ -2171,6 +2187,15 @@ function createInputConversion(ft) {
       }, function (a) {
         return a;
       }];
+    case exports.FieldType.Time:
+      return ["time", function (a) {
+        var l = a.length;
+        if (l === 5) return a + ":00";
+        if (l === 8) return a;
+        return undefined;
+      }, function (a) {
+        return a ? a.substring(0, 5) : "";
+      }];
     case exports.FieldType.Double:
       return ["number", function (a) {
         return parseFloat(a);
@@ -2897,6 +2922,7 @@ exports.setIncluded = setIncluded;
 exports.stringField = stringField;
 exports.stringOptionsField = stringOptionsField;
 exports.textDisplayControl = textDisplayControl;
+exports.timeField = timeField;
 exports.toDepString = toDepString;
 exports.useControlDefinitionForSchema = useControlDefinitionForSchema;
 exports.useControlRenderer = useControlRenderer;