@shopify/react-native-skia 1.11.1 → 1.11.2

package/cpp/rnskia/dom/props/TransformsProps.h

@@ -1,66 +0,0 @@
-#pragma once
-
-#include "MatrixProp.h"
-#include "NodeProp.h"
-#include "PointProp.h"
-#include "TransformProp.h"
-
-#include <memory>
-#include <utility>
-
-namespace RNSkia {
-
-class TransformsProps : public DerivedProp<SkMatrix> {
-public:
-  explicit TransformsProps(const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<SkMatrix>(onChange) {
-    _transformProp = defineProperty<TransformProp>("transform");
-    _originProp = defineProperty<PointProp>("origin");
-    _matrixProp = defineProperty<MatrixProp>("matrix");
-  }
-
-  void updateDerivedValue() override {
-    if (_transformProp->isSet() || _originProp->isSet() ||
-        _matrixProp->isSet()) {
-
-      auto matrix =
-          _matrixProp->isSet() ? _matrixProp->getDerivedValue() : nullptr;
-      auto origin =
-          _originProp->isSet() ? _originProp->getDerivedValue() : nullptr;
-      auto transform =
-          _transformProp->isSet() ? _transformProp->getDerivedValue() : nullptr;
-
-      auto lm = SkMatrix();
-      if (matrix) {
-        if (origin) {
-          lm.preTranslate(origin->x(), origin->y());
-          lm.preConcat(*matrix);
-          lm.preTranslate(-origin->x(), -origin->y());
-        } else {
-          lm.setIdentity();
-          lm.preConcat(*matrix);
-        }
-      } else if (transform) {
-        lm.setIdentity();
-        if (origin) {
-          lm.preTranslate(origin->x(), origin->y());
-        }
-        lm.preConcat(*transform);
-        if (origin) {
-          lm.preTranslate(-origin->x(), -origin->y());
-        }
-      }
-      setDerivedValue(std::move(lm));
-
-    } else {
-      setDerivedValue(nullptr);
-    }
-  }
-
-private:
-  TransformProp *_transformProp;
-  PointProp *_originProp;
-  MatrixProp *_matrixProp;
-};
-
-} // namespace RNSkia

package/cpp/rnskia/dom/props/UniformsProp.h

@@ -1,159 +0,0 @@
-#pragma once
-
-#include "DerivedNodeProp.h"
-#include "JsiSkRuntimeEffect.h"
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/effects/SkRuntimeEffect.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-bool isJSPoint(const JsiValue &value) {
-  return value.getType() == PropType::Object && value.hasValue(PropNameX) &&
-         value.hasValue(PropNameY);
-}
-
-bool isSkPoint(const JsiValue &value) {
-  return value.getType() == PropType::HostObject &&
-         std::dynamic_pointer_cast<JsiSkPoint>(value.getAsHostObject()) !=
-             nullptr;
-}
-
-bool isIndexable(const JsiValue &value) {
-  return value.getType() == PropType::Object && value.hasValue(PropName0);
-}
-
-void processValue(std::vector<SkScalar> &values, const JsiValue &value) {
-  if (value.getType() == PropType::Number) {
-    auto n = value.getAsNumber();
-    values.push_back(n);
-  } else if (value.getType() == PropType::Array) {
-    auto arrayValue = value.getAsArray();
-    for (size_t i = 0; i < arrayValue.size(); ++i) {
-      auto a = arrayValue[i];
-      processValue(values, a);
-    }
-  } else if (isJSPoint(value) || isSkPoint(value)) {
-    auto pointValue = PointProp::processValue(value);
-    values.push_back(pointValue.x());
-    values.push_back(pointValue.y());
-  } else if (isIndexable(value)) {
-    auto length = value.getKeys().size();
-    for (size_t i = 0; i < length; ++i) {
-      values.push_back(
-          value.getValue(JsiPropId::get(std::to_string(i))).getAsNumber());
-    }
-  }
-}
-
-void processUniform(std::vector<SkScalar> &values, SkRuntimeEffect *source,
-                    const JsiValue &uniforms, SkRuntimeShaderBuilder *rtb) {
-  auto uniformsCount = source->uniforms().size();
-  for (size_t i = 0; i < uniformsCount; ++i) {
-    auto it = source->uniforms().begin() + i;
-    auto name = JsiPropId::get(std::string(it->name));
-    if (!uniforms.hasValue(name)) {
-      throw std::runtime_error("The runtime effect has the uniform value \"" +
-                               std::string(name) +
-                               "\" declared, but it is missing from the "
-                               "uniforms property of the Runtime effect.");
-    }
-    auto value = uniforms.getValue(name);
-    if (rtb == nullptr) {
-      processValue(values, value);
-    } else {
-      std::vector<SkScalar> uniformValue;
-      processValue(uniformValue, value);
-      rtb->uniform(name).set(uniformValue.data(),
-                             static_cast<int>(uniformValue.size()));
-    }
-  }
-}
-
-class UniformsProp : public DerivedSkProp<SkData> {
-public:
-  UniformsProp(PropId name, NodeProp *sourceProp,
-               const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedSkProp<SkData>(onChange) {
-    _uniformsProp = defineProperty<NodeProp>(name);
-    _sourceProp = sourceProp;
-  }
-
-  void updateDerivedValue() override {
-    if (!_uniformsProp->isSet()) {
-      return;
-    }
-
-    // Get the effect
-    auto source = _sourceProp->value().getAs<JsiSkRuntimeEffect>()->getObject();
-
-    // Flatten uniforms from property
-    std::vector<SkScalar> uniformValues;
-    processUniform(uniformValues, source.get(), _uniformsProp->value(),
-                   nullptr);
-
-    // Cast uniforms according to the declaration in the shader
-    auto uniformsData = castUniforms(source.get(), uniformValues);
-
-    // Save derived value
-    setDerivedValue(uniformsData);
-  }
-
-  void processUniforms(SkRuntimeShaderBuilder &rtb) {
-    if (!_uniformsProp->isSet()) {
-      return;
-    }
-
-    // Get the effect
-    auto source = _sourceProp->value().getAs<JsiSkRuntimeEffect>()->getObject();
-    // Flatten uniforms from property
-    std::vector<SkScalar> uniformValues;
-    processUniform(uniformValues, source.get(), _uniformsProp->value(), &rtb);
-  }
-
-private:
-  sk_sp<SkData> castUniforms(SkRuntimeEffect *source,
-                             const std::vector<SkScalar> &values) {
-    // Create memory for uniforms
-    auto uniformSize = source->uniformSize();
-    if (values.size() * sizeof(float) != uniformSize) {
-      throw std::runtime_error(
-          "Uniforms size differs from effect's uniform size. Received " +
-          std::to_string(values.size()) + " expected " +
-          std::to_string(uniformSize / sizeof(float)));
-    }
-    auto uniformsData = SkData::MakeUninitialized(uniformSize);
-
-    // Loop through all uniforms in the effect and load data from the flattened
-    // array of values
-    const auto &u = source->uniforms();
-    for (std::size_t i = 0; i < u.size(); i++) {
-      auto it = source->uniforms().begin() + i;
-      RuntimeEffectUniform reu = JsiSkRuntimeEffect::fromUniform(*it);
-      for (std::size_t j = 0; j < reu.columns * reu.rows; ++j) {
-        const std::size_t offset = reu.slot + j;
-        float fValue = values.at(offset);
-        int iValue = static_cast<int>(fValue);
-        auto value = reu.isInteger ? SkBits2Float(iValue) : fValue;
-        memcpy(SkTAddOffset<void>(uniformsData->writable_data(),
-                                  offset * sizeof(value)),
-               &value, sizeof(value));
-      }
-    }
-
-    return uniformsData;
-  }
-
-  NodeProp *_uniformsProp;
-  NodeProp *_sourceProp;
-};
-
-} // namespace RNSkia

package/cpp/rnskia/dom/props/VertexModeProp.h

@@ -1,49 +0,0 @@
-#pragma once
-
-#include "DerivedNodeProp.h"
-
-#include <memory>
-#include <string>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkVertices.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-class VertexModeProp : public DerivedProp<SkVertices::VertexMode> {
-public:
-  explicit VertexModeProp(PropId name,
-                          const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<SkVertices::VertexMode>(onChange) {
-    _vertexModeProp = defineProperty<NodeProp>(name);
-  }
-
-  void updateDerivedValue() override {
-    if (_vertexModeProp->isSet() && (_vertexModeProp->isChanged())) {
-      auto vertexModeValue = _vertexModeProp->value().getAsString();
-      setDerivedValue(getVertexModeFromStringValue(vertexModeValue));
-    }
-  }
-
-private:
-  SkVertices::VertexMode
-  getVertexModeFromStringValue(const std::string &value) {
-    if (value == "triangles") {
-      return SkVertices::VertexMode::kTriangles_VertexMode;
-    } else if (value == "triangleStrip") {
-      return SkVertices::VertexMode::kTriangleStrip_VertexMode;
-    } else if (value == "triangleFan") {
-      return SkVertices::VertexMode::kTriangleFan_VertexMode;
-    }
-    throw std::runtime_error("Property value \"" + value +
-                             "\" is not a legal blend mode.");
-  }
-
-  NodeProp *_vertexModeProp;
-};
-
-} // namespace RNSkia

