From 18d6b3128cd64a712b1c02cf1cb9c8cb47ffb70e Mon Sep 17 00:00:00 2001 From: Rizky Date: Sun, 22 Oct 2023 00:00:16 +0700 Subject: [PATCH] fix build --- app/web/src/render/ed/logic/tree/build.tsx | 21 +++++++++++++++++-- .../render/editor/panel/tree/item/name.tsx | 4 ++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/web/src/render/ed/logic/tree/build.tsx b/app/web/src/render/ed/logic/tree/build.tsx index f4d584a2..13dfa04d 100644 --- a/app/web/src/render/ed/logic/tree/build.tsx +++ b/app/web/src/render/ed/logic/tree/build.tsx @@ -20,12 +20,13 @@ export const treeRebuild = async (p: PG) => { p.page.tree = []; p.page.meta = {}; + const portal = {}; const sections = root.get("childs"); if (sections) { await Promise.all( sections.map(async (e) => { p.page.entry.push(e.get("id")); - await walkMap(p, { mitem: e, tree_parent_id: "root" }); + await walkMap(p, { mitem: e, tree_parent_id: "root", portal }); }) ); console.log(p.page); @@ -53,6 +54,7 @@ const walkMap = async ( p: PG, arg: { mitem: MItem | MSection; + portal: Record; tree_parent_id: string; parent_comp?: EdMeta["parent_comp"]; skip_add_tree?: boolean; @@ -122,6 +124,7 @@ const walkMap = async ( mitem: mcontent, tree_parent_id: item.id, parent_comp: { ref_ids, mcomp }, + portal: arg.portal, }); } } @@ -137,6 +140,7 @@ const walkMap = async ( tree_parent_id: item.id, parent_comp: { ref_ids, mcomp }, skip_add_tree: true, + portal: arg.portal, }); }) || [] ); @@ -155,6 +159,15 @@ const walkMap = async ( parent_comp, }; + if (!item_comp) { + if (item.name.startsWith("⬅")) { + arg.portal[item.name] = meta; + } + if (item.name.startsWith("⮕")) { + arg.portal[item.name] = meta; + } + } + p.page.meta[item.id] = meta; if (!arg.skip_add_tree) { @@ -171,7 +184,11 @@ const walkMap = async ( await Promise.all( mchilds.map(async (e, k) => { item.childs.push(e.get("id")); - await walkMap(p, { mitem: e, tree_parent_id: item.id }); + await walkMap(p, { + mitem: e, + tree_parent_id: item.id, + portal: arg.portal, + }); }) || [] ); } diff --git a/app/web/src/render/editor/panel/tree/item/name.tsx b/app/web/src/render/editor/panel/tree/item/name.tsx index f3140541..d7a44a0e 100644 --- a/app/web/src/render/editor/panel/tree/item/name.tsx +++ b/app/web/src/render/editor/panel/tree/item/name.tsx @@ -66,8 +66,8 @@ const Renaming: FC<{ const target = e.currentTarget; let position = target.selectionStart; if (shouldReplace) { - local.newname = local.newname.replace("<=", "⇦"); - local.newname = local.newname.replace("=>", "⇨"); + local.newname = local.newname.replace("<=", "⬅"); + local.newname = local.newname.replace("=>", "⮕"); } local.render(); setTimeout(() => {