feat: add order classes types generation from theme

muhammadsammy · Jun 22, 2020 · fd24095 · fd24095
1 parent d31bb56
commit fd24095
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/generation/ClassesGenerator.ts b/src/generation/ClassesGenerator.ts
@@ -86,16 +86,13 @@ export class ClassesGenerator implements IClassesGenerator {
   public flexBox = (): string => {
     const FlexBox = {
       ...defaultFlexBox,
-      flexGrow: Object.keys(
-        isEmpty(this.configScanner.themeConfig.flexGrow)
-          ? defaultThemeConfig.flexGrow
-          : (this.configScanner.themeConfig.flexGrow as { [key: string]: string }),
-      ).map(value => 'flex-grow' + (value === 'default' ? '' : `-${value}`)),
-      flexShrink: Object.keys(
-        isEmpty(this.configScanner.themeConfig.flexShrink)
-          ? defaultThemeConfig.flexShrink
-          : (this.configScanner.themeConfig.flexShrink as { [key: string]: string }),
-      ).map(value => 'flex-shrink' + (value === 'default' ? '' : `-${value}`)),
+      flexGrow: Object.keys(this.configScanner.themeConfig.flexGrow).map(
+        value => 'flex-grow' + (value === 'default' ? '' : `-${value}`),
+      ),
+      flexShrink: Object.keys(this.configScanner.themeConfig.flexShrink).map(
+        value => 'flex-shrink' + (value === 'default' ? '' : `-${value}`),
+      ),
+      order: Object.keys(this.configScanner.themeConfig.order).map(value => `order-${value}`),
     };
 
     this.allGeneratedClasses.FlexBox = FlexBox;

diff --git a/src/generation/_definitions.d.ts b/src/generation/_definitions.d.ts
@@ -77,10 +77,10 @@ interface IThemeProps {
   flex?: {
     [key: string]: string;
   };
-  flexGrow?: {
+  flexGrow: {
     [key: string]: string;
   };
-  flexShrink?: {
+  flexShrink: {
     [key: string]: string;
   };
   fontFamily?: {
@@ -122,7 +122,7 @@ interface IThemeProps {
   opacity?: {
     [key: string]: string;
   };
-  order?: {
+  order: {
     [key: string]: string;
   };
   padding: any;