## 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>
230 lines
7.6 KiB
TypeScript
230 lines
7.6 KiB
TypeScript
import type {
|
|
MouseEventHandler,
|
|
PropsWithChildren,
|
|
ReactNode,
|
|
RefObject,
|
|
} from "react";
|
|
import React, { useCallback, useEffect, useRef } from "react";
|
|
import styled from "styled-components";
|
|
import tinycolor from "tinycolor2";
|
|
import fastdom from "fastdom";
|
|
import { generateClassName, getCanvasClassName } from "utils/generators";
|
|
import type { WidgetStyleContainerProps } from "components/designSystems/appsmith/WidgetStyleContainer";
|
|
import WidgetStyleContainer from "components/designSystems/appsmith/WidgetStyleContainer";
|
|
import type { WidgetType } from "utils/WidgetFactory";
|
|
import { scrollCSS } from "widgets/WidgetUtils";
|
|
import { useSelector } from "react-redux";
|
|
import { getCurrentAppPositioningType } from "selectors/editorSelectors";
|
|
import { AppPositioningTypes } from "reducers/entityReducers/pageListReducer";
|
|
import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
|
|
|
|
const StyledContainerComponent = styled.div<
|
|
Omit<ContainerWrapperProps, "widgetId">
|
|
>`
|
|
height: 100%;
|
|
width: 100%;
|
|
overflow: hidden;
|
|
outline: none;
|
|
${(props) => (!!props.dropDisabled ? `position: relative;` : ``)}
|
|
|
|
${(props) =>
|
|
props.shouldScrollContents && !props.$noScroll ? scrollCSS : ``}
|
|
opacity: ${(props) => (props.resizeDisabled ? "0.8" : "1")};
|
|
|
|
background: ${(props) => props.backgroundColor};
|
|
&:hover {
|
|
background-color: ${(props) => {
|
|
return props.onClickCapture && props.backgroundColor
|
|
? tinycolor(props.backgroundColor).darken(5).toString()
|
|
: props.backgroundColor;
|
|
}};
|
|
z-index: ${(props) => (props.onClickCapture ? "2" : "1")};
|
|
cursor: ${(props) => (props.onClickCapture ? "pointer" : "inherit")};
|
|
}
|
|
`;
|
|
|
|
interface ContainerWrapperProps {
|
|
onClick?: MouseEventHandler<HTMLDivElement>;
|
|
onClickCapture?: MouseEventHandler<HTMLDivElement>;
|
|
resizeDisabled?: boolean;
|
|
shouldScrollContents?: boolean;
|
|
backgroundColor?: string;
|
|
widgetId: string;
|
|
type: WidgetType;
|
|
dropDisabled?: boolean;
|
|
$noScroll: boolean;
|
|
}
|
|
function ContainerComponentWrapper(
|
|
props: PropsWithChildren<ContainerWrapperProps>,
|
|
) {
|
|
const containerRef: RefObject<HTMLDivElement> = useRef<HTMLDivElement>(null);
|
|
const appPositioningType = useSelector(getCurrentAppPositioningType);
|
|
|
|
useEffect(() => {
|
|
if (!props.shouldScrollContents) {
|
|
const supportsNativeSmoothScroll =
|
|
"scrollBehavior" in document.documentElement.style;
|
|
|
|
fastdom.mutate(() => {
|
|
if (supportsNativeSmoothScroll) {
|
|
containerRef.current?.scrollTo({ top: 0, behavior: "smooth" });
|
|
} else {
|
|
if (containerRef.current) {
|
|
containerRef.current.scrollTop = 0;
|
|
}
|
|
}
|
|
});
|
|
}
|
|
}, [props.shouldScrollContents]);
|
|
|
|
/**
|
|
* This is for all the container widgets that have the onClickCapture method.
|
|
* The mouse over event makes sure to add the class `hover-styles` so that a
|
|
* darker shade of the background color takes effect to induce the hover effect.
|
|
*
|
|
* Why not use the :hover css selector?
|
|
* For cases like List widget, it can have inner list widgets; so there can be
|
|
* containers inside containers. When the inner container is hovered, the parent container's
|
|
* :hover selector is also triggered making the outer and inner container both having this
|
|
* hover effect.
|
|
*/
|
|
const onMouseOver = useCallback(
|
|
(e: React.MouseEvent<HTMLDivElement>) => {
|
|
const el = e.currentTarget;
|
|
const widgetType = el.getAttribute("type");
|
|
const widgetId = el.dataset.widgetid;
|
|
const isMainContainer = widgetId === "0";
|
|
|
|
if (
|
|
(widgetType === "CONTAINER_WIDGET" && props.onClickCapture) ||
|
|
isMainContainer
|
|
) {
|
|
const elementsHovered = document.getElementsByClassName(
|
|
"hover-styles",
|
|
) as HTMLCollectionOf<HTMLDivElement>;
|
|
|
|
fastdom.mutate(() => {
|
|
for (const elHovered of elementsHovered) {
|
|
elHovered.classList.remove("hover-styles");
|
|
}
|
|
|
|
if (!isMainContainer) {
|
|
el.classList.add("hover-styles");
|
|
}
|
|
});
|
|
}
|
|
},
|
|
[props.onClickCapture],
|
|
);
|
|
|
|
return (
|
|
<StyledContainerComponent
|
|
// Before you remove: generateClassName is used for bounding the resizables within this canvas
|
|
// getCanvasClassName is used to add a scrollable parent.
|
|
$noScroll={props.$noScroll}
|
|
backgroundColor={props.backgroundColor}
|
|
className={`${
|
|
props.shouldScrollContents ? getCanvasClassName() : ""
|
|
} ${generateClassName(props.widgetId)} container-with-scrollbar ${
|
|
appPositioningType === AppPositioningTypes.AUTO &&
|
|
props.widgetId === MAIN_CONTAINER_WIDGET_ID
|
|
? "auto-layout"
|
|
: ""
|
|
}`}
|
|
data-widgetId={props.widgetId}
|
|
dropDisabled={props.dropDisabled}
|
|
onClick={props.onClick}
|
|
onClickCapture={props.onClickCapture}
|
|
onMouseOver={onMouseOver}
|
|
ref={containerRef}
|
|
resizeDisabled={props.resizeDisabled}
|
|
shouldScrollContents={!!props.shouldScrollContents}
|
|
tabIndex={props.shouldScrollContents ? undefined : 0}
|
|
type={props.type}
|
|
>
|
|
{props.children}
|
|
</StyledContainerComponent>
|
|
);
|
|
}
|
|
|
|
function ContainerComponent(props: ContainerComponentProps) {
|
|
if (props.detachFromLayout) {
|
|
return (
|
|
<ContainerComponentWrapper
|
|
$noScroll={!!props.noScroll}
|
|
dropDisabled={props.dropDisabled}
|
|
onClick={props.onClick}
|
|
onClickCapture={props.onClickCapture}
|
|
resizeDisabled={props.resizeDisabled}
|
|
shouldScrollContents={
|
|
props.shouldScrollContents &&
|
|
props.appPositioningType !== AppPositioningTypes.AUTO
|
|
}
|
|
type={props.type}
|
|
widgetId={props.widgetId}
|
|
>
|
|
{props.children}
|
|
</ContainerComponentWrapper>
|
|
);
|
|
}
|
|
return (
|
|
<WidgetStyleContainer
|
|
backgroundColor={props.backgroundColor}
|
|
borderColor={props.borderColor}
|
|
borderRadius={props.borderRadius}
|
|
borderWidth={props.borderWidth}
|
|
boxShadow={props.boxShadow}
|
|
className="style-container"
|
|
containerStyle={props.containerStyle}
|
|
selected={props.selected}
|
|
widgetId={props.widgetId}
|
|
>
|
|
<ContainerComponentWrapper
|
|
$noScroll={!!props.noScroll}
|
|
backgroundColor={props.backgroundColor}
|
|
dropDisabled={props.dropDisabled}
|
|
onClick={props.onClick}
|
|
onClickCapture={props.onClickCapture}
|
|
resizeDisabled={props.resizeDisabled}
|
|
shouldScrollContents={
|
|
props.shouldScrollContents &&
|
|
// Disable scrollbar on autolayout canvas as it meddles with canvas drag and highlight position.
|
|
(props.appPositioningType !== AppPositioningTypes.AUTO ||
|
|
// We need to allow scrollbars for list items as they don't have auto-height
|
|
props.isListItemContainer)
|
|
}
|
|
type={props.type}
|
|
widgetId={props.widgetId}
|
|
>
|
|
{props.children}
|
|
</ContainerComponentWrapper>
|
|
</WidgetStyleContainer>
|
|
);
|
|
}
|
|
|
|
export type ContainerStyle = "border" | "card" | "rounded-border" | "none";
|
|
|
|
export interface ContainerComponentProps extends WidgetStyleContainerProps {
|
|
children?: ReactNode;
|
|
shouldScrollContents?: boolean;
|
|
resizeDisabled?: boolean;
|
|
selected?: boolean;
|
|
focused?: boolean;
|
|
detachFromLayout?: boolean;
|
|
onClick?: MouseEventHandler<HTMLDivElement>;
|
|
onClickCapture?: MouseEventHandler<HTMLDivElement>;
|
|
backgroundColor?: string;
|
|
type: WidgetType;
|
|
noScroll?: boolean;
|
|
minHeight?: number;
|
|
useAutoLayout?: boolean;
|
|
direction?: string;
|
|
justifyContent?: string;
|
|
alignItems?: string;
|
|
dropDisabled?: boolean;
|
|
appPositioningType?: AppPositioningTypes;
|
|
isListItemContainer?: boolean;
|
|
}
|
|
|
|
export default ContainerComponent;
|