@rive-app/react-native 0.1.5 → 0.2.1

package/README.md

@@ -25,7 +25,7 @@
 - **Android**: SDK 24 (Android 7.0) or later
 - **Xcode**: 16.4 or later
 - **JDK**: 17 or later
-- **Nitro Modules**: 0.25.2 or later
+- **Nitro Modules**: 0.33.2 or later
 
 ## Known Issues
 

package/lib/module/core/RiveFile.js

@@ -39,7 +39,7 @@ export let RiveFileFactory;
     const sourceURI = typeof source === 'object' ? source.uri : null;
     const assetURI = assetID ? Image.resolveAssetSource(assetID)?.uri : sourceURI;
     if (!assetURI) {
-      throw new Error(`Invalid source provided, ${source} is not a valid asset ID or URI`);
+      throw new Error(`Invalid source: could not resolve asset ${source}. Ensure 'riv' is in metro.config.js assetExts.`);
     }
     try {
       // handle http address and dev server

package/lib/module/core/RiveFile.js.map

@@ -1 +1 @@
-{"version":3,"names":["NitroModules","Image","RiveFileInternal","createHybridObject","RiveFileFactory","_RiveFileFactory","fromURL","url","referencedAssets","loadCdn","data","undefined","fromFileURL","fileURL","fromResource","resource","fromBytes","bytes","fromSource","source","assetID","sourceURI","uri","assetURI","resolveAssetSource","Error","match","error","errorMessage","message","String"],"sourceRoot":"../../../src","sources":["core/RiveFile.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["NitroModules","Image","RiveFileInternal","createHybridObject","RiveFileFactory","_RiveFileFactory","fromURL","url","referencedAssets","loadCdn","data","undefined","fromFileURL","fileURL","fromResource","resource","fromBytes","bytes","fromSource","source","assetID","sourceURI","uri","assetURI","resolveAssetSource","Error","match","error","errorMessage","message","String"],"sourceRoot":"../../../src","sources":["core/RiveFile.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/useViewModelInstance.js

@@ -2,13 +2,28 @@
 
 import { useMemo, useEffect, useRef } from 'react';
 import { callDispose } from "../core/callDispose.js";
+import { ArtboardByName } from "../specs/ArtboardBy.js";
+
+/**
+ * Use the ViewModel assigned to the default artboard.
+ */
+
+/**
+ * Use the ViewModel assigned to a specific artboard.
+ */
+
+/**
+ * Use a ViewModel by name (file-wide lookup).
+ * ViewModels are defined at the file level, not per-artboard.
+ */
+
 function isRiveViewRef(source) {
-  return source !== null && source !== undefined && 'getViewModelInstance' in source;
+  return source !== null && 'getViewModelInstance' in source;
 }
 function isRiveFile(source) {
-  return source !== null && source !== undefined && 'defaultArtboardViewModel' in source;
+  return source !== null && 'defaultArtboardViewModel' in source;
 }
-function createInstance(source, name, useNew) {
+function createInstance(source, instanceName, artboardName, viewModelName, useNew) {
   if (!source) {
     return {
       instance: null,
@@ -23,8 +38,40 @@ function createInstance(source, name, useNew) {
     };
   }
   if (isRiveFile(source)) {
-    const viewModel = source.defaultArtboardViewModel();
-    const vmi = viewModel?.createDefaultInstance();
+    let viewModel;
+    if (viewModelName) {
+      viewModel = source.viewModelByName(viewModelName);
+      if (!viewModel) {
+        return {
+          instance: null,
+          needsDispose: false,
+          error: `ViewModel '${viewModelName}' not found`
+        };
+      }
+    } else {
+      viewModel = source.defaultArtboardViewModel(artboardName ? ArtboardByName(artboardName) : undefined);
+      if (!viewModel) {
+        if (artboardName) {
+          return {
+            instance: null,
+            needsDispose: false,
+            error: `Artboard '${artboardName}' not found or has no ViewModel`
+          };
+        }
+        return {
+          instance: null,
+          needsDispose: false
+        };
+      }
+    }
+    const vmi = instanceName ? viewModel.createInstanceByName(instanceName) : viewModel.createDefaultInstance();
+    if (!vmi && instanceName) {
+      return {
+        instance: null,
+        needsDispose: false,
+        error: `ViewModel instance '${instanceName}' not found`
+      };
+    }
     return {
       instance: vmi ?? null,
       needsDispose: true
@@ -33,8 +80,15 @@ function createInstance(source, name, useNew) {
 
   // ViewModel source
   let vmi;
-  if (name) {
-    vmi = source.createInstanceByName(name);
+  if (instanceName) {
+    vmi = source.createInstanceByName(instanceName);
+    if (!vmi) {
+      return {
+        instance: null,
+        needsDispose: false,
+        error: `ViewModel instance '${instanceName}' not found`
+      };
+    }
   } else if (useNew) {
     vmi = source.createInstance();
   } else {
@@ -50,7 +104,7 @@ function createInstance(source, name, useNew) {
  * Hook for getting a ViewModelInstance from a RiveFile, ViewModel, or RiveViewRef.
  *
  * @param source - The RiveFile, ViewModel, or RiveViewRef to get an instance from
- * @param params - Configuration for which instance to retrieve (only used with ViewModel)
+ * @param params - Configuration for which instance to retrieve
  * @returns The ViewModelInstance or null if not found
  *
  * @example
@@ -62,6 +116,27 @@ function createInstance(source, name, useNew) {
  *
  * @example
  * ```tsx
+ * // From RiveFile with specific instance name
+ * const { riveFile } = useRiveFile(require('./animation.riv'));
+ * const instance = useViewModelInstance(riveFile, { instanceName: 'PersonInstance' });
+ * ```
+ *
+ * @example
+ * ```tsx
+ * // From RiveFile with specific ViewModel name
+ * const { riveFile } = useRiveFile(require('./animation.riv'));
+ * const instance = useViewModelInstance(riveFile, { viewModelName: 'Settings' });
+ * ```
+ *
+ * @example
+ * ```tsx
+ * // From RiveFile with specific artboard
+ * const { riveFile } = useRiveFile(require('./animation.riv'));
+ * const instance = useViewModelInstance(riveFile, { artboardName: 'MainArtboard' });
+ * ```
+ *
+ * @example
+ * ```tsx
  * // From RiveViewRef (get auto-bound instance)
  * const { riveViewRef, setHybridRef } = useRive();
  * const instance = useViewModelInstance(riveViewRef);
@@ -100,21 +175,31 @@ function createInstance(source, name, useNew) {
  * // Values are already set here
  * ```
  */
+// RiveFile overloads
+
+// ViewModel overloads
+
+// RiveViewRef overloads
 
+// Implementation
 export function useViewModelInstance(source, params) {
-  const name = params?.name;
+  const fileInstanceName = params?.instanceName;
+  const viewModelInstanceName = params?.name;
+  const instanceName = fileInstanceName ?? viewModelInstanceName;
+  const artboardName = params?.artboardName;
+  const viewModelName = params?.viewModelName;
   const useNew = params?.useNew ?? false;
   const required = params?.required ?? false;
   const onInit = params?.onInit;
   const prevInstanceRef = useRef(null);
   const result = useMemo(() => {
-    const created = createInstance(source, name, useNew);
+    const created = createInstance(source, instanceName, artboardName, viewModelName, useNew);
     if (created.instance && onInit) {
       onInit(created.instance);
     }
     return created;
     // eslint-disable-next-line react-hooks/exhaustive-deps -- onInit excluded intentionally
-  }, [source, name, useNew]);
+  }, [source, instanceName, artboardName, viewModelName, useNew]);
 
   // Dispose previous instance if it changed and needed disposal
   if (prevInstanceRef.current && prevInstanceRef.current.instance !== result.instance && prevInstanceRef.current.needsDispose && prevInstanceRef.current.instance) {
@@ -132,7 +217,7 @@ export function useViewModelInstance(source, params) {
     };
   }, []);
   if (required && result.instance === null) {
-    throw new Error('useViewModelInstance: Failed to get ViewModelInstance. ' + 'Ensure the source has a valid ViewModel and instance available.');
+    throw new Error(result.error ? `useViewModelInstance: ${result.error}` : 'useViewModelInstance: Failed to get ViewModelInstance. ' + 'Ensure the source has a valid ViewModel and instance available.');
   }
   return result.instance;
 }

package/lib/module/hooks/useViewModelInstance.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useEffect","useRef","callDispose","isRiveViewRef","source","undefined","isRiveFile","createInstance","name","useNew","instance","needsDispose","vmi","getViewModelInstance","viewModel","defaultArtboardViewModel","createDefaultInstance","createInstanceByName","useViewModelInstance","params","required","onInit","prevInstanceRef","result","created","current","Error"],"sourceRoot":"../../../src","sources":["hooks/useViewModelInstance.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useMemo","useEffect","useRef","callDispose","ArtboardByName","isRiveViewRef","source","isRiveFile","createInstance","instanceName","artboardName","viewModelName","useNew","instance","needsDispose","vmi","getViewModelInstance","viewModel","viewModelByName","error","defaultArtboardViewModel","undefined","createInstanceByName","createDefaultInstance","useViewModelInstance","params","fileInstanceName","viewModelInstanceName","name","required","onInit","prevInstanceRef","result","created","current","Error"],"sourceRoot":"../../../src","sources":["hooks/useViewModelInstance.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/hooks/useViewModelInstance.d.ts

@@ -1,15 +1,7 @@
 import type { ViewModel, ViewModelInstance } from '../specs/ViewModel.nitro';
 import type { RiveFile } from '../specs/RiveFile.nitro';
 import type { RiveViewRef } from '../index';
-export interface UseViewModelInstanceParams {
-    /**
-     * Get a specifically named instance from the ViewModel.
-     */
-    name?: string;
-    /**
-     * Create a new (blank) instance from the ViewModel.
-     */
-    useNew?: boolean;
+interface UseViewModelInstanceBaseParams {
     /**
      * If true, throws an error when the instance cannot be obtained.
      * This is useful with Error Boundaries and ensures TypeScript knows
@@ -23,12 +15,60 @@ export interface UseViewModelInstanceParams {
      */
     onInit?: (instance: ViewModelInstance) => void;
 }
-type ViewModelSource = ViewModel | RiveFile | RiveViewRef;
+interface UseViewModelInstanceFileBaseParams extends UseViewModelInstanceBaseParams {
+    /**
+     * The ViewModel instance name (uses `createInstanceByName()`).
+     * If not provided, creates the default instance.
+     */
+    instanceName?: string;
+}
+/**
+ * Use the ViewModel assigned to the default artboard.
+ */
+interface UseViewModelInstanceFileDefault extends UseViewModelInstanceFileBaseParams {
+    artboardName?: never;
+    viewModelName?: never;
+}
+/**
+ * Use the ViewModel assigned to a specific artboard.
+ */
+interface UseViewModelInstanceFileByArtboard extends UseViewModelInstanceFileBaseParams {
+    /**
+     * Get the ViewModel assigned to this artboard.
+     */
+    artboardName: string;
+    viewModelName?: never;
+}
+/**
+ * Use a ViewModel by name (file-wide lookup).
+ * ViewModels are defined at the file level, not per-artboard.
+ */
+interface UseViewModelInstanceFileByViewModelName extends UseViewModelInstanceFileBaseParams {
+    artboardName?: never;
+    /**
+     * The name of the ViewModel to use (uses `viewModelByName()`).
+     * ViewModels are defined at the file level and looked up by name across the entire file.
+     */
+    viewModelName: string;
+}
+export type UseViewModelInstanceFileParams = UseViewModelInstanceFileDefault | UseViewModelInstanceFileByArtboard | UseViewModelInstanceFileByViewModelName;
+export interface UseViewModelInstanceViewModelParams extends UseViewModelInstanceBaseParams {
+    /**
+     * The ViewModel instance name (uses `createInstanceByName()`).
+     * If not provided, creates the default instance.
+     */
+    name?: string;
+    /**
+     * Create a new (blank) instance from the ViewModel.
+     */
+    useNew?: boolean;
+}
+export type UseViewModelInstanceRefParams = UseViewModelInstanceBaseParams;
 /**
  * Hook for getting a ViewModelInstance from a RiveFile, ViewModel, or RiveViewRef.
  *
  * @param source - The RiveFile, ViewModel, or RiveViewRef to get an instance from
- * @param params - Configuration for which instance to retrieve (only used with ViewModel)
+ * @param params - Configuration for which instance to retrieve
  * @returns The ViewModelInstance or null if not found
  *
  * @example
@@ -40,6 +80,27 @@ type ViewModelSource = ViewModel | RiveFile | RiveViewRef;
  *
  * @example
  * ```tsx
+ * // From RiveFile with specific instance name
+ * const { riveFile } = useRiveFile(require('./animation.riv'));
+ * const instance = useViewModelInstance(riveFile, { instanceName: 'PersonInstance' });
+ * ```
+ *
+ * @example
+ * ```tsx
+ * // From RiveFile with specific ViewModel name
+ * const { riveFile } = useRiveFile(require('./animation.riv'));
+ * const instance = useViewModelInstance(riveFile, { viewModelName: 'Settings' });
+ * ```
+ *
+ * @example
+ * ```tsx
+ * // From RiveFile with specific artboard
+ * const { riveFile } = useRiveFile(require('./animation.riv'));
+ * const instance = useViewModelInstance(riveFile, { artboardName: 'MainArtboard' });
+ * ```
+ *
+ * @example
+ * ```tsx
  * // From RiveViewRef (get auto-bound instance)
  * const { riveViewRef, setHybridRef } = useRive();
  * const instance = useViewModelInstance(riveViewRef);
@@ -78,9 +139,17 @@ type ViewModelSource = ViewModel | RiveFile | RiveViewRef;
  * // Values are already set here
  * ```
  */
-export declare function useViewModelInstance(source: ViewModelSource, params: UseViewModelInstanceParams & {
+export declare function useViewModelInstance(source: RiveFile, params: UseViewModelInstanceFileParams & {
+    required: true;
+}): ViewModelInstance;
+export declare function useViewModelInstance(source: RiveFile | null, params?: UseViewModelInstanceFileParams): ViewModelInstance | null;
+export declare function useViewModelInstance(source: ViewModel, params: UseViewModelInstanceViewModelParams & {
+    required: true;
+}): ViewModelInstance;
+export declare function useViewModelInstance(source: ViewModel | null, params?: UseViewModelInstanceViewModelParams): ViewModelInstance | null;
+export declare function useViewModelInstance(source: RiveViewRef, params: UseViewModelInstanceRefParams & {
     required: true;
 }): ViewModelInstance;
-export declare function useViewModelInstance(source: ViewModelSource | null, params?: UseViewModelInstanceParams): ViewModelInstance | null;
+export declare function useViewModelInstance(source: RiveViewRef | null, params?: UseViewModelInstanceRefParams): ViewModelInstance | null;
 export {};
 //# sourceMappingURL=useViewModelInstance.d.ts.map

package/lib/typescript/src/hooks/useViewModelInstance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useViewModelInstance.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useViewModelInstance.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAG5C,MAAM,WAAW,0BAA0B;IACzC;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAChD;AAED,KAAK,eAAe,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,CAAC;AAgD1D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,0BAA0B,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,GACtD,iBAAiB,CAAC;AACrB,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,eAAe,GAAG,IAAI,EAC9B,MAAM,CAAC,EAAE,0BAA0B,GAClC,iBAAiB,GAAG,IAAI,CAAC"}
+{"version":3,"file":"useViewModelInstance.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useViewModelInstance.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAI5C,UAAU,8BAA8B;IACtC;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAChD;AAED,UAAU,kCACR,SAAQ,8BAA8B;IACtC;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,UAAU,+BACR,SAAQ,kCAAkC;IAC1C,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB,aAAa,CAAC,EAAE,KAAK,CAAC;CACvB;AAED;;GAEG;AACH,UAAU,kCACR,SAAQ,kCAAkC;IAC1C;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,KAAK,CAAC;CACvB;AAED;;;GAGG;AACH,UAAU,uCACR,SAAQ,kCAAkC;IAC1C,YAAY,CAAC,EAAE,KAAK,CAAC;IACrB;;;OAGG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,8BAA8B,GACtC,+BAA+B,GAC/B,kCAAkC,GAClC,uCAAuC,CAAC;AAE5C,MAAM,WAAW,mCACf,SAAQ,8BAA8B;IACtC;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,6BAA6B,GAAG,8BAA8B,CAAC;AA4F3E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0EG;AAEH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,8BAA8B,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,GAC1D,iBAAiB,CAAC;AACrB,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,QAAQ,GAAG,IAAI,EACvB,MAAM,CAAC,EAAE,8BAA8B,GACtC,iBAAiB,GAAG,IAAI,CAAC;AAG5B,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,mCAAmC,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,GAC/D,iBAAiB,CAAC;AACrB,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,GAAG,IAAI,EACxB,MAAM,CAAC,EAAE,mCAAmC,GAC3C,iBAAiB,GAAG,IAAI,CAAC;AAG5B,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,6BAA6B,GAAG;IAAE,QAAQ,EAAE,IAAI,CAAA;CAAE,GACzD,iBAAiB,CAAC;AACrB,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,WAAW,GAAG,IAAI,EAC1B,MAAM,CAAC,EAAE,6BAA6B,GACrC,iBAAiB,GAAG,IAAI,CAAC"}

package/nitrogen/generated/android/c++/JAlignment.hpp

@@ -2,7 +2,7 @@
 /// JAlignment.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,34 +41,33 @@ namespace margelo::nitro::rive {
     [[maybe_unused]]
     static jni::alias_ref<JAlignment> fromCpp(Alignment value) {
       static const auto clazz = javaClassStatic();
-      static const auto fieldTOPLEFT = clazz->getStaticField<JAlignment>("TOPLEFT");
-      static const auto fieldTOPCENTER = clazz->getStaticField<JAlignment>("TOPCENTER");
-      static const auto fieldTOPRIGHT = clazz->getStaticField<JAlignment>("TOPRIGHT");
-      static const auto fieldCENTERLEFT = clazz->getStaticField<JAlignment>("CENTERLEFT");
-      static const auto fieldCENTER = clazz->getStaticField<JAlignment>("CENTER");
-      static const auto fieldCENTERRIGHT = clazz->getStaticField<JAlignment>("CENTERRIGHT");
-      static const auto fieldBOTTOMLEFT = clazz->getStaticField<JAlignment>("BOTTOMLEFT");
-      static const auto fieldBOTTOMCENTER = clazz->getStaticField<JAlignment>("BOTTOMCENTER");
-      static const auto fieldBOTTOMRIGHT = clazz->getStaticField<JAlignment>("BOTTOMRIGHT");
-      
       switch (value) {
         case Alignment::TOPLEFT:
+          static const auto fieldTOPLEFT = clazz->getStaticField<JAlignment>("TOPLEFT");
           return clazz->getStaticFieldValue(fieldTOPLEFT);
         case Alignment::TOPCENTER:
+          static const auto fieldTOPCENTER = clazz->getStaticField<JAlignment>("TOPCENTER");
           return clazz->getStaticFieldValue(fieldTOPCENTER);
         case Alignment::TOPRIGHT:
+          static const auto fieldTOPRIGHT = clazz->getStaticField<JAlignment>("TOPRIGHT");
           return clazz->getStaticFieldValue(fieldTOPRIGHT);
         case Alignment::CENTERLEFT:
+          static const auto fieldCENTERLEFT = clazz->getStaticField<JAlignment>("CENTERLEFT");
           return clazz->getStaticFieldValue(fieldCENTERLEFT);
         case Alignment::CENTER:
+          static const auto fieldCENTER = clazz->getStaticField<JAlignment>("CENTER");
           return clazz->getStaticFieldValue(fieldCENTER);
         case Alignment::CENTERRIGHT:
+          static const auto fieldCENTERRIGHT = clazz->getStaticField<JAlignment>("CENTERRIGHT");
           return clazz->getStaticFieldValue(fieldCENTERRIGHT);
         case Alignment::BOTTOMLEFT:
+          static const auto fieldBOTTOMLEFT = clazz->getStaticField<JAlignment>("BOTTOMLEFT");
           return clazz->getStaticFieldValue(fieldBOTTOMLEFT);
         case Alignment::BOTTOMCENTER:
+          static const auto fieldBOTTOMCENTER = clazz->getStaticField<JAlignment>("BOTTOMCENTER");
           return clazz->getStaticFieldValue(fieldBOTTOMCENTER);
         case Alignment::BOTTOMRIGHT:
+          static const auto fieldBOTTOMRIGHT = clazz->getStaticField<JAlignment>("BOTTOMRIGHT");
           return clazz->getStaticFieldValue(fieldBOTTOMRIGHT);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));

package/nitrogen/generated/android/c++/JArtboardBy.hpp

@@ -2,7 +2,7 @@
 /// JArtboardBy.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/android/c++/JArtboardByTypes.hpp

@@ -2,7 +2,7 @@
 /// JArtboardByTypes.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,13 +41,12 @@ namespace margelo::nitro::rive {
     [[maybe_unused]]
     static jni::alias_ref<JArtboardByTypes> fromCpp(ArtboardByTypes value) {
       static const auto clazz = javaClassStatic();
-      static const auto fieldINDEX = clazz->getStaticField<JArtboardByTypes>("INDEX");
-      static const auto fieldNAME = clazz->getStaticField<JArtboardByTypes>("NAME");
-      
       switch (value) {
         case ArtboardByTypes::INDEX:
+          static const auto fieldINDEX = clazz->getStaticField<JArtboardByTypes>("INDEX");
           return clazz->getStaticFieldValue(fieldINDEX);
         case ArtboardByTypes::NAME:
+          static const auto fieldNAME = clazz->getStaticField<JArtboardByTypes>("NAME");
           return clazz->getStaticFieldValue(fieldNAME);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));

package/nitrogen/generated/android/c++/JDataBindByName.hpp

@@ -2,7 +2,7 @@
 /// JDataBindByName.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/android/c++/JDataBindMode.hpp

@@ -2,7 +2,7 @@
 /// JDataBindMode.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,13 +41,12 @@ namespace margelo::nitro::rive {
     [[maybe_unused]]
     static jni::alias_ref<JDataBindMode> fromCpp(DataBindMode value) {
       static const auto clazz = javaClassStatic();
-      static const auto fieldAUTO = clazz->getStaticField<JDataBindMode>("AUTO");
-      static const auto fieldNONE = clazz->getStaticField<JDataBindMode>("NONE");
-      
       switch (value) {
         case DataBindMode::AUTO:
+          static const auto fieldAUTO = clazz->getStaticField<JDataBindMode>("AUTO");
           return clazz->getStaticFieldValue(fieldAUTO);
         case DataBindMode::NONE:
+          static const auto fieldNONE = clazz->getStaticField<JDataBindMode>("NONE");
           return clazz->getStaticFieldValue(fieldNONE);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));

package/nitrogen/generated/android/c++/JEventPropertiesOutput.cpp

@@ -2,7 +2,7 @@
 /// JEventPropertiesOutput.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JEventPropertiesOutput.hpp"

package/nitrogen/generated/android/c++/JEventPropertiesOutput.hpp

@@ -2,7 +2,7 @@
 /// JEventPropertiesOutput.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -50,7 +50,7 @@ namespace margelo::nitro::rive {
   };
 
   namespace JEventPropertiesOutput_impl {
-    class First: public jni::JavaClass<First, JEventPropertiesOutput> {
+    class First final: public jni::JavaClass<First, JEventPropertiesOutput> {
     public:
       static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput$First;";
     
@@ -60,7 +60,7 @@ namespace margelo::nitro::rive {
       }
     };
     
-    class Second: public jni::JavaClass<Second, JEventPropertiesOutput> {
+    class Second final: public jni::JavaClass<Second, JEventPropertiesOutput> {
     public:
       static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput$Second;";
     
@@ -70,7 +70,7 @@ namespace margelo::nitro::rive {
       }
     };
     
-    class Third: public jni::JavaClass<Third, JEventPropertiesOutput> {
+    class Third final: public jni::JavaClass<Third, JEventPropertiesOutput> {
     public:
       static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/EventPropertiesOutput$Third;";
     

package/nitrogen/generated/android/c++/JFit.hpp

@@ -2,7 +2,7 @@
 /// JFit.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -41,31 +41,30 @@ namespace margelo::nitro::rive {
     [[maybe_unused]]
     static jni::alias_ref<JFit> fromCpp(Fit value) {
       static const auto clazz = javaClassStatic();
-      static const auto fieldFILL = clazz->getStaticField<JFit>("FILL");
-      static const auto fieldCONTAIN = clazz->getStaticField<JFit>("CONTAIN");
-      static const auto fieldCOVER = clazz->getStaticField<JFit>("COVER");
-      static const auto fieldFITWIDTH = clazz->getStaticField<JFit>("FITWIDTH");
-      static const auto fieldFITHEIGHT = clazz->getStaticField<JFit>("FITHEIGHT");
-      static const auto fieldNONE = clazz->getStaticField<JFit>("NONE");
-      static const auto fieldSCALEDOWN = clazz->getStaticField<JFit>("SCALEDOWN");
-      static const auto fieldLAYOUT = clazz->getStaticField<JFit>("LAYOUT");
-      
       switch (value) {
         case Fit::FILL:
+          static const auto fieldFILL = clazz->getStaticField<JFit>("FILL");
           return clazz->getStaticFieldValue(fieldFILL);
         case Fit::CONTAIN:
+          static const auto fieldCONTAIN = clazz->getStaticField<JFit>("CONTAIN");
           return clazz->getStaticFieldValue(fieldCONTAIN);
         case Fit::COVER:
+          static const auto fieldCOVER = clazz->getStaticField<JFit>("COVER");
           return clazz->getStaticFieldValue(fieldCOVER);
         case Fit::FITWIDTH:
+          static const auto fieldFITWIDTH = clazz->getStaticField<JFit>("FITWIDTH");
           return clazz->getStaticFieldValue(fieldFITWIDTH);
         case Fit::FITHEIGHT:
+          static const auto fieldFITHEIGHT = clazz->getStaticField<JFit>("FITHEIGHT");
           return clazz->getStaticFieldValue(fieldFITHEIGHT);
         case Fit::NONE:
+          static const auto fieldNONE = clazz->getStaticField<JFit>("NONE");
           return clazz->getStaticFieldValue(fieldNONE);
         case Fit::SCALEDOWN:
+          static const auto fieldSCALEDOWN = clazz->getStaticField<JFit>("SCALEDOWN");
           return clazz->getStaticFieldValue(fieldSCALEDOWN);
         case Fit::LAYOUT:
+          static const auto fieldLAYOUT = clazz->getStaticField<JFit>("LAYOUT");
           return clazz->getStaticFieldValue(fieldLAYOUT);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));

package/nitrogen/generated/android/c++/JFunc_void.hpp

@@ -2,7 +2,7 @@
 /// JFunc_void.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/android/c++/JFunc_void_RiveError.hpp

@@ -2,7 +2,7 @@
 /// JFunc_void_RiveError.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/android/c++/JFunc_void_UnifiedRiveEvent.hpp

@@ -2,7 +2,7 @@
 /// JFunc_void_UnifiedRiveEvent.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/android/c++/JFunc_void_bool.hpp

@@ -2,7 +2,7 @@
 /// JFunc_void_bool.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/android/c++/JFunc_void_double.hpp

@@ -2,7 +2,7 @@
 /// JFunc_void_double.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once