@amazon-devices/expo-image 2.0.9000000000 → 3.0.0

package/kepler/KeplerImageViewComponent.h

@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * PROPRIETARY/CONFIDENTIAL
- *
- * Use is subject to license terms.
- */
-
-/*
- *   This header is added as a workaround until we figure out whether
- *   we need to have KeplerImageViewComponent included here and how to achieve that
- */
-
-#pragma once
-
-#include <Volta/graphics/DrawableLayer.h>
-#include <Volta/graphics/OpacityLayer.h>
-#include <Volta/utils/Image.h>
-#include <graphics/ImageFilterLayer.h>
-
-#include "KeplerScript/components/KeplerViewComponent.h"
-
-namespace volta::react {
-class ImageDrawableLayer : public volta::graphics::DrawableLayer {
-public:
-    friend class KeplerImageViewComponent;
-    enum class Fit { Cover, Contain, Stretch, Repeat, Center };
-    ImageDrawableLayer();
-    void onDraw(volta::graphics::Canvas& canvas);
-};
-
-class KeplerImageViewComponent {
-public:
-    KeplerImageViewComponent();
-    ~KeplerImageViewComponent() noexcept;
-
-    mutable ImageDrawableLayer imageDrawableLayer_;
-    mutable volta::graphics::OpacityLayer opacityLayer_;
-
-    void didReceiveImage(const facebook::react::ImageResponse& imageResponse) const;
-    void didReceiveProgress(float progress) const;
-    void didReceiveFailure() const;
-
-    void setOverlayColor(const int& newValue);
-
-    void setTintColor(const int& newValue);
-
-    void setBlurRadius(const double& newValue);
-
-    void setResizeMode(const std::string& newValue);
-
-    void setDefaultSource(const utils::json::JsonContainer& newValue);
-
-    // void buildAccessibilityInfo(AccessibilityContext& accessibilityContext) override;
-
-    void updateLayoutMetrics(
-            const std::shared_ptr<KeplerViewComponentLayoutMetrics>& oldLayoutMetrics,
-            const std::shared_ptr<KeplerViewComponentLayoutMetrics>& newLayoutMetrics);
-
-    void updateState(const std::shared_ptr<const void>& oldState, const std::shared_ptr<const void>& newState);
-
-    void changeImageLayer(ImageDrawableLayer newImageLayer);
-};
-}  // namespace volta::react

package/kepler/KeplerInit.cpp

@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * PROPRIETARY/CONFIDENTIAL
- *
- * Use is subject to license terms.
- */
-
-#include <KeplerScript/logger/KPLog.h>
-#include <KeplerScript/utils/autolink/KeplerAutoLinkInfo.h>
-#include <keplerui-072/keplerscript-export.h>
-
-#include "ExpoImage.h"
-#include "RegisterModule.h"
-#include "managers/ExpoImageManager.h"
-
-extern "C" {
-KEPLERSCRIPT_EXPORT void keplerAutoLinkInitV1(const kepler::autolink::v1::KeplerAutoLinkInfo* autoLinkInfo) noexcept {
-    volta::react::KPLog.debug("keplerAutoLinkInitV1 for ExpoImage");
-
-    REGISTER_MODULE(autoLinkInfo, ExpoImage, "ExpoImage");
-
-    auto* customViewDelegate = autoLinkInfo->customViewManagerDelegate;
-    customViewDelegate->registerComponentViewManager("ExpoImageComponent", []() {
-        volta::react::KPLog.debug("Creating ExpoImageComponent");
-        return std::make_unique<ExpoImageManager>();
-    });
-
-    volta::react::KPLog.debug("ExpoImage after registering module");
-}
-}
-
-int main() {
-    return 0;
-}

