From 2f0125dd8e538239557327c4c640f01f06f76e22 Mon Sep 17 00:00:00 2001
From: Rizky <rizky@avolut.com>
Date: Fri, 2 Aug 2024 11:47:18 +0700
Subject: [PATCH] fixed

---
 app/web/src/nova/ed/panel/side/prop-instance.tsx | 12 +++++-------
 app/web/src/nova/ed/panel/side/prop-master.tsx   | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/web/src/nova/ed/panel/side/prop-instance.tsx b/app/web/src/nova/ed/panel/side/prop-instance.tsx
index 2f926f81..761249bb 100644
--- a/app/web/src/nova/ed/panel/side/prop-instance.tsx
+++ b/app/web/src/nova/ed/panel/side/prop-instance.tsx
@@ -4,6 +4,7 @@ import { IItem } from "../../../../utils/types/item";
 import { FMCompDef, FNCompDef } from "../../../../utils/types/meta-fn";
 import { Menu, MenuItem } from "../../../../utils/ui/context-menu";
 import { EDGlobal, IMeta, PG, active } from "../../logic/ed-global";
+import { ChevronDown, ChevronRight } from "../tree/node/item/indent";
 import { createEditScript } from "./prop-instance/edit-script";
 import { EdPropInstanceButton } from "./prop-instance/prop-button";
 import { EdPropInstanceCode } from "./prop-instance/prop-code";
@@ -12,8 +13,8 @@ import { EdPropInstanceOptions } from "./prop-instance/prop-option";
 import { reset } from "./prop-instance/prop-reset";
 import { EdPropInstanceText } from "./prop-instance/prop-text";
 import { EdStyleAll } from "./style/side-all";
-import { ChevronDown, ChevronRight } from "../tree/node/item/indent";
-import { ChevronLeft } from "../popup/script/workbench";
+import { NodeModel } from "@minoru/react-dnd-treeview";
+import { PropItem } from "./prop-master/tree-item";
 
 const w = window as any;
 
@@ -89,10 +90,7 @@ export const EdSidePropInstance: FC<{ meta: IMeta }> = ({ meta }) => {
             for (const [k, v] of Object.entries(meta.item.script?.props)) {
               if (v.value && v.value.length > 3) {
                 try {
-                  const evn = new Function(
-                    "arg",
-                    `arg["${k}"] = (() => { ${v.value} })()`
-                  );
+                  const evn = new Function("arg", `arg["${k}"] = ${v.value}`);
                   evn(arg);
                 } catch (e) {}
               }
@@ -103,7 +101,7 @@ export const EdSidePropInstance: FC<{ meta: IMeta }> = ({ meta }) => {
                 try {
                   const evn = new Function(
                     "arg",
-                    `arg["${k}"] = (() => { ${v.valueBuilt} })()`
+                    `arg["${k}"] = ${v.valueBuilt}`
                   );
                   evn(arg);
                 } catch (e) {
diff --git a/app/web/src/nova/ed/panel/side/prop-master.tsx b/app/web/src/nova/ed/panel/side/prop-master.tsx
index 7a684cf3..408c277e 100644
--- a/app/web/src/nova/ed/panel/side/prop-master.tsx
+++ b/app/web/src/nova/ed/panel/side/prop-master.tsx
@@ -97,16 +97,27 @@ export const EdSidePropComp: FC<{ meta: IMeta }> = ({ meta }) => {
 
     grouped[group].push(item);
   }
-  const final_tree: NodeModel<PropItem>[] = [];
+
+  let final_tree: NodeModel<PropItem>[] = [];
+  let root_tree: NodeModel<PropItem>[] = [];
   for (const items of Object.values(grouped)) {
     const idx = items.findIndex((e) => e.text.endsWith("__"));
     const plucked = items.splice(idx, 1);
     items.unshift(plucked[0]);
     for (const item of items) {
-      final_tree.push(item);
+      if (item.data?.name.includes("__")) {
+        final_tree.push(item);
+      } else {
+        root_tree.push(item);
+      }
     }
   }
 
+  root_tree = root_tree.sort((a, b) => {
+    return (a.data?.prop?.idx || 0) - (b.data?.prop?.idx || 0);
+  });
+  final_tree = [...root_tree, ...final_tree];
+
   let hide = localStorage.getItem("prasi-prop-hide")?.split(",") || [];
 
   return (