Merge pull request #15 from mohit23x/ts

type changes in create function
mohit23x · Feb 21, 2021 · b6b9bd7 · b6b9bd7
2 parents dcd74f9 + 58e5be5
commit b6b9bd7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/build/Sheet.js b/build/Sheet.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const SKIP_KEYS = ["transform", "transformMatrix"];
 class Sheet {
     constructor(sourceFn) {
         this.source = sourceFn;
@@ -25,7 +26,7 @@ class Sheet {
                 const styles = restyle[key];
                 Object.keys(styles).forEach((styleKey) => {
                     const styleValue = styles[styleKey];
-                    if (styleValue && Array.isArray(styleValue)) {
+                    if (styleValue && Array.isArray(styleValue) && !SKIP_KEYS.includes(styleKey)) {
                         // length is checked to allow undefined to set as styleValue
                         if (activeIndex >= styleValue.length) {
                             const selectedValue = styleValue[styleValue.length - 1];

diff --git a/build/Sugar.d.ts b/build/Sugar.d.ts
@@ -99,7 +99,7 @@ export default class Sugar<T> {
     _refresh(): void;
     build(themeObj: T): void;
     configure(newConstants: Partial<ConstantsType>): void;
-    create<P extends NamedStyles<P> | NamedStyles<any>>(objFn: Fn<T, P>): StyleSheetType<P>;
+    create<P extends NamedStyles<P> | NamedStyles<any>>(objFn: Fn<T, P> | P): StyleSheetType<P>;
     _calculateActiveIndex(): void;
     _calcSheets(): void;
     _callListeners(event: buildEventType): void;

diff --git a/lib/Sheet.ts b/lib/Sheet.ts
@@ -1,5 +1,6 @@
 import type { ConstantsType, Fn, NamedStyles, StyleSheetType } from './type';
 
+const SKIP_KEYS = ["transform", "transformMatrix"];
 export default class Sheet<
   T,
   P extends NamedStyles<P> | NamedStyles<any>> {
@@ -38,7 +39,7 @@ export default class Sheet<
         const styles = restyle[key];
         Object.keys(styles).forEach((styleKey) => {
           const styleValue = styles[styleKey];
-          if (styleValue && Array.isArray(styleValue)) {
+          if (styleValue && Array.isArray(styleValue) && !SKIP_KEYS.includes(styleKey)) {
             // length is checked to allow undefined to set as styleValue
             if (activeIndex >= styleValue.length) {
               const selectedValue = styleValue[styleValue.length - 1];

diff --git a/lib/Sugar.ts b/lib/Sugar.ts
@@ -146,7 +146,7 @@ export default class Sugar<T> {
   }
 
   create<P extends NamedStyles<P> | NamedStyles<any>>(
-    objFn: Fn<T, P>
+    objFn: Fn<T, P> | P
   ): StyleSheetType<P> {
     if (typeof objFn === 'function') {
       const sheet = new Sheet(objFn);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-sugar-style",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "React Native Stylesheet alternative with theme support",
   "author": "mohit23x",
   "license": "MIT",