@digigov/form 2.0.10 → 2.0.11

package/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Change Log - @digigov/form
 
-<!-- This log was last generated on Thu, 05 Mar 2026 17:08:26 GMT and should not be manually modified. -->
+<!-- This log was last generated on Mon, 09 Mar 2026 12:14:45 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 2.0.11
+
+Mon, 09 Mar 2026 12:14:45 GMT
+
+### Patches
+
+- feat(form): button disable conditional should depend on internal array values (cpapakon@admin.grnet.gr)
+
 ## 2.0.10
 
 Thu, 05 Mar 2026 17:08:26 GMT

package/FieldArray/FormDialog/index.js

@@ -193,7 +193,7 @@ const FormDialog = /*#__PURE__*/ react.forwardRef(({ name: fieldArrayName, contr
         color: "secondary",
         variant: customField.extra?.label.object?.addButtonVariant,
         onClick: handleAddClick,
-        disabled: customField?.editable === false || customField.extra?.editVariant === 'noinput' || fields.length >= (customField.extra?.max ?? Number.MAX_VALUE)
+        disabled: customField?.editable === false || customField.extra?.editVariant === 'noinput' || fieldArrayValues?.length >= (customField.extra?.max ?? Number.MAX_VALUE)
     }, customField.extra?.label.object?.add)));
 });
 FormDialog.displayName = 'FormDialog';

package/index.js

