PromucFlow_constructor/app/client/src/layoutSystems/common/WidgetNamesCanvas/utils.ts

148 lines
4.7 KiB
TypeScript
Raw Normal View History

chore: code changes for widget position observer and widget name on canvas (#27367) ## Description The PR contains non integrated code changes for below new features, The changes are not integrated to work but only contains the ground work code changes that can be added to css based layout/ Anvil once that is available in Release. - **Widget Position observer-** Since we are moving to css based layout, the positions of widgets will be unknown. To solve the issue we have introduced the above feature that stores/updates position of widgets on Redux state whenever a widget position updates. without manually triggering any action - **Widget Name on Canvas-** For the New Layout the existing widget name is inconsistent as it would cut off or visually not visible. to solve that the widget name will now be drawn on html canvas than it being a dom node component #### PR fixes following issue(s) Fixes #26945 Fixes #26948 #### Type of change - Chore (housekeeping or task changes that don't impact user perception) ## Testing #### How Has This Been Tested? - [ ] Manual - [ ] JUnit - [ ] Jest #### 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 --------- Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Abhinav Jha <abhinav@appsmith.com>
2023-10-06 10:07:43 +00:00
import Konva from "konva";
import type { LayoutElementPosition } from "layoutSystems/common/types";
chore: code changes for widget position observer and widget name on canvas (#27367) ## Description The PR contains non integrated code changes for below new features, The changes are not integrated to work but only contains the ground work code changes that can be added to css based layout/ Anvil once that is available in Release. - **Widget Position observer-** Since we are moving to css based layout, the positions of widgets will be unknown. To solve the issue we have introduced the above feature that stores/updates position of widgets on Redux state whenever a widget position updates. without manually triggering any action - **Widget Name on Canvas-** For the New Layout the existing widget name is inconsistent as it would cut off or visually not visible. to solve that the widget name will now be drawn on html canvas than it being a dom node component #### PR fixes following issue(s) Fixes #26945 Fixes #26948 #### Type of change - Chore (housekeeping or task changes that don't impact user perception) ## Testing #### How Has This Been Tested? - [ ] Manual - [ ] JUnit - [ ] Jest #### 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 --------- Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Abhinav Jha <abhinav@appsmith.com>
2023-10-06 10:07:43 +00:00
import type { WidgetNameData, WidgetNamePositionData } from "./WidgetNameTypes";
import {
warningSVGPath,
WidgetNameState,
WIDGET_NAME_FILL_COLORS,
WIDGET_NAME_FONT_SIZE,
WIDGET_NAME_HEIGHT,
WIDGET_NAME_HORIZONTAL_PADDING,
WIDGET_NAME_ICON_PADDING,
WIDGET_NAME_TEXT_COLOR,
WIDGET_NAME_VERTICAL_PADDING,
} from "./WidgetNameConstants";
/**
* used to get the Konva Group Element that is a group of all the elements
* that are to be drawn as part of widget name on canvas
* @param position Position of widget
* @param widgetName widget name
* @param widgetNameData widget name data contains more information regarding the widget that helps in determining the state of widget name
* @param parentDOM DOM element the MainContainerWrapper component i.e, the parent of the canvas component
* @param htmlCanvasDOM DOM element of the html canvas on which the widget name is drawn
* @param scrollTop amount of pixels scrolled by canvas
* @returns an object that contains
* widgetName Group on Konva, position of widgetName on canvas and canvas offsets
*/
export const getWidgetNameComponent = (
position: LayoutElementPosition,
chore: code changes for widget position observer and widget name on canvas (#27367) ## Description The PR contains non integrated code changes for below new features, The changes are not integrated to work but only contains the ground work code changes that can be added to css based layout/ Anvil once that is available in Release. - **Widget Position observer-** Since we are moving to css based layout, the positions of widgets will be unknown. To solve the issue we have introduced the above feature that stores/updates position of widgets on Redux state whenever a widget position updates. without manually triggering any action - **Widget Name on Canvas-** For the New Layout the existing widget name is inconsistent as it would cut off or visually not visible. to solve that the widget name will now be drawn on html canvas than it being a dom node component #### PR fixes following issue(s) Fixes #26945 Fixes #26948 #### Type of change - Chore (housekeeping or task changes that don't impact user perception) ## Testing #### How Has This Been Tested? - [ ] Manual - [ ] JUnit - [ ] Jest #### 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 --------- Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Abhinav Jha <abhinav@appsmith.com>
2023-10-06 10:07:43 +00:00
widgetName: string,
widgetNameData: WidgetNameData,
parentDOM: HTMLDivElement | null,
htmlCanvasDOM: HTMLDivElement | undefined,
scrollTop: number,
) => {
let showIcon = false;
const { nameState } = widgetNameData;
if (nameState === WidgetNameState.ERROR) {
showIcon = true;
}
//Defining Text Element
const textEl = new Konva.Text({
fill: WIDGET_NAME_TEXT_COLOR,
fontFamily: "sans-serif",
fontSize: WIDGET_NAME_FONT_SIZE,
text: widgetName,
x: showIcon
? WIDGET_NAME_ICON_PADDING + WIDGET_NAME_HORIZONTAL_PADDING
: WIDGET_NAME_HORIZONTAL_PADDING,
y: WIDGET_NAME_VERTICAL_PADDING,
});
const textWidth: number = textEl.width();
const componentWidth: number =
textWidth +
WIDGET_NAME_HORIZONTAL_PADDING * 2 +
(showIcon ? WIDGET_NAME_ICON_PADDING : 0);
const {
canvasLeftOffset,
canvasTopOffset,
left: widgetLeft,
top: widgetTop,
} = getPositionsForBoundary(parentDOM, htmlCanvasDOM, position, scrollTop);
chore: add highlight calculation logic for layouts. (#27980) ## Description 1. Add LayoutComponent functionality. 2. Create Basic LayoutComponents. 3. Create LayoutPresets needed for Container-like widgets. 4. Add highlight calculation logic for all basic Layout Components. 5. Create dragging sagas for Anvil. 6. Create DraggingArena associated functionality to handle DnD in Anvil. #### PR fixes following issue(s) Fixes #27004 #### Type of change > Please delete options that are not relevant. - New feature (non-breaking change which adds functionality) ## Testing #### How Has This Been Tested? - [ ] Manual - [ ] JUnit - [x] Jest - [ ] Cypress ## Checklist: #### Dev activity - [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 - [x] 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 --------- Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Aswath K <aswath.sana@gmail.com> Co-authored-by: rahulramesha <rahul@appsmith.com> Co-authored-by: rahulramesha <71900764+rahulramesha@users.noreply.github.com>
2023-10-19 20:27:40 +00:00
const left: number = widgetLeft + position.width - componentWidth;
chore: code changes for widget position observer and widget name on canvas (#27367) ## Description The PR contains non integrated code changes for below new features, The changes are not integrated to work but only contains the ground work code changes that can be added to css based layout/ Anvil once that is available in Release. - **Widget Position observer-** Since we are moving to css based layout, the positions of widgets will be unknown. To solve the issue we have introduced the above feature that stores/updates position of widgets on Redux state whenever a widget position updates. without manually triggering any action - **Widget Name on Canvas-** For the New Layout the existing widget name is inconsistent as it would cut off or visually not visible. to solve that the widget name will now be drawn on html canvas than it being a dom node component #### PR fixes following issue(s) Fixes #26945 Fixes #26948 #### Type of change - Chore (housekeeping or task changes that don't impact user perception) ## Testing #### How Has This Been Tested? - [ ] Manual - [ ] JUnit - [ ] Jest #### 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 --------- Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Abhinav Jha <abhinav@appsmith.com>
2023-10-06 10:07:43 +00:00
const top: number = widgetTop - WIDGET_NAME_HEIGHT;
//Store the widget name positions for future use
const widgetNamePosition: WidgetNamePositionData = {
left: left,
top: top,
width: componentWidth,
height: WIDGET_NAME_HEIGHT,
widgetNameData: widgetNameData,
};
//rectangle encompassing the widget name
const rectEl = new Konva.Rect({
cornerRadius: [4, 4, 0, 0],
fill: WIDGET_NAME_FILL_COLORS[nameState],
height: WIDGET_NAME_HEIGHT,
width: componentWidth,
x: 0,
y: 0,
});
//Icon in widget name componenet in case of error
const iconEl = new Konva.Path({
x: WIDGET_NAME_HORIZONTAL_PADDING,
y: WIDGET_NAME_VERTICAL_PADDING,
data: warningSVGPath,
fill: WIDGET_NAME_TEXT_COLOR,
scaleX: 0.7,
scaleY: 0.7,
});
//Group Containing all the elements of that particular widget name
const groupEl = new Konva.Group({
height: WIDGET_NAME_HEIGHT,
width: componentWidth,
x: left,
y: top,
});
groupEl.add(rectEl);
groupEl.add(textEl);
showIcon && groupEl.add(iconEl);
return {
widgetNameComponent: groupEl,
widgetNamePosition,
canvasLeftOffset,
canvasTopOffset,
};
};
/**
* Used to calculate the positions of the widget with respect to the HTML Canvas that is rendered by Konva
* @param parentDOM DOM element the MainContainerWrapper component i.e, the parent of the canvas component
* @param htmlCanvasDOM DOM element of the html canvas on which the widget name is drawn
* @param position position of widget with respect to client window in pixels
* @param scrollTop amount of pixels scrolled by canvas
* @returns mainly the left and top of widget with respect to the html canvas
* and also the canvas offset
*/
const getPositionsForBoundary = (
parentDOM: HTMLDivElement | null,
htmlCanvasDOM: HTMLDivElement | undefined,
position: LayoutElementPosition,
chore: code changes for widget position observer and widget name on canvas (#27367) ## Description The PR contains non integrated code changes for below new features, The changes are not integrated to work but only contains the ground work code changes that can be added to css based layout/ Anvil once that is available in Release. - **Widget Position observer-** Since we are moving to css based layout, the positions of widgets will be unknown. To solve the issue we have introduced the above feature that stores/updates position of widgets on Redux state whenever a widget position updates. without manually triggering any action - **Widget Name on Canvas-** For the New Layout the existing widget name is inconsistent as it would cut off or visually not visible. to solve that the widget name will now be drawn on html canvas than it being a dom node component #### PR fixes following issue(s) Fixes #26945 Fixes #26948 #### Type of change - Chore (housekeeping or task changes that don't impact user perception) ## Testing #### How Has This Been Tested? - [ ] Manual - [ ] JUnit - [ ] Jest #### 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 --------- Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Abhinav Jha <abhinav@appsmith.com>
2023-10-06 10:07:43 +00:00
scrollTop: number,
) => {
const { left: parentLeft = 0, top: parentTop = 0 } =
parentDOM?.getBoundingClientRect() || {};
const { left: canvasLeft = 0, top: canvasTop = 0 } =
htmlCanvasDOM?.getBoundingClientRect() || {};
const canvasLeftOffset = parentLeft - canvasLeft;
const canvasTopOffset = parentTop - canvasTop;
const left: number = position.left + canvasLeftOffset;
const top: number = position.top + canvasTopOffset - scrollTop;
return { left, top, canvasLeftOffset, canvasTopOffset };
};