fix: allow wrap section and forbid card wrapping

MTES-MCT · Dec 19, 2024 · 25a6c13 · 25a6c13
1 parent 2632789
commit 25a6c13
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/frontend/src/features/Dashboard/components/Pdf/Amps/index.tsx b/frontend/src/features/Dashboard/components/Pdf/Amps/index.tsx
@@ -15,7 +15,7 @@ export function Amps({ amps }: { amps: AMPFromAPI[] }) {
       </View>
       <View style={layoutStyle.cardWrapper}>
         {amps.map(amp => (
-          <View key={amp.id} style={areaStyle.card}>
+          <View key={amp.id} style={areaStyle.card} wrap={false}>
             <View style={areaStyle.header}>
               <Text> {getTitle(amp.name)}</Text>
             </View>

diff --git a/frontend/src/features/Dashboard/components/Pdf/Brief.tsx b/frontend/src/features/Dashboard/components/Pdf/Brief.tsx
@@ -39,13 +39,13 @@ export function Brief({ brief }: BriefProps) {
         <View style={layoutStyle.section}>
           <AreaTable amps={brief.amps} regulatoryAreas={brief.regulatoryAreas} vigilanceAreas={brief.vigilanceAreas} />
         </View>
-        <View style={layoutStyle.section} wrap={false}>
+        <View style={layoutStyle.section}>
           <RegulatoryAreas regulatoryAreas={brief.regulatoryAreas} />
         </View>
-        <View style={layoutStyle.section} wrap={false}>
+        <View style={layoutStyle.section}>
           <Amps amps={brief.amps} />
         </View>
-        <View style={layoutStyle.section} wrap={false}>
+        <View style={layoutStyle.section}>
           <VigilanceAreas
             linkedAMPs={brief.allLinkedAMPs}
             linkedRegulatoryAreas={brief.allLinkedRegulatoryAreas}

diff --git a/frontend/src/features/Dashboard/components/Pdf/RegulatoryAreas/index.tsx b/frontend/src/features/Dashboard/components/Pdf/RegulatoryAreas/index.tsx
@@ -15,7 +15,7 @@ export function RegulatoryAreas({ regulatoryAreas }: { regulatoryAreas: Regulato
       </View>
       <View style={layoutStyle.cardWrapper}>
         {regulatoryAreas.map(regulatoryArea => (
-          <View key={regulatoryArea.id} style={areaStyle.card}>
+          <View key={regulatoryArea.id} style={areaStyle.card} wrap={false}>
             <View style={areaStyle.header}>
               <Text> {getTitle(regulatoryArea.layer_name)}</Text>
             </View>

diff --git a/frontend/src/features/Dashboard/components/Pdf/Table/index.tsx b/frontend/src/features/Dashboard/components/Pdf/Table/index.tsx
@@ -79,21 +79,21 @@ export function AreaTable({
         <View style={layoutStyle.row}>
           <View style={{ flex: 1 }}>
             {regulatoryAreas.map(regulatoryArea => (
-              <Text key={regulatoryArea.id} style={styles.cell}>
+              <Text key={regulatoryArea.id} style={styles.cell} wrap={false}>
                 {regulatoryArea.entity_name || 'AUCUN NOM'}
               </Text>
             ))}
           </View>
           <View style={{ flex: 1 }}>
             {amps.map(amp => (
-              <Text key={amp.id} style={styles.cell}>
+              <Text key={amp.id} style={styles.cell} wrap={false}>
                 {amp.name}
               </Text>
             ))}
           </View>
           <View style={{ flex: 1 }}>
             {vigilanceAreas.map(vigilanceArea => (
-              <Text key={vigilanceArea.id} style={styles.cell}>
+              <Text key={vigilanceArea.id} style={styles.cell} wrap={false}>
                 {vigilanceArea.name}
               </Text>
             ))}

diff --git a/frontend/src/features/Dashboard/components/Pdf/VigilanceAreas/index.tsx b/frontend/src/features/Dashboard/components/Pdf/VigilanceAreas/index.tsx
@@ -39,7 +39,7 @@ export function VigilanceAreas({
           )
 
           return (
-            <View key={vigilanceArea.id} style={areaStyle.card}>
+            <View key={vigilanceArea.id} style={areaStyle.card} wrap={false}>
               <View style={areaStyle.header}>
                 <Text> {vigilanceArea.name}</Text>
               </View>

diff --git a/frontend/src/features/layersSelector/overlays/useClickOutsideWithNoMove.ts b/frontend/src/features/layersSelector/overlays/useClickOutsideWithNoMove.ts
@@ -76,22 +76,22 @@ export const useClickOutsideWithNoMove = (
     if (!isActive) {
       return () => {
         setTimeout(() => {
-          globalContainer.removeEventListener('mousedown', onMouseDown as any)
-          globalContainer.removeEventListener('mousemove', onMouseMove as any)
-          globalContainer.removeEventListener('mouseup', onMouseUp as any)
+          globalContainer.removeEventListener('mousedown', onMouseDown)
+          globalContainer.removeEventListener('mousemove', onMouseMove)
+          globalContainer.removeEventListener('mouseup', onMouseUp)
         }, 200)
       }
     }
 
-    globalContainer.addEventListener('mousedown', onMouseDown as any)
-    globalContainer.addEventListener('mousemove', onMouseMove as any)
-    globalContainer.addEventListener('mouseup', onMouseUp as any)
+    globalContainer.addEventListener('mousedown', onMouseDown)
+    globalContainer.addEventListener('mousemove', onMouseMove)
+    globalContainer.addEventListener('mouseup', onMouseUp)
 
     return () => {
       setTimeout(() => {
-        globalContainer.removeEventListener('mousedown', onMouseDown as any)
-        globalContainer.removeEventListener('mousemove', onMouseMove as any)
-        globalContainer.removeEventListener('mouseup', onMouseUp as any)
+        globalContainer.removeEventListener('mousedown', onMouseDown)
+        globalContainer.removeEventListener('mousemove', onMouseMove)
+        globalContainer.removeEventListener('mouseup', onMouseUp)
       }, 200)
     }
   }, [onMouseDown, onMouseMove, onMouseUp, isActive])