Skip to content

fex: UI overlap in attribute editing #9453

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

Merged
eliandoran merged 4 commits into from
Apr 16, 2026
Merged

fex: UI overlap in attribute editing #9453

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c888826
fex: UI overlap in attribute editing
ZAKIURREHMAN Apr 16, 2026
6bc3176
fix: resolve context menu state reset issue causing UI text overlap
ZAKIURREHMAN Apr 16, 2026
b2f0296
refactor: show only modified lines
ZAKIURREHMAN Apr 16, 2026
f64b029
refactor: ensure only the changed lines are shown
ZAKIURREHMAN Apr 16, 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
19 changes: 17 additions & 2 deletions apps/client/src/widgets/ribbon/components/AttributeEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ export default function AttributeEditor({ api, note, componentId, notePath, ntxI
const [ state, setState ] = useState<"normal" | "showHelpTooltip" | "showAttributeDetail">();
const [ error, setError ] = useState<unknown>();
const [ needsSaving, setNeedsSaving ] = useState(false);
const [isMenuOpen, setIsMenuOpen] = useState(false);
const suppressNextOnHide = useRef(false);

const lastSavedContent = useRef<string>();
const currentValueRef = useRef(currentValue);
Expand Down Expand Up @@ -383,6 +385,12 @@ export default function AttributeEditor({ api, note, componentId, notePath, ntxI
onClick={(e) => {
// Prevent automatic hiding of the context menu due to the button being clicked.
e.stopPropagation();
if (isMenuOpen) {
// If we re-show the menu, ContextMenu.show() will call hide()
// and immediately trigger onHide. Suppress that transient hide.
suppressNextOnHide.current = true;
}
setIsMenuOpen(true);

contextMenu.show<AttributeCommandNames>({
x: e.pageX,
Expand All @@ -395,7 +403,14 @@ export default function AttributeEditor({ api, note, componentId, notePath, ntxI
{ title: t("attribute_editor.add_new_label_definition"), command: "addNewLabelDefinition", uiIcon: "bx bx-empty" },
{ title: t("attribute_editor.add_new_relation_definition"), command: "addNewRelationDefinition", uiIcon: "bx bx-empty" }
],
selectMenuItemHandler: (item) => handleAddNewAttributeCommand(item.command)
selectMenuItemHandler: (item) => handleAddNewAttributeCommand(item.command),
onHide: () => {
if (suppressNextOnHide.current) {
suppressNextOnHide.current = false;
return;
}
setIsMenuOpen(false);
},
});
}}
/>
Expand Down Expand Up @@ -438,4 +453,4 @@ function getClickIndex(pos: ModelPosition) {
}

return clickIndex;
}
}
Loading