@shopify/react-native-skia 1.11.1 → 1.11.2

package/android/src/main/java/com/shopify/reactnative/skia/SkiaDomViewManager.java

@@ -1,32 +0,0 @@
-package com.shopify.reactnative.skia;
-
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.viewmanagers.SkiaDomViewManagerInterface;
-import com.facebook.react.viewmanagers.SkiaDomViewManagerDelegate;
-
-import androidx.annotation.NonNull;
-
-public class SkiaDomViewManager extends SkiaBaseViewManager<SkiaDomView> implements SkiaDomViewManagerInterface<SkiaDomView> {
-
-    protected SkiaDomViewManagerDelegate mDelegate;
-
-    SkiaDomViewManager() {
-        mDelegate = new SkiaDomViewManagerDelegate(this);
-    }
-
-    protected SkiaDomViewManagerDelegate getDelegate() {
-        return mDelegate;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return "SkiaDomView";
-    }
-
-    @NonNull
-    @Override
-    public SkiaDomView createViewInstance(@NonNull ThemedReactContext reactContext) {
-        return new SkiaDomView(reactContext);
-    }
-}

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaDomViewManagerDelegate.java

@@ -1,34 +0,0 @@
-/**
-* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
-*
-* Do not edit this file as changes may cause incorrect behavior and will be lost
-* once the code is regenerated.
-*
-* @generated by codegen project: GeneratePropsJavaDelegate.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
-
-public class SkiaDomViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & SkiaDomViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
-  public SkiaDomViewManagerDelegate(U viewManager) {
-    super(viewManager);
-  }
-  @Override
-  public void setProperty(T view, String propName, @Nullable Object value) {
-    switch (propName) {
-      case "opaque":
-        mViewManager.setOpaque(view, value != null && (boolean) value);
-        break;
-      case "debug":
-        mViewManager.setDebug(view, value != null && (boolean) value);
-        break;
-      default:
-        super.setProperty(view, propName, value);
-    }
-  }
-}

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaDomViewManagerInterface.java

@@ -1,18 +0,0 @@
-/**
-* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
-*
-* Do not edit this file as changes may cause incorrect behavior and will be lost
-* once the code is regenerated.
-*
-* @generated by codegen project: GeneratePropsJavaInterface.js
-*/
-
-package com.facebook.react.viewmanagers;
-
-import android.view.View;
-import androidx.annotation.Nullable;
-
-public interface SkiaDomViewManagerInterface<T extends View> {
-  void setDebug(T view, boolean value);
-  void setOpaque(T view, boolean value);
-}

package/cpp/rnskia/RNSkDomView.cpp

