agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-25 02:00:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16509 from overleaf/ii-rp-update-entry-positions

Browse Source 
[web] Review panel entry positions and long user names

GitOrigin-RevId: 3a596bd90bab2c87b2efae5eb812ffc5e5a1580f
This commit is contained in:
ilkin-overleaf
2024-01-18 16:26:53 +02:00
committed by Copybot
parent 73349a1b1d
commit fa314fe5b0
4 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/web/frontend/js/features/ide-react/context/review-panel/hooks/use-review-panel-state.ts
View File

@@ -1492,6 +1492,12 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
}
}, [subView])
useEffect(() => {
if (Object.keys(users).length) {
handleLayoutChange({ async: true })
}
}, [users])
const values = useMemo<ReviewPanelStateReactIde['values']>(
() => ({
collapsed,

18
services/web/frontend/js/features/source-editor/components/review-panel/entries/aggregate-change-entry.tsx
View File

@@ -119,14 +119,18 @@ function AggregateChangeEntry({
)}
</div>
<div className="rp-entry-metadata">
{formatTime(timestamp, 'MMM D, Y h:mm A')}
&nbsp;&bull;&nbsp;
<span className="rp-entry-metadata-element">
{formatTime(timestamp, 'MMM D, Y h:mm A')}
</span>
{user && (
<span
className="rp-entry-user"
style={{ color: `hsl(${user.hue}, 70%, 40%)` }}
>
{user.name ?? t('anonymous')}
<span className="rp-entry-metadata-element">
&nbsp;&bull;&nbsp;
<span
className="rp-entry-user"
style={{ color: `hsl(${user.hue}, 70%, 40%)` }}
>
{user.name ?? t('anonymous')}
</span>
</span>
)}
</div>

18
services/web/frontend/js/features/source-editor/components/review-panel/entries/change-entry.tsx
View File

@@ -117,14 +117,18 @@ function ChangeEntry({
</span>
</div>
<div className="rp-entry-metadata">
{formatTime(timestamp, 'MMM D, Y h:mm A')}
&nbsp;&bull;&nbsp;
<span className="rp-entry-metadata-element">
{formatTime(timestamp, 'MMM D, Y h:mm A')}
</span>
{user && (
<span
className="rp-entry-user"
style={{ color: `hsl(${user.hue}, 70%, 40%)` }}
>
{user.name ?? t('anonymous')}
<span className="rp-entry-metadata-element">
&nbsp;&bull;&nbsp;
<span
className="rp-entry-user"
style={{ color: `hsl(${user.hue}, 70%, 40%)` }}
>
{user.name ?? t('anonymous')}
</span>
</span>
)}
</div>

4
services/web/frontend/stylesheets/app/editor/review-panel.less
View File

@@ -469,6 +469,10 @@
font-size: @rp-small-font-size;
}
.rp-entry-metadata-element {
display: inline-block;
}
.rp-entry-user {
font-weight: @rp-semibold-weight;
font-style: normal;