Add back autocompletion for external events from other scenes

4ian · May 14, 2024 · 44b6863 · 44b6863
1 parent 7308722
commit 44b6863
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/newIDE/app/src/EventsSheet/EventsTree/Renderers/LinkEvent/ExternalEventsAutoComplete.js b/newIDE/app/src/EventsSheet/EventsTree/Renderers/LinkEvent/ExternalEventsAutoComplete.js
@@ -1,7 +1,6 @@
 // @flow
 import * as React from 'react';
 import {
- enumerateLayouts,
  enumerateExternalEvents,
 } from '../../../../ProjectManager/EnumerateProjectItems';
 import SemiControlledAutoComplete, {
@@ -17,16 +16,29 @@ const getList = (
  return [];
  }
 
- const externalEvents = enumerateExternalEvents(project)
- .filter(
- externalEvents =>
- externalEvents.getName() !== currentExternalEventName &&
- externalEvents.getAssociatedLayout() === currentSceneName
- )
- .map(externalEvents => ({
+ const currentSceneExternalEvents = [];
+ const otherScenesExternalEvents = [];
+ for (const externalEvents of enumerateExternalEvents(project)) {
+ if (externalEvents.getName() === currentExternalEventName) {
+ continue;
+ }
+ if (externalEvents.getAssociatedLayout() === currentSceneName) {
+ currentSceneExternalEvents.push(externalEvents);
+ } else {
+ otherScenesExternalEvents.push(externalEvents);
+ }
+ }
+ const externalEvents = [
+ ...currentSceneExternalEvents.map(externalEvents => ({
+ text: externalEvents.getName(),
+ value: externalEvents.getName(),
+ })),
+ { type: 'separator' },
+ ...otherScenesExternalEvents.map(externalEvents => ({
  text: externalEvents.getName(),
  value: externalEvents.getName(),
- }));
+ })),
+ ];
 
  return externalEvents;
 };

diff --git a/newIDE/app/src/EventsSheet/EventsTree/Renderers/LinkEvent/index.js b/newIDE/app/src/EventsSheet/EventsTree/Renderers/LinkEvent/index.js
@@ -211,9 +211,9 @@ export default class LinkEvent extends React.Component<EventRendererProps, *> {
  <Text size="body">
  <Trans>
  These external events are owned by another
- scene. Ensure the same variables are declared
- in each scenes, otherwise conditions and
- actions related to them won't work.
+ scene. Ensure that this scene has the
+ variables and objects used in the external
+ events.
  </Trans>
  </Text>
  </Column>