@shopify/react-native-skia 2.0.0-next.3 → 2.0.0-next.4

package/cpp/skia/include/gpu/graphite/mtl/MtlGraphiteTypesUtils.h

@@ -1,48 +1,10 @@
 /*
- * Copyright 2024 Google LLC
+ * Copyright 2022 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#ifndef skgpu_graphite_MtlGraphiteTypesUtils_DEFINED
-#define skgpu_graphite_MtlGraphiteTypesUtils_DEFINED
-
-#include "include/core/SkTypes.h"
-
-#include "include/gpu/graphite/BackendTexture.h"
-#include "include/gpu/graphite/TextureInfo.h"
-#include "include/private/base/SkAPI.h"
-
-#import <CoreFoundation/CoreFoundation.h>
-
-namespace skgpu::graphite {
-
-struct SK_API MtlTextureInfo;
-
-namespace TextureInfos {
-SK_API TextureInfo MakeMetal(const MtlTextureInfo&);
-SK_API TextureInfo MakeMetal(CFTypeRef mtlTexture);
-
-SK_API bool GetMtlTextureInfo(const TextureInfo&, MtlTextureInfo*);
-}  // namespace TextureInfos
-
-namespace BackendTextures {
-// The BackendTexture will not call retain or release on the passed in CFTypeRef. Thus the
-// client must keep the CFTypeRef valid until they are no longer using the BackendTexture.
-SK_API BackendTexture MakeMetal(SkISize dimensions, CFTypeRef mtlTexture);
-
-SK_API CFTypeRef GetMtlTexture(const BackendTexture&);
-}  // namespace BackendTextures
-
-namespace BackendSemaphores {
-// TODO(b/286088355) Determine creator's responsibility for setting refcnt.
-SK_API BackendSemaphore MakeMetal(CFTypeRef mtlEvent, uint64_t value);
-
-SK_API CFTypeRef GetMtlEvent(const BackendSemaphore&);
-SK_API uint64_t GetMtlValue(const BackendSemaphore&);
-}  // namespace BackendSemaphores
-
-}  // namespace skgpu::graphite
-
-#endif  // skgpu_graphite_MtlGraphiteTypesUtils_DEFINED
+// DEPRECRATED: MtlGraphiteTypesUtils.h will be removed in the future, please include
+// MtlGraphiteTypes_cpp.h
+#include "include/gpu/graphite/mtl/MtlGraphiteTypes_cpp.h"

package/cpp/skia/include/gpu/graphite/mtl/MtlGraphiteTypes_cpp.h

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_graphite_MtlGraphiteTypesUtils_DEFINED
+#define skgpu_graphite_MtlGraphiteTypesUtils_DEFINED
+
+#include "include/core/SkTypes.h"
+
+#include "include/gpu/graphite/BackendTexture.h"
+#include "include/gpu/graphite/TextureInfo.h"
+#include "include/private/base/SkAPI.h"
+
+#import <CoreFoundation/CoreFoundation.h>
+
+namespace skgpu::graphite {
+
+// MtlTextureInfo requires compiling with Objective-C, so this header is split to allow invoking
+// the various backend wrapping APIs from a C++-only compilation unit.
+class SK_API MtlTextureInfo;
+
+namespace TextureInfos {
+SK_API TextureInfo MakeMetal(const MtlTextureInfo&);
+SK_API TextureInfo MakeMetal(CFTypeRef mtlTexture);
+
+SK_API bool GetMtlTextureInfo(const TextureInfo&, MtlTextureInfo*);
+}  // namespace TextureInfos
+
+namespace BackendTextures {
+// The BackendTexture will not call retain or release on the passed in CFTypeRef. Thus the
+// client must keep the CFTypeRef valid until they are no longer using the BackendTexture.
+SK_API BackendTexture MakeMetal(SkISize dimensions, CFTypeRef mtlTexture);
+
+SK_API CFTypeRef GetMtlTexture(const BackendTexture&);
+}  // namespace BackendTextures
+
+namespace BackendSemaphores {
+// TODO(b/286088355) Determine creator's responsibility for setting refcnt.
+SK_API BackendSemaphore MakeMetal(CFTypeRef mtlEvent, uint64_t value);
+
+SK_API CFTypeRef GetMtlEvent(const BackendSemaphore&);
+SK_API uint64_t GetMtlValue(const BackendSemaphore&);
+}  // namespace BackendSemaphores
+
+}  // namespace skgpu::graphite
+
+#endif  // skgpu_graphite_MtlGraphiteTypesUtils_DEFINED

package/cpp/skia/include/gpu/graphite/mtl/MtlGraphiteUtils.h

@@ -5,23 +5,5 @@
  * found in the LICENSE file.
  */
 
