Skip to content

Commit c712ab3

Browse files
authored
fix: Correctly detect project manager open to fix some stall guided lessons (#5246)
1 parent 6c27c3d commit c712ab3

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

newIDE/app/resources/inAppTutorials/flingGame.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
"id": "OpenPropertiesManager",
154154
"elementToHighlightId": "#main-toolbar-project-manager-button",
155155
"nextStepTrigger": {
156-
"presenceOfElement": "div[role=\"presentation\"]:not([aria-hidden=true]) #project-manager-tab-game-settings"
156+
"presenceOfElement": "div[role=\"presentation\"]:is([data-open=true], :not([aria-hidden=true])) #project-manager-tab-game-settings"
157157
},
158158
"tooltip": {
159159
"description": {
@@ -169,7 +169,7 @@
169169
}
170170
},
171171
{
172-
"elementToHighlightId": "div[role=\"presentation\"]:not([aria-hidden=true]) #project-manager-tab-game-settings",
172+
"elementToHighlightId": "div[role=\"presentation\"]:is([data-open=true], :not([aria-hidden=true])) #project-manager-tab-game-settings",
173173
"nextStepTrigger": {
174174
"presenceOfElement": "#project-manager-tab-game-properties"
175175
},
@@ -1290,7 +1290,7 @@
12901290
"id": "OpenPropertiesManagerForExtension",
12911291
"elementToHighlightId": "#main-toolbar-project-manager-button",
12921292
"nextStepTrigger": {
1293-
"presenceOfElement": "div[role=\"presentation\"]:not([aria-hidden=true]) #project-manager-tab-extensions"
1293+
"presenceOfElement": "div[role=\"presentation\"]:is([data-open=true], :not([aria-hidden=true])) #project-manager-tab-extensions"
12941294
},
12951295
"tooltip": {
12961296
"title": {
@@ -1315,7 +1315,7 @@
13151315
}
13161316
},
13171317
{
1318-
"elementToHighlightId": "div[role=\"presentation\"]:not([aria-hidden=true]) #project-manager-tab-extensions",
1318+
"elementToHighlightId": "div[role=\"presentation\"]:is([data-open=true], :not([aria-hidden=true])) #project-manager-tab-extensions",
13191319
"nextStepTrigger": {
13201320
"presenceOfElement": "#project-manager-extension-search-or-create"
13211321
},
@@ -3330,7 +3330,7 @@
33303330
{
33313331
"elementToHighlightId": "#main-toolbar-project-manager-button",
33323332
"nextStepTrigger": {
3333-
"presenceOfElement": "div[role=\"presentation\"]:not([aria-hidden=true]) #project-manager-tab-game-settings"
3333+
"presenceOfElement": "div[role=\"presentation\"]:is([data-open=true], :not([aria-hidden=true])) #project-manager-tab-game-settings"
33343334
},
33353335
"tooltip": {
33363336
"title": {
@@ -5367,7 +5367,7 @@
53675367
{
53685368
"elementToHighlightId": "#main-toolbar-project-manager-button",
53695369
"nextStepTrigger": {
5370-
"presenceOfElement": "div[role=\"presentation\"]:not([aria-hidden=true]) #project-manager-tab-game-settings"
5370+
"presenceOfElement": "div[role=\"presentation\"]:is([data-open=true], :not([aria-hidden=true])) #project-manager-tab-game-settings"
53715371
},
53725372
"tooltip": {
53735373
"description": {

newIDE/app/src/InAppTutorial/InAppTutorialOrchestrator.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ const interpolateElementId = (
186186
) {
187187
const splittedElementId = elementId.split(':');
188188
const sceneKey = splittedElementId[1];
189-
return `div[role="presentation"]:not([aria-hidden=true]) #project-manager [id^="scene-item"][data-scene="${
189+
return `div[role="presentation"][data-open="true"] #project-manager [id^="scene-item"][data-scene="${
190190
data[sceneKey]
191191
}"]`;
192192
} else if (

newIDE/app/src/MainFrame/index.js

+4
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ import {
179179
import CustomDragLayer from '../UI/DragAndDrop/CustomDragLayer';
180180
import CloudProjectRecoveryDialog from '../ProjectsStorage/CloudStorageProvider/CloudProjectRecoveryDialog';
181181
import CloudProjectSaveChoiceDialog from '../ProjectsStorage/CloudStorageProvider/CloudProjectSaveChoiceDialog';
182+
import { dataObjectToProps } from '../Utils/HTMLDataset';
182183

183184
const GD_STARTUP_TIMES = global.GD_STARTUP_TIMES || [];
184185

@@ -2983,6 +2984,9 @@ const MainFrame = (props: Props) => {
29832984
keepMounted: true,
29842985
}}
29852986
onClose={toggleProjectManager}
2987+
{...dataObjectToProps({
2988+
open: projectManagerOpen ? 'true' : undefined,
2989+
})}
29862990
>
29872991
<DrawerTopBar
29882992
title={

0 commit comments

Comments
 (0)