@amazon-devices/expo-image 2.0.1758683737 → 2.0.9000000000

package/THIRD_PARTY_NOTICES.txt

@@ -1,24 +1,4 @@
 License from package.json:
 ==============================
 
-The MIT License (MIT)
-
-Copyright (c) 2015-present 650 Industries, Inc. (aka Expo)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT

package/build/ExpoImage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoImage.d.ts","sourceRoot":"","sources":["../src/ExpoImage.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,oBAAoB,EAAsC,MAAM,cAAc,CAAC;AAExF,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,eAAe,CAAC;AAIvB,QAAA,MAAM,eAAe,KAAmC,CAAC;AAgBzD,cAAM,SAAU,SAAQ,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC;IAC3D,WAAW,aAET;IAEF,MAAM,UAAW,oBAAoB,CAAC,kBAAkB,CAAC,UAGvD;IAEF,UAAU,UAAW,oBAAoB,CAAC,sBAAsB,CAAC,UAE/D;IAEF,OAAO,UAAW,oBAAoB,CAAC,mBAAmB,CAAC,UAGzD;IAEF,SAAS,aAEP;IAEF,MAAM;CA+DP;AAED,OAAO,EAAE,eAAe,EAAE,CAAC;AAC3B,eAAe,SAAS,CAAC"}
+{"version":3,"file":"ExpoImage.d.ts","sourceRoot":"","sources":["../src/ExpoImage.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,oBAAoB,EAAsC,MAAM,cAAc,CAAC;AAExF,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,eAAe,CAAC;AAIvB,QAAA,MAAM,eAAe,KAAmC,CAAC;AAgBzD,cAAM,SAAU,SAAQ,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC;IAC3D,WAAW,aAET;IAEF,MAAM,GAAI,OAAO,oBAAoB,CAAC,kBAAkB,CAAC,UAGvD;IAEF,UAAU,GAAI,OAAO,oBAAoB,CAAC,sBAAsB,CAAC,UAE/D;IAEF,OAAO,GAAI,OAAO,oBAAoB,CAAC,mBAAmB,CAAC,UAGzD;IAEF,SAAS,aAEP;IAEF,MAAM;CA+DP;AAED,OAAO,EAAE,eAAe,EAAE,CAAC;AAC3B,eAAe,SAAS,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"ExpoImage.kepler.d.ts","sourceRoot":"","sources":["../src/ExpoImage.kepler.tsx"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAuC,MAAM,cAAc,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,eAAe,CAAC;AAyBvB,cAAM,SAAU,SAAQ,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC;IAC3D,WAAW,aAET;IAEF,MAAM,UAAW,oBAAoB,CAAC,kBAAkB,CAAC,UAEvD;IAEF,UAAU,UAAW,oBAAoB,CAAC,sBAAsB,CAAC,UAE/D;IAEF,OAAO,UAAW,oBAAoB,CAAC,mBAAmB,CAAC,UAEzD;IAEF,SAAS,aAEP;IAEF,MAAM;CAmDP;AAED,OAAO,EAAE,eAAe,EAAE,CAAC;AAC3B,eAAe,SAAS,CAAC"}
+{"version":3,"file":"ExpoImage.kepler.d.ts","sourceRoot":"","sources":["../src/ExpoImage.kepler.tsx"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAuC,MAAM,cAAc,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,eAAe,CAAC;AAyBvB,cAAM,SAAU,SAAQ,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC;IAC3D,WAAW,aAET;IAEF,MAAM,GAAI,OAAO,oBAAoB,CAAC,kBAAkB,CAAC,UAEvD;IAEF,UAAU,GAAI,OAAO,oBAAoB,CAAC,sBAAsB,CAAC,UAE/D;IAEF,OAAO,GAAI,OAAO,oBAAoB,CAAC,mBAAmB,CAAC,UAEzD;IAEF,SAAS,aAEP;IAEF,MAAM;CAmDP;AAED,OAAO,EAAE,eAAe,EAAE,CAAC;AAC3B,eAAe,SAAS,CAAC"}

package/build/utils/blurhash/base83.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base83.d.ts","sourceRoot":"","sources":["../../../src/utils/blurhash/base83.ts"],"names":[],"mappings":"AAsFA,eAAO,MAAM,QAAQ,QAAS,MAAM,WAQnC,CAAC;AAEF,eAAO,MAAM,QAAQ,MAAO,MAAM,UAAU,MAAM,KAAG,MAOpD,CAAC"}
+{"version":3,"file":"base83.d.ts","sourceRoot":"","sources":["../../../src/utils/blurhash/base83.ts"],"names":[],"mappings":"AAsFA,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAQnC,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,GAAG,MAAM,EAAE,QAAQ,MAAM,KAAG,MAOpD,CAAC"}

package/build/utils/blurhash/decode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decode.d.ts","sourceRoot":"","sources":["../../../src/utils/blurhash/decode.ts"],"names":[],"mappings":"AA0BA,eAAO,MAAM,eAAe,aAAc,MAAM,KAAG;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAQzF,CAAC;AAuBF,QAAA,MAAM,MAAM,aAAc,MAAM,SAAS,MAAM,UAAU,MAAM,UAAU,MAAM,mCAsD9E,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"decode.d.ts","sourceRoot":"","sources":["../../../src/utils/blurhash/decode.ts"],"names":[],"mappings":"AA0BA,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,KAAG;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAQzF,CAAC;AAuBF,QAAA,MAAM,MAAM,GAAI,UAAU,MAAM,EAAE,OAAO,MAAM,EAAE,QAAQ,MAAM,EAAE,QAAQ,MAAM,mCAsD9E,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/build/utils/blurhash/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils/blurhash/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,UAAW,MAAM,WAOzC,CAAC;AAEF,eAAO,MAAM,YAAY,UAAW,MAAM,WAOzC,CAAC;AAEF,eAAO,MAAM,IAAI,MAAO,MAAM,WAAqB,CAAC;AAEpD,eAAO,MAAM,OAAO,QAAS,MAAM,OAAO,MAAM,WAA6C,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils/blurhash/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,GAAI,OAAO,MAAM,WAOzC,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,OAAO,MAAM,WAOzC,CAAC;AAEF,eAAO,MAAM,IAAI,GAAI,GAAG,MAAM,WAAqB,CAAC;AAEpD,eAAO,MAAM,OAAO,GAAI,KAAK,MAAM,EAAE,KAAK,MAAM,WAA6C,CAAC"}

package/kepler/test/ExpoImageComponent.cpp

@@ -1,14 +1,28 @@
+/*
+ * Copyright (c) 2024-2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * PROPRIETARY/CONFIDENTIAL
+ *
+ * Use is subject to license terms.
+ */
+
 #include "../ExpoImageComponent.h"
 
 #include <KeplerScript/utils/image/KeplerScriptImageCacheHandler.h>
+#include <Volta/graphics/Picture.h>
+#include <Volta/graphics/Recorder.h>
 #include <gmock/gmock-actions.h>
 #include <gmock/gmock.h>
+#include <graphics/Canvas.h>
 #include <gtest/gtest.h>
 
+#include <cstddef>
+
 #include "catch.hpp"
 
 class MockImageLoaderDelegate : public volta::IImageLoaderDelegate {
 public:
+    // NOLINTBEGIN(misc-non-private-member-variables-in-classes)
     MOCK_METHOD(void, notifyImageLoadStart, (), (override));
     MOCK_METHOD(void, notifyImageLoadProgress, (float progress), (override));
     MOCK_METHOD(void, notifyImageLoadSuccess, (volta::graphics::Image image), (override));
@@ -27,9 +41,10 @@ public:
     MOCK_METHOD(void, notifyImageLoadCancelled, (), (override));
     MOCK_METHOD(void, notifyImagePrefetchFailure, (volta::ImageLoadError error), (override));
     MOCK_METHOD(void, notifyImagePrefetchComplete, (), (override));
+    // NOLINTEND(misc-non-private-member-variables-in-classes)
 };
 
-std::unique_ptr<volta::graphics::Image> mockImage(int width, int height) {
+std::unique_ptr<volta::graphics::Image> mockImage(int64_t width, int64_t height) {
     auto data = std::make_unique<uint8_t[]>(height * width * 4);
     return volta::graphics::Image::makeRasterImage(
             volta::graphics::Size{static_cast<float>(width), static_cast<float>(height)},
@@ -48,13 +63,11 @@ public:
         image_ = mockImage(width, height);
     }
 
-    void load() override {
-        return;
-    }
+    void load() override {}
     bool isLoaded() override {
         return true;
     }
-    volta::graphics::Image* getImage() {
+    volta::graphics::Image* getImage() override {
         return image_.get();
     }
 
@@ -62,9 +75,9 @@ private:
     std::unique_ptr<volta::graphics::Image> image_;
 };
 
+// NOLINTNEXTLINE - warnings caused by catch2 macro internal implementation
 TEST_CASE("ExpoImageDrawableLayer") {
     ExpoImageDrawableLayer layer;
-    volta::graphics::Canvas canvas;
     auto mockImg = mockImage(100, 100);
 
     SECTION("setSize") {
@@ -74,64 +87,65 @@ TEST_CASE("ExpoImageDrawableLayer") {
         EXPECT_EQ(layer.size_, size);
     }
 
-    // TODO: PROJVEGA-211833 - Fix these test cases - removing volta::graphics::Canvas mocks
-    // SECTION("onDraw") {
-    //     facebook::react::ImageSource source;
-    //     auto delegate = std::make_shared<MockImageLoaderDelegate>();
-    //     auto clipRect = volta::graphics::Rect{0.f, 0.f, 50.f, 50.f};
+    SECTION("onDraw") {
+        auto canvas = volta::graphics::Canvas::makeTestingCanvas();
+
+        facebook::react::ImageSource source;
+        auto delegate = std::make_shared<MockImageLoaderDelegate>();
+        auto clipRect = volta::graphics::Rect{0.f, 0.f, 50.f, 50.f};
+
+        layer.imageWrapper_ = std::make_shared<MockImageWrapper>(100, 100, source, delegate);
+        layer.setSize({50.f, 50.f});
+        layer.onDraw(canvas);
+    }
 
-    //     EXPECT_CALL(canvas, drawImageRect2(testing::_, testing::_, testing::_, testing::_)).Times(1);
-    //     EXPECT_CALL(canvas, clipRect(clipRect, testing::_, testing::_)).Times(1);
+    SECTION("paintImageWithContentFit cover") {
+        auto canvas = volta::graphics::Canvas::makeTestingCanvas();
 
-    //     layer.imageWrapper_ = std::make_shared<MockImageWrapper>(100, 100, source, delegate);
-    //     layer.setSize({50.f, 50.f});
-    //     layer.onDraw(canvas);
-    // }
+        volta::graphics::Rect rect{-50.f, -50.f, 50.f, 50.f};
 
-    // SECTION("paintImageWithContentFit cover") {
-    //     volta::graphics::Rect rect{-50.f, -50.f, 50.f, 50.f};
-    //     EXPECT_CALL(canvas, drawImageRect2(testing::_, rect, testing::_, testing::_)).Times(1);
+        layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::Cover, false);
+    }
 
-    //     layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::Cover, false);
-    // }
+    SECTION("paintImageWithContentFit contain") {
+        auto canvas = volta::graphics::Canvas::makeTestingCanvas();
 
-    // SECTION("paintImageWithContentFit contain") {
-    //     volta::graphics::Rect rect{50.f, 0.f, 150.f, 100.f};
+        volta::graphics::Rect rect{50.f, 0.f, 150.f, 100.f};
 
-    //     layer.setSize({200.f, 100.f});
-    //     EXPECT_CALL(canvas, drawImageRect2(testing::_, rect, testing::_, testing::_)).Times(1);
+        layer.setSize({200.f, 100.f});
 
-    //     layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::Contain, false);
-    // }
+        layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::Contain, false);
+    }
 
-    // SECTION("paintImageWithContentFit fill") {
-    //     volta::graphics::Rect rect{0.f, 0.f, 200.f, 100.f};
+    SECTION("paintImageWithContentFit fill") {
+        auto canvas = volta::graphics::Canvas::makeTestingCanvas();
+        volta::graphics::Rect rect{0.f, 0.f, 200.f, 100.f};
 
-    //     layer.setSize({200.f, 100.f});
-    //     EXPECT_CALL(canvas, drawImageRect2(testing::_, rect, testing::_, testing::_)).Times(1);
+        layer.setSize({200.f, 100.f});
 
-    //     layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::Fill, false);
-    // }
+        layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::Fill, false);
+    }
 
-    // SECTION("paintImageWithContentFit none") {
-    //     volta::graphics::Rect rect{-25.f, -25.f, 75.f, 75.f};
+    SECTION("paintImageWithContentFit none") {
+        auto canvas = volta::graphics::Canvas::makeTestingCanvas();
+        volta::graphics::Rect rect{-25.f, -25.f, 75.f, 75.f};
 
-    //     layer.setSize({50.f, 50.f});
-    //     EXPECT_CALL(canvas, drawImageRect2(testing::_, rect, testing::_, testing::_)).Times(1);
+        layer.setSize({50.f, 50.f});
 
-    //     layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::None, false);
-    // }
+        layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::None, false);
+    }
 
-    // SECTION("paintImageWithContentFit scaleDown") {
-    //     volta::graphics::Rect rect{-25.f, -25.f, 75.f, 75.f};
+    SECTION("paintImageWithContentFit scaleDown") {
+        auto canvas = volta::graphics::Canvas::makeTestingCanvas();
+        volta::graphics::Rect rect{-25.f, -25.f, 75.f, 75.f};
 
-    //     layer.setSize({50.f, 50.f});
-    //     EXPECT_CALL(canvas, drawImageRect2(testing::_, rect, testing::_, testing::_)).Times(1);
+        layer.setSize({50.f, 50.f});
 
-    //     layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::ScaleDown, false);
-    // }
+        layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::ScaleDown, false);
+    }
 }
 
