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

Jump to bottom

fix(editing): regression bug in disable editing #3687

Merged
merged 5 commits into from
Oct 3, 2023
Merged

fix(editing): regression bug in disable editing #3687

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1bc2ea
Fix regression bug of disable editing
rodrigobasilio2022 Oct 2, 2023
6a89f21
Merge branch 'master' of github.com:OHIF/Viewers into pr/rodrigobasil…
sedghi Oct 3, 2023
03286ab
fix ci
sedghi Oct 3, 2023
f8e77ec
Merge branch 'master' of github.com:OHIF/Viewers into pr/rodrigobasil…
sedghi Oct 3, 2023
96da95d
fix ci
sedghi Oct 3, 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
4 changes: 3 additions & 1 deletion platform/ui/src/components/SegmentationGroupTable/SegmentationGroupSegment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ const SegmentItem = ({
{/* Icons that show only when hovering */}
<div className="hidden group-hover/row:flex">
<HoveringIcons
disableEditing={disableEditing}
onEdit={onEdit}
isLocked={isLocked}
isVisible={isVisible}
Expand All @@ -147,6 +148,7 @@ const SegmentItem = ({
};

const HoveringIcons = ({
disableEditing,
onEdit,
isLocked,
isVisible,
Expand All @@ -172,7 +174,7 @@ const HoveringIcons = ({

return (
<div className="flex items-center">
{createIcon('row-edit', onEdit)}
{!disableEditing && createIcon('row-edit', onEdit)}
{createIcon(
isLocked ? 'row-lock' : 'row-unlock',
onToggleLocked,
Expand Down
26 changes: 14 additions & 12 deletions platform/ui/src/components/SegmentationGroupTable/SegmentationGroupTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,18 +104,20 @@ const SegmentationGroupTable = ({
</div>
) : (
<div className="mt-1 select-none">
<SegmentationDropDownRow
segmentations={segmentations}
disableEditing={disableEditing}
activeSegmentation={activeSegmentation}
onActiveSegmentationChange={onActiveSegmentationChange}
onSegmentationDelete={onSegmentationDelete}
onSegmentationEdit={onSegmentationEdit}
onSegmentationDownload={onSegmentationDownload}
storeSegmentation={storeSegmentation}
onSegmentationAdd={onSegmentationAdd}
onToggleSegmentationVisibility={onToggleSegmentationVisibility}
/>
{!disableEditing && (
<SegmentationDropDownRow
segmentations={segmentations}
disableEditing={disableEditing}
activeSegmentation={activeSegmentation}
onActiveSegmentationChange={onActiveSegmentationChange}
onSegmentationDelete={onSegmentationDelete}
onSegmentationEdit={onSegmentationEdit}
onSegmentationDownload={onSegmentationDownload}
storeSegmentation={storeSegmentation}
onSegmentationAdd={onSegmentationAdd}
onToggleSegmentationVisibility={onToggleSegmentationVisibility}
/>
)}
{!disableEditing && showAddSegment && (
<AddSegmentRow onClick={() => onSegmentAdd(activeSegmentationId)} />
)}
Expand Down