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

Update ribbon error banner to a div #5187

Merged
merged 2 commits into from
Jan 11, 2024
Merged

Update ribbon error banner to a div #5187

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
9279850
Update ribbon error banner to a div
julieg18 Jan 10, 2024
f9033d3
Merge branch 'main' into turn-banner-into-div
julieg18 Jan 11, 2024
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
4 changes: 2 additions & 2 deletions webview/src/plots/components/ribbon/Errors.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ export const Errors: React.FC = () => {
}

return (
<li className={styles.errors}>
<div className={styles.errors}>
<button
className={styles.errorsButton}
onClick={() => dispatch(setShowErrorsModal(true))}
>
<Error className={styles.errorsIcon} width="16" height="16" />
{errorsTotal === 1 ? 'Show error' : `Show ${errorsTotal} errors`}
</button>
</li>
</div>
)
}
62 changes: 32 additions & 30 deletions webview/src/plots/components/ribbon/Ribbon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const Ribbon: React.FC = () => {
rootMargin: '-5px',
threshold: 0.95
})
const measurementsRef = useRef<HTMLUListElement>()
const measurementsRef = useRef<HTMLDivElement>()
const dispatch = useDispatch()

const revisions = useSelector(
Expand Down Expand Up @@ -60,43 +60,45 @@ export const Ribbon: React.FC = () => {
}, [changeRibbonHeight])

return (
<ul
<div
ref={node => {
if (node) {
measurementsRef.current = node
}
ref(node)
}}
data-testid="ribbon"
className={cx(styles.list, needsShadow && styles.withShadow)}
className={cx(styles.ribbon, needsShadow && styles.withShadow)}
>
<li className={styles.buttonWrapper}>
<IconButton onClick={addPlot} icon={Add} text="Add Plot" />
</li>
<li className={styles.buttonWrapper}>
<IconButton
onClick={selectRevisions}
icon={ListFilter}
text={`${revisions.length} of ${MAX_NB_EXP}`}
appearance="secondary"
/>
</li>
<li className={styles.buttonWrapper}>
<IconButton
onClick={refreshRevisions}
icon={Refresh}
text="Refresh All"
appearance="secondary"
/>
</li>
{revisions.map(revision => (
<RibbonBlock
revision={revision}
key={revision.id}
onClear={() => removeRevision(revision.id)}
/>
))}
<ul className={styles.list}>
<li className={styles.buttonWrapper}>
<IconButton onClick={addPlot} icon={Add} text="Add Plot" />
</li>
<li className={styles.buttonWrapper}>
<IconButton
onClick={selectRevisions}
icon={ListFilter}
text={`${revisions.length} of ${MAX_NB_EXP}`}
appearance="secondary"
/>
</li>
<li className={styles.buttonWrapper}>
<IconButton
onClick={refreshRevisions}
icon={Refresh}
text="Refresh All"
appearance="secondary"
/>
</li>
{revisions.map(revision => (
<RibbonBlock
revision={revision}
key={revision.id}
onClear={() => removeRevision(revision.id)}
/>
))}
</ul>
<Errors />
</ul>
</div>
)
}
28 changes: 16 additions & 12 deletions webview/src/plots/components/ribbon/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,26 +166,30 @@
}
}

.list {
display: flex;
.ribbon {
position: sticky;
align-items: center;
gap: 6px;
border-bottom: 1px solid $border-color;
padding: 10px 15px;
margin: 0;
flex-wrap: wrap;
top: 0;
width: 100%;
transition: box-shadow 0.25s;
z-index: 100;
top: 0;
background-color: $bg-color;
transition: box-shadow 0.25s;
border-bottom: 1px solid $border-color;
padding: 10px 15px;

&.withShadow {
box-shadow: 0 5px 8px -2px $shadow;
}
}

.list {
display: flex;
align-items: center;
gap: 6px;
margin: 0;
padding: 0;
flex-wrap: wrap;
width: 100%;
}

.buttonWrapper {
list-style: none;
}
Expand All @@ -200,7 +204,7 @@
}

.errors {
margin: 5px 0 0;
margin: 10px 0 0;
color: $error-color;
border-top: 1px solid $error-color;
border-bottom: 1px solid $error-color;
Expand Down
Loading