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

perf: Anvil widget name component rendering #33672

Merged
merged 7 commits into from
May 23, 2024
Merged

perf: Anvil widget name component rendering #33672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6764b07
Interact with a hovered widget's widget name component
riodeuno May 22, 2024
50a9b0a
Move mouseover to AnvilEditorCanvas
riodeuno May 22, 2024
303a7e1
feat: Anvil: Enable parent selection for focused widget (#33649)
riodeuno May 22, 2024
5c8a8bf
Revert stage for unfocusing all widgets to Canvas.tsx
riodeuno May 23, 2024
4373df8
Merge branch 'feat/drag-widget-name-component-on-hover' of https://gi…
riodeuno May 23, 2024
8a9ac19
Performance Fixes - Anvil Widget Name Component rendering
riodeuno May 23, 2024
db2487d
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
riodeuno May 23, 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
10 changes: 9 additions & 1 deletion app/client/src/layoutSystems/anvil/editor/AnvilWidgetName/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,13 @@ export function AnvilWidgetName(props: {

let cleanup = () => {};
useEffect(() => {
if (widgetElement && widgetNameComponent && widgetsEditorElement) {
if (
widgetElement &&
widgetNameComponent &&
widgetsEditorElement &&
// Makes sure we add listeners only if the widget is selected or focused
nameComponentState !== "none"
) {
cleanup = handleWidgetUpdate(
widgetElement,
widgetNameComponent,
Expand All @@ -108,6 +114,8 @@ export function AnvilWidgetName(props: {
return null;
// Don't show widget name component if the widget DOM element isn't found
if (!widgetElement) return null;
// Don't render any DOM nodes if the widget is not selected or focused
if (nameComponentState === "none") return null;

return (
<FloatingPortal>
Expand Down
60 changes: 32 additions & 28 deletions app/client/src/layoutSystems/anvil/editor/AnvilWidgetName/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,38 +65,42 @@ export function handleWidgetUpdate(
widgetsEditorElement: HTMLDivElement,
nameComponentState: NameComponentStates,
) {
return autoUpdate(widgetElement, widgetNameComponent, () => {
computePosition(widgetElement as HTMLDivElement, widgetNameComponent, {
placement: "top-start",
strategy: "fixed",
middleware: [
flip(),
shift(),
offset({ mainAxis: 0, crossAxis: -5 }),
getOverflowMiddleware(widgetsEditorElement as HTMLDivElement),
hide({ strategy: "referenceHidden" }),
hide({ strategy: "escaped" }),
],
}).then(({ middlewareData, x, y }) => {
let shiftOffset = 0;
if (middlewareData.containWithinCanvas.overflowAmount > 0) {
shiftOffset = middlewareData.containWithinCanvas.overflowAmount + 5;
}
return autoUpdate(
widgetElement,
widgetNameComponent,
() => {
computePosition(widgetElement as HTMLDivElement, widgetNameComponent, {
placement: "top-start",
strategy: "fixed",
middleware: [
flip(),
shift(),
offset({ mainAxis: 0, crossAxis: -5 }),
getOverflowMiddleware(widgetsEditorElement as HTMLDivElement),
hide({ strategy: "referenceHidden" }),
hide({ strategy: "escaped" }),
],
}).then(({ middlewareData, x, y }) => {
let shiftOffset = 0;
if (middlewareData.containWithinCanvas.overflowAmount > 0) {
shiftOffset = middlewareData.containWithinCanvas.overflowAmount + 5;
}

Object.assign(widgetNameComponent.style, {
left: `${x - shiftOffset}px`,
top: `${y}px`,
visibility:
nameComponentState === "none" || middlewareData.hide?.referenceHidden
Object.assign(widgetNameComponent.style, {
left: `${x - shiftOffset}px`,
top: `${y}px`,
visibility: middlewareData.hide?.referenceHidden
? "hidden"
: "visible",
zIndex:
nameComponentState === "focus"
? "calc(var(--on-canvas-ui-zindex) + 1)"
: "var(--on-canvas-ui-zindex)",
zIndex:
nameComponentState === "focus"
? "calc(var(--on-canvas-ui-zindex) + 1)"
: "var(--on-canvas-ui-zindex)",
});
});
});
});
},
{ animationFrame: true },
);
}

export function getWidgetNameComponentStyleProps(
Expand Down
Loading