Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the events-based objects editor that were never showing up in dev mode (#4279)

Browse Source 
* Don't show in changelogs
This commit is contained in:
D8H
2022-09-12 10:48:22 +02:00
committed by GitHub
parent db74a59730
commit 3e32cb8cea
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
newIDE/app/src/EventsFunctionsExtensionEditor/index.js
View File

@@ -1410,15 +1410,21 @@ export default class EventsFunctionsExtensionEditor extends React.Component<
)
}
initialNodes={
isDev !==
// "objects-list" must only appear in dev mode.
isDev ===
mosaicContainsNode(
initialMosaicEditorNodes,
getDefaultEditorMosaicNode(
'events-functions-extension-editor'
) || initialMosaicEditorNodes,
'objects-list'
)
? getDefaultEditorMosaicNode(
'events-functions-extension-editor'
) || initialMosaicEditorNodes
: initialMosaicEditorNodes
: // Force the mosaic to reset to default.
// It contains "objects-list" only
// in dev mode.
initialMosaicEditorNodes
}
/>
)}

8
newIDE/app/src/UI/EditorMosaic/index.js
View File

@@ -39,10 +39,10 @@ export const mosaicContainsNode = (
return (
!!mosaic &&
(mosaic === node ||
(!!mosaic.first &&
mosaicContainsNode(((mosaic.first: ?any): ?EditorMosaicNode), node) &&
!!mosaic.second &&
mosaicContainsNode(((mosaic.second: ?any): ?EditorMosaicNode), node)))
// $FlowFixMe
((!!mosaic.first && mosaicContainsNode(mosaic.first, node)) ||
// $FlowFixMe
(!!mosaic.second && mosaicContainsNode(mosaic.second, node))))
);
};