@react-typed-forms/schemas 1.0.0-dev.18 → 1.0.0-dev.19

package/.rush/temp/operation/build/state.json

@@ -1,3 +1,3 @@
 {
-  "nonCachedDurationMs": 3673.904774999246
+  "nonCachedDurationMs": 3702.910748000024
 }

package/lib/controlRender.d.ts

@@ -100,27 +100,13 @@ export interface ActionRendererProps {
     visible: Visibility;
     onClick: () => void;
 }
-export declare function isScalarField(sf: SchemaField): sf is SchemaField;
-export declare function isCompoundField(sf: SchemaField): sf is CompoundField;
 export type AnySchemaFields = SchemaField | (Omit<CompoundField, "children"> & {
     children: AnySchemaFields[];
 });
-export declare function applyDefaultValues(v: {
-    [k: string]: any;
-} | undefined, fields: SchemaField[]): any;
-export declare function applyDefaultForField(v: any, field: SchemaField, parent: SchemaField[], notElement?: boolean): any;
-export declare function defaultValueForFields(fields: SchemaField[]): any;
-export declare function defaultValueForField(sf: SchemaField): any;
-export declare function elementValueForField(sf: SchemaField): any;
-export declare function findScalarField(fields: SchemaField[], field: string): SchemaField | undefined;
-export declare function findCompoundField(fields: SchemaField[], field: string): CompoundField | undefined;
-export declare function findField(fields: SchemaField[], field: string): SchemaField | undefined;
 export declare function controlTitle(title: string | undefined | null, field: SchemaField): string;
 export declare function renderControl<S extends ControlDefinition>(definition: S, formState: FormEditState, hooks: FormEditHooks, key: Key): ReactElement;
 export declare function controlForField(field: string, formState: FormEditState): Control<any>;
 export declare function fieldForControl(c: ControlDefinition): string | null | undefined;
-export declare function isDataControl(c: ControlDefinition): c is DataControlDefinition;
-export declare function isGroupControl(c: ControlDefinition): c is GroupedControlsDefinition;
 export declare const AlwaysVisible: Visibility;
 export declare function createAction(label: string, onClick: () => void, actionId?: string): ActionRendererProps;
 export declare function visitControlData<S extends ControlDefinition, A>(definition: S, { fields, data }: FormEditState, cb: (definition: DataControlDefinition, control: Control<any>) => A | undefined): A | undefined;

package/lib/hooks.d.ts

@@ -1,4 +1,4 @@
-import { ControlDefinition, DataControlDefinition, FieldOption, SchemaField } from "./types";
+import { ControlDefinition, DataControlDefinition, FieldOption, GroupedControlsDefinition, SchemaField } from "./types";
 import { DataRendererProps, FormEditHooks, FormEditState, SchemaHooks, Visibility } from "./controlRender";
 import { Control } from "@react-typed-forms/core";
 export declare function useDefaultValue(definition: DataControlDefinition, field: SchemaField, formState: FormEditState, hooks: SchemaHooks): any;
@@ -8,3 +8,4 @@ export declare function getOptionsForScalarField(field: SchemaField): FieldOptio
 export declare function createDefaultSchemaHooks(): SchemaHooks;
 export declare const defaultFormEditHooks: FormEditHooks;
 export declare function createFormEditHooks(schemaHooks: SchemaHooks): FormEditHooks;
+export declare function useControlsWithDefaults(definition: GroupedControlsDefinition, sf: SchemaField[]): GroupedControlsDefinition;

package/lib/index.js

@@ -276,54 +276,6 @@ function defaultCompoundField(field, displayName, collection) {
   };
 }
 
