@shopify/react-native-skia 0.1.228 → 0.1.230

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

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

package/cpp/rnskia/RNSkAnimation.h

@@ -1,65 +0,0 @@
-#pragma once
-
-#include <array>
-#include <memory>
-
-#include "JsiHostObject.h"
-#include "RNSkClockValue.h"
-#include "RNSkPlatformContext.h"
-#include <jsi/jsi.h>
-
-namespace RNSkia {
-namespace jsi = facebook::jsi;
-
-/**
- Implements an animation that can be used to drive other values
- */
-class RNSkAnimation : public RNSkClockValue {
-
-public:
-  RNSkAnimation(std::shared_ptr<RNSkPlatformContext> platformContext,
-                size_t identifier, jsi::Runtime &runtime,
-                const jsi::Value *arguments, size_t count)
-      : RNSkClockValue(platformContext, identifier, runtime, arguments, count) {
-    // Save the update function
-    _updateFunction = std::make_shared<jsi::Function>(
-        arguments[0].asObject(runtime).asFunction(runtime));
-
-    // Set state to undefined initially.
-    _args[1] = jsi::Value::undefined();
-  }
-
-  JSI_HOST_FUNCTION(cancel) {
-    stopClock();
-    return jsi::Value::undefined();
-  }
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(RNSkAnimation, cancel))
-
-protected:
-  void tick(jsi::Runtime &runtime, const jsi::Value &value) override {
-    // Set up arguments and call the update function
-    _args[0] = value.asNumber();
-    _args[1] = _updateFunction->call(
-        runtime, static_cast<const jsi::Value *>(_args.data()), _args.size());
-
-    // Get finished
-    auto finished =
-        _args[1].asObject(runtime).getProperty(runtime, "finished").getBool();
-    if (finished) {
-      stopClock();
-    }
-
-    // Get the next value
-    auto nextValue =
-        _args[1].asObject(runtime).getProperty(runtime, "current").asNumber();
-
-    // Update self
-    update(runtime, nextValue);
-  }
-
-private:
-  std::shared_ptr<jsi::Function> _updateFunction;
-  std::array<jsi::Value, 2> _args;
-};
-} // namespace RNSkia

package/cpp/rnskia/RNSkValueApi.h

@@ -1,72 +0,0 @@
-#pragma once
-
-#include <memory>
-
-#include "JsiHostObject.h"
-#include "RNSkAnimation.h"
-#include "RNSkComputedValue.h"
-#include "RNSkPlatformContext.h"
-#include "RNSkValue.h"
-#include <jsi/jsi.h>
-
-namespace RNSkia {
-
-namespace jsi = facebook::jsi;
-
-class RNSkValueApi : public RNJsi::JsiHostObject {
-public:
-  /**
-   * Constructor
-   * @param platformContext Platform context
-   */
-  explicit RNSkValueApi(std::shared_ptr<RNSkPlatformContext> platformContext)
-      : JsiHostObject(), _platformContext(platformContext) {
-    _valueIdentifier = 50000;
-  }
-
-  /**
-   * Destructor
-   */
-  ~RNSkValueApi() {}
-
-  JSI_HOST_FUNCTION(createValue) {
-    return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<RNSkValue>(_platformContext, runtime,
-                                             arguments, count));
-  }
-
-  JSI_HOST_FUNCTION(createComputedValue) {
-    // Creation and initialization is done in two steps to be able to use weak
-    // references when setting up dependencies - since weak_from_this needs our
-    // instance to be a shared_ptr before calling weak_from_this().
-    auto computedValue = std::make_shared<RNSkComputedValue>(
-        _platformContext, runtime, arguments, count);
-    computedValue->initializeDependencies(runtime, arguments, count);
-    return jsi::Object::createFromHostObject(runtime, computedValue);
-  }
-
-  JSI_HOST_FUNCTION(createAnimation) {
-    return jsi::Object::createFromHostObject(
-        runtime,
-        std::make_shared<RNSkAnimation>(_platformContext, ++_valueIdentifier,
-                                        runtime, arguments, count));
-  }
-
-  JSI_HOST_FUNCTION(createClockValue) {
-    return jsi::Object::createFromHostObject(
-        runtime,
-        std::make_shared<RNSkClockValue>(_platformContext, ++_valueIdentifier,
-                                         runtime, arguments, count));
-  }
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(RNSkValueApi, createValue),
-                       JSI_EXPORT_FUNC(RNSkValueApi, createComputedValue),
-                       JSI_EXPORT_FUNC(RNSkValueApi, createClockValue),
-                       JSI_EXPORT_FUNC(RNSkValueApi, createAnimation))
-
-private:
-  // Platform context
-  std::shared_ptr<RNSkPlatformContext> _platformContext;
-  std::atomic<long> _valueIdentifier;
-};
-} // namespace RNSkia

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

