Skip to content

Commit 38f788f

Browse files
committed
Address review feedback on persisted scroll and editor state
1 parent a753081 commit 38f788f

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

newIDE/app/src/InstancesEditor/CompactInstancePropertiesEditor/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,19 +170,19 @@ export const CompactInstancePropertiesEditor = ({
170170
.map((instance: gdInitialInstance) => '' + instance.ptr)
171171
.join(';');
172172

173-
const selectedObjectForScroll = React.useMemo(() => {
173+
const persistedScrollId = React.useMemo(() => {
174174
if (!instances.length) return null;
175175

176-
return getObjectByName(
176+
const selectedObjectForScroll = getObjectByName(
177177
globalObjectsContainer,
178178
objectsContainer,
179179
instances[0].getObjectName()
180180
);
181-
}, [globalObjectsContainer, instances, objectsContainer]);
182181

183-
const persistedScrollId = selectedObjectForScroll
184-
? selectedObjectForScroll.getPersistentUuid()
185-
: null;
182+
return selectedObjectForScroll
183+
? selectedObjectForScroll.getPersistentUuid()
184+
: null;
185+
}, [globalObjectsContainer, instances, objectsContainer]);
186186

187187
const onScroll = usePersistedScrollPosition({
188188
project,

newIDE/app/src/MainFrame/Preferences/PreferencesProvider.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,14 +1281,7 @@ export default class PreferencesProvider extends React.Component<Props, State> {
12811281
...editorState,
12821282
};
12831283

1284-
if (
1285-
mergedEditorState.editorTabs === null &&
1286-
Object.keys(mergedEditorState.propertiesPanelScroll).length === 0
1287-
) {
1288-
delete nextEditorStateByProject[projectId];
1289-
} else {
1290-
nextEditorStateByProject[projectId] = mergedEditorState;
1291-
}
1284+
nextEditorStateByProject[projectId] = mergedEditorState;
12921285
}
12931286

12941287
return {

0 commit comments

Comments
 (0)