-function fieldHasTag(field, tag) {
-  var _field$tags;
-  return Boolean((_field$tags = field.tags) == null ? void 0 : _field$tags.includes(tag));
-}
-function fieldDisplayName(field) {
-  var _field$displayName;
-  return (_field$displayName = field.displayName) != null ? _field$displayName : field.field;
-}
-function hasOptions(o) {
-  var _o$options$length, _o$options;
-  return ((_o$options$length = (_o$options = o.options) == null ? void 0 : _o$options.length) != null ? _o$options$length : 0) > 0;
-}
-
-var _FormRendererComponentsContext = null;
-function FormRendererComponentsContext() {
-  if (!_FormRendererComponentsContext) {
-    _FormRendererComponentsContext = React.createContext(undefined);
-  }
-  return _FormRendererComponentsContext;
-}
-function FormRendererProvider(_ref) {
-  var _effect = core.useComponentTracking();
-  try {
-    var value = _ref.value,
-      children = _ref.children;
-    var _FormRendererComponen = FormRendererComponentsContext(),
-      Provider = _FormRendererComponen.Provider;
-    return /*#__PURE__*/React__default["default"].createElement(Provider, {
-      value: value,
-      children: children
-    });
-  } finally {
-    _effect();
-  }
-}
-function useFormRendererComponents() {
-  var c = React.useContext(FormRendererComponentsContext());
-  if (!c) {
-    throw "Need to use FormRendererComponentContext.Provider";
-  }
-  return c;
-}
-function isScalarField(sf) {
-  return !isCompoundField(sf);
-}
-function isCompoundField(sf) {
-  return sf.type === exports.FieldType.Compound;
-}
 function applyDefaultValues(v, fields) {
   if (!v) return defaultValueForFields(fields);
   var applyValue = fields.filter(function (x) {
@@ -377,6 +329,129 @@ function findField(fields, field) {
     return x.field === field;
   });
 }
+function isScalarField(sf) {
+  return !isCompoundField(sf);
+}
+function isCompoundField(sf) {
+  return sf.type === exports.FieldType.Compound;
+}
+function isDataControl(c) {
+  return c.type === exports.ControlDefinitionType.Data;
+}
+function isGroupControl(c) {
+  return c.type === exports.ControlDefinitionType.Group;
+}
+function fieldHasTag(field, tag) {
+  var _field$tags;
+  return Boolean((_field$tags = field.tags) == null ? void 0 : _field$tags.includes(tag));
+}
+function fieldDisplayName(field) {
+  var _field$displayName;
+  return (_field$displayName = field.displayName) != null ? _field$displayName : field.field;
+}
+function hasOptions(o) {
+  var _o$options$length, _o$options;
+  return ((_o$options$length = (_o$options = o.options) == null ? void 0 : _o$options.length) != null ? _o$options$length : 0) > 0;
+}
+function defaultControlForField(sf) {
+  if (isCompoundField(sf)) {
+    return {
+      type: exports.ControlDefinitionType.Group,
+      title: sf.displayName,
+      compoundField: sf.field,
+      groupOptions: {
+        type: exports.GroupRenderType.Grid,
+        hideTitle: false
+      },
+      children: sf.children.map(defaultControlForField)
+    };
+  } else if (isScalarField(sf)) {
+    var _sf$tags;
+    var htmlEditor = (_sf$tags = sf.tags) == null ? void 0 : _sf$tags.includes("_HtmlEditor");
+    return {
+      type: exports.ControlDefinitionType.Data,
+      title: sf.displayName,
+      field: sf.field,
+      required: sf.required,
+      renderOptions: {
+        type: htmlEditor ? exports.DataRenderType.HtmlEditor : exports.DataRenderType.Standard
+      }
+    };
+  }
+  throw "Unknown schema field";
+}
+function findReferencedControl(field, control) {
+  if (isDataControl(control) && field === control.field) return control;
+  if (isGroupControl(control)) {
+    if (control.compoundField) return field === control.compoundField ? control : undefined;
+    return findReferencedControlInArray(field, control.children);
+  }
+  return undefined;
+}
+function findReferencedControlInArray(field, controls) {
+  for (var _iterator = _createForOfIteratorHelperLoose(controls), _step; !(_step = _iterator()).done;) {
+    var c = _step.value;
+    var ref = findReferencedControl(field, c);
+    if (ref) return ref;
+  }
+  return undefined;
+}
+function addMissingControls(fields, controls) {
+  var changes = fields.flatMap(function (x) {
+    if (fieldHasTag(x, "_NoControl")) return [];
+    var existing = findReferencedControlInArray(x.field, controls);
+    if (!existing || isCompoundField(x)) return {
+      field: x,
+      existing: existing
+    };
+    return [];
+  });
+  var changedCompounds = controls.map(function (x) {
+    var ex = changes.find(function (c) {
+      return c.existing === x;
+    });
+    if (!ex) return x;
+    var cf = x;
+    return _extends({}, cf, {
+      children: addMissingControls(ex.field.children, cf.children)
+    });
+  });
+  return changedCompounds.concat(changes.filter(function (x) {
+    return !x.existing;
+  }).map(function (x) {
+    return defaultControlForField(x.field);
+  }));
+}
+
+var _FormRendererComponentsContext = null;
+function FormRendererComponentsContext() {
+  if (!_FormRendererComponentsContext) {
+    _FormRendererComponentsContext = React.createContext(undefined);
+  }
+  return _FormRendererComponentsContext;
+}
+function FormRendererProvider(_ref) {
+  var _effect = core.useComponentTracking();
+  try {
+    var value = _ref.value,
+      children = _ref.children;
+    var _FormRendererComponen = FormRendererComponentsContext(),
+      Provider = _FormRendererComponen.Provider;
+    return /*#__PURE__*/React__default["default"].createElement(Provider, {
+      value: value,
+      children: children
+    });
+  } finally {
+    _effect();
+  }
+}
+function useFormRendererComponents() {
+  var c = React.useContext(FormRendererComponentsContext());
+  if (!c) {
+    throw "Need to use FormRendererComponentContext.Provider";
+  }
+  return c;
+}
 function controlTitle(title, field) {
   return title ? title : fieldDisplayName(field);
 }
@@ -492,12 +567,6 @@ function controlForField(field, formState) {
 function fieldForControl(c) {
   return isDataControl(c) ? c.field : isGroupControl(c) ? c.compoundField : undefined;
 }
-function isDataControl(c) {
-  return c.type === exports.ControlDefinitionType.Data;
-}
-function isGroupControl(c) {
-  return c.type === exports.ControlDefinitionType.Group;
-}
 var AlwaysVisible = {
   value: true,
   canChange: false
@@ -615,8 +684,8 @@ function getDefaultScalarControlProperties(definition, field, visible, defaultVa
   };
 }
 function getOptionsForScalarField(field) {
-  var _field$options, _field$restrictions, _opts$length;
-  var opts = (_field$options = field.options) != null ? _field$options : (_field$restrictions = field.restrictions) == null ? void 0 : _field$restrictions.options;
+  var _opts$length;
+  var opts = field.options;
   if ((_opts$length = opts == null ? void 0 : opts.length) != null ? _opts$length : 0 > 0) {
     return opts;
   }
@@ -835,6 +904,13 @@ function defaultArrayRendererProps(control, field, definition, readonly, renderE
     }
   };
 }
+function useControlsWithDefaults(definition, sf) {
+  return React.useMemo(function () {
+    return definition.children.length ? definition : _extends({}, definition, {
+      children: addMissingControls(sf, [])
+    });
+  }, [sf, definition]);
+}
 
 var _excluded = ["control", "convert"],
   _excluded2 = ["errorText", "value", "onChange"],
@@ -1462,6 +1538,7 @@ exports.DefaultBoolOptions = DefaultBoolOptions;
 exports.DefaultLabelRenderer = DefaultLabelRenderer;
 exports.FormRendererProvider = FormRendererProvider;
 exports.SelectDataRenderer = SelectDataRenderer;
+exports.addMissingControls = addMissingControls;
 exports.applyDefaultForField = applyDefaultForField;
 exports.applyDefaultValues = applyDefaultValues;
 exports.boolField = boolField;
@@ -1491,6 +1568,7 @@ exports.createSelectConversion = createSelectConversion;
 exports.createSelectRenderer = createSelectRenderer;
 exports.dataControl = dataControl;
 exports.defaultCompoundField = defaultCompoundField;
+exports.defaultControlForField = defaultControlForField;
 exports.defaultFormEditHooks = defaultFormEditHooks;
 exports.defaultScalarField = defaultScalarField;
 exports.defaultTailwindTheme = defaultTailwindTheme;
@@ -1522,6 +1600,7 @@ exports.makeScalarField = makeScalarField;
 exports.renderControl = renderControl;
 exports.stringField = stringField;
 exports.stringOptionsField = stringOptionsField;
+exports.useControlsWithDefaults = useControlsWithDefaults;
 exports.useDefaultValue = useDefaultValue;
 exports.useFormRendererComponents = useFormRendererComponents;
 exports.useIsControlVisible = useIsControlVisible;