react-three-map 0.4.3 → 0.6.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # react-three-map
 
+## 0.6.0
+
+### Minor Changes
+
+- 3a9a852: Add `useMap` hook to access the map from react-three-map.
+
+### Patch Changes
+
+- 3a9a852: Better type for `useMap`.
+
+## 0.5.0
+
+### Minor Changes
+
+- 7921f43: Add `useMap` hook to access the map from react-three-map.
+
 ## 0.4.3
 
 ### Patch Changes

package/README.md

@@ -163,3 +163,17 @@ import { Canvas, Coordinates } from 'react-three-map'
 | latitude   | The latitude coordinate where to add the scene.  |            |
 | longitude  | The longitude coordinate where to add the scene. |            |
 | altitude   | The altitude coordinate where to add the scene.  | `0`        |
+
+### useMap
+
+Access the map from inside `react-three-map`.
+
+```tsx
+import { useMap } from "react-three-map";
+// import { useMap } from "react-three-map/maplibre"; if you use maplibre
+const Component = () => {
+  const map = useMap();
+  return <>...</>
+}
+
+```

package/dist/cjs/main.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const jsxRuntime = require("react/jsx-runtime");
 const fiber = require("@react-three/fiber");
-const mapboxGl = require("mapbox-gl");
+const jsxRuntime = require("react/jsx-runtime");
 const react = require("react");
-const reactMapGl = require("react-map-gl");
 const THREE = require("three");
+const mapboxGl = require("mapbox-gl");
+const reactMapGl = require("react-map-gl");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -23,6 +23,43 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const THREE__namespace = /* @__PURE__ */ _interopNamespaceDefault(THREE);
+const useMap$1 = () => fiber.useThree((s) => {
+  var _a;
+  return (_a = s.r3m) == null ? void 0 : _a.map;
+});
+const useR3M = () => fiber.useThree((s) => s.r3m);
+const originMx = new THREE.Matrix4();
+const projByView = new THREE.Matrix4();
+const projByViewInv$1 = new THREE.Matrix4();
+const fwd = new THREE.Vector3();
+function syncCamera(camera, origin, mapCamMx) {
+  projByView.fromArray(mapCamMx).multiply(originMx.fromArray(origin));
+  projByViewInv$1.copy(projByView).invert();
+  updateCamera(camera, projByViewInv$1);
+  camera.updateMatrix();
+  camera.updateMatrixWorld(true);
+  camera.projectionMatrix.copy(camera.matrix).premultiply(projByView);
+  camera.projectionMatrixInverse.copy(camera.projectionMatrix).invert();
+  camera.far = calculateFar(
+    camera.matrix.elements[10],
+    camera.matrix.elements[14],
+    camera.near
+  );
+  camera.userData.projByView = projByView.toArray();
+  camera.userData.projByViewInv = projByViewInv$1.toArray();
+}
+const updateCamera = (target, projByViewInv2) => {
+  target.position.setScalar(0).applyMatrix4(projByViewInv2);
+  target.up.set(0, -1, 0).applyMatrix4(projByViewInv2).negate().add(target.position).normalize();
+  fwd.set(0, 0, 1).applyMatrix4(projByViewInv2);
+  target.lookAt(fwd);
+};
+function calculateFar(c, d, near) {
+  const numerator = d * (c - 1);
+  const denominator = c * near + near;
+  const far = numerator / denominator;
+  return far;
+}
 const quat = new THREE.Quaternion();
 const euler = new THREE.Euler();
 const pos = new THREE.Vector3();
@@ -45,6 +82,51 @@ function useCoords({ latitude, longitude, altitude, fromLngLat: fromLngLat2 }) {
   }), [latitude, longitude, altitude, fromLngLat2]);
   return m42;
 }
