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

wip fix

This commit is contained in:
Rizky 2024-03-31 10:02:41 +07:00
parent cda1a66c60
commit 6910088b0a
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/web/src/nova/ed/panel/side/style/side-all.tsx
View File

@ -16,10 +16,18 @@ import { SideLabel } from "./ui/SideLabel";
export const EdStyleAll = () => { export const EdStyleAll = () => {
const p = useGlobal(EDGlobal, "EDITOR"); const p = useGlobal(EDGlobal, "EDITOR");
const meta = active.comp_id let meta = active.comp_id
? p.comp.list[active.comp_id].meta[active.item_id] ? p.comp.list[active.comp_id].meta[active.item_id]
: p.page.meta[active.item_id]; : p.page.meta[active.item_id];
if (
meta.item.component?.props?.child &&
meta.item.component?.props?.child?.content?.id &&
meta.item.component?.useStyle
) {
meta = p.page.meta[meta.item.component.props.child.content.id];
}
let item = meta?.item; let item = meta?.item;
let is_inherit = false; let is_inherit = false;
if (item?.component?.id) { if (item?.component?.id) {

2
app/web/src/nova/ed/panel/tree/node/item/action.tsx
View File

@ -100,7 +100,7 @@ export const EdTreeAction = ({
)} )}
onClick={(e) => { onClick={(e) => {
if ( if (
item.component?.props.child.content?.id && item.component?.props?.child?.content?.id &&
child_jsx_has_script child_jsx_has_script
) { ) {
e.stopPropagation(); e.stopPropagation();

4
app/web/src/nova/ed/panel/tree/node/item/name.tsx
View File

@ -238,7 +238,7 @@ const GenerateJSX: FC<{ meta: IMeta }> = ({ meta }) => {
} }
if (mitem) { if (mitem) {
const genJSX = fillID(findDefaultJSX(p, mitem)); const genJSX = findDefaultJSX(p, mitem);
const ijson = mitem.toJSON() as IItem; const ijson = mitem.toJSON() as IItem;
mitem.doc?.transact(() => { mitem.doc?.transact(() => {
@ -307,5 +307,5 @@ export const findDefaultJSX = (p: PG, mitem: MItem): IItem => {
} }
} }
return resetJSXProp; return fillID(resetJSXProp) as any;
}; };

2
app/web/src/nova/ed/panel/tree/node/on-drop.tsx
View File

@ -61,7 +61,7 @@ export const nodeOnDrop: (
treeRebuild(p); treeRebuild(p);
p.render(); p.render();
} else { } else {
const child_id = toMeta.item.component?.props.child.content?.id; const child_id = toMeta.item.component?.props?.child?.content?.id;
if (child_id) { if (child_id) {
const child_meta = getMetaById(p, child_id); const child_meta = getMetaById(p, child_id);
if (child_meta) { if (child_meta) {