Fix storybook and add story for AsyncSemiControlledTextField (4ian#6854)

psydox · Aug 8, 2024 · 45f25df · 45f25df
1 parent 55eddb4
commit 45f25df
Show file tree

Hide file tree

Showing 59 changed files with 178 additions and 69 deletions.
diff --git a/newIDE/app/src/EventsBasedObjectEditor/EventBasedObjectChildrenEditor.js b/newIDE/app/src/EventsBasedObjectEditor/EventBasedObjectChildrenEditor.js
@@ -16,7 +16,7 @@ import {
   type ObjectFolderOrObjectWithContext,
 } from '../ObjectsList/EnumerateObjectFolderOrObject';
 import { type UnsavedChanges } from '../MainFrame/UnsavedChangesContext';
-import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope';
 
 const gd: libGDevelop = global.gd;
 

diff --git a/newIDE/app/src/EventsBasedObjectEditor/EventsBasedObjectEditorPanel.js b/newIDE/app/src/EventsBasedObjectEditor/EventsBasedObjectEditorPanel.js
@@ -8,7 +8,7 @@ import EventBasedObjectChildrenEditor from './EventBasedObjectChildrenEditor';
 import Background from '../UI/Background';
 import { Column, Line } from '../UI/Grid';
 import { type UnsavedChanges } from '../MainFrame/UnsavedChangesContext';
-import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope';
 
 type TabName = 'configuration' | 'properties' | 'children';
 

diff --git a/newIDE/app/src/EventsFunctionsExtensionEditor/EventsFunctionConfigurationEditor/index.js b/newIDE/app/src/EventsFunctionsExtensionEditor/EventsFunctionConfigurationEditor/index.js
@@ -12,7 +12,7 @@ import { type GroupWithContext } from '../../ObjectsList/EnumerateObjects';
 import { type UnsavedChanges } from '../../MainFrame/UnsavedChangesContext';
 import newNameGenerator from '../../Utils/NewNameGenerator';
 import { type ExtensionItemConfigurationAttribute } from '../../EventsFunctionsExtensionEditor';
-import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope';
 
 const gd: libGDevelop = global.gd;
 

diff --git a/newIDE/app/src/EventsFunctionsExtensionEditor/index.js b/newIDE/app/src/EventsFunctionsExtensionEditor/index.js
@@ -40,7 +40,7 @@ import ExtensionEditIcon from '../UI/CustomSvgIcons/ExtensionEdit';
 import Tune from '../UI/CustomSvgIcons/Tune';
 import Mark from '../UI/CustomSvgIcons/Mark';
 import newNameGenerator from '../Utils/NewNameGenerator';
-import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope';
 import GlobalAndSceneVariablesDialog from '../VariablesList/GlobalAndSceneVariablesDialog';
 
 const gd: libGDevelop = global.gd;

diff --git a/newIDE/app/src/EventsSheet/EventsFunctionExtractor/EventsFunctionExtractorDialog.js b/newIDE/app/src/EventsSheet/EventsFunctionExtractor/EventsFunctionExtractorDialog.js
@@ -25,7 +25,7 @@ import { EventsFunctionParametersEditor } from '../../EventsFunctionsExtensionEd
 import { EventsFunctionPropertiesEditor } from '../../EventsFunctionsExtensionEditor/EventsFunctionConfigurationEditor/EventsFunctionPropertiesEditor';
 import HelpButton from '../../UI/HelpButton';
 import { ColumnStackLayout, ResponsiveLineStackLayout } from '../../UI/Layout';
-import { type EventsScope } from '../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../InstructionOrExpression/EventsScope';
 const gd: libGDevelop = global.gd;
 
 type Props = {|

diff --git a/newIDE/app/src/EventsSheet/EventsFunctionExtractor/index.js b/newIDE/app/src/EventsSheet/EventsFunctionExtractor/index.js
@@ -6,7 +6,7 @@ import getObjectGroupByName from '../../Utils/GetObjectGroupByName';
 import {
   ProjectScopedContainersAccessor,
   type EventsScope,
-} from '../../InstructionOrExpression/EventsScope.flow';
+} from '../../InstructionOrExpression/EventsScope';
 const gd: libGDevelop = global.gd;
 
 /**

diff --git a/newIDE/app/src/EventsSheet/EventsTree/Instruction.js b/newIDE/app/src/EventsSheet/EventsTree/Instruction.js
@@ -41,7 +41,7 @@ import GDevelopThemeContext from '../../UI/Theme/GDevelopThemeContext';
 import {
   type EventsScope,
   ProjectScopedContainersAccessor,
-} from '../../InstructionOrExpression/EventsScope.flow';
+} from '../../InstructionOrExpression/EventsScope';
 import { enumerateParametersUsableInExpressions } from '../ParameterFields/EnumerateFunctionParameters';
 import { getFunctionNameFromType } from '../../EventsFunctionsExtensionsLoader';
 import { ExtensionStoreContext } from '../../AssetStore/ExtensionStore/ExtensionStoreContext';

diff --git a/newIDE/app/src/EventsSheet/EventsTree/InstructionsList.js b/newIDE/app/src/EventsSheet/EventsTree/InstructionsList.js
@@ -20,7 +20,7 @@ import { useLongTouch } from '../../Utils/UseLongTouch';
 import {
   type EventsScope,
   ProjectScopedContainersAccessor,
-} from '../../InstructionOrExpression/EventsScope.flow';
+} from '../../InstructionOrExpression/EventsScope';
 
 const styles = {
   addButton: {

diff --git a/newIDE/app/src/EventsSheet/EventsTree/Renderers/EventRenderer.js b/newIDE/app/src/EventsSheet/EventsTree/Renderers/EventRenderer.js
@@ -6,10 +6,10 @@ import {
   type ParameterContext,
   type VariableDeclarationContext,
 } from '../../SelectionHandler';
-import { type EventsScope } from '../../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../../InstructionOrExpression/EventsScope';
 import { type ScreenType } from '../../../UI/Responsive/ScreenTypeMeasurer';
 import { type WindowSizeType } from '../../../UI/Responsive/ResponsiveWindowMeasurer';
-import { ProjectScopedContainersAccessor } from '../../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../../InstructionOrExpression/EventsScope';
 
 export type EventRendererProps = {
   project: gdProject,

diff --git a/newIDE/app/src/EventsSheet/EventsTree/Renderers/ForEachChildVariableEvent.js b/newIDE/app/src/EventsSheet/EventsTree/Renderers/ForEachChildVariableEvent.js
@@ -23,7 +23,7 @@ import { type EventRendererProps } from './EventRenderer';
 import ConditionsActionsColumns from '../ConditionsActionsColumns';
 import { Trans } from '@lingui/macro';
 import { shouldActivate } from '../../../UI/KeyboardShortcuts/InteractionKeys';
-import { ProjectScopedContainersAccessor } from '../../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../../InstructionOrExpression/EventsScope';
 
 const gd: libGDevelop = global.gd;
 

diff --git a/newIDE/app/src/EventsSheet/EventsTree/index.js b/newIDE/app/src/EventsSheet/EventsTree/index.js
@@ -27,7 +27,7 @@ import {
   type ParameterContext,
   type VariableDeclarationContext,
 } from '../SelectionHandler';
-import { type EventsScope } from '../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../InstructionOrExpression/EventsScope';
 import getObjectByName from '../../Utils/GetObjectByName';
 import ObjectsRenderingService from '../../ObjectsRendering/ObjectsRenderingService';
 import { type ScreenType } from '../../UI/Responsive/ScreenTypeMeasurer';
@@ -52,7 +52,7 @@ import { dataObjectToProps } from '../../Utils/HTMLDataset';
 import useForceUpdate from '../../Utils/UseForceUpdate';
 import { useLongTouch } from '../../Utils/UseLongTouch';
 import GDevelopThemeContext from '../../UI/Theme/GDevelopThemeContext';
-import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope';
 
 const gd: libGDevelop = global.gd;
 

diff --git a/newIDE/app/src/EventsSheet/InlineParameterEditor.js b/newIDE/app/src/EventsSheet/InlineParameterEditor.js
@@ -3,7 +3,7 @@ import * as React from 'react';
 import InlinePopover from './InlinePopover';
 import ParameterRenderingService from './ParameterRenderingService';
 import { type ResourceManagementProps } from '../ResourcesList/ResourceSource';
-import { type EventsScope } from '../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../InstructionOrExpression/EventsScope';
 import { setupInstructionParameters } from '../InstructionOrExpression/SetupInstructionParameters';
 import { getObjectParameterIndex } from '../InstructionOrExpression/EnumerateInstructions';
 import { type ParameterFieldInterface } from './ParameterFields/ParameterFieldCommons';
@@ -14,7 +14,7 @@ import {
   getAvoidSoftKeyboardStyle,
   useSoftKeyboardBottomOffset,
 } from '../UI/MobileSoftKeyboard';
-import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope';
 
 const gd: libGDevelop = global.gd;
 

diff --git a/newIDE/app/src/EventsSheet/InstructionEditor/InstructionEditor.js b/newIDE/app/src/EventsSheet/InstructionEditor/InstructionEditor.js
@@ -13,7 +13,7 @@ import {
   type EnumeratedInstructionMetadata,
   filterEnumeratedInstructionOrExpressionMetadataByScope,
 } from '../../InstructionOrExpression/EnumeratedInstructionOrExpressionMetadata';
-import { type EventsScope } from '../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../InstructionOrExpression/EventsScope';
 const gd: libGDevelop = global.gd;
 
 /** Helper to get the gdInstructionMetadata of an instruction. */

diff --git a/newIDE/app/src/EventsSheet/InstructionEditor/InstructionEditorDialog.js b/newIDE/app/src/EventsSheet/InstructionEditor/InstructionEditorDialog.js
@@ -15,7 +15,7 @@ import InstructionOrObjectSelector, {
 } from './InstructionOrObjectSelector';
 import InstructionOrExpressionSelector from './InstructionOrExpressionSelector';
 import HelpButton from '../../UI/HelpButton';
-import { type EventsScope } from '../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../InstructionOrExpression/EventsScope';
 import { SelectColumns } from '../../UI/Responsive/SelectColumns';
 import { useResponsiveWindowSize } from '../../UI/Responsive/ResponsiveWindowMeasurer';
 import {
@@ -33,7 +33,7 @@ import ExtensionsSearchDialog from '../../AssetStore/ExtensionStore/ExtensionsSe
 import { sendBehaviorAdded } from '../../Utils/Analytics/EventSender';
 import { useShouldAutofocusInput } from '../../UI/Responsive/ScreenTypeMeasurer';
 import ErrorBoundary from '../../UI/ErrorBoundary';
-import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope';
 
 const styles = {
   fullHeightSelector: {

diff --git a/newIDE/app/src/EventsSheet/InstructionEditor/InstructionEditorMenu.js b/newIDE/app/src/EventsSheet/InstructionEditor/InstructionEditorMenu.js
@@ -13,14 +13,14 @@ import InstructionOrObjectSelector, {
   type TabName,
 } from './InstructionOrObjectSelector';
 import InstructionOrExpressionSelector from './InstructionOrExpressionSelector';
-import { type EventsScope } from '../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../InstructionOrExpression/EventsScope';
 import { SelectColumns } from '../../UI/Responsive/SelectColumns';
 import useForceUpdate from '../../Utils/UseForceUpdate';
 import { setupInstructionParameters } from '../../InstructionOrExpression/SetupInstructionParameters';
 import TextButton from '../../UI/TextButton';
 import Paste from '../../UI/CustomSvgIcons/Paste';
 import { Column, Line } from '../../UI/Grid';
-import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope';
 
 const styles = {
   fullHeightSelector: {

diff --git a/...p/src/EventsSheet/InstructionEditor/InstructionOrExpressionSelector/ExpressionSelector.js b/...p/src/EventsSheet/InstructionEditor/InstructionOrExpressionSelector/ExpressionSelector.js
@@ -11,7 +11,7 @@ import {
   type EnumeratedExpressionMetadata,
   filterEnumeratedInstructionOrExpressionMetadataByScope,
 } from '../../../InstructionOrExpression/EnumeratedInstructionOrExpressionMetadata';
-import { type EventsScope } from '../../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../../InstructionOrExpression/EventsScope';
 
 type Props = {|
   expressionType: string,

diff --git a/.../src/EventsSheet/InstructionEditor/InstructionOrExpressionSelector/InstructionSelector.js b/.../src/EventsSheet/InstructionEditor/InstructionOrExpressionSelector/InstructionSelector.js
@@ -11,7 +11,7 @@ import {
   type EnumeratedInstructionMetadata,
   filterEnumeratedInstructionOrExpressionMetadataByScope,
 } from '../../../InstructionOrExpression/EnumeratedInstructionOrExpressionMetadata';
-import { type EventsScope } from '../../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../../InstructionOrExpression/EventsScope';
 
 type Props = {|
   isCondition: boolean,

diff --git a/newIDE/app/src/EventsSheet/InstructionEditor/InstructionOrObjectSelector.js b/newIDE/app/src/EventsSheet/InstructionEditor/InstructionOrObjectSelector.js
@@ -40,7 +40,7 @@ import {
   getObjectOrObjectGroupListItemValue,
   getInstructionListItemValue,
 } from './SelectorListItems/Keys';
-import { type EventsScope } from '../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../InstructionOrExpression/EventsScope';
 import {
   type SearchResult,
   tuneMatches,

diff --git a/newIDE/app/src/EventsSheet/InstructionEditor/InstructionParametersEditor.js b/newIDE/app/src/EventsSheet/InstructionEditor/InstructionParametersEditor.js
@@ -18,7 +18,7 @@ import Window from '../../Utils/Window';
 import { getExtraInstructionInformation } from '../../Hints';
 import DismissableTutorialMessage from '../../Hints/DismissableTutorialMessage';
 import { isAnEventFunctionMetadata } from '../../EventsFunctionsExtensionsLoader';
-import { type EventsScope } from '../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../InstructionOrExpression/EventsScope';
 import { getObjectParameterIndex } from '../../InstructionOrExpression/EnumerateInstructions';
 import Text from '../../UI/Text';
 import { getInstructionMetadata } from './InstructionEditor';
@@ -34,7 +34,7 @@ import {
   type FieldFocusFunction,
 } from '../ParameterFields/ParameterFieldCommons';
 import Edit from '../../UI/CustomSvgIcons/Edit';
-import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope';
 
 const gd: libGDevelop = global.gd;
 

diff --git a/.../app/src/EventsSheet/ParameterFields/GenericExpressionField/ExpressionParametersEditor.js b/.../app/src/EventsSheet/ParameterFields/GenericExpressionField/ExpressionParametersEditor.js
@@ -1,11 +1,11 @@
 // @flow
 import { Trans } from '@lingui/macro';
-import { type EventsScope } from '../../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../../InstructionOrExpression/EventsScope';
 import * as React from 'react';
 import { mapFor } from '../../../Utils/MapFor';
 import EmptyMessage from '../../../UI/EmptyMessage';
 import { ColumnStackLayout } from '../../../UI/Layout';
-import { ProjectScopedContainersAccessor } from '../../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../../InstructionOrExpression/EventsScope';
 
 export type ParameterValues = Array<string>;
 

diff --git a/...rc/EventsSheet/ParameterFields/GenericExpressionField/ExpressionParametersEditorDialog.js b/...rc/EventsSheet/ParameterFields/GenericExpressionField/ExpressionParametersEditorDialog.js
@@ -1,13 +1,13 @@
 // @flow
 import React from 'react';
 import { Trans } from '@lingui/macro';
-import { type EventsScope } from '../../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../../InstructionOrExpression/EventsScope';
 import ExpressionParametersEditor from './ExpressionParametersEditor';
 import Dialog, { DialogPrimaryButton } from '../../../UI/Dialog';
 import Text from '../../../UI/Text';
 import { Column } from '../../../UI/Grid';
 import HelpButton from '../../../UI/HelpButton';
-import { ProjectScopedContainersAccessor } from '../../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../../InstructionOrExpression/EventsScope';
 
 export type ParameterValues = Array<string>;
 

diff --git a/newIDE/app/src/EventsSheet/ParameterFields/GenericExpressionField/index.js b/newIDE/app/src/EventsSheet/ParameterFields/GenericExpressionField/index.js
@@ -48,7 +48,7 @@ import {
   shouldValidate,
 } from '../../../UI/KeyboardShortcuts/InteractionKeys';
 import Paper from '../../../UI/Paper';
-import { ProjectScopedContainersAccessor } from '../../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../../InstructionOrExpression/EventsScope';
 
 const gd: libGDevelop = global.gd;
 

diff --git a/newIDE/app/src/EventsSheet/ParameterFields/ParameterFieldCommons.js b/newIDE/app/src/EventsSheet/ParameterFields/ParameterFieldCommons.js
@@ -1,8 +1,8 @@
 // @flow
 import { type ResourceManagementProps } from '../../ResourcesList/ResourceSource';
-import { type EventsScope } from '../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../InstructionOrExpression/EventsScope';
 import { type MessageDescriptor } from '../../Utils/i18n/MessageDescriptor.flow';
-import { type ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope.flow';
+import { type ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope';
 
 export type ParameterRenderingServiceType = {
   components: any,

diff --git a/newIDE/app/src/EventsSheet/ParameterFields/ParameterInlineRenderer.flow.js b/newIDE/app/src/EventsSheet/ParameterFields/ParameterInlineRenderer.flow.js
@@ -1,7 +1,7 @@
 // @flow
 import * as React from 'react';
-import { type EventsScope } from '../../InstructionOrExpression/EventsScope.flow';
-import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../../InstructionOrExpression/EventsScope';
+import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope';
 
 export type InvalidParameterValueProps = {|
   children: React.Node,

diff --git a/newIDE/app/src/EventsSheet/ParameterFields/VariableField.js b/newIDE/app/src/EventsSheet/ParameterFields/VariableField.js
@@ -38,7 +38,7 @@ import GlobalVariableIcon from '../../UI/CustomSvgIcons/GlobalVariable';
 import SceneVariableIcon from '../../UI/CustomSvgIcons/SceneVariable';
 import ObjectVariableIcon from '../../UI/CustomSvgIcons/ObjectVariable';
 import LocalVariableIcon from '../../UI/CustomSvgIcons/LocalVariable';
-import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope';
 import Link from '../../UI/Link';
 import Add from '../../UI/CustomSvgIcons/Add';
 

diff --git a/newIDE/app/src/EventsSheet/SelectionHandler.js b/newIDE/app/src/EventsSheet/SelectionHandler.js
@@ -1,7 +1,7 @@
 // @flow
 
 import values from 'lodash/values';
-import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope';
 
 export type InstructionsListContext = {|
   isCondition: boolean,

diff --git a/newIDE/app/src/EventsSheet/SelectionHandler.spec.js b/newIDE/app/src/EventsSheet/SelectionHandler.spec.js
@@ -18,7 +18,7 @@ import {
   getLastSelectedInstructionContext,
 } from './SelectionHandler';
 import { makeTestProject } from '../fixtures/TestProject';
-import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope';
 
 const gd: libGDevelop = global.gd;
 

diff --git a/newIDE/app/src/EventsSheet/index.js b/newIDE/app/src/EventsSheet/index.js
@@ -80,7 +80,7 @@ import PreferencesContext, {
 } from '../MainFrame/Preferences/PreferencesContext';
 import EventsFunctionExtractorDialog from './EventsFunctionExtractor/EventsFunctionExtractorDialog';
 import { createNewInstructionForEventsFunction } from './EventsFunctionExtractor';
-import { type EventsScope } from '../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../InstructionOrExpression/EventsScope';
 import {
   pasteEventsFromClipboardInSelection,
   copySelectionToClipboard,
@@ -112,7 +112,7 @@ import {
   registerOnResourceExternallyChangedCallback,
   unregisterOnResourceExternallyChangedCallback,
 } from '../MainFrame/ResourcesWatcher';
-import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope';
 import LocalVariablesDialog from '../VariablesList/LocalVariablesDialog';
 import GlobalAndSceneVariablesDialog from '../VariablesList/GlobalAndSceneVariablesDialog';
 

diff --git a/newIDE/app/src/ExpressionAutocompletion/ExpressionAutocompletion.spec.js b/newIDE/app/src/ExpressionAutocompletion/ExpressionAutocompletion.spec.js
@@ -3,7 +3,7 @@ import {
   getAutocompletionsFromDescriptions,
   insertAutocompletionInExpression,
 } from '.';
-import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope';
 
 const gd: libGDevelop = global.gd;
 

diff --git a/newIDE/app/src/ExpressionAutocompletion/index.js b/newIDE/app/src/ExpressionAutocompletion/index.js
@@ -2,7 +2,7 @@
 import { type I18n as I18nType } from '@lingui/core';
 import { mapFor, mapVector } from '../Utils/MapFor';
 import flatten from 'lodash/flatten';
-import { type EventsScope } from '../InstructionOrExpression/EventsScope.flow';
+import { type EventsScope } from '../InstructionOrExpression/EventsScope';
 import {
   enumerateFreeExpressions,
   filterExpressions,
@@ -19,7 +19,7 @@ import getObjectByName from '../Utils/GetObjectByName';
 import { getAllPointNames } from '../ObjectEditor/Editors/SpriteEditor/Utils/SpriteObjectHelper';
 import { enumerateParametersUsableInExpressions } from '../EventsSheet/ParameterFields/EnumerateFunctionParameters';
 import { filterStringListWithPrefix } from '../Utils/ListFiltering';
-import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../InstructionOrExpression/EventsScope';
 
 const gd: libGDevelop = global.gd;
 

diff --git a/newIDE/app/src/InstancesEditor/CompactInstancePropertiesEditor/index.js b/newIDE/app/src/InstancesEditor/CompactInstancePropertiesEditor/index.js
@@ -27,7 +27,7 @@ import {
   makeSchema,
   reorderInstanceSchemaForCustomProperties,
 } from './CompactPropertiesSchema';
-import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope';
 import TileSetVisualizer, {
   type TileMapTileSelection,
 } from '../TileSetVisualizer';

diff --git a/newIDE/app/src/InstancesEditor/InstancePropertiesEditor/index.js b/newIDE/app/src/InstancesEditor/InstancePropertiesEditor/index.js
@@ -23,7 +23,7 @@ import VariablesList, {
 import ShareExternal from '../../UI/CustomSvgIcons/ShareExternal';
 import useForceUpdate from '../../Utils/UseForceUpdate';
 import ErrorBoundary from '../../UI/ErrorBoundary';
-import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope';
 
 const gd: libGDevelop = global.gd;
 

diff --git a/newIDE/app/src/InstructionOrExpression/EnumeratedInstructionOrExpressionMetadata.js b/newIDE/app/src/InstructionOrExpression/EnumeratedInstructionOrExpressionMetadata.js
@@ -1,5 +1,5 @@
 //@flow
-import { type EventsScope } from './EventsScope.flow';
+import { type EventsScope } from './EventsScope';
 const gd: libGDevelop = global.gd;
 
 export type InstructionOrExpressionScope = {|

diff --git a/...structionOrExpression/EventsScope.flow.js → ...rc/InstructionOrExpression/EventsScope.js b/...structionOrExpression/EventsScope.flow.js → ...rc/InstructionOrExpression/EventsScope.js
@@ -1,5 +1,4 @@
 // @flow
-const gd: libGDevelop = global.gd;
 
 // Instruction or expression can be private (see IsPrivate, SetPrivate).
 // Their visibility will change according to the scope (i.e: if we're
@@ -46,6 +45,8 @@ export class ProjectScopedContainersAccessor {
       eventsBasedObject,
       eventsFunction,
     } = this._scope;
+    const gd: libGDevelop = global.gd;
+
     if (layout) {
       projectScopedContainers = gd.ProjectScopedContainers.makeNewProjectScopedContainersForProjectAndLayout(
         project,

diff --git a/newIDE/app/src/MainFrame/EditorContainers/CustomObjectEditorContainer.js b/newIDE/app/src/MainFrame/EditorContainers/CustomObjectEditorContainer.js
@@ -10,7 +10,7 @@ import {
   unregisterOnResourceExternallyChangedCallback,
 } from '../ResourcesWatcher';
 import SceneEditor from '../../SceneEditor';
-import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope.flow';
+import { ProjectScopedContainersAccessor } from '../../InstructionOrExpression/EventsScope';
 
 const gd: libGDevelop = global.gd;