@tamagui/image 2.0.0-rc.4 → 2.0.0-rc.40

package/dist/esm/Image.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["View","styled","jsx","StyledImage","name","render","Image","styleable","inProps","ref","blurRadius","capInsets","defaultSource","fadeDuration","loadingIndicatorSource","onLoadEnd","onPartialLoad","progressiveRenderingEnabled","resizeMethod","tintColor","rest","staticConfig","memo","func","getSize","getSizeWithHeaders","prefetch","prefetchWithMetadata","abortPrefetch","queryCache"],"sources":["../../src/Image.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,EAAMC,MAAA,QAAc;AAwBlB,SAAAC,GAAA;AArBX,MAAMC,WAAA,GAAcF,MAAA,CAAOD,IAAA,EAAM;IAC/BI,IAAA,EAAM;IACNC,MAAA,EAAQ;EACV,CAAC;EAEYC,KAAA,GAAQH,WAAA,CAAYI,SAAA,CAC/B,CAACC,OAAA,EAASC,GAAA,KAAQ;IAChB,MAAM;MAAA;MAEJC,UAAA;MACAC,SAAA;MACAC,aAAA;MACAC,YAAA;MACAC,sBAAA;MACAC,SAAA;MACAC,aAAA;MACAC,2BAAA;MACAC,YAAA;MACAC,SAAA;MACA,GAAGC;IACL,IAAIZ,OAAA;IACJ,OAAO,eAAAN,GAAA,CAACC,WAAA;MAAYM,GAAA;MAAW,GAAGW;IAAA,CAAM;EAC1C,GACA;IACEC,YAAA,EAAc;MACZC,IAAA,EAAM;IACR;EACF,CACF;EAEMC,IAAA,GAAQA,CAAA,KAAM,CAAC;AAErBjB,KAAA,CAAMkB,OAAA,GAAUD,IAAA;AAChBjB,KAAA,CAAMmB,kBAAA,GAAqBF,IAAA;AAC3BjB,KAAA,CAAMoB,QAAA,GAAWH,IAAA;AACjBjB,KAAA,CAAMqB,oBAAA,GAAuBJ,IAAA;AAC7BjB,KAAA,CAAMsB,aAAA,GAAgBL,IAAA;AACtBjB,KAAA,CAAMuB,UAAA,GAAaN,IAAA","ignoreList":[]}
+{"version":3,"names":["View","styled","jsx","StyledImage","name","render","Image","styleable","inProps","ref","blurRadius","capInsets","defaultSource","fadeDuration","loadingIndicatorSource","onLoadEnd","onPartialLoad","progressiveRenderingEnabled","resizeMethod","tintColor","rest","staticConfig","memo","func","getSize","getSizeWithHeaders","prefetch","prefetchWithMetadata","abortPrefetch","queryCache"],"sources":["../../src/Image.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,EAAMC,MAAA,QAAc;AAwBlB,SAAAC,GAAA;AArBX,MAAMC,WAAA,GAAcF,MAAA,CAAOD,IAAA,EAAM;EAC/BI,IAAA,EAAM;EACNC,MAAA,EAAQ;AACV,CAAC;AAEM,MAAMC,KAAA,GAAQH,WAAA,CAAYI,SAAA,CAC/B,CAACC,OAAA,EAASC,GAAA,KAAQ;EAChB,MAAM;IAAA;IAEJC,UAAA;IACAC,SAAA;IACAC,aAAA;IACAC,YAAA;IACAC,sBAAA;IACAC,SAAA;IACAC,aAAA;IACAC,2BAAA;IACAC,YAAA;IACAC,SAAA;IACA,GAAGC;EACL,IAAIZ,OAAA;EACJ,OAAO,eAAAN,GAAA,CAACC,WAAA;IAAYM,GAAA;IAAW,GAAGW;EAAA,CAAM;AAC1C,GACA;EACEC,YAAA,EAAc;IACZC,IAAA,EAAM;EACR;AACF,CACF;AAEA,MAAMC,IAAA,GAAQA,CAAA,KAAM,CAAC;AAErBjB,KAAA,CAAMkB,OAAA,GAAUD,IAAA;AAChBjB,KAAA,CAAMmB,kBAAA,GAAqBF,IAAA;AAC3BjB,KAAA,CAAMoB,QAAA,GAAWH,IAAA;AACjBjB,KAAA,CAAMqB,oBAAA,GAAuBJ,IAAA;AAC7BjB,KAAA,CAAMsB,aAAA,GAAgBL,IAAA;AACtBjB,KAAA,CAAMuB,UAAA,GAAaN,IAAA","ignoreList":[]}

package/dist/esm/createImage.mjs

@@ -1,80 +1,102 @@
 import { getTokenValue, styled } from "@tamagui/web";
 import { jsx } from "react/jsx-runtime";
 const defaultObjectFitMap = objectFit => {
-    switch (objectFit) {
-      case "fill":
-        return "stretch";
-      case "none":
-        return "center";
-      case "scale-down":
-        return "contain";
-      case "contain":
-        return "contain";
-      default:
-        return "cover";
-    }
-  },
-  defaultTransformSource = props => {
+  switch (objectFit) {
+    case "fill":
+      return "stretch";
+    case "none":
+      return "center";
+    case "scale-down":
+      return "contain";
+    case "contain":
+      return "contain";
+    default:
+      return "cover";
+  }
+};
+const defaultTransformSource = props => {
+  const {
+    src,
+    source,
+    width,
+    height
+  } = props;
+  if (source) return source;
+  if (src && typeof src !== "string") return src;
+  return {
+    uri: src,
+    width,
+    height
+  };
+};
+function createImage(options) {
+  const {
+    Component,
+    mapObjectFitToResizeMode = defaultObjectFitMap,
+    resizeModePropName = "resizeMode",
+    objectPositionPropName,
+    transformSource = defaultTransformSource
+  } = options;
+  const inlinePropsSet = /* @__PURE__ */new Set(["source", "placeholder", "transition", "contentFit", "contentPosition", "cachePolicy", "recyclingKey", "allowDownscaling", "autoplay", "blurRadius", "priority", "placeholderContentFit", "responsivePolicy", "onLoadStart", "onProgress", "onLoadEnd"]);
+  const StyledImage = styled(Component, {
+    name: "Image"
+  }, {
+    inlineProps: inlinePropsSet
+  });
+  const ImageComponent = StyledImage.styleable((incomingProps, ref) => {
+    const props = incomingProps;
     const {
       src,
-      source,
       width,
-      height
+      height,
+      borderRadius,
+      objectFit,
+      objectPosition,
+      // web only props - filter out on native
+      decoding,
+      elementTiming,
+      fetchpriority,
+      isMap,
+      loading,
+      sizes,
+      useMap,
+      onLoad,
+      onError,
+      ...rest
     } = props;
-    return source || (src && typeof src != "string" ? src : {
-      uri: src,
-      width,
-      height
+    const resolvedWidth = typeof width === "string" && width[0] === "$" ? getTokenValue(width, "size") : width;
+    const resolvedHeight = typeof height === "string" && height[0] === "$" ? getTokenValue(height, "size") : height;
+    const finalSource = transformSource({
+      src,
+      width: resolvedWidth,
+      height: resolvedHeight
     });
-  };
-function createImage(options) {
-  const {
-      Component,
-      mapObjectFitToResizeMode = defaultObjectFitMap,
-      resizeModePropName = "resizeMode",
-      objectPositionPropName,
-      transformSource = defaultTransformSource
-    } = options,
-    ImageComponent = styled(Component, {
-      name: "Image"
-    }, {
-      inlineProps: /* @__PURE__ */new Set(["source", "placeholder", "transition", "contentFit", "contentPosition", "cachePolicy", "recyclingKey", "allowDownscaling", "autoplay", "blurRadius", "priority", "placeholderContentFit", "responsivePolicy", "onLoadStart", "onProgress", "onLoadEnd"])
-    }).styleable((incomingProps, ref) => {
-      const props = incomingProps,
-        {
-          src,
-          width,
-          height,
-          objectFit,
-          objectPosition,
-          // web only props - filter out on native
-          decoding,
-          elementTiming,
-          fetchpriority,
-          isMap,
-          loading,
-          sizes,
-          useMap,
-          onLoad,
-          onError,
-          ...rest
-        } = props,
-        resolvedWidth = typeof width == "string" && width[0] === "$" ? getTokenValue(width) : width,
-        resolvedHeight = typeof height == "string" && height[0] === "$" ? getTokenValue(height) : height,
-        finalSource = transformSource({
-          src,
-          width: resolvedWidth,
-          height: resolvedHeight
+    const incomingStyle = Array.isArray(rest.style) ? Object.assign({}, ...rest.style.flat()) : rest.style;
+    const resolvedBorderRadius = typeof borderRadius === "string" && borderRadius[0] === "$" ? getTokenValue(borderRadius, "radius") : borderRadius;
+    const finalProps = {
+      ...rest,
+      source: finalSource,
+      style: {
+        ...incomingStyle,
+        ...(resolvedBorderRadius !== void 0 && {
+          borderRadius: resolvedBorderRadius
+        }),
+        ...(resolvedWidth !== void 0 && {
+          width: resolvedWidth
         }),
-        finalProps = {
-          ...rest,
-          source: finalSource,
-          style: {
-            width: resolvedWidth,
-            height: resolvedHeight
-          }
-        };
-      return objectFit && (finalProps[resizeModePropName] = mapObjectFitToResizeMode(objectFit)), objectPositionPropName && objectPosition && (finalProps[objectPositionPropName] = objectPosition), onLoad && (finalProps.onLoad = e => {
+        ...(resolvedHeight !== void 0 && {
+          height: resolvedHeight
+        })
+      }
+    };
+    if (objectFit) {
+      finalProps[resizeModePropName] = mapObjectFitToResizeMode(objectFit);
+    }
+    if (objectPositionPropName && objectPosition) {
+      finalProps[objectPositionPropName] = objectPosition;
+    }
+    if (onLoad) {
+      finalProps.onLoad = e => {
         const source = e?.nativeEvent?.source || e?.source || {};
         onLoad({
           target: {
@@ -83,17 +105,28 @@ function createImage(options) {
           },
           type: "load"
         });
-      }), onError && (finalProps.onError = () => {
+      };
+    }
+    if (onError) {
+      finalProps.onError = () => {
         onError({
           type: "error"
         });
-      }), /* @__PURE__ */jsx(Component, {
-        ref,
-        ...finalProps
-      });
-    }),
-    comp = Component;
-  return ImageComponent.getSize = comp.getSize || (() => {}), ImageComponent.getSizeWithHeaders = comp.getSizeWithHeaders || (() => {}), ImageComponent.prefetch = comp.prefetch || (() => {}), ImageComponent.prefetchWithMetadata = comp.prefetchWithMetadata || (() => {}), ImageComponent.abortPrefetch = comp.abortPrefetch || (() => {}), ImageComponent.queryCache = comp.queryCache || (() => {}), ImageComponent;
+      };
+    }
+    return /* @__PURE__ */jsx(Component, {
+      ref,
+      ...finalProps
+    });
+  });
+  const comp = Component;
+  ImageComponent.getSize = comp.getSize || (() => {});
+  ImageComponent.getSizeWithHeaders = comp.getSizeWithHeaders || (() => {});
+  ImageComponent.prefetch = comp.prefetch || (() => {});
+  ImageComponent.prefetchWithMetadata = comp.prefetchWithMetadata || (() => {});
+  ImageComponent.abortPrefetch = comp.abortPrefetch || (() => {});
+  ImageComponent.queryCache = comp.queryCache || (() => {});
+  return ImageComponent;
 }
 export { createImage };
 //# sourceMappingURL=createImage.mjs.map

package/dist/esm/createImage.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["getTokenValue","styled","jsx","defaultObjectFitMap","objectFit","defaultTransformSource","props","src","source","width","height","uri","createImage","options","Component","mapObjectFitToResizeMode","resizeModePropName","objectPositionPropName","transformSource","ImageComponent","name","inlineProps","Set","styleable","incomingProps","ref","objectPosition","decoding","elementTiming","fetchpriority","isMap","loading","sizes","useMap","onLoad","onError","rest","resolvedWidth","resolvedHeight","finalSource","finalProps","style","e","nativeEvent","target","naturalHeight","naturalWidth","type","comp","getSize","getSizeWithHeaders","prefetch","prefetchWithMetadata","abortPrefetch","queryCache"],"sources":["../../src/createImage.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getTokenValue","styled","jsx","defaultObjectFitMap","objectFit","defaultTransformSource","props","src","source","width","height","uri","createImage","options","Component","mapObjectFitToResizeMode","resizeModePropName","objectPositionPropName","transformSource","inlinePropsSet","Set","StyledImage","name","inlineProps","ImageComponent","styleable","incomingProps","ref","borderRadius","objectPosition","decoding","elementTiming","fetchpriority","isMap","loading","sizes","useMap","onLoad","onError","rest","resolvedWidth","resolvedHeight","finalSource","incomingStyle","Array","isArray","style","Object","assign","flat","resolvedBorderRadius","finalProps","e","nativeEvent","target","naturalHeight","naturalWidth","type","comp","getSize","getSizeWithHeaders","prefetch","prefetchWithMetadata","abortPrefetch","queryCache"],"sources":["../../src/createImage.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/createImage.native.js

@@ -1,102 +1,133 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { getTokenValue, styled } from "@tamagui/web";
 var defaultObjectFitMap = function (objectFit) {
-    switch (objectFit) {
-      case "fill":
-        return "stretch";
-      case "none":
-        return "center";
-      case "scale-down":
-        return "contain";
-      case "contain":
-        return "contain";
-      default:
-        return "cover";
-    }
-  },
-  defaultTransformSource = function (props) {
+  switch (objectFit) {
+    case "fill":
+      return "stretch";
+    case "none":
+      return "center";
+    case "scale-down":
+      return "contain";
+    case "contain":
+      return "contain";
+    default:
+      return "cover";
+  }
+};
+var defaultTransformSource = function (props) {
+  var {
+    src,
+    source,
+    width,
+    height
+  } = props;
+  if (source) return source;
+  if (src && typeof src !== "string") return src;
+  return {
+    uri: src,
+    width,
+    height
+  };
+};
+function createImage(options) {
+  var {
+    Component,
+    mapObjectFitToResizeMode = defaultObjectFitMap,
+    resizeModePropName = "resizeMode",
+    objectPositionPropName,
+    transformSource = defaultTransformSource
+  } = options;
+  var inlinePropsSet = /* @__PURE__ */new Set(["source", "placeholder", "transition", "contentFit", "contentPosition", "cachePolicy", "recyclingKey", "allowDownscaling", "autoplay", "blurRadius", "priority", "placeholderContentFit", "responsivePolicy", "onLoadStart", "onProgress", "onLoadEnd"]);
+  var StyledImage = styled(Component, {
+    name: "Image"
+  }, {
+    inlineProps: inlinePropsSet
+  });
+  var ImageComponent = StyledImage.styleable(function (incomingProps, ref) {
+    var props = incomingProps;
     var {
       src,
-      source,
       width,
-      height
+      height,
+      borderRadius,
+      objectFit,
+      objectPosition,
+      // web only props - filter out on native
+      decoding,
+      elementTiming,
+      fetchpriority,
+      isMap,
+      loading,
+      sizes,
+      useMap,
+      onLoad,
+      onError,
+      ...rest
     } = props;
-    return source || (src && typeof src != "string" ? src : {
-      uri: src,
-      width,
-      height
+    var resolvedWidth = typeof width === "string" && width[0] === "$" ? getTokenValue(width, "size") : width;
+    var resolvedHeight = typeof height === "string" && height[0] === "$" ? getTokenValue(height, "size") : height;
+    var finalSource = transformSource({
+      src,
+      width: resolvedWidth,
+      height: resolvedHeight
     });
-  };
-function createImage(options) {
-  var {
-      Component,
-      mapObjectFitToResizeMode = defaultObjectFitMap,
-      resizeModePropName = "resizeMode",
-      objectPositionPropName,
-      transformSource = defaultTransformSource
-    } = options,
-    inlinePropsSet = /* @__PURE__ */new Set(["source", "placeholder", "transition", "contentFit", "contentPosition", "cachePolicy", "recyclingKey", "allowDownscaling", "autoplay", "blurRadius", "priority", "placeholderContentFit", "responsivePolicy", "onLoadStart", "onProgress", "onLoadEnd"]),
-    StyledImage = styled(Component, {
-      name: "Image"
-    }, {
-      inlineProps: inlinePropsSet
-    }),
-    ImageComponent = StyledImage.styleable(function (incomingProps, ref) {
-      var props = incomingProps,
-        {
-          src,
-          width,
-          height,
-          objectFit,
-          objectPosition,
-          // web only props - filter out on native
-          decoding,
-          elementTiming,
-          fetchpriority,
-          isMap,
-          loading,
-          sizes,
-          useMap,
-          onLoad,
-          onError,
-          ...rest
-        } = props,
-        resolvedWidth = typeof width == "string" && width[0] === "$" ? getTokenValue(width) : width,
-        resolvedHeight = typeof height == "string" && height[0] === "$" ? getTokenValue(height) : height,
-        finalSource = transformSource({
-          src,
-          width: resolvedWidth,
-          height: resolvedHeight
+    var incomingStyle = Array.isArray(rest.style) ? Object.assign({}, ...rest.style.flat()) : rest.style;
+    var resolvedBorderRadius = typeof borderRadius === "string" && borderRadius[0] === "$" ? getTokenValue(borderRadius, "radius") : borderRadius;
+    var finalProps = {
+      ...rest,
+      source: finalSource,
+      style: {
+        ...incomingStyle,
+        ...(resolvedBorderRadius !== void 0 && {
+          borderRadius: resolvedBorderRadius
+        }),
+        ...(resolvedWidth !== void 0 && {
+          width: resolvedWidth
         }),
-        finalProps = {
-          ...rest,
-          source: finalSource,
-          style: {
-            width: resolvedWidth,
-            height: resolvedHeight
-          }
-        };
-      return objectFit && (finalProps[resizeModePropName] = mapObjectFitToResizeMode(objectFit)), objectPositionPropName && objectPosition && (finalProps[objectPositionPropName] = objectPosition), onLoad && (finalProps.onLoad = function (e) {
-        var _e_nativeEvent,
-          source = (e == null || (_e_nativeEvent = e.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.source) || e?.source || {};
+        ...(resolvedHeight !== void 0 && {
+          height: resolvedHeight
+        })
+      }
+    };
+    if (objectFit) {
+      finalProps[resizeModePropName] = mapObjectFitToResizeMode(objectFit);
+    }
+    if (objectPositionPropName && objectPosition) {
+      finalProps[objectPositionPropName] = objectPosition;
+    }
+    if (onLoad) {
+      finalProps.onLoad = function (e) {
+        var _e_nativeEvent;
+        var source = (e === null || e === void 0 ? void 0 : (_e_nativeEvent = e.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.source) || (e === null || e === void 0 ? void 0 : e.source) || {};
         onLoad({
           target: {
-            naturalHeight: source?.height,
-            naturalWidth: source?.width
+            naturalHeight: source === null || source === void 0 ? void 0 : source.height,
+            naturalWidth: source === null || source === void 0 ? void 0 : source.width
           },
           type: "load"
         });
-      }), onError && (finalProps.onError = function () {
+      };
+    }
+    if (onError) {
+      finalProps.onError = function () {
         onError({
           type: "error"
         });
-      }), /* @__PURE__ */_jsx(Component, {
-        ref,
-        ...finalProps
-      });
-    }),
-    comp = Component;
-  return ImageComponent.getSize = comp.getSize || function () {}, ImageComponent.getSizeWithHeaders = comp.getSizeWithHeaders || function () {}, ImageComponent.prefetch = comp.prefetch || function () {}, ImageComponent.prefetchWithMetadata = comp.prefetchWithMetadata || function () {}, ImageComponent.abortPrefetch = comp.abortPrefetch || function () {}, ImageComponent.queryCache = comp.queryCache || function () {}, ImageComponent;
+      };
+    }
+    return /* @__PURE__ */_jsx(Component, {
+      ref,
+      ...finalProps
+    });
+  });
+  var comp = Component;
+  ImageComponent.getSize = comp.getSize || function () {};
+  ImageComponent.getSizeWithHeaders = comp.getSizeWithHeaders || function () {};
+  ImageComponent.prefetch = comp.prefetch || function () {};
+  ImageComponent.prefetchWithMetadata = comp.prefetchWithMetadata || function () {};
+  ImageComponent.abortPrefetch = comp.abortPrefetch || function () {};
+  ImageComponent.queryCache = comp.queryCache || function () {};
+  return ImageComponent;
 }
 export { createImage };
 //# sourceMappingURL=createImage.native.js.map

package/dist/esm/createImage.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["jsx","_jsx","getTokenValue","styled","defaultObjectFitMap","objectFit","defaultTransformSource","props","src","source","width","height","uri","createImage","options","Component","mapObjectFitToResizeMode","resizeModePropName","objectPositionPropName","transformSource","inlinePropsSet","Set","StyledImage","name","inlineProps","ImageComponent","styleable","incomingProps","ref","objectPosition","decoding","elementTiming","fetchpriority","isMap","loading","sizes","useMap","onLoad","onError","rest","resolvedWidth","resolvedHeight","finalSource","finalProps","style","e","_e_nativeEvent","nativeEvent","target","naturalHeight","naturalWidth","type","comp","getSize","getSizeWithHeaders","prefetch","prefetchWithMetadata","abortPrefetch","queryCache"],"sources":["../../src/createImage.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["jsx","_jsx","getTokenValue","styled","defaultObjectFitMap","objectFit","defaultTransformSource","props","src","source","width","height","uri","createImage","options","Component","mapObjectFitToResizeMode","resizeModePropName","objectPositionPropName","transformSource","inlinePropsSet","Set","StyledImage","name","inlineProps","ImageComponent","styleable","incomingProps","ref","borderRadius","objectPosition","decoding","elementTiming","fetchpriority","isMap","loading","sizes","useMap","onLoad","onError","rest","resolvedWidth","resolvedHeight","finalSource","incomingStyle","Array","isArray","style","Object","assign","flat","resolvedBorderRadius","finalProps","e","_e_nativeEvent","nativeEvent","target","naturalHeight","naturalWidth","type","comp","getSize","getSizeWithHeaders","prefetch","prefetchWithMetadata","abortPrefetch","queryCache"],"sources":["../../src/createImage.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/index.js

@@ -1,3 +1,3 @@
-export * from "./Image";
-export * from "./createImage";
+export * from "./Image.mjs";
+export * from "./createImage.mjs";
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1,6 +1 @@
-{
-  "version": 3,
-  "sources": ["../../src/index.ts"],
-  "mappings": "AAAA,cAAc;AACd,cAAc;",
-  "names": []
-}
+{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc","ignoreList":[]}

package/dist/esm/v1/Image.mjs

@@ -6,35 +6,48 @@ import { jsx } from "react/jsx-runtime";
 const StyledImage = styled(RNImage, {
   name: "Image"
 });
-let hasWarned = !1;
+let hasWarned = false;
 const Image = StyledImage.styleable((inProps, ref) => {
-  const [props, style] = usePropsAndStyle(inProps),
-    {
-      src,
-      source,
-      objectFit,
-      ...rest
-    } = props;
-  process.env.NODE_ENV === "development" && typeof src == "string" && (typeof props.width == "string" && props.width[0] !== "$" || typeof props.height == "string" && props.height[0] !== "$") && (hasWarned || (hasWarned = !0, console.warn('React Native expects a numerical width/height. If you want to use a percent you must define the "source" prop with width, height, and uri.')));
-  let finalSource = typeof src == "string" ? {
+  const [props, style] = usePropsAndStyle(inProps);
+  const {
+    src,
+    source,
+    objectFit,
+    ...rest
+  } = props;
+  if (process.env.NODE_ENV === "development") {
+    if (typeof src === "string") {
+      if (typeof props.width === "string" && props.width[0] !== "$" || typeof props.height === "string" && props.height[0] !== "$") {
+        if (!hasWarned) {
+          hasWarned = true;
+          console.warn(`React Native expects a numerical width/height. If you want to use a percent you must define the "source" prop with width, height, and uri.`);
+        }
+      }
+    }
+  }
+  let finalSource = typeof src === "string" ? {
     uri: src,
     ...(isWeb && {
       width: props.width || style?.width,
       height: props.height || style?.height
     })
   } : source ?? src;
-  return finalSource && typeof finalSource == "object" && (process.env.NODE_ENV === "development" && process.env.TAMAGUI_IMAGE_CHECK_ERROR && React.useEffect(() => {
-    async function run() {
-      if (typeof src == "string") try {
-        await fetch(src).then(res => res.text());
-      } catch {
-        console.error(`Error loading image: ${src}`, {
-          props
-        });
+  if (finalSource && typeof finalSource === "object") {
+    if (process.env.NODE_ENV === "development" && process.env.TAMAGUI_IMAGE_CHECK_ERROR) React.useEffect(() => {
+      async function run() {
+        if (typeof src === "string") try {
+          await fetch(src).then(res => res.text());
+        } catch (err) {
+          console.error(`Error loading image: ${src}`, {
+            props
+          });
+        }
       }
-    }
-    run();
-  }, [src]), finalSource.default && (finalSource = finalSource.default)), /* @__PURE__ */jsx(RNImage, {
+      run();
+    }, [src]);
+    if (finalSource["default"]) finalSource = finalSource["default"];
+  }
+  return /* @__PURE__ */jsx(RNImage, {
     resizeMode: objectFit,
     ref,
     source: finalSource,

package/dist/esm/v1/Image.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["React","isWeb","styled","usePropsAndStyle","Image","RNImage","jsx","StyledImage","name","hasWarned","styleable","inProps","ref","props","style","src","source","objectFit","rest","process","env","NODE_ENV","width","height","console","warn","finalSource","uri","TAMAGUI_IMAGE_CHECK_ERROR","useEffect","run","fetch","then","res","text","error","default","resizeMode","getSize","getSizeWithHeaders","prefetch","prefetchWithMetadata","abortPrefetch","queryCache"],"sources":["../../../src/v1/Image.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,MAAW;AAClB,SAASC,KAAA,QAAa;AAQtB,SAASC,MAAA,EAAQC,gBAAA,QAAwB;AAEzC,SAASC,KAAA,IAASC,OAAA,QAAe;AAqH7B,SAAAC,GAAA;AAnHJ,MAAMC,WAAA,GAAcL,MAAA,CAAOG,OAAA,EAAS;EAClCG,IAAA,EAAM;AACR,CAAC;AAmCD,IAAIC,SAAA,GAAY;AAMT,MAAML,KAAA,GAAQG,WAAA,CAAYG,SAAA,CAAsB,CAACC,OAAA,EAASC,GAAA,KAAQ;EACvE,MAAM,CAACC,KAAA,EAAOC,KAAK,IAAIX,gBAAA,CAAiBQ,OAAO;IACzC;MAAEI,GAAA;MAAKC,MAAA;MAAQC,SAAA;MAAW,GAAGC;IAAK,IAAIL,KAAA;EAExCM,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBACvB,OAAON,GAAA,IAAQ,aAEd,OAAOF,KAAA,CAAMS,KAAA,IAAU,YAAYT,KAAA,CAAMS,KAAA,CAAM,CAAC,MAAM,OACtD,OAAOT,KAAA,CAAMU,MAAA,IAAW,YAAYV,KAAA,CAAMU,MAAA,CAAO,CAAC,MAAM,SAEpDd,SAAA,KACHA,SAAA,GAAY,IACZe,OAAA,CAAQC,IAAA,CACN,4IACF;EAMR,IAAIC,WAAA,GACF,OAAOX,GAAA,IAAQ,WACX;IACEY,GAAA,EAAKZ,GAAA;IACL,IAAId,KAAA,IAAS;MACXqB,KAAA,EAAOT,KAAA,CAAMS,KAAA,IAASR,KAAA,EAAOQ,KAAA;MAC7BC,MAAA,EAAQV,KAAA,CAAMU,MAAA,IAAUT,KAAA,EAAOS;IACjC;EACF,IACCP,MAAA,IAAUD,GAAA;EAEjB,OAAIW,WAAA,IAAe,OAAOA,WAAA,IAAgB,aAgBpCP,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBAAiBF,OAAA,CAAQC,GAAA,CAAIQ,yBAAA,IAExD5B,KAAA,CAAM6B,SAAA,CAAU,MAAM;IACpB,eAAeC,IAAA,EAAM;MACnB,IAAI,OAAOf,GAAA,IAAQ,UACjB,IAAI;QACF,MAAMgB,KAAA,CAAMhB,GAAG,EAAEiB,IAAA,CAAMC,GAAA,IAAQA,GAAA,CAAIC,IAAA,CAAK,CAAC;MAC3C,QAAc;QACZV,OAAA,CAAQW,KAAA,CAAM,wBAAwBpB,GAAG,IAAI;UAAEF;QAAM,CAAC;MACxD;IAEJ;IAEAiB,GAAA,CAAI;EACN,GAAG,CAACf,GAAG,CAAC,GAINW,WAAA,CAAYU,OAAA,KACdV,WAAA,GAAcA,WAAA,CAAYU,OAAA,IAM5B,eAAA9B,GAAA,CAACD,OAAA;IACCgC,UAAA,EAAYpB,SAAA;IACZL,GAAA;IACAI,MAAA,EAAQU,WAAA;IACRZ,KAAA;IACC,GAAII;EAAA,CACP;AAEJ,CAAC;AAEDd,KAAA,CAAMkC,OAAA,GAAUjC,OAAA,CAAQiC,OAAA;AACxBlC,KAAA,CAAMmC,kBAAA,GAAqBlC,OAAA,CAAQkC,kBAAA;AACnCnC,KAAA,CAAMoC,QAAA,GAAWnC,OAAA,CAAQmC,QAAA;AACzBpC,KAAA,CAAMqC,oBAAA,GAAuBpC,OAAA,CAAQoC,oBAAA;AACrCrC,KAAA,CAAMsC,aAAA,GAAgBrC,OAAA,CAAQqC,aAAA;AAC9BtC,KAAA,CAAMuC,UAAA,GAAatC,OAAA,CAAQsC,UAAA","ignoreList":[]}
+{"version":3,"names":["React","isWeb","styled","usePropsAndStyle","Image","RNImage","jsx","StyledImage","name","hasWarned","styleable","inProps","ref","props","style","src","source","objectFit","rest","process","env","NODE_ENV","width","height","console","warn","finalSource","uri","TAMAGUI_IMAGE_CHECK_ERROR","useEffect","run","fetch","then","res","text","err","error","resizeMode","getSize","getSizeWithHeaders","prefetch","prefetchWithMetadata","abortPrefetch","queryCache"],"sources":["../../../src/v1/Image.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,MAAW;AAClB,SAASC,KAAA,QAAa;AAQtB,SAASC,MAAA,EAAQC,gBAAA,QAAwB;AAEzC,SAASC,KAAA,IAASC,OAAA,QAAe;AAqH7B,SAAAC,GAAA;AAnHJ,MAAMC,WAAA,GAAcL,MAAA,CAAOG,OAAA,EAAS;EAAAG,IAAA;AAAA;AAAA,IAClCC,SAAM;AACR,MAACL,KAAA,GAAAG,WAAA,CAAAG,SAAA,EAAAC,OAAA,EAAAC,GAAA;EAmCD,MAAI,CAAAC,KAAA,EAAAC,KAAY,IAAAX,gBAAA,CAAAQ,OAAA;EAMT,MAAM;IAAAI,GAAA;IAAQC,MAAA;IAAAC,SAAY;IAAA,GAAsBC;EAAC,IAAAL,KAAS;EAC/D,IAAAM,OAAO,CAAAC,GAAO,CAAAC,QAAS,kBAAiB;IACxC,WAAQN,GAAK,aAAQ;MAErB,IAAI,OAAQF,KAAI,CAAAS,KAAA,aAAa,IAAAT,KAAe,CAAAS,KAAA,sBAAAT,KAAA,CAAAU,MAAA,iBAAAV,KAAA,CAAAU,MAAA;QAC1C,IAAI,CAAAd,SAAO;UACTA,SACG,GAAO;UAGRe,OAAI,CAACC,IAAA,6IAAW;QACd;MACA;IAAQ;EACN;EACF,IAAAC,WACF,UAAAX,GAAA;IAAAY,GAAA,EACFZ,GAAA;IAAA,IACFd,KAAA;MACFqB,KAAA,EAAAT,KAAA,CAAAS,KAAA,IAAAR,KAAA,EAAAQ,KAAA;MAEAC,MAAI,EAAAV,KAAA,CAAAU,MACF,IAAOT,KAAA,EAAAS;IACH;EACO,IACLP,MAAI,IAAAD,GAAS;EAAA,IAAAW,WACJ,IAAM,OAAAA,WAAgB;IAAA,IAC7BP,OAAA,CAAQC,GAAA,CAAAC,QAAM,KAAU,aAAO,IAAAF,OAAA,CAAAC,GAAA,CAAAQ,yBAAA,EAAA5B,KAAA,CAAA6B,SAAA;MAAA,eACjCC,IAAA;QACF,IACC,OAAAf,GAAU;UAEjB,MAAIgB,KAAA,CAAAhB,GAAA,CAAe,CAAAiB,IAAA,CAAOC,GAAA,IAAAA,GAAA,CAAAC,IAAgB;QACxC,SAAIC,GAAQ;UAEVX,OAAK,CAAAY,KAAM,yBAAsBrB,GAAA;YAAAF;UAAA;QAC/B;MACE;MACAiB,GAAA;IAEE,IAAAf,GAAA;IAEA,IAAAW,WAAA,CAAM,YAAWA,WAAO,GAAAA,WAAA;EAAA;EAC1B,OACF,eAAApB,GAAA,CAAAD,OAAA;IAAAgC,UACF,EAAApB,SAAA;IAAAL,GACF;IAEAI,MAAI,EAAAU,WAAY;IAEdZ,KAAA;IACE,GAAAI;EACE;AACE;AACEd,KAAA,CAAAkC,OAAA,GAAAjC,OAAM,CAAAiC,OAAW;AAAwBlC,KAAA,CAAAmC,kBAClC,GAAKlC,OAAA,CAAAkC,kBAAA;AACZnC,KAAA,CAAAoC,QAAA,GAAAnC,OAAQ,CAAAmC,QAAM;AAAwCpC,KAAA,CAAAqC,oBACxD,GAAApC,OAAA,CAAAoC,oBAAA;AAAArC,KAAA,CAAAsC,aACF,GAAArC,OAAA,CAAAqC,aAAA;AAAAtC,KAAA,CAAAuC,UACF,GAAAtC,OAAA,CAAAsC,UAAA;AAEA,SAAAvC,KAAI","ignoreList":[]}