basalt-appkit 0.1.0 → 0.2.1

package/native/CMakeLists.txt

@@ -88,6 +88,13 @@ get_property(BASALT_PACKAGE_APPKIT_LINK_LIBRARIES GLOBAL PROPERTY BASALT_PACKAGE
 # with a platform half has nowhere else to be tested: it is compiled into the
 # host binary, so the host's suite is the only binary that has it.
 get_property(BASALT_PACKAGE_TESTS GLOBAL PROPERTY BASALT_PACKAGE_TESTS)
+# And the ones only this host can compile. A capability whose platform half is
+# Apple's -- basalt-skia, whose Skia archives and Dawn are Apple binaries --
+# has tests that are Objective-C++ or link those archives, and
+# BASALT_PACKAGE_TESTS goes to all three suites. The GTK suite took them and
+# failed on an `AppKitSkiaPeer.h` it has no path to, which is the cheap half of
+# what it would have failed on.
+get_property(BASALT_PACKAGE_APPKIT_TESTS GLOBAL PROPERTY BASALT_PACKAGE_APPKIT_TESTS)
 
 if(NOT APPLE)
   # Not an error. A checkout builds every package it finds, and on anything but
@@ -223,6 +230,34 @@ if(TARGET basalt_core)
   # has to provide is a link error rather than a discovery. It failed on exactly
   # those three symbols, which is the probe doing its job: this is a host's
   # dependency, not a portable one.
+  # What capability packages contributed for this host, compiled into the
+  # mounting library rather than into each executable that wants it.
+  #
+  # They were on the two executables (basalt_appkit and basalt_appkit_tests)
+  # and that was wrong in a way nothing here could see: this library *calls*
+  # into them -- AppKitMountingManager.mm calls applySkiaCanvas and
+  # forgetSkiaCanvas -- so every binary linking it needs the definitions, and
+  # mount_harness_appkit links it and got none. Found by building kino, where
+  # the link failed on exactly those two symbols; the repository's own build
+  # never caught it because basalt-skia contributes nothing without a Skia
+  # installed, and the one target built by hand while writing the canvas was
+  # basalt_appkit_tests, which had them.
+  #
+  # The 2.x peer beside this has always been a `target_sources` on this
+  # library, which is the shape this follows.
+  if(BASALT_PACKAGE_APPKIT_SOURCES)
+    target_sources(basalt_appkit_mounting PRIVATE ${BASALT_PACKAGE_APPKIT_SOURCES})
+  endif()
+  # And whatever those sources need linked, PUBLIC so it travels to every
+  # binary that links this library. The two executables name it themselves as
+  # well, which costs nothing -- a static archive named twice is searched
+  # twice -- and mount_harness_appkit names nothing, which is why this is
+  # here: it failed on `sk_abort_no_print` referenced from a
+  # BasaltSkPlatformContext.cpp now sitting in libbasalt_appkit_mounting.a.
+  if(BASALT_PACKAGE_APPKIT_LINK_LIBRARIES)
+    target_link_libraries(basalt_appkit_mounting PUBLIC ${BASALT_PACKAGE_APPKIT_LINK_LIBRARIES})
+  endif()
+
   if(TARGET skia_core)
     target_link_libraries(basalt_appkit_mounting PUBLIC skia_core "-framework AppKit")
     target_sources(basalt_appkit_mounting PUBLIC $<TARGET_OBJECTS:skia_core>)
@@ -250,8 +285,6 @@ if(TARGET basalt_core)
     appkit/AppKitAnimationChoreographer.mm
     appkit/AppKitFocus.mm
     appkit/AppKitKeyEvents.mm
-    # Why macOS cannot show a notification; see the file.
-    ${BASALT_PACKAGE_APPKIT_SOURCES}
     appkit/AppKitTouchDispatcher.mm)
   target_compile_options(basalt_appkit PRIVATE -Wall -Wextra -fobjc-arc)
   target_link_libraries(basalt_appkit PRIVATE basalt_appkit_mounting)
@@ -274,6 +307,7 @@ if(TARGET basalt_core)
     # no React Native, so no core -- compiles neither, rather than failing on a
     # package header it was never given the include path for.
     ${BASALT_PACKAGE_TESTS}