@@ -1,4 +1,4 @@
-/** @license Digigov v2.0.10
+/** @license Digigov v2.0.11
  *
  * This source code is licensed under the BSD-2-Clause license found in the
  * LICENSE file in the root directory of this source tree.

package/lazy.d.ts

@@ -8,12 +8,12 @@ declare const _default: {
     FieldBase: import("react").LazyExoticComponent<import("react").FC<import("./internal.js").FieldBaseProps>>;
     FieldBaseContainer: import("react").LazyExoticComponent<import("react").ForwardRefExoticComponent<import("./internal.js").FieldContainerProps & import("react").RefAttributes<HTMLFieldSetElement>>>;
     FieldConditional: import("react").LazyExoticComponent<import("react").FC<import("./internal.js").FieldConditionalProps>>;
-    FieldObject: import("react").LazyExoticComponent<import("react").FC<import("./FieldObject/index.js").FieldObjectProps>>;
     BaseFieldArray: import("react").LazyExoticComponent<import("react").ForwardRefExoticComponent<Omit<import("./FieldArray/index.js").FieldArrayProps, "reset" | "resetField" | "setValue" | "clearErrors" | "trigger" | "registerFieldFocus"> & {
         deleteConfirmation?: boolean;
     } & import("react").RefAttributes<HTMLButtonElement>>>;
     DeleteConfirmationModal: import("react").LazyExoticComponent<({ remove, close, ...props }: import("./FieldArray/DeleteConfirmationModal.js").DeleteConfirmationModalProps) => import("react").JSX.Element>;
     FieldArray: import("react").LazyExoticComponent<import("react").FC<import("./FieldArray/index.js").FieldArrayProps>>;
+    FieldObject: import("react").LazyExoticComponent<import("react").FC<import("./FieldObject/index.js").FieldObjectProps>>;
     FieldsetWithContext: import("react").LazyExoticComponent<import("react").FC<{
         name: string;
     }>>;

package/lazy.js

@@ -27,9 +27,6 @@ const src_lazy = {
     FieldConditional: lazy(()=>import("./Field/FieldConditional.js").then((module)=>({
                 default: module['FieldConditional']
             }))),
-    FieldObject: lazy(()=>import("./FieldObject/index.js").then((module)=>({
-                default: module['FieldObject']
-            }))),
     BaseFieldArray: lazy(()=>import("./FieldArray/BaseFieldArray.js").then((module)=>({
                 default: module['BaseFieldArray']
             }))),
@@ -39,6 +36,9 @@ const src_lazy = {
     FieldArray: lazy(()=>import("./FieldArray/index.js").then((module)=>({
                 default: module['FieldArray']
             }))),
+    FieldObject: lazy(()=>import("./FieldObject/index.js").then((module)=>({
+                default: module['FieldObject']
+            }))),
     FieldsetWithContext: lazy(()=>import("./Fieldset/FieldsetWithContext.js").then((module)=>({
                 default: module['FieldsetWithContext']
             }))),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digigov/form",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "@digigov form builder",
   "author": "GRNET Developers <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
@@ -15,14 +15,14 @@
     "yup": "0.32.11",
     "dayjs": "1.10.4",
     "@hookform/resolvers": "5.0.1",
-    "@digigov/react-icons": "2.0.10"
+    "@digigov/react-icons": "2.0.11"
   },
   "peerDependencies": {
     "clsx": "2.1.1",
     "react": "^18.3.0 || ^19.1.0",
     "react-dom": "^18.3.0 || ^19.1.0",
-    "@digigov/ui": "2.0.10",
-    "@digigov/react-core": "2.0.10"
+    "@digigov/ui": "2.0.11",
+    "@digigov/react-core": "2.0.11"
   },
   "gitHead": "c903a46306f77f55ad7fc4d2e274006f39a6c871",
   "private": false,

package/registry.d.ts

@@ -10,10 +10,10 @@ declare const _default: {
     '@digigov/form/Field/FieldConditional': {};
     '@digigov/form/Field': {};
     '@digigov/form/Field/types': {};
-    '@digigov/form/FieldObject': {};
     '@digigov/form/FieldArray/BaseFieldArray': {};
     '@digigov/form/FieldArray/DeleteConfirmationModal': {};
     '@digigov/form/FieldArray': {};
+    '@digigov/form/FieldObject': {};
     '@digigov/form/Fieldset/FieldsetWithContext': {};
     '@digigov/form/Fieldset': {};
     '@digigov/form/Fieldset/types': {};
@@ -49,9 +49,9 @@ declare const _default: {
     '@digigov/form/Questions/Step': {};
     '@digigov/form/Questions/Step/types': {};
     '@digigov/form/inputs/AutoCompleteInput': {};
+    '@digigov/form/inputs/DateTimeInput': {};
     '@digigov/form/inputs/Checkboxes': {};
     '@digigov/form/inputs/DateInput': {};
-    '@digigov/form/inputs/DateTimeInput': {};
     '@digigov/form/inputs/FileInput': {};
     '@digigov/form/inputs/ImageInput': {};
     '@digigov/form/inputs/Input': {};

package/registry.js

@@ -11,10 +11,10 @@ import * as __WEBPACK_EXTERNAL_MODULE__Field_FieldBase_js_c624a2e3__ from "./Fie
 import * as __WEBPACK_EXTERNAL_MODULE__Field_FieldBaseContainer_js_01a670a9__ from "./Field/FieldBaseContainer.js";
 import * as __WEBPACK_EXTERNAL_MODULE__Field_FieldConditional_js_198c9ee9__ from "./Field/FieldConditional.js";
 import * as __WEBPACK_EXTERNAL_MODULE__Field_types_js_6ef04275__ from "./Field/types.js";
-import * as __WEBPACK_EXTERNAL_MODULE__FieldObject_index_js_3053c0b3__ from "./FieldObject/index.js";
 import * as __WEBPACK_EXTERNAL_MODULE__FieldArray_BaseFieldArray_js_51879b3c__ from "./FieldArray/BaseFieldArray.js";
 import * as __WEBPACK_EXTERNAL_MODULE__FieldArray_DeleteConfirmationModal_js_c12845d4__ from "./FieldArray/DeleteConfirmationModal.js";
 import * as __WEBPACK_EXTERNAL_MODULE__FieldArray_index_js_f6888d1e__ from "./FieldArray/index.js";
+import * as __WEBPACK_EXTERNAL_MODULE__FieldObject_index_js_3053c0b3__ from "./FieldObject/index.js";
 import * as __WEBPACK_EXTERNAL_MODULE__Fieldset_FieldsetWithContext_js_aa40ade4__ from "./Fieldset/FieldsetWithContext.js";
 import * as __WEBPACK_EXTERNAL_MODULE__Fieldset_types_js_45030319__ from "./Fieldset/types.js";
 import * as __WEBPACK_EXTERNAL_MODULE__MultiplicityField_add_objects_js_bc5e12f3__ from "./MultiplicityField/add-objects.js";
@@ -48,9 +48,9 @@ import * as __WEBPACK_EXTERNAL_MODULE__Questions_Step_getAddMoreFields_js_08ef7e
 import * as __WEBPACK_EXTERNAL_MODULE__Questions_Step_index_js_a5d00e0e__ from "./Questions/Step/index.js";
 import * as __WEBPACK_EXTERNAL_MODULE__Questions_Step_types_js_adca4924__ from "./Questions/Step/types.js";
 import * as __WEBPACK_EXTERNAL_MODULE__inputs_AutoCompleteInput_index_js_64b911d2__ from "./inputs/AutoCompleteInput/index.js";
+import * as __WEBPACK_EXTERNAL_MODULE__inputs_DateTimeInput_index_js_c8900e1c__ from "./inputs/DateTimeInput/index.js";
 import * as __WEBPACK_EXTERNAL_MODULE__inputs_Checkboxes_index_js_794dd192__ from "./inputs/Checkboxes/index.js";
 import * as __WEBPACK_EXTERNAL_MODULE__inputs_DateInput_index_js_4dd00af8__ from "./inputs/DateInput/index.js";
-import * as __WEBPACK_EXTERNAL_MODULE__inputs_DateTimeInput_index_js_c8900e1c__ from "./inputs/DateTimeInput/index.js";
 import * as __WEBPACK_EXTERNAL_MODULE__inputs_FileInput_index_js_a3efab43__ from "./inputs/FileInput/index.js";
 import * as __WEBPACK_EXTERNAL_MODULE__inputs_ImageInput_index_js_db0d371d__ from "./inputs/ImageInput/index.js";
 import * as __WEBPACK_EXTERNAL_MODULE__inputs_Input_index_js_a3d24895__ from "./inputs/Input/index.js";
@@ -99,10 +99,10 @@ const registry = {
     '@digigov/form/Field/FieldConditional': lazyImport(__WEBPACK_EXTERNAL_MODULE__Field_FieldConditional_js_198c9ee9__),
     '@digigov/form/Field': lazyImport(__WEBPACK_EXTERNAL_MODULE__Field_index_js_29296f3b__),
     '@digigov/form/Field/types': lazyImport(__WEBPACK_EXTERNAL_MODULE__Field_types_js_6ef04275__),
-    '@digigov/form/FieldObject': lazyImport(__WEBPACK_EXTERNAL_MODULE__FieldObject_index_js_3053c0b3__),
     '@digigov/form/FieldArray/BaseFieldArray': lazyImport(__WEBPACK_EXTERNAL_MODULE__FieldArray_BaseFieldArray_js_51879b3c__),
     '@digigov/form/FieldArray/DeleteConfirmationModal': lazyImport(__WEBPACK_EXTERNAL_MODULE__FieldArray_DeleteConfirmationModal_js_c12845d4__),
     '@digigov/form/FieldArray': lazyImport(__WEBPACK_EXTERNAL_MODULE__FieldArray_index_js_f6888d1e__),
+    '@digigov/form/FieldObject': lazyImport(__WEBPACK_EXTERNAL_MODULE__FieldObject_index_js_3053c0b3__),
     '@digigov/form/Fieldset/FieldsetWithContext': lazyImport(__WEBPACK_EXTERNAL_MODULE__Fieldset_FieldsetWithContext_js_aa40ade4__),
     '@digigov/form/Fieldset': lazyImport(__WEBPACK_EXTERNAL_MODULE__Fieldset_index_js_3b7183e3__),
     '@digigov/form/Fieldset/types': lazyImport(__WEBPACK_EXTERNAL_MODULE__Fieldset_types_js_45030319__),
@@ -138,9 +138,9 @@ const registry = {
     '@digigov/form/Questions/Step': lazyImport(__WEBPACK_EXTERNAL_MODULE__Questions_Step_index_js_a5d00e0e__),
     '@digigov/form/Questions/Step/types': lazyImport(__WEBPACK_EXTERNAL_MODULE__Questions_Step_types_js_adca4924__),
     '@digigov/form/inputs/AutoCompleteInput': lazyImport(__WEBPACK_EXTERNAL_MODULE__inputs_AutoCompleteInput_index_js_64b911d2__),
+    '@digigov/form/inputs/DateTimeInput': lazyImport(__WEBPACK_EXTERNAL_MODULE__inputs_DateTimeInput_index_js_c8900e1c__),
     '@digigov/form/inputs/Checkboxes': lazyImport(__WEBPACK_EXTERNAL_MODULE__inputs_Checkboxes_index_js_794dd192__),
     '@digigov/form/inputs/DateInput': lazyImport(__WEBPACK_EXTERNAL_MODULE__inputs_DateInput_index_js_4dd00af8__),
-    '@digigov/form/inputs/DateTimeInput': lazyImport(__WEBPACK_EXTERNAL_MODULE__inputs_DateTimeInput_index_js_c8900e1c__),
     '@digigov/form/inputs/FileInput': lazyImport(__WEBPACK_EXTERNAL_MODULE__inputs_FileInput_index_js_a3efab43__),
     '@digigov/form/inputs/ImageInput': lazyImport(__WEBPACK_EXTERNAL_MODULE__inputs_ImageInput_index_js_db0d371d__),
     '@digigov/form/inputs/Input': lazyImport(__WEBPACK_EXTERNAL_MODULE__inputs_Input_index_js_a3d24895__),

package/src/FieldArray/FormDialog/index.tsx

@@ -289,7 +289,8 @@ export const FormDialog = React.forwardRef<HTMLButtonElement, FormDialogProps>(
                 disabled={
                   customField?.editable === false ||
                   customField.extra?.editVariant === 'noinput' ||
-                  fields.length >= (customField.extra?.max ?? Number.MAX_VALUE)
+                  fieldArrayValues?.length >=
+                    (customField.extra?.max ?? Number.MAX_VALUE)
                 }
               >
                 {customField.extra?.label.object?.add}

package/src/FieldArray/__tests__/nested-fieldset-multiplicity.spec.tsx

@@ -272,12 +272,8 @@ describe('nested_fieldset_multiplicity case from dilosi', () => {
     it(`should open the nested_multiplicity_${fieldsetType} dialog on nested "add" button click`, async () => {
       render(<TestForm />);
       openMainDialog();
-      const nestedFieldset = getNestedFieldset(fieldsetType);
-      const nestedFieldsetAddButton = within(nestedFieldset!).getByRole(
-        'button',
-        { name: 'Προσθήκη' }
-      );
-      fireEvent.click(nestedFieldsetAddButton);
+      const nestedAddButton = getNestedAddButton(fieldsetType);
+      fireEvent.click(nestedAddButton);
       expect(screen.getAllByRole('dialog').length).toBe(2);
       const inputField = screen.getByRole('textbox');
       expect(inputField).toBeInTheDocument();
@@ -306,18 +302,12 @@ describe('nested_fieldset_multiplicity case from dilosi', () => {
   it('should validate nested_multiplicity_required string field', async () => {
     render(<TestForm />);
     openMainDialog();
-    const nestedFieldset = getNestedFieldset('required');
-    const nestedFieldsetAddButton = within(nestedFieldset).getByRole('button', {
-      name: 'Προσθήκη',
-    });
-    fireEvent.click(nestedFieldsetAddButton);
+    const nestedAddButton = getNestedAddButton('required');
+    fireEvent.click(nestedAddButton);
     expect(screen.getAllByRole('dialog').length).toBe(2);
     const inputField = screen.getByRole('textbox');
     expect(inputField).toHaveProperty('name', `nested_multiplicity_required`);
-    const submitButton = screen.getAllByRole('button', {
-      name: 'Αποθήκευση',
-    })[1];
-    fireEvent.click(submitButton);
+    clickNestedSaveButton();
     await waitFor(() =>
       expect(
         screen.getByText('Το πεδίο είναι υποχρεωτικό.')
@@ -328,49 +318,17 @@ describe('nested_fieldset_multiplicity case from dilosi', () => {
   it('should submit nested_multiplicity_required item added by nested form', async () => {
     render(<TestForm />);
     openMainDialog();
-    const nestedFieldset = getNestedFieldset('required');
-    const nestedFieldsetAddButton = within(nestedFieldset).getByRole('button', {
-      name: 'Προσθήκη',
-    });
-    fireEvent.click(nestedFieldsetAddButton);
-    expect(screen.getAllByRole('dialog').length).toBe(2);
-    const nestedFieldsetInput = screen.getByRole('textbox');
-    expect(nestedFieldsetInput).toBeInTheDocument();
-    expect(nestedFieldsetInput).toHaveProperty(
-      'name',
-      `nested_multiplicity_required`
-    );
-    fireEvent.change(nestedFieldsetInput, {
-      target: { value: 'Test Value' },
-    });
-    expect(nestedFieldsetInput).toHaveValue('Test Value');
-    // There are two "Αποθήκευση" buttons, one for the nested dialog and one for the main dialog
-    const submitButton = screen.getAllByRole('button', {
-      name: 'Αποθήκευση',
-    })[1];
-    fireEvent.click(submitButton);
-    await waitFor(() => {
-      // Only one dialog should remain open (the main one)
-      expect(screen.getAllByRole('dialog').length).toBe(1);
-    });
+
+    const nestedAddButton = getNestedAddButton('required');
+    await addNestedItem(nestedAddButton, 'Test Value');
 
     expect(screen.getByText('Test Value')).toBeInTheDocument();
     expect(submitHandler).not.toHaveBeenCalled();
 
-    const mainDialogSubmitButton = screen.getByRole('button', {
-      name: 'Αποθήκευση',
-    });
-    fireEvent.click(mainDialogSubmitButton);
-    await waitFor(() => {
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-    });
+    await saveMainDialog();
     expect(screen.getByText('Test Value')).toBeInTheDocument();
-    const continueButton = screen.getByRole('button', { name: 'Συνέχεια' });
-    expect(continueButton).toBeInTheDocument();
-    fireEvent.click(continueButton);
-    await waitFor(() => {
-      expect(submitHandler).toHaveBeenCalledTimes(1);
-    });
+
+    await submitForm(submitHandler);
     expect(submitHandler).toHaveBeenCalledWith({
       nested_fieldset_multiplicity: expect.arrayContaining([
         {
@@ -386,108 +344,25 @@ describe('nested_fieldset_multiplicity case from dilosi', () => {
     openMainDialog();
 
     // Add multiple nested_multiplicity_required items
-    const requiredNestedFieldset = getNestedFieldset('required');
-    const requiredNestedFieldsetAddButton = within(
-      requiredNestedFieldset
-    ).getByRole('button', {
-      name: 'Προσθήκη',
-    });
-    fireEvent.click(requiredNestedFieldsetAddButton);
-    expect(screen.getAllByRole('dialog').length).toBe(2);
-    const requiredNestedFieldsetInput = screen.getByRole('textbox');
-    expect(requiredNestedFieldsetInput).toBeInTheDocument();
-    expect(requiredNestedFieldsetInput).toHaveProperty(
-      'name',
-      `nested_multiplicity_required`
-    );
-    fireEvent.change(requiredNestedFieldsetInput, {
-      target: { value: 'Required Test Value 1' },
-    });
-    expect(requiredNestedFieldsetInput).toHaveValue('Required Test Value 1');
-    // There are two "Αποθήκευση" buttons, one for the nested dialog and one for the main dialog
-    const requiredSubmitButton = screen.getAllByRole('button', {
-      name: 'Αποθήκευση',
-    })[1];
-    fireEvent.click(requiredSubmitButton);
-    await waitFor(() => {
-      // Only one dialog should remain open (the main one)
-      expect(screen.getAllByRole('dialog').length).toBe(1);
-    });
-
+    const requiredAddButton = getNestedAddButton('required');
+    await addNestedItem(requiredAddButton, 'Required Test Value 1');
     expect(screen.getByText('Required Test Value 1')).toBeInTheDocument();
     expect(submitHandler).not.toHaveBeenCalled();
-    // Add a second required item
-    fireEvent.click(requiredNestedFieldsetAddButton);
-    expect(screen.getAllByRole('dialog').length).toBe(2);
-    const secondRequiredNestedFieldsetInput = screen.getByRole('textbox');
-    expect(secondRequiredNestedFieldsetInput).toBeInTheDocument();
-    expect(secondRequiredNestedFieldsetInput).toHaveProperty(
-      'name',
-      `nested_multiplicity_required`
-    );
-    fireEvent.change(secondRequiredNestedFieldsetInput, {
-      target: { value: 'Required Test Value 2' },
-    });
-    expect(secondRequiredNestedFieldsetInput).toHaveValue(
-      'Required Test Value 2'
-    );
-    const secondRequiredSubmitButton = screen.getAllByRole('button', {
-      name: 'Αποθήκευση',
-    })[1];
-    fireEvent.click(secondRequiredSubmitButton);
-    await waitFor(() => {
-      // Only one dialog should remain open (the main one)
-      expect(screen.getAllByRole('dialog').length).toBe(1);
-    });
 
+    await addNestedItem(requiredAddButton, 'Required Test Value 2');
     expect(screen.getByText('Required Test Value 1')).toBeInTheDocument();
     expect(submitHandler).not.toHaveBeenCalled();
 
     // Add nested_multiplicity_optional item
-    const optionalNestedFieldset = getNestedFieldset('optional');
-    const optionalNestedFieldsetAddButton = within(
-      optionalNestedFieldset
-    ).getByRole('button', { name: 'Προσθήκη' });
-    fireEvent.click(optionalNestedFieldsetAddButton);
-    expect(screen.getAllByRole('dialog').length).toBe(2);
-    const optionalNestedFieldsetInput = screen.getByRole('textbox');
-    expect(optionalNestedFieldsetInput).toBeInTheDocument();
-    expect(optionalNestedFieldsetInput).toHaveProperty(
-      'name',
-      `nested_multiplicity_optional`
-    );
-    fireEvent.change(optionalNestedFieldsetInput, {
-      target: { value: 'Optional Test Value' },
-    });
-    expect(optionalNestedFieldsetInput).toHaveValue('Optional Test Value');
-
-    // There are two "Αποθήκευση" buttons, one for the nested dialog and one for the main dialog
-    const optionalSubmitButton = screen.getAllByRole('button', {
-      name: 'Αποθήκευση',
-    })[1];
-    fireEvent.click(optionalSubmitButton);
-    await waitFor(() => {
-      // Only one dialog should remain open (the main one)
-      expect(screen.getAllByRole('dialog').length).toBe(1);
-    });
-
+    const optionalAddButton = getNestedAddButton('optional');
+    await addNestedItem(optionalAddButton, 'Optional Test Value');
     expect(screen.getByText('Optional Test Value')).toBeInTheDocument();
     expect(submitHandler).not.toHaveBeenCalled();
 
-    const mainDialogSubmitButton = screen.getByRole('button', {
-      name: 'Αποθήκευση',
-    });
-    fireEvent.click(mainDialogSubmitButton);
-    await waitFor(() => {
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-    });
+    await saveMainDialog();
     expect(screen.getByText('Optional Test Value')).toBeInTheDocument();
-    const continueButton = screen.getByRole('button', { name: 'Συνέχεια' });
-    expect(continueButton).toBeInTheDocument();
-    fireEvent.click(continueButton);
-    await waitFor(() => {
-      expect(submitHandler).toHaveBeenCalledTimes(1);
-    });
+
+    await submitForm(submitHandler);
     expect(submitHandler).toHaveBeenCalledWith({
       nested_fieldset_multiplicity: expect.arrayContaining([
         {
@@ -501,96 +376,144 @@ describe('nested_fieldset_multiplicity case from dilosi', () => {
     });
   });
 
-  it('should submit multiple fieldset items added to main form', async () => {
+  it('should have independent nested_multiplicity_required max limits per fieldset item', async () => {
     render(<TestForm />);
+
+    // --- First nested_fieldset_multiplicity item ---
     openMainDialog();
 
-    // Add first item
-    const nestedFieldset = getNestedFieldset('required');
-    const nestedFieldsetAddButton = within(nestedFieldset).getByRole('button', {
-      name: 'Προσθήκη',
-    });
-    fireEvent.click(nestedFieldsetAddButton);
-    expect(screen.getAllByRole('dialog').length).toBe(2);
-    const nestedFieldsetInput = screen.getByRole('textbox');
-    expect(nestedFieldsetInput).toBeInTheDocument();
-    expect(nestedFieldsetInput).toHaveProperty(
-      'name',
-      `nested_multiplicity_required`
-    );
-    fireEvent.change(nestedFieldsetInput, {
-      target: { value: 'Test Value 1' },
-    });
-    expect(nestedFieldsetInput).toHaveValue('Test Value 1');
-    // There are two "Αποθήκευση" buttons, one for the nested dialog and one for the main dialog
-    const submitButton = screen.getAllByRole('button', {
-      name: 'Αποθήκευση',
-    })[1];
-    fireEvent.click(submitButton);
-    await waitFor(() => {
-      // Only one dialog should remain open (the main one)
-      expect(screen.getAllByRole('dialog').length).toBe(1);
+    const nestedAddButton = getNestedAddButton('required');
+
+    // Fill all 10 (max) nested_multiplicity_required items
+    await addNestedItems(nestedAddButton, 'Item 1', 10);
+
+    // The "add" button for nested_multiplicity_required should now be disabled (max reached)
+    expect(nestedAddButton).toBeDisabled();
+
+    // Submit first fieldset item
+    await saveMainDialog();
+
+    // --- Second nested_fieldset_multiplicity item ---
+    openMainDialog();
+
+    const nestedAddButton2 = getNestedAddButton('required', true);
+
+    // The "add" button should NOT be disabled — it's a fresh fieldset item
+    expect(nestedAddButton2).not.toBeDisabled();
+
+    // Add a nested_multiplicity_required item to verify it works
+    await addNestedItems(nestedAddButton2, 'Item 2', 1);
+    expect(screen.getByText('Item 2-1')).toBeInTheDocument();
+  });
+
+  it('should not validate nested_multiplicity_optional when empty (min 0)', async () => {
+    render(<TestForm />);
+    openMainDialog();
+
+    // Add only a required item — leave optional empty
+    const requiredAddButton = getNestedAddButton('required');
+    await addNestedItem(requiredAddButton, 'Required Value');
+
+    // Save main dialog — should succeed without optional validation error
+    await saveMainDialog();
+
+    await submitForm(submitHandler);
+    expect(submitHandler).toHaveBeenCalledWith({
+      nested_fieldset_multiplicity: expect.arrayContaining([
+        {
+          nested_multiplicity_required: ['Required Value'],
+          nested_multiplicity_optional: [],
+        },
+      ]),
     });
+  });
+
+  it('should disable nested_multiplicity_optional add button when max (10) is reached', async () => {
+    render(<TestForm />);
+    openMainDialog();
+
+    // Must add at least 1 required item to allow saving later
+    const requiredAddButton = getNestedAddButton('required');
+    await addNestedItem(requiredAddButton, 'Required Value');
+
+    const optionalAddButton = getNestedAddButton('optional');
+
+    // Fill all 10 (max) optional items
+    await addNestedItems(optionalAddButton, 'Opt', 10);
+
+    // The "add" button for nested_multiplicity_optional should now be disabled
+    expect(optionalAddButton).toBeDisabled();
+  });
+
+  it('should have independent nested_multiplicity_optional max limits per fieldset item', async () => {
+    render(<TestForm />);
+
+    // --- First nested_fieldset_multiplicity item ---
+    openMainDialog();
+
+    const requiredAddButton = getNestedAddButton('required');
+    await addNestedItem(requiredAddButton, 'Req 1');
+
+    const optionalAddButton = getNestedAddButton('optional');
+    await addNestedItems(optionalAddButton, 'Opt 1', 10);
+
+    // Max reached for optional in first fieldset item
+    expect(optionalAddButton).toBeDisabled();
+
+    await saveMainDialog();
+
+    // --- Second nested_fieldset_multiplicity item ---
+    openMainDialog();
+
+    const requiredAddButton2 = getNestedAddButton('required', true);
+    await addNestedItem(requiredAddButton2, 'Req 2');
+
+    const optionalAddButton2 = getNestedAddButton('optional', true);
+
+    // The "add" button should NOT be disabled — it's a fresh fieldset item
+    expect(optionalAddButton2).not.toBeDisabled();
+
+    await addNestedItem(optionalAddButton2, 'Opt 2-1');
+    expect(screen.getByText('Opt 2-1')).toBeInTheDocument();
+  });
+
+  it('should disable outer add button when max (5) fieldset items are reached', async () => {
+    render(<TestForm />);
+
+    // Add 5 fieldset items (the max)
+    for (let i = 1; i <= 5; i++) {
+      await addFieldsetItem(`Value ${i}`);
+    }
+
+    // The outer "Προσθήκη" button should now be disabled
+    const outerAddButton = screen.getByRole('button', { name: 'Προσθήκη' });
+    expect(outerAddButton).toBeDisabled();
+  });
+
+  it('should submit multiple fieldset items added to main form', async () => {
+    render(<TestForm />);
+
+    // Add first item
+    openMainDialog();
+    const nestedAddButton = getNestedAddButton('required');
+    await addNestedItem(nestedAddButton, 'Test Value 1');
     expect(screen.getByText('Test Value 1')).toBeInTheDocument();
     expect(submitHandler).not.toHaveBeenCalled();
 
-    // Submit first item
-    const mainDialogSubmitButton = screen.getByRole('button', {
-      name: 'Αποθήκευση',
-    });
-    fireEvent.click(mainDialogSubmitButton);
-    await waitFor(() => {
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-    });
+    await saveMainDialog();
     expect(screen.getByText('Test Value 1')).toBeInTheDocument();
 
     // Add second item
     openMainDialog();
-    const secondNestedFieldset = getNestedFieldset('required', true);
-    const secondNestedFieldsetAddButton = within(
-      secondNestedFieldset
-    ).getByRole('button', {
-      name: 'Προσθήκη',
-    });
-    fireEvent.click(secondNestedFieldsetAddButton);
-    expect(screen.getAllByRole('dialog').length).toBe(2);
-    const secondNestedFieldsetInput = screen.getByRole('textbox');
-    expect(secondNestedFieldsetInput).toBeInTheDocument();
-    expect(secondNestedFieldsetInput).toHaveProperty(
-      'name',
-      `nested_multiplicity_required`
-    );
-    fireEvent.change(secondNestedFieldsetInput, {
-      target: { value: 'Test Value 2' },
-    });
-    expect(secondNestedFieldsetInput).toHaveValue('Test Value 2');
-    // There are two "Αποθήκευση" buttons, one for the nested dialog and one for the main dialog
-    const secondSubmitButton = screen.getAllByRole('button', {
-      name: 'Αποθήκευση',
-    })[1];
-    fireEvent.click(secondSubmitButton);
-    await waitFor(() => {
-      // Only one dialog should remain open (the main one)
-      expect(screen.getAllByRole('dialog').length).toBe(1);
-    });
+    const secondNestedAddButton = getNestedAddButton('required', true);
+    await addNestedItem(secondNestedAddButton, 'Test Value 2');
     expect(screen.getByText('Test Value 2')).toBeInTheDocument();
     expect(submitHandler).not.toHaveBeenCalled();
-    // Submit second item
-    const secondMainDialogSubmitButton = screen.getByRole('button', {
-      name: 'Αποθήκευση',
-    });
-    fireEvent.click(secondMainDialogSubmitButton);
-    await waitFor(() => {
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-    });
+
+    await saveMainDialog();
     expect(screen.getByText('Test Value 2')).toBeInTheDocument();
 
-    const continueButton = screen.getByRole('button', { name: 'Συνέχεια' });
-    expect(continueButton).toBeInTheDocument();
-    fireEvent.click(continueButton);
-    await waitFor(() => {
-      expect(submitHandler).toHaveBeenCalledTimes(1);
-    });
+    await submitForm(submitHandler);
     expect(submitHandler).toHaveBeenCalledWith({
       nested_fieldset_multiplicity: expect.arrayContaining([
         {
@@ -606,6 +529,8 @@ describe('nested_fieldset_multiplicity case from dilosi', () => {
   });
 });
 
+// --- Helper functions ---
+
 function openMainDialog() {
   const addButton = screen.getByRole('button', { name: 'Προσθήκη' });
   fireEvent.click(addButton);
@@ -625,3 +550,69 @@ function getNestedFieldset(
   expect(nestedFieldset).toBeInTheDocument();
   return nestedFieldset!;
 }
+
+function getNestedAddButton(
+  type: 'required' | 'optional',
+  hasSubmittedOnce = false
+) {
+  const fieldset = getNestedFieldset(type, hasSubmittedOnce);
+  return within(fieldset).getByRole('button', { name: 'Προσθήκη' });
+}
+
+function clickNestedSaveButton() {
+  const saveBtn = screen.getAllByRole('button', { name: 'Αποθήκευση' })[1];
+  fireEvent.click(saveBtn);
+}
+
+async function addNestedItem(addButton: HTMLElement, value: string) {
+  fireEvent.click(addButton);
+  expect(screen.getAllByRole('dialog').length).toBe(2);
+  const input = screen.getByRole('textbox');
+  fireEvent.change(input, { target: { value } });
+  clickNestedSaveButton();
+  await waitFor(() => {
+    expect(screen.getAllByRole('dialog').length).toBe(1);
+  });
+}
+
+async function addNestedItems(
+  addButton: HTMLElement,
+  prefix: string,
+  count: number
+) {
+  for (let i = 1; i <= count; i++) {
+    await addNestedItem(addButton, `${prefix}-${i}`);
+  }
+}
+
+async function saveMainDialog() {
+  const saveBtn = screen.getByRole('button', { name: 'Αποθήκευση' });
+  fireEvent.click(saveBtn);
+  await waitFor(() => {
+    expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+  });
+}
+
+async function addFieldsetItem(requiredValue: string) {
+  openMainDialog();
+  // After the first submission, there are duplicate fieldset labels in the DOM.
+  // Always pick the last matching fieldset (the one inside the open dialog).
+  const requiredFieldset = screen
+    .getAllByText(/"required" μέχρι 10/)
+    .at(-1)!
+    .closest('fieldset')!;
+  const nestedAddButton = within(requiredFieldset).getByRole('button', {
+    name: 'Προσθήκη',
+  });
+  await addNestedItem(nestedAddButton, requiredValue);
+  await saveMainDialog();
+}
+
+async function submitForm(submitHandler: ReturnType<typeof vi.fn>) {
+  const continueButton = screen.getByRole('button', { name: 'Συνέχεια' });
+  expect(continueButton).toBeInTheDocument();
+  fireEvent.click(continueButton);
+  await waitFor(() => {
+    expect(submitHandler).toHaveBeenCalledTimes(1);
+  });
+}

package/src/lazy.ts

@@ -9,10 +9,10 @@ export default {
   'FieldBase': lazy(() => import('@digigov/form/Field/FieldBase').then((module) => ({ default: module['FieldBase'] }))),
   'FieldBaseContainer': lazy(() => import('@digigov/form/Field/FieldBaseContainer').then((module) => ({ default: module['FieldBaseContainer'] }))),
   'FieldConditional': lazy(() => import('@digigov/form/Field/FieldConditional').then((module) => ({ default: module['FieldConditional'] }))),
-  'FieldObject': lazy(() => import('@digigov/form/FieldObject').then((module) => ({ default: module['FieldObject'] }))),
   'BaseFieldArray': lazy(() => import('@digigov/form/FieldArray/BaseFieldArray').then((module) => ({ default: module['BaseFieldArray'] }))),
   'DeleteConfirmationModal': lazy(() => import('@digigov/form/FieldArray/DeleteConfirmationModal').then((module) => ({ default: module['DeleteConfirmationModal'] }))),
   'FieldArray': lazy(() => import('@digigov/form/FieldArray').then((module) => ({ default: module['FieldArray'] }))),
+  'FieldObject': lazy(() => import('@digigov/form/FieldObject').then((module) => ({ default: module['FieldObject'] }))),
   'FieldsetWithContext': lazy(() => import('@digigov/form/Fieldset/FieldsetWithContext').then((module) => ({ default: module['FieldsetWithContext'] }))),
   'FieldsetLabel': lazy(() => import('@digigov/form/Fieldset').then((module) => ({ default: module['FieldsetLabel'] }))),
   'FieldsetCaption': lazy(() => import('@digigov/form/Fieldset').then((module) => ({ default: module['FieldsetCaption'] }))),

package/src/registry.ts

@@ -10,10 +10,10 @@ import * as _digigov_form_Field_FieldBaseContainer from "@digigov/form/Field/Fie
 import * as _digigov_form_Field_FieldConditional from "@digigov/form/Field/FieldConditional";
 import * as _digigov_form_Field from "@digigov/form/Field";
 import * as _digigov_form_Field_types from "@digigov/form/Field/types";
-import * as _digigov_form_FieldObject from "@digigov/form/FieldObject";
 import * as _digigov_form_FieldArray_BaseFieldArray from "@digigov/form/FieldArray/BaseFieldArray";
 import * as _digigov_form_FieldArray_DeleteConfirmationModal from "@digigov/form/FieldArray/DeleteConfirmationModal";
 import * as _digigov_form_FieldArray from "@digigov/form/FieldArray";
+import * as _digigov_form_FieldObject from "@digigov/form/FieldObject";
 import * as _digigov_form_Fieldset_FieldsetWithContext from "@digigov/form/Fieldset/FieldsetWithContext";
 import * as _digigov_form_Fieldset from "@digigov/form/Fieldset";
 import * as _digigov_form_Fieldset_types from "@digigov/form/Fieldset/types";
@@ -49,9 +49,9 @@ import * as _digigov_form_Questions_Step_getAddMoreFields from "@digigov/form/Qu
 import * as _digigov_form_Questions_Step from "@digigov/form/Questions/Step";
 import * as _digigov_form_Questions_Step_types from "@digigov/form/Questions/Step/types";
 import * as _digigov_form_inputs_AutoCompleteInput from "@digigov/form/inputs/AutoCompleteInput";
+import * as _digigov_form_inputs_DateTimeInput from "@digigov/form/inputs/DateTimeInput";
 import * as _digigov_form_inputs_Checkboxes from "@digigov/form/inputs/Checkboxes";
 import * as _digigov_form_inputs_DateInput from "@digigov/form/inputs/DateInput";
-import * as _digigov_form_inputs_DateTimeInput from "@digigov/form/inputs/DateTimeInput";
 import * as _digigov_form_inputs_FileInput from "@digigov/form/inputs/FileInput";
 import * as _digigov_form_inputs_ImageInput from "@digigov/form/inputs/ImageInput";
 import * as _digigov_form_inputs_Input from "@digigov/form/inputs/Input";
@@ -109,10 +109,10 @@ export default {
   '@digigov/form/Field/FieldConditional': lazyImport(_digigov_form_Field_FieldConditional),
   '@digigov/form/Field': lazyImport(_digigov_form_Field),
   '@digigov/form/Field/types': lazyImport(_digigov_form_Field_types),
-  '@digigov/form/FieldObject': lazyImport(_digigov_form_FieldObject),
   '@digigov/form/FieldArray/BaseFieldArray': lazyImport(_digigov_form_FieldArray_BaseFieldArray),
   '@digigov/form/FieldArray/DeleteConfirmationModal': lazyImport(_digigov_form_FieldArray_DeleteConfirmationModal),
   '@digigov/form/FieldArray': lazyImport(_digigov_form_FieldArray),
+  '@digigov/form/FieldObject': lazyImport(_digigov_form_FieldObject),
   '@digigov/form/Fieldset/FieldsetWithContext': lazyImport(_digigov_form_Fieldset_FieldsetWithContext),
   '@digigov/form/Fieldset': lazyImport(_digigov_form_Fieldset),
   '@digigov/form/Fieldset/types': lazyImport(_digigov_form_Fieldset_types),
@@ -148,9 +148,9 @@ export default {
   '@digigov/form/Questions/Step': lazyImport(_digigov_form_Questions_Step),
   '@digigov/form/Questions/Step/types': lazyImport(_digigov_form_Questions_Step_types),
   '@digigov/form/inputs/AutoCompleteInput': lazyImport(_digigov_form_inputs_AutoCompleteInput),
+  '@digigov/form/inputs/DateTimeInput': lazyImport(_digigov_form_inputs_DateTimeInput),
   '@digigov/form/inputs/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
   '@digigov/form/inputs/DateInput': lazyImport(_digigov_form_inputs_DateInput),
-  '@digigov/form/inputs/DateTimeInput': lazyImport(_digigov_form_inputs_DateTimeInput),
   '@digigov/form/inputs/FileInput': lazyImport(_digigov_form_inputs_FileInput),
   '@digigov/form/inputs/ImageInput': lazyImport(_digigov_form_inputs_ImageInput),
   '@digigov/form/inputs/Input': lazyImport(_digigov_form_inputs_Input),