@obitrain/charts 0.10.0 → 0.10.2

package/README.md

@@ -30,6 +30,75 @@ yarn add @shopify/react-native-skia react-native-reanimated react-native-worklet
 The exact ranges live in the `peerDependencies` of `package.json`. Development and tests run on
 Expo SDK 57 / React Native 0.86 / Node `>= 20.19.4`.
 
+## Usage
+
+### Static line chart
+
+`buildGraph` converts raw `[x, y][]` data into a `GraphData` (Skia path, data points, d3 scales).
+`LineChart` renders one (`path`) or several (`paths`) paths on a Skia canvas:
+
+```tsx
+import { buildGraph, LineChart } from '@obitrain/charts';
+
+const WIDTH = 300;
+const HEIGHT = 140;
+
+const data: [number, number][] = [
+  [0, 10],
+  [1, 25],
+  [2, 18],
+  [3, 40],
+];
+
+const graph = buildGraph(data, WIDTH, HEIGHT);
+
+export function MyChart() {
+  return (
+    <LineChart
+      path={graph.skiaPath}
+      width={WIDTH}
+      height={HEIGHT}
+      color="dodgerblue"
+    />
+  );
+}
+```
+
+### Zoomable line chart
+
+`useScalableGesture` provides the `scale`, `focalX` and `offsetX` shared values plus the pinch/pan
+gestures to wire into a `GestureDetector`:
+
+```tsx
+import {
+  buildGraph,
+  useScalableGesture,
+  ZoomableLineChart,
+} from '@obitrain/charts';
+import { Gesture, GestureDetector } from 'react-native-gesture-handler';
+import { useSharedValue } from 'react-native-reanimated';
+
+export function MyZoomableChart() {
+  const graph = buildGraph(data, WIDTH, HEIGHT);
+  const path = useSharedValue(graph.skiaPath);
+
+  const { scale, focalX, offsetX, pinchGesture, panGesture } =
+    useScalableGesture({ width: WIDTH });
+
+  const gesture = Gesture.Simultaneous(pinchGesture, panGesture);
+
+  return (
+    <GestureDetector gesture={gesture}>
+      <ZoomableLineChart
+        width={WIDTH}
+        height={HEIGHT}
+        {...{ path, scale, focalX, offsetX }}
+      />
+    </GestureDetector>
+  );
+}
+```
+
 ## What's inside
 
 **Components** — `BottomAxis`, `AxisLine`, `Tick`, `Cursor`, `LineChart`, `ZoomableLineChart`,
@@ -116,6 +185,16 @@ yarn gifs --device "iPhone 17 Pro"
 Requires Xcode with an iOS simulator, `ffmpeg` and `jq`. The script boots the simulator, freezes the
 status bar, drives each screen through its deep link and writes `static/<slug>.gif`.
 
+## Releasing
+
+Releases are automated from conventional commits. Every push to `main` updates a "Release" pull
+request (release-please) with the next version and changelog; merging it tags the release, creates the
+GitHub release and publishes `@obitrain/charts` to npm from CI via trusted publishing, so no npm token
+or one-time password is involved.
+
+One-time setup on npmjs.com, under the package's *Settings → Trusted publishing*: add a GitHub Actions
+publisher for `Obitrain/obi-chart` with workflow `release.yml`.
+
 ## Contributing
 
 See the [contributing guide](CONTRIBUTING.md) to learn how to contribute to the repository and the development workflow.

package/lib/commonjs/Charts/BottomAxis/AxisLine.js

@@ -7,7 +7,7 @@ exports.AxisLine = void 0;
 var _reactNativeSkia = require("@shopify/react-native-skia");
 var _reactNative = require("react-native");
 var _reactNativeReanimated = require("react-native-reanimated");
