## Description ### Fixes - [x] https://github.com/appsmithorg/appsmith/issues/19383 - [x] https://github.com/appsmithorg/appsmith/issues/19384 - [x] https://github.com/appsmithorg/appsmith/issues/19385 - [x] https://github.com/appsmithorg/appsmith/issues/19386 - [x] https://github.com/appsmithorg/appsmith/issues/19387 - [x] https://github.com/appsmithorg/appsmith/issues/19388 - [x] https://github.com/appsmithorg/appsmith/issues/19389 - [x] https://github.com/appsmithorg/appsmith/issues/19390 - [x] https://github.com/appsmithorg/appsmith/issues/19391 - [x] https://github.com/appsmithorg/appsmith/issues/19392 - [x] https://github.com/appsmithorg/appsmith/issues/19393 - [x] https://github.com/appsmithorg/appsmith/issues/19394 - [x] https://github.com/appsmithorg/appsmith/issues/19395 - [x] https://github.com/appsmithorg/appsmith/issues/19396 - [x] https://github.com/appsmithorg/appsmith/issues/19397 - [x] https://github.com/appsmithorg/appsmith/issues/19398 - [x] https://github.com/appsmithorg/appsmith/issues/19399 - [x] https://github.com/appsmithorg/appsmith/issues/19400 - [x] https://github.com/appsmithorg/appsmith/issues/19401 - [x] https://github.com/appsmithorg/appsmith/issues/19402 - [x] https://github.com/appsmithorg/appsmith/issues/19403 - [x] https://github.com/appsmithorg/appsmith/issues/19404 - [x] https://github.com/appsmithorg/appsmith/issues/19405 - [x] https://github.com/appsmithorg/appsmith/issues/19406 - [x] https://github.com/appsmithorg/appsmith/issues/19407 - [x] https://github.com/appsmithorg/appsmith/issues/19408 - [x] https://github.com/appsmithorg/appsmith/issues/19409 Fixes # (issue) > if no issue exists, please create an issue and ask the maintainers about this first Media > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video ## Type of change > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update ## How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Provide instructions, so we can reproduce. > Please also list any relevant details for your test configuration. > Delete anything that is not important - Manual - Jest - Cypress ### Test Plan > Add Testsmith test cases links that relate to this PR ### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) ## Checklist: ### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag ### QA activity: - [ ] Test plan has been approved by relevant developers - [ ] Test plan has been peer reviewed by QA - [ ] Cypress test cases have been added and approved by either SDET or manual QA - [ ] Organized project review call with relevant stakeholders after Round 1/2 of QA - [ ] Added Test Plan Approved label after reveiwing all Cypress test --------- Co-authored-by: Ankita Kinger <ankita@appsmith.com> Co-authored-by: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvi@appsmith.com> Co-authored-by: Arsalan <arsalanyaldram0211@outlook.com> Co-authored-by: Aman Agarwal <aman@appsmith.com> Co-authored-by: Rohit Agarwal <rohit_agarwal@live.in> Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com> Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local> Co-authored-by: Vijetha-Kaja <vijetha@appsmith.com> Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com> Co-authored-by: Apple <nandan@thinkify.io> Co-authored-by: Saroj <43822041+sarojsarab@users.noreply.github.com> Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com> Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com> Co-authored-by: rahulramesha <rahul@appsmith.com> Co-authored-by: Aswath K <aswath.sana@gmail.com> Co-authored-by: Preet Sidhu <preetsidhu.bits@gmail.com> Co-authored-by: Vijetha-Kaja <119562824+Vijetha-Kaja@users.noreply.github.com> Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
247 lines
7.0 KiB
TypeScript
247 lines
7.0 KiB
TypeScript
import type { AppState } from "@appsmith/reducers";
|
|
import { Icon } from "design-system";
|
|
import type { Placement, PopperOptions } from "popper.js";
|
|
import PopperJS from "popper.js";
|
|
import React, { useEffect, useMemo, useRef } from "react";
|
|
import { createPortal } from "react-dom";
|
|
import { getThemeDetails, ThemeMode } from "selectors/themeSelectors";
|
|
import styled, { ThemeProvider } from "styled-components";
|
|
import { generateReactKey } from "utils/generators";
|
|
import { draggableElement } from "./utils";
|
|
|
|
export type PopperProps = {
|
|
boundaryParent?: Element | PopperJS.Boundary;
|
|
parentElement?: Element | null;
|
|
zIndex: number;
|
|
isOpen: boolean;
|
|
borderRadius?: string;
|
|
themeMode?: ThemeMode;
|
|
targetNode?: Element;
|
|
children: JSX.Element | null;
|
|
renderDragBlock?: JSX.Element;
|
|
renderDragBlockPositions?: {
|
|
left?: string;
|
|
top?: string;
|
|
zIndex?: string;
|
|
position?: string;
|
|
};
|
|
style?: React.CSSProperties;
|
|
placement: Placement;
|
|
modifiers?: Partial<PopperOptions["modifiers"]>;
|
|
isDraggable?: boolean;
|
|
disablePopperEvents?: boolean;
|
|
cypressSelectorDragHandle?: string;
|
|
portalContainer?: Element;
|
|
position?: {
|
|
top: number;
|
|
left: number;
|
|
};
|
|
onPositionChange?: (position: { top: number; left: number }) => void;
|
|
setPosition?: (e: any) => void;
|
|
setIsDragging?: (e: any) => void;
|
|
isDragging?: boolean;
|
|
customParent?: Element | undefined;
|
|
editorRef?: React.RefObject<HTMLDivElement>;
|
|
// DraggableNode?: any;
|
|
};
|
|
|
|
const PopperWrapper = styled.div<{ zIndex: number; borderRadius?: string }>`
|
|
z-index: ${(props) => props.zIndex};
|
|
position: absolute;
|
|
border-radius: ${(props) => props.borderRadius || "0"};
|
|
box-shadow: 0 6px 20px 0px rgba(0, 0, 0, 0.15);
|
|
|
|
&&&:hover .drag-handle-block {
|
|
display: flex;
|
|
}
|
|
`;
|
|
|
|
const DragHandleBlock = styled.div`
|
|
cursor: grab;
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: center;
|
|
width: 43px;
|
|
height: 28px;
|
|
z-index: 3;
|
|
background-color: var(--ads-v2-color-bg);
|
|
border-radius: var(--ads-v2-border-radius);
|
|
position: relative;
|
|
top: -15px;
|
|
pointer-events: auto;
|
|
|
|
:hover {
|
|
background-color: var(--ads-v2-color-bg-subtle);
|
|
}
|
|
`;
|
|
|
|
type PopperDragHandleProps = { dragFn?: (val: boolean) => void };
|
|
|
|
/* eslint-disable react/display-name */
|
|
export default (props: PopperProps) => {
|
|
const contentRef = useRef<HTMLDivElement>(null);
|
|
const popperIdRef = useRef(generateReactKey());
|
|
const popperId = popperIdRef.current;
|
|
|
|
const onPositionChangeFn = (e: any) => {
|
|
if (contentRef.current && !!props.setPosition) {
|
|
contentRef.current.style.transform = "unset";
|
|
contentRef.current.style.top = e.top + "px";
|
|
contentRef.current.style.left = e.left + "px";
|
|
|
|
props.setPosition(e);
|
|
|
|
// add focus back to codemirror component.
|
|
if (
|
|
props?.editorRef &&
|
|
props?.editorRef?.current &&
|
|
props?.editorRef?.current?.children[1] &&
|
|
!!(props?.editorRef?.current?.children[1] as any)?.CodeMirror
|
|
)
|
|
(props?.editorRef?.current?.children[1] as any)?.CodeMirror.focus();
|
|
}
|
|
};
|
|
|
|
const {
|
|
boundaryParent = "viewport",
|
|
isDraggable = false,
|
|
disablePopperEvents = false,
|
|
position,
|
|
renderDragBlock,
|
|
onPositionChange = onPositionChangeFn,
|
|
themeMode = props.themeMode || ThemeMode.LIGHT,
|
|
renderDragBlockPositions,
|
|
cypressSelectorDragHandle,
|
|
} = props;
|
|
|
|
// Memoizing to avoid rerender of draggable icon.
|
|
// What is the cost of memoizing?
|
|
const popperTheme = useMemo(
|
|
() => getThemeDetails({} as AppState, themeMode),
|
|
[themeMode],
|
|
);
|
|
|
|
const PopperDragHandle = (props: PopperDragHandleProps) => {
|
|
return (
|
|
<DragHandleBlock
|
|
className="drag-handle-block"
|
|
onMouseEnter={(e) => {
|
|
e.stopPropagation();
|
|
if (props?.dragFn) {
|
|
props.dragFn(true);
|
|
}
|
|
}}
|
|
onMouseLeave={(e) => {
|
|
e.stopPropagation();
|
|
if (props?.dragFn) {
|
|
props.dragFn(false);
|
|
}
|
|
}}
|
|
>
|
|
<Icon name="drag-handle" size="lg" />
|
|
</DragHandleBlock>
|
|
);
|
|
};
|
|
|
|
useEffect(() => {
|
|
const parentElement =
|
|
props?.customParent ||
|
|
(props?.targetNode && props.targetNode?.parentElement);
|
|
|
|
if (
|
|
parentElement &&
|
|
parentElement.parentElement &&
|
|
props.targetNode &&
|
|
props.isOpen
|
|
) {
|
|
// TODO: To further optimize this, we can go through the popper API
|
|
// and figure out a way to keep an app instance level popper instance
|
|
// which we can update to have different references when called here.
|
|
// However, the performance benefit gained by such an optimization
|
|
// remains to be discovered.
|
|
const _popper = new PopperJS(
|
|
props.targetNode,
|
|
contentRef.current as unknown as Element,
|
|
{
|
|
...(isDraggable && disablePopperEvents
|
|
? {}
|
|
: { placement: props.placement }),
|
|
onCreate: (popperData) => {
|
|
const elementRef: any = popperData.instance.popper;
|
|
if (isDraggable && position) {
|
|
const initPositon =
|
|
position || elementRef.getBoundingClientRect();
|
|
elementRef.style.transform = "unset";
|
|
elementRef.style.top = initPositon.top + "px";
|
|
elementRef.style.left = initPositon.left + "px";
|
|
}
|
|
},
|
|
modifiers: {
|
|
flip: {
|
|
behavior: ["right", "left", "bottom", "top"],
|
|
},
|
|
keepTogether: {
|
|
enabled: false,
|
|
},
|
|
arrow: {
|
|
enabled: false,
|
|
},
|
|
preventOverflow: {
|
|
enabled: true,
|
|
/*
|
|
Prevent the FilterPane from overflowing the canvas when the
|
|
table widget is on the very top of the canvas.
|
|
*/
|
|
boundariesElement: boundaryParent,
|
|
},
|
|
...props.modifiers,
|
|
},
|
|
},
|
|
);
|
|
if (isDraggable) {
|
|
disablePopperEvents && _popper.disableEventListeners();
|
|
draggableElement(
|
|
`${popperId}-popper`,
|
|
_popper.popper,
|
|
onPositionChange,
|
|
parentElement,
|
|
position,
|
|
renderDragBlockPositions,
|
|
() =>
|
|
!!renderDragBlock ? (
|
|
renderDragBlock
|
|
) : (
|
|
<ThemeProvider theme={popperTheme}>
|
|
<PopperDragHandle dragFn={props.setIsDragging} />
|
|
</ThemeProvider>
|
|
),
|
|
cypressSelectorDragHandle,
|
|
);
|
|
}
|
|
|
|
return () => {
|
|
_popper.destroy();
|
|
};
|
|
}
|
|
}, [
|
|
props.targetNode,
|
|
props.isOpen,
|
|
JSON.stringify(props.modifiers),
|
|
props.placement,
|
|
disablePopperEvents,
|
|
]);
|
|
return createPortal(
|
|
props.isOpen && (
|
|
<PopperWrapper
|
|
borderRadius={props.borderRadius}
|
|
ref={contentRef}
|
|
style={props.style || {}}
|
|
zIndex={props.zIndex}
|
|
>
|
|
{props.children}
|
|
</PopperWrapper>
|
|
),
|
|
props.portalContainer ? props.portalContainer : document.body,
|
|
);
|
|
};
|