@rsuci/shared-form-components 1.0.40 → 1.0.41

package/dist/components/form-renderer/FormRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FormRenderer.d.ts","sourceRoot":"","sources":["../../../src/components/form-renderer/FormRenderer.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAyC,MAAM,OAAO,CAAC;AAC9D,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EAIf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAmBlF;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,6BAA6B;IAC7B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,6DAA6D;IAC7D,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,yBAAyB;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAClD,oCAAoC;IACpC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,iCAAiC;IACjC,SAAS,EAAE,qBAAqB,CAAC;IACjC,wBAAwB;IACxB,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,wCAAwC;IACxC,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,iCAAiC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iCAAiC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAydD;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAgBpD,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"FormRenderer.d.ts","sourceRoot":"","sources":["../../../src/components/form-renderer/FormRenderer.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAyC,MAAM,OAAO,CAAC;AAC9D,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EAIf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAmBlF;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,6BAA6B;IAC7B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,6DAA6D;IAC7D,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,yBAAyB;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAClD,oCAAoC;IACpC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,iCAAiC;IACjC,SAAS,EAAE,qBAAqB,CAAC;IACjC,wBAAwB;IACxB,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,wCAAwC;IACxC,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,iCAAiC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iCAAiC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AA6fD;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAgBpD,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/components/form-renderer/FormRenderer.js

@@ -98,7 +98,36 @@ const FormRendererInner = () => {
     };
     // Navigation - Validation avant navigation
     const groupes = groupesWithInstances.length > 0 ? groupesWithInstances : formulaire?.groupes || [];
-    const canGoNext = validation.validateCurrentGroupRequiredFields(currentGroup, responses);
+    // Validation locale utilisant isVariableVisible du formTree
+    const validateCurrentGroupWithVisibility = useCallback(() => {
+        if (!currentGroup || !currentGroup.variables)
+            return true;
+        // Pour les groupes multiples, vérifier si toutes les instances sont complètes
+        if (currentGroup.estMultiple && currentGroup.instances) {
+            return validation.validateAllInstancesComplete(currentGroup);
+        }
+        // Pour les groupes normaux, valider uniquement les variables visibles et obligatoires
+        const requiredVariables = currentGroup.variables.filter(v => v.estObligatoire);
+        for (const variable of requiredVariables) {
+            // Vérifier si la variable est visible via le formTree
+            const isVisible = isVariableVisible(variable);
+            if (!isVisible) {
+                // Variable masquée = pas de validation
+                continue;
+            }
+            // Vérifier si la variable a une valeur
+            const responseKey = currentGroup.estMultiple && currentInstance?.numeroInstance
+                ? `${variable.code}_${currentInstance.numeroInstance}`
+                : variable.code;
+            const response = responses[responseKey];
+            const hasValue = response && response.valeur != null && response.valeur !== '';
+            if (!hasValue) {
+                return false;
+            }
+        }
+        return true;
+    }, [currentGroup, currentInstance, responses, isVariableVisible, validation]);
+    const canGoNext = validateCurrentGroupWithVisibility();
     const isFormValid = validation.validateAllGroups(groupes, responses).isValid;
     const handleNext = () => {
         if (canGoNext && !navigation.isLastGroup) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsuci/shared-form-components",
-  "version": "1.0.40",
+  "version": "1.0.41",
   "description": "Composants partagés de rendu de formulaires RSU v2 - Package local pour frontend Admin et Public",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",