preload enums on first edit

sannybuilder · May 20, 2023 · b57ae19 · b57ae19
1 parent 500ff6b
commit b57ae19
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/editor/src/app/components/library-page/library-page.component.ts b/editor/src/app/components/library-page/library-page.component.ts
@@ -135,17 +135,6 @@ export class LibraryPageComponent implements OnInit, OnDestroy, AfterViewInit {
     this.detectScreenSize();
     this._ui.toggleCommandListElements(true);
 
-    this.canEdit$.pipe(take(1), filter(Boolean)).subscribe(() => {
-      // we need to preload extensions for cross-edits to work
-      Object.values(Game).forEach((game) => {
-        this._extensions.loadExtensions(game);
-      });
-
-      // Object.values(Game).forEach((game) => {
-      //   this._enums.loadEnums(game);
-      // });
-    });
-
     getBaseGames().forEach((game) => {
       this._snippets.loadSnippets(game);
     });

diff --git a/editor/src/app/state/ui/effects.ts b/editor/src/app/state/ui/effects.ts
@@ -273,6 +273,38 @@ export class UiEffects {
     { dispatch: false }
   );
 
+  preloadEnums$ = createEffect(
+    () =>
+      this._actions$.pipe(
+        ofType(displayOrEditEnum),
+        first(({ viewMode }) => viewMode === ViewMode.EditEnum),
+        tap(() => {
+          Object.values(Game).forEach((game) => {
+            this._extensions.loadExtensions(game);
+          });
+          Object.values(Game).forEach((game) => {
+            this._enums.loadEnums(game);
+          });
+        })
+      ),
+    { dispatch: false }
+  );
+
+  // we need to preload extensions and enums for cross-edits to work
+  preloadExtensions$ = createEffect(
+    () =>
+      this._actions$.pipe(
+        ofType(displayOrEditCommandInfo),
+        first(({ viewMode }) => viewMode === ViewMode.EditCommand),
+        tap(() => {
+          Object.values(Game).forEach((game) => {
+            this._extensions.loadExtensions(game);
+          });
+        })
+      ),
+    { dispatch: false }
+  );
+
   resetPagination$ = createEffect(() =>
     merge(
       this._actions$.pipe(