package/cpp/rnskia/dom/props/VerticesProps.h

@@ -1,63 +0,0 @@
-#pragma once
-
-#include "DerivedNodeProp.h"
-
-#include "ColorProp.h"
-#include "NumbersProp.h"
-#include "PointsProp.h"
-#include "VertexModeProp.h"
-
-#include <memory>
-#include <vector>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkVertices.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-class VerticesProps : public DerivedSkProp<SkVertices> {
-public:
-  explicit VerticesProps(const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedSkProp<SkVertices>(onChange) {
-    _vertexModeProp = defineProperty<VertexModeProp>("mode");
-    _colorsProp = defineProperty<ColorsProp>("colors");
-    _verticesProp = defineProperty<PointsProp>("vertices");
-    _texturesProp = defineProperty<PointsProp>("textures");
-    _indicesProp = defineProperty<Numbers16Prop>("indices");
-
-    _vertexModeProp->require();
-    _verticesProp->require();
-  }
-
-  bool hasColors() { return _colorsProp->isSet(); }
-
-  void updateDerivedValue() override {
-    const SkVertices::VertexMode *vertextMode =
-        _vertexModeProp->getDerivedValue().get();
-    const std::vector<SkColor> *colors = _colorsProp->getDerivedValue().get();
-    auto vertices = _verticesProp->getDerivedValue();
-    auto textures = _texturesProp->getDerivedValue();
-    auto indices = _indicesProp->getDerivedValue();
-
-    setDerivedValue(SkVertices::MakeCopy(
-        *vertextMode, static_cast<int>(vertices->size()),
-        _verticesProp->isSet() ? vertices->data() : nullptr,
-        _texturesProp->isSet() ? textures->data() : nullptr,
-        _colorsProp->isSet() ? colors->data() : nullptr,
-        _indicesProp->isSet() ? static_cast<int>(indices->size()) : 0,
-        _indicesProp->isSet() ? indices->data() : nullptr));
-  }
-
-private:
-  VertexModeProp *_vertexModeProp;
-  ColorsProp *_colorsProp;
-  PointsProp *_verticesProp;
-  PointsProp *_texturesProp;
-  Numbers16Prop *_indicesProp;
-};
-
-} // namespace RNSkia