@@ -1,121 +0,0 @@
-#include "RNSkDomView.h"
-#include "DrawingContext.h"
-
-#include <chrono>
-#include <utility>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkFont.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-RNSkDomRenderer::RNSkDomRenderer(std::function<void()> requestRedraw,
-                                 std::shared_ptr<RNSkPlatformContext> context)
-    : RNSkRenderer(requestRedraw), _platformContext(std::move(context)),
-      _renderLock(std::make_shared<std::timed_mutex>()),
-      _renderTimingInfo("SKIA/RENDER") {}
-
-RNSkDomRenderer::~RNSkDomRenderer() {
-  if (_root != nullptr) {
-    _root->dispose(true);
-    _root = nullptr;
-  }
-}
-
-void RNSkDomRenderer::renderImmediate(
-    std::shared_ptr<RNSkCanvasProvider> canvasProvider) {
-  auto prevDebugOverlay = getShowDebugOverlays();
-  setShowDebugOverlays(false);
-  canvasProvider->renderToCanvas(std::bind(
-      &RNSkDomRenderer::renderCanvas, this, std::placeholders::_1,
-      canvasProvider->getScaledWidth(), canvasProvider->getScaledHeight()));
-  setShowDebugOverlays(prevDebugOverlay);
-}
-
-void RNSkDomRenderer::setRoot(std::shared_ptr<JsiDomRenderNode> node) {
-  std::lock_guard<std::mutex> lock(_rootLock);
-  if (_root != nullptr) {
-    _root->dispose(true);
-    _root = nullptr;
-  }
-  _root = node;
-}
-
-void RNSkDomRenderer::renderCanvas(SkCanvas *canvas, float scaledWidth,
-                                   float scaledHeight) {
-  _renderTimingInfo.beginTiming();
-
-  auto pd = _platformContext->getPixelDensity();
-  canvas->clear(SK_ColorTRANSPARENT);
-  canvas->save();
-  canvas->scale(pd, pd);
-
-  if (_drawingContext == nullptr) {
-    _drawingContext = std::make_shared<DrawingContext>();
-
-    _drawingContext->setRequestRedraw([weakSelf = weak_from_this()]() {
-      auto self = weakSelf.lock();
-      if (self) {
-        self->_requestRedraw();
-      }
-    });
-  }
-
-  _drawingContext->setScaledWidth(scaledWidth);
-  _drawingContext->setScaledHeight(scaledHeight);
-
-  // Update canvas before drawing
-  _drawingContext->setCanvas(canvas);
-
-  try {
-    // Ask the root node to render to the provided canvas
-    std::lock_guard<std::mutex> lock(_rootLock);
-    if (_root != nullptr) {
-      _root->commitPendingChanges();
-      _root->render(_drawingContext.get());
-      _root->resetPendingChanges();
-    }
-  } catch (std::runtime_error err) {
-    _platformContext->raiseError(err);
-  } catch (jsi::JSError err) {
-    _platformContext->raiseError(err);
-  } catch (...) {
-    _platformContext->raiseError(
-        std::runtime_error("Error rendering the Skia view."));
-  }
-
-  renderDebugOverlays(canvas);
-
-  canvas->restore();
-
-  _renderTimingInfo.stopTiming();
-}
-
-void RNSkDomRenderer::renderDebugOverlays(SkCanvas *canvas) {
-  if (!getShowDebugOverlays()) {
-    return;
-  }
-  auto renderAvg = _renderTimingInfo.getAverage();
-  auto fps = _renderTimingInfo.getFps();
-
-  // Build string
-  std::ostringstream stream;
-  stream << "render: " << renderAvg << "ms"
-         << " fps: " << fps;
-
-  std::string debugString = stream.str();
-
-  // Set up debug font/paints
-  auto font = SkFont();
-  font.setSize(14);
-  auto paint = SkPaint();
-  paint.setColor(SkColors::kRed);
-  canvas->drawSimpleText(debugString.c_str(), debugString.size(),
-                         SkTextEncoding::kUTF8, 8, 18, font, paint);
-}
-
-} // namespace RNSkia

package/cpp/rnskia/RNSkDomView.h

