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

fix rendering

This commit is contained in:
Rizky 2023-10-17 15:10:27 +07:00
parent ad2d935f3c
commit 51361d0280
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/web/src/render/live/elements/l-render.tsx
View File

@ -1,5 +1,5 @@
import { FC, ReactNode, useEffect, useState } from "react"; import { FC, ReactNode, useEffect, useState } from "react";
import { useGlobal } from "web-utils"; import { useGlobal, useLocal } from "web-utils";
import { produceCSS } from "../../../utils/css/gen"; import { produceCSS } from "../../../utils/css/gen";
import { IContent } from "../../../utils/types/general"; import { IContent } from "../../../utils/types/general";
import { FNAdv, FNCompDef, FNLinkTag } from "../../../utils/types/meta-fn"; import { FNAdv, FNCompDef, FNLinkTag } from "../../../utils/types/meta-fn";
@ -27,12 +27,10 @@ export const LRender: FC<{
mode: p.mode, mode: p.mode,
}); });
const className = meta.className; return <PrasiPortal name={meta.item.name} />;
return <div id={meta.item.name} className={className} />;
} else { } else {
const el = document.getElementById(meta.item.name); if (!p.portal[meta.item.name]) return null;
if (!el) return null; p.portal[meta.item.name].el = (
return createPortal(
<LRenderInternal <LRenderInternal
p={p} p={p}
id={id} id={id}
@ -40,9 +38,9 @@ export const LRender: FC<{
fromProp={fromProp} fromProp={fromProp}
meta={meta} meta={meta}
_scopeIndex={_scopeIndex} _scopeIndex={_scopeIndex}
/>, />
el
); );
return null;
} }
} }
} }
@ -234,3 +232,16 @@ export const renderHTML = (className: string, adv: FNAdv) => {
} }
return null; return null;
}; };
const PrasiPortal = ({ name }: { name: string }) => {
const p = useGlobal(LiveGlobal, "LIVE");
const local = useLocal({});
if (!p.portal[name]) {
p.portal[name] = { render: local.render, el: null };
} else {
p.portal[name].render = local.render;
}
return p.portal[name].el;
};

5
app/web/src/render/live/logic/global.ts
View File

@ -1,7 +1,7 @@
import { FC } from "react";
import { createRouter } from "radix3"; import { createRouter } from "radix3";
import { FC, ReactNode } from "react";
import { CompDoc } from "../../../base/global/content-editor"; import { CompDoc } from "../../../base/global/content-editor";
import { IContent, MContent, MPage } from "../../../utils/types/general"; import { IContent, MPage } from "../../../utils/types/general";
import { IItem, MItem } from "../../../utils/types/item"; import { IItem, MItem } from "../../../utils/types/item";
import { PRASI_COMPONENT } from "../../../utils/types/render"; import { PRASI_COMPONENT } from "../../../utils/types/render";
import { IRoot } from "../../../utils/types/root"; import { IRoot } from "../../../utils/types/root";
@ -106,6 +106,7 @@ export const LiveGlobal = {
}>(), }>(),
treePending: null as null | Promise<void>, treePending: null as null | Promise<void>,
treeMeta: {} as Record<string, ItemMeta>, treeMeta: {} as Record<string, ItemMeta>,
portal: {} as Record<string, { el?: ReactNode; render: () => void }>,
comps: { comps: {
pending: {} as Record<string, Promise<PRASI_COMPONENT>>, pending: {} as Record<string, Promise<PRASI_COMPONENT>>,
resolve: {} as Record<string, (comp: PRASI_COMPONENT) => void>, resolve: {} as Record<string, (comp: PRASI_COMPONENT) => void>,

1
app/web/src/render/live/logic/route.ts
View File

@ -35,6 +35,7 @@ export const routeLive = (p: PG, pathname: string) => {
if (page_id !== p.page?.id) { if (page_id !== p.page?.id) {
p.page = p.pages[page_id]; p.page = p.pages[page_id];
p.treeMeta = {}; p.treeMeta = {};
p.portal = {};
} }
if (!p.page || !p.page.content_tree) { if (!p.page || !p.page.content_tree) {
promises.push(loadNpmPage(p, page_id)); promises.push(loadNpmPage(p, page_id));