package/ios/RNSkia-iOS/SkiaDomView.h

@@ -1,7 +0,0 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-#import "SkiaUIView.h"
-
-@interface SkiaDomView : SkiaUIView
-
-@end
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSkia-iOS/SkiaDomView.mm

@@ -1,63 +0,0 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-#import "SkiaDomView.h"
-
-#import "RNSkDomView.h"
-#import "RNSkIOSView.h"
-#import "RNSkPlatformContext.h"
-
-#import "RNSkiaModule.h"
-#import "SkiaManager.h"
-#import "SkiaUIView.h"
-
-#import <React/RCTBridge+Private.h>
-#import <React/RCTConversions.h>
-#import <React/RCTFabricComponentsPlugins.h>
-
-#import <react/renderer/components/rnskia/ComponentDescriptors.h>
-#import <react/renderer/components/rnskia/EventEmitters.h>
-#import <react/renderer/components/rnskia/Props.h>
-#import <react/renderer/components/rnskia/RCTComponentViewHelpers.h>
-
-using namespace facebook::react;
-
-@implementation SkiaDomView
-
-- (instancetype)initWithFrame:(CGRect)frame {
-  if (self = [super initWithFrame:frame]) {
-    // Pass SkManager as a raw pointer to avoid circular dependencies
-    auto skManager = [SkiaManager latestActiveSkManager].get();
-    [self
-        initCommon:skManager
-           factory:[](std::shared_ptr<RNSkia::RNSkPlatformContext> context) {
-             return std::make_shared<RNSkiOSView<RNSkia::RNSkDomView>>(context);
-           }];
-    static const auto defaultProps = std::make_shared<const SkiaDomViewProps>();
-    _props = defaultProps;
-  }
-  return self;
-}
-
-#pragma mark - RCTComponentViewProtocol
-
-+ (ComponentDescriptorProvider)componentDescriptorProvider {
-  return concreteComponentDescriptorProvider<SkiaDomViewComponentDescriptor>();
-}
-
-- (void)updateProps:(const Props::Shared &)props
-           oldProps:(const Props::Shared &)oldProps {
-  const auto &newProps =
-      *std::static_pointer_cast<const SkiaDomViewProps>(props);
-  [super updateProps:props oldProps:oldProps];
-  int nativeId =
-      [[RCTConvert NSString:RCTNSStringFromString(newProps.nativeId)] intValue];
-  [self setNativeId:nativeId];
-  [self setDebugMode:newProps.debug];
-}
-
-@end
-
-Class<RCTComponentViewProtocol> SkiaDomViewCls(void) {
-  return SkiaDomView.class;
-}
-
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSkia-iOS/SkiaDomViewManager.h