-#ifndef skgpu_graphite_MtlGraphiteUtils_DEFINED
-#define skgpu_graphite_MtlGraphiteUtils_DEFINED
-
-#include <memory>
-
-#include "include/private/base/SkAPI.h"
-
-namespace skgpu::graphite {
-
-class Context;
-struct ContextOptions;
-struct MtlBackendContext;
-
-namespace ContextFactory {
-SK_API std::unique_ptr<Context> MakeMetal(const MtlBackendContext&, const ContextOptions&);
-} // namespace ContextFactory
-
-} // namespace skgpu::graphite
-
-#endif // skgpu_graphite_MtlGraphiteUtils_DEFINED
+// DEPRECRATED: MtlGraphiteUtils.h will be removed in the future, please include MtlBackendContext.h
+#include "include/gpu/graphite/mtl/MtlBackendContext.h"

package/cpp/skia/include/gpu/graphite/precompile/Precompile.h

@@ -8,12 +8,13 @@
 #ifndef skgpu_graphite_precompile_Precompile_DEFINED
 #define skgpu_graphite_precompile_Precompile_DEFINED
 
+#include "include/core/SkColorSpace.h"
+#include "include/core/SkColorType.h"
 #include "include/core/SkSpan.h"
 #include "include/gpu/graphite/GraphiteTypes.h"
 
 namespace skgpu::graphite {
 
-class Context;
 class PaintOptions;
 class PrecompileContext;
 
@@ -23,9 +24,18 @@ class PrecompileContext;
  *  a pipeline.
  */
 struct SK_API RenderPassProperties {
-    DepthStencilFlags fDSFlags      = DepthStencilFlags::kNone;
-    SkColorType       fDstCT        = kRGBA_8888_SkColorType;
-    bool              fRequiresMSAA = false;
+    bool operator==(const RenderPassProperties& other) const {
+        return fDSFlags == other.fDSFlags &&
+               fDstCT == other.fDstCT &&
+               fRequiresMSAA == other.fRequiresMSAA &&
+               SkColorSpace::Equals(fDstCS.get(), other.fDstCS.get());
+    }
+    bool operator!= (const RenderPassProperties& other) const { return !(*this == other); }
+
+    DepthStencilFlags   fDSFlags      = DepthStencilFlags::kNone;
+    SkColorType         fDstCT        = kRGBA_8888_SkColorType;
+    sk_sp<SkColorSpace> fDstCS        = nullptr;
+    bool                fRequiresMSAA = false;
 };
 
 /**

package/cpp/skia/include/gpu/graphite/precompile/PrecompileShader.h

@@ -11,6 +11,8 @@
 #include "include/gpu/graphite/precompile/PrecompileBase.h"
 
 #include "include/core/SkBlendMode.h"
+#include "include/core/SkImageInfo.h"
+#include "include/effects/SkGradientShader.h"
 
 class SkColorSpace;
 
@@ -109,11 +111,13 @@ namespace PrecompileShaders {
     // time this entry point allows the equivalent precompilation program structure to be created.
     // Note that this factory is for non-YUV SkImages, the YUVImage factory (below) should be used
     // to represent the shading and sampling required for YUV images.
-    SK_API sk_sp<PrecompileShader> Image();
+    SK_API sk_sp<PrecompileShader> Image(SkSpan<const SkColorInfo> = {},
+                                         SkSpan<const SkTileMode> = {});
     // As with the above Image call, raw ImageShaders are usually created via an
     // SkImage::makeRawShader call. The RawImage call allows the equivalent precompilation
     // program structure to be created without needing the SkImage.
-    SK_API sk_sp<PrecompileShader> RawImage();
+    SK_API sk_sp<PrecompileShader> RawImage(SkSpan<const SkColorInfo> = {},
+                                            SkSpan<const SkTileMode> = {});
 
     // In the main Skia API, the specifics of the SkImage used for the SkImage::makeShader call
     // can determine whether normal or YUV sampling is required. This entry point allows clients
@@ -126,10 +130,14 @@ namespace PrecompileShaders {
     SK_API sk_sp<PrecompileShader> MakeTurbulence();
 
     // --- This block of four matches all the factories in SkGradientShader (SkGradientShader.h)
-    SK_API sk_sp<PrecompileShader> LinearGradient();
-    SK_API sk_sp<PrecompileShader> RadialGradient();
-    SK_API sk_sp<PrecompileShader> TwoPointConicalGradient();
-    SK_API sk_sp<PrecompileShader> SweepGradient();
+    SK_API sk_sp<PrecompileShader> LinearGradient(
+            SkGradientShader::Interpolation = SkGradientShader::Interpolation());
+    SK_API sk_sp<PrecompileShader> RadialGradient(
+            SkGradientShader::Interpolation = SkGradientShader::Interpolation());
+    SK_API sk_sp<PrecompileShader> TwoPointConicalGradient(
+            SkGradientShader::Interpolation = SkGradientShader::Interpolation());
+    SK_API sk_sp<PrecompileShader> SweepGradient(
+            SkGradientShader::Interpolation = SkGradientShader::Interpolation());
 
     // Normally, SkPicture shaders are only created via SkPicture::makeShader. Since the
     // SkPicture to be drawn, most likely, won't be available at precompilation time, this

package/cpp/skia/include/gpu/graphite/vk/VulkanGraphiteContext.h

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_graphite_VulkanGraphiteUtils_DEFINED
+#define skgpu_graphite_VulkanGraphiteUtils_DEFINED
+
+#include <memory>
+
+#include "include/private/base/SkAPI.h"
+
+// NOTE: Because there is already a VulkanBackendContext header shared between Ganesh and Graphite,
+// this is named VulkanGraphiteContext.h to supply just the factory function (differing from the
+// public headers exposed by other backends).
+namespace skgpu { struct VulkanBackendContext; }
+
+namespace skgpu::graphite {
+
+class Context;
+struct ContextOptions;
+
+namespace ContextFactory {
+SK_API std::unique_ptr<Context> MakeVulkan(const VulkanBackendContext&, const ContextOptions&);
+} // namespace ContextFactory
+
+} // namespace skgpu::graphite
+
+#endif // skgpu_graphite_VulkanGraphiteUtils_DEFINED

package/cpp/skia/include/gpu/graphite/vk/VulkanGraphiteTypes.h

@@ -13,20 +13,21 @@
 #include "include/gpu/graphite/TextureInfo.h"
 #include "include/gpu/vk/VulkanTypes.h"
 
-namespace skgpu::graphite {
+class SkStream;
+class SkWStream;
 
-struct VulkanTextureInfo {
-    uint32_t fSampleCount = 1;
-    Mipmapped fMipmapped = Mipmapped::kNo;
+namespace skgpu::graphite {
 
+class SK_API VulkanTextureInfo final : public TextureInfo::Data {
+public:
     // VkImageCreateInfo properties
     // Currently the only supported flag is VK_IMAGE_CREATE_PROTECTED_BIT. Any other flag will not
     // be accepted
-    VkImageCreateFlags       fFlags = 0;
-    VkFormat                 fFormat = VK_FORMAT_UNDEFINED;
-    VkImageTiling            fImageTiling = VK_IMAGE_TILING_OPTIMAL;
-    VkImageUsageFlags        fImageUsageFlags = 0;
-    VkSharingMode            fSharingMode = VK_SHARING_MODE_EXCLUSIVE;
+    VkImageCreateFlags fFlags = 0;
+    VkFormat           fFormat = VK_FORMAT_UNDEFINED;
+    VkImageTiling      fImageTiling = VK_IMAGE_TILING_OPTIMAL;
+    VkImageUsageFlags  fImageUsageFlags = 0;
+    VkSharingMode      fSharingMode = VK_SHARING_MODE_EXCLUSIVE;
 
     // Properties related to the image view and sampling. These are less inherent properties of the
     // VkImage but describe how the VkImage should be used within Skia.
@@ -35,8 +36,8 @@ struct VulkanTextureInfo {
     // However, if the VkImage is a Ycbcr format, the client can pass a specific plan here to have
     // Skia directly sample a plane. In that case the client should also pass in a VkFormat that is
     // compatible with the plane as described by the Vulkan spec.
-    VkImageAspectFlags         fAspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-    VulkanYcbcrConversionInfo  fYcbcrConversionInfo;
+    VkImageAspectFlags        fAspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+    VulkanYcbcrConversionInfo fYcbcrConversionInfo;
 
     VulkanTextureInfo() = default;
     VulkanTextureInfo(uint32_t sampleCount,
@@ -48,8 +49,7 @@ struct VulkanTextureInfo {
                       VkSharingMode sharingMode,
                       VkImageAspectFlags aspectMask,
                       VulkanYcbcrConversionInfo ycbcrConversionInfo)
-            : fSampleCount(sampleCount)
-            , fMipmapped(mipmapped)
+            : Data(sampleCount, mipmapped)
             , fFlags(flags)
             , fFormat(format)
             , fImageTiling(imageTiling)
@@ -57,6 +57,29 @@ struct VulkanTextureInfo {
             , fSharingMode(sharingMode)
             , fAspectMask(aspectMask)
             , fYcbcrConversionInfo(ycbcrConversionInfo) {}
+
+private:
+    friend class TextureInfo;
+    friend class TextureInfoPriv;
+
+    // Non-virtual template API for TextureInfo::Data accessed directly when backend type is known.
+    static constexpr skgpu::BackendApi kBackend = skgpu::BackendApi::kVulkan;
+
+    Protected isProtected() const {
+        return fFlags & VK_IMAGE_CREATE_PROTECTED_BIT ? Protected::kYes : Protected::kNo;
+    }
+    TextureFormat viewFormat() const;
+
+    bool serialize(SkWStream*) const;
+    bool deserialize(SkStream*);
+
+    // Virtual API when the specific backend type is not available.
+    SkString toBackendString() const override;
+
+    void copyTo(TextureInfo::AnyTextureInfoData& dstData) const override {
+        dstData.emplace<VulkanTextureInfo>(*this);
+    }
+    bool isCompatible(const TextureInfo& that, bool requireExact) const override;
 };
 
 namespace TextureInfos {
@@ -78,7 +101,6 @@ namespace BackendSemaphores {
 SK_API BackendSemaphore MakeVulkan(VkSemaphore);
 
 SK_API VkSemaphore GetVkSemaphore(const BackendSemaphore&);
-
 }  // namespace BackendSemaphores
 
 }  // namespace skgpu::graphite

package/cpp/skia/include/gpu/graphite/vk/VulkanGraphiteUtils.h

@@ -5,24 +5,6 @@
  * found in the LICENSE file.
  */
 
-#ifndef skgpu_graphite_VulkanGraphiteUtils_DEFINED
-#define skgpu_graphite_VulkanGraphiteUtils_DEFINED
-
-#include <memory>
-
-#include "include/private/base/SkAPI.h"
-
-namespace skgpu { struct VulkanBackendContext; }
-
-namespace skgpu::graphite {
-
-class Context;
-struct ContextOptions;
-
-namespace ContextFactory {
-SK_API std::unique_ptr<Context> MakeVulkan(const VulkanBackendContext&, const ContextOptions&);
-} // namespace ContextFactory
-
-} // namespace skgpu::graphite
-
-#endif // skgpu_graphite_VulkanGraphiteUtils_DEFINED
+// DEPRECRATED: VulkanGraphiteUtils.h will be removed in the future, please include
+// VulkanGraphiteContext.h
+#include "include/gpu/graphite/vk/VulkanGraphiteContext.h"

package/cpp/skia/include/ports/SkTypeface_fontations.h

@@ -18,4 +18,7 @@
 SK_API sk_sp<SkTypeface> SkTypeface_Make_Fontations(std::unique_ptr<SkStreamAsset> fontData,
                                                     const SkFontArguments& args);
 
+SK_API sk_sp<SkTypeface> SkTypeface_Make_Fontations(sk_sp<SkData> fontData,
+                                                    const SkFontArguments& args);
+
 #endif

package/cpp/skia/include/private/SkJpegMetadataDecoder.h

@@ -86,6 +86,13 @@ public:
     virtual bool findGainmapImage(sk_sp<SkData> baseImageData,
                                   sk_sp<SkData>& outGainmapImagedata,
                                   SkGainmapInfo& outGainmapInfo) = 0;
+
+     /**
+      * Return the first JUMBF superbox, if any, and nullptr otherwise. If |copyData| is false,
+      * then the returned SkData may directly reference the data provided when this object was
+      * created.
+      */
+    virtual sk_sp<SkData> getJUMBFMetadata(bool copyData) const = 0;
 };
 
 #endif

