> Pull Request Template > > Use this template to quickly create a well written pull request. Delete all quotes before creating the pull request. > ## Description In this pr we are fixing - Unwanted text selection during DnD and canvas resizing in Safari - In Anvil Shift + Click will still work like Ctrl + Click to pick and select widgets instead of pick all widgets in between a node on Entity Explorer like in Fixed Layout. - We are also fixing canvas resizer being stuck in resizing mode when mouse right is clicked. #### PR fixes following issue(s) Fixes #28193 > 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 > > > ## Testing > #### How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Also list any relevant details for your test configuration. > Delete anything that is not relevant - [ ] Manual - [ ] JUnit - [ ] 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: - [ ] [Speedbreak features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-) have been covered - [ ] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-) - [ ] Test plan has been peer reviewed by project stakeholders and other QA members - [ ] Manually tested functionality on DP - [ ] We had an implementation alignment call with stakeholders post QA Round 2 - [ ] Cypress test cases have been added and approved by SDET/manual QA - [ ] Added `Test Plan Approved` label after Cypress tests were reviewed - [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
247 lines
8.4 KiB
TypeScript
247 lines
8.4 KiB
TypeScript
import type { AppState } from "@appsmith/reducers";
|
|
import type { WidgetType } from "constants/WidgetConstants";
|
|
import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
|
|
import { get, set } from "lodash";
|
|
import { useSelector } from "react-redux";
|
|
import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
|
|
import { LayoutSystemTypes } from "layoutSystems/types";
|
|
import { select } from "redux-saga/effects";
|
|
import WidgetFactory from "WidgetProvider/factory";
|
|
import { getWidgets } from "./selectors";
|
|
|
|
/*
|
|
TODO(abhinav/pawan): Write unit tests for the following functions
|
|
Note:
|
|
Signature for enhancements in WidgetConfigResponse is as follows:
|
|
enhancements: {
|
|
child: {
|
|
autocomplete: (parentProps: any) => Record<string, Record<string, unknown>>,
|
|
customJSControl: (parentProps: any) => string,
|
|
propertyUpdateHook: (parentProps: any, widgetName: string, propertyPath: string, propertyValue: string),
|
|
action: (parentProps: any, dynamicString: string, responseData?: any[]) => { actionString: string, dataToApply?: any[]},
|
|
}
|
|
}
|
|
*/
|
|
|
|
// Enum which identifies the path in the enhancements for the
|
|
export enum WidgetEnhancementType {
|
|
WIDGET_ACTION = "child.action",
|
|
PROPERTY_UPDATE = "child.propertyUpdateHook",
|
|
CUSTOM_CONTROL = "child.customJSControl",
|
|
AUTOCOMPLETE = "child.autocomplete",
|
|
HIDE_EVALUATED_VALUE = "child.hideEvaluatedValue",
|
|
UPDATE_DATA_TREE_PATH = "child.updateDataTreePath",
|
|
SHOULD_HIDE_PROPERTY = "child.shouldHideProperty",
|
|
}
|
|
|
|
export function getParentWithEnhancementFn(
|
|
widgetId: string | undefined,
|
|
widgets: CanvasWidgetsReduxState,
|
|
) {
|
|
let widget = get(widgets, widgetId || "", undefined);
|
|
|
|
// While this widget has a parent
|
|
while (widget?.parentId) {
|
|
// Get parent widget props
|
|
const parent = get(widgets, widget.parentId, undefined);
|
|
|
|
// If parent has enhancements property
|
|
// enhancements property is a new widget property which tells us that
|
|
// the property pane, properties or actions of this widget or its children
|
|
// can be enhanced
|
|
|
|
if (parent && parent.enhancements) {
|
|
return parent;
|
|
}
|
|
// If we didn't find any enhancements
|
|
// keep walking up the tree to find the parent which does
|
|
// if the parent doesn't have a parent stop walking the tree.
|
|
// also stop if the parent is the main container (Main container doesn't have enhancements)
|
|
if (parent?.parentId && parent.parentId !== MAIN_CONTAINER_WIDGET_ID) {
|
|
widget = get(widgets, widget.parentId, undefined);
|
|
|
|
continue;
|
|
}
|
|
|
|
return;
|
|
}
|
|
}
|
|
|
|
const fixedLayoutOnlyProperties = ["dynamicHeight"];
|
|
|
|
export function layoutSystemBasedPropertyFilter(
|
|
parentProps: any,
|
|
propertyName: string,
|
|
) {
|
|
return (
|
|
parentProps.layoutSystemType !== LayoutSystemTypes.FIXED &&
|
|
fixedLayoutOnlyProperties.includes(propertyName)
|
|
);
|
|
}
|
|
|
|
export function getWidgetEnhancementFn(
|
|
type: WidgetType,
|
|
enhancementType: WidgetEnhancementType,
|
|
) {
|
|
// Get enhancements for the widget type from the config response
|
|
// Spread the config response so that we don't pollute the original
|
|
// configs
|
|
|
|
const config = { ...WidgetFactory.widgetConfigMap.get(type) };
|
|
if (config?.enhancements)
|
|
return get(config.enhancements, enhancementType, undefined);
|
|
}
|
|
|
|
// TODO(abhinav): Getting data from the tree may not be needed
|
|
// confirm this.
|
|
export const getPropsFromTree = (
|
|
state: AppState,
|
|
widgetName?: string,
|
|
): unknown => {
|
|
// Get the evaluated data of this widget from the evaluations tree.
|
|
if (!widgetName) return;
|
|
|
|
return get(state.evaluations.tree, widgetName, undefined);
|
|
};
|
|
|
|
export function* getChildWidgetEnhancementFn(
|
|
widgetId: string,
|
|
enhancementType: WidgetEnhancementType,
|
|
) {
|
|
// Get all widgets from the canvas
|
|
const widgets: CanvasWidgetsReduxState = yield select(getWidgets);
|
|
// Get the parent which wants to enhance this widget
|
|
const parentWithEnhancementFn = getParentWithEnhancementFn(widgetId, widgets);
|
|
// If such a parent is found
|
|
if (parentWithEnhancementFn) {
|
|
// Get the enhancement function based on the enhancementType
|
|
// from the configs
|
|
const enhancementFn = getWidgetEnhancementFn(
|
|
parentWithEnhancementFn.type,
|
|
enhancementType,
|
|
);
|
|
// Get the parent's evaluated data from the evaluatedTree
|
|
const parentDataFromDataTree: unknown = yield select(
|
|
getPropsFromTree,
|
|
parentWithEnhancementFn.widgetName,
|
|
);
|
|
if (parentDataFromDataTree) {
|
|
// Update the enhancement function by passing the widget data as the first parameter
|
|
return (...args: unknown[]) =>
|
|
(enhancementFn as EnhancementFn)(parentDataFromDataTree, ...args);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* hook that returns parent with enhancments
|
|
*
|
|
* @param widgetId
|
|
* @returns
|
|
*/
|
|
export function useParentWithEnhancementFn(widgetId: string) {
|
|
const widgets: CanvasWidgetsReduxState = useSelector(getWidgets);
|
|
return getParentWithEnhancementFn(widgetId, widgets);
|
|
}
|
|
|
|
export function useChildWidgetEnhancementFn(
|
|
widgetId: string,
|
|
enhancementType: WidgetEnhancementType,
|
|
) {
|
|
// Get all widgets from the canvas
|
|
const widgets: CanvasWidgetsReduxState = useSelector(getWidgets);
|
|
// Get the parent which wants to enhance this widget
|
|
const parentWithEnhancementFn = getParentWithEnhancementFn(widgetId, widgets);
|
|
// If such a parent is found
|
|
// Get the parent's evaluated data from the evaluatedTree
|
|
const parentDataFromDataTree: unknown = useSelector((state: AppState) =>
|
|
getPropsFromTree(state, parentWithEnhancementFn?.widgetName),
|
|
);
|
|
|
|
if (parentWithEnhancementFn) {
|
|
// Get the enhancement function based on the enhancementType
|
|
// from the configs
|
|
const enhancementFn = getWidgetEnhancementFn(
|
|
parentWithEnhancementFn.type,
|
|
enhancementType,
|
|
);
|
|
|
|
if (parentDataFromDataTree && enhancementFn) {
|
|
// Update the enhancement function by passing the widget data as the first parameter
|
|
return (...args: unknown[]) =>
|
|
(enhancementFn as EnhancementFn)(parentDataFromDataTree, ...args);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Todo (abhinav): Specify styles here
|
|
type EnhancementFn = (parentProps: any, ...rest: any) => unknown;
|
|
type BoundEnhancementFn = (...rest: any) => unknown;
|
|
|
|
interface EnhancementFns {
|
|
updateDataTreePathFn?: BoundEnhancementFn;
|
|
propertyPaneEnhancementFn?: BoundEnhancementFn;
|
|
autoCompleteEnhancementFn?: BoundEnhancementFn;
|
|
customJSControlEnhancementFn?: BoundEnhancementFn;
|
|
hideEvaluatedValueEnhancementFn?: BoundEnhancementFn;
|
|
}
|
|
|
|
export function useChildWidgetEnhancementFns(widgetId: string): EnhancementFns {
|
|
const enhancementFns = {
|
|
updateDataTreePathFn: undefined,
|
|
propertyPaneEnhancementFn: undefined,
|
|
autoCompleteEnhancementFn: undefined,
|
|
customJSControlEnhancementFn: undefined,
|
|
hideEvaluatedValueEnhancementFn: undefined,
|
|
};
|
|
|
|
// Get all widgets from the canvas
|
|
const widgets: CanvasWidgetsReduxState = useSelector(getWidgets);
|
|
// Get the parent which wants to enhance this widget
|
|
const parentWithEnhancementFn = getParentWithEnhancementFn(widgetId, widgets);
|
|
// If such a parent is found
|
|
// Get the parent's evaluated data from the evaluatedTree
|
|
const parentDataFromDataTree: unknown = useSelector((state: AppState) =>
|
|
getPropsFromTree(state, parentWithEnhancementFn?.widgetName),
|
|
);
|
|
|
|
if (parentWithEnhancementFn) {
|
|
// Get the enhancement function based on the enhancementType
|
|
// from the configs
|
|
const widgetEnhancementFns = {
|
|
updateDataTreePathFn: getWidgetEnhancementFn(
|
|
parentWithEnhancementFn.type,
|
|
WidgetEnhancementType.UPDATE_DATA_TREE_PATH,
|
|
),
|
|
propertyPaneEnhancementFn: getWidgetEnhancementFn(
|
|
parentWithEnhancementFn.type,
|
|
WidgetEnhancementType.PROPERTY_UPDATE,
|
|
),
|
|
autoCompleteEnhancementFn: getWidgetEnhancementFn(
|
|
parentWithEnhancementFn.type,
|
|
WidgetEnhancementType.AUTOCOMPLETE,
|
|
),
|
|
customJSControlEnhancementFn: getWidgetEnhancementFn(
|
|
parentWithEnhancementFn.type,
|
|
WidgetEnhancementType.CUSTOM_CONTROL,
|
|
),
|
|
hideEvaluatedValueEnhancementFn: getWidgetEnhancementFn(
|
|
parentWithEnhancementFn.type,
|
|
WidgetEnhancementType.HIDE_EVALUATED_VALUE,
|
|
),
|
|
};
|
|
|
|
Object.keys(widgetEnhancementFns).map((key: string) => {
|
|
const enhancementFn = get(widgetEnhancementFns, `${key}`);
|
|
|
|
if (parentDataFromDataTree && enhancementFn) {
|
|
set(enhancementFns, `${key}`, (...args: unknown[]) =>
|
|
enhancementFn(parentDataFromDataTree, ...args),
|
|
);
|
|
}
|
|
});
|
|
}
|
|
|
|
return enhancementFns;
|
|
}
|