From ed1cddb31e2d3896ecf031b3deca5fba64578e1a Mon Sep 17 00:00:00 2001
From: Ian Jones <hello@ianjo.uk>
Date: Thu, 5 Sep 2024 16:41:14 +0100
Subject: [PATCH 1/2] feat: Full width map for list component

---
 .../@planx/components/List/Public/index.tsx   | 64 +++++++------
 .../Schema/InputFields/MapFieldInput.tsx      | 90 ++++++++++---------
 2 files changed, 83 insertions(+), 71 deletions(-)

diff --git a/editor.planx.uk/src/@planx/components/List/Public/index.tsx b/editor.planx.uk/src/@planx/components/List/Public/index.tsx
index 03a801c7c2..c676c87b58 100644
--- a/editor.planx.uk/src/@planx/components/List/Public/index.tsx
+++ b/editor.planx.uk/src/@planx/components/List/Public/index.tsx
@@ -15,6 +15,7 @@ import { PublicProps } from "@planx/components/ui";
 import { useStore } from "pages/FlowEditor/lib/store";
 import React, { useEffect, useRef } from "react";
 import { FONT_WEIGHT_SEMI_BOLD } from "theme";
+import FullWidthWrapper from "ui/public/FullWidthWrapper";
 import ErrorWrapper from "ui/shared/ErrorWrapper";
 
 import Card from "../../shared/Preview/Card";
