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

deps: migrate-to-pragmatic-drag-and-drop-react-beautiful-dnd-migration #4248

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

deps: migrate-to-pragmatic-drag-and-drop-react-beautiful-dnd-migration #4248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
222 changes: 124 additions & 98 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"node": ">=18.0"
},
"dependencies": {
"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-migration": "^1.2.4",
"@greenbone/opensight-ui-components-mantinev7": "^0.0.7-alpha3",
"@mantine/core": "^7.12.1",
"@reduxjs/toolkit": "^2.4.0",
Expand Down Expand Up @@ -61,7 +62,6 @@
"moment-timezone": "^0.5.46",
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1",
"react-dom": "^18.3.1",
"react-i18next": "^15.1.3",
"react-redux": "^9.1.2",
Expand Down
3 changes: 0 additions & 3 deletions src/web/components/comment/__tests__/__snapshots__/comment.jsx.snap
View file
Open in desktop

This file was deleted.

19 changes: 7 additions & 12 deletions src/web/components/sortable/emptyrow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,18 @@ import React from 'react';

import styled from 'styled-components';

import {Droppable} from 'react-beautiful-dnd';
import {Droppable} from '@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-migration';

import PropTypes from 'web/utils/proptypes';
import {styledExcludeProps} from 'web/utils/styledConfig';

import Theme from 'web/utils/theme';

const EmptyGridRow = styledExcludeProps(styled.div, [
'active',
'isDraggingOver',
])`
const EmptyGridRow = styled.div`
margin: 8px 0px;
min-height: 50px;
display: ${props => (props.active ? 'flex' : 'none')};
display: ${props => (props.$active ? 'flex' : 'none')};
border: 1px dashed ${Theme.lightGray};
background: ${props => (props.isDraggingOver ? Theme.lightBlue : 'none')};
background: ${props => (props.$isDraggingOver ? Theme.lightBlue : 'none')};
height: ${props => props.height}px;
`;

Expand All @@ -31,10 +27,10 @@ const EmptyRow = ({children, active = false, height}) => (
{(provided, snapshot) => (
<EmptyGridRow
data-testid="empty-grid-row"
active={active}
$active={active}
height={height}
ref={provided.innerRef}
isDraggingOver={snapshot.isDraggingOver}
$isDraggingOver={snapshot.isDraggingOver}
>
{children}
{provided.placeholder}
Expand All @@ -44,10 +40,9 @@ const EmptyRow = ({children, active = false, height}) => (
);

EmptyRow.propTypes = {
children: PropTypes.node,
active: PropTypes.bool,
height: PropTypes.number.isRequired,
};

export default EmptyRow;

// vim: set ts=2 sw=2 tw=80:
Loading
Loading