From ee8f6aa3c7490176f3ed1fdcbbae91fc5b042548 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Fri, 31 Jul 2026 15:53:51 +0400
Subject: [PATCH] Allow nested extend

---
 .../core/src/style_manager/model/Sector.ts    | 19 +++---
 .../test/specs/style_manager/model/Models.ts  | 61 +++++++++++++++++++
 2 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/style_manager/model/Sector.ts b/packages/core/src/style_manager/model/Sector.ts
index bf4f76ba8..fca5d90ac 100644
--- a/packages/core/src/style_manager/model/Sector.ts
+++ b/packages/core/src/style_manager/model/Sector.ts
@@ -200,14 +200,19 @@ export default class Sector extends Model<SectorProperties> {
 
   checkExtend(prop: any): PropertyTypes {
     const { extend, ...rest } = (isString(prop) ? { extend: prop } : prop) || {};
-    if (extend) {
-      return {
-        ...(this.buildProperties([extend])[0] || {}),
-        ...rest,
-      };
-    } else {
-      return prop;
+    const result = extend
+      ? {
+          ...(this.buildProperties([extend])[0] || {}),
+          ...rest,
+        }
+      : prop;
+    const properties = result?.properties;
+
+    if (properties?.length) {
+      result.properties = properties.map((nestedProp: PropertyTypes) => this.checkExtend(nestedProp));
     }
+
+    return result;
   }
 
   /**
diff --git a/packages/core/test/specs/style_manager/model/Models.ts b/packages/core/test/specs/style_manager/model/Models.ts
index 798e05234..1f700eada 100644
--- a/packages/core/test/specs/style_manager/model/Models.ts
+++ b/packages/core/test/specs/style_manager/model/Models.ts
@@ -111,6 +111,67 @@ describe('Sector', () => {
     expect(propTop.get('name')).toEqual('Top');
     expect(propTop.get('type')).toEqual('number');
   });
+
+  test('Extend nested properties on extended composite properties', () => {
+    obj = sm.addSector('test', {
+      name: 'test',
+      properties: [
+        {
+          extend: 'border-radius',
+          // @ts-ignore
+          properties: [
+            {
+              extend: 'border-top-left-radius',
+              id: 'border-top-left-radius-custom',
+            },
+            {
+              extend: 'border-bottom-left-radius',
+            },
+          ],
+        },
+      ],
+    });
+    const prop0 = obj.getProperties()[0];
+    const propProps = prop0.get('properties' as any);
+
+    expect(propProps.length).toEqual(2);
+    expect(propProps.at(0).get('id')).toEqual('border-top-left-radius-custom');
+    expect(propProps.at(0).get('type')).toEqual('number');
+    expect(propProps.at(1).get('property')).toEqual('border-bottom-left-radius');
+    expect(propProps.at(1).get('type')).toEqual('number');
+  });
+
+  test('Extend nested properties on stack properties', () => {
+    obj = sm.addSector('test', {
+      name: 'test',
+      properties: [
+        {
+          type: 'stack',
+          property: 'my-shadow',
+          // @ts-ignore
+          properties: [
+            {
+              extend: 'text-shadow-h',
+              property: 'my-shadow-h',
+            },
+            {
+              extend: 'text-shadow-v',
+              property: 'my-shadow-v',
+            },
+          ],
+        },
+      ],
+    });
+    const prop0 = obj.getProperties()[0];
+    const propProps = prop0.get('properties' as any);
+
+    expect(propProps.length).toEqual(2);
+    expect(propProps.at(0).get('property')).toEqual('my-shadow-h');
+    expect(propProps.at(0).get('type')).toEqual('number');
+    expect(propProps.at(0).get('units')).toEqual(['px', 'em', 'rem', 'vh', 'vw']);
+    expect(propProps.at(1).get('property')).toEqual('my-shadow-v');
+    expect(propProps.at(1).get('type')).toEqual('number');
+  });
 });
 
 describe('Property', () => {