@react-typed-forms/schemas-html 4.0.0 → 4.1.0

package/lib/index.js

@@ -663,11 +663,13 @@ function createTabsRenderer(options = {}) {
       designMode,
       formNode,
       className,
-      renderChild
+      renderChild,
+      state
     },
     tabOptions
   }, isVisible) {
-    const tabIndex = useControl(0);
+    var _tabIndex$value;
+    const tabIndex = state.meta.fields.tabIndex.as();
     const {
       tabClass,
       labelClass,
@@ -676,7 +678,7 @@ function createTabsRenderer(options = {}) {
       activeClass,
       contentClass
     } = options;
-    const currentTab = tabIndex.value;
+    const currentTab = (_tabIndex$value = tabIndex.value) != null ? _tabIndex$value : 0;
     return designMode ? /*#__PURE__*/jsx(Fragment, {
       children: formNode.getChildNodes().map((x, i) => renderTabs([x], i))
     }) : renderTabs(formNode.getChildNodes().filter((x, i) => isVisible(i)), 0);
@@ -1698,21 +1700,19 @@ function createOptionalAdornment(options = {}) {
           control: editing,
           className: options.checkClass
         }))(rl);
-        wrapMarkup("children", children => options.customRender ? options.customRender({
-          allValues: getAllValues(dataControl),
-          editing,
-          children,
-          adornment,
-          nullToggler,
-          dataContext,
-          options
-        }) : /*#__PURE__*/jsx(OptionalEditRenderer, {
-          children: children,
-          options: options,
-          editing: editing.as(),
-          adornment: adornment,
-          dataControl: dataControl
-        }))(rl);
+        wrapMarkup("children", children => {
+          const props = {
+            allValues: getAllValues(dataControl),
+            editing,
+            children,
+            adornment,
+            nullToggler,
+            dataContext,
+            options,
+            dataControl
+          };
+          return options.customRender ? options.customRender(props) : /*#__PURE__*/jsx(OptionalEditRenderer, _extends({}, props));
+        })(rl);
       },
       priority: 0,
       adornment
@@ -1726,13 +1726,17 @@ function OptionalEditRenderer({
   options,
   adornment,
   editing,
-  dataControl
+  renderMultiValues,
+  allValues,
+  nullToggler
 }) {
   var _effect = useComponentTracking();
   try {
-    var _options$setNullText, _options$multiValuesT;
-    const nullToggler = getNullToggler(dataControl);
-    const allValues = getAllValues(dataControl);
+    var _renderMultiValues, _options$setNullText;
+    (_renderMultiValues = renderMultiValues) != null ? _renderMultiValues : renderMultiValues = () => {
+      var _options$multiValuesT;
+      return (_options$multiValuesT = options.multiValuesText) != null ? _options$multiValuesT : "Differing values";
+    };
     const multipleValues = allValues.value.length > 1;
     const nullEdit = adornment.allowNull ? /*#__PURE__*/jsxs("div", {
       className: options.nullWrapperClass,
@@ -1748,7 +1752,7 @@ function OptionalEditRenderer({
       className: options.className,
       children: multipleValues && editing.value === false ? /*#__PURE__*/jsx("div", {
         className: options.multiValuesClass,
-        children: (_options$multiValuesT = options.multiValuesText) != null ? _options$multiValuesT : "Differing values"
+        children: renderMultiValues(allValues)
       }) : /*#__PURE__*/jsxs("div", {
         className: options.childWrapperClass,
         children: [nullEdit, children]