midsuit
/
prasi-bun
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix expand tree

This commit is contained in:
rizrmd 2024-05-25 01:01:12 +07:00
parent 0fdc3ef090
commit 960162fa08
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/web/src/nova/ed/panel/main/main-history.tsx
View File

@ -1,17 +1,17 @@
import { useGlobal, useLocal } from "web-utils";
import { EDGlobal } from "../../logic/ed-global";
import { FC, useEffect } from "react"; import { FC, useEffect } from "react";
import { decompress } from "wasm-gzip"; import { decompress } from "wasm-gzip";
import { Vi } from "../../../vi/vi"; import { deepClone, useGlobal, useLocal } from "web-utils";
import { genMeta } from "../../../vi/meta/meta";
import { IRoot } from "../../../../utils/types/root";
import { IContent } from "../../../../utils/types/general"; import { IContent } from "../../../../utils/types/general";
import { initLoadComp } from "../../../vi/meta/comp/init-comp-load";
import { loadCompSnapshot, loadComponent } from "../../logic/comp/load";
import { IItem } from "../../../../utils/types/item"; import { IItem } from "../../../../utils/types/item";
import { mainStyle } from "./main"; import { IRoot } from "../../../../utils/types/root";
import { Loading } from "../../../../utils/ui/loading"; import { Loading } from "../../../../utils/ui/loading";
import { initLoadComp } from "../../../vi/meta/comp/init-comp-load";
import { genMeta } from "../../../vi/meta/meta";
import { Vi } from "../../../vi/vi";
import { loadCompSnapshot, loadComponent } from "../../logic/comp/load";
import { EDGlobal } from "../../logic/ed-global";
import { treeRebuild } from "../../logic/tree/build"; import { treeRebuild } from "../../logic/tree/build";
import { mainStyle } from "./main";
const decoder = new TextDecoder(); const decoder = new TextDecoder();
export const EdPageHistoryMain: FC<{}> = ({}) => { export const EdPageHistoryMain: FC<{}> = ({}) => {
@ -92,7 +92,7 @@ export const EdPageHistoryMain: FC<{}> = ({}) => {
<div className="flex flex-1 flex-col items-stretch"> <div className="flex flex-1 flex-col items-stretch">
<div className="border-b p-1 text-sm flex"> <div className="border-b p-1 text-sm flex">
<div <div
className="border px-2 cursor-pointer hover:bg-blue-200 border border-blue-700 hover:bg-blue-700 hover:text-white transition-all " className="border px-2 cursor-pointer border-blue-700 hover:bg-blue-700 hover:text-white transition-all"
onClick={async () => { onClick={async () => {
if (confirm("Are you sure ?") && local.root) { if (confirm("Are you sure ?") && local.root) {
p.page.history.id = ""; p.page.history.id = "";
@ -140,6 +140,17 @@ export const EdPageHistoryMain: FC<{}> = ({}) => {
page_id={p.page.cur.id} page_id={p.page.cur.id}
entry={local.entry} entry={local.entry}
api={p.script.api} api={p.script.api}
comp_load={async (comp_id) => {
let comp = p.comp.loaded[comp_id];
if (comp) {
return comp;
}
await loadComponent(p, comp_id);
comp = p.comp.loaded[comp_id];
return deepClone(comp);
}}
db={p.script.db} db={p.script.db}
script={{ init_local_effect: p.script.init_local_effect }} script={{ init_local_effect: p.script.init_local_effect }}
/> />

11
app/web/src/nova/ed/panel/tree/node/item/indent-hook.ts
View File

@ -30,11 +30,14 @@ export const expandTreeHook = (
let meta: IMeta | undefined = getMetaById(p, id); let meta: IMeta | undefined = getMetaById(p, id);
while (meta) { while (meta) {
const id = meta.parent?.id; const id = meta.parent?.id;
if (id && !shouldOpen.has(id)) { if (id) {
shouldOpen.add(id);
meta = getMetaById(p, id); meta = getMetaById(p, id);
} else {
break; if (!shouldOpen.has(id)) {
shouldOpen.add(id);
} else if ((meta && !meta.parent) || !meta) {
break;
}
} }
} }
} }