From 1c1ea7767d6f7431af13a86ed1d20a534aec4c52 Mon Sep 17 00:00:00 2001 From: Rizky Date: Mon, 18 Dec 2023 21:39:39 +0700 Subject: [PATCH] wip fix component --- app/web/src/nova/ed/panel/header/mid/comp-picker.tsx | 5 +++-- app/web/src/nova/ed/panel/main/main-per-item.tsx | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/web/src/nova/ed/panel/header/mid/comp-picker.tsx b/app/web/src/nova/ed/panel/header/mid/comp-picker.tsx index f3c814be..493f11e1 100644 --- a/app/web/src/nova/ed/panel/header/mid/comp-picker.tsx +++ b/app/web/src/nova/ed/panel/header/mid/comp-picker.tsx @@ -46,14 +46,15 @@ export const EdCompPicker = () => { if ( item.type === "item" && item.component?.id && - active_meta.parent?.id + active_meta.parent?.id && + item.component?.id !== active.comp_id ) { active_meta = getMetaById(p, active_meta.parent.id); if (active_meta) { item = active_meta.item; } else { - alert("Failed to add component!"); + alert("Warning: Please edit component first before adding. "); return; } } diff --git a/app/web/src/nova/ed/panel/main/main-per-item.tsx b/app/web/src/nova/ed/panel/main/main-per-item.tsx index 03f612c3..96d1d59c 100644 --- a/app/web/src/nova/ed/panel/main/main-per-item.tsx +++ b/app/web/src/nova/ed/panel/main/main-per-item.tsx @@ -28,6 +28,11 @@ export const mainPerItemVisit = ( if ((meta.item as IContent).type === "text" && !meta.item.adv?.jsBuilt) { parts.props.spellCheck = false; parts.props.contentEditable = true; + if (meta.parent?.comp_id) { + if (meta.parent.comp_id !== active.comp_id) { + parts.props.contentEditable = false; + } + } parts.props.onBlur = (e) => { text_edit.prevent_select_all = false; @@ -104,6 +109,8 @@ export const mainPerItemVisit = ( is_active && "el-active", is_active && css` + outline: none; + &::after { content: " "; pointer-events: none;