From 49e8a7d4ed1edce11d7ea323a50027177d59d59c Mon Sep 17 00:00:00 2001 From: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:34:55 +0530 Subject: [PATCH] fix: Add back canvas resize (#31058) ## Description Added back canvas resizing while switching to side by side. #### PR fixes following issue(s) Fixes https://github.com/appsmithorg/appsmith/issues/31057 #### Type of change - Bug fix (non-breaking change which fixes an issue) ## 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 - [x] My code follows the style guidelines of this project - [x] 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 - [x] My changes generate no new warnings - [ ] 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 - [ ] 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 ## Summary by CodeRabbit - **Refactor** - Enhanced the `useDynamicAppLayout` hook for improved layout calculations and control flow, removing dependencies on specific editor states and modes. --- .../src/utils/hooks/useDynamicAppLayout.tsx | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/app/client/src/utils/hooks/useDynamicAppLayout.tsx b/app/client/src/utils/hooks/useDynamicAppLayout.tsx index 4b73ab520c..c2156406fe 100644 --- a/app/client/src/utils/hooks/useDynamicAppLayout.tsx +++ b/app/client/src/utils/hooks/useDynamicAppLayout.tsx @@ -36,12 +36,6 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { useLocation } from "react-router"; import { CANVAS_VIEWPORT } from "constants/componentClassNameConstants"; import { getLayoutSystemType } from "selectors/layoutSystemSelectors"; -import { getIDEViewMode } from "selectors/ideSelectors"; -import { - EditorEntityTab, - EditorViewMode, -} from "@appsmith/entities/IDE/constants"; -import { useCurrentEditorState } from "pages/Editor/IDE/hooks"; const GUTTER_WIDTH = 72; export const AUTOLAYOUT_RESIZER_WIDTH_BUFFER = 40; @@ -73,8 +67,6 @@ export const useDynamicAppLayout = () => { const queryParams = new URLSearchParams(search); const isEmbed = queryParams.get("embed"); const isNavbarVisibleInEmbeddedApp = queryParams.get("navbar"); - const editorMode = useSelector(getIDEViewMode); - const { segment } = useCurrentEditorState(); const isPreviewing = isPreviewMode; @@ -171,22 +163,12 @@ export const useDynamicAppLayout = () => { if ( appMode === APP_MODE.EDIT && appLayout?.type === "FLUID" && - editorMode !== EditorViewMode.SplitScreen && - segment === EditorEntityTab.UI && ele && calculatedWidth > ele.clientWidth ) { calculatedWidth = ele.clientWidth; } - // Reduce the width of the border if splitscreen is enabled. - if ( - editorMode === EditorViewMode.SplitScreen && - appLayout?.type === "FLUID" - ) { - calculatedWidth -= 1; - } - switch (true) { case maxWidth < 0: case appLayout?.type === "FLUID":