@@ -1,97 +0,0 @@
-#pragma once
-
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#include <jsi/jsi.h>
-
-#include "RNSkView.h"
-#include "ViewProperty.h"
-
-#include "JsiDomRenderNode.h"
-#include "RNSkLog.h"
-#include "RNSkPlatformContext.h"
-#include "RNSkTimingInfo.h"
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkBBHFactory.h"
-#include "include/core/SkCanvas.h"
-#include "include/core/SkPictureRecorder.h"
-
-#pragma clang diagnostic pop
-
-class SkPicture;
-class SkRect;
-class SkImage;
-
-namespace RNSkia {
-class JsiSkCanvas;
-namespace jsi = facebook::jsi;
-
-class RNSkDomRenderer : public RNSkRenderer,
-                        public std::enable_shared_from_this<RNSkDomRenderer> {
-public:
-  RNSkDomRenderer(std::function<void()> requestRedraw,
-                  std::shared_ptr<RNSkPlatformContext> context);
-
-  ~RNSkDomRenderer();
-
-  void
-  renderImmediate(std::shared_ptr<RNSkCanvasProvider> canvasProvider) override;
-
-  void setRoot(std::shared_ptr<JsiDomRenderNode> node);
-
-private:
-  void renderCanvas(SkCanvas *canvas, float scaledWidth, float scaledHeight);
-  void renderDebugOverlays(SkCanvas *canvas);
-
-  std::shared_ptr<RNSkPlatformContext> _platformContext;
-
-  std::shared_ptr<std::timed_mutex> _renderLock;
-
-  std::shared_ptr<JsiDomRenderNode> _root;
-  std::shared_ptr<DrawingContext> _drawingContext;
-
-  RNSkTimingInfo _renderTimingInfo;
-
-  std::mutex _rootLock;
-};
-
-class RNSkDomView : public RNSkView {
-public:
-  /**
-   * Constructor
-   */
-  RNSkDomView(std::shared_ptr<RNSkPlatformContext> context,
-              std::shared_ptr<RNSkCanvasProvider> canvasProvider)
-      : RNSkView(context, canvasProvider,
-                 std::make_shared<RNSkDomRenderer>(
-                     std::bind(&RNSkView::requestRedraw, this), context)) {}
-
-  void setJsiProperties(
-      std::unordered_map<std::string, ViewProperty> &props) override {
-
-    for (auto &prop : props) {
-      if (prop.first == "root") {
-        // Save root
-        if (prop.second.isNull()) {
-          std::static_pointer_cast<RNSkDomRenderer>(getRenderer())
-              ->setRoot(nullptr);
-        } else {
-          std::static_pointer_cast<RNSkDomRenderer>(getRenderer())
-              ->setRoot(prop.second.getDomRenderNode());
-        }
-
-        // Request redraw
-        requestRedraw();
-      }
-    }
-  }
-};
-} // namespace RNSkia

package/cpp/rnskia/dom/JsiDomApi.h

