@react-typed-forms/schemas 11.11.0 → 11.12.0

package/lib/createDefaultRenderers.d.ts

@@ -70,5 +70,6 @@ interface DefaultLabelRendererOptions {
     labelContainer?: (children: ReactElement) => ReactElement;
 }
 export declare function createDefaultLabelRenderer(options?: DefaultLabelRendererOptions): LabelRendererRegistration;
+export declare function createNullToggleRenderer(): DataRendererRegistration;
 export declare function createDefaultRenderers(options?: DefaultRendererOptions): DefaultRenderers;
 export {};

package/lib/hooks.d.ts

@@ -8,7 +8,7 @@ export declare function useEvalVisibilityHook(useEvalExpressionHook: UseEvalExpr
 export declare function useEvalReadonlyHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition): EvalExpressionHook<boolean>;
 export declare function useEvalStyleHook(useEvalExpressionHook: UseEvalExpressionHook, property: DynamicPropertyType, definition: ControlDefinition): EvalExpressionHook<React.CSSProperties>;
 export declare function useEvalAllowedOptionsHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition): EvalExpressionHook<any[]>;
-export declare function useEvalDisabledHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition): EvalExpressionHook<boolean>;
+export declare function useEvalDisabledHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition, fieldPath?: SchemaField[]): EvalExpressionHook<boolean>;
 export declare function useEvalDisplayHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition): DynamicHookGenerator<Control<string | undefined> | undefined, ControlDataContext>;
 export declare function useEvalDefaultValueHook(useEvalExpressionHook: UseEvalExpressionHook, definition: ControlDefinition, schemaField: SchemaField | undefined, element: boolean): EvalExpressionHook;
 export declare function defaultEvalHooks(expr: EntityExpression, context: ControlDataContext, coerce: (v: any) => any): Control<any>;

package/lib/index.js

@@ -29,6 +29,8 @@ exports.ValidationMessageType = void 0;
   ValidationMessageType["NotEmpty"] = "NotEmpty";
   ValidationMessageType["MinLength"] = "MinLength";
   ValidationMessageType["MaxLength"] = "MaxLength";
