Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Full width map for list component #3632

Merged
merged 2 commits into from
Sep 6, 2024
Merged

feat: Full width map for list component #3632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed1cddb
feat: Full width map for list component
ianjon3s Sep 5, 2024
11de87b
full width only for list components with maps
ianjon3s Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 43 additions & 30 deletions editor.planx.uk/src/@planx/components/List/Public/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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 }) => ({
Expand Down Expand Up @@ -201,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
Expand All @@ -210,36 +248,11 @@ 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"
>
+ Add another {schema.type.toLowerCase()}
</Button>
</ErrorWrapper>
)}
</>
</ErrorWrapper>
{hasMapField ? (
<FullWidthWrapper>{listContent}</FullWidthWrapper>
) : (
listContent
)}
</Card>
);
};
Expand Down
90 changes: 48 additions & 42 deletions editor.planx.uk/src/@planx/components/shared/Schema/InputFields/MapFieldInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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>
);
};
Loading