expo-image 0.1.0 → 0.2.2

package/README.md

@@ -4,12 +4,12 @@ A cross-platform, performant image component for React Native and Expo with Web
 
 # API documentation
 
-- [Documentation for the master branch](https://github.com/expo/expo/blob/master/docs/pages/versions/unversioned/sdk/image.md)
-- [Documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/image/)
+- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/image.md)
+- [Documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/image/)
 
 # Installation in managed Expo projects
 
-For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/image/). If you follow the link and there is no documentation available then this library is not yet usable within managed projects — it is likely to be included in an upcoming Expo SDK release.
+For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/image/). If you follow the link and there is no documentation available then this library is not yet usable within managed projects — it is likely to be included in an upcoming Expo SDK release.
 
 # Installation in bare React Native projects
 

package/android/build.gradle

@@ -1,21 +1,29 @@
-def DEFAULT_COMPILE_SDK_VERSION = 28
-def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
-def DEFAULT_MIN_SDK_VERSION = 16
-def DEFAULT_TARGET_SDK_VERSION = 28
-
-def DEFAULT_OKHTTP_VERSION = '3.14.9'
-
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply plugin: 'kotlin-kapt'
 
 buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
   }
 
+  // Ensures backward compatibility
+  ext.getKotlinVersion = {
+    if (ext.has("kotlinVersion")) {
+      ext.kotlinVersion()
+    } else {
+      ext.safeExtGet("kotlinVersion", "1.6.10")
+    }
+  }
+
   // The Android Gradle plugin is only required when opening the android folder stand-alone.
   // This avoids unnecessary downloads and potential conflicts when the library is included as a
   // module dependency in an application project.