package/cpp/skia/include/private/base/SkAnySubclass.h

@@ -52,6 +52,9 @@ public:
         fValid = false;
     }
 
+    bool has_value() const { return fValid; }
+    explicit operator bool() const { return this->has_value(); }
+
     const Base* get() const {
         SkASSERT(fValid);
         return std::launder(reinterpret_cast<const Base*>(fData));
@@ -65,6 +68,9 @@ public:
     Base* operator->() { return this->get(); }
     const Base* operator->() const { return this->get(); }
 
+    Base& operator*() { return *this->get(); }
+    const Base& operator*() const { return *this->get(); }
+
 private:
     alignas(8) std::byte fData[Size];
     bool fValid = false;

package/cpp/skia/include/private/chromium/SkPMColor.h

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPMColor_DEFINED
+#define SkPMColor_DEFINED
+
+#include "include/core/SkColor.h"
+#include "include/private/base/SkAPI.h"
+
+#include <cstdint>
+
+/** Returns a SkPMColor value from already premultiplied 8-bit component values.
+
+    @param a  amount of alpha, from fully transparent (0) to fully opaque (255)
+    @param r  amount of red, from no red (0) to full red (255)
+    @param g  amount of green, from no green (0) to full green (255)
+    @param b  amount of blue, from no blue (0) to full blue (255)
+    @return   premultiplied color
+*/
+SK_API SkPMColor SkPMColorSetARGB(SkAlpha a, uint8_t r, uint8_t g, uint8_t b);
+
+/** Returns alpha component of premultiplied color. */
+SK_API SkAlpha SkPMColorGetA(SkPMColor);
+
+/** Returns red component of premultiplied color. */
+SK_API uint8_t SkPMColorGetR(SkPMColor);
+
+/** Returns green component of premultiplied color. */
+SK_API uint8_t SkPMColorGetG(SkPMColor);
+
+/** Returns blue component of premultiplied color. */
+SK_API uint8_t SkPMColorGetB(SkPMColor);
+
+#endif

package/cpp/skia/modules/skparagraph/include/Paragraph.h

@@ -88,7 +88,7 @@ public:
         SkPoint         origin;
         SkScalar        advanceX;
         int             count;
-        const uint16_t* glyphs;     // count values
+        const SkGlyphID* glyphs;     // count values
         const SkPoint*  positions;  // count values
         const uint32_t* utf8Starts; // count+1 values
         unsigned        flags;
@@ -103,7 +103,7 @@ public:
         SkPoint         origin;
         SkSize          advance;
         int             count;
-        const uint16_t* glyphs;     // count values
+        const SkGlyphID* glyphs;     // count values
         SkPoint*        positions;  // count values
         const SkRect*   bounds;     // count values
         const uint32_t* utf8Starts; // count+1 values

package/cpp/skia/modules/skunicode/include/SkUnicode.h

@@ -271,18 +271,22 @@ class SKUNICODE_API SkUnicode : public SkRefCnt {
 
             SkBidiIterator::Position pos16 = 0;
             while (pos16 <= iter->getLength()) {
-                auto level = iter->getLevelAt(pos16);
-                if (pos16 == 0) {
+                uint16_t nextPos16 = start16 - utf16;
+                auto level = iter->getLevelAt(nextPos16);
+                if (nextPos16 == 0) {
                     currentLevel = level;
                 } else if (level != currentLevel) {
-                    callback(pos16, start16 - utf16, currentLevel);
+                    callback(pos16, nextPos16, currentLevel);
                     currentLevel = level;
+                    pos16 = nextPos16;
                 }
                 if (start16 == end16) {
-                    break;
+                    if (pos16 != nextPos16) {
+                        callback(pos16, nextPos16, currentLevel);
+                    }
+                    return;
                 }
-                SkUnichar u = SkUTF::NextUTF16(&start16, end16);
-                pos16 += SkUTF::ToUTF16(u);
+                SkUTF::NextUTF16(&start16, end16);
             }
         }
 

package/cpp/skia/modules/svg/include/SkSVGDOM.h

@@ -53,9 +53,7 @@ public:
         sk_sp<SkShapers::Factory>                    fTextShapingFactory;
     };
 
-    static sk_sp<SkSVGDOM> MakeFromStream(SkStream& str) {
-        return Builder().make(str);
-    }
+    static sk_sp<SkSVGDOM> MakeFromStream(SkStream& str);
 
     /**
      * Returns the root (outermost) SVG element.

package/cpp/skia/src/base/SkTInternalLList.h

@@ -238,7 +238,7 @@ public:
         /**
          * C++11 range-for interface.
          */
-        bool operator!=(const Iter& that) { return fCurr != that.fCurr; }
+        bool operator!=(const Iter& that) const { return fCurr != that.fCurr; }
         T* operator*() { return this->get(); }
         void operator++() { this->next(); }
 

package/cpp/skia/src/core/SkLRUCache.h

@@ -14,7 +14,7 @@
 
 struct SkNoOpPurge {
     template <typename K, typename V>
-    void operator()(const K& /* k */, const V* /* v */) const {}
+    void operator()(void* /* context */, const K& /* k */, const V* /* v */) const {}
 };
 
 /**
@@ -35,7 +35,9 @@ private:
     };
 
 public:
-    explicit SkLRUCache(int maxCount) : fMaxCount(maxCount) {}
+    explicit SkLRUCache(int maxCount, void* context = nullptr)
+            : fMaxCount(maxCount)
+            , fContext(context) {}
     SkLRUCache() = delete;
 
     ~SkLRUCache() {
@@ -111,7 +113,7 @@ public:
         SkASSERT(value);
         Entry* entry = *value;
         SkASSERT(key == entry->fKey);
-        PurgeCB()(key, &entry->fValue);
+        PurgeCB()(fContext, key, &entry->fValue);
         fMap.remove(key);
         fLRU.remove(entry);
         delete entry;
@@ -131,6 +133,7 @@ private:
     int                                         fMaxCount;
     skia_private::THashTable<Entry*, K, Traits> fMap;
     SkTInternalLList<Entry>                     fLRU;
+    void*                                       fContext;
 };
 
 #endif

package/lib/commonjs/external/reanimated/textures.d.ts

@@ -1,8 +1,6 @@
-import type { ReactElement } from "react";
+import type { DependencyList, ReactElement } from "react";
 import type { SharedValue } from "react-native-reanimated";
 import type { DataSourceParam, SkImage, SkPicture, SkSize } from "../../skia/types";
-export declare const useTexture: (element: ReactElement, size: SkSize) => SharedValue<SkImage | null>;
-export declare const useTextureAsValue: (element: ReactElement, size: SkSize) => SharedValue<SkImage | null>;
-export declare const useTextureValueFromPicture: (picture: SkPicture | null, size: SkSize) => SharedValue<SkImage | null>;
+export declare const useTexture: (element: ReactElement, size: SkSize, deps?: DependencyList) => SharedValue<SkImage | null>;
 export declare const usePictureAsTexture: (picture: SkPicture | null, size: SkSize) => SharedValue<SkImage | null>;
 export declare const useImageAsTexture: (source: DataSourceParam) => SharedValue<SkImage | null>;

package/lib/commonjs/external/reanimated/textures.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useTextureValueFromPicture = exports.useTextureAsValue = exports.useTexture = exports.usePictureAsTexture = exports.useImageAsTexture = void 0;
+exports.useTexture = exports.usePictureAsTexture = exports.useImageAsTexture = void 0;
 var _react = require("react");
 var _Offscreen = require("../../renderer/Offscreen");
 var _skia = require("../../skia");
@@ -14,7 +14,7 @@ const createTexture = (texture, picture, size) => {
 
   texture.value = (0, _Offscreen.drawAsImageFromPicture)(picture, size);
 };
-const useTexture = (element, size) => {
+const useTexture = (element, size, deps) => {
   const {
     width,
     height
@@ -26,28 +26,21 @@ const useTexture = (element, size) => {
       y: 0,
       width,
       height
-    }).then(pic => setPicture(pic));
-  }, [element, width, height]);
+    }).then(pic => {
+      setPicture(pic);
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, deps !== null && deps !== void 0 ? deps : []);
   return usePictureAsTexture(picture, size);
 };
 exports.useTexture = useTexture;
-const useTextureAsValue = (element, size) => {
-  console.warn("useTextureAsValue has been renamed to use useTexture");
-  return useTexture(element, size);
-};
-exports.useTextureAsValue = useTextureAsValue;
-const useTextureValueFromPicture = (picture, size) => {
-  console.warn("useTextureValueFromPicture has been renamed to use usePictureAsTexture");
-  return usePictureAsTexture(picture, size);
-};
-exports.useTextureValueFromPicture = useTextureValueFromPicture;
 const usePictureAsTexture = (picture, size) => {
   const texture = _ReanimatedProxy.default.useSharedValue(null);
   (0, _react.useEffect)(() => {
     if (picture !== null) {
       _ReanimatedProxy.default.runOnUI(createTexture)(texture, picture, size);
     }
-  }, [texture, picture, size]);
+  }, [picture, size, texture]);
   return texture;
 };
 exports.usePictureAsTexture = usePictureAsTexture;

package/lib/commonjs/external/reanimated/textures.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_Offscreen","_skia","_ReanimatedProxy","_interopRequireDefault","e","__esModule","default","createTexture","texture","picture","size","value","drawAsImageFromPicture","useTexture","element","width","height","setPicture","useState","useEffect","drawAsPicture","x","y","then","pic","usePictureAsTexture","exports","useTextureAsValue","console","warn","useTextureValueFromPicture","Rea","useSharedValue","runOnUI","useImageAsTexture","source","image","useImage","useMemo","recorder","Skia","PictureRecorder","canvas","beginRecording","drawImage","finishRecordingAsPicture"],"sources":["textures.tsx"],"sourcesContent":["import { useEffect, useMemo, useState } from \"react\";\nimport type { ReactElement } from \"react\";\nimport type { SharedValue } from \"react-native-reanimated\";\n\nimport type {\n  DataSourceParam,\n  SkImage,\n  SkPicture,\n  SkSize,\n} from \"../../skia/types\";\nimport {\n  drawAsImageFromPicture,\n  drawAsPicture,\n} from \"../../renderer/Offscreen\";\nimport { Skia, useImage } from \"../../skia\";\n\nimport Rea from \"./ReanimatedProxy\";\n\nconst createTexture = (\n  texture: SharedValue<SkImage | null>,\n  picture: SkPicture,\n  size: SkSize\n) => {\n  \"worklet\";\n  texture.value = drawAsImageFromPicture(picture, size);\n};\n\nexport const useTexture = (element: ReactElement, size: SkSize) => {\n  const { width, height } = size;\n  const [picture, setPicture] = useState<SkPicture | null>(null);\n  useEffect(() => {\n    drawAsPicture(element, {\n      x: 0,\n      y: 0,\n      width,\n      height,\n    }).then((pic) => setPicture(pic));\n  }, [element, width, height]);\n  return usePictureAsTexture(picture, size);\n};\n\nexport const useTextureAsValue = (element: ReactElement, size: SkSize) => {\n  console.warn(\"useTextureAsValue has been renamed to use useTexture\");\n  return useTexture(element, size);\n};\n\nexport const useTextureValueFromPicture = (\n  picture: SkPicture | null,\n  size: SkSize\n) => {\n  console.warn(\n    \"useTextureValueFromPicture has been renamed to use usePictureAsTexture\"\n  );\n  return usePictureAsTexture(picture, size);\n};\n\nexport const usePictureAsTexture = (\n  picture: SkPicture | null,\n  size: SkSize\n) => {\n  const texture = Rea.useSharedValue<SkImage | null>(null);\n  useEffect(() => {\n    if (picture !== null) {\n      Rea.runOnUI(createTexture)(texture, picture, size);\n    }\n  }, [texture, picture, size]);\n  return texture;\n};\n\nexport const useImageAsTexture = (source: DataSourceParam) => {\n  const image = useImage(source);\n  const size = useMemo(() => {\n    if (image) {\n      return { width: image.width(), height: image.height() };\n    }\n    return { width: 0, height: 0 };\n  }, [image]);\n  const picture = useMemo(() => {\n    if (image) {\n      const recorder = Skia.PictureRecorder();\n      const canvas = recorder.beginRecording({\n        x: 0,\n        y: 0,\n        width: size.width,\n        height: size.height,\n      });\n      canvas.drawImage(image, 0, 0);\n      return recorder.finishRecordingAsPicture();\n    } else {\n      return null;\n    }\n  }, [size, image]);\n  return usePictureAsTexture(picture, size);\n};\n"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAUA,IAAAC,UAAA,GAAAD,OAAA;AAIA,IAAAE,KAAA,GAAAF,OAAA;AAEA,IAAAG,gBAAA,GAAAC,sBAAA,CAAAJ,OAAA;AAAoC,SAAAI,uBAAAC,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEpC,MAAMG,aAAa,GAAGA,CACpBC,OAAoC,EACpCC,OAAkB,EAClBC,IAAY,KACT;EACH,SAAS;;EACTF,OAAO,CAACG,KAAK,GAAG,IAAAC,iCAAsB,EAACH,OAAO,EAAEC,IAAI,CAAC;AACvD,CAAC;AAEM,MAAMG,UAAU,GAAGA,CAACC,OAAqB,EAAEJ,IAAY,KAAK;EACjE,MAAM;IAAEK,KAAK;IAAEC;EAAO,CAAC,GAAGN,IAAI;EAC9B,MAAM,CAACD,OAAO,EAAEQ,UAAU,CAAC,GAAG,IAAAC,eAAQ,EAAmB,IAAI,CAAC;EAC9D,IAAAC,gBAAS,EAAC,MAAM;IACd,IAAAC,wBAAa,EAACN,OAAO,EAAE;MACrBO,CAAC,EAAE,CAAC;MACJC,CAAC,EAAE,CAAC;MACJP,KAAK;MACLC;IACF,CAAC,CAAC,CAACO,IAAI,CAAEC,GAAG,IAAKP,UAAU,CAACO,GAAG,CAAC,CAAC;EACnC,CAAC,EAAE,CAACV,OAAO,EAAEC,KAAK,EAAEC,MAAM,CAAC,CAAC;EAC5B,OAAOS,mBAAmB,CAAChB,OAAO,EAAEC,IAAI,CAAC;AAC3C,CAAC;AAACgB,OAAA,CAAAb,UAAA,GAAAA,UAAA;AAEK,MAAMc,iBAAiB,GAAGA,CAACb,OAAqB,EAAEJ,IAAY,KAAK;EACxEkB,OAAO,CAACC,IAAI,CAAC,sDAAsD,CAAC;EACpE,OAAOhB,UAAU,CAACC,OAAO,EAAEJ,IAAI,CAAC;AAClC,CAAC;AAACgB,OAAA,CAAAC,iBAAA,GAAAA,iBAAA;AAEK,MAAMG,0BAA0B,GAAGA,CACxCrB,OAAyB,EACzBC,IAAY,KACT;EACHkB,OAAO,CAACC,IAAI,CACV,wEACF,CAAC;EACD,OAAOJ,mBAAmB,CAAChB,OAAO,EAAEC,IAAI,CAAC;AAC3C,CAAC;AAACgB,OAAA,CAAAI,0BAAA,GAAAA,0BAAA;AAEK,MAAML,mBAAmB,GAAGA,CACjChB,OAAyB,EACzBC,IAAY,KACT;EACH,MAAMF,OAAO,GAAGuB,wBAAG,CAACC,cAAc,CAAiB,IAAI,CAAC;EACxD,IAAAb,gBAAS,EAAC,MAAM;IACd,IAAIV,OAAO,KAAK,IAAI,EAAE;MACpBsB,wBAAG,CAACE,OAAO,CAAC1B,aAAa,CAAC,CAACC,OAAO,EAAEC,OAAO,EAAEC,IAAI,CAAC;IACpD;EACF,CAAC,EAAE,CAACF,OAAO,EAAEC,OAAO,EAAEC,IAAI,CAAC,CAAC;EAC5B,OAAOF,OAAO;AAChB,CAAC;AAACkB,OAAA,CAAAD,mBAAA,GAAAA,mBAAA;AAEK,MAAMS,iBAAiB,GAAIC,MAAuB,IAAK;EAC5D,MAAMC,KAAK,GAAG,IAAAC,cAAQ,EAACF,MAAM,CAAC;EAC9B,MAAMzB,IAAI,GAAG,IAAA4B,cAAO,EAAC,MAAM;IACzB,IAAIF,KAAK,EAAE;MACT,OAAO;QAAErB,KAAK,EAAEqB,KAAK,CAACrB,KAAK,CAAC,CAAC;QAAEC,MAAM,EAAEoB,KAAK,CAACpB,MAAM,CAAC;MAAE,CAAC;IACzD;IACA,OAAO;MAAED,KAAK,EAAE,CAAC;MAAEC,MAAM,EAAE;IAAE,CAAC;EAChC,CAAC,EAAE,CAACoB,KAAK,CAAC,CAAC;EACX,MAAM3B,OAAO,GAAG,IAAA6B,cAAO,EAAC,MAAM;IAC5B,IAAIF,KAAK,EAAE;MACT,MAAMG,QAAQ,GAAGC,UAAI,CAACC,eAAe,CAAC,CAAC;MACvC,MAAMC,MAAM,GAAGH,QAAQ,CAACI,cAAc,CAAC;QACrCtB,CAAC,EAAE,CAAC;QACJC,CAAC,EAAE,CAAC;QACJP,KAAK,EAAEL,IAAI,CAACK,KAAK;QACjBC,MAAM,EAAEN,IAAI,CAACM;MACf,CAAC,CAAC;MACF0B,MAAM,CAACE,SAAS,CAACR,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;MAC7B,OAAOG,QAAQ,CAACM,wBAAwB,CAAC,CAAC;IAC5C,CAAC,MAAM;MACL,OAAO,IAAI;IACb;EACF,CAAC,EAAE,CAACnC,IAAI,EAAE0B,KAAK,CAAC,CAAC;EACjB,OAAOX,mBAAmB,CAAChB,OAAO,EAAEC,IAAI,CAAC;AAC3C,CAAC;AAACgB,OAAA,CAAAQ,iBAAA,GAAAA,iBAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_Offscreen","_skia","_ReanimatedProxy","_interopRequireDefault","e","__esModule","default","createTexture","texture","picture","size","value","drawAsImageFromPicture","useTexture","element","deps","width","height","setPicture","useState","useEffect","drawAsPicture","x","y","then","pic","usePictureAsTexture","exports","Rea","useSharedValue","runOnUI","useImageAsTexture","source","image","useImage","useMemo","recorder","Skia","PictureRecorder","canvas","beginRecording","drawImage","finishRecordingAsPicture"],"sources":["textures.tsx"],"sourcesContent":["import { useEffect, useMemo, useState } from \"react\";\nimport type { DependencyList, ReactElement } from \"react\";\nimport type { SharedValue } from \"react-native-reanimated\";\n\nimport type {\n  DataSourceParam,\n  SkImage,\n  SkPicture,\n  SkSize,\n} from \"../../skia/types\";\nimport {\n  drawAsImageFromPicture,\n  drawAsPicture,\n} from \"../../renderer/Offscreen\";\nimport { Skia, useImage } from \"../../skia\";\n\nimport Rea from \"./ReanimatedProxy\";\n\nconst createTexture = (\n  texture: SharedValue<SkImage | null>,\n  picture: SkPicture,\n  size: SkSize\n) => {\n  \"worklet\";\n  texture.value = drawAsImageFromPicture(picture, size);\n};\n\nexport const useTexture = (\n  element: ReactElement,\n  size: SkSize,\n  deps?: DependencyList\n) => {\n  const { width, height } = size;\n  const [picture, setPicture] = useState<SkPicture | null>(null);\n  useEffect(() => {\n    drawAsPicture(element, {\n      x: 0,\n      y: 0,\n      width,\n      height,\n    }).then((pic) => {\n      setPicture(pic);\n    });\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, deps ?? []);\n  return usePictureAsTexture(picture, size);\n};\n\nexport const usePictureAsTexture = (\n  picture: SkPicture | null,\n  size: SkSize\n) => {\n  const texture = Rea.useSharedValue<SkImage | null>(null);\n  useEffect(() => {\n    if (picture !== null) {\n      Rea.runOnUI(createTexture)(texture, picture, size);\n    }\n  }, [picture, size, texture]);\n  return texture;\n};\n\nexport const useImageAsTexture = (source: DataSourceParam) => {\n  const image = useImage(source);\n  const size = useMemo(() => {\n    if (image) {\n      return { width: image.width(), height: image.height() };\n    }\n    return { width: 0, height: 0 };\n  }, [image]);\n  const picture = useMemo(() => {\n    if (image) {\n      const recorder = Skia.PictureRecorder();\n      const canvas = recorder.beginRecording({\n        x: 0,\n        y: 0,\n        width: size.width,\n        height: size.height,\n      });\n      canvas.drawImage(image, 0, 0);\n      return recorder.finishRecordingAsPicture();\n    } else {\n      return null;\n    }\n  }, [size, image]);\n  return usePictureAsTexture(picture, size);\n};\n"],"mappings":"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","ignoreList":[]}