Merge pull request #2062 from Shopify/remove-skia-values

Deprecate Skia Value API

Author: wcandillon

docs/docs/animations/reanimated2.md

@@ -21,7 +21,7 @@ In the example below, the animation runs on the JS thread due to the use of Rean
 
 ```tsx twoslash
 import {useEffect} from "react";
-import {Canvas, Rect, mix, useValue} from "@shopify/react-native-skia";
+import {Canvas, Rect, mix} from "@shopify/react-native-skia";
 import {useSharedValue, withRepeat, withTiming, useDerivedValue} from "react-native-reanimated";
 
 const MyComponent = () => {

package/cpp/rnskia/RNSkAnimation.h

@@ -10,7 +10,6 @@
 #include "JsiHostObject.h"
 #include "JsiValueWrapper.h"
 #include "RNSkPlatformContext.h"
-#include "RNSkValue.h"
 #include "RNSkView.h"
 #include <jsi/jsi.h>
 
@@ -178,59 +177,8 @@ class RNSkJsiViewApi : public RNJsi::JsiHostObject,
     return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(registerValuesInView) {
-    // Check params
-    if (!arguments[1].isObject() ||
-        !arguments[1].asObject(runtime).isArray(runtime)) {
-      throw jsi::JSError(runtime,
-                         "Expected array of Values as second parameter");
-      return jsi::Value::undefined();
-    }
-
-    // Get identifier of native SkiaView
-    int nativeId = arguments[0].asNumber();
-
-    // Get values that should be added as dependencies
-    auto values = arguments[1].asObject(runtime).asArray(runtime);
-    std::vector<std::function<void()>> unsubscribers;
-    const std::size_t size = values.size(runtime);
-    unsubscribers.reserve(size);
-    for (size_t i = 0; i < size; ++i) {
-      auto value = values.getValueAtIndex(runtime, i)
-                       .asObject(runtime)
-                       .asHostObject<RNSkReadonlyValue>(runtime);
-
-      if (value != nullptr) {
-        // Add change listener
-        unsubscribers.push_back(value->addListener(
-            [weakSelf = weak_from_this(), nativeId](jsi::Runtime &) {
-              auto self = weakSelf.lock();
-              if (self) {
-                auto info = self->getEnsuredViewInfo(nativeId);
-                if (info->view != nullptr) {
-                  info->view->requestRedraw();
-                }
-              }
-            }));
-      }
-    }
-
-    // Return unsubscribe method that unsubscribes to all values
-    // that we subscribed to.
-    return jsi::Function::createFromHostFunction(
-        runtime, jsi::PropNameID::forUtf8(runtime, "unsubscribe"), 0,
-        JSI_HOST_FUNCTION_LAMBDA {
-          // decrease dependency count on the Skia View
-          for (auto &unsub : unsubscribers) {
-            unsub();
-          }
-          return jsi::Value::undefined();
-        });
-  }
-
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(RNSkJsiViewApi, setJsiProperty),
                        JSI_EXPORT_FUNC(RNSkJsiViewApi, callJsiMethod),
-                       JSI_EXPORT_FUNC(RNSkJsiViewApi, registerValuesInView),
                        JSI_EXPORT_FUNC(RNSkJsiViewApi, requestRedraw),
                        JSI_EXPORT_FUNC(RNSkJsiViewApi, makeImageSnapshot))
 

package/cpp/rnskia/RNSkJsiViewApi.h

@@ -7,7 +7,6 @@
 
 #include <JsiSkApi.h>
 #include <RNSkJsiViewApi.h>
-#include <RNSkValueApi.h>
 #include <RNSkView.h>
 
 #include <JsiDomApi.h>
@@ -80,11 +79,6 @@ void RNSkManager::installBindings() {
       *_jsRuntime, "SkiaViewApi",
       jsi::Object::createFromHostObject(*_jsRuntime, _viewApi));
 
-  auto skiaValueApi = std::make_shared<RNSkValueApi>(_platformContext);
-  _jsRuntime->global().setProperty(
-      *_jsRuntime, "SkiaValueApi",
-      jsi::Object::createFromHostObject(*_jsRuntime, std::move(skiaValueApi)));
-
   auto skiaDomApi = std::make_shared<JsiDomApi>(_platformContext);
   _jsRuntime->global().setProperty(
       *_jsRuntime, "SkiaDomApi",

package/cpp/rnskia/RNSkManager.cpp

@@ -8,7 +8,6 @@
 
 #include "JsiValueWrapper.h"
 #include "RNSkPlatformContext.h"
-#include "RNSkValue.h"
 
 #include "JsiSkImage.h"
 #include "JsiSkPoint.h"
@@ -163,51 +162,15 @@ class RNSkView : public std::enable_shared_from_this<RNSkView> {
   /**
    Destructor
    */
-  virtual ~RNSkView() {
-    endDrawingLoop();
-    if (_onSizeUnsubscribe != nullptr) {
-      _onSizeUnsubscribe();
-      _onSizeUnsubscribe = nullptr;
-    }
-  }
+  virtual ~RNSkView() { endDrawingLoop(); }
 
   /**
    Sets custom properties. Custom properties are properties that are set
    directly from Javascript without having to go through the async bridge.
    */
   virtual void setJsiProperties(
       std::unordered_map<std::string, RNJsi::JsiValueWrapper> &props) {
-
-    for (auto &prop : props) {
-      if (prop.first == "onSize") {
-        // Start by removing any subscribers to the current onSize
-        if (_onSizeUnsubscribe != nullptr) {
-          _onSizeUnsubscribe();
-          _onSizeUnsubscribe = nullptr;
-        }
-        if (prop.second.isUndefinedOrNull()) {
-          // Clear touchCallback
-          _onSize = nullptr;
-        } else if (prop.second.getType() !=
-                   RNJsi::JsiWrapperValueType::HostObject) {
-          // We expect a function for the draw callback custom property
-          throw std::runtime_error(
-              "Expected a Skia mutable value for the onSize property.");
-        }
-        // Save onSize
-        _onSize =
-            std::dynamic_pointer_cast<RNSkValue>(prop.second.getAsHostObject());
-
-        // Add listener
-        _onSizeUnsubscribe =
-            _onSize->addListener([weakSelf = weak_from_this()](jsi::Runtime &) {
-              auto self = weakSelf.lock();
-              if (self) {
-                self->requestRedraw();
-              }
-            });
-      }
-    }
+    // Nothing here...
   }
 
   /**
@@ -326,53 +289,6 @@ class RNSkView : public std::enable_shared_from_this<RNSkView> {
         });
   }
 
-  void updateOnSize() {
-    if (_onSize != nullptr) {
-      auto width = _canvasProvider->getScaledWidth() /
-                   _platformContext->getPixelDensity();
-      auto height = _canvasProvider->getScaledHeight() /
-                    _platformContext->getPixelDensity();
-
-      _platformContext->runOnJavascriptThread(
-          [width, height, weakSelf = weak_from_this()]() {
-            auto self = weakSelf.lock();
-            if (self) {
-              auto runtime = self->_platformContext->getJsRuntime();
-              auto onSize = self->_onSize->getCurrent(*runtime);
-              if (!onSize.isObject()) {
-                throw jsi::JSError(
-                    *runtime,
-                    "Expected onSize property to be a mutable Skia value.");
-                return;
-              }
-              auto onSizeObj = onSize.asObject(*runtime);
-
-              auto wVal = onSizeObj.getProperty(*runtime, "width");
-              auto hVal = onSizeObj.getProperty(*runtime, "height");
-
-              if (!wVal.isNumber() || !hVal.isNumber()) {
-                throw jsi::JSError(*runtime,
-                                   "Expected onSize property to be a mutable "
-                                   "Skia value of type SkSize.");
-                return;
-              }
-
-              auto w = wVal.asNumber();
-              auto h = hVal.asNumber();
-
-              if (w != width || h != height) {
-                // Update
-                auto newValue = jsi::Object(*runtime);
-                newValue.setProperty(*runtime, "width", width);
-                newValue.setProperty(*runtime, "height", height);
-                self->_onSize->set_current(*runtime,
-                                           jsi::Value(*runtime, newValue));
-              }
-            }
-          });
-    }
-  }
-
   /**
     Draw loop callback
    */
@@ -381,9 +297,6 @@ class RNSkView : public std::enable_shared_from_this<RNSkView> {
         _drawingMode == RNSkDrawingMode::Continuous) {
       _redrawRequestCounter = 0;
 
-      // Update size if needed
-      updateOnSize();
-
       if (!_renderer->tryRender(_canvasProvider)) {
         // The renderer could not render cause it was busy, just schedule
         // redrawing on the next frame.
@@ -396,8 +309,6 @@ class RNSkView : public std::enable_shared_from_this<RNSkView> {
   std::shared_ptr<RNSkCanvasProvider> _canvasProvider;
   std::shared_ptr<RNSkRenderer> _renderer;
 
-  std::shared_ptr<RNSkValue> _onSize;
-  std::function<void()> _onSizeUnsubscribe;
   RNSkDrawingMode _drawingMode = RNSkDrawingMode::Default;
   size_t _nativeId;
 

package/cpp/rnskia/RNSkValueApi.h

@@ -8,8 +8,6 @@
 
 #include "JsiHostObject.h"
 
-#include "base/JsiDependencyManager.h"
-
 #include "nodes/JsiCircleNode.h"
 #include "nodes/JsiDiffRectNode.h"
 #include "nodes/JsiFillNode.h"
@@ -56,8 +54,6 @@ class JsiDomApi : public JsiHostObject {
 public:
   explicit JsiDomApi(std::shared_ptr<RNSkPlatformContext> context)
       : JsiHostObject() {
-    installFunction("DependencyManager",
-                    JsiDependencyManager::createCtor(context));
 
     // Shapes
     installFunction("RectNode", JsiRectNode::createCtor(context));