Use signal for internal state of the modal

codegouvfr · Jun 25, 2023 · 01294db · 01294db
1 parent f933915
commit 01294db
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 18 deletions.
diff --git a/src/gdpr/ConsentBannerAndConsentManagement/ConsentManagement.tsx b/src/gdpr/ConsentBannerAndConsentManagement/ConsentManagement.tsx
@@ -14,6 +14,8 @@ import {
 } from "../processConsentChanges";
 import { exclude } from "tsafe/exclude";
 import { useTranslation } from "./translation";
+import { useRerenderOnChange, createStatefulObservable } from "../../tools/StatefulObservable";
+import { useConst } from "../../tools/powerhooks/useConst";
 
 export function createConsentManagement<
     FinalityDescription extends Record<
@@ -62,23 +64,28 @@ export function createConsentManagement<
         const { processLocalConsentChange, localFinalityConsent } = (function useClosure() {
             const realFinalityConsent = useFinalityConsent();
 
-            const [localFinalityConsent, setLocalFinalityConsent] = useState<
-                FinalityConsent<ExtractFinalityFromFinalityDescription<FinalityDescription>>
-            >(() => realFinalityConsent ?? createFullDenyFinalityConsent(finalities));
+            const $localFinalityConsent = useConst(() =>
+                createStatefulObservable(
+                    () => realFinalityConsent ?? createFullDenyFinalityConsent(finalities)
+                )
+            );
+
+            useRerenderOnChange($localFinalityConsent);
 
             useEffect(() => {
                 if (realFinalityConsent === undefined) {
                     return;
                 }
-                setLocalFinalityConsent(realFinalityConsent);
+
+                $localFinalityConsent.current = realFinalityConsent;
             }, [realFinalityConsent]);
 
             const { processConsentChanges } = createProcessConsentChanges({
                 "consentCallback": undefined,
                 finalities,
-                "getFinalityConsent": () => localFinalityConsent,
+                "getFinalityConsent": () => $localFinalityConsent.current,
                 "setFinalityConsent": ({ finalityConsent }) =>
-                    setLocalFinalityConsent(finalityConsent)
+                    ($localFinalityConsent.current = finalityConsent)
             });
 
             const processLocalConsentChange: (
@@ -93,7 +100,10 @@ export function createConsentManagement<
                       }
             ) => void = processConsentChanges;
 
-            return { processLocalConsentChange, localFinalityConsent };
+            return {
+                processLocalConsentChange,
+                "localFinalityConsent": $localFinalityConsent.current
+            };
         })();
 
         const [isProcessingChanges, setIsProcessingChanges] = useState(false);
@@ -175,13 +185,21 @@ export function createConsentManagement<
                                 description={wrap.description}
                                 subFinalities={wrap.subFinalities}
                                 onChange={({ subFinality, isConsentGiven }) =>
-                                    processLocalConsentChange({
-                                        "type": "atomic change",
-                                        "finality": (subFinality === undefined
-                                            ? finality
-                                            : `${finality}.${subFinality}`) as Finality,
-                                        isConsentGiven
-                                    })
+                                    (subFinality !== undefined
+                                        ? [`${finality}.${subFinality}` as Finality]
+                                        : wrap.subFinalities === undefined
+                                        ? [finality as Finality]
+                                        : Object.keys(wrap.subFinalities).map(
+                                              subFinality =>
+                                                  `${finality}.${subFinality}` as Finality
+                                          )
+                                    ).forEach(finality =>
+                                        processLocalConsentChange({
+                                            "type": "atomic change",
+                                            finality,
+                                            isConsentGiven
+                                        })
+                                    )
                                 }
                                 finalityConsent={
                                     localFinalityConsent[
@@ -266,8 +284,6 @@ export function createConsentManagement<
             [finalityConsent]
         );
 
-        console.log("bite");
-
         const [isSubFinalityDivCollapsed, setIsSubFinalityDivCollapsed] = useState(true);
 
         return (

diff --git a/src/i18n.ts b/src/i18n.ts
@@ -72,11 +72,10 @@ export function setUseLang(params: { useLang: () => string }) {
     useLang_glob = params.useLang;
 }
 
-export function useLang(){
+export function useLang() {
     return useLang_glob();
 }
 
-
 export function createComponentI18nApi<
     ComponentName extends string,
     FrMessages extends Record<string, ReactNode | ((params: any) => ReactNode)>

diff --git a/src/tools/powerhooks/useConst.ts b/src/tools/powerhooks/useConst.ts
@@ -0,0 +1,10 @@
+import { useState } from "react";
+
+/**
+ * Compute a value on first render and never again,
+ * Equivalent of const [x] = useState(()=> ...)
+ */
+export function useConst<T>(getValue: () => T): T {
+    const [value] = useState(getValue);
+    return value;
+}