From 269c2a58b902165fbcbd7c0f536378537453d58e Mon Sep 17 00:00:00 2001 From: Rizky Date: Sun, 14 Jan 2024 18:05:27 +0700 Subject: [PATCH] wip fix --- app/web/src/nova/ed/logic/ed-global.ts | 1 + app/web/src/nova/vi/render/script/arg.tsx | 2 +- app/web/src/nova/vi/render/script/eval-prop.tsx | 6 ++++-- app/web/src/nova/vi/render/script/eval-script.tsx | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/web/src/nova/ed/logic/ed-global.ts b/app/web/src/nova/ed/logic/ed-global.ts index d28787d6..76c4de9d 100644 --- a/app/web/src/nova/ed/logic/ed-global.ts +++ b/app/web/src/nova/ed/logic/ed-global.ts @@ -66,6 +66,7 @@ const target = { instance_comp_id: false as any, instance_item_id: false as any, }; + export const active = { should_render_main: true, hover: { id: "" }, diff --git a/app/web/src/nova/vi/render/script/arg.tsx b/app/web/src/nova/vi/render/script/arg.tsx index dcf36246..7ef98abd 100644 --- a/app/web/src/nova/vi/render/script/arg.tsx +++ b/app/web/src/nova/vi/render/script/arg.tsx @@ -1,4 +1,4 @@ -export const viScriptArg = () => ({ +export const viScriptArg = (vi: { site: { db: any; api: any } }) => ({ isMobile: false, isDesktop: true, isEditor: true, diff --git a/app/web/src/nova/vi/render/script/eval-prop.tsx b/app/web/src/nova/vi/render/script/eval-prop.tsx index 1c71257f..a4a29ad3 100644 --- a/app/web/src/nova/vi/render/script/eval-prop.tsx +++ b/app/web/src/nova/vi/render/script/eval-prop.tsx @@ -5,7 +5,7 @@ import { viScriptArg } from "./arg"; import { replaceWithObject, replacement } from "./eval-script"; export const viEvalProps = ( - vi: { meta: VG["meta"] }, + vi: { meta: VG["meta"]; site: { db: any; api: any } }, meta: IMeta, passprop: any ) => { @@ -17,7 +17,9 @@ export const viEvalProps = ( const exports = (window as any).exports; const arg = { ...exports, - ...viScriptArg(), + db: vi.site.db, + api: vi.site.api, + ...viScriptArg(vi), ...passprop, }; diff --git a/app/web/src/nova/vi/render/script/eval-script.tsx b/app/web/src/nova/vi/render/script/eval-script.tsx index e280489e..0fc81383 100644 --- a/app/web/src/nova/vi/render/script/eval-script.tsx +++ b/app/web/src/nova/vi/render/script/eval-script.tsx @@ -11,6 +11,7 @@ import { createViPassProp } from "./passprop"; export const viEvalScript = ( vi: { + site: { db: any; api: any }; meta: VG["meta"]; visit?: VG["visit"]; script?: { init_local_effect: any }; @@ -41,13 +42,15 @@ export const viEvalScript = ( children: parts.props.children, props: parts.props, Local: script.Local, + db: vi.site.db, + api: vi.site.api, PassProp: script?.PassProp, ErrorBox: ErrorBox, newElement: () => {}, render: (jsx: ReactNode) => { script.result = {jsx}; }, - ...viScriptArg(), + ...viScriptArg(vi), ...exports, ...passprop, };