+// NOLINTNEXTLINE - warnings caused by catch2 macro internal implementation
 TEST_CASE("ExpoImageComponent") {
     auto handler = std::make_shared<volta::react::KeplerScriptImageCacheHandler>();
     ExpoImageComponent component(handler);

package/kepler-compatibility.json

@@ -1,8 +1,6 @@
 {
   "versions": {
     "2.0.0": "/com.amazon.kepler.expo_image_2@IExpoImage_0",
-    "2.0.1756403551": "/com.amazon.kepler.expo_image_2@IExpoImage_0",
-    "2.0.1758654000": "/com.amazon.kepler.expo_image_2@IExpoImage_0",
-    "2.0.1758683737": "/com.amazon.kepler.expo_image_2@IExpoImage_0"
+    "2.0.9000000000": "/com.amazon.kepler.expo_image_2@IExpoImage_0"
   }
 }

package/package.json

@@ -1 +1 @@
-{"name": "@amazon-devices/expo-image", "title": "Expo Image", "version": "2.0.1758683737+1.6.0", "description": "A cross-platform, performant image component for React Native and Expo with Web support", "main": "build/index.js", "types": "build/index.d.ts", "sideEffects": false, "scripts": {"build": "expo-module build", "clean": "expo-module clean", "lint": "expo-module lint", "test": "expo-module test", "expo-module": "expo-module"}, "homepage": "https://docs.expo.dev/versions/latest/sdk/image/", "repository": {"type": "git", "url": "https://github.com/expo/expo.git", "directory": "packages/expo-image"}, "kepler": {"temporary-alias-for-package": {"name": "expo-image", "version": "1.6.0"}}, "keywords": ["react-native"], "author": "650 Industries, Inc.", "license": "See license in LICENSE", "dependencies": {"@amazon-devices/keplerscript-turbomodule-api": "^1.0.0"}, "devDependencies": {"expo-module-scripts": "^3.0.0"}, "peerDependencies": {"expo": "*"}}
+{"name": "@amazon-devices/expo-image", "title": "Expo Image", "version": "2.0.9000000000+1.6.0", "description": "A cross-platform, performant image component for React Native and Expo with Web support", "main": "build/index.js", "types": "build/index.d.ts", "sideEffects": false, "scripts": {"build": "expo-module build", "clean": "expo-module clean", "lint": "expo-module lint", "test": "expo-module test", "prepublishOnly": "expo-module prepublishOnly", "expo-module": "expo-module"}, "homepage": "https://docs.expo.dev/versions/latest/sdk/image/", "repository": {"type": "git", "url": "https://github.com/expo/expo.git", "directory": "packages/expo-image"}, "kepler": {"temporary-alias-for-package": {"name": "expo-image", "version": "1.6.0"}}, "keywords": ["react-native"], "author": "650 Industries, Inc.", "license": "See license in LICENSE", "dependencies": {"@amazon-devices/keplerscript-turbomodule-api": "^1.0.0"}, "devDependencies": {"expo-module-scripts": "^3.0.0"}, "peerDependencies": {"expo": "*"}}