## Description TL;DR This is a complete architectural change of of List widget works to support all widgets we currently have and should automatically support any future widgets. It also introduces nested List widgets i.e a list widget can have a another list widget which in turn can have another list widget. Fixes #18206 Fixes #6775 Fixes #13211 Fixes #16582 Fixes #11739 Fixes #15094 Fixes #6840 Fixes #10841 Fixes #17386 Fixes #18340 Fixes #16898 Fixes #17555 Fixes #6858 Fixes #9568 Fixes #17480 Fixes #18523 Fixes #18206 Fixes #16586 Fixes #18106 Fixes #16576 Fixes #14697 Fixes #9607 Fixes #19648 Fixes #19739 Fixes #19652 Fixes #18730 Fixes #19503 Fixes #19498 Fixes #19437 Fixes #5245 Fixes #19150 Fixes #18638 Fixes #11332 Fixes #17901 Fixes #19043 Fixes #17777 Fixes #8237 Fixes #15487 Fixes #15988 Fixes #18621 Fixes #16788 Fixes #18110 Fixes #18382 Fixes #17427 Fixes #18105 Fixes #18287 Fixes #19808 Fixes #14655 ## Type of change - New feature (non-breaking change which adds functionality) ## How Has This Been Tested? - Cypress - Jest - Manual ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes --------- Co-authored-by: Tolulope Adetula <31691737+Tooluloope@users.noreply.github.com> Co-authored-by: Favour Ohanekwu <fohanekwu@gmail.com>
251 lines
8.3 KiB
TypeScript
251 lines
8.3 KiB
TypeScript
import equal from "fast-deep-equal/es6";
|
|
import React from "react";
|
|
|
|
import BaseWidget, { WidgetProps } from "./BaseWidget";
|
|
import {
|
|
GridDefaults,
|
|
MAIN_CONTAINER_WIDGET_ID,
|
|
RenderModes,
|
|
} from "constants/WidgetConstants";
|
|
import {
|
|
getWidgetEvalValues,
|
|
getIsWidgetLoading,
|
|
} from "selectors/dataTreeSelectors";
|
|
import {
|
|
getMainCanvasProps,
|
|
computeMainContainerWidget,
|
|
getChildWidgets,
|
|
getRenderMode,
|
|
getMetaWidgetChildrenStructure,
|
|
getMetaWidget,
|
|
getFlattenedChildCanvasWidgets,
|
|
previewModeSelector,
|
|
} from "selectors/editorSelectors";
|
|
import { AppState } from "@appsmith/reducers";
|
|
import { useDispatch, useSelector } from "react-redux";
|
|
import { getWidget } from "sagas/selectors";
|
|
import {
|
|
createCanvasWidget,
|
|
createLoadingWidget,
|
|
} from "utils/widgetRenderUtils";
|
|
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
|
|
import { checkContainersForAutoHeightAction } from "actions/autoHeightActions";
|
|
import { isAutoHeightEnabledForWidget } from "./WidgetUtils";
|
|
import { CANVAS_DEFAULT_MIN_HEIGHT_PX } from "constants/AppConstants";
|
|
import { getGoogleMapsApiKey } from "ce/selectors/tenantSelectors";
|
|
|
|
const WIDGETS_WITH_CHILD_WIDGETS = ["LIST_WIDGET", "FORM_WIDGET"];
|
|
|
|
function withWidgetProps(WrappedWidget: typeof BaseWidget) {
|
|
function WrappedPropsComponent(
|
|
props: WidgetProps & { skipWidgetPropsHydration?: boolean },
|
|
) {
|
|
const {
|
|
children,
|
|
hasMetaWidgets,
|
|
referencedWidgetId,
|
|
requiresFlatWidgetChildren,
|
|
skipWidgetPropsHydration,
|
|
type,
|
|
widgetId,
|
|
} = props;
|
|
const isPreviewMode = useSelector(previewModeSelector);
|
|
const canvasWidget = useSelector((state: AppState) =>
|
|
getWidget(state, widgetId),
|
|
);
|
|
const metaWidget = useSelector(getMetaWidget(widgetId));
|
|
|
|
const mainCanvasProps = useSelector((state: AppState) =>
|
|
getMainCanvasProps(state),
|
|
);
|
|
const googleMapsApiKey = useSelector(getGoogleMapsApiKey);
|
|
const renderMode = useSelector(getRenderMode);
|
|
|
|
const widgetName = canvasWidget?.widgetName || metaWidget?.widgetName;
|
|
|
|
const evaluatedWidget = useSelector((state: AppState) =>
|
|
getWidgetEvalValues(state, widgetName),
|
|
);
|
|
const isLoading = useSelector((state: AppState) =>
|
|
getIsWidgetLoading(state, widgetName),
|
|
);
|
|
|
|
const metaWidgetChildrenStructure = useSelector(
|
|
getMetaWidgetChildrenStructure(widgetId, type, hasMetaWidgets),
|
|
equal,
|
|
);
|
|
|
|
const dispatch = useDispatch();
|
|
|
|
const childWidgets = useSelector((state: AppState) => {
|
|
if (!WIDGETS_WITH_CHILD_WIDGETS.includes(type)) return undefined;
|
|
return getChildWidgets(state, widgetId);
|
|
}, equal);
|
|
|
|
const flattenedChildCanvasWidgets = useSelector((state: AppState) => {
|
|
if (requiresFlatWidgetChildren) {
|
|
return getFlattenedChildCanvasWidgets(
|
|
state,
|
|
referencedWidgetId || widgetId,
|
|
);
|
|
}
|
|
}, equal);
|
|
|
|
let widgetProps: WidgetProps = {} as WidgetProps;
|
|
const widget = metaWidget || canvasWidget;
|
|
|
|
if (!skipWidgetPropsHydration) {
|
|
const canvasWidgetProps = (() => {
|
|
if (widgetId === MAIN_CONTAINER_WIDGET_ID) {
|
|
const computed = computeMainContainerWidget(
|
|
canvasWidget,
|
|
mainCanvasProps,
|
|
);
|
|
if (renderMode === RenderModes.CANVAS) {
|
|
return {
|
|
...computed,
|
|
bottomRow: Math.max(
|
|
computed.minHeight,
|
|
computed.bottomRow +
|
|
GridDefaults.MAIN_CANVAS_EXTENSION_OFFSET *
|
|
GridDefaults.DEFAULT_GRID_ROW_HEIGHT,
|
|
),
|
|
};
|
|
} else {
|
|
return {
|
|
...computed,
|
|
bottomRow: Math.max(
|
|
CANVAS_DEFAULT_MIN_HEIGHT_PX,
|
|
computed.bottomRow +
|
|
GridDefaults.VIEW_MODE_MAIN_CANVAS_EXTENSION_OFFSET *
|
|
GridDefaults.DEFAULT_GRID_ROW_HEIGHT,
|
|
),
|
|
};
|
|
}
|
|
}
|
|
|
|
return evaluatedWidget
|
|
? createCanvasWidget(widget, evaluatedWidget)
|
|
: createLoadingWidget(widget);
|
|
})();
|
|
|
|
widgetProps = { ...canvasWidgetProps };
|
|
|
|
/**
|
|
* MODAL_WIDGET by default is to be hidden unless the isVisible property is found.
|
|
* If the isVisible property is undefined and the widget is MODAL_WIDGET then isVisible
|
|
* is set to false
|
|
* If the isVisible property is undefined and the widget is not MODAL_WIDGET then isVisible
|
|
* is set to true
|
|
*/
|
|
widgetProps.isVisible =
|
|
canvasWidgetProps.isVisible ??
|
|
canvasWidgetProps.type !== "MODAL_WIDGET";
|
|
|
|
if (
|
|
props.type === "CANVAS_WIDGET" &&
|
|
widgetId !== MAIN_CONTAINER_WIDGET_ID
|
|
) {
|
|
const isListWidgetCanvas =
|
|
props.noPad && props.dropDisabled && props.openParentPropertyPane;
|
|
|
|
widgetProps.rightColumn = props.rightColumn;
|
|
if (isListWidgetCanvas) {
|
|
widgetProps.bottomRow = props.bottomRow;
|
|
widgetProps.minHeight = props.minHeight;
|
|
}
|
|
|
|
widgetProps.shouldScrollContents = props.shouldScrollContents;
|
|
widgetProps.canExtend = props.canExtend;
|
|
widgetProps.parentId = props.parentId;
|
|
} else if (widgetId !== MAIN_CONTAINER_WIDGET_ID) {
|
|
widgetProps.parentColumnSpace = props.parentColumnSpace;
|
|
widgetProps.parentRowSpace = props.parentRowSpace;
|
|
widgetProps.parentId = props.parentId;
|
|
// Form Widget Props
|
|
widgetProps.onReset = props.onReset;
|
|
if ("isFormValid" in props) widgetProps.isFormValid = props.isFormValid;
|
|
}
|
|
|
|
widgetProps.children = children;
|
|
widgetProps.metaWidgetChildrenStructure = metaWidgetChildrenStructure;
|
|
widgetProps.isLoading = isLoading;
|
|
widgetProps.childWidgets = childWidgets;
|
|
widgetProps.flattenedChildCanvasWidgets = flattenedChildCanvasWidgets;
|
|
}
|
|
|
|
//merging with original props
|
|
widgetProps = { ...props, ...widgetProps, renderMode };
|
|
|
|
// adding google maps api key to widget props (although meant for map widget only)
|
|
widgetProps.googleMapsApiKey = googleMapsApiKey;
|
|
|
|
// isVisible prop defines whether to render a detached widget
|
|
if (widgetProps.detachFromLayout && !widgetProps.isVisible) {
|
|
return null;
|
|
}
|
|
|
|
const shouldCollapseWidgetInViewOrPreviewMode =
|
|
!widgetProps.isVisible &&
|
|
(renderMode === RenderModes.PAGE || isPreviewMode);
|
|
|
|
const shouldResetCollapsedContainerHeightInViewOrPreviewMode =
|
|
widgetProps.isVisible && widgetProps.topRow === widgetProps.bottomRow;
|
|
|
|
const shouldResetCollapsedContainerHeightInCanvasMode =
|
|
widgetProps.topRow === widgetProps.bottomRow &&
|
|
renderMode === RenderModes.CANVAS &&
|
|
!isPreviewMode;
|
|
|
|
// We don't render invisible widgets in view mode
|
|
if (shouldCollapseWidgetInViewOrPreviewMode) {
|
|
if (widgetProps.bottomRow !== widgetProps.topRow) {
|
|
dispatch({
|
|
type: ReduxActionTypes.UPDATE_WIDGET_AUTO_HEIGHT,
|
|
payload: {
|
|
widgetId: props.widgetId,
|
|
height: 0,
|
|
},
|
|
});
|
|
}
|
|
return null;
|
|
} else if (
|
|
shouldResetCollapsedContainerHeightInViewOrPreviewMode ||
|
|
shouldResetCollapsedContainerHeightInCanvasMode
|
|
) {
|
|
// We also need to check if a non-auto height widget has collapsed earlier
|
|
// We can figure this out if the widget height is zero and the beforeCollapse
|
|
// topRow and bottomRow are available.
|
|
|
|
// If the above is true, we call an auto height update call
|
|
// so that the widget can be reset correctly.
|
|
if (
|
|
widgetProps.topRow === widgetProps.bottomRow &&
|
|
widgetProps.topRowBeforeCollapse !== undefined &&
|
|
widgetProps.bottomRowBeforeCollapse !== undefined &&
|
|
!isAutoHeightEnabledForWidget(widgetProps)
|
|
) {
|
|
const heightBeforeCollapse =
|
|
(widgetProps.bottomRowBeforeCollapse -
|
|
widgetProps.topRowBeforeCollapse) *
|
|
GridDefaults.DEFAULT_GRID_ROW_HEIGHT;
|
|
dispatch({
|
|
type: ReduxActionTypes.UPDATE_WIDGET_AUTO_HEIGHT,
|
|
payload: {
|
|
widgetId: props.widgetId,
|
|
height: heightBeforeCollapse,
|
|
},
|
|
});
|
|
} else {
|
|
dispatch(checkContainersForAutoHeightAction());
|
|
}
|
|
}
|
|
|
|
return <WrappedWidget {...widgetProps} />;
|
|
}
|
|
|
|
return WrappedPropsComponent;
|
|
}
|
|
|
|
export default withWidgetProps;
|