package/kepler/managers/ExpoImageManager.cpp

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * PROPRIETARY/CONFIDENTIAL
- *
- * Use is subject to license terms.
- */
-
-#include "ExpoImageManager.h"
-
-#include <KeplerScript/components/KeplerViewComponent.h>
-#include <KeplerScript/utils/image/KeplerScriptImageCacheHandler.h>
-
-#include "ExpoImageComponent.h"
-
-ExpoImageManager::ExpoImageManager() :
-        imageCacheHandler_(std::make_shared<volta::react::KeplerScriptImageCacheHandler>()) {}
-
-std::shared_ptr<volta::react::KeplerViewComponent> ExpoImageManager::createComponentView() {
-    VOLTA_TRACE_SECTION(ExpoImageManager::createComponentView);
-    return volta::RenderObject::create<ExpoImageComponent>(imageCacheHandler_);
-}
-
-void ExpoImageManager::aggregatePropSetters(volta::react::PropSetterAggregator& aggregator) {
-    ViewComponentViewManager::aggregatePropSetters(aggregator);
-    aggregator.addPropSetter("contentFit", &ExpoImageComponent::setContentFit, std::string{""});
-    aggregator.addPropSetter("placeholderContentFit", &ExpoImageComponent::setPlaceholderContentFit, std::string{""});
-    aggregator.addPropSetter("allowDownscaling", &ExpoImageComponent::setAllowDownscaling, true);
-    aggregator.addPropSetter("contentPosition", &ExpoImageComponent::setContentPosition, utils::json::JsonContainer());
-    aggregator.addPropSetter("overlayColor", &ExpoImageComponent::setOverlayColor, std::numeric_limits<int>::max());
-    aggregator.addPropSetter("tintColor", &ExpoImageComponent::setTintColor, std::numeric_limits<int>::max());
-    aggregator.addPropSetter("blurRadius", &ExpoImageComponent::setBlurRadius, 0.0);
-    aggregator.addPropSetter("placeholder", &ExpoImageComponent::setPlaceholder, utils::json::JsonContainer());
-    aggregator.addPropSetter("source", &ExpoImageComponent::setSource, utils::json::JsonContainer());
-    aggregator.addPropSetter("priority", &ExpoImageComponent::setPriority, std::string{""});
-    aggregator.addPropSetter("transition", &ExpoImageComponent::setTransition, utils::json::JsonContainer());
-    aggregator.addPropSetter("recyclingKey", &ExpoImageComponent::setRecyclingKey, std::string{""});
-}

package/kepler/managers/ExpoImageManager.h

@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * PROPRIETARY/CONFIDENTIAL
- *
- * Use is subject to license terms.
- */
-
-#pragma once
-
-#include <KeplerScript/components/ViewComponentViewManager.h>
-#include <KeplerScript/utils/image/KeplerScriptImageCacheHandler.h>
-
-class ExpoImageManager : public volta::react::ViewComponentViewManager {
-public:
-    ExpoImageManager();
-    void aggregatePropSetters(volta::react::PropSetterAggregator& aggregator) override;
-    std::shared_ptr<volta::react::KeplerViewComponent> createComponentView() override;
-
-private:
-    std::shared_ptr<volta::react::KeplerScriptImageCacheHandler> imageCacheHandler_;
-};
-

package/kepler/test/ExpoImage.cpp

@@ -1,73 +0,0 @@
-#include "../ExpoImage.h"
-
-#include <KeplerScript/components/ImageSourceBuilder.h>
-#include <KeplerScript/logger/KPLog.h>
-#include <KeplerScript/utils/image/KeplerScriptImageLoaderDelegate.h>
-#include <gmock/gmock-actions.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "../ExpoImageCacheHandler.h"
-#include "catch.hpp"
-
-namespace volta::react {
-
-std::unique_ptr<volta::graphics::Image> mockImage() {
-    auto data = std::make_unique<uint8_t[]>(4);
-    return volta::graphics::Image::makeRasterImage(volta::graphics::Size{1, 1}, std::move(data), 4);
-}
-
-void fullfillPromise(volta::react::Promise& promise) {
-    promise.promiseOperation_(std::make_shared<Promise>(Callback(), Callback()));
-}
-
-class MockExpoImageCacheHandler : public IExpoImageCacheHandler {
-public:
-    MockExpoImageCacheHandler() = default;
-
-    MOCK_METHOD(void, clearMemoryCache, (), (override));
-    MOCK_METHOD(void, clearDiskCache, (), (override));
-
-    MOCK_METHOD(
-            void,
-            load,
-            (volta::ImageDetails & details, const volta::react::KeplerScriptImageLoaderDelegate::Shared& delegate),
-            (override));
-};
-
-TEST_CASE("ExpoImage") {
-    auto handler = std::make_shared<MockExpoImageCacheHandler>();
-
-    ExpoImage module(handler);
-
-    SECTION("load") {
-        std::vector<std::string> urls = {
-                "https://example.com/image1.png",
-                "https://example.com/image2.png",
-                "https://example.com/image3.png"};
-
-        EXPECT_CALL(*handler, load(testing::_, testing::_))
-                .Times(3)
-                .WillRepeatedly(
-                        testing::Invoke([](volta::ImageDetails& details,
-                                           const volta::react::KeplerScriptImageLoaderDelegate::Shared& delegate) {
-                            auto mockImg = mockImage();
-
-                            delegate->notifyImageLoadSuccess(*mockImg);
-                        }));
-
-        auto promise = module.prefetch(urls);
-        fullfillPromise(promise);
-    }
-
-    SECTION("clearMemoryCache") {
-        EXPECT_CALL(*handler, clearMemoryCache()).Times(1);
-        module.clearMemoryCache();
-    }
-
-    SECTION("clearDiskCache") {
-        EXPECT_CALL(*handler, clearDiskCache()).Times(1);
-        module.clearDiskCache();
-    }
-}
-}  // namespace volta::react

