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

fix: Data map annotate step fixes #1166

Merged
merged 4 commits into from
Sep 8, 2023
Merged

fix: Data map annotate step fixes #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1d0b89
fix: Draggable fixes
josebui Sep 7, 2023
7ec5c24
fix: Only add popup if not opened
josebui Sep 7, 2023
8c20e36
fix: added missing function to popup test
josebui Sep 7, 2023
208c02f
fix: Added more deatils for drag and drop issue
josebui Sep 8, 2023
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
1 change: 1 addition & 0 deletions src/landscape/components/LandscapeSharedDataVisualization.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ test('LandscapeSharedDataVisualization: Display visualization', async () => {
setDOMContent: jest.fn().mockReturnThis(),
addTo: jest.fn().mockReturnThis(),
remove: jest.fn(),
isOpen: jest.fn(),
};
mapboxgl.Popup.mockReturnValue(Popup);
const events = {};
Expand Down
5 changes: 4 additions & 1 deletion src/sharedData/visualization/components/Visualization.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,10 @@ const MapboxLayer = props => {
if (!map || !popupData?.coordinates) {
return;
}
popup.setLngLat(popupData?.coordinates).addTo(map);
popup.setLngLat(popupData?.coordinates);
if (!popup.isOpen()) {
popup.addTo(map);
}
}, [popup, popupData?.coordinates, map]);

useEffect(() => {
Expand Down
89 changes: 56 additions & 33 deletions src/sharedData/visualization/components/VisualizationConfigForm/AnnotateStep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,27 @@ const FORM_FIELDS = [
},
];

// Work around for react-beautiful-dnd issue. The issues is that the
// Droppable component is not compatible with React.StrictMode.
// StricMode is used in the development environment by default.
// See:
// - https://stackoverflow.com/a/75807063
// - https://github.com/atlassian/react-beautiful-dnd/issues/2396
const StrictModeDroppable = ({ children, ...props }) => {
const [enabled, setEnabled] = useState(false);
useEffect(() => {
const animation = requestAnimationFrame(() => setEnabled(true));
return () => {
cancelAnimationFrame(animation);
setEnabled(false);
};
}, []);
if (!enabled) {
return null;
}
return <Droppable {...props}>{children}</Droppable>;
};

const DataPoints = props => {
const { t } = useTranslation();
const { value, onChange } = props.field;
Expand Down Expand Up @@ -167,50 +188,52 @@ const DataPoints = props => {
onDragEnd={onDragEnd}
onBeforeCapture={() => setDragging(true)}
>
<Droppable droppableId="droppable-list">
<StrictModeDroppable droppableId="droppable-list">
{provided => (
<List
aria-labelledby="data-points-description"
ref={provided.innerRef}
{...provided.droppableProps}
>
{dataPoints.map((dataPoint, index) => (
<Draggable
key={dataPoint.column}
draggableId={dataPoint.column}
index={index}
>
{(provided, snapshot) => (
<ListItem
ref={provided.innerRef}
{...provided.draggableProps}
{...provided.dragHandleProps}
>
<ListItemAvatar>
<DragHandleIcon />
</ListItemAvatar>
<OutlinedInput
inputProps={{
'aria-label': t(
'sharedData.form_step_annotate_data_points_input_label',
{
index: index + 1,
}
),
}}
fullWidth
placeholder={dataPoint.column}
value={dataPoint.label || ''}
onChange={onLabelChange(index)}
/>
</ListItem>
)}
</Draggable>
<React.Fragment key={dataPoint.column}>
<Draggable
key={dataPoint.column}
draggableId={dataPoint.column}
index={index}
>
{(provided, snapshot) => (
<ListItem
ref={provided.innerRef}
{...provided.draggableProps}
{...provided.dragHandleProps}
>
<ListItemAvatar>
<DragHandleIcon />
</ListItemAvatar>
<OutlinedInput
inputProps={{
'aria-label': t(
'sharedData.form_step_annotate_data_points_input_label',
{
index: index + 1,
}
),
}}
fullWidth
placeholder={dataPoint.column}
value={dataPoint.label || ''}
onChange={onLabelChange(index)}
/>
</ListItem>
)}
</Draggable>
</React.Fragment>
))}
{dragging && provided.placeholder}
</List>
)}
</Droppable>
</StrictModeDroppable>
</DragDropContext>
</>
);
Expand Down
Loading