Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Widget Overflow and Show Binding issue #35651

Merged
merged 1 commit into from
Aug 13, 2024
Merged

fix: Widget Overflow and Show Binding issue #35651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ import { Button } from "@appsmith/ads";
import { getEntityProperties } from "ee/pages/Editor/Explorer/Entity/getEntityProperties";
import store from "store";
import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
import {
APP_SIDEBAR_WIDTH,
DEFAULT_EXPLORER_PANE_WIDTH,
} from "../../../../constants/AppConstants";

const BindingContainerMaxHeight = 300;
const EntityHeight = 36;
Expand Down Expand Up @@ -127,7 +131,8 @@ export function EntityProperties() {
ref.current.style.top = top - EntityHeight + "px";
ref.current.style.bottom = "unset";
}
ref.current.style.left = "100%";
ref.current.style.left =
APP_SIDEBAR_WIDTH + DEFAULT_EXPLORER_PANE_WIDTH + "px";
}
}, [entityId]);

Expand Down
5 changes: 1 addition & 4 deletions app/client/src/pages/Editor/IDE/EditorPane/Explorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
BUILDER_PATH,
BUILDER_PATH_DEPRECATED,
} from "ee/constants/routes/appRoutes";
import EntityProperties from "pages/Editor/Explorer/Entity/EntityProperties";
import SegmentedHeader from "./components/SegmentedHeader";
import { useSelector } from "react-redux";
import { getIDEViewMode } from "selectors/ideSelectors";
Expand All @@ -34,16 +33,14 @@ const EditorPaneExplorer = () => {
}
className="relative ide-editor-left-pane__content"
flexDirection="column"
overflow="hidden"
width={
ideViewMode === EditorViewMode.FullScreen
? DEFAULT_EXPLORER_PANE_WIDTH
: "100%"
}
>
<SegmentedHeader />
{/** Entity Properties component is needed to render
the Bindings popover in the context menu. Will be removed eventually **/}
<EntityProperties />
<Switch>
<SentryRoute
component={JSExplorer}
Expand Down
5 changes: 5 additions & 0 deletions app/client/src/pages/Editor/IDE/EditorPane/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Editor from "./Editor";
import { useSelector } from "react-redux";
import { getIDEViewMode } from "selectors/ideSelectors";
import { EditorViewMode } from "ee/entities/IDE/constants";
import EntityProperties from "pages/Editor/Explorer/Entity/EntityProperties";

const EditorPane = () => {
const width = useEditorPaneWidth();
Expand All @@ -27,6 +28,10 @@ const EditorPane = () => {
height="100%"
width={width}
>
{/** Entity Properties component is necessary to render
the Bindings popover in the context menu.
Will be removed eventually **/}
<EntityProperties />
<EditorPaneExplorer />
<Editor />
</Flex>
Expand Down
Loading