@rive-app/react-native 0.2.0 → 0.2.2

package/lib/module/hooks/useRiveList.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { c as _c } from "react/compiler-runtime";
 import { useCallback, useEffect, useState, useMemo } from 'react';
 /**
  * Hook for interacting with list ViewModel instance properties.
@@ -9,63 +10,178 @@ import { useCallback, useEffect, useState, useMemo } from 'react';
  * @returns An object with list length, manipulation methods, and error state
  */
 export function useRiveList(path, viewModelInstance) {
+  const $ = _c(36);
   const [error, setError] = useState(null);
   const [revision, setRevision] = useState(0);
-  useEffect(() => {
-    setError(null);
-  }, [path, viewModelInstance]);
-  const property = useMemo(() => {
-    if (!viewModelInstance) return undefined;
-    return viewModelInstance.listProperty(path);
-  }, [viewModelInstance, path]);
-  useEffect(() => {
-    if (viewModelInstance && !property) {
-      setError(new Error(`List property "${path}" not found in the ViewModel instance`));
+  let t0;
+  if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+    t0 = () => {
+      setError(null);
+    };
+    $[0] = t0;
+  } else {
+    t0 = $[0];
+  }
+  let t1;
+  if ($[1] !== path || $[2] !== viewModelInstance) {
+    t1 = [path, viewModelInstance];
+    $[1] = path;
+    $[2] = viewModelInstance;
+    $[3] = t1;
+  } else {
+    t1 = $[3];
+  }
+  useEffect(t0, t1);
+  let t2;
+  bb0: {
+    if (!viewModelInstance) {
+      t2 = undefined;
+      break bb0;
+    }
+    let t3;
+    if ($[4] !== path || $[5] !== viewModelInstance) {
+      t3 = viewModelInstance.listProperty(path);
+      $[4] = path;
+      $[5] = viewModelInstance;
+      $[6] = t3;
+    } else {
+      t3 = $[6];
     }
-  }, [viewModelInstance, property, path]);
-  useEffect(() => {
-    if (!property) return;
-    const removeListener = property.addListener(() => {
-      setRevision(r => r + 1);
-    });
-    return () => {
-      removeListener();
-      property.removeListeners();
-      property.dispose();
+    t2 = t3;
+  }
+  const property = t2;
+  let t3;
+  let t4;
+  if ($[7] !== path || $[8] !== property || $[9] !== viewModelInstance) {
+    t3 = () => {
+      if (viewModelInstance && !property) {
+        setError(new Error(`List property "${path}" not found in the ViewModel instance`));
+      }
+    };
+    t4 = [viewModelInstance, property, path];
+    $[7] = path;
+    $[8] = property;
+    $[9] = viewModelInstance;
+    $[10] = t3;
+    $[11] = t4;
+  } else {
+    t3 = $[10];
+    t4 = $[11];
+  }
+  useEffect(t3, t4);
+  let t5;
+  let t6;
+  if ($[12] !== property) {
+    t5 = () => {
+      if (!property) {
+        return;
+      }
+      const removeListener = property.addListener(() => {
+        setRevision(_temp);
+      });
+      return () => {
+        removeListener();
+        property.removeListeners();
+        property.dispose();
+      };
+    };
+    t6 = [property];
+    $[12] = property;
+    $[13] = t5;
+    $[14] = t6;
+  } else {
+    t5 = $[13];
+    t6 = $[14];
+  }
+  useEffect(t5, t6);
+  const length = property?.length ?? 0;
+  let t7;
+  if ($[15] !== property) {
+    t7 = index => property?.getInstanceAt(index);
+    $[15] = property;
+    $[16] = t7;
+  } else {
+    t7 = $[16];
+  }
+  const getInstanceAt = t7;
+  let t8;
+  if ($[17] !== property) {
+    t8 = instance => {
+      property?.addInstance(instance);
     };
-  }, [property]);
-  const length = useMemo(() => {
-    // revision is used to trigger re-computation when list changes
-    revision;
-    return property?.length ?? 0;
-  }, [property, revision]);
-  const getInstanceAt = useCallback(index => {
-    return property?.getInstanceAt(index);
-  }, [property]);
-  const addInstance = useCallback(instance => {
-    property?.addInstance(instance);
-  }, [property]);
-  const addInstanceAt = useCallback((instance, index) => {
-    return property?.addInstanceAt(instance, index) ?? false;
-  }, [property]);
-  const removeInstance = useCallback(instance => {
-    property?.removeInstance(instance);
-  }, [property]);
-  const removeInstanceAt = useCallback(index => {
-    property?.removeInstanceAt(index);
-  }, [property]);
-  const swap = useCallback((index1, index2) => {
-    return property?.swap(index1, index2) ?? false;
-  }, [property]);
-  return {
-    length,
-    getInstanceAt,
-    addInstance,
-    addInstanceAt,
-    removeInstance,
-    removeInstanceAt,
-    swap,
-    error
-  };
+    $[17] = property;
+    $[18] = t8;
+  } else {
+    t8 = $[18];
+  }
+  const addInstance = t8;
+  let t9;
+  if ($[19] !== property) {
+    t9 = (instance_0, index_0) => property?.addInstanceAt(instance_0, index_0) ?? false;
+    $[19] = property;
+    $[20] = t9;
+  } else {
+    t9 = $[20];
+  }
+  const addInstanceAt = t9;
+  let t10;
+  if ($[21] !== property) {
+    t10 = instance_1 => {
+      property?.removeInstance(instance_1);
+    };
+    $[21] = property;
+    $[22] = t10;
+  } else {
+    t10 = $[22];
+  }
+  const removeInstance = t10;
+  let t11;
+  if ($[23] !== property) {
+    t11 = index_1 => {
+      property?.removeInstanceAt(index_1);
+    };
+    $[23] = property;
+    $[24] = t11;
+  } else {
+    t11 = $[24];
+  }
+  const removeInstanceAt = t11;
+  let t12;
+  if ($[25] !== property) {
+    t12 = (index1, index2) => property?.swap(index1, index2) ?? false;
+    $[25] = property;
+    $[26] = t12;
+  } else {
+    t12 = $[26];
+  }
+  const swap = t12;
+  let t13;
+  if ($[27] !== addInstance || $[28] !== addInstanceAt || $[29] !== error || $[30] !== getInstanceAt || $[31] !== length || $[32] !== removeInstance || $[33] !== removeInstanceAt || $[34] !== swap) {
+    t13 = {
+      length,
+      getInstanceAt,
+      addInstance,
+      addInstanceAt,
+      removeInstance,
+      removeInstanceAt,
+      swap,
+      error
+    };
+    $[27] = addInstance;
+    $[28] = addInstanceAt;
+    $[29] = error;
+    $[30] = getInstanceAt;
+    $[31] = length;
+    $[32] = removeInstance;
+    $[33] = removeInstanceAt;
+    $[34] = swap;
+    $[35] = t13;
+  } else {
+    t13 = $[35];
+  }
+  return t13;
+}
+function _temp(r) {
+  return r + 1;
 }
 //# sourceMappingURL=useRiveList.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useEffect","useState","useMemo","useRiveList","path","viewModelInstance","error","setError","revision","setRevision","property","undefined","listProperty","Error","removeListener","addListener","r","removeListeners","dispose","length","getInstanceAt","index","addInstance","instance","addInstanceAt","removeInstance","removeInstanceAt","swap","index1","index2"],"sourceRoot":"../../../src","sources":["hooks/useRiveList.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useEffect","useState","useMemo","useRiveList","path","viewModelInstance","$","_c","error","setError","revision","setRevision","t0","Symbol","for","t1","t2","bb0","undefined","t3","listProperty","property","t4","Error","t5","t6","removeListener","addListener","_temp","removeListeners","dispose","length","t7","index","getInstanceAt","t8","instance","addInstance","t9","instance_0","index_0","addInstanceAt","t10","instance_1","removeInstance","t11","index_1","removeInstanceAt","t12","index1","index2","swap","t13","r"],"sourceRoot":"../../../src","sources":["hooks/useRiveList.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/useRiveNumber.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { c as _c } from "react/compiler-runtime";
 import { useRiveProperty } from "./useRiveProperty.js";
 const NUMBER_PROPERTY_OPTIONS = {
   getProperty: (vmi, p) => vmi.numberProperty(p)
@@ -13,11 +14,22 @@ const NUMBER_PROPERTY_OPTIONS = {
  * @returns An object with the number value, a setter function, and an error if the property is not found
  */
 export function useRiveNumber(path, viewModelInstance) {
+  const $ = _c(4);
   const [value, setValue, error] = useRiveProperty(viewModelInstance, path, NUMBER_PROPERTY_OPTIONS);
-  return {
-    value,
-    setValue,
-    error
-  };
+  let t0;
+  if ($[0] !== error || $[1] !== setValue || $[2] !== value) {
+    t0 = {
+      value,
+      setValue,
+      error
+    };
+    $[0] = error;
+    $[1] = setValue;
+    $[2] = value;
+    $[3] = t0;
+  } else {
+    t0 = $[3];
+  }
+  return t0;
 }
 //# sourceMappingURL=useRiveNumber.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["useRiveProperty","NUMBER_PROPERTY_OPTIONS","getProperty","vmi","p","numberProperty","useRiveNumber","path","viewModelInstance","value","setValue","error"],"sourceRoot":"../../../src","sources":["hooks/useRiveNumber.ts"],"mappings":";;AAKA,SAASA,eAAe,QAAQ,sBAAmB;AAEnD,MAAMC,uBAAuB,GAAG;EAC9BC,WAAW,EAAEA,CAACC,GAAsB,EAAEC,CAAS,KAAKD,GAAG,CAACE,cAAc,CAACD,CAAC;AAC1E,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,aAAaA,CAC3BC,IAAY,EACZC,iBAA4C,EACb;EAC/B,MAAM,CAACC,KAAK,EAAEC,QAAQ,EAAEC,KAAK,CAAC,GAAGX,eAAe,CAG9CQ,iBAAiB,EAAED,IAAI,EAAEN,uBAAuB,CAAC;EACnD,OAAO;IAAEQ,KAAK;IAAEC,QAAQ;IAAEC;EAAM,CAAC;AACnC","ignoreList":[]}
+{"version":3,"names":["useRiveProperty","NUMBER_PROPERTY_OPTIONS","getProperty","vmi","p","numberProperty","useRiveNumber","path","viewModelInstance","$","_c","value","setValue","error","t0"],"sourceRoot":"../../../src","sources":["hooks/useRiveNumber.ts"],"mappings":";;;AAKA,SAASA,eAAe,QAAQ,sBAAmB;AAEnD,MAAMC,uBAAuB,GAAG;EAC9BC,WAAW,EAAEA,CAACC,GAAsB,EAAEC,CAAS,KAAKD,GAAG,CAACE,cAAc,CAACD,CAAC;AAC1E,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAAAE,cAAAC,IAAA,EAAAC,iBAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EAIL,OAAAC,KAAA,EAAAC,QAAA,EAAAC,KAAA,IAAiCb,eAAe,CAG9CQ,iBAAiB,EAAED,IAAI,EAAEN,uBAAuB,CAAC;EAAC,IAAAa,EAAA;EAAA,IAAAL,CAAA,QAAAI,KAAA,IAAAJ,CAAA,QAAAG,QAAA,IAAAH,CAAA,QAAAE,KAAA;IAC7CG,EAAA;MAAAH,KAAA;MAAAC,QAAA;MAAAC;IAAyB,CAAC;IAAAJ,CAAA,MAAAI,KAAA;IAAAJ,CAAA,MAAAG,QAAA;IAAAH,CAAA,MAAAE,KAAA;IAAAF,CAAA,MAAAK,EAAA;EAAA;IAAAA,EAAA,GAAAL,CAAA;EAAA;EAAA,OAA1BK,EAA0B;AAAA","ignoreList":[]}

package/lib/module/hooks/useRiveProperty.js

@@ -65,8 +65,8 @@ export function useRiveProperty(viewModelInstance, path, options) {
     if (!property) {
       setError(new Error(`Cannot set value for property "${path}" because it was not found. Your view model instance may be undefined, or the path may be incorrect.`));
     } else {
-      const newValue = typeof valueOrUpdater === 'function' ? valueOrUpdater(property.value) : valueOrUpdater;
-      property.value = newValue;
+      const newValue_0 = typeof valueOrUpdater === 'function' ? valueOrUpdater(property.value) : valueOrUpdater;
+      property.value = newValue_0;
     }
   }, [property, path]);
   return [value, setPropertyValue, error, property];

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

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useEffect","useState","useMemo","useRiveProperty","viewModelInstance","path","options","property","getProperty","value","setValue","error","setError","Error","removeListener","onPropertyEventOverride","addListener","newValue","dispose","setPropertyValue","valueOrUpdater"],"sourceRoot":"../../../src","sources":["hooks/useRiveProperty.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,OAAO,QAAQ,OAAO;AAOjE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAC7BC,iBAAuD,EACvDC,IAAY,EACZC,OAKC,EAMD;EACA;EACA,MAAMC,QAAQ,GAAGL,OAAO,CAAC,MAAM;IAC7B,IAAI,CAACE,iBAAiB,EAAE;IACxB,OAAOE,OAAO,CAACE,WAAW,CACxBJ,iBAAiB,EACjBC,IACF,CAAC;EACH,CAAC,EAAE,CAACC,OAAO,EAAEF,iBAAiB,EAAEC,IAAI,CAAC,CAAC;;EAEtC;EACA,MAAM,CAACI,KAAK,EAAEC,QAAQ,CAAC,GAAGT,QAAQ,CAAgB,MAAMM,QAAQ,EAAEE,KAAK,CAAC;EACxE,MAAM,CAACE,KAAK,EAAEC,QAAQ,CAAC,GAAGX,QAAQ,CAAe,IAAI,CAAC;;EAEtD;EACAD,SAAS,CAAC,MAAM;IACd,IAAIO,QAAQ,EAAE;MACZG,QAAQ,CAACH,QAAQ,CAACE,KAAK,CAAC;IAC1B;EACF,CAAC,EAAE,CAACF,QAAQ,CAAC,CAAC;;EAEd;EACAP,SAAS,CAAC,MAAM;IACdY,QAAQ,CAAC,IAAI,CAAC;EAChB,CAAC,EAAE,CAACP,IAAI,EAAED,iBAAiB,CAAC,CAAC;;EAE7B;EACAJ,SAAS,CAAC,MAAM;IACd,IAAII,iBAAiB,IAAI,CAACG,QAAQ,EAAE;MAClCK,QAAQ,CACN,IAAIC,KAAK,CAAC,aAAaR,IAAI,uCAAuC,CACpE,CAAC;IACH;EACF,CAAC,EAAE,CAACD,iBAAiB,EAAEG,QAAQ,EAAEF,IAAI,CAAC,CAAC;;EAEvC;EACAL,SAAS,CAAC,MAAM;IACd,IAAI,CAACO,QAAQ,EAAE;;IAEf;IACA;IACA,MAAMO,cAAc,GAAGR,OAAO,CAACS,uBAAuB,GAClDR,QAAQ,CAACS,WAAW,CAACV,OAAO,CAACS,uBAAuB,CAAC,GACrDR,QAAQ,CAACS,WAAW,CAAEC,QAAQ,IAAK;MACjCP,QAAQ,CAACO,QAAQ,CAAC;IACpB,CAAC,CAAC;IAEN,OAAO,MAAM;MACXH,cAAc,CAAC,CAAC;MAChBP,QAAQ,CAACW,OAAO,CAAC,CAAC;IACpB,CAAC;EACH,CAAC,EAAE,CAACZ,OAAO,EAAEC,QAAQ,CAAC,CAAC;;EAEvB;EACA,MAAMY,gBAAgB,GAAGpB,WAAW,CACjCqB,cAAqD,IAAK;IACzD,IAAI,CAACb,QAAQ,EAAE;MACbK,QAAQ,CACN,IAAIC,KAAK,CACP,kCAAkCR,IAAI,sGACxC,CACF,CAAC;IACH,CAAC,MAAM;MACL,MAAMY,QAAQ,GACZ,OAAOG,cAAc,KAAK,UAAU,GAC/BA,cAAc,CACbb,QAAQ,CAACE,KACX,CAAC,GACDW,cAAc;MACpBb,QAAQ,CAACE,KAAK,GAAGQ,QAAQ;IAC3B;EACF,CAAC,EACD,CAACV,QAAQ,EAAEF,IAAI,CACjB,CAAC;EAED,OAAO,CAACI,KAAK,EAAEU,gBAAgB,EAAER,KAAK,EAAEJ,QAAQ,CAAiB;AACnE;;AAEA;AACA;AACA;AACA;AACA;AACA","ignoreList":[]}
+{"version":3,"names":["useCallback","useEffect","useState","useMemo","useRiveProperty","viewModelInstance","path","options","property","getProperty","value","setValue","error","setError","Error","removeListener","onPropertyEventOverride","addListener","newValue","dispose","setPropertyValue","valueOrUpdater"],"sourceRoot":"../../../src","sources":["hooks/useRiveProperty.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,OAAO,QAAQ,OAAO;AAOjE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAC7BC,iBAAuD,EACvDC,IAAY,EACZC,OAKC,EAMD;EACA;EACA,MAAMC,QAAQ,GAAGL,OAAO,CAAC,MAAM;IAC7B,IAAI,CAACE,iBAAiB,EAAE;IACxB,OAAOE,OAAO,CAACE,WAAW,CACxBJ,iBAAiB,EACjBC,IACF,CAAC;EACH,CAAC,EAAE,CAACC,OAAO,EAAEF,iBAAiB,EAAEC,IAAI,CAAC,CAAC;;EAEtC;EACA,MAAM,CAACI,KAAK,EAAEC,QAAQ,CAAC,GAAGT,QAAQ,CAAgB,MAAMM,QAAQ,EAAEE,KAAK,CAAC;EACxE,MAAM,CAACE,KAAK,EAAEC,QAAQ,CAAC,GAAGX,QAAQ,CAAe,IAAI,CAAC;;EAEtD;EACAD,SAAS,CAAC,MAAM;IACd,IAAIO,QAAQ,EAAE;MACZG,QAAQ,CAACH,QAAQ,CAACE,KAAK,CAAC;IAC1B;EACF,CAAC,EAAE,CAACF,QAAQ,CAAC,CAAC;;EAEd;EACAP,SAAS,CAAC,MAAM;IACdY,QAAQ,CAAC,IAAI,CAAC;EAChB,CAAC,EAAE,CAACP,IAAI,EAAED,iBAAiB,CAAC,CAAC;;EAE7B;EACAJ,SAAS,CAAC,MAAM;IACd,IAAII,iBAAiB,IAAI,CAACG,QAAQ,EAAE;MAClCK,QAAQ,CACN,IAAIC,KAAK,CAAC,aAAaR,IAAI,uCAAuC,CACpE,CAAC;IACH;EACF,CAAC,EAAE,CAACD,iBAAiB,EAAEG,QAAQ,EAAEF,IAAI,CAAC,CAAC;;EAEvC;EACAL,SAAS,CAAC,MAAM;IACd,IAAI,CAACO,QAAQ,EAAE;;IAEf;IACA;IACA,MAAMO,cAAc,GAAGR,OAAO,CAACS,uBAAuB,GAClDR,QAAQ,CAACS,WAAW,CAACV,OAAO,CAACS,uBAAuB,CAAC,GACrDR,QAAQ,CAACS,WAAW,CAAEC,QAAQ,IAAK;MACjCP,QAAQ,CAACO,QAAQ,CAAC;IACpB,CAAC,CAAC;IAEN,OAAO,MAAM;MACXH,cAAc,CAAC,CAAC;MAChBP,QAAQ,CAACW,OAAO,CAAC,CAAC;IACpB,CAAC;EACH,CAAC,EAAE,CAACZ,OAAO,EAAEC,QAAQ,CAAC,CAAC;;EAEvB;EACA,MAAMY,gBAAgB,GAAGpB,WAAW,CACjCqB,cAAqD,IAAK;IACzD,IAAI,CAACb,QAAQ,EAAE;MACbK,QAAQ,CACN,IAAIC,KAAK,CACP,kCAAkCR,IAAI,sGACxC,CACF,CAAC;IACH,CAAC,MAAM;MACL,MAAMY,UAAQ,GACZ,OAAOG,cAAc,KAAK,UAAU,GAC/BA,cAAc,CACbb,QAAQ,CAACE,KACX,CAAC,GACDW,cAAc;MACpBb,QAAQ,CAACE,KAAK,GAAGQ,UAAQ;IAC3B;EACF,CAAC,EACD,CAACV,QAAQ,EAAEF,IAAI,CACjB,CAAC;EAED,OAAO,CAACI,KAAK,EAAEU,gBAAgB,EAAER,KAAK,EAAEJ,QAAQ,CAAiB;AACnE;;AAEA;AACA;AACA;AACA;AACA;AACA","ignoreList":[]}

package/lib/module/hooks/useRiveString.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { c as _c } from "react/compiler-runtime";
 import { useRiveProperty } from "./useRiveProperty.js";
 const STRING_PROPERTY_OPTIONS = {
   getProperty: (vmi, p) => vmi.stringProperty(p)
@@ -13,11 +14,22 @@ const STRING_PROPERTY_OPTIONS = {
  * @returns An object with the number value, a setter function, and an error if the property is not found
  */
 export function useRiveString(path, viewModelInstance) {
+  const $ = _c(4);
   const [value, setValue, error] = useRiveProperty(viewModelInstance, path, STRING_PROPERTY_OPTIONS);
-  return {
-    value,
-    setValue,
-    error
-  };
+  let t0;
+  if ($[0] !== error || $[1] !== setValue || $[2] !== value) {
+    t0 = {
+      value,
+      setValue,
+      error
+    };
+    $[0] = error;
+    $[1] = setValue;
+    $[2] = value;
+    $[3] = t0;
+  } else {
+    t0 = $[3];
+  }
+  return t0;
 }
 //# sourceMappingURL=useRiveString.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["useRiveProperty","STRING_PROPERTY_OPTIONS","getProperty","vmi","p","stringProperty","useRiveString","path","viewModelInstance","value","setValue","error"],"sourceRoot":"../../../src","sources":["hooks/useRiveString.ts"],"mappings":";;AAKA,SAASA,eAAe,QAAQ,sBAAmB;AAEnD,MAAMC,uBAAuB,GAAG;EAC9BC,WAAW,EAAEA,CAACC,GAAsB,EAAEC,CAAS,KAAKD,GAAG,CAACE,cAAc,CAACD,CAAC;AAC1E,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,aAAaA,CAC3BC,IAAY,EACZC,iBAA4C,EACb;EAC/B,MAAM,CAACC,KAAK,EAAEC,QAAQ,EAAEC,KAAK,CAAC,GAAGX,eAAe,CAG9CQ,iBAAiB,EAAED,IAAI,EAAEN,uBAAuB,CAAC;EACnD,OAAO;IAAEQ,KAAK;IAAEC,QAAQ;IAAEC;EAAM,CAAC;AACnC","ignoreList":[]}
+{"version":3,"names":["useRiveProperty","STRING_PROPERTY_OPTIONS","getProperty","vmi","p","stringProperty","useRiveString","path","viewModelInstance","$","_c","value","setValue","error","t0"],"sourceRoot":"../../../src","sources":["hooks/useRiveString.ts"],"mappings":";;;AAKA,SAASA,eAAe,QAAQ,sBAAmB;AAEnD,MAAMC,uBAAuB,GAAG;EAC9BC,WAAW,EAAEA,CAACC,GAAsB,EAAEC,CAAS,KAAKD,GAAG,CAACE,cAAc,CAACD,CAAC;AAC1E,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAAAE,cAAAC,IAAA,EAAAC,iBAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EAIL,OAAAC,KAAA,EAAAC,QAAA,EAAAC,KAAA,IAAiCb,eAAe,CAG9CQ,iBAAiB,EAAED,IAAI,EAAEN,uBAAuB,CAAC;EAAC,IAAAa,EAAA;EAAA,IAAAL,CAAA,QAAAI,KAAA,IAAAJ,CAAA,QAAAG,QAAA,IAAAH,CAAA,QAAAE,KAAA;IAC7CG,EAAA;MAAAH,KAAA;MAAAC,QAAA;MAAAC;IAAyB,CAAC;IAAAJ,CAAA,MAAAI,KAAA;IAAAJ,CAAA,MAAAG,QAAA;IAAAH,CAAA,MAAAE,KAAA;IAAAF,CAAA,MAAAK,EAAA;EAAA;IAAAA,EAAA,GAAAL,CAAA;EAAA;EAAA,OAA1BK,EAA0B;AAAA","ignoreList":[]}

package/lib/module/hooks/useRiveTrigger.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { c as _c } from "react/compiler-runtime";
 import { useCallback, useMemo } from 'react';
 import { useRiveProperty } from "./useRiveProperty.js";
 const getTriggerProperty = (vmi, p) => vmi.triggerProperty(p);
@@ -12,22 +13,56 @@ const getTriggerProperty = (vmi, p) => vmi.triggerProperty(p);
  * @returns A trigger function that can be called to fire the trigger
  */
 export function useRiveTrigger(path, viewModelInstance, params) {
+  const $ = _c(9);
+  let t0;
+  if ($[0] !== params) {
+    t0 = params ?? {};
+    $[0] = params;
+    $[1] = t0;
+  } else {
+    t0 = $[1];
+  }
   const {
     onTrigger
-  } = params ?? {};
-  const triggerOptions = useMemo(() => ({
-    getProperty: getTriggerProperty,
-    onPropertyEventOverride: onTrigger
-  }), [onTrigger]);
-  const [_, __, error, property] = useRiveProperty(viewModelInstance, path, triggerOptions);
-  const trigger = useCallback(() => {
-    if (property) {
-      property.trigger();
-    }
-  }, [property]);
-  return {
-    trigger,
-    error
-  };
+  } = t0;
+  let t1;
+  if ($[2] !== onTrigger) {
+    t1 = {
+      getProperty: getTriggerProperty,
+      onPropertyEventOverride: onTrigger
+    };
+    $[2] = onTrigger;
+    $[3] = t1;
+  } else {
+    t1 = $[3];
+  }
+  const triggerOptions = t1;
+  const [,, error, property] = useRiveProperty(viewModelInstance, path, triggerOptions);
+  let t2;
+  if ($[4] !== property) {
+    t2 = () => {
+      if (property) {
+        property.trigger();
+      }
+    };
+    $[4] = property;
+    $[5] = t2;
+  } else {
+    t2 = $[5];
+  }
+  const trigger = t2;
+  let t3;
+  if ($[6] !== error || $[7] !== trigger) {
+    t3 = {
+      trigger,
+      error
+    };
+    $[6] = error;
+    $[7] = trigger;
+    $[8] = t3;
+  } else {
+    t3 = $[8];
+  }
+  return t3;
 }
 //# sourceMappingURL=useRiveTrigger.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useMemo","useRiveProperty","getTriggerProperty","vmi","p","triggerProperty","useRiveTrigger","path","viewModelInstance","params","onTrigger","triggerOptions","getProperty","onPropertyEventOverride","_","__","error","property","trigger"],"sourceRoot":"../../../src","sources":["hooks/useRiveTrigger.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAS5C,SAASC,eAAe,QAAQ,sBAAmB;AAEnD,MAAMC,kBAAkB,GAAGA,CAACC,GAAsB,EAAEC,CAAS,KAC3DD,GAAG,CAACE,eAAe,CAACD,CAAC,CAAC;;AAExB;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,cAAcA,CAC5BC,IAAY,EACZC,iBAA4C,EAC5CC,MAA8C,EACxB;EACtB,MAAM;IAAEC;EAAU,CAAC,GAAGD,MAAM,IAAI,CAAC,CAAC;EAElC,MAAME,cAAc,GAAGX,OAAO,CAC5B,OAAO;IACLY,WAAW,EAAEV,kBAAkB;IAC/BW,uBAAuB,EAAEH;EAC3B,CAAC,CAAC,EACF,CAACA,SAAS,CACZ,CAAC;EAED,MAAM,CAACI,CAAC,EAAEC,EAAE,EAAEC,KAAK,EAAEC,QAAQ,CAAC,GAAGhB,eAAe,CAG9CO,iBAAiB,EAAED,IAAI,EAAEI,cAAc,CAAC;EAE1C,MAAMO,OAAO,GAAGnB,WAAW,CAAC,MAAM;IAChC,IAAIkB,QAAQ,EAAE;MACZA,QAAQ,CAACC,OAAO,CAAC,CAAC;IACpB;EACF,CAAC,EAAE,CAACD,QAAQ,CAAC,CAAC;EAEd,OAAO;IAAEC,OAAO;IAAEF;EAAM,CAAC;AAC3B","ignoreList":[]}
+{"version":3,"names":["useCallback","useMemo","useRiveProperty","getTriggerProperty","vmi","p","triggerProperty","useRiveTrigger","path","viewModelInstance","params","$","_c","t0","onTrigger","t1","getProperty","onPropertyEventOverride","triggerOptions","error","property","t2","trigger","t3"],"sourceRoot":"../../../src","sources":["hooks/useRiveTrigger.ts"],"mappings":";;;AAAA,SAASA,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAS5C,SAASC,eAAe,QAAQ,sBAAmB;AAEnD,MAAMC,kBAAkB,GAAGA,CAACC,GAAsB,EAAEC,CAAS,KAC3DD,GAAG,CAACE,eAAe,CAACD,CAAC,CAAC;;AAExB;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAAAE,eAAAC,IAAA,EAAAC,iBAAA,EAAAC,MAAA;EAAA,MAAAC,CAAA,GAAAC,EAAA;EAAA,IAAAC,EAAA;EAAA,IAAAF,CAAA,QAAAD,MAAA;IAKiBG,EAAA,GAAAH,MAAY,IAAZ,CAAW,CAAC;IAAAC,CAAA,MAAAD,MAAA;IAAAC,CAAA,MAAAE,EAAA;EAAA;IAAAA,EAAA,GAAAF,CAAA;EAAA;EAAlC;IAAAG;EAAA,IAAsBD,EAAY;EAAC,IAAAE,EAAA;EAAA,IAAAJ,CAAA,QAAAG,SAAA;IAG1BC,EAAA;MAAAC,WAAA,EACQb,kBAAkB;MAAAc,uBAAA,EACNH;IAC3B,CAAC;IAAAH,CAAA,MAAAG,SAAA;IAAAH,CAAA,MAAAI,EAAA;EAAA;IAAAA,EAAA,GAAAJ,CAAA;EAAA;EAJH,MAAAO,cAAA,GACSH,EAGN;EAIH,UAAAI,KAAA,EAAAC,QAAA,IAAiClB,eAAe,CAG9CO,iBAAiB,EAAED,IAAI,EAAEU,cAAc,CAAC;EAAC,IAAAG,EAAA;EAAA,IAAAV,CAAA,QAAAS,QAAA;IAEfC,EAAA,GAAAA,CAAA;MAC1B,IAAID,QAAQ;QACVA,QAAQ,CAAAE,OAAQ,CAAC,CAAC;MAAA;IACnB,CACF;IAAAX,CAAA,MAAAS,QAAA;IAAAT,CAAA,MAAAU,EAAA;EAAA;IAAAA,EAAA,GAAAV,CAAA;EAAA;EAJD,MAAAW,OAAA,GAAgBD,EAIF;EAAC,IAAAE,EAAA;EAAA,IAAAZ,CAAA,QAAAQ,KAAA,IAAAR,CAAA,QAAAW,OAAA;IAERC,EAAA;MAAAD,OAAA;MAAAH;IAAiB,CAAC;IAAAR,CAAA,MAAAQ,KAAA;IAAAR,CAAA,MAAAW,OAAA;IAAAX,CAAA,MAAAY,EAAA;EAAA;IAAAA,EAAA,GAAAZ,CAAA;EAAA;EAAA,OAAlBY,EAAkB;AAAA","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;
 }