Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 01:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes: widget inspector going to empty component (#7768)

Browse source
This commit is contained in:
Arpit 2023-10-11 13:41:25 +05:30 committed by GitHub
parent 520f8fcfe8
commit a23a1171f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
frontend/src/Editor/EditorFunc.jsx
View file

@ -1557,6 +1557,13 @@ const EditorComponent = (props) => {
</div>
);
}
const shouldrenderWidgetInspector =
currentSidebarTab === 1 &&
selectedComponents?.length === 1 &&
!isEmpty(appDefinition?.pages[currentPageId]?.components) &&
!isEmpty(appDefinition?.pages[currentPageId]?.components[selectedComponents[0]?.id]);
return (
<div className="editor wrapper">
<Confirm
@ -1791,32 +1798,22 @@ const EditorComponent = (props) => {
removeMultipleComponents={removeComponents}
/>
{currentSidebarTab === 1 && (
{shouldrenderWidgetInspector ? (
<div className="pages-container">
{selectedComponents.length === 1 &&
!isEmpty(appDefinition?.pages[currentPageId]?.components) &&
!isEmpty(appDefinition?.pages[currentPageId]?.components[selectedComponents[0]?.id]) && (
<Inspector
moveComponents={moveComponents}
componentDefinitionChanged={componentDefinitionChanged}
removeComponent={removeComponent}
selectedComponentId={selectedComponents[0].id}
allComponents={appDefinition?.pages[currentPageId]?.components}
key={selectedComponents[0].id}
switchSidebarTab={switchSidebarTab}
darkMode={props.darkMode}
pages={getPagesWithIds()}
></Inspector>
)}
<Inspector
moveComponents={moveComponents}
componentDefinitionChanged={componentDefinitionChanged}
removeComponent={removeComponent}
selectedComponentId={selectedComponents[0].id}
allComponents={appDefinition?.pages[currentPageId]?.components}
key={selectedComponents[0].id}
switchSidebarTab={switchSidebarTab}
darkMode={props.darkMode}
pages={getPagesWithIds()}
/>
</div>
)}
{(selectedComponents.length > 1 || currentSidebarTab === 2) && (
<WidgetManager
componentTypes={componentTypes}
zoomLevel={zoomLevel}
darkMode={props.darkMode}
></WidgetManager>
) : (
<WidgetManager componentTypes={componentTypes} zoomLevel={zoomLevel} darkMode={props.darkMode} />
)}
</div>
{config.COMMENT_FEATURE_ENABLE && showComments && (