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: interpretations modal height (DHIS2-15558) #1549

Closed
wants to merge 10 commits into from
Closed

fix: interpretations modal height (DHIS2-15558) #1549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
28d850c
fix: set height to 100%
martinkrulltott Jul 6, 2023
ae89d7b
fix: avoid double scrollbar
martinkrulltott Jul 6, 2023
a33113d
fix: only scroll thread of messages
martinkrulltott Jul 6, 2023
c76127e
chore: merge branch 'master' into branch
martinkrulltott Jul 7, 2023
5b18126
Merge branch 'master' into fix/DHIS2-15558-interpretations-modal-height
martinkrulltott Jul 10, 2023
25546ed
Merge branch 'master' into fix/DHIS2-15558-interpretations-modal-height
martinkrulltott Aug 21, 2023
4af256d
Merge branch 'master' into fix/DHIS2-15558-interpretations-modal-height
martinkrulltott Sep 4, 2023
d9b9114
Merge branch 'master' into fix/DHIS2-15558-interpretations-modal-height
martinkrulltott Sep 14, 2023
73f3434
Merge branch 'master' into fix/DHIS2-15558-interpretations-modal-height
martinkrulltott Oct 5, 2023
3f33422
fix: use vh in height
martinkrulltott Oct 6, 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
8 changes: 5 additions & 3 deletions src/components/Interpretations/InterpretationModal/InterpretationModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,22 @@ const modalCSS = css.resolve`
max-width: calc(100vw - 128px) !important;
max-height: calc(100vh - 128px) !important;
width: auto !important;
height: auto !important;
height: calc(100vh - 128px) !important;
overflow-y: hidden;
}
aside.hidden {
display: none;
}
aside > :global(div) > :global(div) {
max-height: none;
height: 100%;
}
`

function getModalContentCSS(width) {
return css.resolve`
div {
width: ${width}px;
overflow-y: visible;
}
`
}
Expand Down Expand Up @@ -216,12 +217,14 @@ const InterpretationModal = ({
.container {
display: flex;
flex-direction: column;
height: 100%;
}

.row {
display: flex;
flex-direction: row;
gap: 16px;
height: 100%;
}

.visualisation-wrap {
Expand All @@ -233,7 +236,6 @@ const InterpretationModal = ({
padding-right: ${spacers.dp4};
flex-basis: 300px;
flex-shrink: 0;
overflow-y: auto;
}
`}</style>
</Modal>
Expand Down
81 changes: 38 additions & 43 deletions src/components/Interpretations/InterpretationModal/InterpretationThread.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,52 +33,52 @@ const InterpretationThread = ({

return (
<div className={cx('container', { fetching })}>
<div className={'scrollbox'}>
<div className={'title'}>
<IconClock16 color={colors.grey700} />
{moment(interpretation.created).format('LLL')}
</div>
{DownloadMenu && (
<DownloadMenu relativePeriodDate={interpretation.created} />
)}
<div className={'thread'}>
<Interpretation
currentUser={currentUser}
interpretation={interpretation}
onReplyIconClick={
interpretationAccess.comment
? () => focusRef.current?.focus()
: null
}
onUpdated={() => onThreadUpdated(true)}
onDeleted={onInterpretationDeleted}
isInThread={true}
/>
<div className={'comments'}>
{interpretation.comments.map((comment) => (
<Comment
key={comment.id}
comment={comment}
currentUser={currentUser}
interpretationId={interpretation.id}
onThreadUpdated={onThreadUpdated}
canComment={interpretationAccess.comment}
/>
))}
</div>
{interpretationAccess.comment && (
<CommentAddForm
<div className={'title'}>
<IconClock16 color={colors.grey700} />
{moment(interpretation.created).format('LLL')}
</div>
{DownloadMenu && (
<DownloadMenu relativePeriodDate={interpretation.created} />
)}
<div className={'thread'}>
<Interpretation
currentUser={currentUser}
interpretation={interpretation}
onReplyIconClick={
interpretationAccess.comment
? () => focusRef.current?.focus()
: null
}
onUpdated={() => onThreadUpdated(true)}
onDeleted={onInterpretationDeleted}
isInThread={true}
/>
<div className={'comments'}>
{interpretation.comments.map((comment) => (
<Comment
key={comment.id}
comment={comment}
currentUser={currentUser}
interpretationId={interpretation.id}
onSave={() => onThreadUpdated(true)}
focusRef={focusRef}
onThreadUpdated={onThreadUpdated}
canComment={interpretationAccess.comment}
/>
)}
))}
</div>
</div>
{interpretationAccess.comment && (
<CommentAddForm
currentUser={currentUser}
interpretationId={interpretation.id}
onSave={() => onThreadUpdated(true)}
focusRef={focusRef}
/>
)}
<style jsx>{`
.thread {
margin-top: var(--spacers-dp16);
overflow-y: auto;
scroll-behavior: smooth;
}

.container {
Expand Down Expand Up @@ -113,11 +113,6 @@ const InterpretationThread = ({
rotation;
}

.scrollbox {
overflow-y: auto;
scroll-behavior: smooth;
}

.title {
display: flex;
align-items: center;
Expand Down
Loading