From c65d8b33d76e016989728662d92c826b1550bff0 Mon Sep 17 00:00:00 2001 From: Denis Bykhov Date: Sun, 10 May 2026 23:42:28 +0500 Subject: [PATCH] Nested view setting Signed-off-by: Denis Bykhov --- .../src/components/settings/view/ViewSetting.svelte | 2 +- plugins/view-resources/src/components/ViewletSetting.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/card-resources/src/components/settings/view/ViewSetting.svelte b/plugins/card-resources/src/components/settings/view/ViewSetting.svelte index 7e9cc174d2e..eb3ba92261d 100644 --- a/plugins/card-resources/src/components/settings/view/ViewSetting.svelte +++ b/plugins/card-resources/src/components/settings/view/ViewSetting.svelte @@ -259,7 +259,7 @@ const parentMixins = hierarchy .getDescendants(parent) .map((p) => hierarchy.getClass(p)) - .filter((p) => hierarchy.isMixin(p._id) && p.extends && ancestors.has(p.extends)) + .filter((p) => hierarchy.isMixin(p._id) && ancestors.has(hierarchy.getBaseClass(p._id))) parentMixins.forEach((it) => { hierarchy.getOwnAttributes(it._id).forEach((attr) => { diff --git a/plugins/view-resources/src/components/ViewletSetting.svelte b/plugins/view-resources/src/components/ViewletSetting.svelte index c878aed3a6b..468f2fb23aa 100644 --- a/plugins/view-resources/src/components/ViewletSetting.svelte +++ b/plugins/view-resources/src/components/ViewletSetting.svelte @@ -402,7 +402,7 @@ const parentMixins = hierarchy .getDescendants(parent) .map((p) => hierarchy.getClass(p)) - .filter((p) => hierarchy.isMixin(p._id) && p.extends && ancestors.has(p.extends)) + .filter((p) => hierarchy.isMixin(p._id) && ancestors.has(hierarchy.getBaseClass(p._id))) parentMixins.forEach((it) => { hierarchy.getOwnAttributes(it._id).forEach((attr) => {