refactor: remove window.__previewjs_navigate()

fwouts · Nov 23, 2022 · b495c94 · b495c94
1 parent aa19822
commit b495c94
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/app-foundations/src/components/UpdateBanner/UpdateBannerState.ts b/app-foundations/src/components/UpdateBanner/UpdateBannerState.ts
@@ -2,7 +2,6 @@ import type { ResponseOf, RPCs } from "@previewjs/api";
 import axios from "axios";
 import { makeAutoObservable, runInAction } from "mobx";
 import type { PersistedStateController } from "../../state/PersistedStateController";
-import "../../window";
 
 export class UpdateBannerState {
   private checkVersionResponse: CheckVersionResponse | null = null;

diff --git a/app-foundations/src/state/PreviewState.ts b/app-foundations/src/state/PreviewState.ts
@@ -9,7 +9,6 @@ import { makeAutoObservable, observable, runInAction } from "mobx";
 import { ActionLogsState } from "../components/ActionLogs";
 import { ConsolePanelState } from "../components/ConsolePanel";
 import { UpdateBannerState } from "../components/UpdateBanner";
-import "../window";
 import { decodeComponentId } from "./component-id";
 import { ComponentProps } from "./ComponentProps";
 import type { PersistedStateController } from "./PersistedStateController";
@@ -167,10 +166,6 @@ export class PreviewState {
   }
 
   async start() {
-    window.__previewjs_navigate = (componentId) => {
-      history.pushState(null, "", `/?p=${encodeURIComponent(componentId)}`);
-      this.onUrlChanged().catch(console.error);
-    };
     window.addEventListener("message", this.messageListener);
     window.addEventListener("popstate", this.popStateListener);
     this.iframeController.start();
@@ -221,10 +216,15 @@ export class PreviewState {
   private messageListener = (event: MessageEvent) => {
     const data = event.data;
     if (data && data.kind === "navigate") {
-      window.__previewjs_navigate(data.componentId);
+      this.navigate(data.componentId);
     }
   };
 
+  private navigate(componentId: string) {
+    history.pushState(null, "", `/?p=${encodeURIComponent(componentId)}`);
+    this.onUrlChanged().catch(console.error);
+  }
+
   private popStateListener = () => {
     this.onUrlChanged().catch(console.error);
   };
@@ -270,7 +270,7 @@ export class PreviewState {
     if (componentId === this.component?.componentId) {
       this.setVariant(null);
     } else {
-      window.__previewjs_navigate(componentId);
+      this.navigate(componentId);
     }
   }
 

diff --git a/app-foundations/src/window.ts b/app-foundations/src/window.ts
diff --git a/e2e-test-runner/src/helpers/app-controller.ts b/e2e-test-runner/src/helpers/app-controller.ts
@@ -117,8 +117,10 @@ export class AppController {
     if (this.page.url().startsWith(previewBaseUrl)) {
       // Soft refresh.
       await this.page.evaluate((componentId: string) => {
-        // @ts-ignore
-        window.__previewjs_navigate(componentId);
+        window.postMessage({
+          kind: "navigate",
+          componentId,
+        });
       }, componentId);
     } else {
       // Hard refresh.

diff --git a/...rations/intellij/src/main/kotlin/com/previewjs/intellij/plugin/services/ProjectService.kt b/...rations/intellij/src/main/kotlin/com/previewjs/intellij/plugin/services/ProjectService.kt
@@ -273,7 +273,7 @@ class ProjectService(private val project: Project) : Disposable {
                 val currentBrowserUrl = browser.cefBrowser.url
                 if (currentBrowserUrl?.startsWith(previewBaseUrl) == true) {
                     browser.cefBrowser.executeJavaScript(
-                        "window.__previewjs_navigate(\"${componentId}\");",
+                        "window.postMessage({ kind: \"navigate\", componentId: \"${componentId}\" });",
                         previewUrl,
                         0
                     )