+  ValidationMessageType["NotAfterDate"] = "NotAfterDate";
+  ValidationMessageType["NotBeforeDate"] = "NotBeforeDate";
 })(exports.ValidationMessageType || (exports.ValidationMessageType = {}));
 exports.ControlDefinitionType = void 0;
 (function (ControlDefinitionType) {
@@ -56,6 +58,7 @@ exports.ExpressionType = void 0;
   ExpressionType["Data"] = "Data";
   ExpressionType["DataMatch"] = "FieldValue";
   ExpressionType["UserMatch"] = "UserMatch";
+  ExpressionType["NotEmpty"] = "NotEmpty";
 })(exports.ExpressionType || (exports.ExpressionType = {}));
 exports.AdornmentPlacement = void 0;
 (function (AdornmentPlacement) {
@@ -87,6 +90,7 @@ exports.DataRenderType = void 0;
   DataRenderType["Dropdown"] = "Dropdown";
   DataRenderType["DisplayOnly"] = "DisplayOnly";
   DataRenderType["Group"] = "Group";
+  DataRenderType["NullToggle"] = "NullToggle";
 })(exports.DataRenderType || (exports.DataRenderType = {}));
 exports.SyncTextType = void 0;
 (function (SyncTextType) {
@@ -195,7 +199,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.indexOf(n) >= 0) continue;
+    if (e.includes(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -996,27 +1000,33 @@ function useEvalAllowedOptionsHook(useEvalExpressionHook, definition) {
     return core.useControl([]);
   }, undefined);
 }
-function useEvalDisabledHook(useEvalExpressionHook, definition) {
+function useEvalDisabledHook(useEvalExpressionHook, definition, fieldPath) {
   var dynamicDisabled = useEvalDynamicBoolHook(definition, exports.DynamicPropertyType.Disabled, useEvalExpressionHook);
-  return makeDynamicPropertyHook(dynamicDisabled, function () {
+  return makeDynamicPropertyHook(dynamicDisabled, function (ctx, _ref3) {
+    var fieldPath = _ref3.fieldPath;
     return core.useComputed(function () {
-      return isControlDisabled(definition);
+      var _dataControl$meta$nul;
+      var dataControl = fieldPath && lookupChildControl(ctx, fieldPath);
+      var setToNull = (dataControl == null || (_dataControl$meta$nul = dataControl.meta["nullControl"]) == null ? void 0 : _dataControl$meta$nul.value) === false;
+      return setToNull || isControlDisabled(definition);
     });
-  }, undefined);
+  }, {
+    fieldPath: fieldPath
+  });
 }
 function useEvalDisplayHook(useEvalExpressionHook, definition) {
   return useEvalDynamicHook(definition, exports.DynamicPropertyType.Display, useEvalExpressionHook);
 }
 function useEvalDefaultValueHook(useEvalExpressionHook, definition, schemaField, element) {
   var dynamicValue = useEvalDynamicHook(definition, exports.DynamicPropertyType.DefaultValue, useEvalExpressionHook);
-  return makeDynamicPropertyHook(dynamicValue, function (ctx, _ref3) {
-    var definition = _ref3.definition,
-      schemaField = _ref3.schemaField;
+  return makeDynamicPropertyHook(dynamicValue, function (ctx, _ref4) {
+    var definition = _ref4.definition,
+      schemaField = _ref4.schemaField;
     return core.useComputed(calcDefault);
     function calcDefault() {
-      var _ref4 = isDataControlDefinition(definition) ? [definition.required, definition.defaultValue] : [false, undefined],
-        required = _ref4[0],
-        dcv = _ref4[1];
+      var _ref5 = isDataControlDefinition(definition) ? [definition.required, definition.defaultValue] : [false, undefined],
+        required = _ref5[0],
+        dcv = _ref5[1];
       return dcv != null ? dcv : schemaField ? element ? elementValueForField(schemaField) : defaultValueForField(schemaField, required, true) : undefined;
     }
   }, {
@@ -1049,6 +1059,20 @@ function useDataMatchExpression(fvExpr, fields, data, coerce) {
     return coerce(Array.isArray(fv) ? fv.includes(fvExpr.value) : fv === fvExpr.value);
   });
 }
+function useNotEmptyExpression(fvExpr, fields, schemaInterface, data, coerce) {
+  if (coerce === void 0) {
+    coerce = function coerce(x) {
+      return x;
+    };
+  }
+  var refField = findFieldPath(fields, fvExpr.field);
+  var otherField = refField ? lookupChildControl(data, refField) : undefined;
+  return core.useCalculatedControl(function () {
+    var fv = otherField == null ? void 0 : otherField.value;
+    var field = refField == null ? void 0 : refField.at(-1);
+    return coerce(field && !schemaInterface.isEmptyValue(field, fv));
+  });
+}
 function defaultEvalHooks(expr, context, coerce) {
   switch (expr.type) {
     case exports.ExpressionType.Jsonata:
@@ -1057,6 +1081,8 @@ function defaultEvalHooks(expr, context, coerce) {
       return useDataExpression(expr, context.fields, context, coerce);
     case exports.ExpressionType.DataMatch:
       return useDataMatchExpression(expr, context.fields, context, coerce);
+    case exports.ExpressionType.NotEmpty:
+      return useNotEmptyExpression(expr, context.fields, context.schemaInterface, context, coerce);
     default:
       return core.useControl(undefined);
   }
@@ -1282,7 +1308,7 @@ function useDateValidator(dv, ctx) {
     schemaInterface = ctx.dataContext.schemaInterface;
   var comparisonDate;
   if (dv.fixedDate) {
-    comparisonDate = Date.parse(dv.fixedDate);
+    comparisonDate = schemaInterface.parseToMillis(field, dv.fixedDate);
   } else {
     var nowDate = new Date();
     comparisonDate = Date.UTC(nowDate.getFullYear(), nowDate.getMonth(), nowDate.getDate());
@@ -1295,7 +1321,7 @@ function useDateValidator(dv, ctx) {
       var selDate = schemaInterface.parseToMillis(field, v);
       var notAfter = dv.comparison === exports.DateComparison.NotAfter;
       if (notAfter ? selDate > comparisonDate : selDate < comparisonDate) {
-        return "Date must not be " + (notAfter ? "after" : "before") + " " + new Date(comparisonDate).toDateString();
+        return schemaInterface.validationMessageText(field, notAfter ? exports.ValidationMessageType.NotAfterDate : exports.ValidationMessageType.NotBeforeDate, selDate, comparisonDate);
       }
     }
     return null;
@@ -1326,6 +1352,10 @@ var DefaultSchemaInterface = /*#__PURE__*/function () {
         return "Length must be at least " + expected;
       case exports.ValidationMessageType.MaxLength:
         return "Length must be less than " + expected;
+      case exports.ValidationMessageType.NotBeforeDate:
+        return "Date must not be before " + new Date(expected).toDateString();
+      case exports.ValidationMessageType.NotAfterDate:
+        return "Date must not be after " + new Date(expected).toDateString();
       default:
         return "Unknown error";
     }
@@ -1367,7 +1397,7 @@ var DefaultSchemaInterface = /*#__PURE__*/function () {
 }();
 var defaultSchemaInterface = new DefaultSchemaInterface();
 
-var _excluded$3 = ["definition", "field", "control", "formOptions", "style", "allowedOptions", "schemaInterface"];
+var _excluded$4 = ["definition", "field", "control", "formOptions", "style", "allowedOptions", "schemaInterface"];
 var AppendAdornmentPriority = 0;
 var WrapAdornmentPriority = 1000;
 exports.LabelType = void 0;
@@ -1392,7 +1422,7 @@ function useControlRenderer(definition, fields, renderer, options) {
     defaultValueControl: useEvalDefaultValueHook(useExpr, definition, schemaField, elementIndex != null),
     visibleControl: useEvalVisibilityHook(useExpr, definition, fieldPath),
     readonlyControl: useEvalReadonlyHook(useExpr, definition),
-    disabledControl: useEvalDisabledHook(useExpr, definition),
+    disabledControl: useEvalDisabledHook(useExpr, definition, fieldPath),
     allowedOptions: useEvalAllowedOptionsHook(useExpr, definition),
     labelText: useEvalLabelText(useExpr, definition),
     actionData: useEvalActionHook(useExpr, definition),
@@ -1460,15 +1490,17 @@ function useControlRenderer(definition, fields, renderer, options) {
         control = _getControlData[1],
         controlDataContext = _getControlData[2];
       core.useControlEffect(function () {
-        return [visibility.value, defaultValueControl.value, control == null ? void 0 : control.isNull, isDataControlDefinition(definition) && definition.dontClearHidden, parentControl.isNull, _options.hidden, readonlyControl.value];
+        var _definition$renderOpt;
+        return [visibility.value, defaultValueControl.value, control == null ? void 0 : control.isNull, isDataControlDefinition(definition) && definition.dontClearHidden, isDataControlDefinition(definition) && ((_definition$renderOpt = definition.renderOptions) == null ? void 0 : _definition$renderOpt.type) == exports.DataRenderType.NullToggle, parentControl.isNull, _options.hidden, readonlyControl.value];
       }, function (_ref2) {
         var vc = _ref2[0],
           dv = _ref2[1],
           _ = _ref2[2],
           dontClear = _ref2[3],
-          parentNull = _ref2[4],
-          hidden = _ref2[5],
-          ro = _ref2[6];
+          dontDefault = _ref2[4],
+          parentNull = _ref2[5],
+          hidden = _ref2[6],
+          ro = _ref2[7];
         if (!ro) {
           if (control) {
             if (vc && vc.visible === vc.showing) {
@@ -1476,7 +1508,7 @@ function useControlRenderer(definition, fields, renderer, options) {
                 if (_options.clearHidden && !dontClear) {
                   control.value = undefined;
                 }
-              } else control.setValue(function (x) {
+              } else if (!dontDefault) control.setValue(function (x) {
                 return x != null ? x : dv;
               });
             }
@@ -1629,7 +1661,7 @@ function ControlRenderer(_ref3) {
   }
 }
 function defaultDataProps(_ref4) {
-  var _definition$validator, _allowedOptions$value, _definition$children, _definition$renderOpt;
+  var _definition$validator, _allowedOptions$value, _definition$children, _definition$renderOpt2;
   var definition = _ref4.definition,
     field = _ref4.field,
     control = _ref4.control,
@@ -1638,7 +1670,7 @@ function defaultDataProps(_ref4) {
     allowedOptions = _ref4.allowedOptions,
     _ref4$schemaInterface = _ref4.schemaInterface,
     schemaInterface = _ref4$schemaInterface === void 0 ? defaultSchemaInterface : _ref4$schemaInterface,
-    props = _objectWithoutPropertiesLoose(_ref4, _excluded$3);
+    props = _objectWithoutPropertiesLoose(_ref4, _excluded$4);
   var lengthVal = (_definition$validator = definition.validators) == null ? void 0 : _definition$validator.find(function (x) {
     return x.type === exports.ValidatorType.Length;
   });
@@ -1663,7 +1695,7 @@ function defaultDataProps(_ref4) {
       };
     }) : fieldOptions,
     readonly: !!formOptions.readonly,
-    renderOptions: (_definition$renderOpt = definition.renderOptions) != null ? _definition$renderOpt : {
+    renderOptions: (_definition$renderOpt2 = definition.renderOptions) != null ? _definition$renderOpt2 : {
       type: "Standard"
     },
     required: required,
@@ -2009,7 +2041,7 @@ var defaultTailwindTheme = {
   }
 };
 
-var _excluded$2 = ["data", "display", "className", "style"];
+var _excluded$3 = ["data", "display", "className", "style"];
 function createDefaultDisplayRenderer(options) {
   if (options === void 0) {
     options = {};
@@ -2029,7 +2061,7 @@ function DefaultDisplay(_ref) {
       display = _ref.display,
       className = _ref.className,
       style = _ref.style,
-      options = _objectWithoutPropertiesLoose(_ref, _excluded$2);
+      options = _objectWithoutPropertiesLoose(_ref, _excluded$3);
     switch (data.type) {
       case exports.DisplayDataType.Icon:
         return /*#__PURE__*/React__default["default"].createElement("i", {
@@ -2115,7 +2147,7 @@ function DefaultVisibility(_ref) {
   }
 }
 
-var _excluded$1 = ["state", "options", "className", "convert", "required", "emptyText", "requiredText", "readonly"];
+var _excluded$2 = ["state", "options", "className", "convert", "required", "emptyText", "requiredText", "readonly"];
 function createSelectRenderer(options) {
   if (options === void 0) {
     options = {};
@@ -2150,7 +2182,7 @@ function SelectDataRenderer(_ref) {
       _ref$requiredText = _ref.requiredText,
       requiredText = _ref$requiredText === void 0 ? "<please select>" : _ref$requiredText,
       readonly = _ref.readonly,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$2);
     var value = state.value,
       disabled = state.disabled;
     var _useState = React.useState(!required || value == null),
@@ -2217,7 +2249,7 @@ function DefaultDisplayOnly(_ref) {
   }
 }
 
-var _excluded = ["control", "convert"],
+var _excluded$1 = ["control", "convert"],
   _excluded2 = ["errorText", "value", "onChange"];
 function ControlInput(_ref) {
   var _effect = core.useComponentTracking();
@@ -2227,7 +2259,7 @@ function ControlInput(_ref) {
     };
     var control = _ref.control,
       convert = _ref.convert,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
     var _formControlProps = core.formControlProps(control),
       errorText = _formControlProps.errorText,
       value = _formControlProps.value,
@@ -2528,6 +2560,7 @@ function DefaultAccordion(_ref) {
   }
 }
 
+var _excluded = ["control", "field", "renderOptions"];
 function createButtonActionRenderer(actionId, options) {
   if (options === void 0) {
     options = {};
@@ -2616,6 +2649,7 @@ function createDefaultDataRenderer(options) {
   if (options === void 0) {
     options = {};
   }
+  var nullToggler = createNullToggleRenderer();
   var checkboxRenderer = createCheckboxRenderer((_options$checkOptions = options.checkOptions) != null ? _options$checkOptions : options.checkboxOptions);
   var selectRenderer = createSelectRenderer(options.selectOptions);
   var radioRenderer = createRadioRenderer((_options$radioOptions = options.radioOptions) != null ? _options$radioOptions : options.checkOptions);
@@ -2673,6 +2707,8 @@ function createDefaultDataRenderer(options) {
       return optionRenderer.render(props, renderers);
     }
     switch (renderType) {
+      case exports.DataRenderType.NullToggle:
+        return nullToggler.render(props, renderers);
       case exports.DataRenderType.CheckList:
         return checkListRenderer.render(props, renderers);
       case exports.DataRenderType.Dropdown:
@@ -2773,6 +2809,52 @@ function createDefaultLabelRenderer(options) {
     type: "label"
   };
 }
+function createNullToggleRenderer() {
+  return createDataRenderer(function (_ref7, renderers) {
+    var _control$meta, _nullControl, _control$meta$_nullCo;
+    var control = _ref7.control,
+      field = _ref7.field,
+      props = _objectWithoutPropertiesLoose(_ref7, _excluded);
+    var nullControl = (_control$meta$_nullCo = (_control$meta = control.meta)[_nullControl = "nullControl"]) != null ? _control$meta$_nullCo : _control$meta[_nullControl] = core.newControl(control.current.value != null);
+    return function (layout) {
+      var newLayout = renderers.renderData(_extends({}, props, {
+        control: nullControl,
+        field: _extends({}, field, {
+          type: exports.FieldType.Bool
+        }),
+        renderOptions: {
+          type: exports.DataRenderType.Checkbox
+        }
+      }))(layout);
+      return _extends({}, newLayout, {
+        children: /*#__PURE__*/React__default["default"].createElement(NullWrapper, {
+          control: control,
+          nullControl: nullControl,
+          children: newLayout.children,
+          defaultValue: props.definition.defaultValue
+        })
+      });
+    };
+  });
+}
+function NullWrapper(_ref8) {
+  var children = _ref8.children,
+    nullControl = _ref8.nullControl,
+    control = _ref8.control,
+    defaultValue = _ref8.defaultValue;
+  core.useControlEffect(function () {
+    return nullControl.value;
+  }, function (e) {
+    if (e) {
+      var _nullControl$meta$non;
+      control.value = (_nullControl$meta$non = nullControl.meta["nonNullValue"]) != null ? _nullControl$meta$non : defaultValue;
+    } else {
+      nullControl.meta["nonNullValue"] = control.value;
+      control.value = null;
+    }
+  });
+  return children;
+}
 function createDefaultRenderers(options) {
   if (options === void 0) {
     options = {};
@@ -3002,6 +3084,7 @@ exports.createGroupRenderer = createGroupRenderer;
 exports.createInputConversion = createInputConversion;
 exports.createLabelRenderer = createLabelRenderer;
 exports.createLayoutRenderer = createLayoutRenderer;
+exports.createNullToggleRenderer = createNullToggleRenderer;
 exports.createRadioRenderer = createRadioRenderer;
 exports.createSelectConversion = createSelectConversion;
 exports.createSelectRenderer = createSelectRenderer;