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

[MPDX-7717] Prevent contact details drawer from overlapping task list #768

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+9 −13
Draft

[MPDX-7717] Prevent contact details drawer from overlapping task list #768

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
f303f52
Make assignee text consistent when small
canac May 24, 2023
5e00709
Prevent contact details drawer from overlapping task list
canac May 24, 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
9 changes: 7 additions & 2 deletions pages/accountLists/[accountListId]/tasks/[[...contactId]].page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,8 @@ const TasksPage: React.FC = () => {
);
//#endregion

const contactDetailsWidth = 'max(50%, 530px)';

//#region JSX
return (
<>
Expand Down Expand Up @@ -365,11 +367,14 @@ const TasksPage: React.FC = () => {
))}
</TaskCurrentHistoryButtonGroup>
<InfiniteList
data-foo="bar"
loading={loading}
data={data?.tasks.nodes}
style={{
height: `calc(100vh - ${navBarHeight} - ${headerHeight} - ${buttonBarHeight})`,
width: contactDetailsOpen
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When on smaller devices you can't select other tasks as they're covered up.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good point. I just met with Scott in a call, and he said that we should hold off on this until some more design works happens to figure out what to display on smaller screens.

? `calc(100% - ${contactDetailsWidth})`
: undefined,
overflowX: 'hidden',
}}
itemContent={(index, task) => (
<Box key={index} flexDirection="row" width="100%">
Expand Down Expand Up @@ -448,7 +453,7 @@ const TasksPage: React.FC = () => {
) : undefined
}
rightOpen={contactDetailsOpen}
rightWidth="60%"
rightWidth={contactDetailsWidth}
headerHeight={headerHeight}
/>
</WhiteBackground>
Expand Down
13 changes: 2 additions & 11 deletions src/components/Task/TaskRow/TaskRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
import React from 'react';
import {
Box,
Button,
Checkbox,
Hidden,
Tooltip,
Typography,
} from '@mui/material';
import { Box, Checkbox, Hidden, Tooltip, Typography } from '@mui/material';
import { styled } from '@mui/material/styles';
import { useTranslation } from 'react-i18next';
import { DateTime } from 'luxon';
Expand Down Expand Up @@ -228,9 +221,7 @@ export const TaskRow: React.FC<TaskRowProps> = ({
))}
</Box>
<Hidden smUp>
<Button>
<ContactText>{assigneeName}</ContactText>
</Button>
<ContactText>{assigneeName}</ContactText>
</Hidden>
</Box>
</Box>
Expand Down