@@ -1,8 +0,0 @@
-
-#pragma once
-
-#import <React/RCTViewManager.h>
-
-@interface SkiaDomViewManager : RCTViewManager
-
-@end

package/ios/RNSkia-iOS/SkiaDomViewManager.mm

@@ -1,51 +0,0 @@
-
-#include "SkiaDomViewManager.h"
-#include <React/RCTBridge+Private.h>
-
-#include "RNSkDomView.h"
-#include "RNSkIOSView.h"
-#include "RNSkPlatformContext.h"
-
-#include "RNSkiaModule.h"
-#include "SkiaManager.h"
-#include "SkiaUIView.h"
-
-@implementation SkiaDomViewManager
-
-RCT_EXPORT_MODULE(SkiaDomView)
-
-- (SkiaManager *)skiaManager {
-  auto bridge = self.bridge;
-  RCTAssert(bridge, @"Bridge must not be nil.");
-  auto skiaModule = (RNSkiaModule *)[bridge moduleForName:@"RNSkiaModule"];
-  return [skiaModule manager];
-}
-
-RCT_CUSTOM_VIEW_PROPERTY(nativeID, NSNumber, SkiaUIView) {
-  // Get parameter
-  int nativeId = [[RCTConvert NSString:json] intValue];
-  [(SkiaUIView *)view setNativeId:nativeId];
-}
-
-RCT_CUSTOM_VIEW_PROPERTY(debug, BOOL, SkiaUIView) {
-  bool debug = json != NULL ? [RCTConvert BOOL:json] : false;
-  [(SkiaUIView *)view setDebugMode:debug];
-}
-
-RCT_CUSTOM_VIEW_PROPERTY(opaque, BOOL, SkiaUIView) {
-  bool debug = json != NULL ? [RCTConvert BOOL:json] : false;
-  [(SkiaUIView *)view setOpaque:debug];
-}
-
-- (UIView *)view {
-  auto skManager = [[self skiaManager] skManager];
-  // Pass SkManager as a raw pointer to avoid circular dependenciesr
-  return [[SkiaUIView alloc]
-      initWithManager:skManager.get()
-              factory:[](std::shared_ptr<RNSkia::RNSkPlatformContext> context) {
-                return std::make_shared<RNSkiOSView<RNSkia::RNSkDomView>>(
-                    context);
-              }];
-}
-
-@end

