Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
ee2c3cc
Suggest mode 6/7: review UI (Apply / Reject sidebar and summary)
adamsilverstein Jul 17, 2026
c3aedd3
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 5, 2026
193c2e8
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 11, 2026
ecd1cff
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 11, 2026
c7fa55f
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 12, 2026
c7fce01
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 12, 2026
e303a85
Drop dependency-group comment blocks flagged by the new lint rule
adamsilverstein Aug 12, 2026
2ed31b7
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 22, 2026
c9ec6de
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 23, 2026
65d1931
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 23, 2026
cf63539
Convert suggest review UI to TypeScript
adamsilverstein Aug 23, 2026
e8488e1
Merge remote-tracking branch 'origin/trunk' into suggest/review-ui
adamsilverstein Aug 24, 2026
7023891
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 24, 2026
19e3c2c
Merge remote-tracking branch 'origin/trunk' into suggest/review-ui
adamsilverstein Aug 24, 2026
81cc24c
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 24, 2026
89b2bf6
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 24, 2026
e3e6fa2
Merge branch 'relocate/inline-ops' into relocate/review-ui
adamsilverstein Aug 25, 2026
2263ab1
Move the review UI fixes into the review UI layer
adamsilverstein Aug 25, 2026
9509bff
Merge suggest/inline-ops into suggest/review-ui
adamsilverstein Aug 25, 2026
ec52201
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 27, 2026
672f721
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 31, 2026
5313ed5
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 31, 2026
0457ae3
Name DOM unit tests for the jsdom Jest project
adamsilverstein Aug 31, 2026
34bbf00
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Aug 31, 2026
5196d62
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Sep 4, 2026
d6900ed
Run the review UI layer's unit tests under Vitest
adamsilverstein Sep 4, 2026
52e1666
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Sep 4, 2026
207b7dd
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Sep 5, 2026
32e4d0c
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Sep 6, 2026
459f59b
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Sep 10, 2026
952e597
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Sep 11, 2026
6cdd4d0
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 11, 2026
e85b301
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Sep 15, 2026
14959a7
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 16, 2026
732cd20
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 16, 2026
5c7beea
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 16, 2026
030c390
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 18, 2026
34acbf4
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 18, 2026
fd2ee4e
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 29, 2026
5c5169c
Suggest mode: show the new destination of a retargeted link
adamsilverstein Sep 29, 2026
8492ef0
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 29, 2026
99fa69d
Suggest mode: Use Text from @wordpress/ui in the review sidebar
adamsilverstein Sep 29, 2026
5479ffc
Suggest mode: Match the Accept / Reject icons to the design spec
adamsilverstein Sep 29, 2026
7b023f7
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 29, 2026
fda8310
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 30, 2026
ef8cd7a
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 30, 2026
4ba89ad
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 30, 2026
d918026
Notes sidebar: Keep suggestion summaries off the per-keystroke path
adamsilverstein Sep 30, 2026
fd35749
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 30, 2026
d9ac784
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 30, 2026
4a79f17
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 30, 2026
f2789d1
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 30, 2026
6285c18
Update packages/editor/src/components/collab-sidebar/suggestion-actio…
adamsilverstein Sep 30, 2026
a0fd2a8
Suggest mode: Use the design system token for summary quote color
adamsilverstein Sep 30, 2026
f33e99a
Merge remote-tracking branch 'origin/suggest/inline-ops' into suggest…
adamsilverstein Sep 30, 2026
abf2fe4
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Sep 30, 2026
3db6f08
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Oct 1, 2026
509d1e8
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Oct 2, 2026
da3a14b
Merge branch 'suggest/inline-ops' into suggest/review-ui
adamsilverstein Oct 2, 2026
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
37 changes: 30 additions & 7 deletions packages/editor/src/components/collab-sidebar/note.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import { __, _x, sprintf } from '@wordpress/i18n';
import { moreVertical, published } from '@wordpress/icons';
import { NoteCard } from './note-card';
import { NoteForm } from './note-form';
import SuggestionActions, {
SuggestionActionButtons,
useSuggestionDecision,
} from './suggestion-actions';

function NoteActionsMenu( { items, buttonRef } ) {
return (
Expand Down Expand Up @@ -76,7 +80,14 @@ export function Note( {
}
}, [ rawContent ] );

const canResolve = note.parent === 0;
// Suggestion threads expose their own Accept/Reject affordance in the
// header; the generic "Resolve" button would duplicate that action with
// a confusingly similar checkmark icon, so hide it for suggestion notes.
const hasSuggestionPayload = !! note?.meta?._wp_suggestion;
const suggestionDecision = useSuggestionDecision(
hasSuggestionPayload ? note : null
);
const canResolve = note.parent === 0 && ! hasSuggestionPayload;
const metaStatus = note.meta?._wp_note_status;
const isResolutionNote =
metaStatus === 'resolved' || metaStatus === 'reopen';
Expand Down Expand Up @@ -187,9 +198,13 @@ export function Note( {
);
}

const actions = isSelected ? (
const showActions = isSelected || hasSuggestionPayload;
const actions = showActions ? (
<>
{ canResolve && onResolve && (
{ hasSuggestionPayload && (
<SuggestionActionButtons decision={ suggestionDecision } />
) }
{ isSelected && canResolve && onResolve && (
<Button
label={ _x( 'Resolve', 'Mark note as resolved' ) }
size="small"
Expand All @@ -199,10 +214,12 @@ export function Note( {
onClick={ onResolve }
/>
) }
<NoteActionsMenu
items={ availableItems }
buttonRef={ actionButtonRef }
/>
{ isSelected && (
<NoteActionsMenu
items={ availableItems }
buttonRef={ actionButtonRef }
/>
) }
</>
) : null;

Expand All @@ -213,6 +230,12 @@ export function Note( {
role={ note.parent !== 0 ? 'treeitem' : undefined }
>
{ body }
{ hasSuggestionPayload && (
<SuggestionActions
thread={ note }
decision={ suggestionDecision }
/>
) }
{ actionState === 'delete' && (
<ConfirmDialog
isOpen
Expand Down
Loading
Loading