package/kepler/test/ExpoImageComponent.cpp

@@ -1,304 +0,0 @@
-/*
- * 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));
-    MOCK_METHOD(void, notifyImageLoadSuccess, (volta::image::ImageRef imageRef), (override));
-    MOCK_METHOD(
-            void,
-            notifyAnimatedImageLoadSuccess,
-            (std::shared_ptr<volta::animation::AnimatedImageDrawableLayer> image),
-            (override));
-    MOCK_METHOD(
-            void,
-            notifyNinePatchImageLoadSuccess,
-            (std::shared_ptr<volta::graphics::NinePatchImage> image),
-            (override));
-    MOCK_METHOD(void, notifyImageLoadFailure, (volta::ImageLoadError error), (override));
-    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(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)},
-            std::move(data),
-            width * 4);
-}
-
-class MockImageWrapper : public ImageWrapper {
-public:
-    MockImageWrapper(
-            int width,
-            int height,
-            const facebook::react::ImageSource& source,
-            const volta::IImageLoaderDelegate::Shared& loaderDelegate) :
-            ImageWrapper(source, loaderDelegate) {
-        image_ = mockImage(width, height);
-    }
-
-    void load() override {}
-    bool isLoaded() override {
-        return true;
-    }
-    volta::graphics::Image* getImage() override {
-        return image_.get();
-    }
-
-private:
-    std::unique_ptr<volta::graphics::Image> image_;
-};
-
-// NOLINTNEXTLINE - warnings caused by catch2 macro internal implementation
-TEST_CASE("ExpoImageDrawableLayer") {
-    ExpoImageDrawableLayer layer;
-    auto mockImg = mockImage(100, 100);
-
-    SECTION("setSize") {
-        auto size = volta::graphics::Size{21.f, 37.f};
-        layer.setSize(size);
-
-        EXPECT_EQ(layer.size_, size);
-    }
-
-    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);
-    }
-
-    SECTION("paintImageWithContentFit cover") {
-        auto canvas = volta::graphics::Canvas::makeTestingCanvas();
-
-        volta::graphics::Rect rect{-50.f, -50.f, 50.f, 50.f};
-
-        layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::Cover, false);
-    }
-
-    SECTION("paintImageWithContentFit contain") {
-        auto canvas = volta::graphics::Canvas::makeTestingCanvas();
-
-        volta::graphics::Rect rect{50.f, 0.f, 150.f, 100.f};
-
-        layer.setSize({200.f, 100.f});
-
-        layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::Contain, false);
-    }
-
-    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});
-
-        layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::Fill, false);
-    }
-
-    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});
-
-        layer.paintImageWithContentFit(*mockImg, canvas, volta::graphics::Paint(), ImageContentFit::None, false);
-    }
-
-    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});
-
-        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);
-
-    SECTION("setOverlayColor") {
-        component.setOverlayColor(0x12345678);
-
-        EXPECT_EQ(component.overlayColor_.argb(), static_cast<uint32_t>(0x12345678));
-        EXPECT_EQ(component.imageDrawableLayer_.overlayColor_.argb(), static_cast<uint32_t>(0x12345678));
-    }
-
-    SECTION("setTintColor") {
-        component.setTintColor(0x12345678);
-
-        EXPECT_EQ(component.tintColor_.argb(), static_cast<uint32_t>(0x12345678));
-        EXPECT_EQ(component.imageDrawableLayer_.tintColor_.argb(), static_cast<uint32_t>(0x12345678));
-    }
-
-    SECTION("setBlurRadius") {
-        component.setBlurRadius(2137.0);
-
-        EXPECT_EQ(component.imageDrawableLayer_.blurRadius_, 2137.0);
-    }
-
-    SECTION("setBlurRadius") {
-        component.setBlurRadius(2137.0);
-
-        EXPECT_EQ(component.imageDrawableLayer_.blurRadius_, 2137.0);
-    }
-
-    SECTION("setContentFit") {
-        auto handler = std::make_shared<volta::react::KeplerScriptImageCacheHandler>();
-
-        ExpoImageComponent c1(handler);
-
-        c1.setContentFit("fill");
-
-        EXPECT_EQ(c1.contentFit_, std::string{"fill"});
-        EXPECT_EQ(c1.imageDrawableLayer_.imageContentFit_, ImageContentFit::Fill);
-
-        ExpoImageComponent c2(handler);
-
-        c2.setContentFit("something-strange");
-
-        EXPECT_EQ(c2.contentFit_, std::string{"something-strange"});
-        EXPECT_EQ(c2.imageDrawableLayer_.imageContentFit_, ImageContentFit::Cover);
-    }
-
-    SECTION("setPlaceholderContentFit") {
-        auto handler = std::make_shared<volta::react::KeplerScriptImageCacheHandler>();
-
-        ExpoImageComponent c1(handler);
-
-        c1.setPlaceholderContentFit("fill");
-
-        EXPECT_EQ(c1.placeholderContentFit_, std::string{"fill"});
-        EXPECT_EQ(c1.imageDrawableLayer_.imagePlaceholderContentFit_, ImageContentFit::Fill);
-
-        ExpoImageComponent c2(handler);
-
-        c2.setPlaceholderContentFit("something-strange");
-
-        EXPECT_EQ(c2.placeholderContentFit_, std::string{"something-strange"});
-        EXPECT_EQ(c2.imageDrawableLayer_.imagePlaceholderContentFit_, ImageContentFit::ScaleDown);
-    }
-
-    SECTION("setAllowDownscaling") {
-        component.setAllowDownscaling(true);
-
-        EXPECT_EQ(component.imageDrawableLayer_.imageAllowDownscaling_, true);
-
-        component.setAllowDownscaling(false);
-
-        EXPECT_EQ(component.imageDrawableLayer_.imageAllowDownscaling_, false);
-    }
-
-    SECTION("setPlaceholder") {
-        auto sources = utils::json::JsonContainer::parseJson(
-                R"([{"uri": "https://example.com/image.png", "width": 100, "height": 100}])");
-
-        facebook::react::ImageSource imgSource;
-        imgSource.uri = "https://example.com/image.png";
-        imgSource.size = {100.f, 100.f};
-
-        auto delegate = std::make_shared<MockImageLoaderDelegate>();
-
-        component.currentPlaceholder_ = std::make_shared<MockImageWrapper>(100, 100, imgSource, delegate);
-        component.setPlaceholder(sources);
-
-        EXPECT_EQ(component.placeholders_.size(), 1);
-        EXPECT_EQ(component.placeholders_.at(0).uri, std::string{"https://example.com/image.png"});
-    }
-
-    SECTION("setSource") {
-        auto sources = utils::json::JsonContainer::parseJson(
-                R"([{"uri": "https://example.com/image.png", "width": 100, "height": 100}])");
-
-        facebook::react::ImageSource imgSource;
-        imgSource.uri = "https://example.com/image.png";
-        imgSource.size = {100.f, 100.f};
-
-        auto delegate = std::make_shared<MockImageLoaderDelegate>();
-
-        component.currentSource_ = std::make_shared<MockImageWrapper>(100, 100, imgSource, delegate);
-        component.setSource(sources);
-
-        EXPECT_EQ(component.sources_.size(), 1);
-        EXPECT_EQ(component.sources_.at(0).uri, std::string{"https://example.com/image.png"});
-    }
-
-    SECTION("setPriority") {
-        auto handler = std::make_shared<volta::react::KeplerScriptImageCacheHandler>();
-
-        ExpoImageComponent c1(handler);
-
-        c1.setPriority("high");
-
-        EXPECT_EQ(c1.priority_, ImagePriority::High);
-
-        ExpoImageComponent c2(handler);
-
-        c1.setPriority("something-strange");
-
-        EXPECT_EQ(c1.priority_, ImagePriority::Normal);
-    }
-
-    SECTION("setContentPosition") {
-        auto position =
-                utils::json::JsonContainer::parseJson(R"({"top": 10.0, "bottom": 20.0, "right": 30.0, "left": 40.0})");
-
-        component.setContentPosition(position);
-
-        auto expectedPosition = ImageContentPosition{{10.f, false}, {20.f, false}, {30.f, false}, {40.f, false}};
-
-        EXPECT_EQ(component.imageDrawableLayer_.imageContentPosition_.top_.value_, expectedPosition.top_.value_);
-        EXPECT_EQ(component.imageDrawableLayer_.imageContentPosition_.bottom_.value_, expectedPosition.bottom_.value_);
-        EXPECT_EQ(component.imageDrawableLayer_.imageContentPosition_.right_.value_, expectedPosition.right_.value_);
-        EXPECT_EQ(component.imageDrawableLayer_.imageContentPosition_.left_.value_, expectedPosition.left_.value_);
-    }
-
-    SECTION("setTransition") {
-        auto transition = utils::json::JsonContainer::parseJson(R"({"duration": 1000.0, "timing": "ease-in"})");
-        component.setTransition(transition);
-
-        EXPECT_EQ(component.shouldAnimateOnSrcChange_, true);
-    }
-
-    SECTION("setRecyclingKey") {
-        component.setRecyclingKey("a-key");
-        EXPECT_EQ(component.shouldClearOnSourceChange_, false);
-        EXPECT_EQ(component.recyclingKey_, std::string{"a-key"});
-
-        component.setRecyclingKey("b-key");
-        EXPECT_EQ(component.shouldClearOnSourceChange_, true);
-    }
-}

package/kepler/test/managers/ExpoImageManager.cpp

@@ -1,39 +0,0 @@
-#include "../../managers/ExpoImageManager.h"
-
-#include <KeplerScript/components/ViewComponentViewManager.h>
-#include <gmock/gmock-actions.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "catch.hpp"
-
-TEST_CASE("ExpoImageManager") {
-    ExpoImageManager manager;
-
-    SECTION("aggregatePropSetters") {
-        volta::react::PropSetterAggregator aggregator;
-
-        manager.aggregatePropSetters(aggregator);
-
-        auto end = aggregator.propSetterMap_.end();
-
-        EXPECT_NE(aggregator.propSetterMap_.find("contentFit"), end);
-        EXPECT_NE(aggregator.propSetterMap_.find("placeholderContentFit"), end);
-        EXPECT_NE(aggregator.propSetterMap_.find("allowDownscaling"), end);
-        EXPECT_NE(aggregator.propSetterMap_.find("contentPosition"), end);
-        EXPECT_NE(aggregator.propSetterMap_.find("overlayColor"), end);
-        EXPECT_NE(aggregator.propSetterMap_.find("tintColor"), end);
-        EXPECT_NE(aggregator.propSetterMap_.find("blurRadius"), end);
-        EXPECT_NE(aggregator.propSetterMap_.find("placeholder"), end);
-        EXPECT_NE(aggregator.propSetterMap_.find("source"), end);
-        EXPECT_NE(aggregator.propSetterMap_.find("priority"), end);
-        EXPECT_NE(aggregator.propSetterMap_.find("transition"), end);
-        EXPECT_NE(aggregator.propSetterMap_.find("recyclingKey"), end);
-    }
-
-    SECTION("createCOmponentView") {
-        auto component = manager.createComponentView();
-
-        EXPECT_TRUE(component);
-    }
-}