package/lib/commonjs/dom/nodes/JsiSkDOM.d.ts

@@ -1,64 +0,0 @@
-import type { PathProps, SkDOM, GroupProps, ImageProps, BlurImageFilterProps, MatrixColorFilterProps, CircleProps, BlurMaskFilterProps, LinearGradientProps, PaintProps, ShaderProps, ImageShaderProps, LineProps, OvalProps, PatchProps, PointsProps, RectProps, RoundedRectProps, VerticesProps, TextProps, DiffRectProps, OffsetImageFilterProps, BlendColorFilterProps, TextPathProps, TextBlobProps, GlyphsProps, TwoPointConicalGradientProps, TurbulenceProps, SweepGradientProps, RadialGradientProps, FractalNoiseProps, ColorProps, PictureProps, ImageSVGProps, LerpColorFilterProps, DrawingNodeProps, BoxProps, BoxShadowProps, ChildrenProps, AtlasProps } from "../types";
-import type { BlendImageFilterProps, BlendProps, DisplacementMapImageFilterProps, DropShadowImageFilterProps, MorphologyImageFilterProps, RuntimeShaderImageFilterProps } from "../types/ImageFilters";
-import type { CornerPathEffectProps, DashPathEffectProps, DiscretePathEffectProps, Line2DPathEffectProps, Path1DPathEffectProps, Path2DPathEffectProps } from "../types/PathEffects";
-import type { ParagraphProps } from "../types/Paragraph";
-export declare class JsiSkDOM implements SkDOM {
-    constructor();
-    Layer(props?: ChildrenProps): import("../types").RenderNode<ChildrenProps>;
-    Group(props?: GroupProps): import("../types").RenderNode<GroupProps>;
-    Paint(props: PaintProps): import("../types").DeclarationNode<PaintProps>;
-    Fill(props?: DrawingNodeProps): import("../types").RenderNode<PaintProps>;
-    Image(props: ImageProps): import("../types").RenderNode<ImageProps>;
-    Circle(props: CircleProps): import("../types").RenderNode<CircleProps>;
-    Path(props: PathProps): import("../types").RenderNode<PathProps>;
-    Line(props: LineProps): import("../types").RenderNode<LineProps>;
-    Oval(props: OvalProps): import("../types").RenderNode<OvalProps>;
-    Patch(props: PatchProps): import("../types").RenderNode<PatchProps>;
-    Points(props: PointsProps): import("../types").RenderNode<PointsProps>;
-    Rect(props: RectProps): import("../types").RenderNode<RectProps>;
-    RRect(props: RoundedRectProps): import("../types").RenderNode<RoundedRectProps>;
-    Vertices(props: VerticesProps): import("../types").RenderNode<VerticesProps>;
-    Text(props: TextProps): import("../types").RenderNode<TextProps>;
-    TextPath(props: TextPathProps): import("../types").RenderNode<TextPathProps>;
-    TextBlob(props: TextBlobProps): import("../types").RenderNode<TextBlobProps>;
-    Glyphs(props: GlyphsProps): import("../types").RenderNode<GlyphsProps>;
-    DiffRect(props: DiffRectProps): import("../types").RenderNode<DiffRectProps>;
-    Picture(props: PictureProps): import("../types").RenderNode<PictureProps>;
-    Atlas(props: AtlasProps): import("../types").RenderNode<AtlasProps>;
-    ImageSVG(props: ImageSVGProps): import("../types").RenderNode<ImageSVGProps>;
-    BlurMaskFilter(props: BlurMaskFilterProps): import("../types").DeclarationNode<BlurMaskFilterProps>;
-    BlendImageFilter(props: BlendImageFilterProps): import("../types").DeclarationNode<BlendImageFilterProps>;
-    DropShadowImageFilter(props: DropShadowImageFilterProps): import("../types").DeclarationNode<DropShadowImageFilterProps>;
-    DisplacementMapImageFilter(props: DisplacementMapImageFilterProps): import("../types").DeclarationNode<DisplacementMapImageFilterProps>;
-    BlurImageFilter(props: BlurImageFilterProps): import("../types").DeclarationNode<BlurImageFilterProps>;
-    OffsetImageFilter(props: OffsetImageFilterProps): import("../types").DeclarationNode<OffsetImageFilterProps>;
-    MorphologyImageFilter(props: MorphologyImageFilterProps): import("../types").DeclarationNode<MorphologyImageFilterProps>;
-    RuntimeShaderImageFilter(props: RuntimeShaderImageFilterProps): import("../types").DeclarationNode<RuntimeShaderImageFilterProps>;
-    MatrixColorFilter(props: MatrixColorFilterProps): import("../types").DeclarationNode<MatrixColorFilterProps>;
-    BlendColorFilter(props: BlendColorFilterProps): import("../types").DeclarationNode<BlendColorFilterProps>;
-    LumaColorFilter(): import("../types").DeclarationNode<null>;
-    LinearToSRGBGammaColorFilter(): import("../types").DeclarationNode<null>;
-    SRGBToLinearGammaColorFilter(): import("../types").DeclarationNode<null>;
-    LerpColorFilter(props: LerpColorFilterProps): import("../types").DeclarationNode<LerpColorFilterProps>;
-    Shader(props: ShaderProps): import("../types").DeclarationNode<ShaderProps>;
-    ImageShader(props: ImageShaderProps): import("../types").DeclarationNode<ImageShaderProps>;
-    ColorShader(props: ColorProps): import("../types").DeclarationNode<ColorProps>;
-    SweepGradient(props: SweepGradientProps): import("../types").DeclarationNode<SweepGradientProps>;
-    Turbulence(props: TurbulenceProps): import("../types").DeclarationNode<TurbulenceProps>;
-    FractalNoise(props: FractalNoiseProps): import("../types").DeclarationNode<FractalNoiseProps>;
-    LinearGradient(props: LinearGradientProps): import("../types").DeclarationNode<LinearGradientProps>;
-    RadialGradient(props: RadialGradientProps): import("../types").DeclarationNode<RadialGradientProps>;
-    TwoPointConicalGradient(props: TwoPointConicalGradientProps): import("../types").DeclarationNode<TwoPointConicalGradientProps>;
-    CornerPathEffect(props: CornerPathEffectProps): import("../types").DeclarationNode<CornerPathEffectProps>;
-    DiscretePathEffect(props: DiscretePathEffectProps): import("../types").DeclarationNode<DiscretePathEffectProps>;
-    DashPathEffect(props: DashPathEffectProps): import("../types").DeclarationNode<DashPathEffectProps>;
-    Path1DPathEffect(props: Path1DPathEffectProps): import("../types").DeclarationNode<Path1DPathEffectProps>;
-    Path2DPathEffect(props: Path2DPathEffectProps): import("../types").DeclarationNode<Path2DPathEffectProps>;
-    SumPathEffect(): import("../types").DeclarationNode<null>;
-    Line2DPathEffect(props: Line2DPathEffectProps): import("../types").DeclarationNode<Line2DPathEffectProps>;
-    Blend(props: BlendProps): import("../types").DeclarationNode<BlendProps>;
-    BackdropFilter(props: ChildrenProps): import("../types").RenderNode<ChildrenProps>;
-    Box(props: BoxProps): import("../types").RenderNode<BoxProps>;
-    BoxShadow(props: BoxShadowProps): import("../types").DeclarationNode<BoxShadowProps>;
-    Paragraph(props: ParagraphProps): import("../types").RenderNode<ParagraphProps>;
-}