@react-typed-forms/schemas 11.0.3 → 11.2.0

package/lib/controlRender.d.ts

@@ -143,6 +143,7 @@ export interface DataControlProps {
     elementIndex?: number;
     allowedOptions?: Control<any[] | undefined>;
     useChildVisibility: ChildVisibilityFunc;
+    schemaInterface?: SchemaInterface;
 }
 export type CreateDataProps = (controlProps: DataControlProps) => DataRendererProps;
 export interface ControlRenderOptions extends FormContextOptions {
@@ -164,7 +165,7 @@ export declare function ControlRenderer({ definition, fields, renderer, options,
     control: Control<any>;
     parentPath?: JsonPath[];
 }): React.JSX.Element;
-export declare function defaultDataProps({ definition, field, control, formOptions, style, allowedOptions, ...props }: DataControlProps): DataRendererProps;
+export declare function defaultDataProps({ definition, field, control, formOptions, style, allowedOptions, schemaInterface, ...props }: DataControlProps): DataRendererProps;
 export declare function defaultArrayProps(arrayControl: Control<any[] | undefined | null>, field: SchemaField, required: boolean, style: CSSProperties | undefined, className: string | undefined, renderElement: (elemIndex: number) => ReactNode, min: number | undefined | null, max: number | undefined | null): ArrayRendererProps;
 export interface ChildRendererOptions {
     elementIndex?: number;
@@ -189,6 +190,7 @@ export interface RenderControlProps {
     actionDataControl?: Control<any | undefined | null>;
     useChildVisibility: ChildVisibilityFunc;
     actionOnClick?: (actionId: string, actionData: any) => () => void;
+    schemaInterface?: SchemaInterface;
 }
 export declare function renderControlLayout(props: RenderControlProps): ControlLayoutProps;
 export declare function appendMarkup(k: keyof Omit<RenderedLayout, "errorControl" | "style" | "className">, markup: ReactNode): (layout: RenderedLayout) => void;

package/lib/index.js

@@ -417,6 +417,9 @@ function useUpdatedRef(a) {
 function isControlReadonly(c) {
   return isDataControl(c) && !!c.readonly;
 }
+function isControlDisabled(c) {
+  return isDataControl(c) && !!c.disabled;
+}
 function getDisplayOnlyOptions(d) {
   return isDataControlDefinition(d) && d.renderOptions && isDisplayOnlyRenderer(d.renderOptions) ? d.renderOptions : undefined;
 }
@@ -490,17 +493,17 @@ function lookupChildControlPath(data, jsonPath) {
   var childPath = [].concat(data.path, jsonPath);
   return watchControlLookup(data.data, childPath);
 }
-function cleanDataForSchema(v, fields) {
+function cleanDataForSchema(v, fields, removeIfDefault) {
   if (!v) return v;
   var typeField = fields.find(function (x) {
     return x.isTypeField;
   });
   if (!typeField) return v;
   var typeValue = v[typeField.field];
-  var cleanableFields = fields.filter(function (x) {
+  var cleanableFields = !removeIfDefault ? fields.filter(function (x) {
     var _x$onlyForTypes$lengt, _x$onlyForTypes;
     return isCompoundField(x) || ((_x$onlyForTypes$lengt = (_x$onlyForTypes = x.onlyForTypes) == null ? void 0 : _x$onlyForTypes.length) != null ? _x$onlyForTypes$lengt : 0) > 0;
-  });
+  }) : fields;
   if (!cleanableFields.length) return v;
   var out = _extends({}, v);
   cleanableFields.forEach(function (x) {
@@ -515,15 +518,15 @@ function cleanDataForSchema(v, fields) {
       if (x.collection) {
         if (Array.isArray(childValue)) {
           out[x.field] = childValue.map(function (cv) {
-            return cleanDataForSchema(cv, childFields);
+            return cleanDataForSchema(cv, childFields, removeIfDefault);
           });
         }
       } else {
-        out[x.field] = cleanDataForSchema(childValue, childFields);
+        out[x.field] = cleanDataForSchema(childValue, childFields, removeIfDefault);
       }
     }
     function canBeNull() {
-      return x.collection && Array.isArray(childValue) && !childValue.length
+      return removeIfDefault && x.defaultValue === childValue || x.collection && Array.isArray(childValue) && !childValue.length
       //|| (x.type === FieldType.Bool && childValue === false)
       ;
     }
@@ -957,7 +960,9 @@ function useEvalAllowedOptionsHook(useEvalExpressionHook, definition) {
 function useEvalDisabledHook(useEvalExpressionHook, definition) {
   var dynamicDisabled = useEvalDynamicBoolHook(definition, exports.DynamicPropertyType.Disabled, useEvalExpressionHook);
   return makeDynamicPropertyHook(dynamicDisabled, function () {
-    return core.useControl(false);
+    return core.useComputed(function () {
+      return isControlDisabled(definition);
+    });
   }, undefined);
 }
 function useEvalDisplayHook(useEvalExpressionHook, definition) {
@@ -1245,6 +1250,10 @@ function cc(n) {
 var DefaultSchemaInterface = /*#__PURE__*/function () {
   function DefaultSchemaInterface() {}
   var _proto = DefaultSchemaInterface.prototype;
+  _proto.getOptions = function getOptions(_ref) {
+    var options = _ref.options;
+    return options && options.length > 0 ? options : null;
+  };
   _proto.isEmptyValue = function isEmptyValue(f, value) {
     if (f.collection) return Array.isArray(value) ? value.length === 0 : value == null;
     switch (f.type) {
@@ -1269,14 +1278,14 @@ var DefaultSchemaInterface = /*#__PURE__*/function () {
     return f.collection ? (_control$elements$len = (_control$elements = control.elements) == null ? void 0 : _control$elements.length) != null ? _control$elements$len : 0 : this.valueLength(f, control.value);
   };
   _proto.valueLength = function valueLength(field, value) {
-    var _ref;
-    return (_ref = value && (value == null ? void 0 : value.length)) != null ? _ref : 0;
+    var _ref2;
+    return (_ref2 = value && (value == null ? void 0 : value.length)) != null ? _ref2 : 0;
   };
   return DefaultSchemaInterface;
 }();
 var defaultSchemaInterface = new DefaultSchemaInterface();
 
-var _excluded$3 = ["definition", "field", "control", "formOptions", "style", "allowedOptions"];
+var _excluded$3 = ["definition", "field", "control", "formOptions", "style", "allowedOptions", "schemaInterface"];
 var AppendAdornmentPriority = 0;
 var WrapAdornmentPriority = 1000;
 exports.LabelType = void 0;
@@ -1436,6 +1445,7 @@ function useControlRenderer(definition, fields, renderer, options) {
         parentContext: parentDataContext,
         control: displayControl != null ? displayControl : control,
         elementIndex: _elementIndex,
+        schemaInterface: schemaInterface,
         labelText: labelText,
         field: _schemaField,
         displayControl: displayControl,
@@ -1524,20 +1534,22 @@ function ControlRenderer(_ref3) {
   }
 }
 function defaultDataProps(_ref4) {
-  var _definition$validator, _field$options$length, _field$options, _allowedOptions$value, _definition$children, _definition$renderOpt;
+  var _definition$validator, _allowedOptions$value, _definition$children, _definition$renderOpt;
   var definition = _ref4.definition,
     field = _ref4.field,
     control = _ref4.control,
     formOptions = _ref4.formOptions,
     style = _ref4.style,
     allowedOptions = _ref4.allowedOptions,
+    _ref4$schemaInterface = _ref4.schemaInterface,
+    schemaInterface = _ref4$schemaInterface === void 0 ? defaultSchemaInterface : _ref4$schemaInterface,
     props = _objectWithoutPropertiesLoose(_ref4, _excluded$3);
   var lengthVal = (_definition$validator = definition.validators) == null ? void 0 : _definition$validator.find(function (x) {
     return x.type === exports.ValidatorType.Length;
   });
   var className = cc(definition.styleClass);
   var required = !!definition.required;
-  var fieldOptions = ((_field$options$length = (_field$options = field.options) == null ? void 0 : _field$options.length) != null ? _field$options$length : 0) === 0 ? null : field.options;
+  var fieldOptions = schemaInterface.getOptions(field);
   var allowed = (_allowedOptions$value = allowedOptions == null ? void 0 : allowedOptions.value) != null ? _allowedOptions$value : [];
   return _extends({
     definition: definition,
@@ -1972,12 +1984,13 @@ function createSelectRenderer(options) {
     options = {};
   }
   return createDataRenderer(function (props, asArray) {
+    var _props$options;
     return /*#__PURE__*/React__default["default"].createElement(SelectDataRenderer, {
       className: rendererClass(props.className, options.className),
       state: props.control,
       id: props.id,
       readonly: props.readonly,
-      options: props.options,
+      options: (_props$options = props.options) != null ? _props$options : [],
       required: props.required,
       emptyText: options.emptyText,
       requiredText: options.requiredText,
@@ -2806,6 +2819,7 @@ exports.htmlDisplayControl = htmlDisplayControl;
 exports.intField = intField;
 exports.isActionControlsDefinition = isActionControlsDefinition;
 exports.isCompoundField = isCompoundField;
+exports.isControlDisabled = isControlDisabled;
 exports.isControlReadonly = isControlReadonly;
 exports.isDataControl = isDataControl;
 exports.isDataControlDefinition = isDataControlDefinition;