Merge pull request #685 from rofrischmann/extend-all-extensions

Improve fela-plugin-extend

Author: robinweser

packages/fela-plugin-extend/src/__tests__/extend-test.js

@@ -143,6 +143,94 @@ describe('Extend plugin', () => {
     })
   })
 
+  it('should merge multiple nested extensions', () => {
+    const base = {
+      color: 'blue',
+      backgroundColor: 'red',
+      extend: {
+        color: 'green',
+        fontSize: 15,
+        extend: {
+          lineHeight: 1.0,
+        },
+      },
+    }
+
+    expect(extend()(base)).toEqual({
+      color: 'blue',
+      backgroundColor: 'red',
+      color: 'green',
+      fontSize: 15,
+      lineHeight: 1.0,
+    })
+  })
+
+  it('should merge multiple nested conditional extensions', () => {
+    const base = {
+      color: 'blue',
+      backgroundColor: 'red',
+      extend: {
+        condition: true,
+        style: {
+          color: 'green',
+          fontSize: 15,
+          extend: {
+            condition: true,
+            style: {
+              lineHeight: 1.0,
+            },
+          },
+        },
+      },
+    }
+
+    expect(extend()(base)).toEqual({
+      color: 'blue',
+      backgroundColor: 'red',
+      color: 'green',
+      fontSize: 15,
+      lineHeight: 1.0,
+    })
+  })
+
+  it('should merge multiple nested conditional extensions', () => {
+    const base = {
+      color: 'blue',
+      backgroundColor: 'red',
+      extend: [
+        {
+          condition: true,
+          style: {
+            color: 'green',
+            fontSize: 15,
+            extend: {
+              condition: true,
+              style: {
+                lineHeight: 1.0,
+              },
+            },
+          },
+        },
+        {
+          paddingLeft: 10,
+          extend: {
+            paddingRight: 10,
+          },
+        },
+      ],
+    }
+
+    expect(extend()(base)).toEqual({
+      color: 'blue',
+      backgroundColor: 'red',
+      color: 'green',
+      fontSize: 15,
+      lineHeight: 1.0,
+      paddingLeft: 10,
+      paddingRight: 10,
+    })
+  })
+
   it('should not convert null values to empty objects', () => {
     const base = {
       color: 'blue',

packages/fela-plugin-extend/src/index.js

@@ -32,7 +32,7 @@ function extendStyle(style: Object, extension: Object): void {
     }
   } else {
     // extend basic style objects
-    assignStyle(style, removeUndefined(extension))
+    assignStyle(style, removeUndefined(extend(extension)))
   }
 }