basalt-appkit 0.1.0 → 0.2.0

package/native/appkit/AppKitMountingManager.mm

@@ -17,7 +17,10 @@
 #include "Gradients.h"
 #include "ExpoImageComponent.h"
 #include "ImageProgress.h"
-#ifdef BASALT_HAS_SKIA
+// Either Skia: the 2.x peer in this package or the 3.x one in basalt-skia,
+// which share this header's two functions and are never both linked. See
+// AppKitSkiaPeer.h.
+#if defined(BASALT_HAS_SKIA) || BASALT_HAS_SKIA_GRAPHITE
 #include "AppKitSkiaPeer.h"
 #endif
 #include "UIManagerAccess.h"
@@ -395,7 +398,7 @@ void AppKitMountingManager::forgetTag(Tag tag) {
   textInputs_.remove(tag);
   imageUris_.erase(tag);
   switchValues_.erase(tag);
-#ifdef BASALT_HAS_SKIA
+#if defined(BASALT_HAS_SKIA) || BASALT_HAS_SKIA_GRAPHITE
   // Unregisters the canvas and takes its layer off the view. This is the one
   // moment a view is known to be finished with, which matters more here than
   // elsewhere: a canvas left registered keeps a Metal layer and a GPU surface
@@ -663,7 +666,7 @@ void AppKitMountingManager::updateView(RnAppKitView *view, const ShadowView &sha
   // needed the same swap for the same reason.
   applyTextInput(view, shadowView);
   applyAccessibility(view, shadowView);
-#ifdef BASALT_HAS_SKIA
+#if defined(BASALT_HAS_SKIA) || BASALT_HAS_SKIA_GRAPHITE
   // After applyProps, which is what puts nativeID on the view -- a canvas
   // registers itself by that id and cannot be attached before it is there. And
   // before applyLayoutMetrics only incidentally: the size it reads comes from the

package/native/appkit/AppKitSkiaPeer.h

@@ -1,5 +1,20 @@
 // The AppKit half of a `<Canvas>`: a Metal layer inside an ordinary view.
 //
+// **Two implementations, one at a time.** This header is the contract; which
+// file defines it depends on which Skia the app installed. 2.x is Ganesh over
+// Metal and its half is `AppKitSkiaPeer.mm` beside this, compiled when
+// `BASALT_HAS_SKIA` says core's cmake/Skia.cmake built the Ganesh sources. 3.x
+// is Graphite over Dawn and its half is
+// `basalt-skia/native/appkit/BasaltSkiaCanvasAppKit.mm`, compiled when
+// `BASALT_HAS_SKIA_GRAPHITE` says that package found Dawn. The two cannot both
+// be true -- Skia.cmake refuses a 3.x install by version -- so exactly one
+// definition of each function below is linked, and the mounting manager calls
+// them under a guard that covers either.
+//
+// They differ in the component they answer to as well, which is 3.x's rename:
+// a 2.x `<Canvas>` mounts a `SkiaPictureView` and a 3.x one a `SkiaView`. Both
+// descriptors are registered on all three hosts.
+//
 // The package's SkiaUIView is an RCTViewComponentView that does three things --
 // creates a drawing view, adds its layer as a sublayer of its own, and registers
 // it with RNSkManager under the nativeId. None of the three needs React Native;

package/native/appkit/ComponentRegistryAppKit.mm

@@ -24,6 +24,7 @@
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
 #include "SkiaPictureViewComponent.h"
+#include "SkiaViewComponent.h"
 #include <react/renderer/components/FBReactNativeSpec/ComponentDescriptors.h>
 #include <react/renderer/components/image/ImageComponentDescriptor.h>
 #include <react/renderer/components/iostextinput/TextInputComponentDescriptor.h>
@@ -81,11 +82,15 @@ ComponentRegistryFactory getDefaultComponentRegistryFactory() {
       // through a TextLayoutManager, which here is the Core Text one.
       // Android's needs fbjni. Its component name is "TextInput".
       registry->add(concreteComponentDescriptorProvider<TextInputComponentDescriptor>());
-      // @shopify/react-native-skia's <Canvas>. Registered whether or not the
-      // build has Skia in it, for the reason the Expo one below gives: it costs
-      // a name in a registry. Without Skia the view mounts and stays empty, and
+      // React Native Skia's <Canvas>, under both of its names: 2.x mounts a
+      // "SkiaPictureView" and 3.x a "SkiaView", and which one an app mounts is
+      // decided by the Skia it installed, which a host binary cannot know
+      // until the app's JavaScript runs. Registered whether or not the build
+      // has Skia in it, for the reason the Expo one below gives: it costs a
+      // name in a registry. Without Skia the view mounts and stays empty, and
       // an app that draws has already failed at getEnforcing('RNSkiaModule').
       registry->add(concreteComponentDescriptorProvider<SkiaPictureViewComponentDescriptor>());
+      registry->add(concreteComponentDescriptorProvider<SkiaViewComponentDescriptor>());
       // expo-image's view. Registered whether or not the build has Expo in it:
       // the descriptor is ordinary Fabric C++, and an app that never renders
       // one pays a registry entry. See core/ExpoImageComponent.h.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "basalt-appkit",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "The macOS view layer for basalt-core: an AppKit view layer, a Fabric mounting manager, and a host. Everything behind them is in basalt-core.",
   "license": "MIT",
   "repository": {
@@ -22,6 +22,6 @@
     "react-native": "*"
   },
   "dependencies": {
-    "basalt-core": "0.1.0"
+    "basalt-core": "0.2.0"
   }
 }