@@ -1,165 +0,0 @@
-#pragma once
-
-/* Enable output of dom trees and paint contexts */
-#define SKIA_DOM_DEBUG 0
-#define SKIA_DOM_DEBUG_VERBOSE 0
-
-#include <memory>
-
-#include "JsiHostObject.h"
-
-#include "nodes/JsiAtlasNode.h"
-#include "nodes/JsiCircleNode.h"
-#include "nodes/JsiDiffRectNode.h"
-#include "nodes/JsiFillNode.h"
-#include "nodes/JsiGroupNode.h"
-#include "nodes/JsiImageNode.h"
-#include "nodes/JsiLineNode.h"
-#include "nodes/JsiOvalNode.h"
-#include "nodes/JsiPatchNode.h"
-#include "nodes/JsiPathNode.h"
-#include "nodes/JsiPointsNode.h"
-#include "nodes/JsiRRectNode.h"
-#include "nodes/JsiRectNode.h"
-
-#include "nodes/JsiBlurMaskNode.h"
-#include "nodes/JsiImageSvgNode.h"
-#include "nodes/JsiPictureNode.h"
-#include "nodes/JsiVerticesNode.h"
-
-#include "nodes/JsiColorFilterNodes.h"
-#include "nodes/JsiImageFilterNodes.h"
-#include "nodes/JsiPathEffectNodes.h"
-#include "nodes/JsiShaderNodes.h"
-
-#include "nodes/JsiPaintNode.h"
-
-#include "nodes/JsiBackdropFilterNode.h"
-#include "nodes/JsiBlendNode.h"
-#include "nodes/JsiBoxNode.h"
-#include "nodes/JsiBoxShadowNode.h"
-
-#include "nodes/JsiGlyphsNode.h"
-#include "nodes/JsiTextBlobNode.h"
-#include "nodes/JsiTextNode.h"
-#include "nodes/JsiTextPathNode.h"
-
-#include "nodes/JsiLayerNode.h"
-#include "nodes/JsiParagraphNode.h"
-
-namespace RNSkia {
-
-namespace jsi = facebook::jsi;
-
-class JsiDomApi : public JsiHostObject {
-public:
-  explicit JsiDomApi(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiHostObject() {
-
-    // Shapes
-    installFunction("RectNode", JsiRectNode::createCtor(context));
-    installFunction("RRectNode", JsiRRectNode::createCtor(context));
-    installFunction("CircleNode", JsiCircleNode::createCtor(context));
-    installFunction("PathNode", JsiPathNode::createCtor(context));
-    installFunction("LineNode", JsiLineNode::createCtor(context));
-    installFunction("ImageNode", JsiImageNode::createCtor(context));
-    installFunction("OvalNode", JsiOvalNode::createCtor(context));
-    installFunction("PatchNode", JsiPatchNode::createCtor(context));
-    installFunction("PointsNode", JsiPointsNode::createCtor(context));
-    installFunction("DiffRectNode", JsiDiffRectNode::createCtor(context));
-    installFunction("AtlasNode", JsiAtlasNode::createCtor(context));
-
-    installFunction("FillNode", JsiFillNode::createCtor(context));
-
-    installFunction("GroupNode", JsiGroupNode::createCtor(context));
-
-    installFunction("PaintNode", JsiPaintNode::createCtor(context));
-
-    installFunction("BlurMaskFilterNode", JsiBlurMaskNode::createCtor(context));
-
-    installFunction("PictureNode", JsiPictureNode::createCtor(context));
-    installFunction("ImageSVGNode", JsiImageSvgNode::createCtor(context));
-
-    installFunction("VerticesNode", JsiVerticesNode::createCtor(context));
-
-    // Path effects
-    installFunction("DashPathEffectNode",
-                    JsiDashPathEffectNode::createCtor(context));
-    installFunction("DiscretePathEffectNode",
-                    JsiDiscretePathEffectNode::createCtor(context));
-    installFunction("CornerPathEffectNode",
-                    JsiCornerPathEffectNode::createCtor(context));
-    installFunction("Path1DPathEffectNode",
-                    JsiPath1DPathEffectNode::createCtor(context));
-    installFunction("Path2DPathEffectNode",
-                    JsiPath2DPathEffectNode::createCtor(context));
-    installFunction("Line2DPathEffectNode",
-                    JsiLine2DPathEffectNode::createCtor(context));
-    installFunction("SumPathEffectNode",
-                    JsiSumPathEffectNode::createCtor(context));
-
-    // Image filters
-    installFunction("DashPathEffectNode",
-                    JsiBlendImageFilterNode::createCtor(context));
-    installFunction("DropShadowImageFilterNode",
-                    JsiDropShadowImageFilterNode::createCtor(context));
-    installFunction("DisplacementMapImageFilterNode",
-                    JsiDisplacementMapImageFilterNode::createCtor(context));
-    installFunction("BlurImageFilterNode",
-                    JsiBlurImageFilterNode::createCtor(context));
-    installFunction("OffsetImageFilterNode",
-                    JsiOffsetImageFilterNode::createCtor(context));
-    installFunction("MorphologyImageFilterNode",
-                    JsiMorphologyImageFilterNode::createCtor(context));
-    installFunction("RuntimeShaderImageFilterNode",
-                    JsiRuntimeShaderImageFilterNode::createCtor(context));
-
-    // Color Filters
-    installFunction("MatrixColorFilterNode",
-                    JsiMatrixColorFilterNode::createCtor(context));
-    installFunction("BlendColorFilterNode",
-                    JsiBlendColorFilterNode::createCtor(context));
-    installFunction("LinearToSRGBGammaColorFilterNode",
-                    JsiLinearToSRGBGammaColorFilterNode::createCtor(context));
-    installFunction("SRGBToLinearGammaColorFilterNode",
-                    JsiSRGBToLinearGammaColorFilterNode::createCtor(context));
-    installFunction("LumaColorFilterNode",
-                    JsiLumaColorFilterNode::createCtor(context));
-    installFunction("LerpColorFilterNode",
-                    JsiLerpColorFilterNode::createCtor(context));
-
-    // Shaders
-    installFunction("ShaderNode", JsiShaderNode::createCtor(context));
-    installFunction("ImageShaderNode", JsiImageShaderNode::createCtor(context));
-    installFunction("ColorShaderNode", JsiColorShaderNode::createCtor(context));
-    installFunction("TurbulenceNode", JsiTurbulenceNode::createCtor(context));
-    installFunction("FractalNoiseNode",
-                    JsiFractalNoiseNode::createCtor(context));
-    installFunction("LinearGradientNode",
-                    JsiLinearGradientNode::createCtor(context));
-    installFunction("RadialGradientNode",
-                    JsiRadialGradientNode::createCtor(context));
-    installFunction("SweepGradientNode",
-                    JsiSweepGradientNode::createCtor(context));
-    installFunction("TwoPointConicalGradientNode",
-                    JsiTwoPointConicalGradientNode::createCtor(context));
-
-    installFunction("BackdropFilterNode",
-                    JsiBackdropFilterNode::createCtor(context));
-    installFunction("BlendNode", JsiBlendNode::createCtor(context));
-    installFunction("BoxNode", JsiBoxNode::createCtor(context));
-    installFunction("BoxShadowNode", JsiBoxShadowNode::createCtor(context));
-
-    installFunction("GlyphsNode", JsiGlyphsNode::createCtor(context));
-    installFunction("TextNode", JsiTextNode::createCtor(context));
-    installFunction("TextPathNode", JsiTextPathNode::createCtor(context));
-    installFunction("TextBlobNode", JsiTextBlobNode::createCtor(context));
-
-    installFunction("LayerNode", JsiLayerNode::createCtor(context));
-
-    // Paragraph node
-    installFunction("ParagraphNode", JsiParagraphNode::createCtor(context));
-  }
-};
-
-} // namespace RNSkia

package/cpp/rnskia/dom/base/BaseNodeProp.h

@@ -1,72 +0,0 @@
-#pragma once
-
-#include "DrawingContext.h"
-#include "JsiValue.h"
-
-#include <string>
-
-namespace RNSkia {
-
-class NodeProp;
-
-using namespace RNJsi; // NOLINT
-
-using ReadPropFunc =
-    std::function<jsi::Value(jsi::Runtime &, PropId, NodeProp *prop)>;
-
-/**
- Base class for Dom Node Properties
- */
-class BaseNodeProp {
-public:
-  virtual ~BaseNodeProp() {}
-
-  /**
-   Use to check if the value represented by this property has a usable
-   (non-null/undefined) value or not.
-   */
-  virtual bool isSet() = 0;
-
-  /**
-   True if the property has changed since we last visited it
-   */
-  virtual bool isChanged() = 0;
-
-  /**
-   Updates any pending values that has happened from other threads, sets flags
-   for changed.
-   */
-  virtual void updatePendingChanges() = 0;
-
-  /*
-   Marks property flags for changed as resolved
-   */
-  virtual void markAsResolved() = 0;
-
-  /**
-   Override to read the value represented by this property from the Javascript
-   property object
-   */
-  virtual void readValueFromJs(jsi::Runtime &runtime,
-                               const ReadPropFunc &read) = 0;
-
-  /**
-   Returns the name (or names) in a property
-   */
-  virtual std::string getName() = 0;
-
-  /**
-   Sets the property as required
-   */
-  void require() { _isRequired = true; }
-
-  /**
-   Returns true for required props
-   */
-  bool isRequired() { return _isRequired; }
-
-private:
-  bool _isRequired = false;
-};
-
-} // namespace RNSkia

package/cpp/rnskia/dom/base/ConcatablePaint.cpp

@@ -1,117 +0,0 @@
-#include "ConcatablePaint.h"
-
-#include "DeclarationContext.h"
-#include "JsiDomNode.h"
-#include "PaintProps.h"
-
-namespace RNSkia {
-
-ConcatablePaint::ConcatablePaint(
-    DeclarationContext *declarationContext, PaintProps *paintProps,
-    const std::vector<std::shared_ptr<JsiDomNode>> &children)
-    : _declarationContext(declarationContext), _paintProps(paintProps),
-      _children(children) {
-
-  auto hasPropertyValues = _paintProps->getColor()->isSet() ||
-                           _paintProps->getStrokeWidth()->isSet() ||
-                           _paintProps->getBlendMode()->isSet() ||
-                           _paintProps->getStyle()->isSet() ||
-                           _paintProps->getStrokeJoin()->isSet() ||
-                           _paintProps->getStrokeCap()->isSet() ||
-                           _paintProps->getStrokeMiter()->isSet() ||
-                           _paintProps->getOpacity()->isSet() ||
-                           _paintProps->getAntiAlias()->isSet();
-
-  _declarationContext->save();
-
-  for (auto &child : _children) {
-    child->decorateContext(_declarationContext);
-  }
-
-  _imageFilter = declarationContext->getImageFilters()->popAsOne();
-  _colorFilter = declarationContext->getColorFilters()->popAsOne();
-  _shader = declarationContext->getShaders()->pop();
-  _maskFilter = declarationContext->getMaskFilters()->pop();
-  _pathEffect = declarationContext->getPathEffects()->popAsOne();
-
-  _declarationContext->restore();
-
-  _isEmpty = !hasPropertyValues && _imageFilter == nullptr &&
-             _colorFilter == nullptr && _shader == nullptr &&
-             _maskFilter == nullptr && _pathEffect == nullptr;
-}
-
-bool ConcatablePaint::isEmpty() { return _isEmpty; }
-
-void ConcatablePaint::concatTo(std::shared_ptr<SkPaint> paint) {
-
-  if (_paintProps->getOpacity()->isSet()) {
-    paint->setAlphaf(paint->getAlphaf() *
-                     _paintProps->getOpacity()->value().getAsNumber());
-  }
-
-  if (_paintProps->getColor()->isSet()) {
-    auto currentOpacity = paint->getAlphaf();
-    paint->setShader(nullptr);
-    paint->setColor(*_paintProps->getColor()->getDerivedValue());
-    paint->setAlphaf(paint->getAlphaf() * currentOpacity);
-  }
-
-  if (_paintProps->getStrokeWidth()->isSet()) {
-    paint->setStrokeWidth(_paintProps->getStrokeWidth()->value().getAsNumber());
-  }
-
-  if (_paintProps->getBlendMode()->isSet()) {
-    paint->setBlendMode(*_paintProps->getBlendMode()->getDerivedValue());
-  }
-
-  if (_paintProps->getStyle()->isSet()) {
-    auto styleValue = _paintProps->getStyle()->value().getAsString();
-    if (styleValue == "stroke") {
-      paint->setStyle(SkPaint::Style::kStroke_Style);
-    } else if (styleValue == "fill") {
-      paint->setStyle(SkPaint::Style::kFill_Style);
-    } else {
-      throw std::runtime_error(styleValue +
-                               " is not a valud value for the style property.");
-    }
-  }
-
-  if (_paintProps->getStrokeJoin()->isSet()) {
-    paint->setStrokeJoin(*_paintProps->getStrokeJoin()->getDerivedValue());
-  }
-
-  if (_paintProps->getStrokeCap()->isSet()) {
-    paint->setStrokeCap(*_paintProps->getStrokeCap()->getDerivedValue());
-  }
-
-  if (_paintProps->getStrokeMiter()->isSet()) {
-    paint->setStrokeMiter(_paintProps->getStrokeMiter()->value().getAsNumber());
-  }
-
-  if (_paintProps->getAntiAlias()->isSet()) {
-    paint->setAntiAlias(_paintProps->getAntiAlias()->value().getAsBool());
-  }
-
-  if (_imageFilter) {
-    paint->setImageFilter(_imageFilter);
-  }
-
-  if (_colorFilter) {
-    paint->setColorFilter(_colorFilter);
-  }
-
-  if (_shader) {
-    paint->setShader(_shader);
-  }
-
-  if (_maskFilter) {
-    paint->setMaskFilter(_maskFilter);
-  }
-
-  if (_pathEffect) {
-    paint->setPathEffect(_pathEffect);
-  }
-}
-
-} // namespace RNSkia