@jag-k/scriptable-jsx 1.0.1 → 1.1.0

package/dist/index.js

@@ -262,14 +262,15 @@ function processContainerChildren(widget, children) {
                     }
                     case "image": {
                         let init;
-                        if (child.props.image) {
-                            init = child.props.image;
+                        const { data } = child.props || {};
+                        if (typeof data === "string") {
+                            init = Image.fromFile(child.props.fileURL);
                         }
-                        else if (child.props.data) {
-                            init = Image.fromData(child.props.data);
+                        else if (data.size) {
+                            init = data;
                         }
-                        else if (child.props.fileURL) {
-                            init = Image.fromFile(child.props.fileURL);
+                        else {
+                            init = Image.fromData(data);
                         }
                         const image = widget.addImage(init);
                         processImageProps(image, child.props || {});

package/package.json

@@ -2,7 +2,7 @@
   "name": "@jag-k/scriptable-jsx",
   "description": "Create a Scriptable bundle from JSX",
   "license": "SEE LICENSE IN LICENSE",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "author": {
     "email": "jag.konon@gmail.com",
     "name": "Jag_k",

package/types/widget.d.ts

@@ -62,7 +62,8 @@ export declare namespace JSX {
 
   type ImageContentMode = "fitting" | "filling";
 
-  interface ImageCommonProps extends Alienable {
+  interface ImageProps extends Alienable {
+    data: string /* file url */ | Image | Data;
     size?: Size;
     cornerRadius?: number;
     resizable?: boolean;
@@ -75,10 +76,6 @@ export declare namespace JSX {
     contentMode?: ImageContentMode;
   }
 
-  type ImageProps =
-    & ImageCommonProps
-    & ({ data: Data } | { fileURL: string } | { image: Image });
-
   interface DateProps extends TextProps {
     date: Date | string | number;
     style?: DateStyle;