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

Jump to bottom

fix: ensure latest tab stays expanded when editing a point or polygon on the map in MapAndLabel #3753

Merged
merged 3 commits into from
Oct 3, 2024
Merged

fix: ensure latest tab stays expanded when editing a point or polygon on the map in MapAndLabel #3753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed04c8b
keep tabs expanded on geojson change
jessicamcinchak Oct 2, 2024
0d9d99f
Merge branch 'main' of github.com:theopensystemslab/planx-new into je…
jessicamcinchak Oct 3, 2024
214c74e
active tab matches feature being modified
jessicamcinchak Oct 3, 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
33 changes: 25 additions & 8 deletions editor.planx.uk/src/@planx/components/MapAndLabel/Public/Context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ interface MapAndLabelContextValue {
validateAndSubmitForm: () => void;
isFeatureInvalid: (index: number) => boolean;
addInitialFeaturesToMap: (features: Feature[]) => void;
editFeature: (index: number) => void;
editFeatureInForm: (index: number) => void;
copyFeature: (sourceIndex: number, destinationIndex: number) => void;
removeFeature: (index: number) => void;
mapAndLabelProps: PresentationalProps;
Expand Down Expand Up @@ -115,8 +115,26 @@ export const MapAndLabelProvider: React.FC<MapAndLabelProviderProps> = (
return;
}

addFeatureToMap(event.detail);
addFeatureToForm();
if (event.detail) {
// If the user added a feature to the map, the dispatched event will contain more features than form state
const userAddedFeature =
event.detail["EPSG:3857"].features.length >
formik.values.schemaData.length;

if (userAddedFeature) {
addFeatureToMap(event.detail);
addFeatureToForm();
} else {
const modifiedFeatures = event.detail["EPSG:3857"].features;
setFeatures(modifiedFeatures);

// If the user is editing an existing feature on the map, the modified feature aka active tab should be last item in features
const lastModifiedFeature =
event.detail["EPSG:3857"].features.slice(-1)[0];
const lastModifiedLabel = lastModifiedFeature?.properties?.label;
setActiveIndex(parseInt(lastModifiedLabel) - 1);
}
}
};

const [features, setFeatures] = useGeoJSONChange(MAP_ID, handleGeoJSONChange);
Expand Down Expand Up @@ -145,7 +163,7 @@ export const MapAndLabelProvider: React.FC<MapAndLabelProviderProps> = (
formik.handleSubmit();
};

const editFeature = (index: number) => {
const editFeatureInForm = (index: number) => {
setActiveIndex(index);
};

Expand All @@ -154,14 +172,15 @@ export const MapAndLabelProvider: React.FC<MapAndLabelProviderProps> = (

const addFeatureToMap = (geojson: GeoJSONChange) => {
resetErrors();

const newFeatures = geojson["EPSG:3857"].features;
setFeatures(newFeatures);

setActiveIndex(newFeatures.length - 1);
};

const addInitialFeaturesToMap = (features: Feature[]) => {
setFeatures(features);
// setActiveIndex(features.length - 1);
};

const addFeatureToForm = () => {
Expand All @@ -175,8 +194,6 @@ export const MapAndLabelProvider: React.FC<MapAndLabelProviderProps> = (
if (schema.max && updatedFeatures.length > schema.max) {
setMaxError(true);
}

setActiveIndex(activeIndex + 1);
};

const copyFeature = (sourceIndex: number, destinationIndex: number) => {
Expand Down Expand Up @@ -231,7 +248,7 @@ export const MapAndLabelProvider: React.FC<MapAndLabelProviderProps> = (
formik,
validateAndSubmitForm,
addInitialFeaturesToMap,
editFeature,
editFeatureInForm,
copyFeature,
removeFeature,
isFeatureInvalid,
Expand Down
4 changes: 2 additions & 2 deletions editor.planx.uk/src/@planx/components/MapAndLabel/Public/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const VerticalFeatureTabs: React.FC = () => {
activeIndex,
formik,
features,
editFeature,
editFeatureInForm,
isFeatureInvalid,
removeFeature,
} = useMapAndLabelContext();
Expand Down Expand Up @@ -92,7 +92,7 @@ const VerticalFeatureTabs: React.FC = () => {
variant="scrollable"
value={activeIndex.toString()}
onChange={(_e, newValue) => {
editFeature(parseInt(newValue, 10));
editFeatureInForm(parseInt(newValue, 10));
}}
aria-label="Select a feature to enter data"
TabIndicatorProps={{
Expand Down
Loading