Merge branch 'feat/artboard-dimensions' of github.com:macintoshhelper/react-sketchapp into feat/artboard-dimensions

Author: macintoshhelper

src/stylesheet/index.ts

@@ -81,7 +81,6 @@ const mergeStyle = (a: Style, b: Style): Style => {
     if (key === 'transform') {
       a[key] = mergeTransforms(a[key], b[key]);
     } else {
-      // @ts-ignore
       a[key] = b[key];
     }
   });

src/stylesheet/types.ts

@@ -9,7 +9,7 @@ export type Style = {
 export type StyleId = number;
 export type RawStyle = { [key: string]: any };
 export type RawStyles = { [key: string]: RawStyle };
-export type UserStyle = RawStyles | StyleId;
+export type UserStyle = RawStyle | StyleId;
 export type UserStyles = Array<UserStyle> | UserStyle;
 export type Rules = { declarations: { [key: string]: RawStyle } };
 export type StyleSheetInstance = { [key: string]: StyleId };