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

---
 app/srv/ws/sync/actions/site_group.ts          | 1 -
 app/web/src/render/editor/editor.tsx           | 2 +-
 app/web/src/render/editor/logic/tree-prop.tsx  | 2 --
 app/web/src/render/editor/logic/tree-scope.tsx | 9 +++++++++
 pkgs/web-utils/src/use-global.ts               | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/srv/ws/sync/actions/site_group.ts b/app/srv/ws/sync/actions/site_group.ts
index 2f0e84be..6da7936b 100644
--- a/app/srv/ws/sync/actions/site_group.ts
+++ b/app/srv/ws/sync/actions/site_group.ts
@@ -1,6 +1,5 @@
 import { SyncConnection } from "../type";
 
 export const site_group = async function (this: SyncConnection) {
-  console.log(this.user);
   return "gruop";
 };
diff --git a/app/web/src/render/editor/editor.tsx b/app/web/src/render/editor/editor.tsx
index 12a81847..cb30ef31 100644
--- a/app/web/src/render/editor/editor.tsx
+++ b/app/web/src/render/editor/editor.tsx
@@ -78,7 +78,7 @@ export const Editor: FC<{ site_id: string; page_id: string; session: any }> = ({
 
   useEffect(() => {
     if (p.status !== "init" && w.prasiApi) {
-      for (const [k, v] of Object.entries(deepClone(EditorGlobal))) {
+      for (const [k, v] of Object.entries(EditorGlobal)) {
         if (k === "session" || k === "site" || "status") continue;
         (p as any)[k] = v;
       }
diff --git a/app/web/src/render/editor/logic/tree-prop.tsx b/app/web/src/render/editor/logic/tree-prop.tsx
index 42789e8e..716e462c 100644
--- a/app/web/src/render/editor/logic/tree-prop.tsx
+++ b/app/web/src/render/editor/logic/tree-prop.tsx
@@ -67,8 +67,6 @@ export const treePropEval = (
               parent_id: string;
               _scopeIndex?: Record<string, string>;
             }) => {
-              console.log(prop_name);
-
               if (prop.content) {
                 const meta = p.treeMeta[prop.content.id];
                 if (meta) {
diff --git a/app/web/src/render/editor/logic/tree-scope.tsx b/app/web/src/render/editor/logic/tree-scope.tsx
index b7a6d35e..7c4f42e4 100644
--- a/app/web/src/render/editor/logic/tree-scope.tsx
+++ b/app/web/src/render/editor/logic/tree-scope.tsx
@@ -209,6 +209,14 @@ const createPassProp = (
 
       const scopeIndex = { ..._existingScopeIndex, [meta.item.id]: arg.idx };
 
+      if (!meta.scope) {
+        meta.scope = {};
+      }
+      for (const [k, v] of Object.entries(arg)) {
+        if (k === "children") continue;
+        meta.scope[k] = v;
+      }
+
       return modifyChildIndex(arg.children, scopeIndex);
     }
 
@@ -219,6 +227,7 @@ const createPassProp = (
       if (k === "children") continue;
       meta.scope[k] = v;
     }
+
     return arg.children;
   };
 };
diff --git a/pkgs/web-utils/src/use-global.ts b/pkgs/web-utils/src/use-global.ts
index 19247764..b0963827 100644
--- a/pkgs/web-utils/src/use-global.ts
+++ b/pkgs/web-utils/src/use-global.ts
@@ -43,7 +43,7 @@ export const useGlobal = <T extends object>(
   const { global, render } = ctx;
 
   if (!global[_id]) {
-    global[_id] = defaultValue;
+    global[_id] = structuredClone(defaultValue);
   }
 
   useEffect(() => {