@@ -33,6 +34,9 @@ const ListCard = styled(Box)(({ theme }) => ({
   flexDirection: "column",
   gap: theme.spacing(2),
   marginBottom: theme.spacing(2),
+  "& label, & table": {
+    maxWidth: theme.breakpoints.values.formWrap,
+  },
 }));
 
 const CardButton = styled(Button)(({ theme }) => ({
@@ -210,36 +214,38 @@ const Root = () => {
         policyRef={policyRef}
         howMeasured={howMeasured}
       />
-      <ErrorWrapper error={rootError}>
-        <>
-          {formik.values.schemaData.map((_, i) =>
-            i === activeIndex ? (
-              <ActiveListCard key={`card-${i}`} index={i} />
-            ) : (
-              <InactiveListCard key={`card-${i}`} index={i} />
-            ),
-          )}
-          {shouldShowAddAnotherButton && (
-            <ErrorWrapper
-              error={
-                errors.addItem
-                  ? `Please save all responses before adding another ${schema.type.toLowerCase()}`
-                  : ""
-              }
-            >
-              <Button
-                variant="contained"
-                color="secondary"
-                onClick={addNewItem}
-                sx={{ width: "100%" }}
-                data-testid="list-add-button"
+      <FullWidthWrapper>
+        <ErrorWrapper error={rootError}>
+          <>
+            {formik.values.schemaData.map((_, i) =>
+              i === activeIndex ? (
+                <ActiveListCard key={`card-${i}`} index={i} />
+              ) : (
+                <InactiveListCard key={`card-${i}`} index={i} />
+              ),
+            )}
+            {shouldShowAddAnotherButton && (
+              <ErrorWrapper
+                error={
+                  errors.addItem
+                    ? `Please save all responses before adding another ${schema.type.toLowerCase()}`
+                    : ""
+                }
               >
-                + Add another {schema.type.toLowerCase()}
-              </Button>
-            </ErrorWrapper>
-          )}
-        </>
-      </ErrorWrapper>
+                <Button
+                  variant="contained"
+                  color="secondary"
+                  onClick={addNewItem}
+                  sx={{ width: "100%" }}
+                  data-testid="list-add-button"
+                >
+                  + Add another {schema.type.toLowerCase()}
+                </Button>
+              </ErrorWrapper>
+            )}
+          </>
+        </ErrorWrapper>
+      </FullWidthWrapper>
     </Card>
   );
 };
diff --git a/editor.planx.uk/src/@planx/components/shared/Schema/InputFields/MapFieldInput.tsx b/editor.planx.uk/src/@planx/components/shared/Schema/InputFields/MapFieldInput.tsx
index 203a1f6ab0..765ef75489 100644
--- a/editor.planx.uk/src/@planx/components/shared/Schema/InputFields/MapFieldInput.tsx
+++ b/editor.planx.uk/src/@planx/components/shared/Schema/InputFields/MapFieldInput.tsx
@@ -1,3 +1,4 @@
+import Box from "@mui/material/Box";
 import { MapContainer } from "@planx/components/shared/Preview/MapContainer";
 import type { MapField } from "@planx/components/shared/Schema/model";
 import { Feature } from "geojson";
@@ -47,47 +48,52 @@ export const MapFieldInput: React.FC<Props<MapField>> = (props) => {
   }, [setFeatures]);
 
   return (
-    <InputLabel label={title} id={`map-label-${id}`} htmlFor={id}>
-      {description && <FieldInputDescription description={description} />}
-      <ErrorWrapper error={errorMessage} id={id}>
-        <MapContainer environment="standalone">
-          {/* @ts-ignore */}
-          <my-map
-            id={id}
-            // TODO
-            // ariaLabelOlFixedOverlay={`An interactive map for plotting and describing ${schema.type.toLocaleLowerCase()}`}
-            height={400}
-            basemap={mapOptions?.basemap}
-            drawMode
-            drawGeojsonData={
-              features &&
-              JSON.stringify({ type: "FeatureCollection", features: features })
-            }
-            drawMany={mapOptions?.drawMany}
-            drawColor={mapOptions?.drawColor}
-            drawType={mapOptions?.drawType}
-            drawPointer="crosshair"
-            zoom={20}
-            maxZoom={23}
-            latitude={Number(passport?.data?._address?.latitude)}
-            longitude={Number(passport?.data?._address?.longitude)}
-            osProxyEndpoint={`${
-              import.meta.env.VITE_APP_API_URL
-            }/proxy/ordnance-survey`}
-            osCopyright={
-              mapOptions?.basemap === "OSVectorTile"
-                ? `Basemap subject to Crown copyright and database rights ${new Date().getFullYear()} OS (0)100024857`
-                : ``
-            }
-            clipGeojsonData={
-              teamSettings?.boundaryBBox &&
-              JSON.stringify(teamSettings?.boundaryBBox)
-            }
-            mapboxAccessToken={import.meta.env.VITE_APP_MAPBOX_ACCESS_TOKEN}
-            collapseAttributions
-          />
-        </MapContainer>
-      </ErrorWrapper>
-    </InputLabel>
+    <Box sx={{ "& > label": { maxWidth: "100% !important" } }}>
+      <InputLabel label={title} id={`map-label-${id}`} htmlFor={id}>
+        {description && <FieldInputDescription description={description} />}
+        <ErrorWrapper error={errorMessage} id={id}>
+          <MapContainer environment="standalone">
+            {/* @ts-ignore */}
+            <my-map
+              id={id}
+              // TODO
+              // ariaLabelOlFixedOverlay={`An interactive map for plotting and describing ${schema.type.toLocaleLowerCase()}`}
+              height={400}
+              basemap={mapOptions?.basemap}
+              drawMode
+              drawGeojsonData={
+                features &&
+                JSON.stringify({
+                  type: "FeatureCollection",
+                  features: features,
+                })
+              }
+              drawMany={mapOptions?.drawMany}
+              drawColor={mapOptions?.drawColor}
+              drawType={mapOptions?.drawType}
+              drawPointer="crosshair"
+              zoom={20}
+              maxZoom={23}
+              latitude={Number(passport?.data?._address?.latitude)}
+              longitude={Number(passport?.data?._address?.longitude)}
+              osProxyEndpoint={`${
+                import.meta.env.VITE_APP_API_URL
+              }/proxy/ordnance-survey`}
+              osCopyright={
+                mapOptions?.basemap === "OSVectorTile"
+                  ? `Basemap subject to Crown copyright and database rights ${new Date().getFullYear()} OS (0)100024857`
+                  : ``
+              }
+              clipGeojsonData={
+                teamSettings?.boundaryBBox &&
+                JSON.stringify(teamSettings?.boundaryBBox)
+              }
+              mapboxAccessToken={import.meta.env.VITE_APP_MAPBOX_ACCESS_TOKEN}
+              collapseAttributions
+            />
+          </MapContainer>
+        </ErrorWrapper>
+      </InputLabel>
+    </Box>
   );
 };