+    ${BASALT_PACKAGE_APPKIT_TESTS}
     tests/test_appkit_mounting.mm
     # Fonts loaded at runtime: core/FontRegistry.h's macOS half, and the
     # measurement cache a late registration has to invalidate. Needs React
@@ -283,8 +317,10 @@ if(TARGET basalt_core)
     # tests need it too, and it pulls in nothing else.
     appkit/AppKitFocus.mm
     appkit/AppKitKeyEvents.mm
-    # Why macOS cannot show a notification; see the file.
-    ${BASALT_PACKAGE_APPKIT_SOURCES}
+    # A capability package's AppKit sources are *not* listed here: with a
+    # mounting library they are compiled into it and arrive with the link, and
+    # compiling them again here would be a duplicate symbol in every one. The
+    # view-only branch, which has no mounting library, adds them below.
     appkit/AppKitTouchDispatcher.mm
     tests/test_appkit_input.mm
     tests/test_appkit_key_events.mm
@@ -296,6 +332,14 @@ if(TARGET basalt_core)
     tests/test_appkit_scrollview.mm)
 endif()
 
+# Without a mounting library there is nowhere else for a package's AppKit
+# sources to go, so the suite carries them. This is the view-only build: no
+# React Native, no core, and a package source that needs either does not
+# compile here anyway -- which is the honest place to find that out.
+if(NOT TARGET basalt_appkit_mounting AND BASALT_PACKAGE_APPKIT_SOURCES)
+  list(APPEND BASALT_APPKIT_TEST_SOURCES ${BASALT_PACKAGE_APPKIT_SOURCES})
+endif()
+
 add_executable(basalt_appkit_tests ${BASALT_APPKIT_TEST_SOURCES})
 target_compile_options(basalt_appkit_tests PRIVATE -Wall -Wextra -fobjc-arc)
 target_include_directories(basalt_appkit_tests PRIVATE ${BASALT_TEST_INCLUDE})

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/native/appkit/main_appkit.mm

@@ -51,6 +51,13 @@
 #ifdef BASALT_HAS_SKIA
 #include "AppKitSkiaModule.h"
 #endif
+#if BASALT_HAS_SKIA_GRAPHITE
+// The 3.x module, from basalt-skia. Registered here rather than through
+// BASALT_PACKAGE_TURBO_MODULES because that property has core generate the
+// call, and core is shared with hosts that cannot link Apple's Skia -- see
+// that package's CMakeLists. The same arrangement the 2.x module above has.
+#include "BasaltSkiaModule.h"
+#endif
 #include "TestSettle.h"
 #import "AppKitRunLoopObserver.h"
 #import "AppKitFocus.h"
@@ -428,13 +435,24 @@ facebook::react::TurboModuleProviders makeTurboModuleProviders(
           return std::make_shared<basalt::DesktopGestureHandlerModule>(jsInvoker);
         }
 #ifdef BASALT_HAS_SKIA
-        // @shopify/react-native-skia, when the build was pointed at an app that
-        // has it. Its `install` is what puts Skia's whole JavaScript API on the
-        // global object; see appkit/AppKitSkiaModule.h.
+        // React Native Skia's 2.x line, when the build was pointed at an app
+        // that has it. Its `install` is what puts Skia's whole JavaScript API
+        // on the global object; see appkit/AppKitSkiaModule.h.
         if (name == basalt::AppKitSkiaModule::kModuleName) {
           return std::make_shared<basalt::AppKitSkiaModule>(jsInvoker);
         }
 #endif
+#if BASALT_HAS_SKIA_GRAPHITE
+        // And 3.x, which is Graphite over Dawn and a different module for the
+        // same name. Never both: cmake/Skia.cmake refuses a 3.x install by
+        // version, so BASALT_HAS_SKIA is defined in exactly the builds this is
+        // not.
+        if (name == basalt::BasaltSkiaModule::kModuleName) {
+          if (auto module = basalt::makeSkiaTurboModule(name, jsInvoker)) {
+            return module;
+          }
+        }
+#endif
 #ifdef BASALT_HAS_WORKLETS
         // react-native-worklets, when the build was pointed at one. Reanimated
         // is built on it; see core/WorkletsModule.h.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "basalt-appkit",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "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.1"
   }
 }