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

package/lib/adornments/optionalAdornment.d.ts

@@ -9,6 +9,7 @@ export interface OptionalRenderProps {
     nullToggler: Control<boolean>;
     dataContext: ControlDataContext;
     options: DefaultOptionalAdornmentOptions;
+    dataControl: Control<any>;
 }
 export interface DefaultOptionalAdornmentOptions {
     className?: string;
@@ -23,10 +24,6 @@ export interface DefaultOptionalAdornmentOptions {
     customRender?: (props: OptionalRenderProps) => ReactNode;
 }
 export declare function createOptionalAdornment(options?: DefaultOptionalAdornmentOptions): AdornmentRendererRegistration;
-export declare function OptionalEditRenderer({ children, options, adornment, editing, dataControl, }: {
-    options: DefaultOptionalAdornmentOptions;
-    children: ReactNode;
-    adornment: OptionalAdornment;
-    editing: Control<boolean | undefined>;
-    dataControl: Control<any>;
+export declare function OptionalEditRenderer({ children, options, adornment, editing, renderMultiValues, allValues, nullToggler, }: OptionalRenderProps & {
+    renderMultiValues?: (allValues: Control<unknown[]>) => ReactNode;
 }): JSX.Element;

package/lib/index.cjs

@@ -763,21 +763,23 @@ function createTabsRenderer(options) {
     renderType: schemas.GroupRenderType.Tabs
   });
   function renderAllTabs(_ref, isVisible) {
+    var _tabIndex$value;
     var options = _ref.options,
       _ref$groupProps = _ref.groupProps,
       designMode = _ref$groupProps.designMode,
       formNode = _ref$groupProps.formNode,
       className = _ref$groupProps.className,
       renderChild = _ref$groupProps.renderChild,
+      state = _ref$groupProps.state,
       tabOptions = _ref.tabOptions;
-    var tabIndex = core.useControl(0);
+    var tabIndex = state.meta.fields.tabIndex.as();
     var tabClass = options.tabClass,
       labelClass = options.labelClass,
       tabListClass = options.tabListClass,
       inactiveClass = options.inactiveClass,
       activeClass = options.activeClass,
       contentClass = options.contentClass;
-    var currentTab = tabIndex.value;
+    var currentTab = (_tabIndex$value = tabIndex.value) != null ? _tabIndex$value : 0;
     return designMode ? /*#__PURE__*/jsxRuntime.jsx(jsxRuntime.Fragment, {
       children: formNode.getChildNodes().map(function (x, i) {
         return renderTabs([x], i);
@@ -1842,21 +1844,17 @@ function createOptionalAdornment(options) {
           className: options.checkClass
         }))(rl);
         schemas.wrapMarkup("children", function (children) {
-          return options.customRender ? options.customRender({
+          var props = {
             allValues: schemas.getAllValues(dataControl),
             editing: editing,
             children: children,
             adornment: adornment,
             nullToggler: nullToggler,
             dataContext: dataContext,
-            options: options
-          }) : /*#__PURE__*/jsxRuntime.jsx(OptionalEditRenderer, {
-            children: children,
             options: options,
-            editing: editing.as(),
-            adornment: adornment,
             dataControl: dataControl
-          });
+          };
+          return options.customRender ? options.customRender(props) : /*#__PURE__*/jsxRuntime.jsx(OptionalEditRenderer, _extends({}, props));
         })(rl);
       },
       priority: 0,
@@ -1869,14 +1867,18 @@ function createOptionalAdornment(options) {
 function OptionalEditRenderer(_ref2) {
   var _effect = core.useComponentTracking();
   try {
-    var _options$setNullText, _options$multiValuesT;
+    var _renderMultiValues, _options$setNullText;
     var children = _ref2.children,
       options = _ref2.options,
       adornment = _ref2.adornment,
       editing = _ref2.editing,
-      dataControl = _ref2.dataControl;
-    var nullToggler = schemas.getNullToggler(dataControl);
-    var allValues = schemas.getAllValues(dataControl);
+      renderMultiValues = _ref2.renderMultiValues,
+      allValues = _ref2.allValues,
+      nullToggler = _ref2.nullToggler;
+    (_renderMultiValues = renderMultiValues) != null ? _renderMultiValues : renderMultiValues = function renderMultiValues() {
+      var _options$multiValuesT;
+      return (_options$multiValuesT = options.multiValuesText) != null ? _options$multiValuesT : "Differing values";
+    };
     var multipleValues = allValues.value.length > 1;
     var nullEdit = adornment.allowNull ? /*#__PURE__*/jsxRuntime.jsxs("div", {
       className: options.nullWrapperClass,
@@ -1892,7 +1894,7 @@ function OptionalEditRenderer(_ref2) {
       className: options.className,
       children: multipleValues && editing.value === false ? /*#__PURE__*/jsxRuntime.jsx("div", {
         className: options.multiValuesClass,
-        children: (_options$multiValuesT = options.multiValuesText) != null ? _options$multiValuesT : "Differing values"
+        children: renderMultiValues(allValues)
       }) : /*#__PURE__*/jsxRuntime.jsxs("div", {
         className: options.childWrapperClass,
         children: [nullEdit, children]