fix sticky elements

This commit is contained in:
Rodrigo Antinarelli 2020-03-16 12:34:01 -03:00 committed by James A. Petts
parent b39a96cfb2
commit bc7cf6e01d
3 changed files with 104 additions and 97 deletions

View File

@ -69,13 +69,8 @@ const StudyList = ({ studies, perPage }) => {
'h-screen': isEmptyStudies, 'h-screen': isEmptyStudies,
})} })}
> >
<div className="sticky top-0 z-10">
<Header /> <Header />
<StudyListFilter <StudyListFilter numOfStudies={numOfStudies} filtersMeta={filtersMeta} />
numOfStudies={numOfStudies}
filtersMeta={filtersMeta}
/>
</div>
<StudyListTable <StudyListTable
studies={studiesData} studies={studiesData}
numOfStudies={numOfStudies} numOfStudies={numOfStudies}

View File

@ -12,7 +12,7 @@ function Header({ appLogo = OHIFLogo(), children, t }) {
}; };
return ( return (
<div className="bg-custom-navy flex flex-row justify-between px-3 py-1 text-white"> <div className="bg-custom-navy flex flex-row justify-between px-3 py-1 text-white sticky top-0 z-10">
<div className="flex items-center"> <div className="flex items-center">
<div className="mx-3">{appLogo}</div> <div className="mx-3">{appLogo}</div>
<div>{children}</div> <div>{children}</div>

View File

@ -124,12 +124,16 @@ const StudyListFilter = ({
}; };
return ( return (
<div className="border-t-4 border-b-4 border-black"> <>
<div className="border-t-4 border-black">
<div className="bg-custom-navyDark"> <div className="bg-custom-navyDark">
<div className="container m-auto relative flex flex-col pt-5 pb-3"> <div className="container m-auto relative flex flex-col pt-5">
<div className="flex flex-row justify-between mb-5 px-12"> <div className="flex flex-row justify-between mb-5 px-12">
<div className="flex flex-row"> <div className="flex flex-row">
<Typography variant="h4" className="text-custom-aquaBright mr-6"> <Typography
variant="h4"
className="text-custom-aquaBright mr-6"
>
Study List Study List
</Typography> </Typography>
<div className="flex flex-row items-end"> <div className="flex flex-row items-end">
@ -171,11 +175,18 @@ const StudyListFilter = ({
</Typography> </Typography>
</div> </div>
</div> </div>
</div>
</div>
</div>
<div className="sticky z-10" style={{ top: 54 }}>
<div className="bg-custom-navyDark pt-3 pb-3 border-b-4 border-black">
<div className="container m-auto relative flex flex-col">
<div className="flex flex-row w-full"> <div className="flex flex-row w-full">
{filtersMeta.map( {filtersMeta.map(
({ name, displayName, inputType, isSortable, gridCol }) => { ({ name, displayName, inputType, isSortable, gridCol }) => {
return ( return (
<div <div
key={name}
className={classnames( className={classnames(
`w-${gridCol}/24`, `w-${gridCol}/24`,
'pl-4 first:pl-12' 'pl-4 first:pl-12'
@ -221,6 +232,7 @@ const StudyListFilter = ({
</div> </div>
)} )}
</div> </div>
</>
); );
}; };