From 11de87bb284cff8d655bdbbce6c0932596369bc9 Mon Sep 17 00:00:00 2001
From: Ian Jones <hello@ianjo.uk>
Date: Thu, 5 Sep 2024 16:54:44 +0100
Subject: [PATCH 2/2] full width only for list components with maps

---
 .../@planx/components/List/Public/index.tsx   | 71 ++++++++++---------
 1 file changed, 39 insertions(+), 32 deletions(-)

diff --git a/editor.planx.uk/src/@planx/components/List/Public/index.tsx b/editor.planx.uk/src/@planx/components/List/Public/index.tsx
index c676c87b58..87dced62e0 100644
--- a/editor.planx.uk/src/@planx/components/List/Public/index.tsx
+++ b/editor.planx.uk/src/@planx/components/List/Public/index.tsx
@@ -205,6 +205,40 @@ const Root = () => {
     );
   }
 
+  const listContent = (
+    <ErrorWrapper error={rootError}>
+      <>
+        {formik.values.schemaData.map((_, i) =>
+          i === activeIndex ? (
+            <ActiveListCard key={`card-${i}`} index={i} />
+          ) : (
+            <InactiveListCard key={`card-${i}`} index={i} />
+          ),
+        )}
+        {shouldShowAddAnotherButton && (
+          <ErrorWrapper
+            error={
+              errors.addItem
+                ? `Please save all responses before adding another ${schema.type.toLowerCase()}`
+                : ""
+            }
+          >
+            <Button
+              variant="contained"
+              color="secondary"
+              onClick={addNewItem}
+              sx={{ "@media (min-width: 768px)": { width: "100%" } }}
+              size="large"
+              data-testid="list-add-button"
+            >
+              + Add another {schema.type.toLowerCase()}
+            </Button>
+          </ErrorWrapper>
+        )}
+      </>
+    </ErrorWrapper>
+  );
+
   return (
     <Card handleSubmit={validateAndSubmitForm} isValid>
       <CardHeader
@@ -214,38 +248,11 @@ const Root = () => {
         policyRef={policyRef}
         howMeasured={howMeasured}
       />
-      <FullWidthWrapper>
-        <ErrorWrapper error={rootError}>
-          <>
-            {formik.values.schemaData.map((_, i) =>
-              i === activeIndex ? (
-                <ActiveListCard key={`card-${i}`} index={i} />
-              ) : (
-                <InactiveListCard key={`card-${i}`} index={i} />
-              ),
-            )}
-            {shouldShowAddAnotherButton && (
-              <ErrorWrapper
-                error={
-                  errors.addItem
-                    ? `Please save all responses before adding another ${schema.type.toLowerCase()}`
-                    : ""
-                }
-              >
-                <Button
-                  variant="contained"
-                  color="secondary"
-                  onClick={addNewItem}
-                  sx={{ width: "100%" }}
-                  data-testid="list-add-button"
-                >
-                  + Add another {schema.type.toLowerCase()}
-                </Button>
-              </ErrorWrapper>
-            )}
-          </>
-        </ErrorWrapper>
-      </FullWidthWrapper>
+      {hasMapField ? (
+        <FullWidthWrapper>{listContent}</FullWidthWrapper>
+      ) : (
+        listContent
+      )}
     </Card>
   );
 };