Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions src/visualBuilder/components/FieldLocationAppList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { VisualBuilderPostMessageEvents } from "../utils/types/postMessage.types
import visualBuilderPostMessage from "../utils/visualBuilderPostMessage";
import { visualBuilderStyles } from "../visualBuilder.style";
import classNames from "classnames";
import { CslpData } from "../../utils/cslpdata";

interface App {
app_installation_uid: string;
Expand All @@ -30,6 +31,9 @@ interface FieldLocationAppListProps {
apps: App[];
position: "left" | "right";
toolbarRef: React.RefObject<HTMLDivElement>;
domEditStack:CslpData[]
setDisplayAllApps: (displayAllApps: boolean) => void;
displayAllApps: boolean;
}

const normalize = (text: string) =>
Expand All @@ -42,6 +46,8 @@ export const FieldLocationAppList = ({
apps,
position,
toolbarRef,
domEditStack,
setDisplayAllApps,
}: FieldLocationAppListProps) => {
const remainingApps = apps.filter((app, index) => index !== 0);
const [search, setSearch] = useState("");
Expand All @@ -63,8 +69,10 @@ export const FieldLocationAppList = ({
{
app: app,
position: toolbarRef.current?.getBoundingClientRect(),
DomEditStack:domEditStack
}
);
setDisplayAllApps(false);
};

return (
Expand Down
4 changes: 4 additions & 0 deletions src/visualBuilder/components/FieldLocationIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,22 @@ import React, { useRef } from "preact/compat";
import { LoadingIcon } from "./icons/loading";
import { VisualBuilderPostMessageEvents } from "../utils/types/postMessage.types";
import visualBuilderPostMessage from "../utils/visualBuilderPostMessage";
import { CslpData } from "../../utils/cslpdata";

export const FieldLocationIcon = ({
fieldLocationData,
multipleFieldToolbarButtonClasses,
handleMoreIconClick,
moreButtonRef,
toolbarRef,
domEditStack
}: {
fieldLocationData: any;
multipleFieldToolbarButtonClasses: any;
handleMoreIconClick: () => void;
moreButtonRef: any;
toolbarRef: any;
domEditStack:CslpData[]
}) => {


Expand All @@ -32,6 +35,7 @@ export const FieldLocationIcon = ({
visualBuilderPostMessage?.send(VisualBuilderPostMessageEvents.FIELD_LOCATION_SELECTED_APP, {
app,
position: toolbarRef.current?.getBoundingClientRect(),
DomEditStack:domEditStack
});
};

Expand Down
8 changes: 8 additions & 0 deletions src/visualBuilder/components/FieldToolbar.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { CslpData } from "../../cslp/types/cslp.types";
import { CslpData as CslpDataUtil } from "../../utils/cslpdata";
import getChildrenDirection from "../utils/getChildrenDirection";
import {
ALLOWED_MODAL_EDITABLE_FIELD,
Expand Down Expand Up @@ -195,6 +196,9 @@ function FieldToolbarComponent(
// }
}

const domEditStack=getDOMEditStack(eventDetails.editableElement) as CslpDataUtil[]


const invertTooltipPosition =
targetElement.getBoundingClientRect().top <= TOOLTIP_TOP_EDGE_BUFFER;

Expand Down Expand Up @@ -570,6 +574,7 @@ function FieldToolbarComponent(
handleMoreIconClick={handleMoreIconClick}
moreButtonRef={moreButtonRef}
toolbarRef={toolbarRef}
domEditStack={domEditStack}
/>
</>
</div>
Expand All @@ -579,6 +584,9 @@ function FieldToolbarComponent(
toolbarRef={toolbarRef}
apps={fieldLocationData?.apps || ([] as any[])}
position={appListPosition}
domEditStack={domEditStack}
setDisplayAllApps={setDisplayAllApps}
displayAllApps={displayAllApps}
/>
)}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,17 +145,29 @@ describe("FieldLocationAppList", () => {
});

it("should send event when app is clicked", () => {
render(<FieldLocationAppList apps={mockApps} position="right" toolbarRef={mockToolbarRef} />);
const mockSetDisplayAllApps = vi.fn();
render(<FieldLocationAppList apps={mockApps} position="right" toolbarRef={mockToolbarRef} domEditStack={[]} setDisplayAllApps={mockSetDisplayAllApps} displayAllApps={true} />);

const secondApp = screen.getByText("Second App");
fireEvent.click(secondApp);

expect(visualBuilderPostMessage?.send).toHaveBeenCalledWith("field-location-selected-app", {
app: mockApps[1],
position: { top: 0, left: 0, right: 100, bottom: 50, width: 100, height: 50, x: 0, y: 0 },
DomEditStack: []
});
});

it("should close the app list when an app is selected", () => {
const mockSetDisplayAllApps = vi.fn();
render(<FieldLocationAppList apps={mockApps} position="right" toolbarRef={mockToolbarRef} domEditStack={[]} setDisplayAllApps={mockSetDisplayAllApps} displayAllApps={true} />);

const secondApp = screen.getByText("Second App");
fireEvent.click(secondApp);

expect(mockSetDisplayAllApps).toHaveBeenCalledWith(false);
});




Expand Down
16 changes: 16 additions & 0 deletions src/visualBuilder/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,22 @@ export class VisualBuilder {
VisualBuilderPostMessageEvents.SEND_VARIANT_AND_LOCALE
);

visualBuilderPostMessage?.on<{
scroll: boolean
}>(
VisualBuilderPostMessageEvents.TOGGLE_SCROLL,
(event) => {
if (!event.data.scroll) {
document.body.style.overflow = 'hidden'
} else {
document.body.style.overflow = 'auto'
}
}
);




useHideFocusOverlayPostMessageEvent({
overlayWrapper: this.overlayWrapper,
visualBuilderContainer: this.visualBuilderContainer,
Expand Down
1 change: 1 addition & 0 deletions src/visualBuilder/utils/types/postMessage.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,5 @@ export enum VisualBuilderPostMessageEvents {
COLLAB_THREADS_REMOVE = "collab-threads-remove",
COLLAB_THREAD_REOPEN = "collab-thread-reopen",
COLLAB_THREAD_HIGHLIGHT = "collab-thread-highlight",
TOGGLE_SCROLL = "toggle-scroll",
}
Loading