@@ -23,29 +31,31 @@ buildscript {
   if (project == rootProject) {
     repositories {
       google()
-      jcenter()
     }
     dependencies {
-      classpath 'com.android.tools.build:gradle:3.4.1'
-      classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.21')}")
+      classpath 'com.android.tools.build:gradle:4.2.2'
+      classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
     }
   }
 }
 
 android {
-  compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
-  buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
+  compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
-    minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
-    targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
+    minSdkVersion safeExtGet("minSdkVersion", 21)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 1
-    versionName "0.1.0"
+    versionName "0.2.2"
   }
   lintOptions {
     abortOnError false
@@ -89,9 +99,9 @@ dependencies {
   api 'com.caverock:androidsvg-aar:1.4'
 
   api 'com.github.bumptech.glide:okhttp3-integration:4.11.0'
-  api "com.squareup.okhttp3:okhttp:${safeExtGet("okHttpVersion", DEFAULT_OKHTTP_VERSION)}"
+  api "com.squareup.okhttp3:okhttp:${safeExtGet("okHttpVersion", '4.9.2')}"
 
   implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1'
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
   implementation "jp.wasabeef:glide-transformations:4.3.0"
 }

package/android/src/main/java/expo/modules/image/okhttp/OkHttpClientProgressInterceptor.kt

@@ -20,10 +20,10 @@ object OkHttpClientProgressInterceptor : Interceptor {
   @Throws(IOException::class)
   override fun intercept(chain: Interceptor.Chain): Response {
     val weakThis = WeakReference(this)
-    val requestUrl = chain.call().request().url().toString()
+    val requestUrl = chain.call().request().url.toString()
     val originalResponse = chain.proceed(chain.request())
     return originalResponse.newBuilder()
-      .body(ProgressResponseBody(originalResponse.body()) { bytesWritten, contentLength, done ->
+      .body(ProgressResponseBody(originalResponse.body) { bytesWritten, contentLength, done ->
         val strongThis = weakThis.get() ?: return@ProgressResponseBody
         val urlListeners = strongThis.mProgressListeners[requestUrl]
         urlListeners?.forEach { it.get()?.onProgress(bytesWritten, contentLength, done) }

package/build/ExpoImage.d.ts

@@ -0,0 +1,5 @@
+import { ImageProps } from './Image';
+declare const ExpoImageModule: any;
+export { ExpoImageModule };
+export default function ExpoImage({ source, style, defaultSource, loadingIndicatorSource, ...props }: ImageProps): JSX.Element;
+//# sourceMappingURL=ExpoImage.d.ts.map

package/build/ExpoImage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoImage.d.ts","sourceRoot":"","sources":["../src/ExpoImage.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAMrC,QAAA,MAAM,eAAe,KAAgC,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,CAAC;AAE3B,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,MAAM,EACN,KAAK,EACL,aAAa,EACb,sBAAsB,EACtB,GAAG,KAAK,EACT,EAAE,UAAU,eAoEZ"}

package/build/ExpoImage.js

@@ -0,0 +1,58 @@
+import React from 'react';
+import { Image, requireNativeComponent, NativeModules, StyleSheet, Platform, processColor, } from 'react-native';
+const NativeExpoImage = requireNativeComponent('ExpoImage');
+const ExpoImageModule = NativeModules.ExpoImageModule;
+export { ExpoImageModule };
+export default function ExpoImage({ source, style, defaultSource, loadingIndicatorSource, ...props }) {
+    const resolvedSource = Image.resolveAssetSource(source ?? {});
+    const resolvedStyle = StyleSheet.flatten([style]);
+    const resolvedPlaceholder = Image.resolveAssetSource(defaultSource ?? loadingIndicatorSource ?? {});
+    // If both are specified, we default to use default source
+    if (defaultSource && loadingIndicatorSource) {
+        console.warn("<Image> component can't have both defaultSource and loadingIndicatorSource at the same time. Defaulting to defaultSource");
+    }
+    // When possible, pass through the intrinsic size of the asset to the Yoga layout
+    // system. While this is also possible in native code, doing it here is more efficient
+    // as the yoga node gets initialized with the correct size from the start.
+    // In native code, there is a separation between the layout (shadow) nodes and
+    // actual views. Views that update the intrinsic content-size in Yoga trigger
+    // additional layout passes, which we want to prevent.
+    if (!Array.isArray(resolvedSource)) {
+        const { width, height } = resolvedSource;
+        resolvedStyle.width = resolvedStyle.width ?? width;
+        resolvedStyle.height = resolvedStyle.height ?? height;
+    }
+    // Shadows behave different on iOS, Android & Web.
+    // Android uses the `elevation` prop, whereas iOS
+    // and web use the regular `shadow...` props.
+    let hasShadows = false;
+    if (Platform.OS === 'android') {
+        delete resolvedStyle.shadowColor;
+        delete resolvedStyle.shadowOffset;
+        delete resolvedStyle.shadowOpacity;
+        delete resolvedStyle.shadowRadius;
+        hasShadows = !!resolvedStyle.elevation;
+    }
+    else {
+        delete resolvedStyle.elevation;
+        hasShadows = !!resolvedStyle.shadowColor;
+    }
+    // Shadows are rendered quite differently on iOS, Android and web.
+    // - iOS renders the shadow along the transparent contours of the image.
+    // - Android renders an underlay which extends to the inside of the bounds.
+    // - Web renders the shadow only on the outside of the bounds.
+    // To achieve a consistent appearance on all platforms, it is highly recommended
+    // to set a background-color on the Image when using shadows. This will ensure
+    // consistent rendering on all platforms and mitigate Androids drawing artefacts.
+    if (hasShadows) {
+        const processedColor = processColor(resolvedStyle.backgroundColor);
+        const bkColor = typeof processedColor === 'number' ? processedColor : 0;
+        const alpha = bkColor >> 24;
+        if (alpha !== -1 && alpha !== 255) {
+            // To silence this warning, set background-color to a fully transparent color
+            console.warn(`"expo-image" Shadows may not be rendered correctly for the transparent parts of images. Set "backgroundColor" to a non-transparent color when using a shadow.`);
+        }
+    }
+    return (React.createElement(NativeExpoImage, { ...props, source: resolvedSource, style: resolvedStyle, defaultSource: resolvedPlaceholder }));
+}
+//# sourceMappingURL=ExpoImage.js.map

package/build/ExpoImage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoImage.js","sourceRoot":"","sources":["../src/ExpoImage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,KAAK,EACL,sBAAsB,EACtB,aAAa,EACb,UAAU,EACV,QAAQ,EACR,YAAY,GACb,MAAM,cAAc,CAAC;AAMtB,MAAM,eAAe,GAAG,sBAAsB,CAAuB,WAAW,CAAC,CAAC;AAElF,MAAM,eAAe,GAAG,aAAa,CAAC,eAAe,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,CAAC;AAE3B,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,MAAM,EACN,KAAK,EACL,aAAa,EACb,sBAAsB,EACtB,GAAG,KAAK,EACG;IACX,MAAM,cAAc,GAAG,KAAK,CAAC,kBAAkB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC9D,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAClD,MAAM,mBAAmB,GAAG,KAAK,CAAC,kBAAkB,CAClD,aAAa,IAAI,sBAAsB,IAAI,EAAE,CAC9C,CAAC;IAEF,0DAA0D;IAC1D,IAAI,aAAa,IAAI,sBAAsB,EAAE;QAC3C,OAAO,CAAC,IAAI,CACV,0HAA0H,CAC3H,CAAC;KACH;IAED,iFAAiF;IACjF,sFAAsF;IACtF,0EAA0E;IAC1E,8EAA8E;IAC9E,6EAA6E;IAC7E,sDAAsD;IACtD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;QAClC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;QACzC,aAAa,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,IAAI,KAAK,CAAC;QACnD,aAAa,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,IAAI,MAAM,CAAC;KACvD;IAED,kDAAkD;IAClD,iDAAiD;IACjD,6CAA6C;IAC7C,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,QAAQ,CAAC,EAAE,KAAK,SAAS,EAAE;QAC7B,OAAO,aAAa,CAAC,WAAW,CAAC;QACjC,OAAO,aAAa,CAAC,YAAY,CAAC;QAClC,OAAO,aAAa,CAAC,aAAa,CAAC;QACnC,OAAO,aAAa,CAAC,YAAY,CAAC;QAClC,UAAU,GAAG,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC;KACxC;SAAM;QACL,OAAO,aAAa,CAAC,SAAS,CAAC;QAC/B,UAAU,GAAG,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC;KAC1C;IAED,kEAAkE;IAClE,wEAAwE;IACxE,2EAA2E;IAC3E,8DAA8D;IAC9D,gFAAgF;IAChF,8EAA8E;IAC9E,iFAAiF;IACjF,IAAI,UAAU,EAAE;QACd,MAAM,cAAc,GAAG,YAAY,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QACnE,MAAM,OAAO,GAAW,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,MAAM,KAAK,GAAG,OAAO,IAAI,EAAE,CAAC;QAC5B,IAAI,KAAK,KAAK,CAAC,CAAC,IAAI,KAAK,KAAK,GAAG,EAAE;YACjC,6EAA6E;YAC7E,OAAO,CAAC,IAAI,CACV,+JAA+J,CAChK,CAAC;SACH;KACF;IAED,OAAO,CACL,oBAAC,eAAe,OACV,KAAK,EACT,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,aAAa,EACpB,aAAa,EAAE,mBAAmB,GAClC,CACH,CAAC;AACJ,CAAC","sourcesContent":["import React from 'react';\nimport {\n  Image,\n  requireNativeComponent,\n  NativeModules,\n  StyleSheet,\n  Platform,\n  processColor,\n} from 'react-native';\n\nimport { ImageProps } from './Image';\n\ntype NativeExpoImageProps = ImageProps;\n\nconst NativeExpoImage = requireNativeComponent<NativeExpoImageProps>('ExpoImage');\n\nconst ExpoImageModule = NativeModules.ExpoImageModule;\n\nexport { ExpoImageModule };\n\nexport default function ExpoImage({\n  source,\n  style,\n  defaultSource,\n  loadingIndicatorSource,\n  ...props\n}: ImageProps) {\n  const resolvedSource = Image.resolveAssetSource(source ?? {});\n  const resolvedStyle = StyleSheet.flatten([style]);\n  const resolvedPlaceholder = Image.resolveAssetSource(\n    defaultSource ?? loadingIndicatorSource ?? {}\n  );\n\n  // If both are specified, we default to use default source\n  if (defaultSource && loadingIndicatorSource) {\n    console.warn(\n      \"<Image> component can't have both defaultSource and loadingIndicatorSource at the same time. Defaulting to defaultSource\"\n    );\n  }\n\n  // When possible, pass through the intrinsic size of the asset to the Yoga layout\n  // system. While this is also possible in native code, doing it here is more efficient\n  // as the yoga node gets initialized with the correct size from the start.\n  // In native code, there is a separation between the layout (shadow) nodes and\n  // actual views. Views that update the intrinsic content-size in Yoga trigger\n  // additional layout passes, which we want to prevent.\n  if (!Array.isArray(resolvedSource)) {\n    const { width, height } = resolvedSource;\n    resolvedStyle.width = resolvedStyle.width ?? width;\n    resolvedStyle.height = resolvedStyle.height ?? height;\n  }\n\n  // Shadows behave different on iOS, Android & Web.\n  // Android uses the `elevation` prop, whereas iOS\n  // and web use the regular `shadow...` props.\n  let hasShadows = false;\n  if (Platform.OS === 'android') {\n    delete resolvedStyle.shadowColor;\n    delete resolvedStyle.shadowOffset;\n    delete resolvedStyle.shadowOpacity;\n    delete resolvedStyle.shadowRadius;\n    hasShadows = !!resolvedStyle.elevation;\n  } else {\n    delete resolvedStyle.elevation;\n    hasShadows = !!resolvedStyle.shadowColor;\n  }\n\n  // Shadows are rendered quite differently on iOS, Android and web.\n  // - iOS renders the shadow along the transparent contours of the image.\n  // - Android renders an underlay which extends to the inside of the bounds.\n  // - Web renders the shadow only on the outside of the bounds.\n  // To achieve a consistent appearance on all platforms, it is highly recommended\n  // to set a background-color on the Image when using shadows. This will ensure\n  // consistent rendering on all platforms and mitigate Androids drawing artefacts.\n  if (hasShadows) {\n    const processedColor = processColor(resolvedStyle.backgroundColor);\n    const bkColor: number = typeof processedColor === 'number' ? processedColor : 0;\n    const alpha = bkColor >> 24;\n    if (alpha !== -1 && alpha !== 255) {\n      // To silence this warning, set background-color to a fully transparent color\n      console.warn(\n        `\"expo-image\" Shadows may not be rendered correctly for the transparent parts of images. Set \"backgroundColor\" to a non-transparent color when using a shadow.`\n      );\n    }\n  }\n\n  return (\n    <NativeExpoImage\n      {...props}\n      source={resolvedSource}\n      style={resolvedStyle}\n      defaultSource={resolvedPlaceholder}\n    />\n  );\n}\n"]}

package/build/ExpoImage.web.d.ts

@@ -0,0 +1,3 @@
+import { ImageProps } from './Image';
+export default function ExpoImage({ source, ...props }: ImageProps): JSX.Element;
+//# sourceMappingURL=ExpoImage.web.d.ts.map

package/build/ExpoImage.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoImage.web.d.ts","sourceRoot":"","sources":["../src/ExpoImage.web.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,UAAU,eAKjE"}

package/build/ExpoImage.web.js

@@ -0,0 +1,8 @@
+import React from 'react';
+import { Image } from 'react-native';
+export default function ExpoImage({ source, ...props }) {
+    const resolvedSource = source ?? {};
+    // @ts-expect-error - expo-image is being reworked so these types should be revisited
+    return React.createElement(Image, { ...props, source: resolvedSource });
+}
+//# sourceMappingURL=ExpoImage.web.js.map

package/build/ExpoImage.web.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoImage.web.js","sourceRoot":"","sources":["../src/ExpoImage.web.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAIrC,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,KAAK,EAAc;IAChE,MAAM,cAAc,GAAG,MAAM,IAAI,EAAE,CAAC;IAEpC,qFAAqF;IACrF,OAAO,oBAAC,KAAK,OAAK,KAAK,EAAE,MAAM,EAAE,cAAc,GAAI,CAAC;AACtD,CAAC","sourcesContent":["import React from 'react';\nimport { Image } from 'react-native';\n\nimport { ImageProps } from './Image';\n\nexport default function ExpoImage({ source, ...props }: ImageProps) {\n  const resolvedSource = source ?? {};\n\n  // @ts-expect-error - expo-image is being reworked so these types should be revisited\n  return <Image {...props} source={resolvedSource} />;\n}\n"]}

package/build/Image.d.ts

@@ -0,0 +1,45 @@
+import React from 'react';
+import { AccessibilityProps, ImageResizeMode, ImageSourcePropType, ImageStyle as RNImageStyle, NativeSyntheticEvent, StyleProp } from 'react-native';
+import { ImageErrorEventData, ImageLoadEventData, ImageLoadProgressEventData } from './Image.types';
+interface ImageStyle extends RNImageStyle {
+    elevation?: number;
+}
+export interface ImageProps extends AccessibilityProps {
+    source?: ImageSourcePropType | null;
+    style?: StyleProp<ImageStyle>;
+    defaultSource?: ImageSourcePropType | null;
+    loadingIndicatorSource?: ImageSourcePropType | null;
+    resizeMode?: ImageResizeMode;
+    /**
+     * @Android only
+     */
+    blurRadius?: number;
+    fadeDuration?: number;
+    onLoadStart?: () => void;
+    onProgress?: (event: NativeSyntheticEvent<ImageLoadProgressEventData>) => void;
+    onLoad?: (event: NativeSyntheticEvent<ImageLoadEventData>) => void;
+    onError?: (error: NativeSyntheticEvent<ImageErrorEventData>) => void;
+    onLoadEnd?: () => void;
+}
+interface ImageState {
+    onLoad: ImageProps['onLoad'];
+    onError: ImageProps['onError'];
+}
+export default class Image extends React.Component<ImageProps, ImageState> {
+    static getDerivedStateFromProps(props: ImageProps): {
+        onLoad: ((event: NativeSyntheticEvent<ImageLoadEventData>) => void) | undefined;
+        onError: ((error: NativeSyntheticEvent<ImageErrorEventData>) => void) | undefined;
+    };
+    /**
+     * **Available on @Android only.** Caching the image that can be later used in ImageView
+     * @return an empty promise.
+     */
+    static prefetch(url: string): Promise<void>;
+    state: {
+        onLoad: undefined;
+        onError: undefined;
+    };
+    render(): JSX.Element;
+}
+export {};
+//# sourceMappingURL=Image.d.ts.map

package/build/Image.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../src/Image.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,mBAAmB,EACnB,UAAU,IAAI,YAAY,EAC1B,oBAAoB,EACpB,SAAS,EAEV,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAIpG,UAAU,UAAW,SAAQ,YAAY;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,UAAW,SAAQ,kBAAkB;IAMpD,MAAM,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACpC,KAAK,CAAC,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;IAC9B,aAAa,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAC3C,sBAAsB,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACpD,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,0BAA0B,CAAC,KAAK,IAAI,CAAC;IAC/E,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,IAAI,CAAC;IACnE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,mBAAmB,CAAC,KAAK,IAAI,CAAC;IACrE,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,UAAU,UAAU;IAClB,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC7B,OAAO,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;CAChC;AAED,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,KAAK,CAAC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IACxE,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,UAAU;;;;IAqBjD;;;OAGG;WACU,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjD,KAAK;;;MAGH;IAEF,MAAM;CAgBP"}

package/build/Image.js

@@ -0,0 +1,48 @@
+import { Platform, UnavailabilityError } from 'expo-modules-core';
+import React from 'react';
+import { StyleSheet, } from 'react-native';
+import ExpoImage, { ExpoImageModule } from './ExpoImage';
+const DEFAULT_RESIZE_MODE = 'cover';
+export default class Image extends React.Component {
+    static getDerivedStateFromProps(props) {
+        return {
+            onLoad: props.onLoadEnd
+                ? (e) => {
+                    if (props.onLoad) {
+                        props.onLoad(e);
+                    }
+                    props.onLoadEnd();
+                }
+                : props.onLoad,
+            onError: props.onLoadEnd
+                ? (e) => {
+                    if (props.onError) {
+                        props.onError(e);
+                    }
+                    props.onLoadEnd();
+                }
+                : props.onError,
+        };
+    }
+    /**
+     * **Available on @Android only.** Caching the image that can be later used in ImageView
+     * @return an empty promise.
+     */
+    static async prefetch(url) {
+        if (Platform.OS !== 'android') {
+            throw new UnavailabilityError('Image', 'prefetch');
+        }
+        return await ExpoImageModule.prefetch(url);
+    }
+    state = {
+        onLoad: undefined,
+        onError: undefined,
+    };
+    render() {
+        const { style, resizeMode: resizeModeProp, ...restProps } = this.props;
+        const { resizeMode: resizeModeStyle, ...restStyle } = StyleSheet.flatten([style]) || {};
+        const resizeMode = resizeModeProp ?? resizeModeStyle ?? DEFAULT_RESIZE_MODE;
+        return (React.createElement(ExpoImage, { ...restProps, style: restStyle, resizeMode: resizeMode, onLoad: this.state.onLoad, onError: this.state.onError }));
+    }
+}
+//# sourceMappingURL=Image.js.map

package/build/Image.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Image.js","sourceRoot":"","sources":["../src/Image.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAOL,UAAU,GACX,MAAM,cAAc,CAAC;AAEtB,OAAO,SAAS,EAAE,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGzD,MAAM,mBAAmB,GAAG,OAAO,CAAC;AAmCpC,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,KAAK,CAAC,SAAiC;IACxE,MAAM,CAAC,wBAAwB,CAAC,KAAiB;QAC/C,OAAO;YACL,MAAM,EAAE,KAAK,CAAC,SAAS;gBACrB,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;oBACJ,IAAI,KAAK,CAAC,MAAM,EAAE;wBAChB,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;qBACjB;oBACD,KAAK,CAAC,SAAU,EAAE,CAAC;gBACrB,CAAC;gBACH,CAAC,CAAC,KAAK,CAAC,MAAM;YAChB,OAAO,EAAE,KAAK,CAAC,SAAS;gBACtB,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;oBACJ,IAAI,KAAK,CAAC,OAAO,EAAE;wBACjB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;qBAClB;oBACD,KAAK,CAAC,SAAU,EAAE,CAAC;gBACrB,CAAC;gBACH,CAAC,CAAC,KAAK,CAAC,OAAO;SAClB,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAW;QAC/B,IAAI,QAAQ,CAAC,EAAE,KAAK,SAAS,EAAE;YAC7B,MAAM,IAAI,mBAAmB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;SACpD;QACD,OAAO,MAAM,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,GAAG;QACN,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,SAAS;KACnB,CAAC;IAEF,MAAM;QACJ,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEvE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,SAAS,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;QACxF,MAAM,UAAU,GAAG,cAAc,IAAI,eAAe,IAAI,mBAAmB,CAAC;QAE5E,OAAO,CACL,oBAAC,SAAS,OACJ,SAAS,EACb,KAAK,EAAE,SAAS,EAChB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EACzB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,GAC3B,CACH,CAAC;IACJ,CAAC;CACF","sourcesContent":["import { Platform, UnavailabilityError } from 'expo-modules-core';\nimport React from 'react';\nimport {\n  AccessibilityProps,\n  ImageResizeMode,\n  ImageSourcePropType,\n  ImageStyle as RNImageStyle,\n  NativeSyntheticEvent,\n  StyleProp,\n  StyleSheet,\n} from 'react-native';\n\nimport ExpoImage, { ExpoImageModule } from './ExpoImage';\nimport { ImageErrorEventData, ImageLoadEventData, ImageLoadProgressEventData } from './Image.types';\n\nconst DEFAULT_RESIZE_MODE = 'cover';\n\ninterface ImageStyle extends RNImageStyle {\n  elevation?: number;\n}\n\nexport interface ImageProps extends AccessibilityProps {\n  // On one hand we want to pass resolved source to native module.\n  // On the other hand, react-native-web doesn't expose a resolveAssetSource\n  // function, so we can't use it there. So we pass the unresolved source\n  // to \"native components\" and they decide whether to resolve the value\n  // or not.\n  source?: ImageSourcePropType | null;\n  style?: StyleProp<ImageStyle>;\n  defaultSource?: ImageSourcePropType | null;\n  loadingIndicatorSource?: ImageSourcePropType | null;\n  resizeMode?: ImageResizeMode;\n  /**\n   * @Android only\n   */\n  blurRadius?: number;\n  fadeDuration?: number;\n\n  onLoadStart?: () => void;\n  onProgress?: (event: NativeSyntheticEvent<ImageLoadProgressEventData>) => void;\n  onLoad?: (event: NativeSyntheticEvent<ImageLoadEventData>) => void;\n  onError?: (error: NativeSyntheticEvent<ImageErrorEventData>) => void;\n  onLoadEnd?: () => void;\n}\n\ninterface ImageState {\n  onLoad: ImageProps['onLoad'];\n  onError: ImageProps['onError'];\n}\n\nexport default class Image extends React.Component<ImageProps, ImageState> {\n  static getDerivedStateFromProps(props: ImageProps) {\n    return {\n      onLoad: props.onLoadEnd\n        ? (e) => {\n            if (props.onLoad) {\n              props.onLoad(e);\n            }\n            props.onLoadEnd!();\n          }\n        : props.onLoad,\n      onError: props.onLoadEnd\n        ? (e) => {\n            if (props.onError) {\n              props.onError(e);\n            }\n            props.onLoadEnd!();\n          }\n        : props.onError,\n    };\n  }\n\n  /**\n   * **Available on @Android only.** Caching the image that can be later used in ImageView\n   * @return an empty promise.\n   */\n  static async prefetch(url: string): Promise<void> {\n    if (Platform.OS !== 'android') {\n      throw new UnavailabilityError('Image', 'prefetch');\n    }\n    return await ExpoImageModule.prefetch(url);\n  }\n\n  state = {\n    onLoad: undefined,\n    onError: undefined,\n  };\n\n  render() {\n    const { style, resizeMode: resizeModeProp, ...restProps } = this.props;\n\n    const { resizeMode: resizeModeStyle, ...restStyle } = StyleSheet.flatten([style]) || {};\n    const resizeMode = resizeModeProp ?? resizeModeStyle ?? DEFAULT_RESIZE_MODE;\n\n    return (\n      <ExpoImage\n        {...restProps}\n        style={restStyle}\n        resizeMode={resizeMode}\n        onLoad={this.state.onLoad}\n        onError={this.state.onError}\n      />\n    );\n  }\n}\n"]}

package/build/Image.types.d.ts

@@ -0,0 +1,42 @@
+export declare enum ImageCacheType {
+    UNKNOWN = 0,
+    NONE = 1,
+    DISK = 2,
+    MEMORY = 3
+}
+export interface ImageLoadEventData {
+    cacheType?: ImageCacheType;
+    source: {
+        url: string;
+        width: number;
+        height: number;
+        mediaType?: string | null;
+    };
+}
+export interface ImageLoadProgressEventData {
+    loaded: number;
+    total: number;
+}
+interface AndroidThrowable {
+    class: string;
+    cause: AndroidThrowable | null;
+    message: string;
+}
+interface AndroidGlideException extends AndroidThrowable {
+    origin: AndroidThrowable | null;
+    causes: AndroidThrowable[] | null;
+}
+export interface ImageErrorEventData {
+    error: string;
+    ios?: {
+        code: number;
+        domain: string;
+        description: string;
+        helpAnchor: string | null;
+        failureReason: string | null;
+        recoverySuggestion: string | null;
+    };
+    android?: AndroidGlideException | null;
+}
+export {};
+//# sourceMappingURL=Image.types.d.ts.map

package/build/Image.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Image.types.d.ts","sourceRoot":"","sources":["../src/Image.types.ts"],"names":[],"mappings":"AAAA,oBAAY,cAAc;IACxB,OAAO,IAAI;IACX,IAAI,IAAI;IACR,IAAI,IAAI;IACR,MAAM,IAAI;CACX;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,MAAM,EAAE;QACN,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC3B,CAAC;CACH;AAED,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,gBAAgB;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,qBAAsB,SAAQ,gBAAgB;IACtD,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;QAC7B,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;KACnC,CAAC;IACF,OAAO,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;CACxC"}

package/build/Image.types.js

@@ -0,0 +1,8 @@
+export var ImageCacheType;
+(function (ImageCacheType) {
+    ImageCacheType[ImageCacheType["UNKNOWN"] = 0] = "UNKNOWN";
+    ImageCacheType[ImageCacheType["NONE"] = 1] = "NONE";
+    ImageCacheType[ImageCacheType["DISK"] = 2] = "DISK";
+    ImageCacheType[ImageCacheType["MEMORY"] = 3] = "MEMORY";
+})(ImageCacheType || (ImageCacheType = {}));
+//# sourceMappingURL=Image.types.js.map

package/build/Image.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Image.types.js","sourceRoot":"","sources":["../src/Image.types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,yDAAW,CAAA;IACX,mDAAQ,CAAA;IACR,mDAAQ,CAAA;IACR,uDAAU,CAAA;AACZ,CAAC,EALW,cAAc,KAAd,cAAc,QAKzB","sourcesContent":["export enum ImageCacheType {\n  UNKNOWN = 0,\n  NONE = 1,\n  DISK = 2,\n  MEMORY = 3,\n}\n\nexport interface ImageLoadEventData {\n  cacheType?: ImageCacheType;\n  source: {\n    url: string;\n    width: number;\n    height: number;\n    mediaType?: string | null;\n  };\n}\n\nexport interface ImageLoadProgressEventData {\n  loaded: number;\n  total: number;\n}\n\ninterface AndroidThrowable {\n  class: string;\n  cause: AndroidThrowable | null;\n  message: string;\n}\n\ninterface AndroidGlideException extends AndroidThrowable {\n  origin: AndroidThrowable | null;\n  causes: AndroidThrowable[] | null;\n}\n\nexport interface ImageErrorEventData {\n  error: string;\n  ios?: {\n    code: number;\n    domain: string;\n    description: string;\n    helpAnchor: string | null;\n    failureReason: string | null;\n    recoverySuggestion: string | null;\n  };\n  android?: AndroidGlideException | null;\n}\n"]}

package/build/index.d.ts

@@ -0,0 +1,4 @@
+import Image from './Image';
+export * from './Image.types';
+export default Image;
+//# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,eAAe,KAAK,CAAC"}

package/build/index.js

@@ -0,0 +1,4 @@
+import Image from './Image';
+export * from './Image.types';
+export default Image;
+//# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,eAAe,KAAK,CAAC","sourcesContent":["import Image from './Image';\nexport * from './Image.types';\nexport default Image;\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-image",
   "title": "Expo Image",
-  "version": "0.1.0",
+  "version": "0.2.2",
   "description": "A cross-platform, performant image component for React Native and Expo with Web support",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -26,8 +26,12 @@
   ],
   "author": "650 Industries, Inc.",
   "license": "MIT",
+  "dependencies": {},
   "devDependencies": {
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "b2384f7dfa01d2455f771fd7c94169e15ed76aad"
+  "peerDependencies": {
+    "expo": "*"
+  },
+  "gitHead": "2b35d9008fef42cb53473331c37693ca12e9bf12"
 }