@react-three/fiber 7.0.28 → 7.0.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,13 +1,13 @@
1
- import * as React from 'react';
2
- import { Options as ResizeOptions } from 'react-use-measure';
3
- import { RenderProps } from './index';
4
- import { UseBoundStore } from 'zustand';
5
- import { RootState } from '../core/store';
6
- import { EventManager } from '../core/events';
7
- export interface Props extends Omit<RenderProps<HTMLCanvasElement>, 'size' | 'events'>, React.HTMLAttributes<HTMLDivElement> {
8
- children: React.ReactNode;
9
- fallback?: React.ReactNode;
10
- resize?: ResizeOptions;
11
- events?: (store: UseBoundStore<RootState>) => EventManager<any>;
12
- }
13
- export declare const Canvas: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLCanvasElement>>;
1
+ import * as React from 'react';
2
+ import { Options as ResizeOptions } from 'react-use-measure';
3
+ import { RenderProps } from './index';
4
+ import { UseBoundStore } from 'zustand';
5
+ import { RootState } from '../core/store';
6
+ import { EventManager } from '../core/events';
7
+ export interface Props extends Omit<RenderProps<HTMLCanvasElement>, 'size' | 'events'>, React.HTMLAttributes<HTMLDivElement> {
8
+ children: React.ReactNode;
9
+ fallback?: React.ReactNode;
10
+ resize?: ResizeOptions;
11
+ events?: (store: UseBoundStore<RootState>) => EventManager<any>;
12
+ }
13
+ export declare const Canvas: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLCanvasElement>>;
@@ -1,4 +1,4 @@
1
- import { UseBoundStore } from 'zustand';
2
- import { RootState } from '../core/store';
3
- import type { EventManager } from '../core/events';
4
- export declare function createPointerEvents(store: UseBoundStore<RootState>): EventManager<HTMLElement>;
1
+ import { UseBoundStore } from 'zustand';
2
+ import { RootState } from '../core/store';
3
+ import type { EventManager } from '../core/events';
4
+ export declare function createPointerEvents(store: UseBoundStore<RootState>): EventManager<HTMLElement>;
@@ -1,36 +1,36 @@
1
- /// <reference types="react-reconciler" />
2
- import * as THREE from 'three';
3
- import * as React from 'react';
4
- import { UseBoundStore } from 'zustand';
5
- import { Renderer, StoreProps, context, RootState, Size } from '../core/store';
6
- import { extend, Root } from '../core/renderer';
7
- import { addEffect, addAfterEffect, addTail } from '../core/loop';
8
- import { createPointerEvents as events } from './events';
9
- import { Canvas } from './Canvas';
10
- import { EventManager } from '../core/events';
11
- declare const roots: Map<Element, Root>;
12
- declare const modes: readonly ["legacy", "blocking", "concurrent"];
13
- declare const invalidate: (state?: RootState | undefined) => void, advance: (timestamp: number, runGlobalEffects?: boolean, state?: RootState | undefined) => void;
14
- declare const reconciler: import("react-reconciler").Reconciler<unknown, unknown, unknown, unknown, unknown>, applyProps: (instance: import("../core/renderer").Instance, data: import("../core/renderer").DiffSet | import("../core/renderer").InstanceProps) => import("../core/renderer").Instance;
15
- declare type Properties<T> = Pick<T, {
16
- [K in keyof T]: T[K] extends (_: any) => any ? never : K;
17
- }[keyof T]>;
18
- declare type GLProps = Renderer | ((canvas: HTMLCanvasElement) => Renderer) | Partial<Properties<THREE.WebGLRenderer> | THREE.WebGLRendererParameters> | undefined;
19
- export declare type RenderProps<TCanvas extends Element> = Omit<StoreProps, 'gl' | 'events' | 'size'> & {
20
- gl?: GLProps;
21
- events?: (store: UseBoundStore<RootState>) => EventManager<TCanvas>;
22
- size?: Size;
23
- mode?: typeof modes[number];
24
- onCreated?: (state: RootState) => void;
25
- };
26
- declare function render<TCanvas extends Element>(element: React.ReactNode, canvas: TCanvas, { gl, size, mode, events, onCreated, ...props }?: RenderProps<TCanvas>): UseBoundStore<RootState>;
27
- declare function unmountComponentAtNode<TElement extends Element>(canvas: TElement, callback?: (canvas: TElement) => void): void;
28
- declare function dispose<TObj extends {
29
- dispose?: () => void;
30
- type?: string;
31
- [key: string]: any;
32
- }>(obj: TObj): void;
33
- declare const act: (callback: () => import("react-reconciler").Thenable<unknown>) => import("react-reconciler").Thenable<void>;
34
- declare function createPortal(children: React.ReactNode, container: THREE.Object3D): React.ReactNode;
35
- export * from '../core/hooks';
36
- export { context, render, unmountComponentAtNode, createPortal, events, reconciler, applyProps, dispose, invalidate, advance, extend, addEffect, addAfterEffect, addTail, Canvas, act, roots as _roots, };
1
+ /// <reference types="react-reconciler" />
2
+ import * as THREE from 'three';
3
+ import * as React from 'react';
4
+ import { UseBoundStore } from 'zustand';
5
+ import { Renderer, StoreProps, context, RootState, Size } from '../core/store';
6
+ import { extend, Root } from '../core/renderer';
7
+ import { addEffect, addAfterEffect, addTail } from '../core/loop';
8
+ import { createPointerEvents as events } from './events';
9
+ import { Canvas } from './Canvas';
10
+ import { EventManager } from '../core/events';
11
+ declare const roots: Map<Element, Root>;
12
+ declare const modes: readonly ["legacy", "blocking", "concurrent"];
13
+ declare const invalidate: (state?: RootState | undefined) => void, advance: (timestamp: number, runGlobalEffects?: boolean, state?: RootState | undefined) => void;
14
+ declare const reconciler: import("react-reconciler").Reconciler<unknown, unknown, unknown, unknown, unknown>, applyProps: (instance: import("../core/renderer").Instance, data: import("../core/renderer").DiffSet | import("../core/renderer").InstanceProps) => import("../core/renderer").Instance;
15
+ declare type Properties<T> = Pick<T, {
16
+ [K in keyof T]: T[K] extends (_: any) => any ? never : K;
17
+ }[keyof T]>;
18
+ declare type GLProps = Renderer | ((canvas: HTMLCanvasElement) => Renderer) | Partial<Properties<THREE.WebGLRenderer> | THREE.WebGLRendererParameters> | undefined;
19
+ export declare type RenderProps<TCanvas extends Element> = Omit<StoreProps, 'gl' | 'events' | 'size'> & {
20
+ gl?: GLProps;
21
+ events?: (store: UseBoundStore<RootState>) => EventManager<TCanvas>;
22
+ size?: Size;
23
+ mode?: typeof modes[number];
24
+ onCreated?: (state: RootState) => void;
25
+ };
26
+ declare function render<TCanvas extends Element>(element: React.ReactNode, canvas: TCanvas, { gl, size, mode, events, onCreated, ...props }?: RenderProps<TCanvas>): UseBoundStore<RootState>;
27
+ declare function unmountComponentAtNode<TElement extends Element>(canvas: TElement, callback?: (canvas: TElement) => void): void;
28
+ declare function dispose<TObj extends {
29
+ dispose?: () => void;
30
+ type?: string;
31
+ [key: string]: any;
32
+ }>(obj: TObj): void;
33
+ declare const act: (callback: () => import("react-reconciler").Thenable<unknown>) => import("react-reconciler").Thenable<void>;
34
+ declare function createPortal(children: React.ReactNode, container: THREE.Object3D): React.ReactNode;
35
+ export * from '../core/hooks';
36
+ export { context, render, unmountComponentAtNode, createPortal, events, reconciler, applyProps, dispose, invalidate, advance, extend, addEffect, addAfterEffect, addTail, Canvas, act, roots as _roots, };
@@ -1 +1,11 @@
1
- export * from "../../dist/declarations/src/native";
1
+ // are you seeing an error that a default export doesn't exist but your source file has a default export?
2
+ // you should run `yarn` or `yarn preconstruct dev` if preconstruct dev isn't in your postinstall hook
3
+
4
+ // curious why you need to?
5
+ // this file exists so that you can import from the entrypoint normally
6
+ // except that it points to your source file and you don't need to run build constantly
7
+ // which means we need to re-export all of the modules from your source file
8
+ // and since export * doesn't include default exports, we need to read your source file
9
+ // to check for a default export and re-export it if it exists
10
+ // it's not ideal, but it works pretty well ¯\_(ツ)_/¯
11
+ export * from "../../src/native";
@@ -1,7 +1,16 @@
1
- 'use strict';
1
+ "use strict";
2
+ // this file might look strange and you might be wondering what it's for
3
+ // it's lets you import your source files by importing this entrypoint
4
+ // as you would import it if it was built with preconstruct build
5
+ // this file is slightly different to some others though
6
+ // it has a require hook which compiles your code with Babel
7
+ // this means that you don't have to set up @babel/register or anything like that
8
+ // but you can still require this module and it'll be compiled
2
9
 
