@react-typed-forms/schemas 15.0.0 → 15.1.1

package/lib/index.js

@@ -1,8 +1,9 @@
 import { newControl, getElementIndex, ensureMetaValue, ControlChange, useControl, useComputed, useRefState, SubscriptionTracker, addAfterChangesCallback, trackedValue, collectChanges, useCalculatedControl, useValueChangeEffect, useValidator, useComponentTracking, useControlEffect, removeElement, RenderArrayElements, addElement } from '@react-typed-forms/core';
-import React, { useRef, useMemo, useCallback, useEffect } from 'react';
+import { useRef, useMemo, useCallback, useEffect } from 'react';
 import clsx from 'clsx';
 import jsonata from 'jsonata';
 import { v4 } from 'uuid';
+import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 
 /**
  * Enum representing the various field types.
@@ -2125,8 +2126,9 @@ class DefaultSchemaInterface {
 }
 const defaultSchemaInterface = new DefaultSchemaInterface();
 
-const _excluded = ["parentDataNode"],
-  _excluded2 = ["definition", "control", "formOptions", "style", "allowedOptions", "schemaInterface", "styleClass"];
+const _excluded = ["styleClass", "labelClass", "layoutClass"],
+  _excluded2 = ["parentDataNode"],
+  _excluded3 = ["definition", "control", "formOptions", "style", "allowedOptions", "schemaInterface", "styleClass"];
 const AppendAdornmentPriority = 0;
 const WrapAdornmentPriority = 1000;
 /**
@@ -2158,7 +2160,7 @@ function useControlRenderer(definition, fields, renderer, options = {}) {
     control,
     parentPath
   }) => {
-    return /*#__PURE__*/React.createElement(ControlRenderer, _extends({}, r.current, {
+    return /*#__PURE__*/jsx(ControlRenderer, _extends({}, r.current, {
       control: control,
       parentPath: parentPath
     }));
@@ -2274,14 +2276,14 @@ function useControlRendererComponent(controlOrFormNode, renderer, options = {},
         hiddenControl: myOptionsControl.fields.hidden,
         dataContext
       });
-      const childOptions = _extends({}, options, myOptions, {
-        elementIndex: undefined,
-        formData
+      const inheritableOptions = _objectWithoutPropertiesLoose(options, _excluded);
+      const childOptions = _extends({}, inheritableOptions, myOptions, {
+        elementIndex: undefined
       });
       useEffect(() => {
         if (control && typeof myOptions.disabled === "boolean" && control.disabled != myOptions.disabled) control.disabled = myOptions.disabled;
       }, [control, myOptions.disabled]);
-      if (parentControl.isNull) return /*#__PURE__*/React.createElement(React.Fragment, null);
+      if (parentControl.isNull) return /*#__PURE__*/jsx(Fragment, {});
       const adornments = (_definition$adornment2 = (_definition$adornment3 = definition.adornments) == null ? void 0 : _definition$adornment3.map(x => renderer.renderAdornment({
         adornment: x,
         dataContext,
@@ -2300,15 +2302,16 @@ function useControlRendererComponent(controlOrFormNode, renderer, options = {},
             {
               parentDataNode
             } = _ref,
-            renderOptions = _objectWithoutPropertiesLoose(_ref, _excluded);
+            renderOptions = _objectWithoutPropertiesLoose(_ref, _excluded2);
           const dContext = (_ref2 = parentDataNode != null ? parentDataNode : dataContext.dataNode) != null ? _ref2 : dataContext.parentNode;
-          return /*#__PURE__*/React.createElement(NewControlRenderer, {
-            key: k,
+          const allChildOptions = _extends({}, childOptions, overrideClasses, renderOptions);
+          console.log(allChildOptions, overrideClasses);
+          return /*#__PURE__*/jsx(NewControlRenderer, {
             definition: child,
             renderer: renderer,
             parentDataNode: dContext,
-            options: _extends({}, childOptions, overrideClasses, renderOptions)
-          });
+            options: allChildOptions
+          }, k);
         },
         createDataProps: dataProps,
         formOptions: myOptions,
@@ -2361,7 +2364,7 @@ function ControlRenderer({
       "": fields
     }).getSchema(""), control);
     const Render = useControlRendererComponent(definition, renderer, options, schemaDataNode);
-    return /*#__PURE__*/React.createElement(Render, null);
+    return /*#__PURE__*/jsx(Render, {});
   } finally {
     _effect();
   }
@@ -2375,7 +2378,7 @@ function NewControlRenderer({
   var _effect2 = useComponentTracking();
   try {
     const Render = useControlRendererComponent(definition, renderer, options, parentDataNode);
-    return /*#__PURE__*/React.createElement(Render, null);
+    return /*#__PURE__*/jsx(Render, {});
   } finally {
     _effect2();
   }
@@ -2391,7 +2394,7 @@ function defaultDataProps(_ref4) {
       schemaInterface = defaultSchemaInterface,
       styleClass
     } = _ref4,
-    props = _objectWithoutPropertiesLoose(_ref4, _excluded2);
+    props = _objectWithoutPropertiesLoose(_ref4, _excluded3);
   const dataNode = props.dataContext.dataNode;
   const field = dataNode.schema.field;
   const className = rendererClass(styleClass, definition.styleClass);
@@ -2534,7 +2537,9 @@ function renderControlLayout(props) {
   }
 }
 function appendMarkup(k, markup) {
-  return layout => layout[k] = /*#__PURE__*/React.createElement(React.Fragment, null, layout[k], markup);
+  return layout => layout[k] = /*#__PURE__*/jsxs(Fragment, {
+    children: [layout[k], markup]
+  });
 }
 function wrapMarkup(k, wrap) {
   return layout => layout[k] = wrap(layout[k]);
@@ -2703,15 +2708,16 @@ function applyArrayLengthRestrictions({
   };
 }
 function fieldOptionAdornment(p) {
-  return (o, i, selected) => /*#__PURE__*/React.createElement(RenderArrayElements, {
-    array: p.formNode.getChildNodes()
-  }, (cd, i) => p.renderChild(i, cd, {
-    parentDataNode: p.dataContext.parentNode,
-    formData: {
-      option: o,
-      optionSelected: selected
-    }
-  }));
+  return (o, i, selected) => /*#__PURE__*/jsx(RenderArrayElements, {
+    array: p.formNode.getChildNodes(),
+    children: (cd, i) => p.renderChild(i, cd, {
+      parentDataNode: p.dataContext.parentNode,
+      formData: {
+        option: o,
+        optionSelected: selected
+      }
+    })
+  });
 }
 
 function isIconAdornment(a) {
@@ -2784,16 +2790,17 @@ function createAdornmentRenderer(render, options) {
 }
 
 function createFormRenderer(customRenderers = [], defaultRenderers) {
-  var _customRenderers$find;
-  const dataRegistrations = customRenderers.filter(isDataRegistration);
-  const groupRegistrations = customRenderers.filter(isGroupRegistration);
-  const adornmentRegistrations = customRenderers.filter(isAdornmentRegistration);
-  const displayRegistrations = customRenderers.filter(isDisplayRegistration);
-  const labelRenderers = customRenderers.filter(isLabelRegistration);
-  const arrayRenderers = customRenderers.filter(isArrayRegistration);
-  const actionRenderers = customRenderers.filter(isActionRegistration);
-  const layoutRenderers = customRenderers.filter(isLayoutRegistration);
-  const visibilityRenderer = (_customRenderers$find = customRenderers.find(isVisibilityRegistration)) != null ? _customRenderers$find : defaultRenderers.visibility;
+  var _defaultRenderers$ext, _allRenderers$find;
+  const allRenderers = [...customRenderers, ...((_defaultRenderers$ext = defaultRenderers.extraRenderers) != null ? _defaultRenderers$ext : [])];
+  const dataRegistrations = allRenderers.filter(isDataRegistration);
+  const groupRegistrations = allRenderers.filter(isGroupRegistration);
+  const adornmentRegistrations = allRenderers.filter(isAdornmentRegistration);
+  const displayRegistrations = allRenderers.filter(isDisplayRegistration);
+  const labelRenderers = allRenderers.filter(isLabelRegistration);
+  const arrayRenderers = allRenderers.filter(isArrayRegistration);
+  const actionRenderers = allRenderers.filter(isActionRegistration);
+  const layoutRenderers = allRenderers.filter(isLayoutRegistration);
+  const visibilityRenderer = (_allRenderers$find = allRenderers.find(isVisibilityRegistration)) != null ? _allRenderers$find : defaultRenderers.visibility;
   const formRenderers = {
     renderAction,
     renderData,
@@ -2806,7 +2813,7 @@ function createFormRenderer(customRenderers = [], defaultRenderers) {
     renderVisibility,
     renderLabelText,
     renderText: defaultRenderers.renderText,
-    h: defaultRenderers.h
+    html: defaultRenderers.html
   };
   function renderVisibility(props) {
     return visibilityRenderer.render(props, formRenderers);