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

Merge pull request #5247 from ToolJet/component-state-persists-duplicate-pages

Browse source 
Multipage: component and current state is persisted for duplicate pages
This commit is contained in:
Sherfin Shamsudeen 2023-01-09 12:06:52 +05:30 committed by GitHub
commit 54a9cc378c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontend/src/Editor/Box.jsx
View file

@ -282,6 +282,7 @@ export const Box = function Box({
{inCanvas ? (
!resetComponent ? (
<ComponentToRender
key={`${id}${currentState.page.id}`}
onComponentClick={onComponentClick}
onComponentOptionChanged={onComponentOptionChanged}
currentState={currentState}

2
frontend/src/Editor/Editor.jsx
View file

@ -1622,7 +1622,7 @@ class EditorComponent extends React.Component {
const { globals: existingGlobals } = this.state.currentState;
const page = {
...this.state.currentState.page,
id: pageId,
name,
handle,
variables: this.state.pages?.[pageId]?.variables ?? {},

2
frontend/src/Editor/Viewer.jsx
View file

@ -154,6 +154,7 @@ class ViewerComponent extends React.Component {
},
variables: {},
page: {
id: currentPage.id,
handle: currentPage.handle,
name: currentPage.name,
variables: {},
@ -337,6 +338,7 @@ class ViewerComponent extends React.Component {
name: targetPage.name,
handle: targetPage.handle,
variables: this.state.pages?.[pageIdCorrespondingToHandleOnURL]?.variables ?? {},
id: pageIdCorrespondingToHandleOnURL,
},
},
},