From b256d5bd5b86afcbec15637e31911b5915ac2c38 Mon Sep 17 00:00:00 2001
From: Rizky <rizky05@gmail.com>
Date: Tue, 17 Oct 2023 07:17:47 +0700
Subject: [PATCH] fix

---
 app/web/src/render/live/logic/route.ts      | 1 +
 app/web/src/render/live/logic/tree-prop.tsx | 6 ++++--
 app/web/src/render/site/site.tsx            | 1 -
 pkgs/web-utils/src/define-window.ts         | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/web/src/render/live/logic/route.ts b/app/web/src/render/live/logic/route.ts
index e5c24fd6..6e6ba5db 100644
--- a/app/web/src/render/live/logic/route.ts
+++ b/app/web/src/render/live/logic/route.ts
@@ -31,6 +31,7 @@ export const routeLive = (p: PG, pathname: string) => {
       }
     }
 
+    console.log(page_id);
     if (page_id) {
       (window as any).prasiPageID = page_id;
       const promises: Promise<void>[] = [];
diff --git a/app/web/src/render/live/logic/tree-prop.tsx b/app/web/src/render/live/logic/tree-prop.tsx
index 521d0ff9..21073737 100644
--- a/app/web/src/render/live/logic/tree-prop.tsx
+++ b/app/web/src/render/live/logic/tree-prop.tsx
@@ -5,6 +5,8 @@ import { ItemMeta, PG } from "./global";
 import { mergeScopeUpwards } from "./tree-scope";
 import { LItem } from "../elements/l-item";
 import { extractNavigate, preload } from "./route";
+import { createId } from "@paralleldrive/cuid2";
+import { fillID } from "../../editor/tools/fill-id";
 
 export type PropCompFC = FC<{}>;
 
@@ -67,9 +69,9 @@ export const treePropEval = (
                 if (prop.content) {
                   if (p.treeMeta[prop.content.id]) {
                     p.treeMeta[prop.content.id].jsxParentId = parent_id;
-                  }
 
-                  return <LItem id={prop.content.id} fromProp={true} />;
+                    return <LItem id={prop.content.id} fromProp={true} />;
+                  }
                 }
                 return <></>;
               },
diff --git a/app/web/src/render/site/site.tsx b/app/web/src/render/site/site.tsx
index 0bb328a3..9f96a41d 100644
--- a/app/web/src/render/site/site.tsx
+++ b/app/web/src/render/site/site.tsx
@@ -18,7 +18,6 @@ const Root: FC<{ url: URL; Live: any }> = ({ url, Live }) => {
   w.prasiContext.render = () => {
     render({});
   };
-  w.rootRender = w.prasiContext.render;
 
   const Provider = GlobalContext.Provider as FC<{ value: any; children: any }>;
   return (
diff --git a/pkgs/web-utils/src/define-window.ts b/pkgs/web-utils/src/define-window.ts
index bc7aa88f..e8552616 100644
--- a/pkgs/web-utils/src/define-window.ts
+++ b/pkgs/web-utils/src/define-window.ts
@@ -9,7 +9,7 @@ export const defineWindow = async (awaitServerUrl = true) => {
   w.prasiContext = {
     global: {},
     render() {},
-  }; 
+  };
 
   const location = window["location"];
 
@@ -88,9 +88,9 @@ export const defineWindow = async (awaitServerUrl = true) => {
         w.preventPopRender = false;
         return;
       }
-      if (w.rootRender) {
+      if (w.prasiContext && w.prasiContext.render) {
         w.pathname = location.pathname;
-        w.rootRender();
+        w.prasiContext.render();
       }
     });
   }