@@ -1,297 +0,0 @@
-#pragma once
-
-#include "JsiHostObject.h"
-
-#include "RNSkPlatformContext.h"
-
-#include "JsiDomNode.h"
-
-#include <map>
-#include <memory>
-#include <set>
-#include <string>
-#include <utility>
-#include <vector>
-
-namespace RNSkia {
-
-static PropId PropNameSelector = JsiPropId::get("selector");
-static PropId PropNameValue = JsiPropId::get("value");
-
-class JsiDependencyManager
-    : public JsiHostObject,
-      public std::enable_shared_from_this<JsiDependencyManager> {
-public:
-  JsiDependencyManager(std::shared_ptr<RNSkPlatformContext> context,
-                       jsi::Runtime &runtime,
-                       const jsi::Value &registerValuesCallback)
-      : _registerValuesCallback(std::make_shared<jsi::Object>(
-            registerValuesCallback.asObject(runtime))),
-        JsiHostObject() {}
-
-  ~JsiDependencyManager() { unsubscribeAll(); }
-
-  /**
-   Call to unsubscribe all value listeners from the given node based on the
-   current list of subscriptions for the node. This function is typically called
-   when the node is unmounted or when one or more properties have changed. NOTE:
-   In this implementation we call unsubscribe directly without going through the
-   JSI method - but the method is kept for compatibility with the JS
-   implementation
-   */
-  JSI_HOST_FUNCTION(unsubscribeNode) {
-    // (node: Node<unknown>)
-    auto node =
-        getArgumentAsHostObject<JsiDomNode>(runtime, arguments, count, 0);
-    unsubscribeNode(node.get());
-    return jsi::Value::undefined();
-  }
-
-  /**
-   Adds listeners to the provided values so that the node is notified when a
-   value changes.
-   */
-  JSI_HOST_FUNCTION(subscribeNode) {
-    // subscribeNode<P>(node: Node<unknown>, props: AnimatedProps<P>)
-    auto node =
-        getArgumentAsHostObject<JsiDomNode>(runtime, arguments, count, 0);
-    auto nextProps = getArgumentAsObject(runtime, arguments, count, 1);
-
-    // Save unsubscribe callbacks
-    std::vector<
-        std::pair<std::shared_ptr<RNSkReadonlyValue>, std::function<void()>>>
-        unsubscribers;
-
-    // Enumerate registered keys for the given node to only handle known
-    // properties
-    node->getPropsContainer()->enumerateMappedProps(
-        [&](const PropId key, const std::vector<NodeProp *> &propMapping) {
-          auto jsValue = nextProps.getProperty(runtime, key);
-          JsiValue nativeValue(runtime, jsValue);
-
-          if (isAnimatedValue(nativeValue)) {
-            // Handle Skia Animation Values
-            auto animatedValue = getAnimatedValue(nativeValue);
-            auto unsubscribe = animatedValue->addListener(
-                [animatedValue, propMapping](jsi::Runtime &runtime) {
-                  // Get value from animation value
-                  auto nextJsValue = animatedValue->getCurrent(runtime);
-                  // Update all props that listens to this animation value
-                  for (auto &prop : propMapping) {
-                    prop->updateValue(runtime, nextJsValue);
-                  }
-                });
-
-            // Save unsubscribe methods
-            unsubscribers.push_back(std::make_pair(animatedValue, unsubscribe));
-
-          } else if (isSelector(nativeValue)) {
-            // Handle Skia Animation Value Selectors
-            auto animatedValue = std::dynamic_pointer_cast<RNSkReadonlyValue>(
-                nativeValue.getValue(PropNameValue).getAsHostObject());
-
-            auto selector =
-                nativeValue.getValue(PropNameSelector).getAsFunction();
-            // Add subscription to animated value in selector
-            auto unsubscribe = animatedValue->addListener(
-                [nativeValue, propMapping, selector = std::move(selector),
-                 animatedValue](jsi::Runtime &runtime) {
-                  // Get value from animation value
-                  jsi::Value jsValue = animatedValue->getCurrent(runtime);
-                  // Call selector to transform new value
-                  auto selectedJsValue =
-                      selector(runtime, jsi::Value::null(), &jsValue, 1);
-                  // Update all props that listens to this animation value
-                  for (auto &prop : propMapping) {
-                    prop->updateValue(runtime, selectedJsValue);
-                  }
-                });
-
-            // Save unsubscribe methods
-            unsubscribers.push_back(std::make_pair(animatedValue, unsubscribe));
-          }
-        });
-
-    // Now let's store the subscription info
-    _subscriptions.emplace(node.get(), unsubscribers);
-
-    // Set callback for unsubscribing
-    node->setDisposeCallback([node, weakSelf = weak_from_this()]() {
-      auto self = weakSelf.lock();
-      if (self) {
-        self->unsubscribeNode(node.get());
-      }
-    });
-
-    return jsi::Value::undefined();
-  }
-
-  /**
-   Called when the hosting container is mounted or updated. This ensures that we
-   have a ref to the underlying SkiaView so that we can registers redraw
-   listeners on values used in the current View automatically.
-   */
-  JSI_HOST_FUNCTION(update) {
-    if (_unregisterValues != nullptr) {
-      // unregisterValues is a pointer to unsubscribing to the automatic
-      // re-render when a value change
-      _unregisterValues->asFunction(runtime).call(runtime,
-                                                  jsi::Value::undefined(), 0);
-      _unregisterValues = nullptr;
-    }
-
-    // Now let's create connection between view and unique values
-    std::set<std::shared_ptr<RNSkReadonlyValue>> uniqueValues;
-
-    for (auto &nodeSub : _subscriptions) {
-      for (auto &sub : nodeSub.second) {
-        if (uniqueValues.count(sub.first) == 0) {
-          uniqueValues.emplace(sub.first);
-        }
-      }
-    }
-
-    // Copy to args
-    auto array = jsi::Array(runtime, uniqueValues.size());
-    size_t i = 0;
-    for (auto &el : uniqueValues) {
-      array.setValueAtIndex(runtime, i++,
-                            jsi::Object::createFromHostObject(runtime, el));
-    }
-
-    // Call JS registerValues callback
-    auto func = _registerValuesCallback->asFunction(runtime);
-    _unregisterValues = std::make_shared<jsi::Object>(
-        func.call(runtime, array, 1).asObject(runtime));
-
-    return jsi::Value::undefined();
-  }
-
-  /**
-   Called when the hosting container is unmounted or recreated. This ensures
-   that we remove all subscriptions to Skia values so that we don't have any
-   listeners left after the component is removed.
-
-    * Called when the hosting container is unmounted or recreated. This ensures
-   that we remove
-    * all subscriptions to Skia values so that we don't have any listeners left
-   after
-    * the component is removed.
-  */
-  JSI_HOST_FUNCTION(remove) {
-    if (_unregisterValues != nullptr) {
-      // unregisterValues is a pointer to unsubscribing to the automatic
-      // re-render when a value change
-      _unregisterValues->asFunction(runtime).call(runtime,
-                                                  jsi::Value::undefined(), 0);
-      _unregisterValues = nullptr;
-    }
-
-    unsubscribeAll();
-
-    _registerValuesCallback = nullptr;
-
-    return jsi::Value::undefined();
-  }
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiDependencyManager, unsubscribeNode),
-                       JSI_EXPORT_FUNC(JsiDependencyManager, subscribeNode),
-                       JSI_EXPORT_FUNC(JsiDependencyManager, update),
-                       JSI_EXPORT_FUNC(JsiDependencyManager, remove))
-
-  /**
-   Constructor to add to the Api object
-   */
-  static const jsi::HostFunctionType
-  createCtor(std::shared_ptr<RNSkPlatformContext> context) {
-    return JSI_HOST_FUNCTION_LAMBDA {
-      // Params: registerValues: (values: Array<SkiaValue<unknown>>) => () =>
-      // void
-      auto obj = std::make_shared<JsiDependencyManager>(context, runtime,
-                                                        arguments[0]);
-
-      return jsi::Object::createFromHostObject(runtime, std::move(obj));
-    };
-  }
-
-private:
-  /**
-   Removes all subscriptions
-   */
-  void unsubscribeAll() {
-    // Unregister all nodes
-    std::vector<JsiDomNode *> tmp;
-    tmp.reserve(_subscriptions.size());
-    for (auto &subInfo : _subscriptions) {
-      tmp.push_back(subInfo.first);
-    }
-    for (auto &node : tmp) {
-      unsubscribeNode(node);
-    }
-
-    // Clear all subscriptions
-    _subscriptions.clear();
-  }
-
-  /**
-   Unsubscribes from a given node
-   */
-  void unsubscribeNode(JsiDomNode *node) {
-    if (_subscriptions.count(node) > 0) {
-      auto subscriptions = _subscriptions.at(node);
-      for (auto &p : subscriptions) {
-        p.second();
-      }
-
-      // Remove node's subscriptions
-      _subscriptions.erase(node);
-
-      // Remove node's callback to avoid keeping
-      // cyclic dependencies between dep manager and the node
-      node->setDisposeCallback(nullptr);
-    }
-  }
-  /**
-   Returns true if the given value is a HostObject and it inherits from
-   RNSkReadonlyValue.
-   */
-  bool isAnimatedValue(JsiValue &value) {
-    return value.getType() == PropType::HostObject &&
-           std::dynamic_pointer_cast<RNSkReadonlyValue>(
-               value.getAsHostObject()) != nullptr;
-  }
-
-  /**
-   Returns the RNSkReadonlyValue pointer for a value that is an Animated value
-   */
-  std::shared_ptr<RNSkReadonlyValue> getAnimatedValue(JsiValue &value) {
-    return std::dynamic_pointer_cast<RNSkReadonlyValue>(
-        value.getAsHostObject());
-  }
-
-  /**
-   Returns true if the value is a selector. A Selector is a JS object that has
-   two properties, the selector and the the value. The selector is a function
-   that is used to transform the value - which is an animated skia value.
-   */
-  bool isSelector(JsiValue &value) {
-    // Handling selectors is rather easy, we just add
-    // a listener on the selector's callback and then we'll do the javascript
-    // resolving in the callback (which will always be on the Javascript
-    // thread)!
-    if (value.getType() == PropType::Object) {
-      if (value.hasValue(PropNameSelector) && value.hasValue(PropNameValue)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  std::shared_ptr<jsi::Object> _registerValuesCallback;
-  std::shared_ptr<jsi::Object> _unregisterValues;
-  std::map<JsiDomNode *,
-           std::vector<std::pair<std::shared_ptr<RNSkReadonlyValue>,
-                                 std::function<void()>>>>
-      _subscriptions;
-};
-} // namespace RNSkia

package/cpp/rnskia/dom/nodes/JsiCustomDrawingNode.h

@@ -1,127 +0,0 @@
-#pragma once
-
-#include "DrawingProp.h"
-#include "JsiDomDrawingNode.h"
-
-#include "JsiSkCanvas.h"
-#include "JsiSkPaint.h"
-
-#include <memory>
-#include <mutex>
-#include <utility>
-
-namespace RNSkia {
-
-class JsiCustomDrawingNode : public JsiDomDrawingNode,
-                             public JsiDomNodeCtor<JsiCustomDrawingNode> {
-public:
-  explicit JsiCustomDrawingNode(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiDomDrawingNode(context, "skCustomDrawing") {}
-
-protected:
-  void draw(DrawingContext *context) override {
-    if (_drawing != nullptr) {
-
-      // Only repaint the picture IF we did not get to the draw function
-      // from a redrawRequest after creating the picture!
-      if (!_inRedrawCycle || _drawingProp->isChanged()) {
-
-        float scaledWidth = context->getScaledWidth();
-        float scaledHeight = context->getScaledHeight();
-        auto paint = context->getPaint();
-        auto platformContext = getContext();
-        auto requestRedraw = context->getRequestRedraw();
-
-        // Create/set the paint/canvas wrappers
-        if (_jsiPaint == nullptr) {
-          _jsiPaint = std::make_shared<JsiSkPaint>(getContext(), *paint);
-        } else {
-          _jsiPaint->fromPaint(*paint);
-        }
-
-        if (_jsiCanvas == nullptr) {
-          _jsiCanvas = std::make_shared<JsiSkCanvas>(getContext());
-        }
-
-        // Run rendering on the javascript thread
-        getContext()->runOnJavascriptThread([this, platformContext,
-                                             requestRedraw, scaledWidth,
-                                             scaledHeight]() {
-          // Get the runtime
-          auto runtime = platformContext->getJsRuntime();
-
-          // Create the picture recorder
-          SkPictureRecorder recorder;
-          SkRTreeFactory factory;
-          SkCanvas *canvas =
-              recorder.beginRecording(scaledWidth, scaledHeight, &factory);
-
-          auto jsiCanvas =
-              std::make_shared<JsiSkCanvas>(platformContext, canvas);
-
-          // Create context wrapper
-          auto jsiCtx = jsi::Object(*runtime);
-          jsiCtx.setProperty(
-              *runtime, "paint",
-              jsi::Object::createFromHostObject(*runtime, this->_jsiPaint));
-
-          jsiCtx.setProperty(
-              *runtime, "canvas",
-              jsi::Object::createFromHostObject(*runtime, jsiCanvas));
-
-          std::array<jsi::Value, 1> args;
-          args[0] = std::move(jsiCtx);
-
-          // Draw
-          _drawing(*runtime, jsi::Value::undefined(),
-                   static_cast<const jsi::Value *>(args.data()), 1);
-
-          auto picture = recorder.finishRecordingAsPicture();
-          {
-            // Lock access to the picture property's setter
-            std::lock_guard<std::mutex> lock(_pictureLock);
-            this->_drawingProp->setPicture(picture);
-          }
-
-          // Ask view to redraw itself
-          _inRedrawCycle = true;
-          requestRedraw();
-        });
-      }
-    }
-
-    if (_drawingProp->isSet()) {
-      std::lock_guard<std::mutex> lock(_pictureLock);
-      context->getCanvas()->drawPicture(_drawingProp->getDerivedValue());
-      _inRedrawCycle = false;
-    }
-  }
-
-  void defineProperties(NodePropsContainer *container) override {
-    JsiDomDrawingNode::defineProperties(container);
-
-    NotifyNeedRenderCallback cb =
-        std::bind(&JsiCustomDrawingNode::notifyPictureNeeded, this,
-                  std::placeholders::_1);
-
-    _drawingProp = container->defineProperty<DrawingProp>("drawing", cb);
-  }
-
-private:
-  void notifyPictureNeeded(jsi::HostFunctionType drawing) {
-    _drawing = drawing;
-  }
-
-  jsi::HostFunctionType _drawing;
-
-  DrawingProp *_drawingProp;
-
-  std::array<jsi::Value, 1> _argsCache;
-  std::shared_ptr<JsiSkPaint> _jsiPaint;
-  std::shared_ptr<JsiSkCanvas> _jsiCanvas;
-
-  std::atomic<bool> _inRedrawCycle = {false};
-  std::mutex _pictureLock;
-};
-
-} // namespace RNSkia

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

@@ -1,35 +0,0 @@
-#pragma once
-
-#include "DerivedNodeProp.h"
-
-#include "JsiSkFont.h"
-
-#include <memory>
-
-namespace RNSkia {
-
-using NotifyNeedRenderCallback =
-    std::function<void(jsi::HostFunctionType drawing)>;
-
-class DrawingProp : public DerivedSkProp<SkPicture> {
-public:
-  DrawingProp(PropId name, NotifyNeedRenderCallback notifyPictureNeeded,
-              const std::function<void(BaseNodeProp *)> &onChange)
-      : _notifyPictureNeeded(notifyPictureNeeded), DerivedSkProp<SkPicture>(
-                                                       onChange) {
-    _drawingProp = defineProperty<NodeProp>(name);
-  }
-
-  void updateDerivedValue() override {
-    auto drawingFunc = _drawingProp->value().getAsFunction();
-    _notifyPictureNeeded(drawingFunc);
-  }
-
-  void setPicture(sk_sp<SkPicture> picture) { setDerivedValue(picture); }
-
-private:
-  NodeProp *_drawingProp;
-  NotifyNeedRenderCallback _notifyPictureNeeded;
-};
-
-} // namespace RNSkia