+const Coordinates = react.memo(({
+  latitude,
+  longitude,
+  altitude = 0,
+  children
+}) => {
+  const [scene] = react.useState(() => new THREE.Scene());
+  const r3m = useR3M();
+  const origin = useCoords({
+    latitude,
+    longitude,
+    altitude,
+    fromLngLat: r3m.fromLngLat
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: fiber.createPortal(/* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RenderAtCoords, { r3m, origin }),
+    children
+  ] }), scene, { events: { priority: 2 } }) });
+});
+Coordinates.displayName = "Coordinates";
+function RenderAtCoords({ r3m, origin }) {
+  const { gl, scene, set } = fiber.useThree();
+  const cameraRef = react.useRef(null);
+  fiber.useFrame(() => {
+    if (!r3m.mapCamMx)
+      return;
+    if (!cameraRef.current)
+      return;
+    syncCamera(cameraRef.current, origin, r3m.mapCamMx);
+    gl.render(scene, cameraRef.current);
+  });
+  react.useLayoutEffect(() => {
+    if (!cameraRef.current)
+      return;
+    set({
+      invalidate: () => {
+        if (!r3m.map)
+          return;
+        r3m.map.triggerRepaint();
+      },
+      camera: cameraRef.current
+    });
+  }, [set, r3m]);
+  return /* @__PURE__ */ jsxRuntime.jsx("perspectiveCamera", { ref: cameraRef });
+}
 const DOM_EVENTS = {
   onClick: ["click", false],
   onContextMenu: ["contextmenu", false],
@@ -57,7 +139,7 @@ const DOM_EVENTS = {
   onPointerCancel: ["pointercancel", true],
   onLostPointerCapture: ["lostpointercapture", true]
 };
-const projByViewInv$1 = new THREE.Matrix4();
+const projByViewInv = new THREE.Matrix4();
 function createEvents() {
   return (store) => {
     const { handlePointer } = fiber.createEvents(store);
@@ -68,10 +150,10 @@ function createEvents() {
         state.pointer.x = event.offsetX / state.size.width * 2 - 1;
         state.pointer.y = 1 - event.offsetY / state.size.height * 2;
         if (state.camera.userData.projByViewInv)
-          projByViewInv$1.fromArray(state.camera.userData.projByViewInv);
+          projByViewInv.fromArray(state.camera.userData.projByViewInv);
         state.raycaster.camera = state.camera;
-        state.raycaster.ray.origin.setScalar(0).applyMatrix4(projByViewInv$1);
-        state.raycaster.ray.direction.set(state.pointer.x, state.pointer.y, 1).applyMatrix4(projByViewInv$1).sub(state.raycaster.ray.origin).normalize();
+        state.raycaster.ray.origin.setScalar(0).applyMatrix4(projByViewInv);
+        state.raycaster.ray.direction.set(state.pointer.x, state.pointer.y, 1).applyMatrix4(projByViewInv).sub(state.raycaster.ray.origin).normalize();
       },
       connected: void 0,
       handlers: Object.keys(DOM_EVENTS).reduce(
@@ -204,38 +286,6 @@ const useCreateRoot = ({
   }, [r3mRef, mounted, children]);
   return { id, onAdd, onRemove, r3mRef };
 };
-const originMx = new THREE.Matrix4();
-const projByView = new THREE.Matrix4();
-const projByViewInv = new THREE.Matrix4();
-const fwd = new THREE.Vector3();
-function syncCamera(camera, origin, mapCamMx) {
-  projByView.fromArray(mapCamMx).multiply(originMx.fromArray(origin));
-  projByViewInv.copy(projByView).invert();
-  updateCamera(camera, projByViewInv);
-  camera.updateMatrix();
-  camera.updateMatrixWorld(true);
-  camera.projectionMatrix.copy(camera.matrix).premultiply(projByView);
-  camera.projectionMatrixInverse.copy(camera.projectionMatrix).invert();
-  camera.far = calculateFar(
-    camera.matrix.elements[10],
-    camera.matrix.elements[14],
-    camera.near
-  );
-  camera.userData.projByView = projByView.toArray();
-  camera.userData.projByViewInv = projByViewInv.toArray();
-}
-const updateCamera = (target, projByViewInv2) => {
-  target.position.setScalar(0).applyMatrix4(projByViewInv2);
-  target.up.set(0, -1, 0).applyMatrix4(projByViewInv2).negate().add(target.position).normalize();
-  fwd.set(0, 0, 1).applyMatrix4(projByViewInv2);
-  target.lookAt(fwd);
-};
-function calculateFar(c, d, near) {
-  const numerator = d * (c - 1);
-  const denominator = c * near + near;
-  const far = numerator / denominator;
-  return far;
-}
 function useRender(origin, r3mRef, frameloop) {
   const render = useFunction((_gl, mapCamMx) => {
     const r3m = r3mRef.current;
@@ -287,51 +337,7 @@ const Canvas = react.memo((props) => {
     }
   );
 });
-const useR3M = () => fiber.useThree((s) => s.r3m);
-const Coordinates = react.memo(({
-  latitude,
-  longitude,
-  altitude = 0,
-  children
-}) => {
-  const [scene] = react.useState(() => new THREE.Scene());
-  const r3m = useR3M();
-  const origin = useCoords({
-    latitude,
-    longitude,
-    altitude,
-    fromLngLat: r3m.fromLngLat
-  });
-  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: fiber.createPortal(/* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RenderAtCoords, { r3m, origin }),
-    children
-  ] }), scene, { events: { priority: 2 } }) });
-});
-Coordinates.displayName = "Coordinates";
-function RenderAtCoords({ r3m, origin }) {
-  const { gl, scene, set } = fiber.useThree();
-  const cameraRef = react.useRef(null);
-  fiber.useFrame(() => {
-    if (!r3m.mapCamMx)
-      return;
-    if (!cameraRef.current)
-      return;
-    syncCamera(cameraRef.current, origin, r3m.mapCamMx);
-    gl.render(scene, cameraRef.current);
-  });
-  react.useLayoutEffect(() => {
-    if (!cameraRef.current)
-      return;
-    set({
-      invalidate: () => {
-        if (!r3m.map)
-          return;
-        r3m.map.triggerRepaint();
-      },
-      camera: cameraRef.current
-    });
-  }, [set, r3m]);
-  return /* @__PURE__ */ jsxRuntime.jsx("perspectiveCamera", { ref: cameraRef });
-}
+const useMap = useMap$1;
 exports.Canvas = Canvas;
 exports.Coordinates = Coordinates;
+exports.useMap = useMap;

package/dist/es/main.mjs

@@ -1,7 +1,10 @@
-import { Canvas } from "./main2.mjs";
+import { useMap as useMap$1 } from "./main2.mjs";
 import { Coordinates } from "./main3.mjs";
+import { Canvas } from "./main4.mjs";
+const useMap = useMap$1;
 export {
   Canvas,
-  Coordinates
+  Coordinates,
+  useMap
 };
 //# sourceMappingURL=main.mjs.map

package/dist/es/main.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"main.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;"}
+{"version":3,"file":"main.mjs","sources":["../../src/mapbox.index.ts"],"sourcesContent":["import type { Map } from 'mapbox-gl';\nimport { useMap as useMapGeneric } from './api/use-map';\n\nexport * from './api/canvas-props';\nexport * from './api/coordinates';\nexport * from './mapbox/canvas';\n\nexport const useMap = useMapGeneric<Map>;\n"],"names":["useMapGeneric"],"mappings":";;;AAOO,MAAM,SAASA;"}

package/dist/es/main10.mjs

@@ -1,23 +1,24 @@
-import { syncCamera } from "./main6.mjs";
-import { useFunction } from "./main12.mjs";
-function useRender(origin, r3mRef, frameloop) {
-  const render = useFunction((_gl, mapCamMx) => {
-    const r3m = r3mRef.current;
-    if (!r3m.state || !r3m.map)
+import { jsx, Fragment } from "react/jsx-runtime";
+import { useId, useEffect } from "react";
+import { useOnAdd } from "./main12.mjs";
+const useCreateRoot = ({
+  children,
+  frameloop,
+  fromLngLat,
+  ...renderProps
+}) => {
+  const id = useId();
+  const { onAdd, onRemove, mounted, r3mRef } = useOnAdd(fromLngLat, { frameloop, ...renderProps });
+  useEffect(() => {
+    if (!mounted)
       return;
-    const camera = r3m.state.camera;
-    const gl = r3m.state.gl;
-    const advance = r3m.state.advance;
-    r3m.mapCamMx = mapCamMx;
-    syncCamera(camera, origin, mapCamMx);
-    gl.resetState();
-    advance(Date.now() * 1e-3, true);
-    if (frameloop === "always")
-      r3m.map.triggerRepaint();
-  });
-  return render;
-}
+    if (!r3mRef.current.root)
+      return;
+    r3mRef.current.root.render(/* @__PURE__ */ jsx(Fragment, { children }));
+  }, [r3mRef, mounted, children]);
+  return { id, onAdd, onRemove, r3mRef };
+};
 export {
-  useRender
+  useCreateRoot
 };
 //# sourceMappingURL=main10.mjs.map

package/dist/es/main10.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"main10.mjs","sources":["../../src/core/use-render.ts"],"sourcesContent":["import { MutableRefObject } from \"react\";\nimport { Matrix4Tuple, PerspectiveCamera } from \"three\";\nimport { R3mStore } from \"./store\";\nimport { syncCamera } from \"./sync-camera\";\nimport { useFunction } from \"./use-function\";\n\nexport function useRender(\n  origin: Matrix4Tuple, r3mRef: MutableRefObject<R3mStore>, frameloop: 'always' | 'demand'\n) {\n\n  const render = useFunction((_gl: WebGL2RenderingContext, mapCamMx: number[]) => {\n    const r3m = r3mRef.current;\n    if (!r3m.state || !r3m.map) return;\n    const camera = r3m.state.camera;\n    const gl = r3m.state.gl;\n    const advance = r3m.state.advance;\n    r3m.mapCamMx = mapCamMx as Matrix4Tuple;\n    syncCamera(camera as PerspectiveCamera, origin, mapCamMx as Matrix4Tuple);\n    gl.resetState();\n    advance(Date.now() * 0.001, true);\n    if (frameloop === 'always') r3m.map.triggerRepaint();\n  })\n\n  return render;\n\n}"],"names":[],"mappings":";;AAMgB,SAAA,UACd,QAAsB,QAAoC,WAC1D;AAEA,QAAM,SAAS,YAAY,CAAC,KAA6B,aAAuB;AAC9E,UAAM,MAAM,OAAO;AACnB,QAAI,CAAC,IAAI,SAAS,CAAC,IAAI;AAAK;AACtB,UAAA,SAAS,IAAI,MAAM;AACnB,UAAA,KAAK,IAAI,MAAM;AACf,UAAA,UAAU,IAAI,MAAM;AAC1B,QAAI,WAAW;AACJ,eAAA,QAA6B,QAAQ,QAAwB;AACxE,OAAG,WAAW;AACd,YAAQ,KAAK,IAAQ,IAAA,MAAO,IAAI;AAChC,QAAI,cAAc;AAAU,UAAI,IAAI;EAAe,CACpD;AAEM,SAAA;AAET;"}
+{"version":3,"file":"main10.mjs","sources":["../../src/core/use-create-root.tsx"],"sourcesContent":["import { RenderProps } from \"@react-three/fiber\";\nimport { PropsWithChildren, useEffect, useId } from \"react\";\nimport { FromLngLat } from \"./generic-map\";\nimport { useOnAdd } from \"./use-on-add\";\n\nexport interface useCanvasProps extends Omit<RenderProps<HTMLCanvasElement>, 'frameloop'>, PropsWithChildren {\n  frameloop: 'always' | 'demand',\n  fromLngLat: FromLngLat\n}\n\nexport const useCreateRoot = (({\n  children, frameloop, fromLngLat, ...renderProps\n}: useCanvasProps) => {\n\n  const id = useId();\n\n  const { onAdd, onRemove, mounted, r3mRef } = useOnAdd(fromLngLat, { frameloop, ...renderProps });\n\n  useEffect(() => {\n    if (!mounted) return;\n    if (!r3mRef.current.root) return;\n    r3mRef.current.root.render(<>\n      {children}\n    </>);\n  }, [r3mRef, mounted, children])\n\n  return { id, onAdd, onRemove, r3mRef }\n})"],"names":[],"mappings":";;;AAUO,MAAM,gBAAiB,CAAC;AAAA,EAC7B;AAAA,EAAU;AAAA,EAAW;AAAA,EAAY,GAAG;AACtC,MAAsB;AAEpB,QAAM,KAAK;AAEX,QAAM,EAAE,OAAO,UAAU,SAAS,OAAO,IAAI,SAAS,YAAY,EAAE,WAAW,GAAG,YAAa,CAAA;AAE/F,YAAU,MAAM;AACd,QAAI,CAAC;AAAS;AACV,QAAA,CAAC,OAAO,QAAQ;AAAM;AAC1B,WAAO,QAAQ,KAAK,OAAO,oBAAA,UAAA,EACxB,SACH,CAAA,CAAG;AAAA,EACF,GAAA,CAAC,QAAQ,SAAS,QAAQ,CAAC;AAE9B,SAAO,EAAE,IAAI,OAAO,UAAU,OAAO;AACvC;"}

package/dist/es/main11.mjs

@@ -1,78 +1,23 @@
-import { createRoot, _roots } from "@react-three/fiber";
-import { useState, useRef, useEffect } from "react";
-import { createEvents } from "./main13.mjs";
-import { useFunction } from "./main12.mjs";
-function useOnAdd(fromLngLat, { frameloop, ...renderProps }) {
-  const [mounted, setMounted] = useState(false);
-  const r3mRef = useRef({ fromLngLat });
-  const onAdd = useFunction((map, gl) => {
-    const canvas = map.getCanvas();
-    const root = createRoot(canvas);
-    root.configure({
-      dpr: window.devicePixelRatio,
-      events: createEvents(),
-      ...renderProps,
-      frameloop: "never",
-      gl: {
-        context: gl,
-        depth: true,
-        autoClear: false,
-        antialias: true,
-        ...renderProps == null ? void 0 : renderProps.gl
-      },
-      onCreated: (state) => {
-        state.gl.forceContextLoss = () => {
-        };
-      },
-      camera: {
-        matrixAutoUpdate: false,
-        near: 0
-      },
-      size: {
-        width: canvas.clientWidth,
-        height: canvas.clientHeight,
-        top: 0,
-        left: 0,
-        ...renderProps == null ? void 0 : renderProps.size
-      }
-    });
-    const store = _roots.get(canvas).store;
-    r3mRef.current.map = map;
-    r3mRef.current.root = root;
-    r3mRef.current.state = store.getState();
-    store.setState({ r3m: r3mRef.current });
-    if (frameloop === "demand") {
-      store.setState({
-        frameloop,
-        invalidate: () => {
-          map.triggerRepaint();
-        }
-      });
-    }
-    map.on("resize", onResize);
-    setTimeout(() => setMounted(true));
-  });
-  const onResize = useFunction(() => {
-    if (!r3mRef.current.map)
-      return;
-    if (!r3mRef.current.state)
-      return;
-    const canvas = r3mRef.current.map.getCanvas();
-    r3mRef.current.state.setSize(canvas.width, canvas.height);
-  });
-  const onRemove = useFunction(() => {
-    if (!r3mRef.current.root)
-      return;
-    r3mRef.current.root.unmount();
-    r3mRef.current.root = void 0;
-    if (!r3mRef.current.map)
+import { syncCamera } from "./main6.mjs";
+import { useFunction } from "./main13.mjs";
+function useRender(origin, r3mRef, frameloop) {
+  const render = useFunction((_gl, mapCamMx) => {
+    const r3m = r3mRef.current;
+    if (!r3m.state || !r3m.map)
       return;
-    r3mRef.current.map.off("resize", onResize);
+    const camera = r3m.state.camera;
+    const gl = r3m.state.gl;
+    const advance = r3m.state.advance;
+    r3m.mapCamMx = mapCamMx;
+    syncCamera(camera, origin, mapCamMx);
+    gl.resetState();
+    advance(Date.now() * 1e-3, true);
+    if (frameloop === "always")
+      r3m.map.triggerRepaint();
   });
-  useEffect(() => () => onRemove(), [onRemove]);
-  return { onAdd, onRemove, mounted, r3mRef };
+  return render;
 }
 export {
-  useOnAdd
+  useRender
 };
 //# sourceMappingURL=main11.mjs.map

package/dist/es/main11.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"main11.mjs","sources":["../../src/core/use-on-add.ts"],"sourcesContent":["import { RenderProps, _roots, createRoot } from \"@react-three/fiber\";\nimport { useEffect, useRef, useState } from \"react\";\nimport { createEvents } from \"./create-events\";\nimport { FromLngLat, MapInstance } from \"./generic-map\";\nimport { R3mStore } from \"./store\";\nimport { useFunction } from \"./use-function\";\n\nexport function useOnAdd(\n  fromLngLat: FromLngLat,\n  { frameloop, ...renderProps }: RenderProps<HTMLCanvasElement>\n) {\n\n  const [mounted, setMounted] = useState(false);\n\n  const r3mRef = useRef<R3mStore>({ fromLngLat });\n\n  const onAdd = useFunction((map: MapInstance, gl: WebGLRenderingContext) => {\n\n    const canvas = map.getCanvas();\n    const root = createRoot(canvas);\n    root.configure({\n      dpr: window.devicePixelRatio,\n      events: createEvents(),\n      ...renderProps,\n      frameloop: 'never',\n      gl: {\n        context: gl,\n        depth: true,\n        autoClear: false,\n        antialias: true,\n        ...renderProps?.gl,\n      },\n      onCreated: (state) => {\n        // eslint-disable-next-line @typescript-eslint/no-empty-function\n        state.gl.forceContextLoss = () => { };\n      },\n      camera: {\n        matrixAutoUpdate: false,\n        near: 0,\n      },\n      size: {\n        width: canvas.clientWidth,\n        height: canvas.clientHeight,\n        top: 0,\n        left: 0,\n        ...renderProps?.size,\n      },\n    });\n\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    const store = _roots.get(canvas)!.store;\n\n    r3mRef.current.map = map;\n    r3mRef.current.root = root;\n    r3mRef.current.state = store.getState();\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    store.setState({ r3m: r3mRef.current } as any);\n\n    if (frameloop === 'demand') {\n      store.setState({\n        frameloop,\n        invalidate: () => {\n          map.triggerRepaint();\n        },\n      })\n    }\n\n    map.on('resize', onResize)\n\n    setTimeout(() => setMounted(true));\n\n  })\n\n  const onResize = useFunction(() => {\n    if (!r3mRef.current.map) return;\n    if (!r3mRef.current.state) return;\n    const canvas = r3mRef.current.map.getCanvas();\n    r3mRef.current.state.setSize(canvas.width, canvas.height);\n  })\n\n  const onRemove = useFunction(() => {\n    if (!r3mRef.current.root) return;\n    r3mRef.current.root.unmount();\n    r3mRef.current.root = undefined;\n    if (!r3mRef.current.map) return;\n    r3mRef.current.map.off('resize', onResize)\n  })\n\n  // on unmount\n  useEffect(() => () => onRemove(), [onRemove])\n\n  return { onAdd, onRemove, mounted, r3mRef };\n}"],"names":[],"mappings":";;;;AAOO,SAAS,SACd,YACA,EAAE,WAAW,GAAG,eAChB;AAEA,QAAM,CAAC,SAAS,UAAU,IAAI,SAAS,KAAK;AAE5C,QAAM,SAAS,OAAiB,EAAE,WAAY,CAAA;AAE9C,QAAM,QAAQ,YAAY,CAAC,KAAkB,OAA8B;AAEnE,UAAA,SAAS,IAAI;AACb,UAAA,OAAO,WAAW,MAAM;AAC9B,SAAK,UAAU;AAAA,MACb,KAAK,OAAO;AAAA,MACZ,QAAQ,aAAa;AAAA,MACrB,GAAG;AAAA,MACH,WAAW;AAAA,MACX,IAAI;AAAA,QACF,SAAS;AAAA,QACT,OAAO;AAAA,QACP,WAAW;AAAA,QACX,WAAW;AAAA,QACX,GAAG,2CAAa;AAAA,MAClB;AAAA,MACA,WAAW,CAAC,UAAU;AAEd,cAAA,GAAG,mBAAmB,MAAM;AAAA,QAAA;AAAA,MACpC;AAAA,MACA,QAAQ;AAAA,QACN,kBAAkB;AAAA,QAClB,MAAM;AAAA,MACR;AAAA,MACA,MAAM;AAAA,QACJ,OAAO,OAAO;AAAA,QACd,QAAQ,OAAO;AAAA,QACf,KAAK;AAAA,QACL,MAAM;AAAA,QACN,GAAG,2CAAa;AAAA,MAClB;AAAA,IAAA,CACD;AAGD,UAAM,QAAQ,OAAO,IAAI,MAAM,EAAG;AAElC,WAAO,QAAQ,MAAM;AACrB,WAAO,QAAQ,OAAO;AACf,WAAA,QAAQ,QAAQ,MAAM,SAAS;AAGtC,UAAM,SAAS,EAAE,KAAK,OAAO,QAAgB,CAAA;AAE7C,QAAI,cAAc,UAAU;AAC1B,YAAM,SAAS;AAAA,QACb;AAAA,QACA,YAAY,MAAM;AAChB,cAAI,eAAe;AAAA,QACrB;AAAA,MAAA,CACD;AAAA,IACH;AAEI,QAAA,GAAG,UAAU,QAAQ;AAEd,eAAA,MAAM,WAAW,IAAI,CAAC;AAAA,EAAA,CAElC;AAEK,QAAA,WAAW,YAAY,MAAM;AAC7B,QAAA,CAAC,OAAO,QAAQ;AAAK;AACrB,QAAA,CAAC,OAAO,QAAQ;AAAO;AAC3B,UAAM,SAAS,OAAO,QAAQ,IAAI,UAAU;AAC5C,WAAO,QAAQ,MAAM,QAAQ,OAAO,OAAO,OAAO,MAAM;AAAA,EAAA,CACzD;AAEK,QAAA,WAAW,YAAY,MAAM;AAC7B,QAAA,CAAC,OAAO,QAAQ;AAAM;AACnB,WAAA,QAAQ,KAAK;AACpB,WAAO,QAAQ,OAAO;AAClB,QAAA,CAAC,OAAO,QAAQ;AAAK;AACzB,WAAO,QAAQ,IAAI,IAAI,UAAU,QAAQ;AAAA,EAAA,CAC1C;AAGD,YAAU,MAAM,MAAM,SAAY,GAAA,CAAC,QAAQ,CAAC;AAE5C,SAAO,EAAE,OAAO,UAAU,SAAS,OAAO;AAC5C;"}
+{"version":3,"file":"main11.mjs","sources":["../../src/core/use-render.ts"],"sourcesContent":["import { MutableRefObject } from \"react\";\nimport { Matrix4Tuple, PerspectiveCamera } from \"three\";\nimport { R3mStore } from \"./store\";\nimport { syncCamera } from \"./sync-camera\";\nimport { useFunction } from \"./use-function\";\n\nexport function useRender(\n  origin: Matrix4Tuple, r3mRef: MutableRefObject<R3mStore>, frameloop: 'always' | 'demand'\n) {\n\n  const render = useFunction((_gl: WebGL2RenderingContext, mapCamMx: number[]) => {\n    const r3m = r3mRef.current;\n    if (!r3m.state || !r3m.map) return;\n    const camera = r3m.state.camera;\n    const gl = r3m.state.gl;\n    const advance = r3m.state.advance;\n    r3m.mapCamMx = mapCamMx as Matrix4Tuple;\n    syncCamera(camera as PerspectiveCamera, origin, mapCamMx as Matrix4Tuple);\n    gl.resetState();\n    advance(Date.now() * 0.001, true);\n    if (frameloop === 'always') r3m.map.triggerRepaint();\n  })\n\n  return render;\n\n}"],"names":[],"mappings":";;AAMgB,SAAA,UACd,QAAsB,QAAoC,WAC1D;AAEA,QAAM,SAAS,YAAY,CAAC,KAA6B,aAAuB;AAC9E,UAAM,MAAM,OAAO;AACnB,QAAI,CAAC,IAAI,SAAS,CAAC,IAAI;AAAK;AACtB,UAAA,SAAS,IAAI,MAAM;AACnB,UAAA,KAAK,IAAI,MAAM;AACf,UAAA,UAAU,IAAI,MAAM;AAC1B,QAAI,WAAW;AACJ,eAAA,QAA6B,QAAQ,QAAwB;AACxE,OAAG,WAAW;AACd,YAAQ,KAAK,IAAQ,IAAA,MAAO,IAAI;AAChC,QAAI,cAAc;AAAU,UAAI,IAAI;EAAe,CACpD;AAEM,SAAA;AAET;"}

package/dist/es/main12.mjs

@@ -1,12 +1,78 @@
-import { useRef, useCallback } from "react";
-const useFunction = (callback) => {
-  const callbackRef = useRef(callback);
-  callbackRef.current = callback;
-  return useCallback((...args) => {
-    return callbackRef.current(...args);
-  }, []);
-};
+import { createRoot, _roots } from "@react-three/fiber";
+import { useState, useRef, useEffect } from "react";
+import { createEvents } from "./main14.mjs";
+import { useFunction } from "./main13.mjs";
+function useOnAdd(fromLngLat, { frameloop, ...renderProps }) {
+  const [mounted, setMounted] = useState(false);
+  const r3mRef = useRef({ fromLngLat });
+  const onAdd = useFunction((map, gl) => {
+    const canvas = map.getCanvas();
+    const root = createRoot(canvas);
+    root.configure({
+      dpr: window.devicePixelRatio,
+      events: createEvents(),
+      ...renderProps,
+      frameloop: "never",
+      gl: {
+        context: gl,
+        depth: true,
+        autoClear: false,
+        antialias: true,
+        ...renderProps == null ? void 0 : renderProps.gl
+      },
+      onCreated: (state) => {
+        state.gl.forceContextLoss = () => {
+        };
+      },
+      camera: {
+        matrixAutoUpdate: false,
+        near: 0
+      },
+      size: {
+        width: canvas.clientWidth,
+        height: canvas.clientHeight,
+        top: 0,
+        left: 0,
+        ...renderProps == null ? void 0 : renderProps.size
+      }
+    });
+    const store = _roots.get(canvas).store;
+    r3mRef.current.map = map;
+    r3mRef.current.root = root;
+    r3mRef.current.state = store.getState();
+    store.setState({ r3m: r3mRef.current });
+    if (frameloop === "demand") {
+      store.setState({
+        frameloop,
+        invalidate: () => {
+          map.triggerRepaint();
+        }
+      });
+    }
+    map.on("resize", onResize);
+    setTimeout(() => setMounted(true));
+  });
+  const onResize = useFunction(() => {
+    if (!r3mRef.current.map)
+      return;
+    if (!r3mRef.current.state)
+      return;
+    const canvas = r3mRef.current.map.getCanvas();
+    r3mRef.current.state.setSize(canvas.width, canvas.height);
+  });
+  const onRemove = useFunction(() => {
+    if (!r3mRef.current.root)
+      return;
+    r3mRef.current.root.unmount();
+    r3mRef.current.root = void 0;
+    if (!r3mRef.current.map)
+      return;
+    r3mRef.current.map.off("resize", onResize);
+  });
+  useEffect(() => () => onRemove(), [onRemove]);
+  return { onAdd, onRemove, mounted, r3mRef };
+}
 export {
-  useFunction
+  useOnAdd
 };
 //# sourceMappingURL=main12.mjs.map

package/dist/es/main12.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"main12.mjs","sources":["../../src/core/use-function.ts"],"sourcesContent":["import { useCallback, useRef } from 'react';\n\n/* eslint-disable @typescript-eslint/no-explicit-any */\nexport const useFunction = <T extends (...args: any[]) => any>(callback: T): T => {\n  const callbackRef = useRef(callback);\n  callbackRef.current = callback;\n  return useCallback((...args: any[]) => {\n    return callbackRef.current(...args);\n  }, []) as T;\n};\n"],"names":[],"mappings":";AAGa,MAAA,cAAc,CAAoC,aAAmB;AAC1E,QAAA,cAAc,OAAO,QAAQ;AACnC,cAAY,UAAU;AACf,SAAA,YAAY,IAAI,SAAgB;AAC9B,WAAA,YAAY,QAAQ,GAAG,IAAI;AAAA,EACpC,GAAG,CAAE,CAAA;AACP;"}
+{"version":3,"file":"main12.mjs","sources":["../../src/core/use-on-add.ts"],"sourcesContent":["import { RenderProps, _roots, createRoot } from \"@react-three/fiber\";\nimport { useEffect, useRef, useState } from \"react\";\nimport { createEvents } from \"./create-events\";\nimport { FromLngLat, MapInstance } from \"./generic-map\";\nimport { R3mStore } from \"./store\";\nimport { useFunction } from \"./use-function\";\n\nexport function useOnAdd(\n  fromLngLat: FromLngLat,\n  { frameloop, ...renderProps }: RenderProps<HTMLCanvasElement>\n) {\n\n  const [mounted, setMounted] = useState(false);\n\n  const r3mRef = useRef<R3mStore>({ fromLngLat });\n\n  const onAdd = useFunction((map: MapInstance, gl: WebGLRenderingContext) => {\n\n    const canvas = map.getCanvas();\n    const root = createRoot(canvas);\n    root.configure({\n      dpr: window.devicePixelRatio,\n      events: createEvents(),\n      ...renderProps,\n      frameloop: 'never',\n      gl: {\n        context: gl,\n        depth: true,\n        autoClear: false,\n        antialias: true,\n        ...renderProps?.gl,\n      },\n      onCreated: (state) => {\n        // eslint-disable-next-line @typescript-eslint/no-empty-function\n        state.gl.forceContextLoss = () => { };\n      },\n      camera: {\n        matrixAutoUpdate: false,\n        near: 0,\n      },\n      size: {\n        width: canvas.clientWidth,\n        height: canvas.clientHeight,\n        top: 0,\n        left: 0,\n        ...renderProps?.size,\n      },\n    });\n\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    const store = _roots.get(canvas)!.store;\n\n    r3mRef.current.map = map;\n    r3mRef.current.root = root;\n    r3mRef.current.state = store.getState();\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    store.setState({ r3m: r3mRef.current } as any);\n\n    if (frameloop === 'demand') {\n      store.setState({\n        frameloop,\n        invalidate: () => {\n          map.triggerRepaint();\n        },\n      })\n    }\n\n    map.on('resize', onResize)\n\n    setTimeout(() => setMounted(true));\n\n  })\n\n  const onResize = useFunction(() => {\n    if (!r3mRef.current.map) return;\n    if (!r3mRef.current.state) return;\n    const canvas = r3mRef.current.map.getCanvas();\n    r3mRef.current.state.setSize(canvas.width, canvas.height);\n  })\n\n  const onRemove = useFunction(() => {\n    if (!r3mRef.current.root) return;\n    r3mRef.current.root.unmount();\n    r3mRef.current.root = undefined;\n    if (!r3mRef.current.map) return;\n    r3mRef.current.map.off('resize', onResize)\n  })\n\n  // on unmount\n  useEffect(() => () => onRemove(), [onRemove])\n\n  return { onAdd, onRemove, mounted, r3mRef };\n}"],"names":[],"mappings":";;;;AAOO,SAAS,SACd,YACA,EAAE,WAAW,GAAG,eAChB;AAEA,QAAM,CAAC,SAAS,UAAU,IAAI,SAAS,KAAK;AAE5C,QAAM,SAAS,OAAiB,EAAE,WAAY,CAAA;AAE9C,QAAM,QAAQ,YAAY,CAAC,KAAkB,OAA8B;AAEnE,UAAA,SAAS,IAAI;AACb,UAAA,OAAO,WAAW,MAAM;AAC9B,SAAK,UAAU;AAAA,MACb,KAAK,OAAO;AAAA,MACZ,QAAQ,aAAa;AAAA,MACrB,GAAG;AAAA,MACH,WAAW;AAAA,MACX,IAAI;AAAA,QACF,SAAS;AAAA,QACT,OAAO;AAAA,QACP,WAAW;AAAA,QACX,WAAW;AAAA,QACX,GAAG,2CAAa;AAAA,MAClB;AAAA,MACA,WAAW,CAAC,UAAU;AAEd,cAAA,GAAG,mBAAmB,MAAM;AAAA,QAAA;AAAA,MACpC;AAAA,MACA,QAAQ;AAAA,QACN,kBAAkB;AAAA,QAClB,MAAM;AAAA,MACR;AAAA,MACA,MAAM;AAAA,QACJ,OAAO,OAAO;AAAA,QACd,QAAQ,OAAO;AAAA,QACf,KAAK;AAAA,QACL,MAAM;AAAA,QACN,GAAG,2CAAa;AAAA,MAClB;AAAA,IAAA,CACD;AAGD,UAAM,QAAQ,OAAO,IAAI,MAAM,EAAG;AAElC,WAAO,QAAQ,MAAM;AACrB,WAAO,QAAQ,OAAO;AACf,WAAA,QAAQ,QAAQ,MAAM,SAAS;AAGtC,UAAM,SAAS,EAAE,KAAK,OAAO,QAAgB,CAAA;AAE7C,QAAI,cAAc,UAAU;AAC1B,YAAM,SAAS;AAAA,QACb;AAAA,QACA,YAAY,MAAM;AAChB,cAAI,eAAe;AAAA,QACrB;AAAA,MAAA,CACD;AAAA,IACH;AAEI,QAAA,GAAG,UAAU,QAAQ;AAEd,eAAA,MAAM,WAAW,IAAI,CAAC;AAAA,EAAA,CAElC;AAEK,QAAA,WAAW,YAAY,MAAM;AAC7B,QAAA,CAAC,OAAO,QAAQ;AAAK;AACrB,QAAA,CAAC,OAAO,QAAQ;AAAO;AAC3B,UAAM,SAAS,OAAO,QAAQ,IAAI,UAAU;AAC5C,WAAO,QAAQ,MAAM,QAAQ,OAAO,OAAO,OAAO,MAAM;AAAA,EAAA,CACzD;AAEK,QAAA,WAAW,YAAY,MAAM;AAC7B,QAAA,CAAC,OAAO,QAAQ;AAAM;AACnB,WAAA,QAAQ,KAAK;AACpB,WAAO,QAAQ,OAAO;AAClB,QAAA,CAAC,OAAO,QAAQ;AAAK;AACzB,WAAO,QAAQ,IAAI,IAAI,UAAU,QAAQ;AAAA,EAAA,CAC1C;AAGD,YAAU,MAAM,MAAM,SAAY,GAAA,CAAC,QAAQ,CAAC;AAE5C,SAAO,EAAE,OAAO,UAAU,SAAS,OAAO;AAC5C;"}

package/dist/es/main13.mjs

@@ -1,71 +1,12 @@
-import { createEvents as createEvents$1 } from "@react-three/fiber";
-import { Matrix4 } from "three";
-const DOM_EVENTS = {
-  onClick: ["click", false],
-  onContextMenu: ["contextmenu", false],
-  onDoubleClick: ["dblclick", false],
-  onWheel: ["wheel", true],
-  onPointerDown: ["pointerdown", true],
-  onPointerUp: ["pointerup", true],
-  onPointerLeave: ["pointerleave", true],
-  onPointerMove: ["pointermove", true],
-  onPointerCancel: ["pointercancel", true],
-  onLostPointerCapture: ["lostpointercapture", true]
+import { useRef, useCallback } from "react";
+const useFunction = (callback) => {
+  const callbackRef = useRef(callback);
+  callbackRef.current = callback;
+  return useCallback((...args) => {
+    return callbackRef.current(...args);
+  }, []);
 };
-const projByViewInv = new Matrix4();
-function createEvents() {
-  return (store) => {
-    const { handlePointer } = createEvents$1(store);
-    return {
-      priority: 1,
-      enabled: true,
-      compute(event, state) {
-        state.pointer.x = event.offsetX / state.size.width * 2 - 1;
-        state.pointer.y = 1 - event.offsetY / state.size.height * 2;
-        if (state.camera.userData.projByViewInv)
-          projByViewInv.fromArray(state.camera.userData.projByViewInv);
-        state.raycaster.camera = state.camera;
-        state.raycaster.ray.origin.setScalar(0).applyMatrix4(projByViewInv);
-        state.raycaster.ray.direction.set(state.pointer.x, state.pointer.y, 1).applyMatrix4(projByViewInv).sub(state.raycaster.ray.origin).normalize();
-      },
-      connected: void 0,
-      handlers: Object.keys(DOM_EVENTS).reduce(
-        (acc, key) => ({ ...acc, [key]: handlePointer(key) }),
-        {}
-      ),
-      update: () => {
-        var _a;
-        const { events, internal } = store.getState();
-        if (((_a = internal.lastEvent) == null ? void 0 : _a.current) && events.handlers) {
-          events.handlers.onPointerMove(internal.lastEvent.current);
-        }
-      },
-      connect: (target) => {
-        var _a;
-        const { set, events } = store.getState();
-        (_a = events.disconnect) == null ? void 0 : _a.call(events);
-        set((state) => ({ events: { ...state.events, connected: target.parentNode } }));
-        Object.entries(events.handlers ?? []).forEach(([name, event]) => {
-          const [eventName, passive] = DOM_EVENTS[name];
-          target.addEventListener(eventName, event, { passive });
-        });
-      },
-      disconnect: () => {
-        const { set, events } = store.getState();
-        if (events.connected) {
-          Object.entries(events.handlers ?? []).forEach(([name, event]) => {
-            if (events && events.connected instanceof HTMLElement) {
-              const [eventName] = DOM_EVENTS[name];
-              events.connected.removeEventListener(eventName, event);
-            }
-          });
-          set((state) => ({ events: { ...state.events, connected: void 0 } }));
-        }
-      }
-    };
-  };
-}
 export {
-  createEvents
+  useFunction
 };
 //# sourceMappingURL=main13.mjs.map