From e246e1f1e2237d9f762175d229dfa339e72e6ba8 Mon Sep 17 00:00:00 2001
From: Florian <hi@florianpanchout.com>
Date: Tue, 3 Oct 2023 18:24:41 +0200
Subject: [PATCH] feat: disable next question instead of input

---
 src/components/form/Navigation.tsx | 14 ++++++++++++--
 src/components/form/Question.tsx   | 11 ++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/components/form/Navigation.tsx b/src/components/form/Navigation.tsx
index 5dc16460d..d8bb115dc 100644
--- a/src/components/form/Navigation.tsx
+++ b/src/components/form/Navigation.tsx
@@ -14,11 +14,21 @@ type Props = {
   onComplete?: () => void
 }
 
+//TODO: It should maayyybe be described in the model...
+const questionsThatCantBeZero = [
+  'transport . voiture . saisie voyageurs',
+  'logement . saisie habitants',
+  'logement . surface',
+]
+
 export default function Navigation({ question, onComplete = () => '' }: Props) {
   const { gotoPrevQuestion, gotoNextQuestion, noPrevQuestion, noNextQuestion } =
     useForm()
-  const { isMissing, setDefaultAsValue } = useRule(question)
+  const { isMissing, setDefaultAsValue, numericValue } = useRule(question)
   const [isSettingDefaultValue, setIsSettingDefaultValue] = useState(false)
+
+  const nextDisabled =
+    questionsThatCantBeZero.includes(question) && numericValue < 1
   return (
     <div className="flex justify-end  gap-4">
       {!noPrevQuestion ? (
@@ -36,7 +46,7 @@ export default function Navigation({ question, onComplete = () => '' }: Props) {
       ) : null}
       <Button
         color={isMissing ? 'secondary' : 'primary'}
-        disabled={isSettingDefaultValue}
+        disabled={isSettingDefaultValue || nextDisabled}
         onClick={async () => {
           if (isMissing) {
             trackEvent(getMatomoEventClickDontKnow(question))
diff --git a/src/components/form/Question.tsx b/src/components/form/Question.tsx
index 67392592b..8e314efad 100644
--- a/src/components/form/Question.tsx
+++ b/src/components/form/Question.tsx
@@ -12,13 +12,6 @@ type Props = {
   question: string
 }
 
-//TODO: It should maayyybe be described in the model...
-const questionsThatCantBeZero = [
-  'transport . voiture . saisie voyageurs',
-  'logement . saisie habitants',
-  'logement . surface',
-]
-
 export default function Question({ question }: Props) {
   const {
     type,
@@ -44,11 +37,11 @@ export default function Question({ question }: Props) {
             unit={unit}
             value={numericValue}
             setValue={(value) => {
-              const limit = questionsThatCantBeZero.includes(question) ? 1 : 0
+              const limit = 0
               setValue(value < limit ? limit : value, question)
             }}
             isMissing={isMissing}
-            min={questionsThatCantBeZero.includes(question) ? 1 : 0}
+            min={0}
           />
         )}
         {type === 'boolean' && (