-var _gesture = require("../gesture");
+var _gesture = require("../gesture.js");
 var _jsxRuntime = require("react/jsx-runtime");
 const AxisLine = function (props) {
   const {
@@ -22,11 +22,11 @@ const AxisLine = function (props) {
   const p1 = (0, _reactNativeReanimated.useDerivedValue)(() => {
     const p1X = (0, _gesture.getPositionWl)(0, focalX.value, scale.value, offsetX.value);
     return (0, _reactNativeSkia.vec)(p1X, offsetY);
-  }, []);
+  });
   const p2 = (0, _reactNativeReanimated.useDerivedValue)(() => {
-    const p1X = (0, _gesture.getPositionWl)(width, focalX.value, scale.value, offsetX.value);
-    return (0, _reactNativeSkia.vec)(p1X, offsetY);
-  }, [width]);
+    const p2X = (0, _gesture.getPositionWl)(width, focalX.value, scale.value, offsetX.value);
+    return (0, _reactNativeSkia.vec)(p2X, offsetY);
+  });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeSkia.Line, {
     p1,
     p2,

package/lib/commonjs/Charts/BottomAxis/AxisLine.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeSkia","require","_reactNative","_reactNativeReanimated","_gesture","_jsxRuntime","AxisLine","props","width","focalX","scale","offsetX","offsetY","strokeWidth","StyleSheet","hairlineWidth","color","p1","useDerivedValue","p1X","getPositionWl","value","vec","p2","jsx","Line","exports"],"sourceRoot":"../../../../src","sources":["Charts/BottomAxis/AxisLine.tsx"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AAEA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AAA2C,IAAAI,WAAA,GAAAJ,OAAA;AAY3C,MAAMK,QAA2B,GAAG,SAAAA,CAAUC,KAAK,EAAE;EACnD,MAAM;IACJC,KAAK;IACLC,MAAM;IACNC,KAAK;IACLC,OAAO;IACPC,OAAO,GAAG,CAAC;IACXC,WAAW,GAAGC,uBAAU,CAACC,aAAa;IACtCC,KAAK,GAAG;EACV,CAAC,GAAGT,KAAK;EACT,MAAMU,EAAE,GAAG,IAAAC,sCAAe,EAAC,MAAM;IAC/B,MAAMC,GAAG,GAAG,IAAAC,sBAAa,EAAC,CAAC,EAAEX,MAAM,CAACY,KAAK,EAAEX,KAAK,CAACW,KAAK,EAAEV,OAAO,CAACU,KAAK,CAAC;IACtE,OAAO,IAAAC,oBAAG,EAACH,GAAG,EAAEP,OAAO,CAAC;EAC1B,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMW,EAAE,GAAG,IAAAL,sCAAe,EAAC,MAAM;IAC/B,MAAMC,GAAG,GAAG,IAAAC,sBAAa,EAACZ,KAAK,EAAEC,MAAM,CAACY,KAAK,EAAEX,KAAK,CAACW,KAAK,EAAEV,OAAO,CAACU,KAAK,CAAC;IAC1E,OAAO,IAAAC,oBAAG,EAACH,GAAG,EAAEP,OAAO,CAAC;EAC1B,CAAC,EAAE,CAACJ,KAAK,CAAC,CAAC;EAEX,oBAAO,IAAAH,WAAA,CAAAmB,GAAA,EAACxB,gBAAA,CAAAyB,IAAI;IAAOR,EAAE;IAAEM,EAAE;IAAEP,KAAK;IAAEH;EAAW,CAAK,CAAC;AACrD,CAAC;AAACa,OAAA,CAAApB,QAAA,GAAAA,QAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeSkia","require","_reactNative","_reactNativeReanimated","_gesture","_jsxRuntime","AxisLine","props","width","focalX","scale","offsetX","offsetY","strokeWidth","StyleSheet","hairlineWidth","color","p1","useDerivedValue","p1X","getPositionWl","value","vec","p2","p2X","jsx","Line","exports"],"sourceRoot":"../../../../src","sources":["Charts/BottomAxis/AxisLine.tsx"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AAEA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AAA2C,IAAAI,WAAA,GAAAJ,OAAA;AAY3C,MAAMK,QAA2B,GAAG,SAAAA,CAAUC,KAAK,EAAE;EACnD,MAAM;IACJC,KAAK;IACLC,MAAM;IACNC,KAAK;IACLC,OAAO;IACPC,OAAO,GAAG,CAAC;IACXC,WAAW,GAAGC,uBAAU,CAACC,aAAa;IACtCC,KAAK,GAAG;EACV,CAAC,GAAGT,KAAK;EACT,MAAMU,EAAE,GAAG,IAAAC,sCAAe,EAAC,MAAM;IAC/B,MAAMC,GAAG,GAAG,IAAAC,sBAAa,EAAC,CAAC,EAAEX,MAAM,CAACY,KAAK,EAAEX,KAAK,CAACW,KAAK,EAAEV,OAAO,CAACU,KAAK,CAAC;IACtE,OAAO,IAAAC,oBAAG,EAACH,GAAG,EAAEP,OAAO,CAAC;EAC1B,CAAC,CAAC;EAEF,MAAMW,EAAE,GAAG,IAAAL,sCAAe,EAAC,MAAM;IAC/B,MAAMM,GAAG,GAAG,IAAAJ,sBAAa,EAACZ,KAAK,EAAEC,MAAM,CAACY,KAAK,EAAEX,KAAK,CAACW,KAAK,EAAEV,OAAO,CAACU,KAAK,CAAC;IAC1E,OAAO,IAAAC,oBAAG,EAACE,GAAG,EAAEZ,OAAO,CAAC;EAC1B,CAAC,CAAC;EAEF,oBAAO,IAAAP,WAAA,CAAAoB,GAAA,EAACzB,gBAAA,CAAA0B,IAAI;IAAOT,EAAE;IAAEM,EAAE;IAAEP,KAAK;IAAEH;EAAW,CAAK,CAAC;AACrD,CAAC;AAACc,OAAA,CAAArB,QAAA,GAAAA,QAAA","ignoreList":[]}

package/lib/commonjs/Charts/BottomAxis/BottomAxis.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BottomAxis = void 0;
 var _reactNativeSkia = require("@shopify/react-native-skia");
-var _AxisLine = require("./AxisLine");
-var _Tick = require("./Tick");
+var _AxisLine = require("./AxisLine.js");
+var _Tick = require("./Tick.js");
 var _jsxRuntime = require("react/jsx-runtime");
 // ChartUtilsScreen.tsx
 
@@ -21,7 +21,7 @@ const BottomAxis = function (props) {
     font
   } = props;
   const offsetY = props.offsetY ?? 0;
-  const tickInterval = width / (labels.length - 1);
+  const tickInterval = labels.length > 1 ? width / (labels.length - 1) : 0;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNativeSkia.Canvas, {
     style: style,
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_AxisLine.AxisLine, {

package/lib/commonjs/Charts/BottomAxis/BottomAxis.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeSkia","require","_AxisLine","_Tick","_jsxRuntime","BottomAxis","props","labels","scale","focalX","offsetX","style","width","font","offsetY","tickInterval","length","jsxs","Canvas","children","jsx","AxisLine","map","_label","i","Tick","label","initPosition","exports"],"sourceRoot":"../../../../src","sources":["Charts/BottomAxis/BottomAxis.tsx"],"mappings":";;;;;;AACA,IAAAA,gBAAA,GAAAC,OAAA;AAIA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,KAAA,GAAAF,OAAA;AAA8B,IAAAG,WAAA,GAAAH,OAAA;AAN9B;;AAoBA,MAAMI,UAA+B,GAAG,SAAAA,CAAUC,KAAK,EAAE;EACvD,MAAM;IAAEC,MAAM;IAAEC,KAAK;IAAEC,MAAM;IAAEC,OAAO;IAAEC,KAAK;IAAEC,KAAK;IAAEC;EAAK,CAAC,GAAGP,KAAK;EACpE,MAAMQ,OAAO,GAAGR,KAAK,CAACQ,OAAO,IAAI,CAAC;EAClC,MAAMC,YAAY,GAAGH,KAAK,IAAIL,MAAM,CAACS,MAAM,GAAG,CAAC,CAAC;EAEhD,oBACE,IAAAZ,WAAA,CAAAa,IAAA,EAACjB,gBAAA,CAAAkB,MAAM;IAACP,KAAK,EAAEA,KAAM;IAAAQ,QAAA,gBACnB,IAAAf,WAAA,CAAAgB,GAAA,EAAClB,SAAA,CAAAmB,QAAQ;MAAOT,KAAK;MAAEE,OAAO;MAAEL,MAAM;MAAED,KAAK;MAAEE;IAAO,CAAK,CAAC,EAC3DH,MAAM,CAACe,GAAG,CAAC,CAACC,MAAM,EAAEC,CAAC,kBACpB,IAAApB,WAAA,CAAAgB,GAAA,EAACjB,KAAA,CAAAsB,IAAI;MAEHC,KAAK,EAAEH,MAAO;MACdI,YAAY,EAAEZ,YAAY,GAAGS,CAAE;MACzBd,OAAO;MAAEI,OAAO;MAAEL,MAAM;MAAED,KAAK;MAAEK;IAAI,GAHtCW,CAIN,CACF,CAAC;EAAA,CACI,CAAC;AAEb,CAAC;AAACI,OAAA,CAAAvB,UAAA,GAAAA,UAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeSkia","require","_AxisLine","_Tick","_jsxRuntime","BottomAxis","props","labels","scale","focalX","offsetX","style","width","font","offsetY","tickInterval","length","jsxs","Canvas","children","jsx","AxisLine","map","_label","i","Tick","label","initPosition","exports"],"sourceRoot":"../../../../src","sources":["Charts/BottomAxis/BottomAxis.tsx"],"mappings":";;;;;;AACA,IAAAA,gBAAA,GAAAC,OAAA;AAIA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,KAAA,GAAAF,OAAA;AAA8B,IAAAG,WAAA,GAAAH,OAAA;AAN9B;;AAoBA,MAAMI,UAA+B,GAAG,SAAAA,CAAUC,KAAK,EAAE;EACvD,MAAM;IAAEC,MAAM;IAAEC,KAAK;IAAEC,MAAM;IAAEC,OAAO;IAAEC,KAAK;IAAEC,KAAK;IAAEC;EAAK,CAAC,GAAGP,KAAK;EACpE,MAAMQ,OAAO,GAAGR,KAAK,CAACQ,OAAO,IAAI,CAAC;EAClC,MAAMC,YAAY,GAAGR,MAAM,CAACS,MAAM,GAAG,CAAC,GAAGJ,KAAK,IAAIL,MAAM,CAACS,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC;EAExE,oBACE,IAAAZ,WAAA,CAAAa,IAAA,EAACjB,gBAAA,CAAAkB,MAAM;IAACP,KAAK,EAAEA,KAAM;IAAAQ,QAAA,gBACnB,IAAAf,WAAA,CAAAgB,GAAA,EAAClB,SAAA,CAAAmB,QAAQ;MAAOT,KAAK;MAAEE,OAAO;MAAEL,MAAM;MAAED,KAAK;MAAEE;IAAO,CAAK,CAAC,EAC3DH,MAAM,CAACe,GAAG,CAAC,CAACC,MAAM,EAAEC,CAAC,kBACpB,IAAApB,WAAA,CAAAgB,GAAA,EAACjB,KAAA,CAAAsB,IAAI;MAEHC,KAAK,EAAEH,MAAO;MACdI,YAAY,EAAEZ,YAAY,GAAGS,CAAE;MACzBd,OAAO;MAAEI,OAAO;MAAEL,MAAM;MAAED,KAAK;MAAEK;IAAI,GAHtCW,CAIN,CACF,CAAC;EAAA,CACI,CAAC;AAEb,CAAC;AAACI,OAAA,CAAAvB,UAAA,GAAAA,UAAA","ignoreList":[]}

package/lib/commonjs/Charts/BottomAxis/Tick.js

@@ -7,7 +7,7 @@ exports.Tick = void 0;
 var _reactNativeSkia = require("@shopify/react-native-skia");
 var _react = _interopRequireDefault(require("react"));
 var _reactNativeReanimated = require("react-native-reanimated");
-var _gesture = require("../gesture");
+var _gesture = require("../gesture.js");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const Tick = props => {
@@ -22,7 +22,7 @@ const Tick = props => {
   const offsetY = props.offsetY ?? 0;
   const transform = (0, _reactNativeReanimated.useDerivedValue)(() => [{
     translateX: (0, _gesture.getPositionWl)(initPosition, focalX.value, scale.value, offsetX.value)
-  }], [initPosition, offsetX]);
+  }]);
   const width = font.getGlyphWidths(font.getGlyphIDs(label)).reduce((a, b) => a + b, 0);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNativeSkia.Group, {
     transform: transform,

package/lib/commonjs/Charts/BottomAxis/Tick.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeSkia","require","_react","_interopRequireDefault","_reactNativeReanimated","_gesture","_jsxRuntime","e","__esModule","default","Tick","props","label","scale","focalX","offsetX","initPosition","font","offsetY","transform","useDerivedValue","translateX","getPositionWl","value","width","getGlyphWidths","getGlyphIDs","reduce","a","b","jsxs","Group","children","jsx","Line","color","p1","vec","p2","Text","text","x","y","exports"],"sourceRoot":"../../../../src","sources":["Charts/BottomAxis/Tick.tsx"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AAOA,IAAAC,MAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,sBAAA,GAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;AAA2C,IAAAK,WAAA,GAAAL,OAAA;AAAA,SAAAE,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAYpC,MAAMG,IAAyB,GAAIC,KAAK,IAAK;EAClD,MAAM;IAAEC,KAAK;IAAEC,KAAK;IAAEC,MAAM;IAAEC,OAAO;IAAEC,YAAY;IAAEC;EAAK,CAAC,GAAGN,KAAK;EACnE,MAAMO,OAAO,GAAGP,KAAK,CAACO,OAAO,IAAI,CAAC;EAClC,MAAMC,SAAS,GAAG,IAAAC,sCAAe,EAC/B,MAAM,CACJ;IACEC,UAAU,EAAE,IAAAC,sBAAa,EACvBN,YAAY,EACZF,MAAM,CAACS,KAAK,EACZV,KAAK,CAACU,KAAK,EACXR,OAAO,CAACQ,KACV;EACF,CAAC,CACF,EACD,CAACP,YAAY,EAAED,OAAO,CACxB,CAAC;EACD,MAAMS,KAAK,GAAGP,IAAI,CACfQ,cAAc,CAACR,IAAI,CAACS,WAAW,CAACd,KAAK,CAAC,CAAC,CACvCe,MAAM,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAKD,CAAC,GAAGC,CAAC,EAAE,CAAC,CAAC;EAE7B,oBACE,IAAAvB,WAAA,CAAAwB,IAAA,EAAC9B,gBAAA,CAAA+B,KAAK;IAACZ,SAAS,EAAEA,SAAU;IAAAa,QAAA,gBAC1B,IAAA1B,WAAA,CAAA2B,GAAA,EAACjC,gBAAA,CAAAkC,IAAI;MAACC,KAAK,EAAC,OAAO;MAACC,EAAE,EAAE,IAAAC,oBAAG,EAAC,CAAC,EAAEnB,OAAO,CAAE;MAACoB,EAAE,EAAE,IAAAD,oBAAG,EAAC,CAAC,EAAEnB,OAAO,GAAG,EAAE;IAAE,CAAE,CAAC,eACrE,IAAAZ,WAAA,CAAA2B,GAAA,EAACjC,gBAAA,CAAAuC,IAAI;MACHC,IAAI,EAAE5B,KAAM;MACZuB,KAAK,EAAC,OAAO;MACbM,CAAC,EAAE,CAACjB,KAAK,GAAG,CAAE;MACdkB,CAAC,EAAExB,OAAO,GAAG,EAAG;MAChBD,IAAI,EAAEA;IAAK,CACZ,CAAC;EAAA,CACG,CAAC;AAEZ,CAAC;AAAC0B,OAAA,CAAAjC,IAAA,GAAAA,IAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeSkia","require","_react","_interopRequireDefault","_reactNativeReanimated","_gesture","_jsxRuntime","e","__esModule","default","Tick","props","label","scale","focalX","offsetX","initPosition","font","offsetY","transform","useDerivedValue","translateX","getPositionWl","value","width","getGlyphWidths","getGlyphIDs","reduce","a","b","jsxs","Group","children","jsx","Line","color","p1","vec","p2","Text","text","x","y","exports"],"sourceRoot":"../../../../src","sources":["Charts/BottomAxis/Tick.tsx"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AAOA,IAAAC,MAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,sBAAA,GAAAH,OAAA;AACA,IAAAI,QAAA,GAAAJ,OAAA;AAA2C,IAAAK,WAAA,GAAAL,OAAA;AAAA,SAAAE,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAYpC,MAAMG,IAAyB,GAAIC,KAAK,IAAK;EAClD,MAAM;IAAEC,KAAK;IAAEC,KAAK;IAAEC,MAAM;IAAEC,OAAO;IAAEC,YAAY;IAAEC;EAAK,CAAC,GAAGN,KAAK;EACnE,MAAMO,OAAO,GAAGP,KAAK,CAACO,OAAO,IAAI,CAAC;EAClC,MAAMC,SAAS,GAAG,IAAAC,sCAAe,EAAC,MAAM,CACtC;IACEC,UAAU,EAAE,IAAAC,sBAAa,EACvBN,YAAY,EACZF,MAAM,CAACS,KAAK,EACZV,KAAK,CAACU,KAAK,EACXR,OAAO,CAACQ,KACV;EACF,CAAC,CACF,CAAC;EACF,MAAMC,KAAK,GAAGP,IAAI,CACfQ,cAAc,CAACR,IAAI,CAACS,WAAW,CAACd,KAAK,CAAC,CAAC,CACvCe,MAAM,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAKD,CAAC,GAAGC,CAAC,EAAE,CAAC,CAAC;EAE7B,oBACE,IAAAvB,WAAA,CAAAwB,IAAA,EAAC9B,gBAAA,CAAA+B,KAAK;IAACZ,SAAS,EAAEA,SAAU;IAAAa,QAAA,gBAC1B,IAAA1B,WAAA,CAAA2B,GAAA,EAACjC,gBAAA,CAAAkC,IAAI;MAACC,KAAK,EAAC,OAAO;MAACC,EAAE,EAAE,IAAAC,oBAAG,EAAC,CAAC,EAAEnB,OAAO,CAAE;MAACoB,EAAE,EAAE,IAAAD,oBAAG,EAAC,CAAC,EAAEnB,OAAO,GAAG,EAAE;IAAE,CAAE,CAAC,eACrE,IAAAZ,WAAA,CAAA2B,GAAA,EAACjC,gBAAA,CAAAuC,IAAI;MACHC,IAAI,EAAE5B,KAAM;MACZuB,KAAK,EAAC,OAAO;MACbM,CAAC,EAAE,CAACjB,KAAK,GAAG,CAAE;MACdkB,CAAC,EAAExB,OAAO,GAAG,EAAG;MAChBD,IAAI,EAAEA;IAAK,CACZ,CAAC;EAAA,CACG,CAAC;AAEZ,CAAC;AAAC0B,OAAA,CAAAjC,IAAA,GAAAA,IAAA","ignoreList":[]}

package/lib/commonjs/Charts/BottomAxis/index.js

@@ -21,7 +21,7 @@ Object.defineProperty(exports, "Tick", {
     return _Tick.Tick;
   }
 });
-var _AxisLine = require("./AxisLine");
-var _BottomAxis = require("./BottomAxis");
-var _Tick = require("./Tick");
+var _AxisLine = require("./AxisLine.js");
+var _BottomAxis = require("./BottomAxis.js");
+var _Tick = require("./Tick.js");
 //# sourceMappingURL=index.js.map

package/lib/commonjs/Charts/Cursor.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.Cursor = void 0;
 var _reactNativeSkia = require("@shopify/react-native-skia");
 var _reactNativeReanimated = require("react-native-reanimated");
-var _maths = require("./maths");
+var _maths = require("./maths.js");
 var _jsxRuntime = require("react/jsx-runtime");
 const CURSOR_SIZE = 10;
 const Cursor = function ({
@@ -18,21 +18,20 @@ const Cursor = function ({
   size = CURSOR_SIZE
 }) {
   if (currentValue !== undefined && translateY !== undefined) {
-    console.warn('Current value as no effect when translateY is set');
+    console.warn('currentValue has no effect when translateY is set');
   }
-  const _translateY = translateY ? translateY :
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _reactNativeReanimated.useDerivedValue)(() => {
+  const derivedTranslateY = (0, _reactNativeReanimated.useDerivedValue)(() => {
     const _commands = commands?.value;
     if (_commands === undefined) {
       return 0;
     }
     const _value = (0, _maths.getYForX)(_commands, positionX.value) ?? 0;
-    if (currentValue !== undefined) {
+    if (translateY === undefined && currentValue !== undefined) {
       currentValue.value = _value;
     }
     return _value;
   });
+  const _translateY = translateY ?? derivedTranslateY;
   const transform = (0, _reactNativeReanimated.useDerivedValue)(() => [{
     translateX: positionX.value
   }, {

package/lib/commonjs/Charts/Cursor.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeSkia","require","_reactNativeReanimated","_maths","_jsxRuntime","CURSOR_SIZE","Cursor","commands","positionX","color","currentValue","translateY","size","undefined","console","warn","_translateY","useDerivedValue","_commands","value","_value","getYForX","transform","translateX","jsx","Circle","cx","cy","r","exports"],"sourceRoot":"../../../src","sources":["Charts/Cursor.tsx"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AAEA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AAAmC,IAAAG,WAAA,GAAAH,OAAA;AAEnC,MAAMI,WAAW,GAAG,EAAE;AAWtB,MAAMC,MAAuB,GAAG,SAAAA,CAAU;EACxCC,QAAQ;EACRC,SAAS;EACTC,KAAK;EACLC,YAAY;EACZC,UAAU;EACVC,IAAI,GAAGP;AACT,CAAC,EAAE;EACD,IAAIK,YAAY,KAAKG,SAAS,IAAIF,UAAU,KAAKE,SAAS,EAAE;IAC1DC,OAAO,CAACC,IAAI,CAAC,mDAAmD,CAAC;EACnE;EAEA,MAAMC,WAAW,GAAGL,UAAU,GAC1BA,UAAU;EACV;EACA,IAAAM,sCAAe,EAAC,MAAM;IACpB,MAAMC,SAAS,GAAGX,QAAQ,EAAEY,KAAK;IACjC,IAAID,SAAS,KAAKL,SAAS,EAAE;MAC3B,OAAO,CAAC;IACV;IACA,MAAMO,MAAM,GAAG,IAAAC,eAAQ,EAACH,SAAS,EAAEV,SAAS,CAACW,KAAK,CAAC,IAAI,CAAC;IACxD,IAAIT,YAAY,KAAKG,SAAS,EAAE;MAC9BH,YAAY,CAACS,KAAK,GAAGC,MAAM;IAC7B;IACA,OAAOA,MAAM;EACf,CAAC,CAAC;EAEN,MAAME,SAAS,GAAG,IAAAL,sCAAe,EAAC,MAAM,CACtC;IAAEM,UAAU,EAAEf,SAAS,CAACW;EAAM,CAAC,EAC/B;IAAER,UAAU,EAAEK,WAAW,CAACG,KAAK,IAAI;EAAE,CAAC,CACvC,CAAC;EACF,oBAAO,IAAAf,WAAA,CAAAoB,GAAA,EAACxB,gBAAA,CAAAyB,MAAM;IAACH,SAAS,EAAEA,SAAU;IAACI,EAAE,EAAE,CAAE;IAACC,EAAE,EAAE,CAAE;IAACC,CAAC,EAAEhB,IAAK;IAACH,KAAK,EAAEA;EAAM,CAAE,CAAC;AAC9E,CAAC;AAACoB,OAAA,CAAAvB,MAAA,GAAAA,MAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeSkia","require","_reactNativeReanimated","_maths","_jsxRuntime","CURSOR_SIZE","Cursor","commands","positionX","color","currentValue","translateY","size","undefined","console","warn","derivedTranslateY","useDerivedValue","_commands","value","_value","getYForX","_translateY","transform","translateX","jsx","Circle","cx","cy","r","exports"],"sourceRoot":"../../../src","sources":["Charts/Cursor.tsx"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AAEA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AAAmC,IAAAG,WAAA,GAAAH,OAAA;AAEnC,MAAMI,WAAW,GAAG,EAAE;AAWtB,MAAMC,MAAuB,GAAG,SAAAA,CAAU;EACxCC,QAAQ;EACRC,SAAS;EACTC,KAAK;EACLC,YAAY;EACZC,UAAU;EACVC,IAAI,GAAGP;AACT,CAAC,EAAE;EACD,IAAIK,YAAY,KAAKG,SAAS,IAAIF,UAAU,KAAKE,SAAS,EAAE;IAC1DC,OAAO,CAACC,IAAI,CAAC,mDAAmD,CAAC;EACnE;EAEA,MAAMC,iBAAiB,GAAG,IAAAC,sCAAe,EAAC,MAAM;IAC9C,MAAMC,SAAS,GAAGX,QAAQ,EAAEY,KAAK;IACjC,IAAID,SAAS,KAAKL,SAAS,EAAE;MAC3B,OAAO,CAAC;IACV;IACA,MAAMO,MAAM,GAAG,IAAAC,eAAQ,EAACH,SAAS,EAAEV,SAAS,CAACW,KAAK,CAAC,IAAI,CAAC;IACxD,IAAIR,UAAU,KAAKE,SAAS,IAAIH,YAAY,KAAKG,SAAS,EAAE;MAC1DH,YAAY,CAACS,KAAK,GAAGC,MAAM;IAC7B;IACA,OAAOA,MAAM;EACf,CAAC,CAAC;EAEF,MAAME,WAAW,GAAGX,UAAU,IAAIK,iBAAiB;EAEnD,MAAMO,SAAS,GAAG,IAAAN,sCAAe,EAAC,MAAM,CACtC;IAAEO,UAAU,EAAEhB,SAAS,CAACW;EAAM,CAAC,EAC/B;IAAER,UAAU,EAAEW,WAAW,CAACH,KAAK,IAAI;EAAE,CAAC,CACvC,CAAC;EACF,oBAAO,IAAAf,WAAA,CAAAqB,GAAA,EAACzB,gBAAA,CAAA0B,MAAM;IAACH,SAAS,EAAEA,SAAU;IAACI,EAAE,EAAE,CAAE;IAACC,EAAE,EAAE,CAAE;IAACC,CAAC,EAAEjB,IAAK;IAACH,KAAK,EAAEA;EAAM,CAAE,CAAC;AAC9E,CAAC;AAACqB,OAAA,CAAAxB,MAAA,GAAAA,MAAA","ignoreList":[]}

package/lib/commonjs/Charts/Linechart/index.js

@@ -8,6 +8,8 @@ var _reactNativeSkia = require("@shopify/react-native-skia");
 var _react = _interopRequireDefault(require("react"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// Require at least one of `path` / `paths` at compile time
+
 const LineChart = function (props) {
   const {
     width,

package/lib/commonjs/Charts/Linechart/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeSkia","require","_react","_interopRequireDefault","_jsxRuntime","e","__esModule","default","LineChart","props","width","height","style","path","children","color","paths","background","offsetX","offsetY","_paths","undefined","length","console","warn","jsx","Canvas","jsxs","Group","transform","translateY","translateX","map","_path","i","Path","strokeWidth","strokeJoin","strokeCap","id","exports"],"sourceRoot":"../../../../src","sources":["Charts/Linechart/index.tsx"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAC,sBAAA,CAAAF,OAAA;AAA0B,IAAAG,WAAA,GAAAH,OAAA;AAAA,SAAAE,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAuB1B,MAAMG,SAA6B,GAAG,SAAAA,CAAUC,KAAK,EAAE;EACrD,MAAM;IACJC,KAAK;IACLC,MAAM;IACNC,KAAK;IACLC,IAAI;IACJC,QAAQ;IACRC,KAAK;IACLC,KAAK;IACLC,UAAU;IACVC,OAAO,GAAG,CAAC;IACXC,OAAO,GAAG;EACZ,CAAC,GAAGV,KAAK;EAET,MAAMW,MAAkB,GACtBJ,KAAK,KAAKK,SAAS,GACfL,KAAK,GACLH,IAAI,KAAKQ,SAAS,GAClB,CAAC;IAAER,IAAI,EAAEA,IAAI;IAAEE,KAAK,EAAEA,KAAK,IAAI;EAAM,CAAC,CAAC,GACvC,EAAE;EACR,IAAIK,MAAM,CAACE,MAAM,KAAK,CAAC,EAAE;IACvBC,OAAO,CAACC,IAAI,CAAC,0CAA0C,CAAC;IACxD,OAAO,IAAI;IACX;EACF;EACA,oBACE,IAAApB,WAAA,CAAAqB,GAAA,EAACzB,gBAAA,CAAA0B,MAAM;IACLd,KAAK,EAAE,CACL;MACEF,KAAK;MACLC;IACF,CAAC,EACDC,KAAK,CACL;IAAAE,QAAA,eAEF,IAAAV,WAAA,CAAAuB,IAAA,EAAC3B,gBAAA,CAAA4B,KAAK;MAACC,SAAS,EAAE,CAAC;QAAEC,UAAU,EAAEX;MAAQ,CAAC,EAAE;QAAEY,UAAU,EAAEb;MAAQ,CAAC,CAAE;MAAAJ,QAAA,GAClEG,UAAU,EACVG,MAAM,CAACY,GAAG,CAAC,CAACC,KAAK,EAAEC,CAAC,kBACnB,IAAA9B,WAAA,CAAAqB,GAAA,EAACzB,gBAAA,CAAAmC,IAAI;QAEHvB,KAAK,EAAC,QAAQ;QAAA,GACVqB,KAAK;QACTG,WAAW,EAAE,CAAE;QACfC,UAAU,EAAC,OAAO;QAClBC,SAAS,EAAC;MAAO,GALZ,GAAGL,KAAK,CAACM,EAAE,IAAIL,CAAC,EAMtB,CACF,CAAC,EACDpB,QAAQ;IAAA,CACJ;EAAC,CACF,CAAC;AAEb,CAAC;AAAC0B,OAAA,CAAAhC,SAAA,GAAAA,SAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeSkia","require","_react","_interopRequireDefault","_jsxRuntime","e","__esModule","default","LineChart","props","width","height","style","path","children","color","paths","background","offsetX","offsetY","_paths","undefined","length","console","warn","jsx","Canvas","jsxs","Group","transform","translateY","translateX","map","_path","i","Path","strokeWidth","strokeJoin","strokeCap","id","exports"],"sourceRoot":"../../../../src","sources":["Charts/Linechart/index.tsx"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAC,sBAAA,CAAAF,OAAA;AAA0B,IAAAG,WAAA,GAAAH,OAAA;AAAA,SAAAE,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAoB1B;;AAOA,MAAMG,SAA6B,GAAG,SAAAA,CAAUC,KAAK,EAAE;EACrD,MAAM;IACJC,KAAK;IACLC,MAAM;IACNC,KAAK;IACLC,IAAI;IACJC,QAAQ;IACRC,KAAK;IACLC,KAAK;IACLC,UAAU;IACVC,OAAO,GAAG,CAAC;IACXC,OAAO,GAAG;EACZ,CAAC,GAAGV,KAAK;EAET,MAAMW,MAAkB,GACtBJ,KAAK,KAAKK,SAAS,GACfL,KAAK,GACLH,IAAI,KAAKQ,SAAS,GAClB,CAAC;IAAER,IAAI,EAAEA,IAAI;IAAEE,KAAK,EAAEA,KAAK,IAAI;EAAM,CAAC,CAAC,GACvC,EAAE;EACR,IAAIK,MAAM,CAACE,MAAM,KAAK,CAAC,EAAE;IACvBC,OAAO,CAACC,IAAI,CAAC,0CAA0C,CAAC;IACxD,OAAO,IAAI;IACX;EACF;EACA,oBACE,IAAApB,WAAA,CAAAqB,GAAA,EAACzB,gBAAA,CAAA0B,MAAM;IACLd,KAAK,EAAE,CACL;MACEF,KAAK;MACLC;IACF,CAAC,EACDC,KAAK,CACL;IAAAE,QAAA,eAEF,IAAAV,WAAA,CAAAuB,IAAA,EAAC3B,gBAAA,CAAA4B,KAAK;MAACC,SAAS,EAAE,CAAC;QAAEC,UAAU,EAAEX;MAAQ,CAAC,EAAE;QAAEY,UAAU,EAAEb;MAAQ,CAAC,CAAE;MAAAJ,QAAA,GAClEG,UAAU,EACVG,MAAM,CAACY,GAAG,CAAC,CAACC,KAAK,EAAEC,CAAC,kBACnB,IAAA9B,WAAA,CAAAqB,GAAA,EAACzB,gBAAA,CAAAmC,IAAI;QAEHvB,KAAK,EAAC,QAAQ;QAAA,GACVqB,KAAK;QACTG,WAAW,EAAE,CAAE;QACfC,UAAU,EAAC,OAAO;QAClBC,SAAS,EAAC;MAAO,GALZ,GAAGL,KAAK,CAACM,EAAE,IAAIL,CAAC,EAMtB,CACF,CAAC,EACDpB,QAAQ;IAAA,CACJ;EAAC,CACF,CAAC;AAEb,CAAC;AAAC0B,OAAA,CAAAhC,SAAA,GAAAA,SAAA","ignoreList":[]}

package/lib/commonjs/Charts/ZoomableLinechart/ScalablePath.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.ScalablePath = void 0;
 var _reactNativeSkia = require("@shopify/react-native-skia");
 var _reactNativeReanimated = require("react-native-reanimated");
-var _graphUtils = require("../graphUtils");
 var _jsxRuntime = require("react/jsx-runtime");
 const ScalablePath = function (props) {
   const {
@@ -18,17 +17,11 @@ const ScalablePath = function (props) {
     color = 'red'
   } = props;
   const animatedPath = (0, _reactNativeReanimated.useDerivedValue)(() => {
-    let _cmds = [];
-    try {
-      _cmds = (0, _graphUtils.scaleCommands)(path.value?.toCmds() ?? [], scale, focalX, offsetX);
-    } catch (e) {
-      console.error('Got error while scaling path: ', typeof e);
-      _cmds = [];
-    }
-    const _path = _reactNativeSkia.Skia.Path.MakeFromCmds(_cmds);
-    if (!_path) throw new Error('Path is null');
+    // Affine equivalent of getPositionWl: x' = scale * x + focalX * (1 - scale) + offsetX
+    const _path = path.value.copy();
+    _path.transform(_reactNativeSkia.Skia.Matrix().translate(focalX.value * (1 - scale.value) + offsetX.value, 0).scale(scale.value, 1));
     return _path;
-  }, [scale]);
+  });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeSkia.Path, {
     style: "stroke",
     path: animatedPath,

package/lib/commonjs/Charts/ZoomableLinechart/ScalablePath.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeSkia","require","_reactNativeReanimated","_graphUtils","_jsxRuntime","ScalablePath","props","path","scale","focalX","offsetX","pathProps","color","animatedPath","useDerivedValue","_cmds","scaleCommands","value","toCmds","e","console","error","_path","Skia","Path","MakeFromCmds","Error","jsx","style","strokeWidth","strokeJoin","strokeCap","exports"],"sourceRoot":"../../../../src","sources":["Charts/ZoomableLinechart/ScalablePath.tsx"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AAOA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AAA8C,IAAAG,WAAA,GAAAH,OAAA;AAW9C,MAAMI,YAAmC,GAAG,SAAAA,CAAUC,KAAK,EAAE;EAC3D,MAAM;IAAEC,IAAI;IAAEC,KAAK;IAAEC,MAAM;IAAEC,OAAO;IAAEC,SAAS;IAAEC,KAAK,GAAG;EAAM,CAAC,GAAGN,KAAK;EAExE,MAAMO,YAAY,GAAG,IAAAC,sCAAe,EAAC,MAAM;IACzC,IAAIC,KAAoB,GAAG,EAAE;IAC7B,IAAI;MACFA,KAAK,GAAG,IAAAC,yBAAa,EAACT,IAAI,CAACU,KAAK,EAAEC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAEV,KAAK,EAAEC,MAAM,EAAEC,OAAO,CAAC;IAC3E,CAAC,CAAC,OAAOS,CAAC,EAAE;MACVC,OAAO,CAACC,KAAK,CAAC,gCAAgC,EAAE,OAAOF,CAAC,CAAC;MACzDJ,KAAK,GAAG,EAAE;IACZ;IACA,MAAMO,KAAK,GAAGC,qBAAI,CAACC,IAAI,CAACC,YAAY,CAACV,KAAK,CAAC;IAC3C,IAAI,CAACO,KAAK,EAAE,MAAM,IAAII,KAAK,CAAC,cAAc,CAAC;IAC3C,OAAOJ,KAAK;EACd,CAAC,EAAE,CAACd,KAAK,CAAC,CAAC;EAEX,oBACE,IAAAJ,WAAA,CAAAuB,GAAA,EAAC3B,gBAAA,CAAAwB,IAAI;IACHI,KAAK,EAAC,QAAQ;IACdrB,IAAI,EAAEM,YAAa;IACnBgB,WAAW,EAAE,CAAE;IACfC,UAAU,EAAC,OAAO;IAClBC,SAAS,EAAC,OAAO;IACjBnB,KAAK,EAAEA,KAAM;IAAA,GACTD;EAAS,CACd,CAAC;AAEN,CAAC;AAACqB,OAAA,CAAA3B,YAAA,GAAAA,YAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeSkia","require","_reactNativeReanimated","_jsxRuntime","ScalablePath","props","path","scale","focalX","offsetX","pathProps","color","animatedPath","useDerivedValue","_path","value","copy","transform","Skia","Matrix","translate","jsx","Path","style","strokeWidth","strokeJoin","strokeCap","exports"],"sourceRoot":"../../../../src","sources":["Charts/ZoomableLinechart/ScalablePath.tsx"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AAEA,IAAAC,sBAAA,GAAAD,OAAA;AAA4E,IAAAE,WAAA,GAAAF,OAAA;AAW5E,MAAMG,YAAmC,GAAG,SAAAA,CAAUC,KAAK,EAAE;EAC3D,MAAM;IAAEC,IAAI;IAAEC,KAAK;IAAEC,MAAM;IAAEC,OAAO;IAAEC,SAAS;IAAEC,KAAK,GAAG;EAAM,CAAC,GAAGN,KAAK;EAExE,MAAMO,YAAY,GAAG,IAAAC,sCAAe,EAAC,MAAM;IACzC;IACA,MAAMC,KAAK,GAAGR,IAAI,CAACS,KAAK,CAACC,IAAI,CAAC,CAAC;IAC/BF,KAAK,CAACG,SAAS,CACbC,qBAAI,CAACC,MAAM,CAAC,CAAC,CACVC,SAAS,CAACZ,MAAM,CAACO,KAAK,IAAI,CAAC,GAAGR,KAAK,CAACQ,KAAK,CAAC,GAAGN,OAAO,CAACM,KAAK,EAAE,CAAC,CAAC,CAC9DR,KAAK,CAACA,KAAK,CAACQ,KAAK,EAAE,CAAC,CACzB,CAAC;IACD,OAAOD,KAAK;EACd,CAAC,CAAC;EAEF,oBACE,IAAAX,WAAA,CAAAkB,GAAA,EAACrB,gBAAA,CAAAsB,IAAI;IACHC,KAAK,EAAC,QAAQ;IACdjB,IAAI,EAAEM,YAAa;IACnBY,WAAW,EAAE,CAAE;IACfC,UAAU,EAAC,OAAO;IAClBC,SAAS,EAAC,OAAO;IACjBf,KAAK,EAAEA,KAAM;IAAA,GACTD;EAAS,CACd,CAAC;AAEN,CAAC;AAACiB,OAAA,CAAAvB,YAAA,GAAAA,YAAA","ignoreList":[]}

package/lib/commonjs/Charts/ZoomableLinechart/index.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "ScalablePath", {
 exports.ZoomableLineChart = void 0;
 var _reactNativeSkia = require("@shopify/react-native-skia");
 var _react = _interopRequireDefault(require("react"));
-var _ScalablePath = require("./ScalablePath");
+var _ScalablePath = require("./ScalablePath.js");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const ZoomableLineChart = function (props) {

package/lib/commonjs/Charts/gesture.js

@@ -8,6 +8,7 @@ var _reactNativeSkia = require("@shopify/react-native-skia");
 var _react = require("react");
 var _reactNativeGestureHandler = require("react-native-gesture-handler");
 var _reactNativeReanimated = require("react-native-reanimated");
+var _reactNativeWorklets = require("react-native-worklets");
 /**
  * Get the position of a point on the axis,
  * given the current focal, scale and offset
@@ -44,13 +45,6 @@ const useScalableGesture = props => {
     offsetX.value = startOffset;
     lastOffsetX.value = startOffset;
   }, [focalX, lastFocalX, lastOffsetX, lastScale, offsetX, scale, startOffset, startScale]);
-  const animateFocalPoint = newFocalX => {
-    'worklet';
-
-    focalX.value = (0, _reactNativeReanimated.withTiming)(newFocalX, {
-      duration: 300
-    }); // Smooth transition with duration
-  };
   const panGesture = _reactNativeGestureHandler.Gesture.Pan().onUpdate(event => {
     const newOffsetX = lastOffsetX.value + event.translationX;
     offsetX.value = newOffsetX;
@@ -61,27 +55,26 @@ const useScalableGesture = props => {
     const rightBound = getPositionWl(width, focalX.value, scale.value, offsetX.value);
     let newOffset;
     if (leftBound > startOffset) {
-      // console.log(`Left Boundary reached`);
       newOffset = offsetX.value - leftBound + startOffset;
-    } else if (rightBound < width) {
-      // console.log(`Right Boundary reached`);
+    } else if (rightBound < width + startOffset) {
       newOffset = offsetX.value + width - rightBound + startOffset;
     } else {
       newOffset = offsetX.value;
     }
-    if (newOffset === undefined) throw new Error('newOffset is undefined');
     offsetX.value = (0, _reactNativeReanimated.withTiming)(newOffset, {
       duration: 300
     });
     lastOffsetX.value = newOffset;
   });
   const pinchGesture = _reactNativeGestureHandler.Gesture.Pinch().onUpdate(event => {
-    const newScale = lastScale.value * event.scale;
-    scale.value = (0, _reactNativeSkia.clamp)(newScale, 1, Infinity); // Clamp the scale value
-    animateFocalPoint(event.focalX);
+    // Rebase offsetX so moving the focal point doesn't shift the content
+    offsetX.value += (focalX.value - event.focalX) * (1 - scale.value);
+    focalX.value = event.focalX;
+    scale.value = (0, _reactNativeSkia.clamp)(lastScale.value * event.scale, 1, Infinity);
   }).onEnd(() => {
     lastScale.value = scale.value;
     lastFocalX.value = focalX.value;
+    lastOffsetX.value = offsetX.value;
   });
   return {
     scale,
@@ -107,11 +100,11 @@ const useUpdateAxis = function (props) {
       if (_curScale === undefined || _prevScale === undefined) throw new Error('Got undefined scale');
       if (currentScale >= _prevScale && currentScale < _curScale && currentIndex.value !== i) {
         currentIndex.value = i;
-        if (onScaleChange !== undefined) (0, _reactNativeReanimated.runOnJS)(onScaleChange)(i);
+        if (onScaleChange !== undefined) (0, _reactNativeWorklets.scheduleOnRN)(onScaleChange, i);
         break;
       }
     }
-  }, []);
+  });
   return {
     currentIndex
   };
@@ -150,30 +143,31 @@ const useCursorGesture = function (props) {
     closestDataPoint,
     isContinuous = true
   } = props;
+  if (!isContinuous && points === undefined) console.warn('Points must be defined for non-continuous mode');
   const xPosition = (0, _reactNativeReanimated.useSharedValue)(0);
-  const yPosition = (0, _reactNativeReanimated.useSharedValue)(height); // GRAPH_HEIGHT
+  const yPosition = (0, _reactNativeReanimated.useSharedValue)(height);
+  const setPosition = (x, y) => {
+    'worklet';
 
-  const panGesture = _reactNativeGestureHandler.Gesture.Pan().onBegin(event => {
-    xPosition.value = (0, _reactNativeSkia.clamp)(event.x, 0, width);
-    yPosition.value = (0, _reactNativeSkia.clamp)(event.y, 0, height);
-  }).onUpdate(event => {
-    xPosition.value = (0, _reactNativeSkia.clamp)(event.x, 0, width);
-    yPosition.value = (0, _reactNativeSkia.clamp)(event.y, 0, height);
-  });
-  const tapGesture = _reactNativeGestureHandler.Gesture.Tap().onBegin(event => {
-    xPosition.value = (0, _reactNativeSkia.clamp)(event.x, 0, width);
-    yPosition.value = (0, _reactNativeSkia.clamp)(event.y, 0, height);
-  });
-  (0, _reactNativeReanimated.useDerivedValue)(() => {
-    if (isContinuous) return;
-    if (points === undefined) {
-      console.warn('Points must be defined for non-continuous mode');
+    yPosition.value = (0, _reactNativeSkia.clamp)(y, 0, height);
+    if (isContinuous || points === undefined) {
+      xPosition.value = (0, _reactNativeSkia.clamp)(x, 0, width);
       return;
     }
-    const _closestDot = getClosestPoint(xPosition.value, points.value);
+    const _closestDot = getClosestPoint((0, _reactNativeSkia.clamp)(x, 0, width), points.value);
+    if (closestDataPoint !== undefined) closestDataPoint.value = _closestDot;
+    xPosition.value = _closestDot.x;
+  };
+  const panGesture = _reactNativeGestureHandler.Gesture.Pan().onBegin(event => setPosition(event.x, event.y)).onUpdate(event => setPosition(event.x, event.y));
+  const tapGesture = _reactNativeGestureHandler.Gesture.Tap().onBegin(event => setPosition(event.x, event.y));
+
+  // Re-snap the cursor when the data points change (e.g. switching graphs)
+  (0, _reactNativeReanimated.useAnimatedReaction)(() => points?.value, _points => {
+    if (isContinuous || _points === undefined || _points.length === 0) return;
+    const _closestDot = getClosestPoint(xPosition.value, _points);
     if (closestDataPoint !== undefined) closestDataPoint.value = _closestDot;
     xPosition.value = _closestDot.x;
-  }, [xPosition, isContinuous]);
+  });
   return {
     panGesture,
     tapGesture,

package/lib/commonjs/Charts/gesture.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeSkia","require","_react","_reactNativeGestureHandler","_reactNativeReanimated","getPositionWl","position","focalX","scale","offsetX","exports","useScalableGesture","props","width","startOffset","startScale","useSharedValue","lastScale","lastFocalX","lastOffsetX","reset","useCallback","value","animateFocalPoint","newFocalX","withTiming","duration","panGesture","Gesture","Pan","onUpdate","event","newOffsetX","translationX","onEnd","leftBound","rightBound","newOffset","undefined","Error","pinchGesture","Pinch","newScale","clamp","Infinity","useUpdateAxis","scales","onScaleChange","currentIndex","useAnimatedReaction","currentScale","_","i","length","_prevScale","_curScale","runOnJS","getClosestPoint","x","dataPoints","closestPoint","minDistance","Math","abs","point","distance","useCursorGesture","height","points","closestDataPoint","isContinuous","xPosition","yPosition","onBegin","y","tapGesture","Tap","useDerivedValue","console","warn","_closestDot"],"sourceRoot":"../../../src","sources":["Charts/gesture.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNativeSkia","require","_react","_reactNativeGestureHandler","_reactNativeReanimated","_reactNativeWorklets","getPositionWl","position","focalX","scale","offsetX","exports","useScalableGesture","props","width","startOffset","startScale","useSharedValue","lastScale","lastFocalX","lastOffsetX","reset","useCallback","value","panGesture","Gesture","Pan","onUpdate","event","newOffsetX","translationX","onEnd","leftBound","rightBound","newOffset","withTiming","duration","pinchGesture","Pinch","clamp","Infinity","useUpdateAxis","scales","onScaleChange","currentIndex","useAnimatedReaction","currentScale","_","i","length","_prevScale","_curScale","undefined","Error","scheduleOnRN","getClosestPoint","x","dataPoints","closestPoint","minDistance","Math","abs","point","distance","useCursorGesture","height","points","closestDataPoint","isContinuous","console","warn","xPosition","yPosition","setPosition","y","_closestDot","onBegin","tapGesture","Tap","_points"],"sourceRoot":"../../../src","sources":["Charts/gesture.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/Charts/graphUtils.js

@@ -8,27 +8,30 @@ var _reactNativeSkia = require("@shopify/react-native-skia");
 var _d3Scale = require("d3-scale");
 var shape = _interopRequireWildcard(require("d3-shape"));
 var _reactNativeReanimated = require("react-native-reanimated");
-var _gesture = require("./gesture");
-var _maths = require("./maths");
+var _gesture = require("./gesture.js");
+var _maths = require("./maths.js");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+/** @deprecated Use {@link BuildGraphConfig} instead */
+
 const buildGraph = function (data, width, height, config) {
-  const minX = config?.minX ?? Math.min(...data.map(x => x[0]));
-  const maxX = config?.maxX ?? Math.max(...data.map(x => x[0]));
+  if (data.length === 0) throw new Error('buildGraph requires at least one data point');
+  const minX = config?.minX ?? Math.min(...data.map(d => d[0]));
+  const maxX = config?.maxX ?? Math.max(...data.map(d => d[0]));
   const scaleX = (0, _d3Scale.scaleLinear)().domain([minX, maxX]).range([0, width]);
-  const minY = config?.minY ?? Math.min(...data.map(x => x[1]));
-  const maxY = config?.maxY ?? Math.max(...data.map(x => x[1]));
+  const minY = config?.minY ?? Math.min(...data.map(d => d[1]));
+  const maxY = config?.maxY ?? Math.max(...data.map(d => d[1]));
   const scaleY = (0, _d3Scale.scaleLinear)().domain([minY, maxY]).range([height, 0]);
-  const fmtValues = data.map(x => [x[1], x[0]]);
-  const path = shape.line().x(([, x]) => scaleX(x)).y(([y]) => scaleY(y)).curve(config?.curve ?? shape.curveBasis)(fmtValues);
-  const dataPoints = fmtValues.map(([y, x]) => ({
+  const path = shape.line().x(([x]) => scaleX(x)).y(([, y]) => scaleY(y)).curve(config?.curve ?? shape.curveBasis)(data);
+  if (path === null) throw new Error('Failed to build the line path');
+  const dataPoints = data.map(([x, y]) => ({
     x: scaleX(x),
     y: scaleY(y),
     value: y
   }));
   const skiaPath = _reactNativeSkia.Skia.Path.MakeFromSVGString(path);
-  if (skiaPath == null) throw new Error('Path not found');
+  if (skiaPath == null) throw new Error('Failed to parse the SVG path');
   return {
-    data: fmtValues,
+    data,
     minY,
     maxY,
     path,
@@ -71,7 +74,6 @@ const scaleCommands = function (commands, scaleX, focalX, offsetX, scaleY) {
       (0, _gesture.getPositionWl)(command[5], focalX.value, scaleX.value, offsetX.value), command[6] * _scaleY];
     }
     if (commandType === _reactNativeSkia.PathVerb.Close) return command;
-    if (commandType === _reactNativeSkia.PathVerb.Move) return command;
     throw new Error(`Unsupported command type ${commandType}`);
   });
 };
@@ -103,27 +105,28 @@ const useDotsTransition = function (props) {
   } = props;
   (0, _reactNativeReanimated.useAnimatedReaction)(() => ({
     _currentGraph: currentGraph.value,
-    _currentCommands: path.value.toCmds()
+    _currentCommands: path.value.toCmds(),
+    // Track the animating x values so y stays glued to the curve
+    // even when the path is swapped instantly or tweens on another duration
+    _xs: dots.map(d => d.x.value)
   }), ({
     _currentGraph,
     _currentCommands
   }) => {
     const newDataPoints = dataPoints[_currentGraph];
     if (newDataPoints === undefined) throw new Error('Data points cannot be undefined');
-    dots.map((_dot, i) => {
+    dots.forEach((_dot, i) => {
       const _newDot = newDataPoints[i];
       if (!_newDot) {
         _dot.opacity.value = opacityWl(0);
         return;
-      } else {
-        _dot.x.value = translateWl(_newDot.x);
-        const newY = (0, _maths.getYForX)(_currentCommands, _dot.x.value);
-        if (newY !== undefined) {
-          _dot.y.value = newY;
-        }
-        //   _dot.y.value = withTiming(newDots[i]!.y, { duration: 1000 });
-        _dot.opacity.value = opacityWl(1);
       }
+      _dot.x.value = translateWl(_newDot.x);
+      const newY = (0, _maths.getYForX)(_currentCommands, _dot.x.value);
+      if (newY !== undefined) {
+        _dot.y.value = newY;
+      }
+      _dot.opacity.value = opacityWl(1);
     });
   });
 };