3
- if (process.env.NODE_ENV === "production") {
4
- module.exports = require("./react-three-fiber-native.cjs.prod.js");
5
- } else {
6
- module.exports = require("./react-three-fiber-native.cjs.dev.js");
7
- }
10
+ // this bit of code imports the require hook and registers it
11
+ let unregister = require("../../../../node_modules/@preconstruct/hook").___internalHook(typeof __dirname === 'undefined' ? undefined : __dirname, "../../../..", "../..");
12
+
13
+ // this re-exports the source file
14
+ module.exports = require("../../src/native.tsx");
15
+
16
+ unregister();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@react-three/fiber",
3
- "version": "7.0.28",
3
+ "version": "7.0.29",
4
4
  "description": "A React renderer for Threejs",
5
5
  "keywords": [
6
6
  "react",
@@ -30,7 +30,6 @@
30
30
  "main": "dist/react-three-fiber.cjs.js",
31
31
  "module": "dist/react-three-fiber.esm.js",
32
32
  "types": "dist/react-three-fiber.cjs.d.ts",
33
- "react-native": "dist/native.js",
34
33
  "sideEffects": false,
35
34
  "preconstruct": {
36
35
  "entrypoints": [
@@ -1,369 +0,0 @@
1
- 'use strict';
2
-
3
- Object.defineProperty(exports, '__esModule', { value: true });
4
-
5
- var THREE = require('three');
6
- var expoAsset = require('expo-asset');
7
- var index = require('../../dist/index-9ced08b3.cjs.dev.js');
8
- var _extends = require('@babel/runtime/helpers/extends');
9
- var React = require('react');
10
- var mergeRefs = require('react-merge-refs');
11
- var reactNative = require('react-native');
12
- var expoGl = require('expo-gl');
13
- var Pressability = require('react-native/Libraries/Pressability/Pressability');
14
- require('react-reconciler/constants');
15
- require('zustand');
16
- require('react-reconciler');
17
- require('scheduler');
18
- require('suspend-react');
19
-
20
- function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
21
-
22
- function _interopNamespace(e) {
23
- if (e && e.__esModule) return e;
24
- var n = Object.create(null);
25
- if (e) {
26
- Object.keys(e).forEach(function (k) {
27
- if (k !== 'default') {
28
- var d = Object.getOwnPropertyDescriptor(e, k);
29
- Object.defineProperty(n, k, d.get ? d : {
30
- enumerable: true,
31
- get: function () { return e[k]; }
32
- });
33
- }
34
- });
35
- }
36
- n["default"] = e;
37
- return Object.freeze(n);
38
- }
39
-
40
- var THREE__namespace = /*#__PURE__*/_interopNamespace(THREE);
41
- var React__namespace = /*#__PURE__*/_interopNamespace(React);
42
- var mergeRefs__default = /*#__PURE__*/_interopDefault(mergeRefs);
43
- var Pressability__default = /*#__PURE__*/_interopDefault(Pressability);
44
-
45
- const EVENTS = {
46
- PRESS: 'onPress',
47
- PRESSIN: 'onPressIn',
48
- PRESSOUT: 'onPressOut',
49
- LONGPRESS: 'onLongPress',
50
- HOVERIN: 'onHoverIn',
51
- HOVEROUT: 'onHoverOut',
52
- PRESSMOVE: 'onPressMove'
53
- };
54
- const DOM_EVENTS = {
55
- [EVENTS.PRESS]: 'onClick',
56
- [EVENTS.PRESSIN]: 'onPointerDown',
57
- [EVENTS.PRESSOUT]: 'onPointerUp',
58
- [EVENTS.LONGPRESS]: 'onDoubleClick',
59
- [EVENTS.HOVERIN]: 'onPointerOver',
60
- [EVENTS.HOVEROUT]: 'onPointerOut',
61
- [EVENTS.PRESSMOVE]: 'onPointerMove'
62
- };
63
- /** Default R3F event manager for react-native */
64
-
65
- function createTouchEvents(store) {
66
- const {
67
- handlePointer
68
- } = index.createEvents(store);
69
-
70
- const handleTouch = (event, name) => {
71
- event.persist() // Apply offset
72
- ;
73
- event.nativeEvent.offsetX = event.nativeEvent.locationX;
74
- event.nativeEvent.offsetY = event.nativeEvent.locationY; // Emulate DOM event
75
-
76
- const callback = handlePointer(DOM_EVENTS[name]);
77
- return callback(event.nativeEvent);
78
- };
79
-
80
- return {
81
- priority: 1,
82
- enabled: true,
83
-
84
- compute(event, state, previous) {
85
- // https://github.com/pmndrs/react-three-fiber/pull/782
86
- // Events trigger outside of canvas when moved, use offsetX/Y by default and allow overrides
87
- state.pointer.set(event.offsetX / state.size.width * 2 - 1, -(event.offsetY / state.size.height) * 2 + 1);
88
- state.raycaster.setFromCamera(state.pointer, state.camera);
89
- },
90
-
91
- connected: undefined,
92
- handlers: Object.values(EVENTS).reduce((acc, name) => ({ ...acc,
93
- [name]: event => handleTouch(event, name)
94
- }), {}),
95
- connect: () => {
96
- const {
97
- set,
98
- events
99
- } = store.getState();
100
- events.disconnect == null ? void 0 : events.disconnect();
101
- const connected = new Pressability__default["default"](events == null ? void 0 : events.handlers);
102
- set(state => ({
103
- events: { ...state.events,
104
- connected
105
- }
106
- }));
107
- const handlers = connected.getEventHandlers();
108
- return handlers;
109
- },
110
- disconnect: () => {
111
- const {
112
- set,
113
- events
114
- } = store.getState();
115
-
116
- if (events.connected) {
117
- events.connected.reset();
118
- set(state => ({
119
- events: { ...state.events,
120
- connected: undefined
121
- }
122
- }));
123
- }
124
- }
125
- };
126
- }
127
-
128
- /**
129
- * A native canvas which accepts threejs elements as children.
130
- * @see https://docs.pmnd.rs/react-three-fiber/api/canvas
131
- */
132
- const Canvas = /*#__PURE__*/React__namespace.forwardRef(({
133
- children,
134
- style,
135
- gl,
136
- events = createTouchEvents,
137
- shadows,
138
- linear,
139
- flat,
140
- legacy,
141
- orthographic,
142
- frameloop,
143
- performance,
144
- raycaster,
145
- camera,
146
- onPointerMissed,
147
- onCreated,
148
- ...props
149
- }, forwardedRef) => {
150
- // Create a known catalogue of Threejs-native elements
151
- // This will include the entire THREE namespace by default, users can extend
152
- // their own elements by using the createRoot API instead
153
- React__namespace.useMemo(() => index.extend(THREE__namespace), []);
154
- const [{
155
- width,
156
- height
157
- }, setSize] = React__namespace.useState({
158
- width: 0,
159
- height: 0
160
- });
161
- const [canvas, setCanvas] = React__namespace.useState(null);
162
- const [bind, setBind] = React__namespace.useState();
163
- const handlePointerMissed = index.useMutableCallback(onPointerMissed);
164
- const [block, setBlock] = React__namespace.useState(false);
165
- const [error, setError] = React__namespace.useState(false); // Suspend this component if block is a promise (2nd run)
166
-
167
- if (block) throw block; // Throw exception outwards if anything within canvas throws
168
-
169
- if (error) throw error;
170
- const viewRef = React__namespace.useRef(null);
171
- const root = React__namespace.useRef(null);
172
- const onLayout = React__namespace.useCallback(e => {
173
- const {
174
- width,
175
- height
176
- } = e.nativeEvent.layout;
177
- setSize({
178
- width,
179
- height
180
- });
181
- }, []);
182
- const onContextCreate = React__namespace.useCallback(context => {
183
- const canvasShim = {
184
- width: context.drawingBufferWidth,
185
- height: context.drawingBufferHeight,
186
- style: {},
187
- addEventListener: () => {},
188
- removeEventListener: () => {},
189
- clientHeight: context.drawingBufferHeight,
190
- getContext: () => context
191
- };
192
- setCanvas(canvasShim);
193
- }, []);
194
-
195
- if (width > 0 && height > 0 && canvas) {
196
- if (!root.current) root.current = index.createRoot(canvas);
197
- root.current.configure({
198
- gl,
199
- events,
200
- shadows,
201
- linear,
202
- flat,
203
- legacy,
204
- orthographic,
205
- frameloop,
206
- performance,
207
- raycaster,
208
- camera,
209
- // expo-gl can only render at native dpr/resolution
210
- // https://github.com/expo/expo-three/issues/39
211
- dpr: reactNative.PixelRatio.get(),
212
- size: {
213
- width,
214
- height
215
- },
216
- // Pass mutable reference to onPointerMissed so it's free to update
217
- onPointerMissed: (...args) => handlePointerMissed.current == null ? void 0 : handlePointerMissed.current(...args),
218
- // Overwrite onCreated to apply RN bindings
219
- onCreated: state => {
220
- // Bind events after creation
221
- const handlers = state.events.connect == null ? void 0 : state.events.connect(viewRef.current);
222
- setBind(handlers); // Bind render to RN bridge
223
-
224
- const context = state.gl.getContext();
225
- const renderFrame = state.gl.render.bind(state.gl);
226
-
227
- state.gl.render = (scene, camera) => {
228
- renderFrame(scene, camera);
229
- context.endFrameEXP();
230
- };
231
-
232
- return onCreated == null ? void 0 : onCreated(state);
233
- }
234
- });
235
- root.current.render( /*#__PURE__*/React__namespace.createElement(index.ErrorBoundary, {
236
- set: setError
237
- }, /*#__PURE__*/React__namespace.createElement(React__namespace.Suspense, {
238
- fallback: /*#__PURE__*/React__namespace.createElement(index.Block, {
239
- set: setBlock
240
- })
241
- }, children)));
242
- }
243
-
244
- React__namespace.useEffect(() => {
245
- if (canvas) {
246
- return () => index.unmountComponentAtNode(canvas);
247
- }
248
- }, [canvas]);
249
- return /*#__PURE__*/React__namespace.createElement(reactNative.View, _extends({}, props, {
250
- ref: mergeRefs__default["default"]([viewRef, forwardedRef]),
251
- onLayout: onLayout,
252
- style: {
253
- flex: 1,
254
- ...style
255
- }
256
- }, bind), width > 0 && /*#__PURE__*/React__namespace.createElement(expoGl.GLView, {
257
- onContextCreate: onContextCreate,
258
- style: reactNative.StyleSheet.absoluteFill
259
- }));
260
- });
261
-
262
- /**
263
- * Generates an asset based on input type.
264
- */
265
-
266
- const getAsset = input => {
267
- if (input instanceof expoAsset.Asset) return input;
268
-
269
- switch (typeof input) {
270
- case 'string':
271
- return expoAsset.Asset.fromURI(input);
272
-
273
- case 'number':
274
- return expoAsset.Asset.fromModule(input);
275
-
276
- default:
277
- throw 'Invalid asset! Must be a URI or module.';
278
- }
279
- }; // Don't pre-process urls, let expo-asset generate an absolute URL
280
-
281
-
282
- const extractUrlBase = THREE__namespace.LoaderUtils.extractUrlBase.bind(THREE__namespace.LoaderUtils);
283
-
284
- THREE__namespace.LoaderUtils.extractUrlBase = url => typeof url === 'string' ? extractUrlBase(url) : './'; // There's no Image in native, so create a data texture instead
285
-
286
-
287
- THREE__namespace.TextureLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
288
- const texture = new THREE__namespace.Texture(); // @ts-ignore
289
-
290
- texture.isDataTexture = true;
291
- getAsset(url).downloadAsync().then(asset => {
292
- texture.image = {
293
- data: asset,
294
- width: asset.width,
295
- height: asset.height
296
- };
297
- texture.needsUpdate = true;
298
- onLoad == null ? void 0 : onLoad(texture);
299
- }).catch(onError);
300
- return texture;
301
- }; // Fetches assets via XMLHttpRequest
302
-
303
-
304
- THREE__namespace.FileLoader.prototype.load = function (url, onLoad, onProgress, onError) {
305
- if (this.path) url = this.path + url;
306
- const request = new XMLHttpRequest();
307
- getAsset(url).downloadAsync().then(asset => {
308
- request.open('GET', asset.uri, true);
309
- request.addEventListener('load', event => {
310
- if (request.status === 200) {
311
- onLoad == null ? void 0 : onLoad(request.response);
312
- this.manager.itemEnd(url);
313
- } else {
314
- onError == null ? void 0 : onError(event);
315
- this.manager.itemError(url);
316
- this.manager.itemEnd(url);
317
- }
318
- }, false);
319
- request.addEventListener('progress', event => {
320
- onProgress == null ? void 0 : onProgress(event);
321
- }, false);
322
- request.addEventListener('error', event => {
323
- onError == null ? void 0 : onError(event);
324
- this.manager.itemError(url);
325
- this.manager.itemEnd(url);
326
- }, false);
327
- request.addEventListener('abort', event => {
328
- onError == null ? void 0 : onError(event);
329
- this.manager.itemError(url);
330
- this.manager.itemEnd(url);
331
- }, false);
332
- if (this.responseType) request.responseType = this.responseType;
333
- if (this.withCredentials) request.withCredentials = this.withCredentials;
334
-
335
- for (const header in this.requestHeader) {
336
- request.setRequestHeader(header, this.requestHeader[header]);
337
- }
338
-
339
- request.send(null);
340
- this.manager.itemStart(url);
341
- });
342
- return request;
343
- };
344
-
345
- exports.ReactThreeFiber = index.threeTypes;
346
- exports._roots = index.roots;
347
- exports.act = index.act;
348
- exports.addAfterEffect = index.addAfterEffect;
349
- exports.addEffect = index.addEffect;
350
- exports.addTail = index.addTail;
351
- exports.advance = index.advance;
352
- exports.applyProps = index.applyProps;
353
- exports.context = index.context;
354
- exports.createPortal = index.createPortal;
355
- exports.createRoot = index.createRoot;
356
- exports.dispose = index.dispose;
357
- exports.extend = index.extend;
358
- exports.getRootState = index.getRootState;
359
- exports.invalidate = index.invalidate;
360
- exports.reconciler = index.reconciler;
361
- exports.render = index.render;
362
- exports.unmountComponentAtNode = index.unmountComponentAtNode;
363
- exports.useFrame = index.useFrame;
364
- exports.useGraph = index.useGraph;
365
- exports.useLoader = index.useLoader;
366
- exports.useStore = index.useStore;
367
- exports.useThree = index.useThree;
368
- exports.Canvas = Canvas;
369
- exports.events = createTouchEvents;