@react-three/fiber 10.0.0-canary.1be335a → 10.0.0-canary.27df622
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.
- package/dist/index.cjs +2565 -2468
- package/dist/index.d.cts +310 -153
- package/dist/index.d.mts +310 -153
- package/dist/index.d.ts +308 -179
- package/dist/index.mjs +1701 -1604
- package/dist/legacy.cjs +2482 -2389
- package/dist/legacy.d.cts +313 -160
- package/dist/legacy.d.mts +313 -160
- package/dist/legacy.d.ts +311 -184
- package/dist/legacy.mjs +2483 -2390
- package/dist/webgpu/index.cjs +2851 -2729
- package/dist/webgpu/index.d.cts +390 -264
- package/dist/webgpu/index.d.mts +390 -264
- package/dist/webgpu/index.d.ts +388 -290
- package/dist/webgpu/index.mjs +2590 -2468
- package/package.json +4 -4
- package/readme.md +1 -1
- package/react-reconciler/constants.d.ts +0 -7
- package/react-reconciler/constants.js +0 -1
- package/react-reconciler/index.d.ts +0 -1044
- package/react-reconciler/index.js +0 -208
package/dist/index.mjs
CHANGED
|
@@ -1,22 +1,21 @@
|
|
|
1
1
|
import * as webgpu from 'three/webgpu';
|
|
2
|
-
import { CubeRenderTarget, RenderTarget,
|
|
2
|
+
import { CubeRenderTarget, RenderTarget, Frustum, Matrix4, Group, BoxGeometry, MeshBasicNodeMaterial, Mesh, Node, NodeUpdateType, Layers, ShaderMaterial, Uniform, SRGBColorSpace, RGBAFormat, UnsignedByteType, Vector3, Vector2, TextureLoader, Texture as Texture$1, CubeReflectionMapping, EquirectangularReflectionMapping, CubeTextureLoader, CanvasTarget, Raycaster, OrthographicCamera, PerspectiveCamera, Scene, PCFShadowMap, VSMShadowMap, BasicShadowMap, ACESFilmicToneMapping, WebGPURenderer, HalfFloatType, Color } from 'three/webgpu';
|
|
3
3
|
import { WebGLCubeRenderTarget, WebGLRenderTarget, WebGLRenderer } from 'three';
|
|
4
|
-
import { Inspector } from 'three/addons/inspector/Inspector.js';
|
|
5
4
|
import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
|
|
6
5
|
import * as React from 'react';
|
|
7
|
-
import React__default, {
|
|
6
|
+
import React__default, { useRef, useMemo, useLayoutEffect, useEffect, useContext, useImperativeHandle, useCallback, useState } from 'react';
|
|
8
7
|
import useMeasure from 'react-use-measure';
|
|
9
8
|
import { useFiber, useContextBridge, traverseFiber, FiberProvider } from 'its-fine';
|
|
10
|
-
import {
|
|
9
|
+
import { createWithEqualityFn } from 'zustand/traditional';
|
|
10
|
+
import { getScheduler } from '@pmndrs/scheduler';
|
|
11
|
+
export { Scheduler, getScheduler } from '@pmndrs/scheduler';
|
|
12
|
+
import Tb, { unstable_getCurrentPriorityLevel, unstable_IdlePriority, unstable_LowPriority, unstable_NormalPriority, unstable_UserBlockingPriority, unstable_ImmediatePriority, unstable_scheduleCallback } from 'scheduler';
|
|
11
13
|
import { GroundedSkybox } from 'three/examples/jsm/objects/GroundedSkybox.js';
|
|
12
14
|
import { HDRLoader } from 'three/examples/jsm/loaders/HDRLoader.js';
|
|
15
|
+
import { HDRCubeTextureLoader } from 'three/examples/jsm/loaders/HDRCubeTextureLoader.js';
|
|
13
16
|
import { EXRLoader } from 'three/examples/jsm/loaders/EXRLoader.js';
|
|
14
17
|
import { UltraHDRLoader } from 'three/examples/jsm/loaders/UltraHDRLoader.js';
|
|
15
18
|
import { GainMapLoader } from '@monogrid/gainmap-js';
|
|
16
|
-
import Tb, { unstable_getCurrentPriorityLevel, unstable_IdlePriority, unstable_LowPriority, unstable_NormalPriority, unstable_UserBlockingPriority, unstable_ImmediatePriority, unstable_scheduleCallback } from 'scheduler';
|
|
17
|
-
import { createWithEqualityFn } from 'zustand/traditional';
|
|
18
|
-
import { getScheduler } from '@pmndrs/scheduler';
|
|
19
|
-
export { Scheduler, getScheduler } from '@pmndrs/scheduler';
|
|
20
19
|
import { suspend, preload, clear } from 'suspend-react';
|
|
21
20
|
|
|
22
21
|
function _mergeNamespaces(n, m) {
|
|
@@ -33,18 +32,22 @@ function _mergeNamespaces(n, m) {
|
|
|
33
32
|
|
|
34
33
|
const R3F_BUILD_LEGACY = true;
|
|
35
34
|
const R3F_BUILD_WEBGPU = true;
|
|
35
|
+
async function loadInspector() {
|
|
36
|
+
const { Inspector } = await import('three/addons/inspector/Inspector.js');
|
|
37
|
+
return Inspector;
|
|
38
|
+
}
|
|
36
39
|
|
|
37
40
|
const THREE = /*#__PURE__*/_mergeNamespaces({
|
|
38
41
|
__proto__: null,
|
|
39
42
|
CubeRenderTarget: CubeRenderTarget,
|
|
40
43
|
CubeRenderTargetCompat: CubeRenderTarget,
|
|
41
|
-
Inspector: Inspector,
|
|
42
44
|
R3F_BUILD_LEGACY: R3F_BUILD_LEGACY,
|
|
43
45
|
R3F_BUILD_WEBGPU: R3F_BUILD_WEBGPU,
|
|
44
46
|
RenderTargetCompat: RenderTarget,
|
|
45
47
|
WebGLCubeRenderTarget: WebGLCubeRenderTarget,
|
|
46
48
|
WebGLRenderTarget: WebGLRenderTarget,
|
|
47
|
-
WebGLRenderer: WebGLRenderer
|
|
49
|
+
WebGLRenderer: WebGLRenderer,
|
|
50
|
+
loadInspector: loadInspector
|
|
48
51
|
}, [webgpu]);
|
|
49
52
|
|
|
50
53
|
const primaryRegistry = /* @__PURE__ */ new Map();
|
|
@@ -105,556 +108,229 @@ function getPrimaryIds() {
|
|
|
105
108
|
return Array.from(primaryRegistry.keys());
|
|
106
109
|
}
|
|
107
110
|
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
111
|
+
var __defProp = Object.defineProperty;
|
|
112
|
+
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
113
|
+
var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
|
|
114
|
+
const useIsomorphicLayoutEffect = /* @__PURE__ */ (() => typeof window !== "undefined" && (window.document?.createElement || window.navigator?.product === "ReactNative"))() ? React.useLayoutEffect : React.useEffect;
|
|
115
|
+
function useMutableCallback(fn) {
|
|
116
|
+
const ref = React.useRef(fn);
|
|
117
|
+
useIsomorphicLayoutEffect(() => void (ref.current = fn), [fn]);
|
|
118
|
+
return ref;
|
|
119
|
+
}
|
|
120
|
+
function useBridge() {
|
|
121
|
+
const fiber = useFiber();
|
|
122
|
+
const ContextBridge = useContextBridge();
|
|
123
|
+
return React.useMemo(
|
|
124
|
+
() => ({ children }) => {
|
|
125
|
+
const strict = !!traverseFiber(fiber, true, (node) => node.type === React.StrictMode);
|
|
126
|
+
const Root = strict ? React.StrictMode : React.Fragment;
|
|
127
|
+
return /* @__PURE__ */ jsx(Root, { children: /* @__PURE__ */ jsx(ContextBridge, { children }) });
|
|
128
|
+
},
|
|
129
|
+
[fiber, ContextBridge]
|
|
130
|
+
);
|
|
131
|
+
}
|
|
132
|
+
function Block({ set }) {
|
|
133
|
+
useIsomorphicLayoutEffect(() => {
|
|
134
|
+
set(new Promise(() => null));
|
|
135
|
+
return () => set(false);
|
|
136
|
+
}, [set]);
|
|
137
|
+
return null;
|
|
138
|
+
}
|
|
139
|
+
const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
140
|
+
var _a;
|
|
141
|
+
return _a = class extends React.Component {
|
|
142
|
+
constructor() {
|
|
143
|
+
super(...arguments);
|
|
144
|
+
__publicField(this, "state", { error: false });
|
|
145
|
+
}
|
|
146
|
+
componentDidCatch(err) {
|
|
147
|
+
this.props.set(err);
|
|
148
|
+
}
|
|
149
|
+
render() {
|
|
150
|
+
return this.state.error ? null : this.props.children;
|
|
151
|
+
}
|
|
152
|
+
}, __publicField(_a, "getDerivedStateFromError", () => ({ error: true })), _a;
|
|
153
|
+
})();
|
|
120
154
|
|
|
121
|
-
const
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
} = {}) {
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
useLoader$1.clear(loader, multiFile ? [files] : files);
|
|
155
|
+
const is = {
|
|
156
|
+
obj: (a) => a === Object(a) && !is.arr(a) && typeof a !== "function",
|
|
157
|
+
fun: (a) => typeof a === "function",
|
|
158
|
+
str: (a) => typeof a === "string",
|
|
159
|
+
num: (a) => typeof a === "number",
|
|
160
|
+
boo: (a) => typeof a === "boolean",
|
|
161
|
+
und: (a) => a === void 0,
|
|
162
|
+
nul: (a) => a === null,
|
|
163
|
+
arr: (a) => Array.isArray(a),
|
|
164
|
+
equ(a, b, { arrays = "shallow", objects = "reference", strict = true } = {}) {
|
|
165
|
+
if (typeof a !== typeof b || !!a !== !!b) return false;
|
|
166
|
+
if (is.str(a) || is.num(a) || is.boo(a)) return a === b;
|
|
167
|
+
const isObj = is.obj(a);
|
|
168
|
+
if (isObj && objects === "reference") return a === b;
|
|
169
|
+
const isArr = is.arr(a);
|
|
170
|
+
if (isArr && arrays === "reference") return a === b;
|
|
171
|
+
if ((isArr || isObj) && a === b) return true;
|
|
172
|
+
let i;
|
|
173
|
+
for (i in a) if (!(i in b)) return false;
|
|
174
|
+
if (isObj && arrays === "shallow" && objects === "shallow") {
|
|
175
|
+
for (i in strict ? b : a) if (!is.equ(a[i], b[i], { strict, objects: "reference" })) return false;
|
|
176
|
+
} else {
|
|
177
|
+
for (i in strict ? b : a) if (a[i] !== b[i]) return false;
|
|
145
178
|
}
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
multiFile ? [files] : files,
|
|
151
|
-
(loader2) => {
|
|
152
|
-
if (extension === "webp" || extension === "jpg" || extension === "jpeg") {
|
|
153
|
-
loader2.setRenderer?.(renderer);
|
|
154
|
-
}
|
|
155
|
-
loader2.setPath?.(path);
|
|
156
|
-
if (extensions) extensions(loader2);
|
|
179
|
+
if (is.und(i)) {
|
|
180
|
+
if (isArr && a.length === 0 && b.length === 0) return true;
|
|
181
|
+
if (isObj && Object.keys(a).length === 0 && Object.keys(b).length === 0) return true;
|
|
182
|
+
if (a !== b) return false;
|
|
157
183
|
}
|
|
158
|
-
|
|
159
|
-
let texture = multiFile ? (
|
|
160
|
-
// @ts-ignore
|
|
161
|
-
loaderResult[0]
|
|
162
|
-
) : loaderResult;
|
|
163
|
-
if (extension === "jpg" || extension === "jpeg" || extension === "webp") {
|
|
164
|
-
texture = texture.renderTarget?.texture;
|
|
165
|
-
}
|
|
166
|
-
texture.mapping = isCubemap ? CubeReflectionMapping : EquirectangularReflectionMapping;
|
|
167
|
-
texture.colorSpace = colorSpace ?? (isCubemap ? "srgb" : "srgb-linear");
|
|
168
|
-
return texture;
|
|
169
|
-
}
|
|
170
|
-
const preloadDefaultOptions = {
|
|
171
|
-
files: defaultFiles,
|
|
172
|
-
path: "",
|
|
173
|
-
preset: void 0,
|
|
174
|
-
extensions: void 0
|
|
175
|
-
};
|
|
176
|
-
useEnvironment.preload = (preloadOptions) => {
|
|
177
|
-
const options = { ...preloadDefaultOptions, ...preloadOptions };
|
|
178
|
-
let { files, path = "" } = options;
|
|
179
|
-
const { preset, extensions } = options;
|
|
180
|
-
if (preset) {
|
|
181
|
-
validatePreset(preset);
|
|
182
|
-
files = presetsObj[preset];
|
|
183
|
-
path = CUBEMAP_ROOT;
|
|
184
|
-
}
|
|
185
|
-
const { extension } = getExtension(files);
|
|
186
|
-
if (extension === "webp" || extension === "jpg" || extension === "jpeg") {
|
|
187
|
-
throw new Error("useEnvironment: Preloading gainmaps is not supported");
|
|
188
|
-
}
|
|
189
|
-
const loader = getLoader$1(extension);
|
|
190
|
-
if (!loader) throw new Error("useEnvironment: Unrecognized file extension: " + files);
|
|
191
|
-
useLoader$1.preload(loader, isArray(files) ? [files] : files, (loader2) => {
|
|
192
|
-
loader2.setPath?.(path);
|
|
193
|
-
if (extensions) extensions(loader2);
|
|
194
|
-
});
|
|
195
|
-
};
|
|
196
|
-
const clearDefaultOptins = {
|
|
197
|
-
files: defaultFiles,
|
|
198
|
-
preset: void 0
|
|
199
|
-
};
|
|
200
|
-
useEnvironment.clear = (clearOptions) => {
|
|
201
|
-
const options = { ...clearDefaultOptins, ...clearOptions };
|
|
202
|
-
let { files } = options;
|
|
203
|
-
const { preset } = options;
|
|
204
|
-
if (preset) {
|
|
205
|
-
validatePreset(preset);
|
|
206
|
-
files = presetsObj[preset];
|
|
184
|
+
return true;
|
|
207
185
|
}
|
|
208
|
-
const { extension } = getExtension(files);
|
|
209
|
-
const loader = getLoader$1(extension);
|
|
210
|
-
if (!loader) throw new Error("useEnvironment: Unrecognized file extension: " + files);
|
|
211
|
-
useLoader$1.clear(loader, isArray(files) ? [files] : files);
|
|
212
186
|
};
|
|
213
|
-
|
|
214
|
-
|
|
187
|
+
const isOrthographicCamera = (def) => def && def.isOrthographicCamera;
|
|
188
|
+
const isRef$1 = (obj) => obj !== null && typeof obj === "object" && obj.hasOwnProperty("current");
|
|
189
|
+
const isColorRepresentation = (value) => value != null && (typeof value === "string" || typeof value === "number" || value.isColor);
|
|
190
|
+
const isObject3D = (object) => object?.isObject3D;
|
|
191
|
+
const isTexture = (value) => !!value?.isTexture;
|
|
192
|
+
const isVectorLike = (object) => object !== null && typeof object === "object" && "set" in object && typeof object.set === "function";
|
|
193
|
+
const isCopyable = (object) => isVectorLike(object) && "copy" in object && typeof object.copy === "function";
|
|
194
|
+
const hasConstructor = (object) => !!object?.constructor;
|
|
195
|
+
|
|
196
|
+
function calculateDpr(dpr) {
|
|
197
|
+
const target = typeof window !== "undefined" ? window.devicePixelRatio ?? 2 : 1;
|
|
198
|
+
return Array.isArray(dpr) ? Math.min(Math.max(dpr[0], target), dpr[1]) : dpr;
|
|
215
199
|
}
|
|
216
|
-
function
|
|
217
|
-
|
|
218
|
-
const isGainmap = isArray(files) && files.length === 3 && files.some((file) => file.endsWith("json"));
|
|
219
|
-
const firstEntry = isArray(files) ? files[0] : files;
|
|
220
|
-
const extension = isCubemap ? "cube" : isGainmap ? "webp" : firstEntry.startsWith("data:application/exr") ? "exr" : firstEntry.startsWith("data:application/hdr") ? "hdr" : firstEntry.startsWith("data:image/jpeg") ? "jpg" : firstEntry.split(".").pop()?.split("?")?.shift()?.toLowerCase();
|
|
221
|
-
return { extension, isCubemap, isGainmap };
|
|
200
|
+
function getUuidPrefix(uuid) {
|
|
201
|
+
return uuid.split("-")[0];
|
|
222
202
|
}
|
|
223
|
-
function
|
|
224
|
-
|
|
225
|
-
|
|
203
|
+
function updateCamera(camera, size) {
|
|
204
|
+
if (camera.manual) return;
|
|
205
|
+
if (isOrthographicCamera(camera)) {
|
|
206
|
+
camera.left = size.width / -2;
|
|
207
|
+
camera.right = size.width / 2;
|
|
208
|
+
camera.top = size.height / 2;
|
|
209
|
+
camera.bottom = size.height / -2;
|
|
210
|
+
} else {
|
|
211
|
+
camera.aspect = size.width / size.height;
|
|
212
|
+
}
|
|
213
|
+
camera.updateProjectionMatrix();
|
|
226
214
|
}
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
const
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
backgroundIntensity: 1,
|
|
234
|
-
backgroundRotation: [0, 0, 0],
|
|
235
|
-
environmentIntensity: 1,
|
|
236
|
-
environmentRotation: [0, 0, 0],
|
|
237
|
-
...sceneProps
|
|
238
|
-
};
|
|
239
|
-
const target = resolveScene(scene || defaultScene);
|
|
240
|
-
const oldbg = target.background;
|
|
241
|
-
const oldenv = target.environment;
|
|
242
|
-
const oldSceneProps = {
|
|
243
|
-
// @ts-ignore
|
|
244
|
-
backgroundBlurriness: target.backgroundBlurriness,
|
|
245
|
-
// @ts-ignore
|
|
246
|
-
backgroundIntensity: target.backgroundIntensity,
|
|
247
|
-
// @ts-ignore
|
|
248
|
-
backgroundRotation: target.backgroundRotation?.clone?.() ?? [0, 0, 0],
|
|
249
|
-
// @ts-ignore
|
|
250
|
-
environmentIntensity: target.environmentIntensity,
|
|
251
|
-
// @ts-ignore
|
|
252
|
-
environmentRotation: target.environmentRotation?.clone?.() ?? [0, 0, 0]
|
|
253
|
-
};
|
|
254
|
-
if (background !== "only") target.environment = texture;
|
|
255
|
-
if (background) target.background = texture;
|
|
256
|
-
applyProps$1(target, sceneProps);
|
|
257
|
-
return () => {
|
|
258
|
-
if (background !== "only") target.environment = oldenv;
|
|
259
|
-
if (background) target.background = oldbg;
|
|
260
|
-
applyProps$1(target, oldSceneProps);
|
|
261
|
-
};
|
|
215
|
+
const frustumMatrix = new Matrix4();
|
|
216
|
+
function updateFrustum(camera, frustum) {
|
|
217
|
+
const target = frustum ?? new Frustum();
|
|
218
|
+
frustumMatrix.multiplyMatrices(camera.projectionMatrix, camera.matrixWorldInverse);
|
|
219
|
+
target.setFromProjectionMatrix(frustumMatrix);
|
|
220
|
+
return target;
|
|
262
221
|
}
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
return
|
|
222
|
+
|
|
223
|
+
const REACT_INTERNAL_PROPS = ["children", "key", "ref"];
|
|
224
|
+
function findInitialRoot(instance) {
|
|
225
|
+
let root = instance.root;
|
|
226
|
+
while (root.getState().previousRoot) root = root.getState().previousRoot;
|
|
227
|
+
return root;
|
|
269
228
|
}
|
|
270
|
-
function
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
...rest
|
|
280
|
-
}) {
|
|
281
|
-
const texture = useEnvironment(rest);
|
|
282
|
-
const defaultScene = useThree$1((state) => state.scene);
|
|
283
|
-
React.useLayoutEffect(() => {
|
|
284
|
-
return setEnvProps(background, scene, defaultScene, texture, {
|
|
285
|
-
backgroundBlurriness: blur ?? backgroundBlurriness,
|
|
286
|
-
backgroundIntensity,
|
|
287
|
-
backgroundRotation,
|
|
288
|
-
environmentIntensity,
|
|
289
|
-
environmentRotation
|
|
229
|
+
function getRootState(obj) {
|
|
230
|
+
let state = obj.__r3f?.root.getState();
|
|
231
|
+
if (!state) {
|
|
232
|
+
obj.traverseAncestors((ancestor) => {
|
|
233
|
+
const parentState = ancestor.__r3f?.root.getState();
|
|
234
|
+
if (parentState) {
|
|
235
|
+
state = parentState;
|
|
236
|
+
return false;
|
|
237
|
+
}
|
|
290
238
|
});
|
|
291
|
-
}
|
|
292
|
-
|
|
293
|
-
return () => {
|
|
294
|
-
texture.dispose();
|
|
295
|
-
};
|
|
296
|
-
}, [texture]);
|
|
297
|
-
return null;
|
|
239
|
+
}
|
|
240
|
+
return state;
|
|
298
241
|
}
|
|
299
|
-
function
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
path,
|
|
316
|
-
preset = void 0,
|
|
317
|
-
extensions
|
|
318
|
-
}) {
|
|
319
|
-
const renderer = useThree$1((state) => state.renderer);
|
|
320
|
-
const isLegacy = useThree$1((state) => state.isLegacy);
|
|
321
|
-
const defaultScene = useThree$1((state) => state.scene);
|
|
322
|
-
const camera = React.useRef(null);
|
|
323
|
-
const [virtualScene] = React.useState(() => new Scene());
|
|
324
|
-
const fbo = React.useMemo(() => {
|
|
325
|
-
const fbo2 = isLegacy ? new WebGLCubeRenderTarget(resolution) : new CubeRenderTarget(resolution);
|
|
326
|
-
fbo2.texture.type = HalfFloatType;
|
|
327
|
-
return fbo2;
|
|
328
|
-
}, [resolution, isLegacy]);
|
|
329
|
-
React.useEffect(() => {
|
|
330
|
-
return () => {
|
|
331
|
-
fbo.dispose();
|
|
332
|
-
};
|
|
333
|
-
}, [fbo]);
|
|
334
|
-
React.useLayoutEffect(() => {
|
|
335
|
-
if (frames === 1) {
|
|
336
|
-
const autoClear = renderer.autoClear;
|
|
337
|
-
renderer.autoClear = true;
|
|
338
|
-
camera.current.update(renderer, virtualScene);
|
|
339
|
-
renderer.autoClear = autoClear;
|
|
340
|
-
}
|
|
341
|
-
return setEnvProps(background, scene, defaultScene, fbo.texture, {
|
|
342
|
-
backgroundBlurriness: blur ?? backgroundBlurriness,
|
|
343
|
-
backgroundIntensity,
|
|
344
|
-
backgroundRotation,
|
|
345
|
-
environmentIntensity,
|
|
346
|
-
environmentRotation
|
|
242
|
+
function buildGraph(object) {
|
|
243
|
+
const data = { nodes: {}, materials: {}, meshes: {} };
|
|
244
|
+
if (object) {
|
|
245
|
+
object.traverse((obj) => {
|
|
246
|
+
if (obj.name) data.nodes[obj.name] = obj;
|
|
247
|
+
if (obj.material) {
|
|
248
|
+
const material = Array.isArray(obj.material) ? obj.material[0] : obj.material;
|
|
249
|
+
const nameAlreadyUsed = data.materials[material.name];
|
|
250
|
+
let materialName = material.name;
|
|
251
|
+
if (nameAlreadyUsed) {
|
|
252
|
+
materialName = materialName + `-${getUuidPrefix(material.uuid)}`;
|
|
253
|
+
material.userData.materialCacheName = materialName;
|
|
254
|
+
}
|
|
255
|
+
data.materials[materialName] = material;
|
|
256
|
+
}
|
|
257
|
+
if (obj.isMesh && !data.meshes[obj.name]) data.meshes[obj.name] = obj;
|
|
347
258
|
});
|
|
348
|
-
}
|
|
349
|
-
|
|
350
|
-
virtualScene,
|
|
351
|
-
fbo.texture,
|
|
352
|
-
scene,
|
|
353
|
-
defaultScene,
|
|
354
|
-
background,
|
|
355
|
-
frames,
|
|
356
|
-
renderer,
|
|
357
|
-
blur,
|
|
358
|
-
backgroundBlurriness,
|
|
359
|
-
backgroundIntensity,
|
|
360
|
-
backgroundRotation,
|
|
361
|
-
environmentIntensity,
|
|
362
|
-
environmentRotation
|
|
363
|
-
]);
|
|
364
|
-
let count = 1;
|
|
365
|
-
useFrame$1(() => {
|
|
366
|
-
if (frames === Infinity || count < frames) {
|
|
367
|
-
const autoClear = renderer.autoClear;
|
|
368
|
-
renderer.autoClear = true;
|
|
369
|
-
camera.current.update(renderer, virtualScene);
|
|
370
|
-
renderer.autoClear = autoClear;
|
|
371
|
-
count++;
|
|
372
|
-
}
|
|
373
|
-
});
|
|
374
|
-
return /* @__PURE__ */ jsx(Fragment, { children: createPortal$1(
|
|
375
|
-
/* @__PURE__ */ jsxs(Fragment, { children: [
|
|
376
|
-
children,
|
|
377
|
-
/* @__PURE__ */ jsx("cubeCamera", { ref: camera, args: [near, far, fbo] }),
|
|
378
|
-
files || preset ? /* @__PURE__ */ jsx(EnvironmentCube, { background: true, files, preset, path, extensions }) : map ? /* @__PURE__ */ jsx(EnvironmentMap, { background: true, map, extensions }) : null
|
|
379
|
-
] }),
|
|
380
|
-
virtualScene
|
|
381
|
-
) });
|
|
382
|
-
}
|
|
383
|
-
function EnvironmentGround(props) {
|
|
384
|
-
const textureDefault = useEnvironment(props);
|
|
385
|
-
const texture = props.map || textureDefault;
|
|
386
|
-
React.useMemo(() => extend$1({ GroundProjectedEnvImpl: GroundedSkybox }), []);
|
|
387
|
-
React.useEffect(() => {
|
|
388
|
-
return () => {
|
|
389
|
-
textureDefault.dispose();
|
|
390
|
-
};
|
|
391
|
-
}, [textureDefault]);
|
|
392
|
-
const height = props.ground?.height ?? 15;
|
|
393
|
-
const radius = props.ground?.radius ?? 60;
|
|
394
|
-
const scale = props.ground?.scale ?? 1e3;
|
|
395
|
-
const args = React.useMemo(
|
|
396
|
-
() => [texture, height, radius],
|
|
397
|
-
[texture, height, radius]
|
|
398
|
-
);
|
|
399
|
-
return /* @__PURE__ */ jsxs(Fragment, { children: [
|
|
400
|
-
/* @__PURE__ */ jsx(EnvironmentMap, { ...props, map: texture }),
|
|
401
|
-
/* @__PURE__ */ jsx("groundProjectedEnvImpl", { args, scale })
|
|
402
|
-
] });
|
|
403
|
-
}
|
|
404
|
-
function EnvironmentColor({ color, scene }) {
|
|
405
|
-
const defaultScene = useThree$1((state) => state.scene);
|
|
406
|
-
React.useLayoutEffect(() => {
|
|
407
|
-
if (color === void 0) return;
|
|
408
|
-
const target = resolveScene(scene || defaultScene);
|
|
409
|
-
const oldBg = target.background;
|
|
410
|
-
target.background = new Color(color);
|
|
411
|
-
return () => {
|
|
412
|
-
target.background = oldBg;
|
|
413
|
-
};
|
|
414
|
-
});
|
|
415
|
-
return null;
|
|
259
|
+
}
|
|
260
|
+
return data;
|
|
416
261
|
}
|
|
417
|
-
function
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
262
|
+
function dispose(obj) {
|
|
263
|
+
if (obj.type !== "Scene") obj.dispose?.();
|
|
264
|
+
for (const p in obj) {
|
|
265
|
+
const prop = obj[p];
|
|
266
|
+
if (prop?.type !== "Scene") prop?.dispose?.();
|
|
267
|
+
}
|
|
423
268
|
}
|
|
424
|
-
function
|
|
425
|
-
|
|
426
|
-
|
|
269
|
+
function getInstanceProps(pendingProps) {
|
|
270
|
+
const props = {};
|
|
271
|
+
for (const key in pendingProps) {
|
|
272
|
+
if (!REACT_INTERNAL_PROPS.includes(key)) props[key] = pendingProps[key];
|
|
427
273
|
}
|
|
428
|
-
|
|
429
|
-
|
|
274
|
+
return props;
|
|
275
|
+
}
|
|
276
|
+
function prepare(target, root, type, props) {
|
|
277
|
+
const object = target;
|
|
278
|
+
let instance = object?.__r3f;
|
|
279
|
+
if (!instance) {
|
|
280
|
+
instance = {
|
|
281
|
+
root,
|
|
282
|
+
type,
|
|
283
|
+
parent: null,
|
|
284
|
+
children: [],
|
|
285
|
+
props: getInstanceProps(props),
|
|
286
|
+
object,
|
|
287
|
+
eventCount: 0,
|
|
288
|
+
handlers: {},
|
|
289
|
+
isHidden: false
|
|
290
|
+
};
|
|
291
|
+
if (object) object.__r3f = instance;
|
|
430
292
|
}
|
|
431
|
-
return
|
|
293
|
+
return instance;
|
|
294
|
+
}
|
|
295
|
+
function invalidateInstance(instance) {
|
|
296
|
+
if (!instance.parent) return;
|
|
297
|
+
instance.props.onUpdate?.(instance.object);
|
|
298
|
+
const state = instance.root?.getState?.();
|
|
299
|
+
if (state && state.internal.frames === 0) state.invalidate();
|
|
432
300
|
}
|
|
433
301
|
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
302
|
+
const tempFrustum = new Frustum();
|
|
303
|
+
let hasWarnedWebGL = false;
|
|
304
|
+
let tslModule = null;
|
|
305
|
+
async function loadTSL() {
|
|
306
|
+
if (tslModule) return tslModule;
|
|
307
|
+
try {
|
|
308
|
+
const tsl = await import('three/tsl');
|
|
309
|
+
tslModule = { uniform: tsl.uniform, nodeObject: tsl.nodeObject };
|
|
310
|
+
return tslModule;
|
|
311
|
+
} catch {
|
|
312
|
+
return null;
|
|
313
|
+
}
|
|
443
314
|
}
|
|
444
|
-
function
|
|
445
|
-
const
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
const ErrorBoundary = /* @__PURE__ */ (() => {
|
|
464
|
-
var _a;
|
|
465
|
-
return _a = class extends React.Component {
|
|
466
|
-
constructor() {
|
|
467
|
-
super(...arguments);
|
|
468
|
-
__publicField(this, "state", { error: false });
|
|
469
|
-
}
|
|
470
|
-
componentDidCatch(err) {
|
|
471
|
-
this.props.set(err);
|
|
472
|
-
}
|
|
473
|
-
render() {
|
|
474
|
-
return this.state.error ? null : this.props.children;
|
|
475
|
-
}
|
|
476
|
-
}, __publicField(_a, "getDerivedStateFromError", () => ({ error: true })), _a;
|
|
477
|
-
})();
|
|
478
|
-
|
|
479
|
-
const is = {
|
|
480
|
-
obj: (a) => a === Object(a) && !is.arr(a) && typeof a !== "function",
|
|
481
|
-
fun: (a) => typeof a === "function",
|
|
482
|
-
str: (a) => typeof a === "string",
|
|
483
|
-
num: (a) => typeof a === "number",
|
|
484
|
-
boo: (a) => typeof a === "boolean",
|
|
485
|
-
und: (a) => a === void 0,
|
|
486
|
-
nul: (a) => a === null,
|
|
487
|
-
arr: (a) => Array.isArray(a),
|
|
488
|
-
equ(a, b, { arrays = "shallow", objects = "reference", strict = true } = {}) {
|
|
489
|
-
if (typeof a !== typeof b || !!a !== !!b) return false;
|
|
490
|
-
if (is.str(a) || is.num(a) || is.boo(a)) return a === b;
|
|
491
|
-
const isObj = is.obj(a);
|
|
492
|
-
if (isObj && objects === "reference") return a === b;
|
|
493
|
-
const isArr = is.arr(a);
|
|
494
|
-
if (isArr && arrays === "reference") return a === b;
|
|
495
|
-
if ((isArr || isObj) && a === b) return true;
|
|
496
|
-
let i;
|
|
497
|
-
for (i in a) if (!(i in b)) return false;
|
|
498
|
-
if (isObj && arrays === "shallow" && objects === "shallow") {
|
|
499
|
-
for (i in strict ? b : a) if (!is.equ(a[i], b[i], { strict, objects: "reference" })) return false;
|
|
500
|
-
} else {
|
|
501
|
-
for (i in strict ? b : a) if (a[i] !== b[i]) return false;
|
|
502
|
-
}
|
|
503
|
-
if (is.und(i)) {
|
|
504
|
-
if (isArr && a.length === 0 && b.length === 0) return true;
|
|
505
|
-
if (isObj && Object.keys(a).length === 0 && Object.keys(b).length === 0) return true;
|
|
506
|
-
if (a !== b) return false;
|
|
507
|
-
}
|
|
508
|
-
return true;
|
|
509
|
-
}
|
|
510
|
-
};
|
|
511
|
-
const isOrthographicCamera = (def) => def && def.isOrthographicCamera;
|
|
512
|
-
const isRef = (obj) => obj !== null && typeof obj === "object" && obj.hasOwnProperty("current");
|
|
513
|
-
const isColorRepresentation = (value) => value != null && (typeof value === "string" || typeof value === "number" || value.isColor);
|
|
514
|
-
const isObject3D = (object) => object?.isObject3D;
|
|
515
|
-
const isTexture = (value) => !!value?.isTexture;
|
|
516
|
-
const isVectorLike = (object) => object !== null && typeof object === "object" && "set" in object && typeof object.set === "function";
|
|
517
|
-
const isCopyable = (object) => isVectorLike(object) && "copy" in object && typeof object.copy === "function";
|
|
518
|
-
const hasConstructor = (object) => !!object?.constructor;
|
|
519
|
-
|
|
520
|
-
function calculateDpr(dpr) {
|
|
521
|
-
const target = typeof window !== "undefined" ? window.devicePixelRatio ?? 2 : 1;
|
|
522
|
-
return Array.isArray(dpr) ? Math.min(Math.max(dpr[0], target), dpr[1]) : dpr;
|
|
523
|
-
}
|
|
524
|
-
function getUuidPrefix(uuid) {
|
|
525
|
-
return uuid.split("-")[0];
|
|
526
|
-
}
|
|
527
|
-
function updateCamera(camera, size) {
|
|
528
|
-
if (camera.manual) return;
|
|
529
|
-
if (isOrthographicCamera(camera)) {
|
|
530
|
-
camera.left = size.width / -2;
|
|
531
|
-
camera.right = size.width / 2;
|
|
532
|
-
camera.top = size.height / 2;
|
|
533
|
-
camera.bottom = size.height / -2;
|
|
534
|
-
} else {
|
|
535
|
-
camera.aspect = size.width / size.height;
|
|
536
|
-
}
|
|
537
|
-
camera.updateProjectionMatrix();
|
|
538
|
-
}
|
|
539
|
-
const frustumMatrix = new Matrix4();
|
|
540
|
-
function updateFrustum(camera, frustum) {
|
|
541
|
-
const target = frustum ?? new Frustum();
|
|
542
|
-
frustumMatrix.multiplyMatrices(camera.projectionMatrix, camera.matrixWorldInverse);
|
|
543
|
-
target.setFromProjectionMatrix(frustumMatrix);
|
|
544
|
-
return target;
|
|
545
|
-
}
|
|
546
|
-
|
|
547
|
-
const REACT_INTERNAL_PROPS = ["children", "key", "ref"];
|
|
548
|
-
function findInitialRoot(instance) {
|
|
549
|
-
let root = instance.root;
|
|
550
|
-
while (root.getState().previousRoot) root = root.getState().previousRoot;
|
|
551
|
-
return root;
|
|
552
|
-
}
|
|
553
|
-
function getRootState(obj) {
|
|
554
|
-
let state = obj.__r3f?.root.getState();
|
|
555
|
-
if (!state) {
|
|
556
|
-
obj.traverseAncestors((ancestor) => {
|
|
557
|
-
const parentState = ancestor.__r3f?.root.getState();
|
|
558
|
-
if (parentState) {
|
|
559
|
-
state = parentState;
|
|
560
|
-
return false;
|
|
561
|
-
}
|
|
562
|
-
});
|
|
563
|
-
}
|
|
564
|
-
return state;
|
|
565
|
-
}
|
|
566
|
-
function buildGraph(object) {
|
|
567
|
-
const data = { nodes: {}, materials: {}, meshes: {} };
|
|
568
|
-
if (object) {
|
|
569
|
-
object.traverse((obj) => {
|
|
570
|
-
if (obj.name) data.nodes[obj.name] = obj;
|
|
571
|
-
if (obj.material) {
|
|
572
|
-
const material = Array.isArray(obj.material) ? obj.material[0] : obj.material;
|
|
573
|
-
const nameAlreadyUsed = data.materials[material.name];
|
|
574
|
-
let materialName = material.name;
|
|
575
|
-
if (nameAlreadyUsed) {
|
|
576
|
-
materialName = materialName + `-${getUuidPrefix(material.uuid)}`;
|
|
577
|
-
material.userData.materialCacheName = materialName;
|
|
578
|
-
}
|
|
579
|
-
data.materials[materialName] = material;
|
|
580
|
-
}
|
|
581
|
-
if (obj.isMesh && !data.meshes[obj.name]) data.meshes[obj.name] = obj;
|
|
582
|
-
});
|
|
583
|
-
}
|
|
584
|
-
return data;
|
|
585
|
-
}
|
|
586
|
-
function dispose(obj) {
|
|
587
|
-
if (obj.type !== "Scene") obj.dispose?.();
|
|
588
|
-
for (const p in obj) {
|
|
589
|
-
const prop = obj[p];
|
|
590
|
-
if (prop?.type !== "Scene") prop?.dispose?.();
|
|
591
|
-
}
|
|
592
|
-
}
|
|
593
|
-
function getInstanceProps(pendingProps) {
|
|
594
|
-
const props = {};
|
|
595
|
-
for (const key in pendingProps) {
|
|
596
|
-
if (!REACT_INTERNAL_PROPS.includes(key)) props[key] = pendingProps[key];
|
|
597
|
-
}
|
|
598
|
-
return props;
|
|
599
|
-
}
|
|
600
|
-
function prepare(target, root, type, props) {
|
|
601
|
-
const object = target;
|
|
602
|
-
let instance = object?.__r3f;
|
|
603
|
-
if (!instance) {
|
|
604
|
-
instance = {
|
|
605
|
-
root,
|
|
606
|
-
type,
|
|
607
|
-
parent: null,
|
|
608
|
-
children: [],
|
|
609
|
-
props: getInstanceProps(props),
|
|
610
|
-
object,
|
|
611
|
-
eventCount: 0,
|
|
612
|
-
handlers: {},
|
|
613
|
-
isHidden: false
|
|
614
|
-
};
|
|
615
|
-
if (object) object.__r3f = instance;
|
|
616
|
-
}
|
|
617
|
-
return instance;
|
|
618
|
-
}
|
|
619
|
-
function invalidateInstance(instance) {
|
|
620
|
-
if (!instance.parent) return;
|
|
621
|
-
instance.props.onUpdate?.(instance.object);
|
|
622
|
-
const state = instance.root?.getState?.();
|
|
623
|
-
if (state && state.internal.frames === 0) state.invalidate();
|
|
624
|
-
}
|
|
625
|
-
|
|
626
|
-
const tempFrustum = new Frustum();
|
|
627
|
-
let hasWarnedWebGL = false;
|
|
628
|
-
let tslModule = null;
|
|
629
|
-
async function loadTSL() {
|
|
630
|
-
if (tslModule) return tslModule;
|
|
631
|
-
try {
|
|
632
|
-
const tsl = await import('three/tsl');
|
|
633
|
-
tslModule = { uniform: tsl.uniform, nodeObject: tsl.nodeObject };
|
|
634
|
-
return tslModule;
|
|
635
|
-
} catch {
|
|
636
|
-
return null;
|
|
637
|
-
}
|
|
638
|
-
}
|
|
639
|
-
function createOcclusionObserverNode(store, uniform) {
|
|
640
|
-
const node = new Node("float");
|
|
641
|
-
node.updateType = NodeUpdateType.OBJECT;
|
|
642
|
-
node.update = function(frame) {
|
|
643
|
-
const { internal } = store.getState();
|
|
644
|
-
const registry = internal.visibilityRegistry;
|
|
645
|
-
const cache = internal.occlusionCache;
|
|
646
|
-
for (const entry of registry.values()) {
|
|
647
|
-
const { object, handlers } = entry;
|
|
648
|
-
if (handlers.onOccluded || handlers.onVisible) {
|
|
649
|
-
const isOccluded = frame.renderer.isOccluded(object);
|
|
650
|
-
cache.set(object, isOccluded);
|
|
651
|
-
}
|
|
652
|
-
}
|
|
653
|
-
};
|
|
654
|
-
node.setup = function() {
|
|
655
|
-
return uniform(0);
|
|
656
|
-
};
|
|
657
|
-
return node;
|
|
315
|
+
function createOcclusionObserverNode(store, uniform) {
|
|
316
|
+
const node = new Node("float");
|
|
317
|
+
node.updateType = NodeUpdateType.OBJECT;
|
|
318
|
+
node.update = function(frame) {
|
|
319
|
+
const { internal } = store.getState();
|
|
320
|
+
const registry = internal.visibilityRegistry;
|
|
321
|
+
const cache = internal.occlusionCache;
|
|
322
|
+
for (const entry of registry.values()) {
|
|
323
|
+
const { object, handlers } = entry;
|
|
324
|
+
if (handlers.onOccluded || handlers.onVisible) {
|
|
325
|
+
const isOccluded = frame.renderer.isOccluded(object);
|
|
326
|
+
cache.set(object, isOccluded);
|
|
327
|
+
}
|
|
328
|
+
}
|
|
329
|
+
};
|
|
330
|
+
node.setup = function() {
|
|
331
|
+
return uniform(0);
|
|
332
|
+
};
|
|
333
|
+
return node;
|
|
658
334
|
}
|
|
659
335
|
let occlusionSetupPromise = null;
|
|
660
336
|
function enableOcclusion(store) {
|
|
@@ -834,8 +510,10 @@ function hasVisibilityHandlers(handlers) {
|
|
|
834
510
|
}
|
|
835
511
|
|
|
836
512
|
const FROM_REF = Symbol.for("@react-three/fiber.fromRef");
|
|
837
|
-
function fromRef(ref) {
|
|
838
|
-
|
|
513
|
+
function fromRef(ref, transform) {
|
|
514
|
+
const marker = { [FROM_REF]: ref };
|
|
515
|
+
if (transform) marker.transform = transform;
|
|
516
|
+
return marker;
|
|
839
517
|
}
|
|
840
518
|
function isFromRef(value) {
|
|
841
519
|
return value !== null && typeof value === "object" && FROM_REF in value;
|
|
@@ -936,11 +614,9 @@ function diffProps(instance, newProps) {
|
|
|
936
614
|
for (const prop in instance.props) {
|
|
937
615
|
if (RESERVED_PROPS.includes(prop) || newProps.hasOwnProperty(prop)) continue;
|
|
938
616
|
const { root, key } = resolve(instance.object, prop);
|
|
939
|
-
if (
|
|
617
|
+
if (typeof root?.constructor === "function") {
|
|
940
618
|
const ctor = getMemoizedPrototype(root);
|
|
941
619
|
if (!is.und(ctor)) changedProps[prop] = ctor[key];
|
|
942
|
-
} else {
|
|
943
|
-
changedProps[prop] = 0;
|
|
944
620
|
}
|
|
945
621
|
}
|
|
946
622
|
return changedProps;
|
|
@@ -1057,635 +733,90 @@ function applyProps(object, props) {
|
|
|
1057
733
|
return object;
|
|
1058
734
|
}
|
|
1059
735
|
|
|
1060
|
-
const
|
|
1061
|
-
|
|
1062
|
-
|
|
1063
|
-
|
|
1064
|
-
if (!state) {
|
|
1065
|
-
state = {
|
|
1066
|
-
hovered: /* @__PURE__ */ new Map(),
|
|
1067
|
-
captured: /* @__PURE__ */ new Map(),
|
|
1068
|
-
initialClick: [0, 0],
|
|
1069
|
-
initialHits: []
|
|
1070
|
-
};
|
|
1071
|
-
internal.pointerMap.set(pointerId, state);
|
|
736
|
+
const shownNotices = /* @__PURE__ */ new Set();
|
|
737
|
+
function notifyDepreciated({ heading, body, link }) {
|
|
738
|
+
if (typeof process !== "undefined" && (process.env.NODE_ENV === "test" || process.env.JEST_WORKER_ID !== void 0) && process.env.R3F_SHOW_DEPRECATION_WARNINGS !== "true") {
|
|
739
|
+
return;
|
|
1072
740
|
}
|
|
1073
|
-
return
|
|
1074
|
-
|
|
1075
|
-
|
|
1076
|
-
|
|
1077
|
-
|
|
1078
|
-
function makeId(event) {
|
|
1079
|
-
return (event.eventObject || event.object).uuid + "/" + event.index + event.instanceId;
|
|
1080
|
-
}
|
|
1081
|
-
function releaseInternalPointerCapture(internal, obj, pointerId) {
|
|
1082
|
-
const pointerState = internal.pointerMap.get(pointerId);
|
|
1083
|
-
if (!pointerState) return;
|
|
1084
|
-
const captureData = pointerState.captured.get(obj);
|
|
1085
|
-
if (captureData) {
|
|
1086
|
-
pointerState.captured.delete(obj);
|
|
1087
|
-
captureData.target.releasePointerCapture(pointerId);
|
|
741
|
+
if (shownNotices.has(heading)) return;
|
|
742
|
+
shownNotices.add(heading);
|
|
743
|
+
const caller = getCallerFrame();
|
|
744
|
+
if (caller) {
|
|
745
|
+
console.log();
|
|
1088
746
|
}
|
|
1089
|
-
|
|
1090
|
-
|
|
1091
|
-
|
|
1092
|
-
internal.interaction = internal.interaction.filter((o) => o !== object);
|
|
1093
|
-
for (const [pointerId, pointerState] of internal.pointerMap) {
|
|
1094
|
-
pointerState.initialHits = pointerState.initialHits.filter((o) => o !== object);
|
|
1095
|
-
pointerState.hovered.forEach((value, key) => {
|
|
1096
|
-
if (value.eventObject === object || value.object === object) {
|
|
1097
|
-
pointerState.hovered.delete(key);
|
|
1098
|
-
}
|
|
1099
|
-
});
|
|
1100
|
-
if (pointerState.captured.has(object)) {
|
|
1101
|
-
releaseInternalPointerCapture(internal, object, pointerId);
|
|
1102
|
-
}
|
|
747
|
+
const boxStyle = "background: #ff9800; color: #1a1a1a; padding: 8px 12px; border-radius: 4px; font-weight: 500;";
|
|
748
|
+
if (caller) {
|
|
749
|
+
console.log(`%c\u26A0\uFE0F ${heading}`, boxStyle);
|
|
1103
750
|
}
|
|
1104
|
-
|
|
1105
|
-
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
|
|
1109
|
-
const pointerState = internal.pointerMap.get(pointerId);
|
|
1110
|
-
if (!pointerState) return 0;
|
|
1111
|
-
const [initialX, initialY] = pointerState.initialClick;
|
|
1112
|
-
const dx = event.offsetX - initialX;
|
|
1113
|
-
const dy = event.offsetY - initialY;
|
|
1114
|
-
return Math.round(Math.sqrt(dx * dx + dy * dy));
|
|
751
|
+
if (body || link) {
|
|
752
|
+
let message = "";
|
|
753
|
+
if (body) message += body;
|
|
754
|
+
if (link) message += (body ? "\n\n" : "") + `More info: ${link}`;
|
|
755
|
+
console.warn(`%c${message}`, "font-weight: bold;");
|
|
1115
756
|
}
|
|
1116
|
-
|
|
1117
|
-
|
|
1118
|
-
|
|
1119
|
-
|
|
1120
|
-
|
|
1121
|
-
|
|
1122
|
-
|
|
1123
|
-
|
|
757
|
+
}
|
|
758
|
+
function getCallerFrame(depth = 3) {
|
|
759
|
+
const stack = new Error().stack;
|
|
760
|
+
if (!stack) return null;
|
|
761
|
+
const lines = stack.split("\n");
|
|
762
|
+
const frame = lines[depth];
|
|
763
|
+
if (!frame) return null;
|
|
764
|
+
let match = frame.match(/^\s*at (?:(.+?) )?\(?(.+?):(\d+):(\d+)\)?$/);
|
|
765
|
+
if (!match) {
|
|
766
|
+
match = frame.match(/^(?:(.+?)@)?(.+?):(\d+):(\d+)$/);
|
|
1124
767
|
}
|
|
1125
|
-
|
|
1126
|
-
|
|
1127
|
-
|
|
1128
|
-
|
|
1129
|
-
|
|
1130
|
-
|
|
1131
|
-
|
|
1132
|
-
|
|
1133
|
-
|
|
1134
|
-
|
|
1135
|
-
|
|
1136
|
-
|
|
1137
|
-
|
|
1138
|
-
|
|
1139
|
-
|
|
1140
|
-
const state2 = getRootState(obj);
|
|
1141
|
-
if (!state2 || !state2.events.enabled || state2.raycaster.camera === null) return [];
|
|
1142
|
-
if (state2.raycaster.camera === void 0) {
|
|
1143
|
-
state2.events.compute?.(event, state2, state2.previousRoot?.getState());
|
|
1144
|
-
if (state2.raycaster.camera === void 0) state2.raycaster.camera = null;
|
|
1145
|
-
}
|
|
1146
|
-
return state2.raycaster.camera ? state2.raycaster.intersectObject(obj, true) : [];
|
|
1147
|
-
}
|
|
1148
|
-
let hits = eventsObjects.flatMap(handleRaycast).sort((a, b) => {
|
|
1149
|
-
const aInteractivePriority = a.object.userData?.interactivePriority;
|
|
1150
|
-
const bInteractivePriority = b.object.userData?.interactivePriority;
|
|
1151
|
-
if (aInteractivePriority !== void 0 || bInteractivePriority !== void 0) {
|
|
1152
|
-
if (aInteractivePriority !== void 0 && bInteractivePriority === void 0) return -1;
|
|
1153
|
-
if (bInteractivePriority !== void 0 && aInteractivePriority === void 0) return 1;
|
|
1154
|
-
if (aInteractivePriority !== bInteractivePriority) {
|
|
1155
|
-
return (bInteractivePriority ?? 0) - (aInteractivePriority ?? 0);
|
|
1156
|
-
}
|
|
1157
|
-
}
|
|
1158
|
-
const aState = getRootState(a.object);
|
|
1159
|
-
const bState = getRootState(b.object);
|
|
1160
|
-
const aPriority = aState?.events?.priority ?? 1;
|
|
1161
|
-
const bPriority = bState?.events?.priority ?? 1;
|
|
1162
|
-
return bPriority - aPriority || a.distance - b.distance;
|
|
1163
|
-
}).filter((item) => {
|
|
1164
|
-
const id = makeId(item);
|
|
1165
|
-
if (duplicates.has(id)) return false;
|
|
1166
|
-
duplicates.add(id);
|
|
1167
|
-
return true;
|
|
1168
|
-
});
|
|
1169
|
-
if (state.events.filter) hits = state.events.filter(hits, state);
|
|
1170
|
-
for (const hit of hits) {
|
|
1171
|
-
let eventObject = hit.object;
|
|
1172
|
-
while (eventObject) {
|
|
1173
|
-
if (eventObject.__r3f?.eventCount) {
|
|
1174
|
-
intersections.push({ ...hit, eventObject });
|
|
1175
|
-
}
|
|
1176
|
-
eventObject = eventObject.parent;
|
|
1177
|
-
}
|
|
1178
|
-
}
|
|
1179
|
-
if ("pointerId" in event) {
|
|
1180
|
-
const pointerId = event.pointerId;
|
|
1181
|
-
const pointerState = state.internal.pointerMap.get(pointerId);
|
|
1182
|
-
if (pointerState?.captured.size) {
|
|
1183
|
-
for (const captureData of pointerState.captured.values()) {
|
|
1184
|
-
if (!duplicates.has(makeId(captureData.intersection))) intersections.push(captureData.intersection);
|
|
1185
|
-
}
|
|
1186
|
-
}
|
|
1187
|
-
}
|
|
1188
|
-
return intersections;
|
|
768
|
+
if (!match) return null;
|
|
769
|
+
const [, fn, url, line] = match;
|
|
770
|
+
return {
|
|
771
|
+
functionName: fn ?? "<anonymous>",
|
|
772
|
+
location: formatLocation(url, Number(line))
|
|
773
|
+
};
|
|
774
|
+
}
|
|
775
|
+
function formatLocation(url, line) {
|
|
776
|
+
const clean = url.split("?")[0];
|
|
777
|
+
const file = clean.split("/").pop() ?? clean;
|
|
778
|
+
return `${file}:${line}`;
|
|
779
|
+
}
|
|
780
|
+
function notifyAlpha({ message, link }) {
|
|
781
|
+
if (typeof process !== "undefined" && (process.env.NODE_ENV === "test" || process.env.JEST_WORKER_ID !== void 0) && process.env.R3F_SHOW_ALPHA_WARNINGS !== "true") {
|
|
782
|
+
return;
|
|
1189
783
|
}
|
|
1190
|
-
|
|
1191
|
-
|
|
1192
|
-
|
|
1193
|
-
|
|
1194
|
-
|
|
1195
|
-
|
|
1196
|
-
const { raycaster, pointer, camera, internal } = state;
|
|
1197
|
-
const unprojectedPoint = new Vector3(pointer.x, pointer.y, 0).unproject(camera);
|
|
1198
|
-
const hasPointerCapture = (id) => {
|
|
1199
|
-
const pointerState = internal.pointerMap.get(id);
|
|
1200
|
-
return pointerState?.captured.has(hit.eventObject) ?? false;
|
|
1201
|
-
};
|
|
1202
|
-
const setPointerCapture = (id) => {
|
|
1203
|
-
const captureData = { intersection: hit, target: event.target };
|
|
1204
|
-
const pointerState = getPointerState(internal, id);
|
|
1205
|
-
pointerState.captured.set(hit.eventObject, captureData);
|
|
1206
|
-
event.target.setPointerCapture(id);
|
|
1207
|
-
};
|
|
1208
|
-
const releasePointerCapture = (id) => {
|
|
1209
|
-
releaseInternalPointerCapture(internal, hit.eventObject, id);
|
|
1210
|
-
};
|
|
1211
|
-
const extractEventProps = {};
|
|
1212
|
-
for (const prop in event) {
|
|
1213
|
-
const property = event[prop];
|
|
1214
|
-
if (typeof property !== "function") extractEventProps[prop] = property;
|
|
1215
|
-
}
|
|
1216
|
-
const eventPointerId = "pointerId" in event ? event.pointerId : void 0;
|
|
1217
|
-
const raycastEvent = {
|
|
1218
|
-
...hit,
|
|
1219
|
-
...extractEventProps,
|
|
1220
|
-
pointer,
|
|
1221
|
-
intersections,
|
|
1222
|
-
stopped: localState.stopped,
|
|
1223
|
-
delta,
|
|
1224
|
-
unprojectedPoint,
|
|
1225
|
-
ray: raycaster.ray,
|
|
1226
|
-
camera,
|
|
1227
|
-
pointerId: eventPointerId,
|
|
1228
|
-
// Hijack stopPropagation, which just sets a flag
|
|
1229
|
-
stopPropagation() {
|
|
1230
|
-
const pointerState = eventPointerId !== void 0 ? internal.pointerMap.get(eventPointerId) : void 0;
|
|
1231
|
-
if (
|
|
1232
|
-
// ...if this pointer hasn't been captured
|
|
1233
|
-
!pointerState?.captured.size || // ... or if the hit object is capturing the pointer
|
|
1234
|
-
pointerState.captured.has(hit.eventObject)
|
|
1235
|
-
) {
|
|
1236
|
-
raycastEvent.stopped = localState.stopped = true;
|
|
1237
|
-
if (pointerState?.hovered.size && Array.from(pointerState.hovered.values()).find((i) => i.eventObject === hit.eventObject)) {
|
|
1238
|
-
const higher = intersections.slice(0, intersections.indexOf(hit));
|
|
1239
|
-
cancelPointer([...higher, hit], eventPointerId);
|
|
1240
|
-
}
|
|
1241
|
-
}
|
|
1242
|
-
},
|
|
1243
|
-
// there should be a distinction between target and currentTarget
|
|
1244
|
-
target: { hasPointerCapture, setPointerCapture, releasePointerCapture },
|
|
1245
|
-
currentTarget: { hasPointerCapture, setPointerCapture, releasePointerCapture },
|
|
1246
|
-
nativeEvent: event
|
|
1247
|
-
};
|
|
1248
|
-
callback(raycastEvent);
|
|
1249
|
-
if (localState.stopped === true) break;
|
|
1250
|
-
}
|
|
1251
|
-
}
|
|
1252
|
-
}
|
|
1253
|
-
return intersections;
|
|
784
|
+
if (shownNotices.has(message)) return;
|
|
785
|
+
shownNotices.add(message);
|
|
786
|
+
const boxStyle = "background: #6366f1; color: #ffffff; padding: 6px 10px; border-radius: 4px; font-weight: 500;";
|
|
787
|
+
console.log(`%c\u{1F52C} ${message}`, boxStyle);
|
|
788
|
+
{
|
|
789
|
+
console.log(`%cMore info: ${link}`, "color: #6366f1; font-weight: normal;");
|
|
1254
790
|
}
|
|
1255
|
-
|
|
1256
|
-
|
|
1257
|
-
|
|
1258
|
-
|
|
1259
|
-
|
|
1260
|
-
|
|
1261
|
-
|
|
1262
|
-
|
|
1263
|
-
|
|
1264
|
-
|
|
1265
|
-
|
|
1266
|
-
|
|
1267
|
-
|
|
1268
|
-
|
|
1269
|
-
|
|
1270
|
-
|
|
1271
|
-
|
|
1272
|
-
|
|
1273
|
-
|
|
1274
|
-
|
|
1275
|
-
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
|
|
1279
|
-
|
|
1280
|
-
|
|
1281
|
-
|
|
1282
|
-
|
|
1283
|
-
|
|
1284
|
-
for (let i = 0; i < objects.length; i++) {
|
|
1285
|
-
const instance = objects[i].__r3f;
|
|
1286
|
-
instance?.handlers.onDragOverMissed?.(event);
|
|
1287
|
-
}
|
|
1288
|
-
}
|
|
1289
|
-
function dropMissed(event, objects) {
|
|
1290
|
-
for (let i = 0; i < objects.length; i++) {
|
|
1291
|
-
const instance = objects[i].__r3f;
|
|
1292
|
-
instance?.handlers.onDropMissed?.(event);
|
|
1293
|
-
}
|
|
1294
|
-
}
|
|
1295
|
-
function cleanupPointer(pointerId) {
|
|
1296
|
-
const { internal } = store.getState();
|
|
1297
|
-
const pointerState = internal.pointerMap.get(pointerId);
|
|
1298
|
-
if (pointerState) {
|
|
1299
|
-
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1300
|
-
const eventObject = hoveredObj.eventObject;
|
|
1301
|
-
const instance = eventObject.__r3f;
|
|
1302
|
-
if (instance?.eventCount) {
|
|
1303
|
-
const handlers = instance.handlers;
|
|
1304
|
-
const data = { ...hoveredObj, intersections: [] };
|
|
1305
|
-
handlers.onPointerOut?.(data);
|
|
1306
|
-
handlers.onPointerLeave?.(data);
|
|
1307
|
-
}
|
|
1308
|
-
}
|
|
1309
|
-
internal.pointerMap.delete(pointerId);
|
|
1310
|
-
}
|
|
1311
|
-
internal.pointerDirty.delete(pointerId);
|
|
1312
|
-
}
|
|
1313
|
-
function processDeferredPointer(event, pointerId) {
|
|
1314
|
-
const state = store.getState();
|
|
1315
|
-
const { internal } = state;
|
|
1316
|
-
if (!state.events.enabled) return;
|
|
1317
|
-
const filter = filterPointerEvents;
|
|
1318
|
-
const hits = intersect(event, filter);
|
|
1319
|
-
cancelPointer(hits, pointerId);
|
|
1320
|
-
function onIntersect(data) {
|
|
1321
|
-
const eventObject = data.eventObject;
|
|
1322
|
-
const instance = eventObject.__r3f;
|
|
1323
|
-
if (!instance?.eventCount) return;
|
|
1324
|
-
const handlers = instance.handlers;
|
|
1325
|
-
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1326
|
-
const id = makeId(data);
|
|
1327
|
-
const pointerState = getPointerState(internal, pointerId);
|
|
1328
|
-
const hoveredItem = pointerState.hovered.get(id);
|
|
1329
|
-
if (!hoveredItem) {
|
|
1330
|
-
pointerState.hovered.set(id, data);
|
|
1331
|
-
handlers.onPointerOver?.(data);
|
|
1332
|
-
handlers.onPointerEnter?.(data);
|
|
1333
|
-
} else if (hoveredItem.stopped) {
|
|
1334
|
-
data.stopPropagation();
|
|
1335
|
-
}
|
|
1336
|
-
}
|
|
1337
|
-
handlers.onPointerMove?.(data);
|
|
1338
|
-
}
|
|
1339
|
-
handleIntersects(hits, event, 0, onIntersect);
|
|
1340
|
-
}
|
|
1341
|
-
function handlePointer(name) {
|
|
1342
|
-
switch (name) {
|
|
1343
|
-
case "onPointerLeave":
|
|
1344
|
-
case "onDragLeave":
|
|
1345
|
-
return () => cancelPointer([]);
|
|
1346
|
-
// Global cancel of these events
|
|
1347
|
-
case "onPointerCancel":
|
|
1348
|
-
return (event) => {
|
|
1349
|
-
const pointerId = getPointerId(event);
|
|
1350
|
-
cleanupPointer(pointerId);
|
|
1351
|
-
};
|
|
1352
|
-
case "onLostPointerCapture":
|
|
1353
|
-
return (event) => {
|
|
1354
|
-
const { internal } = store.getState();
|
|
1355
|
-
const pointerId = getPointerId(event);
|
|
1356
|
-
const pointerState = internal.pointerMap.get(pointerId);
|
|
1357
|
-
if (pointerState?.captured.size) {
|
|
1358
|
-
requestAnimationFrame(() => {
|
|
1359
|
-
const pointerState2 = internal.pointerMap.get(pointerId);
|
|
1360
|
-
if (pointerState2?.captured.size) {
|
|
1361
|
-
pointerState2.captured.clear();
|
|
1362
|
-
}
|
|
1363
|
-
cancelPointer([], pointerId);
|
|
1364
|
-
});
|
|
1365
|
-
}
|
|
1366
|
-
};
|
|
1367
|
-
}
|
|
1368
|
-
return function handleEvent(event) {
|
|
1369
|
-
const state = store.getState();
|
|
1370
|
-
const { onPointerMissed, onDragOverMissed, onDropMissed, internal, events } = state;
|
|
1371
|
-
const pointerId = getPointerId(event);
|
|
1372
|
-
internal.lastEvent.current = event;
|
|
1373
|
-
if (!events.enabled) return;
|
|
1374
|
-
const isPointerMove = name === "onPointerMove";
|
|
1375
|
-
const isDragOver = name === "onDragOver";
|
|
1376
|
-
const isDrop = name === "onDrop";
|
|
1377
|
-
const isClickEvent = name === "onClick" || name === "onContextMenu" || name === "onDoubleClick";
|
|
1378
|
-
const isPointerDown = name === "onPointerDown";
|
|
1379
|
-
const isPointerUp = name === "onPointerUp";
|
|
1380
|
-
const isWheel = name === "onWheel";
|
|
1381
|
-
const canDeferRaycasts = events.frameTimedRaycasts && state.frameloop === "always";
|
|
1382
|
-
if (isPointerMove && canDeferRaycasts) {
|
|
1383
|
-
events.compute?.(event, state);
|
|
1384
|
-
internal.pointerDirty.set(pointerId, event);
|
|
1385
|
-
return;
|
|
1386
|
-
}
|
|
1387
|
-
if (isWheel && canDeferRaycasts && !events.alwaysFireOnScroll) {
|
|
1388
|
-
events.compute?.(event, state);
|
|
1389
|
-
internal.pointerDirty.set(pointerId, event);
|
|
1390
|
-
return;
|
|
1391
|
-
}
|
|
1392
|
-
if ((isClickEvent || isPointerDown || isPointerUp) && internal.pointerDirty.has(pointerId)) {
|
|
1393
|
-
const deferredEvent = internal.pointerDirty.get(pointerId);
|
|
1394
|
-
internal.pointerDirty.delete(pointerId);
|
|
1395
|
-
processDeferredPointer(deferredEvent, pointerId);
|
|
1396
|
-
}
|
|
1397
|
-
const filter = isPointerMove || isDragOver || isDrop ? filterPointerEvents : void 0;
|
|
1398
|
-
const hits = intersect(event, filter);
|
|
1399
|
-
const delta = isClickEvent ? calculateDistance(event, pointerId) : 0;
|
|
1400
|
-
if (isPointerDown) {
|
|
1401
|
-
const pointerState2 = getPointerState(internal, pointerId);
|
|
1402
|
-
pointerState2.initialClick = [event.offsetX, event.offsetY];
|
|
1403
|
-
pointerState2.initialHits = hits.map((hit) => hit.eventObject);
|
|
1404
|
-
}
|
|
1405
|
-
const pointerState = internal.pointerMap.get(pointerId);
|
|
1406
|
-
const initialHits = pointerState?.initialHits ?? [];
|
|
1407
|
-
if (isClickEvent && !hits.length) {
|
|
1408
|
-
if (delta <= 2) {
|
|
1409
|
-
pointerMissed(event, internal.interaction);
|
|
1410
|
-
if (onPointerMissed) onPointerMissed(event);
|
|
1411
|
-
}
|
|
1412
|
-
}
|
|
1413
|
-
if (isDragOver && !hits.length) {
|
|
1414
|
-
dragOverMissed(event, internal.interaction);
|
|
1415
|
-
if (onDragOverMissed) onDragOverMissed(event);
|
|
1416
|
-
}
|
|
1417
|
-
if (isDrop && !hits.length) {
|
|
1418
|
-
dropMissed(event, internal.interaction);
|
|
1419
|
-
if (onDropMissed) onDropMissed(event);
|
|
1420
|
-
}
|
|
1421
|
-
if (isPointerMove || isDragOver) {
|
|
1422
|
-
cancelPointer(hits, pointerId);
|
|
1423
|
-
}
|
|
1424
|
-
function onIntersect(data) {
|
|
1425
|
-
const eventObject = data.eventObject;
|
|
1426
|
-
const instance = eventObject.__r3f;
|
|
1427
|
-
if (!instance?.eventCount) return;
|
|
1428
|
-
const handlers = instance.handlers;
|
|
1429
|
-
if (isPointerMove) {
|
|
1430
|
-
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
1431
|
-
const id = makeId(data);
|
|
1432
|
-
const pointerState2 = getPointerState(internal, pointerId);
|
|
1433
|
-
const hoveredItem = pointerState2.hovered.get(id);
|
|
1434
|
-
if (!hoveredItem) {
|
|
1435
|
-
pointerState2.hovered.set(id, data);
|
|
1436
|
-
handlers.onPointerOver?.(data);
|
|
1437
|
-
handlers.onPointerEnter?.(data);
|
|
1438
|
-
} else if (hoveredItem.stopped) {
|
|
1439
|
-
data.stopPropagation();
|
|
1440
|
-
}
|
|
1441
|
-
}
|
|
1442
|
-
handlers.onPointerMove?.(data);
|
|
1443
|
-
} else if (isDragOver) {
|
|
1444
|
-
const id = makeId(data);
|
|
1445
|
-
const pointerState2 = getPointerState(internal, pointerId);
|
|
1446
|
-
const hoveredItem = pointerState2.hovered.get(id);
|
|
1447
|
-
if (!hoveredItem) {
|
|
1448
|
-
pointerState2.hovered.set(id, data);
|
|
1449
|
-
handlers.onDragOverEnter?.(data);
|
|
1450
|
-
} else if (hoveredItem.stopped) {
|
|
1451
|
-
data.stopPropagation();
|
|
1452
|
-
}
|
|
1453
|
-
handlers.onDragOver?.(data);
|
|
1454
|
-
} else if (isDrop) {
|
|
1455
|
-
handlers.onDrop?.(data);
|
|
1456
|
-
} else {
|
|
1457
|
-
const handler = handlers[name];
|
|
1458
|
-
if (handler) {
|
|
1459
|
-
if (!isClickEvent || initialHits.includes(eventObject)) {
|
|
1460
|
-
pointerMissed(
|
|
1461
|
-
event,
|
|
1462
|
-
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1463
|
-
);
|
|
1464
|
-
handler(data);
|
|
1465
|
-
}
|
|
1466
|
-
} else {
|
|
1467
|
-
if (isClickEvent && initialHits.includes(eventObject)) {
|
|
1468
|
-
pointerMissed(
|
|
1469
|
-
event,
|
|
1470
|
-
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
1471
|
-
);
|
|
1472
|
-
}
|
|
1473
|
-
}
|
|
1474
|
-
}
|
|
1475
|
-
}
|
|
1476
|
-
handleIntersects(hits, event, delta, onIntersect);
|
|
1477
|
-
};
|
|
1478
|
-
}
|
|
1479
|
-
function flushDeferredPointers() {
|
|
1480
|
-
const { internal, events } = store.getState();
|
|
1481
|
-
if (!events.frameTimedRaycasts) return;
|
|
1482
|
-
for (const [pointerId, event] of internal.pointerDirty) {
|
|
1483
|
-
processDeferredPointer(event, pointerId);
|
|
1484
|
-
}
|
|
1485
|
-
internal.pointerDirty.clear();
|
|
1486
|
-
}
|
|
1487
|
-
return { handlePointer, flushDeferredPointers, processDeferredPointer };
|
|
1488
|
-
}
|
|
1489
|
-
const DOM_EVENTS = {
|
|
1490
|
-
onClick: ["click", false],
|
|
1491
|
-
onContextMenu: ["contextmenu", false],
|
|
1492
|
-
onDoubleClick: ["dblclick", false],
|
|
1493
|
-
onDragEnter: ["dragenter", false],
|
|
1494
|
-
onDragLeave: ["dragleave", false],
|
|
1495
|
-
onDragOver: ["dragover", false],
|
|
1496
|
-
onDrop: ["drop", false],
|
|
1497
|
-
onWheel: ["wheel", true],
|
|
1498
|
-
onPointerDown: ["pointerdown", true],
|
|
1499
|
-
onPointerUp: ["pointerup", true],
|
|
1500
|
-
onPointerLeave: ["pointerleave", true],
|
|
1501
|
-
onPointerMove: ["pointermove", true],
|
|
1502
|
-
onPointerCancel: ["pointercancel", true],
|
|
1503
|
-
onLostPointerCapture: ["lostpointercapture", true]
|
|
1504
|
-
};
|
|
1505
|
-
function createPointerEvents(store) {
|
|
1506
|
-
const { handlePointer, flushDeferredPointers, processDeferredPointer } = createEvents(store);
|
|
1507
|
-
let nextXRPointerId = XR_POINTER_ID_START;
|
|
1508
|
-
const xrPointers = /* @__PURE__ */ new Map();
|
|
1509
|
-
return {
|
|
1510
|
-
priority: 1,
|
|
1511
|
-
enabled: true,
|
|
1512
|
-
frameTimedRaycasts: true,
|
|
1513
|
-
alwaysFireOnScroll: true,
|
|
1514
|
-
updateOnFrame: false,
|
|
1515
|
-
compute(event, state) {
|
|
1516
|
-
state.pointer.set(event.offsetX / state.size.width * 2 - 1, -(event.offsetY / state.size.height) * 2 + 1);
|
|
1517
|
-
state.raycaster.setFromCamera(state.pointer, state.camera);
|
|
1518
|
-
},
|
|
1519
|
-
connected: void 0,
|
|
1520
|
-
handlers: Object.keys(DOM_EVENTS).reduce(
|
|
1521
|
-
(acc, key) => ({ ...acc, [key]: handlePointer(key) }),
|
|
1522
|
-
{}
|
|
1523
|
-
),
|
|
1524
|
-
update: (pointerId) => {
|
|
1525
|
-
const { events, internal } = store.getState();
|
|
1526
|
-
if (!events.handlers) return;
|
|
1527
|
-
if (pointerId !== void 0) {
|
|
1528
|
-
const event = internal.pointerDirty.get(pointerId);
|
|
1529
|
-
if (event) {
|
|
1530
|
-
internal.pointerDirty.delete(pointerId);
|
|
1531
|
-
processDeferredPointer(event, pointerId);
|
|
1532
|
-
} else if (internal.lastEvent?.current) {
|
|
1533
|
-
processDeferredPointer(internal.lastEvent.current, pointerId);
|
|
1534
|
-
}
|
|
1535
|
-
} else {
|
|
1536
|
-
flushDeferredPointers();
|
|
1537
|
-
if (internal.lastEvent?.current) {
|
|
1538
|
-
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1539
|
-
}
|
|
1540
|
-
}
|
|
1541
|
-
},
|
|
1542
|
-
flush: () => {
|
|
1543
|
-
const { events, internal } = store.getState();
|
|
1544
|
-
flushDeferredPointers();
|
|
1545
|
-
if (events.updateOnFrame && internal.lastEvent?.current && events.handlers) {
|
|
1546
|
-
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
1547
|
-
}
|
|
1548
|
-
},
|
|
1549
|
-
connect: (target) => {
|
|
1550
|
-
if (!target) return;
|
|
1551
|
-
const { set, events } = store.getState();
|
|
1552
|
-
events.disconnect?.();
|
|
1553
|
-
set((state) => ({ events: { ...state.events, connected: target } }));
|
|
1554
|
-
if (events.handlers) {
|
|
1555
|
-
for (const name in events.handlers) {
|
|
1556
|
-
const event = events.handlers[name];
|
|
1557
|
-
const [eventName, passive] = DOM_EVENTS[name];
|
|
1558
|
-
target.addEventListener(eventName, event, { passive });
|
|
1559
|
-
}
|
|
1560
|
-
}
|
|
1561
|
-
},
|
|
1562
|
-
disconnect: () => {
|
|
1563
|
-
const { set, events } = store.getState();
|
|
1564
|
-
if (events.connected) {
|
|
1565
|
-
if (events.handlers) {
|
|
1566
|
-
for (const name in events.handlers) {
|
|
1567
|
-
const event = events.handlers[name];
|
|
1568
|
-
const [eventName] = DOM_EVENTS[name];
|
|
1569
|
-
events.connected.removeEventListener(eventName, event);
|
|
1570
|
-
}
|
|
1571
|
-
}
|
|
1572
|
-
set((state) => ({ events: { ...state.events, connected: void 0 } }));
|
|
1573
|
-
}
|
|
1574
|
-
},
|
|
1575
|
-
// PREVIEW (A8): the XR pointer registration API may change before stable.
|
|
1576
|
-
registerPointer: (config) => {
|
|
1577
|
-
const pointerId = nextXRPointerId++;
|
|
1578
|
-
xrPointers.set(pointerId, config);
|
|
1579
|
-
const { internal } = store.getState();
|
|
1580
|
-
getPointerState(internal, pointerId);
|
|
1581
|
-
return pointerId;
|
|
1582
|
-
},
|
|
1583
|
-
unregisterPointer: (pointerId) => {
|
|
1584
|
-
xrPointers.delete(pointerId);
|
|
1585
|
-
const { internal } = store.getState();
|
|
1586
|
-
const pointerState = internal.pointerMap.get(pointerId);
|
|
1587
|
-
if (pointerState) {
|
|
1588
|
-
for (const [, hoveredObj] of pointerState.hovered) {
|
|
1589
|
-
const eventObject = hoveredObj.eventObject;
|
|
1590
|
-
const instance = eventObject.__r3f;
|
|
1591
|
-
if (instance?.eventCount) {
|
|
1592
|
-
const handlers = instance.handlers;
|
|
1593
|
-
const data = { ...hoveredObj, intersections: [] };
|
|
1594
|
-
handlers.onPointerOut?.(data);
|
|
1595
|
-
handlers.onPointerLeave?.(data);
|
|
1596
|
-
}
|
|
1597
|
-
}
|
|
1598
|
-
internal.pointerMap.delete(pointerId);
|
|
1599
|
-
}
|
|
1600
|
-
internal.pointerDirty.delete(pointerId);
|
|
1601
|
-
}
|
|
1602
|
-
};
|
|
1603
|
-
}
|
|
1604
|
-
|
|
1605
|
-
const shownNotices = /* @__PURE__ */ new Set();
|
|
1606
|
-
function notifyDepreciated({ heading, body, link }) {
|
|
1607
|
-
if (typeof process !== "undefined" && (process.env.NODE_ENV === "test" || process.env.JEST_WORKER_ID !== void 0) && process.env.R3F_SHOW_DEPRECATION_WARNINGS !== "true") {
|
|
1608
|
-
return;
|
|
1609
|
-
}
|
|
1610
|
-
if (shownNotices.has(heading)) return;
|
|
1611
|
-
shownNotices.add(heading);
|
|
1612
|
-
const caller = getCallerFrame();
|
|
1613
|
-
if (caller) {
|
|
1614
|
-
console.log();
|
|
1615
|
-
}
|
|
1616
|
-
const boxStyle = "background: #ff9800; color: #1a1a1a; padding: 8px 12px; border-radius: 4px; font-weight: 500;";
|
|
1617
|
-
if (caller) {
|
|
1618
|
-
console.log(`%c\u26A0\uFE0F ${heading}`, boxStyle);
|
|
1619
|
-
}
|
|
1620
|
-
if (body || link) {
|
|
1621
|
-
let message = "";
|
|
1622
|
-
if (body) message += body;
|
|
1623
|
-
if (link) message += (body ? "\n\n" : "") + `More info: ${link}`;
|
|
1624
|
-
console.warn(`%c${message}`, "font-weight: bold;");
|
|
1625
|
-
}
|
|
1626
|
-
}
|
|
1627
|
-
function getCallerFrame(depth = 3) {
|
|
1628
|
-
const stack = new Error().stack;
|
|
1629
|
-
if (!stack) return null;
|
|
1630
|
-
const lines = stack.split("\n");
|
|
1631
|
-
const frame = lines[depth];
|
|
1632
|
-
if (!frame) return null;
|
|
1633
|
-
let match = frame.match(/^\s*at (?:(.+?) )?\(?(.+?):(\d+):(\d+)\)?$/);
|
|
1634
|
-
if (!match) {
|
|
1635
|
-
match = frame.match(/^(?:(.+?)@)?(.+?):(\d+):(\d+)$/);
|
|
1636
|
-
}
|
|
1637
|
-
if (!match) return null;
|
|
1638
|
-
const [, fn, url, line] = match;
|
|
1639
|
-
return {
|
|
1640
|
-
functionName: fn ?? "<anonymous>",
|
|
1641
|
-
location: formatLocation(url, Number(line))
|
|
1642
|
-
};
|
|
1643
|
-
}
|
|
1644
|
-
function formatLocation(url, line) {
|
|
1645
|
-
const clean = url.split("?")[0];
|
|
1646
|
-
const file = clean.split("/").pop() ?? clean;
|
|
1647
|
-
return `${file}:${line}`;
|
|
1648
|
-
}
|
|
1649
|
-
function notifyAlpha({ message, link }) {
|
|
1650
|
-
if (typeof process !== "undefined" && (process.env.NODE_ENV === "test" || process.env.JEST_WORKER_ID !== void 0) && process.env.R3F_SHOW_ALPHA_WARNINGS !== "true") {
|
|
1651
|
-
return;
|
|
1652
|
-
}
|
|
1653
|
-
if (shownNotices.has(message)) return;
|
|
1654
|
-
shownNotices.add(message);
|
|
1655
|
-
const boxStyle = "background: #6366f1; color: #ffffff; padding: 6px 10px; border-radius: 4px; font-weight: 500;";
|
|
1656
|
-
console.log(`%c\u{1F52C} ${message}`, boxStyle);
|
|
1657
|
-
{
|
|
1658
|
-
console.log(`%cMore info: ${link}`, "color: #6366f1; font-weight: normal;");
|
|
1659
|
-
}
|
|
1660
|
-
}
|
|
1661
|
-
|
|
1662
|
-
const INTERNAL_LIB_MARKERS = ["zustand", "setState", "Object.assign"];
|
|
1663
|
-
function isInternalRendererAccess(stack, callerDepth = 2) {
|
|
1664
|
-
if (!stack) return false;
|
|
1665
|
-
const caller = stack.split("\n")[callerDepth] ?? "";
|
|
1666
|
-
return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m));
|
|
1667
|
-
}
|
|
1668
|
-
|
|
1669
|
-
const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
|
|
1670
|
-
const context = globalThis[R3F_CONTEXT] ?? (globalThis[R3F_CONTEXT] = React.createContext(null));
|
|
1671
|
-
const createStore = (invalidate, advance) => {
|
|
1672
|
-
const rootStore = createWithEqualityFn((set, get) => {
|
|
1673
|
-
const position = new Vector3();
|
|
1674
|
-
const defaultTarget = new Vector3();
|
|
1675
|
-
const tempTarget = new Vector3();
|
|
1676
|
-
function getCurrentViewport(camera = get().camera, target = defaultTarget, size = get().size) {
|
|
1677
|
-
const { width, height, top, left } = size;
|
|
1678
|
-
const aspect = width / height;
|
|
1679
|
-
if (target.isVector3) tempTarget.copy(target);
|
|
1680
|
-
else tempTarget.set(...target);
|
|
1681
|
-
const distance = camera.getWorldPosition(position).distanceTo(tempTarget);
|
|
1682
|
-
if (isOrthographicCamera(camera)) {
|
|
1683
|
-
return { width: width / camera.zoom, height: height / camera.zoom, top, left, factor: 1, distance, aspect };
|
|
1684
|
-
} else {
|
|
1685
|
-
const fov = camera.fov * Math.PI / 180;
|
|
1686
|
-
const h = 2 * Math.tan(fov / 2) * distance;
|
|
1687
|
-
const w = h * (width / height);
|
|
1688
|
-
return { width: w, height: h, top, left, factor: width / w, distance, aspect };
|
|
791
|
+
}
|
|
792
|
+
|
|
793
|
+
const INTERNAL_LIB_MARKERS = ["zustand", "setState", "Object.assign"];
|
|
794
|
+
function isInternalRendererAccess(stack, callerDepth = 2) {
|
|
795
|
+
if (!stack) return false;
|
|
796
|
+
const caller = stack.split("\n")[callerDepth] ?? "";
|
|
797
|
+
return INTERNAL_LIB_MARKERS.some((m) => caller.includes(m));
|
|
798
|
+
}
|
|
799
|
+
|
|
800
|
+
const R3F_CONTEXT = Symbol.for("@react-three/fiber.context");
|
|
801
|
+
const context = globalThis[R3F_CONTEXT] ?? (globalThis[R3F_CONTEXT] = React.createContext(null));
|
|
802
|
+
const createStore = (invalidate, advance) => {
|
|
803
|
+
const rootStore = createWithEqualityFn((set, get) => {
|
|
804
|
+
const position = new Vector3();
|
|
805
|
+
const defaultTarget = new Vector3();
|
|
806
|
+
const tempTarget = new Vector3();
|
|
807
|
+
function getCurrentViewport(camera = get().camera, target = defaultTarget, size = get().size) {
|
|
808
|
+
const { width, height, top, left } = size;
|
|
809
|
+
const aspect = width / height;
|
|
810
|
+
if (target.isVector3) tempTarget.copy(target);
|
|
811
|
+
else tempTarget.set(...target);
|
|
812
|
+
const distance = camera.getWorldPosition(position).distanceTo(tempTarget);
|
|
813
|
+
if (isOrthographicCamera(camera)) {
|
|
814
|
+
return { width: width / camera.zoom, height: height / camera.zoom, top, left, factor: 1, distance, aspect };
|
|
815
|
+
} else {
|
|
816
|
+
const fov = camera.fov * Math.PI / 180;
|
|
817
|
+
const h = 2 * Math.tan(fov / 2) * distance;
|
|
818
|
+
const w = h * (width / height);
|
|
819
|
+
return { width: w, height: h, top, left, factor: width / w, distance, aspect };
|
|
1689
820
|
}
|
|
1690
821
|
}
|
|
1691
822
|
let performanceTimeout = void 0;
|
|
@@ -1775,7 +906,7 @@ const createStore = (invalidate, advance) => {
|
|
|
1775
906
|
size: newSize,
|
|
1776
907
|
viewport: { ...s.viewport, ...getCurrentViewport(state2.camera, defaultTarget, newSize) }
|
|
1777
908
|
}));
|
|
1778
|
-
|
|
909
|
+
get().invalidate();
|
|
1779
910
|
}
|
|
1780
911
|
}
|
|
1781
912
|
return;
|
|
@@ -1790,15 +921,16 @@ const createStore = (invalidate, advance) => {
|
|
|
1790
921
|
viewport: { ...s.viewport, ...getCurrentViewport(state2.camera, defaultTarget, size) },
|
|
1791
922
|
_sizeImperative: true
|
|
1792
923
|
}));
|
|
1793
|
-
|
|
924
|
+
get().invalidate();
|
|
1794
925
|
},
|
|
1795
926
|
setDpr: (dpr) => set((state2) => {
|
|
1796
927
|
const resolved = calculateDpr(dpr);
|
|
1797
928
|
return { viewport: { ...state2.viewport, dpr: resolved, initialDpr: state2.viewport.initialDpr || resolved } };
|
|
1798
929
|
}),
|
|
1799
930
|
setFrameloop: (frameloop = "always") => {
|
|
931
|
+
const rootId = get().internal.rootId;
|
|
932
|
+
if (rootId) getScheduler().setRootFrameloop(rootId, frameloop);
|
|
1800
933
|
set(() => ({ frameloop }));
|
|
1801
|
-
getScheduler().frameloop = frameloop;
|
|
1802
934
|
},
|
|
1803
935
|
setError: (error) => set(() => ({ error })),
|
|
1804
936
|
error: null,
|
|
@@ -1914,17 +1046,11 @@ const createStore = (invalidate, advance) => {
|
|
|
1914
1046
|
oldSize = size;
|
|
1915
1047
|
oldDpr = viewport.dpr;
|
|
1916
1048
|
updateCamera(camera, size);
|
|
1917
|
-
|
|
1918
|
-
|
|
1919
|
-
|
|
1920
|
-
|
|
1921
|
-
|
|
1922
|
-
actualRenderer.setSize(size.width, size.height, false);
|
|
1923
|
-
if (canvasTarget) {
|
|
1924
|
-
if (viewport.dpr > 0) canvasTarget.setPixelRatio(viewport.dpr);
|
|
1925
|
-
canvasTarget.setSize(size.width, size.height, false);
|
|
1926
|
-
}
|
|
1927
|
-
}
|
|
1049
|
+
const resizeTarget = canvasTarget ?? actualRenderer;
|
|
1050
|
+
if (viewport.dpr > 0) resizeTarget.setPixelRatio(viewport.dpr);
|
|
1051
|
+
resizeTarget.setSize(size.width, size.height, false);
|
|
1052
|
+
const activeTarget = actualRenderer.getCanvasTarget?.();
|
|
1053
|
+
if (!canvasTarget || activeTarget !== canvasTarget) internal.canvasTargetSizeDirty = true;
|
|
1928
1054
|
}
|
|
1929
1055
|
if (camera !== oldCamera) {
|
|
1930
1056
|
oldCamera = camera;
|
|
@@ -1945,7 +1071,7 @@ const createStore = (invalidate, advance) => {
|
|
|
1945
1071
|
|
|
1946
1072
|
const memoizedLoaders = /* @__PURE__ */ new WeakMap();
|
|
1947
1073
|
const isConstructor$1 = (value) => typeof value === "function" && value?.prototype?.constructor === value;
|
|
1948
|
-
function getLoader(Proto) {
|
|
1074
|
+
function getLoader$1(Proto) {
|
|
1949
1075
|
if (isConstructor$1(Proto)) {
|
|
1950
1076
|
let loader = memoizedLoaders.get(Proto);
|
|
1951
1077
|
if (!loader) {
|
|
@@ -1958,7 +1084,7 @@ function getLoader(Proto) {
|
|
|
1958
1084
|
}
|
|
1959
1085
|
function loadingFn(extensions, onProgress) {
|
|
1960
1086
|
return function(Proto, input) {
|
|
1961
|
-
const loader = getLoader(Proto);
|
|
1087
|
+
const loader = getLoader$1(Proto);
|
|
1962
1088
|
if (extensions) extensions(loader);
|
|
1963
1089
|
if ("loadAsync" in loader && typeof loader.loadAsync === "function") {
|
|
1964
1090
|
return loader.loadAsync(input, onProgress).then((data) => {
|
|
@@ -1986,7 +1112,11 @@ function useLoader(loader, input, extensions, onProgress, cacheKey) {
|
|
|
1986
1112
|
const results = cacheKeys.map(
|
|
1987
1113
|
(key, index) => suspend(() => fn(loader, inputs[index]), [loader, key], { equal: is.equ })
|
|
1988
1114
|
);
|
|
1989
|
-
|
|
1115
|
+
const stableRef = useRef(null);
|
|
1116
|
+
const previous = stableRef.current;
|
|
1117
|
+
const stable = previous !== null && previous.length === results.length && previous.every((value, i) => value === results[i]) ? previous : results;
|
|
1118
|
+
stableRef.current = stable;
|
|
1119
|
+
return Array.isArray(input) ? stable : stable[0];
|
|
1990
1120
|
}
|
|
1991
1121
|
useLoader.preload = function(loader, input, extensions, onProgress, cacheKey) {
|
|
1992
1122
|
const inputs = Array.isArray(input) ? input : [input];
|
|
@@ -1999,7 +1129,7 @@ useLoader.clear = function(loader, input, cacheKey) {
|
|
|
1999
1129
|
const cacheKeys = Array.isArray(cacheKey ?? input) ? cacheKey ?? input : [cacheKey ?? input];
|
|
2000
1130
|
cacheKeys.forEach((key) => clear([loader, key]));
|
|
2001
1131
|
};
|
|
2002
|
-
useLoader.loader = getLoader;
|
|
1132
|
+
useLoader.loader = getLoader$1;
|
|
2003
1133
|
|
|
2004
1134
|
function useFrame(callback, priorityOrOptions) {
|
|
2005
1135
|
const store = React.useContext(context);
|
|
@@ -2106,6 +1236,13 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2106
1236
|
* Use for controlling the entire frame loop, adding phases, etc.
|
|
2107
1237
|
*/
|
|
2108
1238
|
scheduler: scheduler2,
|
|
1239
|
+
/**
|
|
1240
|
+
* The root that currently owns this job. Resolve on access because ambient
|
|
1241
|
+
* jobs can be adopted by a Canvas after the controls object is created.
|
|
1242
|
+
*/
|
|
1243
|
+
get rootId() {
|
|
1244
|
+
return getScheduler().getJobRootId(id);
|
|
1245
|
+
},
|
|
2109
1246
|
/**
|
|
2110
1247
|
* Manually step this job only.
|
|
2111
1248
|
* Bypasses FPS limiting - always runs.
|
|
@@ -2122,6 +1259,14 @@ function useFrame(callback, priorityOrOptions) {
|
|
|
2122
1259
|
stepAll: (timestamp) => {
|
|
2123
1260
|
getScheduler().step(timestamp);
|
|
2124
1261
|
},
|
|
1262
|
+
/**
|
|
1263
|
+
* Request frames for this job's owning root without waking sibling roots.
|
|
1264
|
+
*/
|
|
1265
|
+
invalidate: (frames, stackFrames) => {
|
|
1266
|
+
const scheduler3 = getScheduler();
|
|
1267
|
+
const rootId = scheduler3.getJobRootId(id);
|
|
1268
|
+
if (rootId) scheduler3.invalidateRoot(rootId, frames, stackFrames);
|
|
1269
|
+
},
|
|
2125
1270
|
/**
|
|
2126
1271
|
* Pause this job (set enabled=false).
|
|
2127
1272
|
* Job remains registered but won't run.
|
|
@@ -2151,6 +1296,11 @@ function getUrls(input) {
|
|
|
2151
1296
|
if (Array.isArray(input)) return input;
|
|
2152
1297
|
return Object.values(input);
|
|
2153
1298
|
}
|
|
1299
|
+
function inputSignature(input) {
|
|
1300
|
+
if (typeof input === "string") return input;
|
|
1301
|
+
if (Array.isArray(input)) return input.join("\0");
|
|
1302
|
+
return Object.keys(input).sort().map((key) => `${key}\0${input[key]}`).join("");
|
|
1303
|
+
}
|
|
2154
1304
|
function allUrlsCached(urls, textureCache) {
|
|
2155
1305
|
return urls.every((url) => textureCache.has(url));
|
|
2156
1306
|
}
|
|
@@ -2176,24 +1326,37 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
2176
1326
|
const onLoadRef = useRef(onLoad);
|
|
2177
1327
|
onLoadRef.current = onLoad;
|
|
2178
1328
|
const onLoadCalledForRef = useRef(null);
|
|
2179
|
-
const
|
|
1329
|
+
const inputKey = useMemo(() => inputSignature(input), [input]);
|
|
1330
|
+
const stableInput = useMemo(() => input, [inputKey]);
|
|
1331
|
+
const urls = useMemo(() => getUrls(stableInput), [stableInput]);
|
|
2180
1332
|
const cachedResult = useMemo(() => {
|
|
2181
1333
|
if (!cache) return null;
|
|
2182
1334
|
const textures = store.getState().textures;
|
|
2183
1335
|
if (!allUrlsCached(urls, textures)) return null;
|
|
2184
|
-
return buildFromCache(
|
|
2185
|
-
}, [cache, urls,
|
|
1336
|
+
return buildFromCache(stableInput, textures);
|
|
1337
|
+
}, [cache, urls, stableInput, store]);
|
|
2186
1338
|
const loadedTextures = useLoader(
|
|
2187
1339
|
TextureLoader,
|
|
2188
|
-
IsObject(
|
|
1340
|
+
IsObject(stableInput) ? Object.values(stableInput) : stableInput
|
|
2189
1341
|
);
|
|
2190
|
-
const
|
|
1342
|
+
const mappedTextures = useMemo(() => {
|
|
1343
|
+
if (cachedResult) return cachedResult;
|
|
1344
|
+
if (IsObject(stableInput)) {
|
|
1345
|
+
const keyed = {};
|
|
1346
|
+
const textureArray = loadedTextures;
|
|
1347
|
+
let i = 0;
|
|
1348
|
+
for (const key in stableInput) keyed[key] = textureArray[i++];
|
|
1349
|
+
return keyed;
|
|
1350
|
+
} else {
|
|
1351
|
+
return loadedTextures;
|
|
1352
|
+
}
|
|
1353
|
+
}, [stableInput, loadedTextures, cachedResult]);
|
|
2191
1354
|
useLayoutEffect(() => {
|
|
2192
1355
|
if (cachedResult) return;
|
|
2193
1356
|
if (onLoadCalledForRef.current === inputKey) return;
|
|
2194
1357
|
onLoadCalledForRef.current = inputKey;
|
|
2195
|
-
onLoadRef.current?.(
|
|
2196
|
-
}, [cachedResult,
|
|
1358
|
+
onLoadRef.current?.(mappedTextures);
|
|
1359
|
+
}, [cachedResult, mappedTextures, inputKey]);
|
|
2197
1360
|
useEffect(() => {
|
|
2198
1361
|
if (cachedResult) return;
|
|
2199
1362
|
if ("initTexture" in renderer) {
|
|
@@ -2212,30 +1375,18 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
2212
1375
|
});
|
|
2213
1376
|
}
|
|
2214
1377
|
}, [renderer, loadedTextures, cachedResult]);
|
|
2215
|
-
const mappedTextures = useMemo(() => {
|
|
2216
|
-
if (cachedResult) return cachedResult;
|
|
2217
|
-
if (IsObject(input)) {
|
|
2218
|
-
const keyed = {};
|
|
2219
|
-
const textureArray = loadedTextures;
|
|
2220
|
-
let i = 0;
|
|
2221
|
-
for (const key in input) keyed[key] = textureArray[i++];
|
|
2222
|
-
return keyed;
|
|
2223
|
-
} else {
|
|
2224
|
-
return loadedTextures;
|
|
2225
|
-
}
|
|
2226
|
-
}, [input, loadedTextures, cachedResult]);
|
|
2227
1378
|
useEffect(() => {
|
|
2228
1379
|
if (!cache) return;
|
|
2229
1380
|
const urlTextureMap = [];
|
|
2230
|
-
if (typeof
|
|
2231
|
-
urlTextureMap.push([
|
|
2232
|
-
} else if (Array.isArray(
|
|
1381
|
+
if (typeof stableInput === "string") {
|
|
1382
|
+
urlTextureMap.push([stableInput, mappedTextures]);
|
|
1383
|
+
} else if (Array.isArray(stableInput)) {
|
|
2233
1384
|
const textureArray = mappedTextures;
|
|
2234
|
-
|
|
2235
|
-
} else if (IsObject(
|
|
1385
|
+
stableInput.forEach((url, i) => urlTextureMap.push([url, textureArray[i]]));
|
|
1386
|
+
} else if (IsObject(stableInput)) {
|
|
2236
1387
|
const textureRecord = mappedTextures;
|
|
2237
|
-
for (const key in
|
|
2238
|
-
const url =
|
|
1388
|
+
for (const key in stableInput) {
|
|
1389
|
+
const url = stableInput[key];
|
|
2239
1390
|
urlTextureMap.push([url, textureRecord[key]]);
|
|
2240
1391
|
}
|
|
2241
1392
|
}
|
|
@@ -2264,7 +1415,7 @@ function useTexture(input, optionsOrOnLoad) {
|
|
|
2264
1415
|
}
|
|
2265
1416
|
return { _textureRefs: refs };
|
|
2266
1417
|
});
|
|
2267
|
-
}, [cache,
|
|
1418
|
+
}, [cache, stableInput, mappedTextures, store]);
|
|
2268
1419
|
return mappedTextures;
|
|
2269
1420
|
}
|
|
2270
1421
|
useTexture.preload = (url) => useLoader.preload(TextureLoader, url);
|
|
@@ -2365,7 +1516,128 @@ function useRenderTarget(widthOrOptions, heightOrOptions, options) {
|
|
|
2365
1516
|
{
|
|
2366
1517
|
return isLegacy ? new WebGLRenderTarget(w, h, opts) : new RenderTarget(w, h, opts);
|
|
2367
1518
|
}
|
|
2368
|
-
}, [width, height, size.width, size.height, opts, isLegacy]);
|
|
1519
|
+
}, [width, height, size.width, size.height, opts, isLegacy]);
|
|
1520
|
+
}
|
|
1521
|
+
|
|
1522
|
+
const presetsObj = {
|
|
1523
|
+
apartment: "lebombo_1k.hdr",
|
|
1524
|
+
city: "potsdamer_platz_1k.hdr",
|
|
1525
|
+
dawn: "kiara_1_dawn_1k.hdr",
|
|
1526
|
+
forest: "forest_slope_1k.hdr",
|
|
1527
|
+
lobby: "st_fagans_interior_1k.hdr",
|
|
1528
|
+
night: "dikhololo_night_1k.hdr",
|
|
1529
|
+
park: "rooitou_park_1k.hdr",
|
|
1530
|
+
studio: "studio_small_03_1k.hdr",
|
|
1531
|
+
sunset: "venice_sunset_1k.hdr",
|
|
1532
|
+
warehouse: "empty_warehouse_01_1k.hdr"
|
|
1533
|
+
};
|
|
1534
|
+
|
|
1535
|
+
const CUBEMAP_ROOT = "https://raw.githack.com/pmndrs/drei-assets/456060a26bbeb8fdf79326f224b6d99b8bcce736/hdri/";
|
|
1536
|
+
const isArray = (arr) => Array.isArray(arr);
|
|
1537
|
+
const defaultFiles = ["/px.png", "/nx.png", "/py.png", "/ny.png", "/pz.png", "/nz.png"];
|
|
1538
|
+
function useEnvironment({
|
|
1539
|
+
files = defaultFiles,
|
|
1540
|
+
path = "",
|
|
1541
|
+
preset = void 0,
|
|
1542
|
+
colorSpace = void 0,
|
|
1543
|
+
extensions
|
|
1544
|
+
} = {}) {
|
|
1545
|
+
if (preset) {
|
|
1546
|
+
validatePreset(preset);
|
|
1547
|
+
files = presetsObj[preset];
|
|
1548
|
+
path = CUBEMAP_ROOT;
|
|
1549
|
+
}
|
|
1550
|
+
const multiFile = isArray(files);
|
|
1551
|
+
const { extension, isCubemap } = getExtension(files);
|
|
1552
|
+
const loader = getLoader(extension);
|
|
1553
|
+
if (!loader) throw new Error("useEnvironment: Unrecognized file extension: " + files);
|
|
1554
|
+
const renderer = useThree((state) => state.renderer);
|
|
1555
|
+
useLayoutEffect(() => {
|
|
1556
|
+
if (extension !== "webp" && extension !== "jpg" && extension !== "jpeg") return;
|
|
1557
|
+
function clearGainmapTexture() {
|
|
1558
|
+
useLoader.clear(loader, multiFile ? [files] : files);
|
|
1559
|
+
}
|
|
1560
|
+
renderer.domElement.addEventListener("webglcontextlost", clearGainmapTexture, { once: true });
|
|
1561
|
+
}, [extension, files, loader, multiFile, renderer.domElement]);
|
|
1562
|
+
const loaderResult = useLoader(
|
|
1563
|
+
loader,
|
|
1564
|
+
multiFile ? [files] : files,
|
|
1565
|
+
(loader2) => {
|
|
1566
|
+
if (extension === "webp" || extension === "jpg" || extension === "jpeg") {
|
|
1567
|
+
loader2.setRenderer?.(renderer);
|
|
1568
|
+
}
|
|
1569
|
+
loader2.setPath?.(path);
|
|
1570
|
+
if (extensions) extensions(loader2);
|
|
1571
|
+
}
|
|
1572
|
+
);
|
|
1573
|
+
let texture = multiFile ? (
|
|
1574
|
+
// @ts-ignore
|
|
1575
|
+
loaderResult[0]
|
|
1576
|
+
) : loaderResult;
|
|
1577
|
+
if (extension === "jpg" || extension === "jpeg" || extension === "webp") {
|
|
1578
|
+
texture = texture.renderTarget?.texture;
|
|
1579
|
+
}
|
|
1580
|
+
texture.mapping = isCubemap ? CubeReflectionMapping : EquirectangularReflectionMapping;
|
|
1581
|
+
texture.colorSpace = colorSpace ?? (isCubemap && extension !== "hdr-cube" ? "srgb" : "srgb-linear");
|
|
1582
|
+
return texture;
|
|
1583
|
+
}
|
|
1584
|
+
const preloadDefaultOptions = {
|
|
1585
|
+
files: defaultFiles,
|
|
1586
|
+
path: "",
|
|
1587
|
+
preset: void 0,
|
|
1588
|
+
extensions: void 0
|
|
1589
|
+
};
|
|
1590
|
+
useEnvironment.preload = (preloadOptions) => {
|
|
1591
|
+
const options = { ...preloadDefaultOptions, ...preloadOptions };
|
|
1592
|
+
let { files, path = "" } = options;
|
|
1593
|
+
const { preset, extensions } = options;
|
|
1594
|
+
if (preset) {
|
|
1595
|
+
validatePreset(preset);
|
|
1596
|
+
files = presetsObj[preset];
|
|
1597
|
+
path = CUBEMAP_ROOT;
|
|
1598
|
+
}
|
|
1599
|
+
const { extension } = getExtension(files);
|
|
1600
|
+
if (extension === "webp" || extension === "jpg" || extension === "jpeg") {
|
|
1601
|
+
throw new Error("useEnvironment: Preloading gainmaps is not supported");
|
|
1602
|
+
}
|
|
1603
|
+
const loader = getLoader(extension);
|
|
1604
|
+
if (!loader) throw new Error("useEnvironment: Unrecognized file extension: " + files);
|
|
1605
|
+
useLoader.preload(loader, isArray(files) ? [files] : files, (loader2) => {
|
|
1606
|
+
loader2.setPath?.(path);
|
|
1607
|
+
if (extensions) extensions(loader2);
|
|
1608
|
+
});
|
|
1609
|
+
};
|
|
1610
|
+
const clearDefaultOptins = {
|
|
1611
|
+
files: defaultFiles,
|
|
1612
|
+
preset: void 0
|
|
1613
|
+
};
|
|
1614
|
+
useEnvironment.clear = (clearOptions) => {
|
|
1615
|
+
const options = { ...clearDefaultOptins, ...clearOptions };
|
|
1616
|
+
let { files } = options;
|
|
1617
|
+
const { preset } = options;
|
|
1618
|
+
if (preset) {
|
|
1619
|
+
validatePreset(preset);
|
|
1620
|
+
files = presetsObj[preset];
|
|
1621
|
+
}
|
|
1622
|
+
const { extension } = getExtension(files);
|
|
1623
|
+
const loader = getLoader(extension);
|
|
1624
|
+
if (!loader) throw new Error("useEnvironment: Unrecognized file extension: " + files);
|
|
1625
|
+
useLoader.clear(loader, isArray(files) ? [files] : files);
|
|
1626
|
+
};
|
|
1627
|
+
function validatePreset(preset) {
|
|
1628
|
+
if (!(preset in presetsObj)) throw new Error("Preset must be one of: " + Object.keys(presetsObj).join(", "));
|
|
1629
|
+
}
|
|
1630
|
+
function getExtension(files) {
|
|
1631
|
+
const isCubemap = isArray(files) && files.length === 6;
|
|
1632
|
+
const isGainmap = isArray(files) && files.length === 3 && files.some((file) => file.endsWith("json"));
|
|
1633
|
+
const firstEntry = isArray(files) ? files[0] : files;
|
|
1634
|
+
const firstExtension = firstEntry.split(".").pop()?.split("?")?.shift()?.toLowerCase();
|
|
1635
|
+
const extension = isCubemap ? firstExtension === "hdr" ? "hdr-cube" : "cube" : isGainmap ? "webp" : firstEntry.startsWith("data:application/exr") ? "exr" : firstEntry.startsWith("data:application/hdr") ? "hdr" : firstEntry.startsWith("data:image/jpeg") ? "jpg" : firstExtension;
|
|
1636
|
+
return { extension, isCubemap, isGainmap };
|
|
1637
|
+
}
|
|
1638
|
+
function getLoader(extension) {
|
|
1639
|
+
const loader = extension === "cube" ? CubeTextureLoader : extension === "hdr-cube" ? HDRCubeTextureLoader : extension === "hdr" ? HDRLoader : extension === "exr" ? EXRLoader : extension === "jpg" || extension === "jpeg" ? UltraHDRLoader : extension === "webp" ? GainMapLoader : null;
|
|
1640
|
+
return loader;
|
|
2369
1641
|
}
|
|
2370
1642
|
|
|
2371
1643
|
function useStore() {
|
|
@@ -2385,6 +1657,8 @@ function useGraph(object) {
|
|
|
2385
1657
|
return useMemo(() => buildGraph(object), [object]);
|
|
2386
1658
|
}
|
|
2387
1659
|
|
|
1660
|
+
const t = 1, o = 8, r = 32, e = 2, i$1 = 268435456;
|
|
1661
|
+
|
|
2388
1662
|
let effectId = 0;
|
|
2389
1663
|
function addEffect(callback) {
|
|
2390
1664
|
notifyDepreciated({
|
|
@@ -2413,13 +1687,19 @@ function addTail(callback) {
|
|
|
2413
1687
|
return getScheduler().onIdle(callback);
|
|
2414
1688
|
}
|
|
2415
1689
|
function invalidate(state, frames = 1, stackFrames = false) {
|
|
2416
|
-
|
|
1690
|
+
const rootId = state?.internal?.rootId;
|
|
1691
|
+
const scheduler = getScheduler();
|
|
1692
|
+
if (rootId) scheduler.invalidateRoot(rootId, frames, stackFrames);
|
|
1693
|
+
else scheduler.invalidate(frames, stackFrames);
|
|
2417
1694
|
}
|
|
2418
|
-
function advance(timestamp) {
|
|
2419
|
-
|
|
1695
|
+
function advance(timestamp, runGlobalEffects, state) {
|
|
1696
|
+
const rootId = state?.internal?.rootId;
|
|
1697
|
+
const scheduler = getScheduler();
|
|
1698
|
+
if (rootId) scheduler.stepRoot(rootId, timestamp);
|
|
1699
|
+
else scheduler.step(timestamp);
|
|
2420
1700
|
}
|
|
2421
1701
|
|
|
2422
|
-
const version = "10.0.0-alpha.
|
|
1702
|
+
const version = "10.0.0-alpha.5";
|
|
2423
1703
|
const packageData = {
|
|
2424
1704
|
version: version};
|
|
2425
1705
|
|
|
@@ -13287,395 +12567,978 @@ Check the top-level render call using <` + i + ">.");
|
|
|
13287
12567
|
} finally {
|
|
13288
12568
|
x.H = o;
|
|
13289
12569
|
}
|
|
13290
|
-
}, useReducer: function(e, n, o) {
|
|
13291
|
-
z = "useReducer", D(), N();
|
|
13292
|
-
var i = x.H;
|
|
13293
|
-
x.H = $o;
|
|
12570
|
+
}, useReducer: function(e, n, o) {
|
|
12571
|
+
z = "useReducer", D(), N();
|
|
12572
|
+
var i = x.H;
|
|
12573
|
+
x.H = $o;
|
|
12574
|
+
try {
|
|
12575
|
+
return Br(e, n, o);
|
|
12576
|
+
} finally {
|
|
12577
|
+
x.H = i;
|
|
12578
|
+
}
|
|
12579
|
+
}, useRef: function() {
|
|
12580
|
+
return z = "useRef", D(), N(), xe().memoizedState;
|
|
12581
|
+
}, useState: function() {
|
|
12582
|
+
z = "useState", D(), N();
|
|
12583
|
+
var e = x.H;
|
|
12584
|
+
x.H = $o;
|
|
12585
|
+
try {
|
|
12586
|
+
return Br(gr);
|
|
12587
|
+
} finally {
|
|
12588
|
+
x.H = e;
|
|
12589
|
+
}
|
|
12590
|
+
}, useDebugValue: function() {
|
|
12591
|
+
z = "useDebugValue", D(), N();
|
|
12592
|
+
}, useDeferredValue: function(e, n) {
|
|
12593
|
+
return z = "useDeferredValue", D(), N(), nc(e, n);
|
|
12594
|
+
}, useTransition: function() {
|
|
12595
|
+
return z = "useTransition", D(), N(), Qp();
|
|
12596
|
+
}, useSyncExternalStore: function(e, n, o) {
|
|
12597
|
+
return z = "useSyncExternalStore", D(), N(), ta(e, n, o);
|
|
12598
|
+
}, useId: function() {
|
|
12599
|
+
return z = "useId", D(), N(), xe().memoizedState;
|
|
12600
|
+
}, useFormState: function(e) {
|
|
12601
|
+
return z = "useFormState", D(), N(), hs(e);
|
|
12602
|
+
}, useActionState: function(e) {
|
|
12603
|
+
return z = "useActionState", D(), N(), hs(e);
|
|
12604
|
+
}, useOptimistic: function(e, n) {
|
|
12605
|
+
return z = "useOptimistic", D(), N(), rf(e, n);
|
|
12606
|
+
}, useMemoCache: function(e) {
|
|
12607
|
+
return D(), Oa(e);
|
|
12608
|
+
}, useHostTransitionStatus: ia, useCacheRefresh: function() {
|
|
12609
|
+
return z = "useCacheRefresh", N(), xe().memoizedState;
|
|
12610
|
+
}, useEffectEvent: function(e) {
|
|
12611
|
+
return z = "useEffectEvent", D(), N(), oa(e);
|
|
12612
|
+
} }, dm = { readContext: function(e) {
|
|
12613
|
+
return Ce(), Ee(e);
|
|
12614
|
+
}, use: function(e) {
|
|
12615
|
+
return D(), we(e);
|
|
12616
|
+
}, useCallback: function(e, n) {
|
|
12617
|
+
return z = "useCallback", D(), N(), Ma(e, n);
|
|
12618
|
+
}, useContext: function(e) {
|
|
12619
|
+
return z = "useContext", D(), N(), Ee(e);
|
|
12620
|
+
}, useEffect: function(e, n) {
|
|
12621
|
+
z = "useEffect", D(), N(), Qn(2048, Ut, e, n);
|
|
12622
|
+
}, useImperativeHandle: function(e, n, o) {
|
|
12623
|
+
return z = "useImperativeHandle", D(), N(), aa(e, n, o);
|
|
12624
|
+
}, useInsertionEffect: function(e, n) {
|
|
12625
|
+
return z = "useInsertionEffect", D(), N(), Qn(4, Wt, e, n);
|
|
12626
|
+
}, useLayoutEffect: function(e, n) {
|
|
12627
|
+
return z = "useLayoutEffect", D(), N(), Qn(4, Rr, e, n);
|
|
12628
|
+
}, useMemo: function(e, n) {
|
|
12629
|
+
z = "useMemo", D(), N();
|
|
12630
|
+
var o = x.H;
|
|
12631
|
+
x.H = $o;
|
|
12632
|
+
try {
|
|
12633
|
+
return Vi(e, n);
|
|
12634
|
+
} finally {
|
|
12635
|
+
x.H = o;
|
|
12636
|
+
}
|
|
12637
|
+
}, useReducer: function(e, n, o) {
|
|
12638
|
+
z = "useReducer", D(), N();
|
|
12639
|
+
var i = x.H;
|
|
12640
|
+
x.H = $o;
|
|
12641
|
+
try {
|
|
12642
|
+
return Qi(e, n, o);
|
|
12643
|
+
} finally {
|
|
12644
|
+
x.H = i;
|
|
12645
|
+
}
|
|
12646
|
+
}, useRef: function() {
|
|
12647
|
+
return z = "useRef", D(), N(), xe().memoizedState;
|
|
12648
|
+
}, useState: function() {
|
|
12649
|
+
z = "useState", D(), N();
|
|
12650
|
+
var e = x.H;
|
|
12651
|
+
x.H = $o;
|
|
12652
|
+
try {
|
|
12653
|
+
return Qi(gr);
|
|
12654
|
+
} finally {
|
|
12655
|
+
x.H = e;
|
|
12656
|
+
}
|
|
12657
|
+
}, useDebugValue: function() {
|
|
12658
|
+
z = "useDebugValue", D(), N();
|
|
12659
|
+
}, useDeferredValue: function(e, n) {
|
|
12660
|
+
return z = "useDeferredValue", D(), N(), sf(e, n);
|
|
12661
|
+
}, useTransition: function() {
|
|
12662
|
+
return z = "useTransition", D(), N(), Ro();
|
|
12663
|
+
}, useSyncExternalStore: function(e, n, o) {
|
|
12664
|
+
return z = "useSyncExternalStore", D(), N(), ta(e, n, o);
|
|
12665
|
+
}, useId: function() {
|
|
12666
|
+
return z = "useId", D(), N(), xe().memoizedState;
|
|
12667
|
+
}, useFormState: function(e) {
|
|
12668
|
+
return z = "useFormState", D(), N(), $t(e);
|
|
12669
|
+
}, useActionState: function(e) {
|
|
12670
|
+
return z = "useActionState", D(), N(), $t(e);
|
|
12671
|
+
}, useOptimistic: function(e, n) {
|
|
12672
|
+
return z = "useOptimistic", D(), N(), of(e, n);
|
|
12673
|
+
}, useMemoCache: function(e) {
|
|
12674
|
+
return D(), Oa(e);
|
|
12675
|
+
}, useHostTransitionStatus: ia, useCacheRefresh: function() {
|
|
12676
|
+
return z = "useCacheRefresh", N(), xe().memoizedState;
|
|
12677
|
+
}, useEffectEvent: function(e) {
|
|
12678
|
+
return z = "useEffectEvent", D(), N(), oa(e);
|
|
12679
|
+
} };
|
|
12680
|
+
var Fy = {}, Hy = /* @__PURE__ */ new Set(), Ay = /* @__PURE__ */ new Set(), jy = /* @__PURE__ */ new Set(), Dy = /* @__PURE__ */ new Set(), Wy = /* @__PURE__ */ new Set(), Uy = /* @__PURE__ */ new Set(), By = /* @__PURE__ */ new Set(), Oy = /* @__PURE__ */ new Set(), My = /* @__PURE__ */ new Set(), Qy = /* @__PURE__ */ new Set();
|
|
12681
|
+
Object.freeze(Fy);
|
|
12682
|
+
var zg = { enqueueSetState: function(e, n, o) {
|
|
12683
|
+
e = e._reactInternals;
|
|
12684
|
+
var i = Nt(e), s = zo(i);
|
|
12685
|
+
s.payload = n, o != null && (df(o), s.callback = o), n = Mt(e, s, i), n !== null && (ur(i, "this.setState()", e), We(n, e, i), Bi(n, e, i));
|
|
12686
|
+
}, enqueueReplaceState: function(e, n, o) {
|
|
12687
|
+
e = e._reactInternals;
|
|
12688
|
+
var i = Nt(e), s = zo(i);
|
|
12689
|
+
s.tag = Cy, s.payload = n, o != null && (df(o), s.callback = o), n = Mt(e, s, i), n !== null && (ur(i, "this.replaceState()", e), We(n, e, i), Bi(n, e, i));
|
|
12690
|
+
}, enqueueForceUpdate: function(e, n) {
|
|
12691
|
+
e = e._reactInternals;
|
|
12692
|
+
var o = Nt(e), i = zo(o);
|
|
12693
|
+
i.tag = Ty, n != null && (df(n), i.callback = n), n = Mt(e, i, o), n !== null && (ur(o, "this.forceUpdate()", e), We(n, e, o), Bi(n, e, o));
|
|
12694
|
+
} }, bd = null, Cg = null, Tg = Error("This is not a real error. It's an implementation detail of React's selective hydration feature. If this leaks into userspace, it's a bug in React. Please file an issue."), Cn = false, $y = {}, Vy = {}, qy = {}, Gy = {}, vd = false, Jy = {}, fm = {}, _g = { dehydrated: null, treeContext: null, retryLane: 0, hydrationErrors: null }, Zy = false, Yy = null;
|
|
12695
|
+
Yy = /* @__PURE__ */ new Set();
|
|
12696
|
+
var Si = false, Tn = false, Rg = false, Xy = typeof WeakSet == "function" ? WeakSet : Set, Gn = null, Sd = null, kd = null, _n = null, nr = false, Vo = null, Wn = false, wd = 8192, Vb = { getCacheForType: function(e) {
|
|
12697
|
+
var n = Ee(un), o = n.data.get(e);
|
|
12698
|
+
return o === void 0 && (o = e(), n.data.set(e, o)), o;
|
|
12699
|
+
}, cacheSignal: function() {
|
|
12700
|
+
return Ee(un).controller.signal;
|
|
12701
|
+
}, getOwner: function() {
|
|
12702
|
+
return di;
|
|
12703
|
+
} }, pm = 0, hm = 1, mm = 2, gm = 3, ym = 4;
|
|
12704
|
+
if (typeof Symbol == "function" && Symbol.for) {
|
|
12705
|
+
var bp = Symbol.for;
|
|
12706
|
+
pm = bp("selector.component"), hm = bp("selector.has_pseudo_class"), mm = bp("selector.role"), gm = bp("selector.test_id"), ym = bp("selector.text");
|
|
12707
|
+
}
|
|
12708
|
+
var bm = [], qb = typeof WeakMap == "function" ? WeakMap : Map, Jn = 0, Zn = 2, uo = 4, ki = 0, vp = 1, iu = 2, vm = 3, Tl = 4, Sm = 6, Ky = 5, ye = Jn, je = null, se = null, ae = 0, tr = 0, km = 1, lu = 2, Sp = 3, eb = 4, Eg = 5, kp = 6, wm = 7, Ig = 8, su = 9, Le = tr, Er = null, _l = false, Pd = false, Lg = false, Ta = 0, nn = ki, Rl = 0, El = 0, Ng = 0, rr = 0, uu = 0, wp = null, Bt = null, Pm = false, xm = 0, nb = 0, tb = 300, Pp = 1 / 0, Fg = 500, xp = null, gn = null, Il = null, zm = 0, Hg = 1, Ag = 2, rb = 3, Ll = 0, ob = 1, ab = 2, ib = 3, lb = 4, Cm = 5, Rn = 0, Nl = null, xd = null, qo = 0, jg = 0, Dg = -0, Wg = null, sb = null, ub = null, Go = zm, cb = null, Gb = 50, zp = 0, Ug = null, Bg = false, Tm = false, Jb = 50, cu = 0, Cp = null, zd = false, _m = null, db = false, fb = /* @__PURE__ */ new Set(), Zb = {}, co = null, Cd = null, pb = false;
|
|
12709
|
+
try {
|
|
12710
|
+
var o0 = Object.preventExtensions({});
|
|
12711
|
+
} catch {
|
|
12712
|
+
pb = true;
|
|
12713
|
+
}
|
|
12714
|
+
var hb = false, mb = {}, gb = null, yb = null, bb = null, vb = null, Sb = null, kb = null, wb = null, Pb = null, xb = null, zb = null;
|
|
12715
|
+
return gb = function(e, n, o, i) {
|
|
12716
|
+
n = Yn(e, n), n !== null && (o = _d(n.memoizedState, o, 0, i), n.memoizedState = o, n.baseState = o, e.memoizedProps = ze({}, e.memoizedProps), o = On(e, 2), o !== null && We(o, e, 2));
|
|
12717
|
+
}, yb = function(e, n, o) {
|
|
12718
|
+
n = Yn(e, n), n !== null && (o = du(n.memoizedState, o, 0), n.memoizedState = o, n.baseState = o, e.memoizedProps = ze({}, e.memoizedProps), o = On(e, 2), o !== null && We(o, e, 2));
|
|
12719
|
+
}, bb = function(e, n, o, i) {
|
|
12720
|
+
n = Yn(e, n), n !== null && (o = F(n.memoizedState, o, i), n.memoizedState = o, n.baseState = o, e.memoizedProps = ze({}, e.memoizedProps), o = On(e, 2), o !== null && We(o, e, 2));
|
|
12721
|
+
}, vb = function(e, n, o) {
|
|
12722
|
+
e.pendingProps = _d(e.memoizedProps, n, 0, o), e.alternate && (e.alternate.pendingProps = e.pendingProps), n = On(e, 2), n !== null && We(n, e, 2);
|
|
12723
|
+
}, Sb = function(e, n) {
|
|
12724
|
+
e.pendingProps = du(e.memoizedProps, n, 0), e.alternate && (e.alternate.pendingProps = e.pendingProps), n = On(e, 2), n !== null && We(n, e, 2);
|
|
12725
|
+
}, kb = function(e, n, o) {
|
|
12726
|
+
e.pendingProps = F(e.memoizedProps, n, o), e.alternate && (e.alternate.pendingProps = e.pendingProps), n = On(e, 2), n !== null && We(n, e, 2);
|
|
12727
|
+
}, wb = function(e) {
|
|
12728
|
+
var n = On(e, 2);
|
|
12729
|
+
n !== null && We(n, e, 2);
|
|
12730
|
+
}, Pb = function(e) {
|
|
12731
|
+
var n = ut(), o = On(e, n);
|
|
12732
|
+
o !== null && We(o, e, n);
|
|
12733
|
+
}, xb = function(e) {
|
|
12734
|
+
pu = e;
|
|
12735
|
+
}, zb = function(e) {
|
|
12736
|
+
fu = e;
|
|
12737
|
+
}, le.attemptContinuousHydration = function(e) {
|
|
12738
|
+
if (e.tag === 13 || e.tag === 31) {
|
|
12739
|
+
var n = On(e, 67108864);
|
|
12740
|
+
n !== null && We(n, e, 67108864), rl(e, 67108864);
|
|
12741
|
+
}
|
|
12742
|
+
}, le.attemptHydrationAtCurrentPriority = function(e) {
|
|
12743
|
+
if (e.tag === 13 || e.tag === 31) {
|
|
12744
|
+
var n = Nt(e);
|
|
12745
|
+
n = Xo(n);
|
|
12746
|
+
var o = On(e, n);
|
|
12747
|
+
o !== null && We(o, e, n), rl(e, n);
|
|
12748
|
+
}
|
|
12749
|
+
}, le.attemptSynchronousHydration = function(e) {
|
|
12750
|
+
switch (e.tag) {
|
|
12751
|
+
case 3:
|
|
12752
|
+
if (e = e.stateNode, e.current.memoizedState.isDehydrated) {
|
|
12753
|
+
var n = _t(e.pendingLanes);
|
|
12754
|
+
if (n !== 0) {
|
|
12755
|
+
for (e.pendingLanes |= 2, e.entangledLanes |= 2; n; ) {
|
|
12756
|
+
var o = 1 << 31 - vn(n);
|
|
12757
|
+
e.entanglements[1] |= o, n &= ~o;
|
|
12758
|
+
}
|
|
12759
|
+
Kn(e), (ye & (Zn | uo)) === Jn && (Pp = me() + Fg, Wa(0));
|
|
12760
|
+
}
|
|
12761
|
+
}
|
|
12762
|
+
break;
|
|
12763
|
+
case 31:
|
|
12764
|
+
case 13:
|
|
12765
|
+
n = On(e, 2), n !== null && We(n, e, 2), Ls(), rl(e, 2);
|
|
12766
|
+
}
|
|
12767
|
+
}, le.batchedUpdates = function(e, n) {
|
|
12768
|
+
return e(n);
|
|
12769
|
+
}, le.createComponentSelector = function(e) {
|
|
12770
|
+
return { $$typeof: pm, value: e };
|
|
12771
|
+
}, le.createContainer = function(e, n, o, i, s, u, f, p, g, S) {
|
|
12772
|
+
return Ka(e, n, false, null, o, i, u, null, f, p, g, S);
|
|
12773
|
+
}, le.createHasPseudoClassSelector = function(e) {
|
|
12774
|
+
return { $$typeof: hm, value: e };
|
|
12775
|
+
}, le.createHydrationContainer = function(e, n, o, i, s, u, f, p, g, S, T, _, I, O) {
|
|
12776
|
+
return e = Ka(o, i, true, e, s, u, p, O, g, S, T, _), e.context = Dh(null), o = e.current, i = Nt(o), i = Xo(i), s = zo(i), s.callback = n ?? null, Mt(o, s, i), ur(i, "hydrateRoot()", null), n = i, e.current.lanes = n, Ci(e, n), Kn(e), e;
|
|
12777
|
+
}, le.createPortal = function(e, n, o) {
|
|
12778
|
+
var i = 3 < arguments.length && arguments[3] !== void 0 ? arguments[3] : null;
|
|
13294
12779
|
try {
|
|
13295
|
-
|
|
13296
|
-
|
|
13297
|
-
|
|
12780
|
+
vt(i);
|
|
12781
|
+
var s = false;
|
|
12782
|
+
} catch {
|
|
12783
|
+
s = true;
|
|
13298
12784
|
}
|
|
13299
|
-
|
|
13300
|
-
|
|
13301
|
-
|
|
13302
|
-
|
|
13303
|
-
|
|
13304
|
-
|
|
12785
|
+
return s && (console.error("The provided key is an unsupported type %s. This value must be coerced to a string before using it here.", typeof Symbol == "function" && Symbol.toStringTag && i[Symbol.toStringTag] || i.constructor.name || "Object"), vt(i)), { $$typeof: Ao, key: i == null ? null : "" + i, children: e, containerInfo: n, implementation: o };
|
|
12786
|
+
}, le.createRoleSelector = function(e) {
|
|
12787
|
+
return { $$typeof: mm, value: e };
|
|
12788
|
+
}, le.createTestNameSelector = function(e) {
|
|
12789
|
+
return { $$typeof: gm, value: e };
|
|
12790
|
+
}, le.createTextSelector = function(e) {
|
|
12791
|
+
return { $$typeof: ym, value: e };
|
|
12792
|
+
}, le.defaultOnCaughtError = function(e) {
|
|
12793
|
+
var n = bd ? "The above error occurred in the <" + bd + "> component." : "The above error occurred in one of your React components.", o = "React will try to recreate this component tree from scratch using the error boundary you provided, " + ((Cg || "Anonymous") + ".");
|
|
12794
|
+
typeof e == "object" && e !== null && typeof e.environmentName == "string" ? ri("error", [`%o
|
|
12795
|
+
|
|
12796
|
+
%s
|
|
12797
|
+
|
|
12798
|
+
%s
|
|
12799
|
+
`, e, n, o], e.environmentName)() : console.error(`%o
|
|
12800
|
+
|
|
12801
|
+
%s
|
|
12802
|
+
|
|
12803
|
+
%s
|
|
12804
|
+
`, e, n, o);
|
|
12805
|
+
}, le.defaultOnRecoverableError = function(e) {
|
|
12806
|
+
qg(e);
|
|
12807
|
+
}, le.defaultOnUncaughtError = function(e) {
|
|
12808
|
+
qg(e), console.warn(`%s
|
|
12809
|
+
|
|
12810
|
+
%s
|
|
12811
|
+
`, bd ? "An error occurred in the <" + bd + "> component." : "An error occurred in one of your React components.", `Consider adding an error boundary to your tree to customize error handling behavior.
|
|
12812
|
+
Visit https://react.dev/link/error-boundaries to learn more about error boundaries.`);
|
|
12813
|
+
}, le.deferredUpdates = function(e) {
|
|
12814
|
+
var n = x.T, o = wt();
|
|
13305
12815
|
try {
|
|
13306
|
-
return
|
|
12816
|
+
return an(32), x.T = null, e();
|
|
13307
12817
|
} finally {
|
|
13308
|
-
x.
|
|
12818
|
+
an(o), x.T = n;
|
|
13309
12819
|
}
|
|
13310
|
-
},
|
|
13311
|
-
|
|
13312
|
-
}, useDeferredValue: function(e, n) {
|
|
13313
|
-
return z = "useDeferredValue", D(), N(), nc(e, n);
|
|
13314
|
-
}, useTransition: function() {
|
|
13315
|
-
return z = "useTransition", D(), N(), Qp();
|
|
13316
|
-
}, useSyncExternalStore: function(e, n, o) {
|
|
13317
|
-
return z = "useSyncExternalStore", D(), N(), ta(e, n, o);
|
|
13318
|
-
}, useId: function() {
|
|
13319
|
-
return z = "useId", D(), N(), xe().memoizedState;
|
|
13320
|
-
}, useFormState: function(e) {
|
|
13321
|
-
return z = "useFormState", D(), N(), hs(e);
|
|
13322
|
-
}, useActionState: function(e) {
|
|
13323
|
-
return z = "useActionState", D(), N(), hs(e);
|
|
13324
|
-
}, useOptimistic: function(e, n) {
|
|
13325
|
-
return z = "useOptimistic", D(), N(), rf(e, n);
|
|
13326
|
-
}, useMemoCache: function(e) {
|
|
13327
|
-
return D(), Oa(e);
|
|
13328
|
-
}, useHostTransitionStatus: ia, useCacheRefresh: function() {
|
|
13329
|
-
return z = "useCacheRefresh", N(), xe().memoizedState;
|
|
13330
|
-
}, useEffectEvent: function(e) {
|
|
13331
|
-
return z = "useEffectEvent", D(), N(), oa(e);
|
|
13332
|
-
} }, dm = { readContext: function(e) {
|
|
13333
|
-
return Ce(), Ee(e);
|
|
13334
|
-
}, use: function(e) {
|
|
13335
|
-
return D(), we(e);
|
|
13336
|
-
}, useCallback: function(e, n) {
|
|
13337
|
-
return z = "useCallback", D(), N(), Ma(e, n);
|
|
13338
|
-
}, useContext: function(e) {
|
|
13339
|
-
return z = "useContext", D(), N(), Ee(e);
|
|
13340
|
-
}, useEffect: function(e, n) {
|
|
13341
|
-
z = "useEffect", D(), N(), Qn(2048, Ut, e, n);
|
|
13342
|
-
}, useImperativeHandle: function(e, n, o) {
|
|
13343
|
-
return z = "useImperativeHandle", D(), N(), aa(e, n, o);
|
|
13344
|
-
}, useInsertionEffect: function(e, n) {
|
|
13345
|
-
return z = "useInsertionEffect", D(), N(), Qn(4, Wt, e, n);
|
|
13346
|
-
}, useLayoutEffect: function(e, n) {
|
|
13347
|
-
return z = "useLayoutEffect", D(), N(), Qn(4, Rr, e, n);
|
|
13348
|
-
}, useMemo: function(e, n) {
|
|
13349
|
-
z = "useMemo", D(), N();
|
|
13350
|
-
var o = x.H;
|
|
13351
|
-
x.H = $o;
|
|
12820
|
+
}, le.discreteUpdates = function(e, n, o, i, s) {
|
|
12821
|
+
var u = x.T, f = wt();
|
|
13352
12822
|
try {
|
|
13353
|
-
return
|
|
12823
|
+
return an(2), x.T = null, e(n, o, i, s);
|
|
13354
12824
|
} finally {
|
|
13355
|
-
x.
|
|
12825
|
+
an(f), x.T = u, ye === Jn && (Pp = me() + Fg);
|
|
13356
12826
|
}
|
|
13357
|
-
},
|
|
13358
|
-
|
|
13359
|
-
|
|
13360
|
-
|
|
13361
|
-
|
|
13362
|
-
|
|
13363
|
-
|
|
13364
|
-
|
|
12827
|
+
}, le.findAllNodes = kc, le.findBoundingRects = function(e, n) {
|
|
12828
|
+
if (!xr) throw Error("Test selector API is not supported by this renderer.");
|
|
12829
|
+
n = kc(e, n), e = [];
|
|
12830
|
+
for (var o = 0; o < n.length; o++) e.push(ma(n[o]));
|
|
12831
|
+
for (n = e.length - 1; 0 < n; n--) {
|
|
12832
|
+
o = e[n];
|
|
12833
|
+
for (var i = o.x, s = i + o.width, u = o.y, f = u + o.height, p = n - 1; 0 <= p; p--) if (n !== p) {
|
|
12834
|
+
var g = e[p], S = g.x, T = S + g.width, _ = g.y, I = _ + g.height;
|
|
12835
|
+
if (i >= S && u >= _ && s <= T && f <= I) {
|
|
12836
|
+
e.splice(n, 1);
|
|
12837
|
+
break;
|
|
12838
|
+
} else if (i !== S || o.width !== g.width || I < u || _ > f) {
|
|
12839
|
+
if (!(u !== _ || o.height !== g.height || T < i || S > s)) {
|
|
12840
|
+
S > i && (g.width += S - i, g.x = i), T < s && (g.width = s - S), e.splice(n, 1);
|
|
12841
|
+
break;
|
|
12842
|
+
}
|
|
12843
|
+
} else {
|
|
12844
|
+
_ > u && (g.height += _ - u, g.y = u), I < f && (g.height = f - _), e.splice(n, 1);
|
|
12845
|
+
break;
|
|
12846
|
+
}
|
|
12847
|
+
}
|
|
13365
12848
|
}
|
|
13366
|
-
|
|
13367
|
-
|
|
13368
|
-
|
|
13369
|
-
|
|
13370
|
-
|
|
13371
|
-
|
|
12849
|
+
return e;
|
|
12850
|
+
}, le.findHostInstance = function(e) {
|
|
12851
|
+
var n = e._reactInternals;
|
|
12852
|
+
if (n === void 0) throw typeof e.render == "function" ? Error("Unable to find node on an unmounted component.") : (e = Object.keys(e).join(","), Error("Argument appears to not be a ReactComponent. Keys: " + e));
|
|
12853
|
+
return e = mu(n), e === null ? null : ot(e.stateNode);
|
|
12854
|
+
}, le.findHostInstanceWithNoPortals = function(e) {
|
|
12855
|
+
return e = Ed(e), e = e !== null ? _p(e) : null, e === null ? null : ot(e.stateNode);
|
|
12856
|
+
}, le.findHostInstanceWithWarning = function(e, n) {
|
|
12857
|
+
var o = e._reactInternals;
|
|
12858
|
+
if (o === void 0) throw typeof e.render == "function" ? Error("Unable to find node on an unmounted component.") : (e = Object.keys(e).join(","), Error("Argument appears to not be a ReactComponent. Keys: " + e));
|
|
12859
|
+
if (e = mu(o), e === null) return null;
|
|
12860
|
+
if (e.mode & 8) {
|
|
12861
|
+
var i = G(o) || "Component";
|
|
12862
|
+
mb[i] || (mb[i] = true, B(e, function() {
|
|
12863
|
+
o.mode & 8 ? console.error("%s is deprecated in StrictMode. %s was passed an instance of %s which is inside StrictMode. Instead, add a ref directly to the element you want to reference. Learn more about using refs safely here: https://react.dev/link/strict-mode-find-node", n, n, i) : console.error("%s is deprecated in StrictMode. %s was passed an instance of %s which renders StrictMode children. Instead, add a ref directly to the element you want to reference. Learn more about using refs safely here: https://react.dev/link/strict-mode-find-node", n, n, i);
|
|
12864
|
+
}));
|
|
12865
|
+
}
|
|
12866
|
+
return ot(e.stateNode);
|
|
12867
|
+
}, le.flushPassiveEffects = el, le.flushSyncFromReconciler = function(e) {
|
|
12868
|
+
var n = ye;
|
|
12869
|
+
ye |= 1;
|
|
12870
|
+
var o = x.T, i = wt();
|
|
13372
12871
|
try {
|
|
13373
|
-
return
|
|
12872
|
+
if (an(2), x.T = null, e) return e();
|
|
13374
12873
|
} finally {
|
|
13375
|
-
x.
|
|
12874
|
+
an(i), x.T = o, ye = n, (ye & (Zn | uo)) === Jn && Wa(0);
|
|
12875
|
+
}
|
|
12876
|
+
}, le.flushSyncWork = Ls, le.focusWithin = function(e, n) {
|
|
12877
|
+
if (!xr) throw Error("Test selector API is not supported by this renderer.");
|
|
12878
|
+
for (e = Ef(e), n = hh(e, n), n = Array.from(n), e = 0; e < n.length; ) {
|
|
12879
|
+
var o = n[e++], i = o.tag;
|
|
12880
|
+
if (!Kr(o)) {
|
|
12881
|
+
if ((i === 5 || i === 26 || i === 27) && Ft(o.stateNode)) return true;
|
|
12882
|
+
for (o = o.child; o !== null; ) n.push(o), o = o.sibling;
|
|
12883
|
+
}
|
|
12884
|
+
}
|
|
12885
|
+
return false;
|
|
12886
|
+
}, le.getFindAllNodesFailureDescription = function(e, n) {
|
|
12887
|
+
if (!xr) throw Error("Test selector API is not supported by this renderer.");
|
|
12888
|
+
var o = 0, i = [];
|
|
12889
|
+
e = [Ef(e), 0];
|
|
12890
|
+
for (var s = 0; s < e.length; ) {
|
|
12891
|
+
var u = e[s++], f = u.tag, p = e[s++], g = n[p];
|
|
12892
|
+
if ((f !== 5 && f !== 26 && f !== 27 || !Kr(u)) && (If(u, g) && (i.push(Sc(g)), p++, p > o && (o = p)), p < n.length)) for (u = u.child; u !== null; ) e.push(u, p), u = u.sibling;
|
|
12893
|
+
}
|
|
12894
|
+
if (o < n.length) {
|
|
12895
|
+
for (e = []; o < n.length; o++) e.push(Sc(n[o]));
|
|
12896
|
+
return `findAllNodes was able to match part of the selector:
|
|
12897
|
+
` + (i.join(" > ") + `
|
|
12898
|
+
|
|
12899
|
+
No matching component was found for:
|
|
12900
|
+
`) + e.join(" > ");
|
|
12901
|
+
}
|
|
12902
|
+
return null;
|
|
12903
|
+
}, le.getPublicRootInstance = function(e) {
|
|
12904
|
+
if (e = e.current, !e.child) return null;
|
|
12905
|
+
switch (e.child.tag) {
|
|
12906
|
+
case 27:
|
|
12907
|
+
case 5:
|
|
12908
|
+
return ot(e.child.stateNode);
|
|
12909
|
+
default:
|
|
12910
|
+
return e.child.stateNode;
|
|
12911
|
+
}
|
|
12912
|
+
}, le.injectIntoDevTools = function() {
|
|
12913
|
+
var e = { bundleType: 1, version: Jt, rendererPackageName: Zt, currentDispatcherRef: x, reconcilerVersion: "19.2.0" };
|
|
12914
|
+
return jo !== null && (e.rendererConfig = jo), e.overrideHookState = gb, e.overrideHookStateDeletePath = yb, e.overrideHookStateRenamePath = bb, e.overrideProps = vb, e.overridePropsDeletePath = Sb, e.overridePropsRenamePath = kb, e.scheduleUpdate = wb, e.scheduleRetry = Pb, e.setErrorHandler = xb, e.setSuspenseHandler = zb, e.scheduleRefresh = hu, e.scheduleRoot = Fl, e.setRefreshHandler = Ir, e.getCurrentFiber = Ic, Ep(e);
|
|
12915
|
+
}, le.isAlreadyRendering = Ns, le.observeVisibleRects = function(e, n, o, i) {
|
|
12916
|
+
function s() {
|
|
12917
|
+
var S = kc(e, n);
|
|
12918
|
+
u.forEach(function(T) {
|
|
12919
|
+
0 > S.indexOf(T) && g(T);
|
|
12920
|
+
}), S.forEach(function(T) {
|
|
12921
|
+
0 > u.indexOf(T) && p(T);
|
|
12922
|
+
});
|
|
12923
|
+
}
|
|
12924
|
+
if (!xr) throw Error("Test selector API is not supported by this renderer.");
|
|
12925
|
+
var u = kc(e, n);
|
|
12926
|
+
o = zr(u, o, i);
|
|
12927
|
+
var f = o.disconnect, p = o.observe, g = o.unobserve;
|
|
12928
|
+
return bm.push(s), { disconnect: function() {
|
|
12929
|
+
var S = bm.indexOf(s);
|
|
12930
|
+
0 <= S && bm.splice(S, 1), f();
|
|
12931
|
+
} };
|
|
12932
|
+
}, le.shouldError = function(e) {
|
|
12933
|
+
return pu(e);
|
|
12934
|
+
}, le.shouldSuspend = function(e) {
|
|
12935
|
+
return fu(e);
|
|
12936
|
+
}, le.startHostTransition = function(e, n, o, i) {
|
|
12937
|
+
if (e.tag !== 5) throw Error("Expected the form instance to be a HostComponent. This is a bug in React.");
|
|
12938
|
+
var s = uf(e).queue;
|
|
12939
|
+
Hp(e), nt(e, s, n, Xt, o === null ? Em : function() {
|
|
12940
|
+
x.T === null && console.error("requestFormReset was called outside a transition or action. To fix, move to an action, or wrap with startTransition.");
|
|
12941
|
+
var u = uf(e);
|
|
12942
|
+
return u.next === null && (u = e.alternate.memoizedState), qi(e, u.next.queue, {}, Nt(e)), o(i);
|
|
12943
|
+
});
|
|
12944
|
+
}, le.updateContainer = function(e, n, o, i) {
|
|
12945
|
+
var s = n.current, u = Nt(s);
|
|
12946
|
+
return As(s, u, e, n, o, i), u;
|
|
12947
|
+
}, le.updateContainerSync = Wh, le;
|
|
12948
|
+
}, Tt.exports.default = Tt.exports, Object.defineProperty(Tt.exports, "__esModule", { value: true }));
|
|
12949
|
+
})(Mg)), Mg.exports;
|
|
12950
|
+
}
|
|
12951
|
+
var Eb;
|
|
12952
|
+
function n0() {
|
|
12953
|
+
return Eb || (Eb = 1, process.env.NODE_ENV === "production" ? Rm.exports = Kb() : Rm.exports = e0()), Rm.exports;
|
|
12954
|
+
}
|
|
12955
|
+
var t0 = n0();
|
|
12956
|
+
const r0 = Xb(t0);
|
|
12957
|
+
|
|
12958
|
+
const DEFAULT_POINTER_ID = 0;
|
|
12959
|
+
const XR_POINTER_ID_START = 1e3;
|
|
12960
|
+
function getPointerState(internal, pointerId) {
|
|
12961
|
+
let state = internal.pointerMap.get(pointerId);
|
|
12962
|
+
if (!state) {
|
|
12963
|
+
state = {
|
|
12964
|
+
hovered: /* @__PURE__ */ new Map(),
|
|
12965
|
+
captured: /* @__PURE__ */ new Map(),
|
|
12966
|
+
initialClick: [0, 0],
|
|
12967
|
+
initialHits: []
|
|
12968
|
+
};
|
|
12969
|
+
internal.pointerMap.set(pointerId, state);
|
|
12970
|
+
}
|
|
12971
|
+
return state;
|
|
12972
|
+
}
|
|
12973
|
+
function getPointerId(event) {
|
|
12974
|
+
return "pointerId" in event ? event.pointerId : DEFAULT_POINTER_ID;
|
|
12975
|
+
}
|
|
12976
|
+
function makeId(event) {
|
|
12977
|
+
return (event.eventObject || event.object).uuid + "/" + event.index + event.instanceId;
|
|
12978
|
+
}
|
|
12979
|
+
function releaseInternalPointerCapture(internal, obj, pointerId) {
|
|
12980
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
12981
|
+
if (!pointerState) return;
|
|
12982
|
+
const captureData = pointerState.captured.get(obj);
|
|
12983
|
+
if (captureData) {
|
|
12984
|
+
pointerState.captured.delete(obj);
|
|
12985
|
+
try {
|
|
12986
|
+
captureData.target.releasePointerCapture?.(pointerId);
|
|
12987
|
+
} catch {
|
|
12988
|
+
}
|
|
12989
|
+
}
|
|
12990
|
+
}
|
|
12991
|
+
function swapInteractivity(store, object, newObject) {
|
|
12992
|
+
const { internal } = store.getState();
|
|
12993
|
+
for (let i = 0; i < internal.interaction.length; i++) {
|
|
12994
|
+
if (internal.interaction[i] === object) internal.interaction[i] = newObject;
|
|
12995
|
+
}
|
|
12996
|
+
for (const pointerState of internal.pointerMap.values()) {
|
|
12997
|
+
for (let i = 0; i < pointerState.initialHits.length; i++) {
|
|
12998
|
+
if (pointerState.initialHits[i] === object) pointerState.initialHits[i] = newObject;
|
|
12999
|
+
}
|
|
13000
|
+
pointerState.hovered.forEach((value, key) => {
|
|
13001
|
+
if (value.eventObject === object || value.object === object) {
|
|
13002
|
+
pointerState.hovered.delete(key);
|
|
13003
|
+
const next = {
|
|
13004
|
+
...value,
|
|
13005
|
+
eventObject: value.eventObject === object ? newObject : value.eventObject,
|
|
13006
|
+
object: value.object === object ? newObject : value.object
|
|
13007
|
+
};
|
|
13008
|
+
pointerState.hovered.set(makeId(next), next);
|
|
13009
|
+
}
|
|
13010
|
+
});
|
|
13011
|
+
const captureData = pointerState.captured.get(object);
|
|
13012
|
+
if (captureData) {
|
|
13013
|
+
pointerState.captured.delete(object);
|
|
13014
|
+
pointerState.captured.set(newObject, {
|
|
13015
|
+
...captureData,
|
|
13016
|
+
intersection: {
|
|
13017
|
+
...captureData.intersection,
|
|
13018
|
+
object: captureData.intersection.object === object ? newObject : captureData.intersection.object,
|
|
13019
|
+
eventObject: captureData.intersection.eventObject === object ? newObject : captureData.intersection.eventObject
|
|
13376
13020
|
}
|
|
13377
|
-
}
|
|
13378
|
-
|
|
13379
|
-
|
|
13380
|
-
|
|
13381
|
-
|
|
13382
|
-
|
|
13383
|
-
|
|
13384
|
-
|
|
13385
|
-
|
|
13386
|
-
|
|
13387
|
-
|
|
13388
|
-
|
|
13389
|
-
|
|
13390
|
-
return z = "useActionState", D(), N(), $t(e);
|
|
13391
|
-
}, useOptimistic: function(e, n) {
|
|
13392
|
-
return z = "useOptimistic", D(), N(), of(e, n);
|
|
13393
|
-
}, useMemoCache: function(e) {
|
|
13394
|
-
return D(), Oa(e);
|
|
13395
|
-
}, useHostTransitionStatus: ia, useCacheRefresh: function() {
|
|
13396
|
-
return z = "useCacheRefresh", N(), xe().memoizedState;
|
|
13397
|
-
}, useEffectEvent: function(e) {
|
|
13398
|
-
return z = "useEffectEvent", D(), N(), oa(e);
|
|
13399
|
-
} };
|
|
13400
|
-
var Fy = {}, Hy = /* @__PURE__ */ new Set(), Ay = /* @__PURE__ */ new Set(), jy = /* @__PURE__ */ new Set(), Dy = /* @__PURE__ */ new Set(), Wy = /* @__PURE__ */ new Set(), Uy = /* @__PURE__ */ new Set(), By = /* @__PURE__ */ new Set(), Oy = /* @__PURE__ */ new Set(), My = /* @__PURE__ */ new Set(), Qy = /* @__PURE__ */ new Set();
|
|
13401
|
-
Object.freeze(Fy);
|
|
13402
|
-
var zg = { enqueueSetState: function(e, n, o) {
|
|
13403
|
-
e = e._reactInternals;
|
|
13404
|
-
var i = Nt(e), s = zo(i);
|
|
13405
|
-
s.payload = n, o != null && (df(o), s.callback = o), n = Mt(e, s, i), n !== null && (ur(i, "this.setState()", e), We(n, e, i), Bi(n, e, i));
|
|
13406
|
-
}, enqueueReplaceState: function(e, n, o) {
|
|
13407
|
-
e = e._reactInternals;
|
|
13408
|
-
var i = Nt(e), s = zo(i);
|
|
13409
|
-
s.tag = Cy, s.payload = n, o != null && (df(o), s.callback = o), n = Mt(e, s, i), n !== null && (ur(i, "this.replaceState()", e), We(n, e, i), Bi(n, e, i));
|
|
13410
|
-
}, enqueueForceUpdate: function(e, n) {
|
|
13411
|
-
e = e._reactInternals;
|
|
13412
|
-
var o = Nt(e), i = zo(o);
|
|
13413
|
-
i.tag = Ty, n != null && (df(n), i.callback = n), n = Mt(e, i, o), n !== null && (ur(o, "this.forceUpdate()", e), We(n, e, o), Bi(n, e, o));
|
|
13414
|
-
} }, bd = null, Cg = null, Tg = Error("This is not a real error. It's an implementation detail of React's selective hydration feature. If this leaks into userspace, it's a bug in React. Please file an issue."), Cn = false, $y = {}, Vy = {}, qy = {}, Gy = {}, vd = false, Jy = {}, fm = {}, _g = { dehydrated: null, treeContext: null, retryLane: 0, hydrationErrors: null }, Zy = false, Yy = null;
|
|
13415
|
-
Yy = /* @__PURE__ */ new Set();
|
|
13416
|
-
var Si = false, Tn = false, Rg = false, Xy = typeof WeakSet == "function" ? WeakSet : Set, Gn = null, Sd = null, kd = null, _n = null, nr = false, Vo = null, Wn = false, wd = 8192, Vb = { getCacheForType: function(e) {
|
|
13417
|
-
var n = Ee(un), o = n.data.get(e);
|
|
13418
|
-
return o === void 0 && (o = e(), n.data.set(e, o)), o;
|
|
13419
|
-
}, cacheSignal: function() {
|
|
13420
|
-
return Ee(un).controller.signal;
|
|
13421
|
-
}, getOwner: function() {
|
|
13422
|
-
return di;
|
|
13423
|
-
} }, pm = 0, hm = 1, mm = 2, gm = 3, ym = 4;
|
|
13424
|
-
if (typeof Symbol == "function" && Symbol.for) {
|
|
13425
|
-
var bp = Symbol.for;
|
|
13426
|
-
pm = bp("selector.component"), hm = bp("selector.has_pseudo_class"), mm = bp("selector.role"), gm = bp("selector.test_id"), ym = bp("selector.text");
|
|
13021
|
+
});
|
|
13022
|
+
}
|
|
13023
|
+
}
|
|
13024
|
+
unregisterVisibility(store, object);
|
|
13025
|
+
}
|
|
13026
|
+
function removeInteractivity(store, object) {
|
|
13027
|
+
const { internal } = store.getState();
|
|
13028
|
+
internal.interaction = internal.interaction.filter((o) => o !== object);
|
|
13029
|
+
for (const [pointerId, pointerState] of internal.pointerMap) {
|
|
13030
|
+
pointerState.initialHits = pointerState.initialHits.filter((o) => o !== object);
|
|
13031
|
+
pointerState.hovered.forEach((value, key) => {
|
|
13032
|
+
if (value.eventObject === object || value.object === object) {
|
|
13033
|
+
pointerState.hovered.delete(key);
|
|
13427
13034
|
}
|
|
13428
|
-
|
|
13429
|
-
|
|
13430
|
-
|
|
13431
|
-
|
|
13432
|
-
|
|
13035
|
+
});
|
|
13036
|
+
if (pointerState.captured.has(object)) {
|
|
13037
|
+
releaseInternalPointerCapture(internal, object, pointerId);
|
|
13038
|
+
}
|
|
13039
|
+
}
|
|
13040
|
+
unregisterVisibility(store, object);
|
|
13041
|
+
}
|
|
13042
|
+
function createEvents(store) {
|
|
13043
|
+
function calculateDistance(event, pointerId) {
|
|
13044
|
+
const { internal } = store.getState();
|
|
13045
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
13046
|
+
if (!pointerState) return 0;
|
|
13047
|
+
const [initialX, initialY] = pointerState.initialClick;
|
|
13048
|
+
const dx = event.offsetX - initialX;
|
|
13049
|
+
const dy = event.offsetY - initialY;
|
|
13050
|
+
return Math.round(Math.sqrt(dx * dx + dy * dy));
|
|
13051
|
+
}
|
|
13052
|
+
function filterPointerEvents(objects) {
|
|
13053
|
+
return objects.filter(
|
|
13054
|
+
(obj) => ["Move", "Over", "Enter", "Out", "Leave"].some(
|
|
13055
|
+
(name) => obj.__r3f?.handlers["onPointer" + name]
|
|
13056
|
+
) || ["OverEnter", "OverLeave", "Over"].some(
|
|
13057
|
+
(name) => obj.__r3f?.handlers["onDrag" + name]
|
|
13058
|
+
) || obj.__r3f?.handlers.onDrop
|
|
13059
|
+
);
|
|
13060
|
+
}
|
|
13061
|
+
function intersect(event, filter) {
|
|
13062
|
+
const state = store.getState();
|
|
13063
|
+
const duplicates = /* @__PURE__ */ new Set();
|
|
13064
|
+
const intersections = [];
|
|
13065
|
+
const eventsObjects = filter ? filter(state.internal.interaction) : state.internal.interaction;
|
|
13066
|
+
for (let i = 0; i < eventsObjects.length; i++) {
|
|
13067
|
+
const state2 = getRootState(eventsObjects[i]);
|
|
13068
|
+
if (state2) {
|
|
13069
|
+
state2.raycaster.camera = void 0;
|
|
13433
13070
|
}
|
|
13434
|
-
|
|
13435
|
-
|
|
13436
|
-
|
|
13437
|
-
|
|
13438
|
-
|
|
13439
|
-
|
|
13440
|
-
|
|
13441
|
-
|
|
13442
|
-
|
|
13443
|
-
|
|
13444
|
-
|
|
13445
|
-
|
|
13446
|
-
|
|
13447
|
-
|
|
13448
|
-
|
|
13449
|
-
|
|
13450
|
-
|
|
13451
|
-
|
|
13452
|
-
|
|
13453
|
-
|
|
13454
|
-
|
|
13455
|
-
|
|
13456
|
-
|
|
13457
|
-
}, le.attemptContinuousHydration = function(e) {
|
|
13458
|
-
if (e.tag === 13 || e.tag === 31) {
|
|
13459
|
-
var n = On(e, 67108864);
|
|
13460
|
-
n !== null && We(n, e, 67108864), rl(e, 67108864);
|
|
13071
|
+
}
|
|
13072
|
+
if (!state.previousRoot) {
|
|
13073
|
+
state.events.compute?.(event, state);
|
|
13074
|
+
}
|
|
13075
|
+
function handleRaycast(obj) {
|
|
13076
|
+
const state2 = getRootState(obj);
|
|
13077
|
+
if (!state2 || !state2.events.enabled || state2.raycaster.camera === null) return [];
|
|
13078
|
+
if (state2.raycaster.camera === void 0) {
|
|
13079
|
+
state2.events.compute?.(event, state2, state2.previousRoot?.getState());
|
|
13080
|
+
if (state2.raycaster.camera === void 0) state2.raycaster.camera = null;
|
|
13081
|
+
}
|
|
13082
|
+
if (!state2.raycaster.camera) return [];
|
|
13083
|
+
obj.updateWorldMatrix(true, true);
|
|
13084
|
+
return state2.raycaster.intersectObject(obj, true);
|
|
13085
|
+
}
|
|
13086
|
+
let hits = eventsObjects.flatMap(handleRaycast).sort((a, b) => {
|
|
13087
|
+
const aInteractivePriority = a.object.userData?.interactivePriority;
|
|
13088
|
+
const bInteractivePriority = b.object.userData?.interactivePriority;
|
|
13089
|
+
if (aInteractivePriority !== void 0 || bInteractivePriority !== void 0) {
|
|
13090
|
+
if (aInteractivePriority !== void 0 && bInteractivePriority === void 0) return -1;
|
|
13091
|
+
if (bInteractivePriority !== void 0 && aInteractivePriority === void 0) return 1;
|
|
13092
|
+
if (aInteractivePriority !== bInteractivePriority) {
|
|
13093
|
+
return (bInteractivePriority ?? 0) - (aInteractivePriority ?? 0);
|
|
13461
13094
|
}
|
|
13462
|
-
}
|
|
13463
|
-
|
|
13464
|
-
|
|
13465
|
-
|
|
13466
|
-
|
|
13467
|
-
|
|
13095
|
+
}
|
|
13096
|
+
const aState = getRootState(a.object);
|
|
13097
|
+
const bState = getRootState(b.object);
|
|
13098
|
+
const aPriority = aState?.events?.priority ?? 1;
|
|
13099
|
+
const bPriority = bState?.events?.priority ?? 1;
|
|
13100
|
+
return bPriority - aPriority || a.distance - b.distance;
|
|
13101
|
+
}).filter((item) => {
|
|
13102
|
+
const id = makeId(item);
|
|
13103
|
+
if (duplicates.has(id)) return false;
|
|
13104
|
+
duplicates.add(id);
|
|
13105
|
+
return true;
|
|
13106
|
+
});
|
|
13107
|
+
if (state.events.filter) hits = state.events.filter(hits, state);
|
|
13108
|
+
for (const hit of hits) {
|
|
13109
|
+
let eventObject = hit.object;
|
|
13110
|
+
while (eventObject) {
|
|
13111
|
+
if (eventObject.__r3f?.eventCount) {
|
|
13112
|
+
intersections.push({ ...hit, eventObject });
|
|
13468
13113
|
}
|
|
13469
|
-
|
|
13470
|
-
|
|
13471
|
-
|
|
13472
|
-
|
|
13473
|
-
|
|
13474
|
-
|
|
13475
|
-
|
|
13476
|
-
|
|
13477
|
-
|
|
13114
|
+
eventObject = eventObject.parent;
|
|
13115
|
+
}
|
|
13116
|
+
}
|
|
13117
|
+
if ("pointerId" in event) {
|
|
13118
|
+
const pointerId = event.pointerId;
|
|
13119
|
+
const pointerState = state.internal.pointerMap.get(pointerId);
|
|
13120
|
+
if (pointerState?.captured.size) {
|
|
13121
|
+
for (const captureData of pointerState.captured.values()) {
|
|
13122
|
+
if (!duplicates.has(makeId(captureData.intersection))) intersections.push(captureData.intersection);
|
|
13123
|
+
}
|
|
13124
|
+
}
|
|
13125
|
+
}
|
|
13126
|
+
return intersections;
|
|
13127
|
+
}
|
|
13128
|
+
function handleIntersects(intersections, event, delta, callback) {
|
|
13129
|
+
if (intersections.length) {
|
|
13130
|
+
const localState = { stopped: false };
|
|
13131
|
+
for (const hit of intersections) {
|
|
13132
|
+
const state = getRootState(hit.object);
|
|
13133
|
+
if (state) {
|
|
13134
|
+
const { raycaster, pointer, camera, internal } = state;
|
|
13135
|
+
const unprojectedPoint = new Vector3(pointer.x, pointer.y, 0).unproject(camera);
|
|
13136
|
+
const hasPointerCapture = (id) => {
|
|
13137
|
+
const pointerState = internal.pointerMap.get(id);
|
|
13138
|
+
return pointerState?.captured.has(hit.eventObject) ?? false;
|
|
13139
|
+
};
|
|
13140
|
+
const setPointerCapture = (id) => {
|
|
13141
|
+
const captureData = { intersection: hit, target: event.target };
|
|
13142
|
+
const pointerState = getPointerState(internal, id);
|
|
13143
|
+
pointerState.captured.set(hit.eventObject, captureData);
|
|
13144
|
+
event.target.setPointerCapture(id);
|
|
13145
|
+
};
|
|
13146
|
+
const releasePointerCapture = (id) => {
|
|
13147
|
+
releaseInternalPointerCapture(internal, hit.eventObject, id);
|
|
13148
|
+
};
|
|
13149
|
+
const extractEventProps = {};
|
|
13150
|
+
for (const prop in event) {
|
|
13151
|
+
const property = event[prop];
|
|
13152
|
+
if (typeof property !== "function") extractEventProps[prop] = property;
|
|
13153
|
+
}
|
|
13154
|
+
const eventPointerId = "pointerId" in event ? event.pointerId : void 0;
|
|
13155
|
+
const raycastEvent = {
|
|
13156
|
+
...hit,
|
|
13157
|
+
...extractEventProps,
|
|
13158
|
+
pointer,
|
|
13159
|
+
intersections,
|
|
13160
|
+
stopped: localState.stopped,
|
|
13161
|
+
delta,
|
|
13162
|
+
unprojectedPoint,
|
|
13163
|
+
ray: raycaster.ray,
|
|
13164
|
+
camera,
|
|
13165
|
+
pointerId: eventPointerId,
|
|
13166
|
+
// Hijack stopPropagation, which just sets a flag
|
|
13167
|
+
stopPropagation() {
|
|
13168
|
+
const pointerState = eventPointerId !== void 0 ? internal.pointerMap.get(eventPointerId) : void 0;
|
|
13169
|
+
if (
|
|
13170
|
+
// ...if this pointer hasn't been captured
|
|
13171
|
+
!pointerState?.captured.size || // ... or if the hit object is capturing the pointer
|
|
13172
|
+
pointerState.captured.has(hit.eventObject)
|
|
13173
|
+
) {
|
|
13174
|
+
raycastEvent.stopped = localState.stopped = true;
|
|
13175
|
+
if (pointerState?.hovered.size && Array.from(pointerState.hovered.values()).find((i) => i.eventObject === hit.eventObject)) {
|
|
13176
|
+
const higher = intersections.slice(0, intersections.indexOf(hit));
|
|
13177
|
+
cancelPointer([...higher, hit], eventPointerId);
|
|
13478
13178
|
}
|
|
13479
|
-
Kn(e), (ye & (Zn | uo)) === Jn && (Pp = me() + Fg, Wa(0));
|
|
13480
13179
|
}
|
|
13481
|
-
}
|
|
13482
|
-
|
|
13483
|
-
|
|
13484
|
-
|
|
13485
|
-
|
|
13180
|
+
},
|
|
13181
|
+
// there should be a distinction between target and currentTarget
|
|
13182
|
+
target: { hasPointerCapture, setPointerCapture, releasePointerCapture },
|
|
13183
|
+
currentTarget: { hasPointerCapture, setPointerCapture, releasePointerCapture },
|
|
13184
|
+
nativeEvent: event
|
|
13185
|
+
};
|
|
13186
|
+
callback(raycastEvent);
|
|
13187
|
+
if (localState.stopped === true) break;
|
|
13486
13188
|
}
|
|
13487
|
-
}
|
|
13488
|
-
|
|
13489
|
-
|
|
13490
|
-
|
|
13491
|
-
|
|
13492
|
-
|
|
13493
|
-
|
|
13494
|
-
|
|
13495
|
-
|
|
13496
|
-
|
|
13497
|
-
|
|
13498
|
-
|
|
13499
|
-
|
|
13500
|
-
|
|
13501
|
-
|
|
13502
|
-
|
|
13503
|
-
|
|
13189
|
+
}
|
|
13190
|
+
}
|
|
13191
|
+
return intersections;
|
|
13192
|
+
}
|
|
13193
|
+
function cancelPointer(intersections, pointerId) {
|
|
13194
|
+
const { internal } = store.getState();
|
|
13195
|
+
const pid = pointerId ?? DEFAULT_POINTER_ID;
|
|
13196
|
+
const pointerState = internal.pointerMap.get(pid);
|
|
13197
|
+
if (!pointerState) return;
|
|
13198
|
+
for (const [hoveredId, hoveredObj] of pointerState.hovered) {
|
|
13199
|
+
if (!intersections.length || !intersections.find(
|
|
13200
|
+
(hit) => hit.object === hoveredObj.object && hit.index === hoveredObj.index && hit.instanceId === hoveredObj.instanceId
|
|
13201
|
+
)) {
|
|
13202
|
+
const eventObject = hoveredObj.eventObject;
|
|
13203
|
+
const instance = eventObject.__r3f;
|
|
13204
|
+
pointerState.hovered.delete(hoveredId);
|
|
13205
|
+
if (instance?.eventCount) {
|
|
13206
|
+
const handlers = instance.handlers;
|
|
13207
|
+
const data = { ...hoveredObj, intersections };
|
|
13208
|
+
handlers.onPointerOut?.(data);
|
|
13209
|
+
handlers.onPointerLeave?.(data);
|
|
13210
|
+
handlers.onDragOverLeave?.(data);
|
|
13504
13211
|
}
|
|
13505
|
-
|
|
13506
|
-
|
|
13507
|
-
|
|
13508
|
-
|
|
13509
|
-
|
|
13510
|
-
|
|
13511
|
-
|
|
13512
|
-
|
|
13513
|
-
|
|
13514
|
-
|
|
13515
|
-
|
|
13516
|
-
|
|
13517
|
-
|
|
13518
|
-
|
|
13519
|
-
|
|
13520
|
-
|
|
13521
|
-
|
|
13522
|
-
|
|
13523
|
-
|
|
13524
|
-
|
|
13525
|
-
|
|
13526
|
-
|
|
13527
|
-
|
|
13528
|
-
|
|
13529
|
-
|
|
13530
|
-
|
|
13531
|
-
|
|
13532
|
-
|
|
13533
|
-
|
|
13534
|
-
|
|
13535
|
-
|
|
13536
|
-
|
|
13537
|
-
|
|
13538
|
-
an(o), x.T = n;
|
|
13212
|
+
}
|
|
13213
|
+
}
|
|
13214
|
+
}
|
|
13215
|
+
function pointerMissed(event, objects) {
|
|
13216
|
+
for (let i = 0; i < objects.length; i++) {
|
|
13217
|
+
const instance = objects[i].__r3f;
|
|
13218
|
+
instance?.handlers.onPointerMissed?.(event);
|
|
13219
|
+
}
|
|
13220
|
+
}
|
|
13221
|
+
function dragOverMissed(event, objects) {
|
|
13222
|
+
for (let i = 0; i < objects.length; i++) {
|
|
13223
|
+
const instance = objects[i].__r3f;
|
|
13224
|
+
instance?.handlers.onDragOverMissed?.(event);
|
|
13225
|
+
}
|
|
13226
|
+
}
|
|
13227
|
+
function dropMissed(event, objects) {
|
|
13228
|
+
for (let i = 0; i < objects.length; i++) {
|
|
13229
|
+
const instance = objects[i].__r3f;
|
|
13230
|
+
instance?.handlers.onDropMissed?.(event);
|
|
13231
|
+
}
|
|
13232
|
+
}
|
|
13233
|
+
function cleanupPointer(pointerId) {
|
|
13234
|
+
const { internal } = store.getState();
|
|
13235
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
13236
|
+
if (pointerState) {
|
|
13237
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
13238
|
+
const eventObject = hoveredObj.eventObject;
|
|
13239
|
+
const instance = eventObject.__r3f;
|
|
13240
|
+
if (instance?.eventCount) {
|
|
13241
|
+
const handlers = instance.handlers;
|
|
13242
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
13243
|
+
handlers.onPointerOut?.(data);
|
|
13244
|
+
handlers.onPointerLeave?.(data);
|
|
13539
13245
|
}
|
|
13540
|
-
}
|
|
13541
|
-
|
|
13542
|
-
|
|
13543
|
-
|
|
13544
|
-
|
|
13545
|
-
|
|
13246
|
+
}
|
|
13247
|
+
internal.pointerMap.delete(pointerId);
|
|
13248
|
+
}
|
|
13249
|
+
internal.pointerDirty.delete(pointerId);
|
|
13250
|
+
}
|
|
13251
|
+
function processDeferredPointer(event, pointerId) {
|
|
13252
|
+
const state = store.getState();
|
|
13253
|
+
const { internal } = state;
|
|
13254
|
+
if (!state.events.enabled) return;
|
|
13255
|
+
const filter = filterPointerEvents;
|
|
13256
|
+
const hits = intersect(event, filter);
|
|
13257
|
+
cancelPointer(hits, pointerId);
|
|
13258
|
+
function onIntersect(data) {
|
|
13259
|
+
const eventObject = data.eventObject;
|
|
13260
|
+
const instance = eventObject.__r3f;
|
|
13261
|
+
if (!instance?.eventCount) return;
|
|
13262
|
+
const handlers = instance.handlers;
|
|
13263
|
+
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
13264
|
+
const id = makeId(data);
|
|
13265
|
+
const pointerState = getPointerState(internal, pointerId);
|
|
13266
|
+
const hoveredItem = pointerState.hovered.get(id);
|
|
13267
|
+
if (!hoveredItem) {
|
|
13268
|
+
pointerState.hovered.set(id, data);
|
|
13269
|
+
handlers.onPointerOver?.(data);
|
|
13270
|
+
handlers.onPointerEnter?.(data);
|
|
13271
|
+
} else if (hoveredItem.stopped) {
|
|
13272
|
+
data.stopPropagation();
|
|
13273
|
+
}
|
|
13274
|
+
}
|
|
13275
|
+
handlers.onPointerMove?.(data);
|
|
13276
|
+
}
|
|
13277
|
+
handleIntersects(hits, event, 0, onIntersect);
|
|
13278
|
+
}
|
|
13279
|
+
function handlePointer(name) {
|
|
13280
|
+
switch (name) {
|
|
13281
|
+
case "onPointerLeave":
|
|
13282
|
+
case "onDragLeave":
|
|
13283
|
+
return () => cancelPointer([]);
|
|
13284
|
+
// Global cancel of these events
|
|
13285
|
+
case "onPointerCancel":
|
|
13286
|
+
return (event) => {
|
|
13287
|
+
const pointerId = getPointerId(event);
|
|
13288
|
+
cleanupPointer(pointerId);
|
|
13289
|
+
};
|
|
13290
|
+
case "onLostPointerCapture":
|
|
13291
|
+
return (event) => {
|
|
13292
|
+
const { internal } = store.getState();
|
|
13293
|
+
const pointerId = getPointerId(event);
|
|
13294
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
13295
|
+
if (pointerState?.captured.size) {
|
|
13296
|
+
requestAnimationFrame(() => {
|
|
13297
|
+
const pointerState2 = internal.pointerMap.get(pointerId);
|
|
13298
|
+
if (pointerState2?.captured.size) {
|
|
13299
|
+
pointerState2.captured.clear();
|
|
13300
|
+
}
|
|
13301
|
+
cancelPointer([], pointerId);
|
|
13302
|
+
});
|
|
13303
|
+
}
|
|
13304
|
+
};
|
|
13305
|
+
}
|
|
13306
|
+
return function handleEvent(event) {
|
|
13307
|
+
const state = store.getState();
|
|
13308
|
+
const { onPointerMissed, onDragOverMissed, onDropMissed, internal, events } = state;
|
|
13309
|
+
const pointerId = getPointerId(event);
|
|
13310
|
+
internal.lastEvent.current = event;
|
|
13311
|
+
if (!events.enabled) return;
|
|
13312
|
+
const isPointerMove = name === "onPointerMove";
|
|
13313
|
+
const isDragOver = name === "onDragOver";
|
|
13314
|
+
const isDrop = name === "onDrop";
|
|
13315
|
+
const isClickEvent = name === "onClick" || name === "onContextMenu" || name === "onDoubleClick";
|
|
13316
|
+
const isPointerDown = name === "onPointerDown";
|
|
13317
|
+
const isPointerUp = name === "onPointerUp";
|
|
13318
|
+
const isWheel = name === "onWheel";
|
|
13319
|
+
const canDeferRaycasts = events.frameTimedRaycasts && state.frameloop === "always";
|
|
13320
|
+
if (isPointerMove && canDeferRaycasts) {
|
|
13321
|
+
events.compute?.(event, state);
|
|
13322
|
+
internal.pointerDirty.set(pointerId, event);
|
|
13323
|
+
return;
|
|
13324
|
+
}
|
|
13325
|
+
if (isWheel && canDeferRaycasts && !events.alwaysFireOnScroll) {
|
|
13326
|
+
events.compute?.(event, state);
|
|
13327
|
+
internal.pointerDirty.set(pointerId, event);
|
|
13328
|
+
return;
|
|
13329
|
+
}
|
|
13330
|
+
if ((isClickEvent || isPointerDown || isPointerUp) && internal.pointerDirty.has(pointerId)) {
|
|
13331
|
+
const deferredEvent = internal.pointerDirty.get(pointerId);
|
|
13332
|
+
internal.pointerDirty.delete(pointerId);
|
|
13333
|
+
processDeferredPointer(deferredEvent, pointerId);
|
|
13334
|
+
}
|
|
13335
|
+
const filter = isPointerMove || isDragOver || isDrop ? filterPointerEvents : void 0;
|
|
13336
|
+
const hits = intersect(event, filter);
|
|
13337
|
+
const delta = isClickEvent ? calculateDistance(event, pointerId) : 0;
|
|
13338
|
+
if (isPointerDown) {
|
|
13339
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
13340
|
+
pointerState2.initialClick = [event.offsetX, event.offsetY];
|
|
13341
|
+
pointerState2.initialHits = hits.map((hit) => hit.eventObject);
|
|
13342
|
+
}
|
|
13343
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
13344
|
+
const initialHits = pointerState?.initialHits ?? [];
|
|
13345
|
+
if (isClickEvent && !hits.length) {
|
|
13346
|
+
if (delta <= 2) {
|
|
13347
|
+
pointerMissed(event, internal.interaction);
|
|
13348
|
+
if (onPointerMissed) onPointerMissed(event);
|
|
13546
13349
|
}
|
|
13547
|
-
}
|
|
13548
|
-
|
|
13549
|
-
|
|
13550
|
-
|
|
13551
|
-
|
|
13552
|
-
|
|
13553
|
-
|
|
13554
|
-
|
|
13555
|
-
|
|
13556
|
-
|
|
13557
|
-
|
|
13558
|
-
|
|
13559
|
-
|
|
13560
|
-
|
|
13561
|
-
|
|
13562
|
-
|
|
13563
|
-
|
|
13564
|
-
|
|
13565
|
-
|
|
13350
|
+
}
|
|
13351
|
+
if (isDragOver && !hits.length) {
|
|
13352
|
+
dragOverMissed(event, internal.interaction);
|
|
13353
|
+
if (onDragOverMissed) onDragOverMissed(event);
|
|
13354
|
+
}
|
|
13355
|
+
if (isDrop && !hits.length) {
|
|
13356
|
+
dropMissed(event, internal.interaction);
|
|
13357
|
+
if (onDropMissed) onDropMissed(event);
|
|
13358
|
+
}
|
|
13359
|
+
if (isPointerMove || isDragOver) {
|
|
13360
|
+
cancelPointer(hits, pointerId);
|
|
13361
|
+
}
|
|
13362
|
+
function onIntersect(data) {
|
|
13363
|
+
const eventObject = data.eventObject;
|
|
13364
|
+
const instance = eventObject.__r3f;
|
|
13365
|
+
if (!instance?.eventCount) return;
|
|
13366
|
+
const handlers = instance.handlers;
|
|
13367
|
+
if (isPointerMove) {
|
|
13368
|
+
if (handlers.onPointerOver || handlers.onPointerEnter || handlers.onPointerOut || handlers.onPointerLeave) {
|
|
13369
|
+
const id = makeId(data);
|
|
13370
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
13371
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
13372
|
+
if (!hoveredItem) {
|
|
13373
|
+
pointerState2.hovered.set(id, data);
|
|
13374
|
+
handlers.onPointerOver?.(data);
|
|
13375
|
+
handlers.onPointerEnter?.(data);
|
|
13376
|
+
} else if (hoveredItem.stopped) {
|
|
13377
|
+
data.stopPropagation();
|
|
13566
13378
|
}
|
|
13567
13379
|
}
|
|
13568
|
-
|
|
13569
|
-
|
|
13570
|
-
|
|
13571
|
-
|
|
13572
|
-
|
|
13573
|
-
|
|
13574
|
-
|
|
13575
|
-
|
|
13576
|
-
|
|
13577
|
-
|
|
13578
|
-
|
|
13579
|
-
|
|
13580
|
-
if (
|
|
13581
|
-
|
|
13582
|
-
|
|
13583
|
-
|
|
13584
|
-
|
|
13585
|
-
|
|
13586
|
-
|
|
13587
|
-
|
|
13588
|
-
|
|
13589
|
-
|
|
13590
|
-
|
|
13591
|
-
|
|
13592
|
-
|
|
13593
|
-
|
|
13594
|
-
|
|
13595
|
-
|
|
13596
|
-
|
|
13597
|
-
|
|
13598
|
-
|
|
13599
|
-
var o = n[e++], i = o.tag;
|
|
13600
|
-
if (!Kr(o)) {
|
|
13601
|
-
if ((i === 5 || i === 26 || i === 27) && Ft(o.stateNode)) return true;
|
|
13602
|
-
for (o = o.child; o !== null; ) n.push(o), o = o.sibling;
|
|
13380
|
+
handlers.onPointerMove?.(data);
|
|
13381
|
+
} else if (isDragOver) {
|
|
13382
|
+
const id = makeId(data);
|
|
13383
|
+
const pointerState2 = getPointerState(internal, pointerId);
|
|
13384
|
+
const hoveredItem = pointerState2.hovered.get(id);
|
|
13385
|
+
if (!hoveredItem) {
|
|
13386
|
+
pointerState2.hovered.set(id, data);
|
|
13387
|
+
handlers.onDragOverEnter?.(data);
|
|
13388
|
+
} else if (hoveredItem.stopped) {
|
|
13389
|
+
data.stopPropagation();
|
|
13390
|
+
}
|
|
13391
|
+
handlers.onDragOver?.(data);
|
|
13392
|
+
} else if (isDrop) {
|
|
13393
|
+
handlers.onDrop?.(data);
|
|
13394
|
+
} else {
|
|
13395
|
+
const handler = handlers[name];
|
|
13396
|
+
if (handler) {
|
|
13397
|
+
if (!isClickEvent || initialHits.includes(eventObject)) {
|
|
13398
|
+
pointerMissed(
|
|
13399
|
+
event,
|
|
13400
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
13401
|
+
);
|
|
13402
|
+
handler(data);
|
|
13403
|
+
}
|
|
13404
|
+
} else {
|
|
13405
|
+
if (isClickEvent && initialHits.includes(eventObject)) {
|
|
13406
|
+
pointerMissed(
|
|
13407
|
+
event,
|
|
13408
|
+
internal.interaction.filter((object) => !initialHits.includes(object))
|
|
13409
|
+
);
|
|
13410
|
+
}
|
|
13603
13411
|
}
|
|
13604
13412
|
}
|
|
13605
|
-
|
|
13606
|
-
|
|
13607
|
-
|
|
13608
|
-
|
|
13609
|
-
|
|
13610
|
-
|
|
13611
|
-
|
|
13612
|
-
|
|
13413
|
+
}
|
|
13414
|
+
handleIntersects(hits, event, delta, onIntersect);
|
|
13415
|
+
};
|
|
13416
|
+
}
|
|
13417
|
+
function flushDeferredPointers() {
|
|
13418
|
+
const { internal, events } = store.getState();
|
|
13419
|
+
if (!events.frameTimedRaycasts) return;
|
|
13420
|
+
for (const [pointerId, event] of internal.pointerDirty) {
|
|
13421
|
+
processDeferredPointer(event, pointerId);
|
|
13422
|
+
}
|
|
13423
|
+
internal.pointerDirty.clear();
|
|
13424
|
+
}
|
|
13425
|
+
return { handlePointer, flushDeferredPointers, processDeferredPointer };
|
|
13426
|
+
}
|
|
13427
|
+
const DOM_EVENTS = {
|
|
13428
|
+
onClick: ["click", false],
|
|
13429
|
+
onContextMenu: ["contextmenu", false],
|
|
13430
|
+
onDoubleClick: ["dblclick", false],
|
|
13431
|
+
onDragEnter: ["dragenter", false],
|
|
13432
|
+
onDragLeave: ["dragleave", false],
|
|
13433
|
+
onDragOver: ["dragover", false],
|
|
13434
|
+
onDrop: ["drop", false],
|
|
13435
|
+
onWheel: ["wheel", true],
|
|
13436
|
+
onPointerDown: ["pointerdown", true],
|
|
13437
|
+
onPointerUp: ["pointerup", true],
|
|
13438
|
+
onPointerLeave: ["pointerleave", true],
|
|
13439
|
+
onPointerMove: ["pointermove", true],
|
|
13440
|
+
onPointerCancel: ["pointercancel", true],
|
|
13441
|
+
onLostPointerCapture: ["lostpointercapture", true]
|
|
13442
|
+
};
|
|
13443
|
+
function createPointerEvents(store) {
|
|
13444
|
+
const { handlePointer, flushDeferredPointers, processDeferredPointer } = createEvents(store);
|
|
13445
|
+
let nextXRPointerId = XR_POINTER_ID_START;
|
|
13446
|
+
const xrPointers = /* @__PURE__ */ new Map();
|
|
13447
|
+
return {
|
|
13448
|
+
priority: 1,
|
|
13449
|
+
enabled: true,
|
|
13450
|
+
frameTimedRaycasts: true,
|
|
13451
|
+
alwaysFireOnScroll: true,
|
|
13452
|
+
updateOnFrame: false,
|
|
13453
|
+
compute(event, state) {
|
|
13454
|
+
state.pointer.set(event.offsetX / state.size.width * 2 - 1, -(event.offsetY / state.size.height) * 2 + 1);
|
|
13455
|
+
state.raycaster.setFromCamera(state.pointer, state.camera);
|
|
13456
|
+
},
|
|
13457
|
+
connected: void 0,
|
|
13458
|
+
handlers: Object.keys(DOM_EVENTS).reduce(
|
|
13459
|
+
(acc, key) => ({ ...acc, [key]: handlePointer(key) }),
|
|
13460
|
+
{}
|
|
13461
|
+
),
|
|
13462
|
+
update: (pointerId) => {
|
|
13463
|
+
const { events, internal } = store.getState();
|
|
13464
|
+
if (!events.handlers) return;
|
|
13465
|
+
if (pointerId !== void 0) {
|
|
13466
|
+
const event = internal.pointerDirty.get(pointerId);
|
|
13467
|
+
if (event) {
|
|
13468
|
+
internal.pointerDirty.delete(pointerId);
|
|
13469
|
+
processDeferredPointer(event, pointerId);
|
|
13470
|
+
} else if (internal.lastEvent?.current) {
|
|
13471
|
+
processDeferredPointer(internal.lastEvent.current, pointerId);
|
|
13613
13472
|
}
|
|
13614
|
-
|
|
13615
|
-
|
|
13616
|
-
|
|
13617
|
-
|
|
13618
|
-
|
|
13619
|
-
No matching component was found for:
|
|
13620
|
-
`) + e.join(" > ");
|
|
13473
|
+
} else {
|
|
13474
|
+
flushDeferredPointers();
|
|
13475
|
+
if (internal.lastEvent?.current) {
|
|
13476
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
13621
13477
|
}
|
|
13622
|
-
|
|
13623
|
-
|
|
13624
|
-
|
|
13625
|
-
|
|
13626
|
-
|
|
13627
|
-
|
|
13628
|
-
|
|
13629
|
-
|
|
13630
|
-
|
|
13478
|
+
}
|
|
13479
|
+
},
|
|
13480
|
+
flush: () => {
|
|
13481
|
+
const { events, internal } = store.getState();
|
|
13482
|
+
flushDeferredPointers();
|
|
13483
|
+
if (events.updateOnFrame && internal.lastEvent?.current && events.handlers) {
|
|
13484
|
+
events.handlers.onPointerMove(internal.lastEvent.current);
|
|
13485
|
+
}
|
|
13486
|
+
},
|
|
13487
|
+
connect: (target) => {
|
|
13488
|
+
if (!target) return;
|
|
13489
|
+
const { set, events } = store.getState();
|
|
13490
|
+
events.disconnect?.();
|
|
13491
|
+
set((state) => ({ events: { ...state.events, connected: target } }));
|
|
13492
|
+
if (events.handlers) {
|
|
13493
|
+
for (const name in events.handlers) {
|
|
13494
|
+
const event = events.handlers[name];
|
|
13495
|
+
const [eventName, passive] = DOM_EVENTS[name];
|
|
13496
|
+
target.addEventListener(eventName, event, { passive });
|
|
13631
13497
|
}
|
|
13632
|
-
}
|
|
13633
|
-
|
|
13634
|
-
|
|
13635
|
-
|
|
13636
|
-
|
|
13637
|
-
|
|
13638
|
-
|
|
13639
|
-
|
|
13640
|
-
|
|
13641
|
-
|
|
13642
|
-
}
|
|
13498
|
+
}
|
|
13499
|
+
},
|
|
13500
|
+
disconnect: () => {
|
|
13501
|
+
const { set, events } = store.getState();
|
|
13502
|
+
if (events.connected) {
|
|
13503
|
+
if (events.handlers) {
|
|
13504
|
+
for (const name in events.handlers) {
|
|
13505
|
+
const event = events.handlers[name];
|
|
13506
|
+
const [eventName] = DOM_EVENTS[name];
|
|
13507
|
+
events.connected.removeEventListener(eventName, event);
|
|
13508
|
+
}
|
|
13509
|
+
}
|
|
13510
|
+
set((state) => ({ events: { ...state.events, connected: void 0 } }));
|
|
13511
|
+
}
|
|
13512
|
+
},
|
|
13513
|
+
// PREVIEW (A8): the XR pointer registration API may change before stable.
|
|
13514
|
+
registerPointer: (config) => {
|
|
13515
|
+
const pointerId = nextXRPointerId++;
|
|
13516
|
+
xrPointers.set(pointerId, config);
|
|
13517
|
+
const { internal } = store.getState();
|
|
13518
|
+
getPointerState(internal, pointerId);
|
|
13519
|
+
return pointerId;
|
|
13520
|
+
},
|
|
13521
|
+
unregisterPointer: (pointerId) => {
|
|
13522
|
+
xrPointers.delete(pointerId);
|
|
13523
|
+
const { internal } = store.getState();
|
|
13524
|
+
const pointerState = internal.pointerMap.get(pointerId);
|
|
13525
|
+
if (pointerState) {
|
|
13526
|
+
for (const [, hoveredObj] of pointerState.hovered) {
|
|
13527
|
+
const eventObject = hoveredObj.eventObject;
|
|
13528
|
+
const instance = eventObject.__r3f;
|
|
13529
|
+
if (instance?.eventCount) {
|
|
13530
|
+
const handlers = instance.handlers;
|
|
13531
|
+
const data = { ...hoveredObj, intersections: [] };
|
|
13532
|
+
handlers.onPointerOut?.(data);
|
|
13533
|
+
handlers.onPointerLeave?.(data);
|
|
13534
|
+
}
|
|
13643
13535
|
}
|
|
13644
|
-
|
|
13645
|
-
|
|
13646
|
-
|
|
13647
|
-
|
|
13648
|
-
|
|
13649
|
-
var S = bm.indexOf(s);
|
|
13650
|
-
0 <= S && bm.splice(S, 1), f();
|
|
13651
|
-
} };
|
|
13652
|
-
}, le.shouldError = function(e) {
|
|
13653
|
-
return pu(e);
|
|
13654
|
-
}, le.shouldSuspend = function(e) {
|
|
13655
|
-
return fu(e);
|
|
13656
|
-
}, le.startHostTransition = function(e, n, o, i) {
|
|
13657
|
-
if (e.tag !== 5) throw Error("Expected the form instance to be a HostComponent. This is a bug in React.");
|
|
13658
|
-
var s = uf(e).queue;
|
|
13659
|
-
Hp(e), nt(e, s, n, Xt, o === null ? Em : function() {
|
|
13660
|
-
x.T === null && console.error("requestFormReset was called outside a transition or action. To fix, move to an action, or wrap with startTransition.");
|
|
13661
|
-
var u = uf(e);
|
|
13662
|
-
return u.next === null && (u = e.alternate.memoizedState), qi(e, u.next.queue, {}, Nt(e)), o(i);
|
|
13663
|
-
});
|
|
13664
|
-
}, le.updateContainer = function(e, n, o, i) {
|
|
13665
|
-
var s = n.current, u = Nt(s);
|
|
13666
|
-
return As(s, u, e, n, o, i), u;
|
|
13667
|
-
}, le.updateContainerSync = Wh, le;
|
|
13668
|
-
}, Tt.exports.default = Tt.exports, Object.defineProperty(Tt.exports, "__esModule", { value: true }));
|
|
13669
|
-
})(Mg)), Mg.exports;
|
|
13670
|
-
}
|
|
13671
|
-
var Eb;
|
|
13672
|
-
function n0() {
|
|
13673
|
-
return Eb || (Eb = 1, process.env.NODE_ENV === "production" ? Rm.exports = Kb() : Rm.exports = e0()), Rm.exports;
|
|
13536
|
+
internal.pointerMap.delete(pointerId);
|
|
13537
|
+
}
|
|
13538
|
+
internal.pointerDirty.delete(pointerId);
|
|
13539
|
+
}
|
|
13540
|
+
};
|
|
13674
13541
|
}
|
|
13675
|
-
var t0 = n0();
|
|
13676
|
-
const r0 = Xb(t0);
|
|
13677
|
-
|
|
13678
|
-
const t = 1, o = 8, r = 32, e = 2, i$1 = 268435456;
|
|
13679
13542
|
|
|
13680
13543
|
function createReconciler(config) {
|
|
13681
13544
|
const reconciler2 = r0(config);
|
|
@@ -13695,7 +13558,10 @@ function extend(objects) {
|
|
|
13695
13558
|
catalogue[Component] = objects;
|
|
13696
13559
|
return Component;
|
|
13697
13560
|
} else {
|
|
13698
|
-
|
|
13561
|
+
for (const name in objects) {
|
|
13562
|
+
const object = objects[name];
|
|
13563
|
+
if (isConstructor(object)) catalogue[name] = object;
|
|
13564
|
+
}
|
|
13699
13565
|
}
|
|
13700
13566
|
}
|
|
13701
13567
|
function validateInstance(type, props) {
|
|
@@ -13866,7 +13732,9 @@ function swapReconstructedInstances() {
|
|
|
13866
13732
|
}
|
|
13867
13733
|
}
|
|
13868
13734
|
if (instance.isHidden) unhideInstance(instance);
|
|
13869
|
-
if (isObject3D(instance.object)
|
|
13735
|
+
if (isObject3D(instance.object) && !instance.parent) {
|
|
13736
|
+
removeInteractivity(findInitialRoot(instance), instance.object);
|
|
13737
|
+
}
|
|
13870
13738
|
if (instance.object.__r3f) delete instance.object.__r3f;
|
|
13871
13739
|
if (instance.type !== "primitive") disposeOnIdle(instance.object);
|
|
13872
13740
|
}
|
|
@@ -13875,9 +13743,13 @@ function swapReconstructedInstances() {
|
|
|
13875
13743
|
const parent = instance.parent;
|
|
13876
13744
|
if (parent) {
|
|
13877
13745
|
const target = catalogue[toPascalCase(instance.type)];
|
|
13746
|
+
const prevObject = instance.object;
|
|
13878
13747
|
instance.object = instance.props.object ?? new target(...instance.props.args ?? []);
|
|
13879
13748
|
instance.object.__r3f = instance;
|
|
13880
13749
|
setFiberRef(fiber, instance.object);
|
|
13750
|
+
if (isObject3D(prevObject) && isObject3D(instance.object)) {
|
|
13751
|
+
swapInteractivity(findInitialRoot(instance), prevObject, instance.object);
|
|
13752
|
+
}
|
|
13881
13753
|
delete instance.appliedOnce;
|
|
13882
13754
|
instance.eventCount = 0;
|
|
13883
13755
|
instance.handlers = {};
|
|
@@ -14037,7 +13909,7 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14037
13909
|
getRootHostContext: () => NO_CONTEXT,
|
|
14038
13910
|
getChildHostContext: () => NO_CONTEXT,
|
|
14039
13911
|
commitUpdate(instance, type, oldProps, newProps, fiber) {
|
|
14040
|
-
validateInstance(type, newProps);
|
|
13912
|
+
validateInstance(instance.type, newProps);
|
|
14041
13913
|
let reconstruct = false;
|
|
14042
13914
|
if (instance.type === "primitive" && oldProps.object !== newProps.object) reconstruct = true;
|
|
14043
13915
|
else if (newProps.args?.length !== oldProps.args?.length) reconstruct = true;
|
|
@@ -14064,8 +13936,8 @@ const reconciler = /* @__PURE__ */ createReconciler({
|
|
|
14064
13936
|
for (const prop in instance.props) {
|
|
14065
13937
|
const value = instance.props[prop];
|
|
14066
13938
|
if (isFromRef(value)) {
|
|
14067
|
-
const ref = value
|
|
14068
|
-
if (ref.current != null) resolved[prop] = ref.current;
|
|
13939
|
+
const { [FROM_REF]: ref, transform } = value;
|
|
13940
|
+
if (ref.current != null) resolved[prop] = transform ? transform(ref.current) : ref.current;
|
|
14069
13941
|
}
|
|
14070
13942
|
}
|
|
14071
13943
|
if (Object.keys(resolved).length) applyProps(instance.object, resolved);
|
|
@@ -14364,9 +14236,8 @@ function createRoot(canvas) {
|
|
|
14364
14236
|
if (!renderer.hasInitialized?.()) {
|
|
14365
14237
|
const size2 = computeInitialSize(canvas, propsSize);
|
|
14366
14238
|
if (size2.width > 0 && size2.height > 0) {
|
|
14367
|
-
|
|
14368
|
-
|
|
14369
|
-
canvas.height = size2.height * pixelRatio;
|
|
14239
|
+
renderer.setPixelRatio(calculateDpr(dpr));
|
|
14240
|
+
renderer.setSize(size2.width, size2.height, false);
|
|
14370
14241
|
}
|
|
14371
14242
|
await renderer.init();
|
|
14372
14243
|
}
|
|
@@ -14375,7 +14246,7 @@ function createRoot(canvas) {
|
|
|
14375
14246
|
state.internal.actualRenderer = renderer;
|
|
14376
14247
|
state.set({ webGPUSupported: isWebGPUBackend, renderer, primaryStore: store });
|
|
14377
14248
|
if (canvasId && !state.internal.isSecondary) {
|
|
14378
|
-
const canvasTarget =
|
|
14249
|
+
const canvasTarget = renderer.getCanvasTarget?.();
|
|
14379
14250
|
const unregisterPrimary = registerPrimary(canvasId, renderer, store);
|
|
14380
14251
|
state.set((prev) => ({
|
|
14381
14252
|
internal: {
|
|
@@ -14489,7 +14360,7 @@ function createRoot(canvas) {
|
|
|
14489
14360
|
const handleXRFrame = (timestamp, _frame) => {
|
|
14490
14361
|
const state2 = store.getState();
|
|
14491
14362
|
if (state2.frameloop === "never") return;
|
|
14492
|
-
advance(timestamp);
|
|
14363
|
+
advance(timestamp, true, state2);
|
|
14493
14364
|
};
|
|
14494
14365
|
const actualRenderer = state.internal.actualRenderer;
|
|
14495
14366
|
const handleSessionChange = () => {
|
|
@@ -14497,7 +14368,7 @@ function createRoot(canvas) {
|
|
|
14497
14368
|
const renderer2 = state2.internal.actualRenderer;
|
|
14498
14369
|
actualRenderer.xr.enabled = actualRenderer.xr.isPresenting;
|
|
14499
14370
|
renderer2.xr.setAnimationLoop(renderer2.xr.isPresenting ? handleXRFrame : null);
|
|
14500
|
-
if (!renderer2.xr.isPresenting) invalidate();
|
|
14371
|
+
if (!renderer2.xr.isPresenting) invalidate(state2);
|
|
14501
14372
|
};
|
|
14502
14373
|
const xr = {
|
|
14503
14374
|
connect() {
|
|
@@ -14579,14 +14450,23 @@ function createRoot(canvas) {
|
|
|
14579
14450
|
const newRootId = canvasId || scheduler.generateRootId();
|
|
14580
14451
|
const unregisterRoot = scheduler.registerRoot(newRootId, {
|
|
14581
14452
|
getState: () => store.getState(),
|
|
14582
|
-
onError: (err) => store.getState().setError(err)
|
|
14453
|
+
onError: (err) => store.getState().setError(err),
|
|
14454
|
+
frameloop: store.getState().frameloop,
|
|
14455
|
+
before: schedulerConfig?.before,
|
|
14456
|
+
after: schedulerConfig?.after,
|
|
14457
|
+
order: schedulerConfig?.order
|
|
14583
14458
|
});
|
|
14584
14459
|
const unregisterCanvasTarget = scheduler.register(
|
|
14585
14460
|
() => {
|
|
14586
14461
|
const state2 = store.getState();
|
|
14587
|
-
|
|
14462
|
+
const canvasTarget = state2.internal.canvasTarget;
|
|
14463
|
+
if (canvasTarget) {
|
|
14588
14464
|
const renderer2 = state2.internal.actualRenderer;
|
|
14589
|
-
renderer2.setCanvasTarget(
|
|
14465
|
+
if (renderer2.getCanvasTarget() !== canvasTarget) renderer2.setCanvasTarget(canvasTarget);
|
|
14466
|
+
if (state2.internal.canvasTargetSizeDirty) {
|
|
14467
|
+
state2.internal.canvasTargetSizeDirty = false;
|
|
14468
|
+
renderer2.backend?.updateSize?.();
|
|
14469
|
+
}
|
|
14590
14470
|
}
|
|
14591
14471
|
},
|
|
14592
14472
|
{
|
|
@@ -14655,8 +14535,7 @@ function createRoot(canvas) {
|
|
|
14655
14535
|
phase: "render",
|
|
14656
14536
|
system: true,
|
|
14657
14537
|
// Internal flag: this is a system job, not user-controlled
|
|
14658
|
-
//
|
|
14659
|
-
...schedulerConfig?.after && { after: schedulerConfig.after },
|
|
14538
|
+
// FPS throttles only the default render job; Canvas ordering belongs to the root.
|
|
14660
14539
|
...schedulerConfig?.fps && { fps: schedulerConfig.fps }
|
|
14661
14540
|
}
|
|
14662
14541
|
);
|
|
@@ -14675,8 +14554,21 @@ function createRoot(canvas) {
|
|
|
14675
14554
|
scheduler
|
|
14676
14555
|
}
|
|
14677
14556
|
}));
|
|
14557
|
+
} else {
|
|
14558
|
+
const constraintsChanged = !is.equ(schedulerConfig?.before, lastConfiguredProps.schedulerBefore, shallowLoose) || !is.equ(schedulerConfig?.after, lastConfiguredProps.schedulerAfter, shallowLoose);
|
|
14559
|
+
if (constraintsChanged) {
|
|
14560
|
+
scheduler.setRootConstraints(rootId, {
|
|
14561
|
+
before: schedulerConfig?.before,
|
|
14562
|
+
after: schedulerConfig?.after
|
|
14563
|
+
});
|
|
14564
|
+
}
|
|
14565
|
+
if (schedulerConfig?.order !== lastConfiguredProps.schedulerOrder) {
|
|
14566
|
+
scheduler.setRootOrder(rootId, schedulerConfig?.order ?? 0);
|
|
14567
|
+
}
|
|
14678
14568
|
}
|
|
14679
|
-
|
|
14569
|
+
lastConfiguredProps.schedulerBefore = schedulerConfig?.before;
|
|
14570
|
+
lastConfiguredProps.schedulerAfter = schedulerConfig?.after;
|
|
14571
|
+
lastConfiguredProps.schedulerOrder = schedulerConfig?.order;
|
|
14680
14572
|
onCreated = onCreatedCallback;
|
|
14681
14573
|
configured = true;
|
|
14682
14574
|
resolve();
|
|
@@ -14718,18 +14610,23 @@ function unmountComponentAtNode(canvas, callback) {
|
|
|
14718
14610
|
const fiber = root?.fiber;
|
|
14719
14611
|
if (fiber) {
|
|
14720
14612
|
const state = root?.store.getState();
|
|
14721
|
-
if (state)
|
|
14613
|
+
if (state) {
|
|
14614
|
+
state.internal.active = false;
|
|
14615
|
+
const unregisterRoot = state.internal.unregisterRoot;
|
|
14616
|
+
if (unregisterRoot) {
|
|
14617
|
+
unregisterRoot();
|
|
14618
|
+
state.internal.unregisterRoot = void 0;
|
|
14619
|
+
}
|
|
14620
|
+
}
|
|
14722
14621
|
reconciler.updateContainer(null, fiber, null, () => {
|
|
14723
14622
|
if (state) {
|
|
14724
14623
|
setTimeout(() => {
|
|
14725
14624
|
try {
|
|
14726
14625
|
const renderer = state.internal.actualRenderer;
|
|
14727
|
-
const unregisterRoot = state.internal.unregisterRoot;
|
|
14728
|
-
if (unregisterRoot) unregisterRoot();
|
|
14729
14626
|
const unregisterPrimary = state.internal.unregisterPrimary;
|
|
14730
14627
|
if (unregisterPrimary) unregisterPrimary();
|
|
14731
14628
|
const canvasTarget = state.internal.canvasTarget;
|
|
14732
|
-
if (canvasTarget?.dispose) canvasTarget.dispose();
|
|
14629
|
+
if (state.internal.isSecondary && canvasTarget?.dispose) canvasTarget.dispose();
|
|
14733
14630
|
state.events.disconnect?.();
|
|
14734
14631
|
cleanupHelperGroup(root.store);
|
|
14735
14632
|
if (state.isLegacy && renderer) {
|
|
@@ -14855,6 +14752,207 @@ function flushSync(fn) {
|
|
|
14855
14752
|
return reconciler.flushSyncFromReconciler(fn);
|
|
14856
14753
|
}
|
|
14857
14754
|
|
|
14755
|
+
const isRef = (obj) => obj.current && obj.current.isScene;
|
|
14756
|
+
const resolveScene = (scene) => isRef(scene) ? scene.current : scene;
|
|
14757
|
+
function setEnvProps(background, scene, defaultScene, texture, sceneProps = {}) {
|
|
14758
|
+
sceneProps = {
|
|
14759
|
+
backgroundBlurriness: 0,
|
|
14760
|
+
backgroundIntensity: 1,
|
|
14761
|
+
backgroundRotation: [0, 0, 0],
|
|
14762
|
+
environmentIntensity: 1,
|
|
14763
|
+
environmentRotation: [0, 0, 0],
|
|
14764
|
+
...sceneProps
|
|
14765
|
+
};
|
|
14766
|
+
const target = resolveScene(scene || defaultScene);
|
|
14767
|
+
const oldbg = target.background;
|
|
14768
|
+
const oldenv = target.environment;
|
|
14769
|
+
const oldSceneProps = {
|
|
14770
|
+
backgroundBlurriness: target.backgroundBlurriness,
|
|
14771
|
+
backgroundIntensity: target.backgroundIntensity,
|
|
14772
|
+
backgroundRotation: target.backgroundRotation.clone(),
|
|
14773
|
+
environmentIntensity: target.environmentIntensity,
|
|
14774
|
+
environmentRotation: target.environmentRotation.clone()
|
|
14775
|
+
};
|
|
14776
|
+
if (background !== "only") target.environment = texture;
|
|
14777
|
+
if (background) target.background = texture;
|
|
14778
|
+
applyProps(target, sceneProps);
|
|
14779
|
+
return () => {
|
|
14780
|
+
if (background !== "only") target.environment = oldenv;
|
|
14781
|
+
if (background) target.background = oldbg;
|
|
14782
|
+
applyProps(target, oldSceneProps);
|
|
14783
|
+
};
|
|
14784
|
+
}
|
|
14785
|
+
function EnvironmentMap({ scene, background = false, map, ...config }) {
|
|
14786
|
+
const defaultScene = useThree((state) => state.scene);
|
|
14787
|
+
React.useLayoutEffect(() => {
|
|
14788
|
+
if (map) return setEnvProps(background, scene, defaultScene, map, config);
|
|
14789
|
+
});
|
|
14790
|
+
return null;
|
|
14791
|
+
}
|
|
14792
|
+
function EnvironmentCube({
|
|
14793
|
+
background = false,
|
|
14794
|
+
scene,
|
|
14795
|
+
blur,
|
|
14796
|
+
backgroundBlurriness,
|
|
14797
|
+
backgroundIntensity,
|
|
14798
|
+
backgroundRotation,
|
|
14799
|
+
environmentIntensity,
|
|
14800
|
+
environmentRotation,
|
|
14801
|
+
...rest
|
|
14802
|
+
}) {
|
|
14803
|
+
const texture = useEnvironment(rest);
|
|
14804
|
+
const defaultScene = useThree((state) => state.scene);
|
|
14805
|
+
React.useLayoutEffect(() => {
|
|
14806
|
+
return setEnvProps(background, scene, defaultScene, texture, {
|
|
14807
|
+
backgroundBlurriness: blur ?? backgroundBlurriness,
|
|
14808
|
+
backgroundIntensity,
|
|
14809
|
+
backgroundRotation,
|
|
14810
|
+
environmentIntensity,
|
|
14811
|
+
environmentRotation
|
|
14812
|
+
});
|
|
14813
|
+
});
|
|
14814
|
+
React.useEffect(() => {
|
|
14815
|
+
return () => {
|
|
14816
|
+
texture.dispose();
|
|
14817
|
+
};
|
|
14818
|
+
}, [texture]);
|
|
14819
|
+
return null;
|
|
14820
|
+
}
|
|
14821
|
+
function EnvironmentPortal({
|
|
14822
|
+
children,
|
|
14823
|
+
near = 0.1,
|
|
14824
|
+
far = 1e3,
|
|
14825
|
+
resolution = 256,
|
|
14826
|
+
frames = 1,
|
|
14827
|
+
map,
|
|
14828
|
+
background = false,
|
|
14829
|
+
blur,
|
|
14830
|
+
backgroundBlurriness,
|
|
14831
|
+
backgroundIntensity,
|
|
14832
|
+
backgroundRotation,
|
|
14833
|
+
environmentIntensity,
|
|
14834
|
+
environmentRotation,
|
|
14835
|
+
scene,
|
|
14836
|
+
files,
|
|
14837
|
+
path,
|
|
14838
|
+
preset = void 0,
|
|
14839
|
+
extensions
|
|
14840
|
+
}) {
|
|
14841
|
+
const renderer = useThree((state) => state.renderer);
|
|
14842
|
+
const isLegacy = useThree((state) => state.isLegacy);
|
|
14843
|
+
const defaultScene = useThree((state) => state.scene);
|
|
14844
|
+
const camera = React.useRef(null);
|
|
14845
|
+
const [virtualScene] = React.useState(() => new Scene());
|
|
14846
|
+
const fbo = React.useMemo(() => {
|
|
14847
|
+
const fbo2 = isLegacy ? new WebGLCubeRenderTarget(resolution) : new CubeRenderTarget(resolution);
|
|
14848
|
+
fbo2.texture.type = HalfFloatType;
|
|
14849
|
+
return fbo2;
|
|
14850
|
+
}, [resolution, isLegacy]);
|
|
14851
|
+
React.useEffect(() => {
|
|
14852
|
+
return () => {
|
|
14853
|
+
fbo.dispose();
|
|
14854
|
+
};
|
|
14855
|
+
}, [fbo]);
|
|
14856
|
+
React.useLayoutEffect(() => {
|
|
14857
|
+
if (frames === 1) {
|
|
14858
|
+
const autoClear = renderer.autoClear;
|
|
14859
|
+
renderer.autoClear = true;
|
|
14860
|
+
camera.current.update(renderer, virtualScene);
|
|
14861
|
+
renderer.autoClear = autoClear;
|
|
14862
|
+
}
|
|
14863
|
+
return setEnvProps(background, scene, defaultScene, fbo.texture, {
|
|
14864
|
+
backgroundBlurriness: blur ?? backgroundBlurriness,
|
|
14865
|
+
backgroundIntensity,
|
|
14866
|
+
backgroundRotation,
|
|
14867
|
+
environmentIntensity,
|
|
14868
|
+
environmentRotation
|
|
14869
|
+
});
|
|
14870
|
+
}, [
|
|
14871
|
+
children,
|
|
14872
|
+
virtualScene,
|
|
14873
|
+
fbo.texture,
|
|
14874
|
+
scene,
|
|
14875
|
+
defaultScene,
|
|
14876
|
+
background,
|
|
14877
|
+
frames,
|
|
14878
|
+
renderer,
|
|
14879
|
+
blur,
|
|
14880
|
+
backgroundBlurriness,
|
|
14881
|
+
backgroundIntensity,
|
|
14882
|
+
backgroundRotation,
|
|
14883
|
+
environmentIntensity,
|
|
14884
|
+
environmentRotation
|
|
14885
|
+
]);
|
|
14886
|
+
let count = 1;
|
|
14887
|
+
useFrame(() => {
|
|
14888
|
+
if (frames === Infinity || count < frames) {
|
|
14889
|
+
const autoClear = renderer.autoClear;
|
|
14890
|
+
renderer.autoClear = true;
|
|
14891
|
+
camera.current.update(renderer, virtualScene);
|
|
14892
|
+
renderer.autoClear = autoClear;
|
|
14893
|
+
count++;
|
|
14894
|
+
}
|
|
14895
|
+
});
|
|
14896
|
+
return /* @__PURE__ */ jsx(Fragment, { children: createPortal(
|
|
14897
|
+
/* @__PURE__ */ jsxs(Fragment, { children: [
|
|
14898
|
+
children,
|
|
14899
|
+
/* @__PURE__ */ jsx("cubeCamera", { ref: camera, args: [near, far, fbo] }),
|
|
14900
|
+
files || preset ? /* @__PURE__ */ jsx(EnvironmentCube, { background: true, files, preset, path, extensions }) : map ? /* @__PURE__ */ jsx(EnvironmentMap, { background: true, map, extensions }) : null
|
|
14901
|
+
] }),
|
|
14902
|
+
virtualScene
|
|
14903
|
+
) });
|
|
14904
|
+
}
|
|
14905
|
+
function EnvironmentGround(props) {
|
|
14906
|
+
const textureDefault = useEnvironment(props);
|
|
14907
|
+
const texture = props.map || textureDefault;
|
|
14908
|
+
React.useMemo(() => extend({ GroundProjectedEnvImpl: GroundedSkybox }), []);
|
|
14909
|
+
React.useEffect(() => {
|
|
14910
|
+
return () => {
|
|
14911
|
+
textureDefault.dispose();
|
|
14912
|
+
};
|
|
14913
|
+
}, [textureDefault]);
|
|
14914
|
+
const height = props.ground?.height ?? 15;
|
|
14915
|
+
const radius = props.ground?.radius ?? 60;
|
|
14916
|
+
const scale = props.ground?.scale ?? 1e3;
|
|
14917
|
+
const args = React.useMemo(
|
|
14918
|
+
() => [texture, height, radius],
|
|
14919
|
+
[texture, height, radius]
|
|
14920
|
+
);
|
|
14921
|
+
return /* @__PURE__ */ jsxs(Fragment, { children: [
|
|
14922
|
+
/* @__PURE__ */ jsx(EnvironmentMap, { ...props, map: texture }),
|
|
14923
|
+
/* @__PURE__ */ jsx("groundProjectedEnvImpl", { args, scale })
|
|
14924
|
+
] });
|
|
14925
|
+
}
|
|
14926
|
+
function EnvironmentColor({ color, scene }) {
|
|
14927
|
+
const defaultScene = useThree((state) => state.scene);
|
|
14928
|
+
React.useLayoutEffect(() => {
|
|
14929
|
+
if (color === void 0) return;
|
|
14930
|
+
const target = resolveScene(scene || defaultScene);
|
|
14931
|
+
const oldBg = target.background;
|
|
14932
|
+
target.background = new Color(color);
|
|
14933
|
+
return () => {
|
|
14934
|
+
target.background = oldBg;
|
|
14935
|
+
};
|
|
14936
|
+
});
|
|
14937
|
+
return null;
|
|
14938
|
+
}
|
|
14939
|
+
function EnvironmentDualSource(props) {
|
|
14940
|
+
const { backgroundFiles, ...envProps } = props;
|
|
14941
|
+
return /* @__PURE__ */ jsxs(Fragment, { children: [
|
|
14942
|
+
/* @__PURE__ */ jsx(EnvironmentCube, { ...envProps, background: false }),
|
|
14943
|
+
/* @__PURE__ */ jsx(EnvironmentCube, { ...props, files: backgroundFiles, background: "only" })
|
|
14944
|
+
] });
|
|
14945
|
+
}
|
|
14946
|
+
function Environment(props) {
|
|
14947
|
+
if (props.color && !props.files && !props.preset && !props.map) {
|
|
14948
|
+
return /* @__PURE__ */ jsx(EnvironmentColor, { ...props });
|
|
14949
|
+
}
|
|
14950
|
+
if (props.backgroundFiles && props.backgroundFiles !== props.files) {
|
|
14951
|
+
return /* @__PURE__ */ jsx(EnvironmentDualSource, { ...props });
|
|
14952
|
+
}
|
|
14953
|
+
return props.ground ? /* @__PURE__ */ jsx(EnvironmentGround, { ...props }) : props.map ? /* @__PURE__ */ jsx(EnvironmentMap, { ...props }) : props.children ? /* @__PURE__ */ jsx(EnvironmentPortal, { ...props }) : /* @__PURE__ */ jsx(EnvironmentCube, { ...props });
|
|
14954
|
+
}
|
|
14955
|
+
|
|
14858
14956
|
function parseBackground(background) {
|
|
14859
14957
|
if (!background) return null;
|
|
14860
14958
|
if (typeof background === "object" && !background.isColor) {
|
|
@@ -14967,9 +15065,9 @@ function CanvasImpl({
|
|
|
14967
15065
|
React.useMemo(() => extend(THREE), []);
|
|
14968
15066
|
const Bridge = useBridge();
|
|
14969
15067
|
const backgroundProps = React.useMemo(() => parseBackground(background), [background]);
|
|
14970
|
-
const
|
|
15068
|
+
const [hasInitialSize, setHasInitialSize] = React.useState(false);
|
|
14971
15069
|
const measureConfig = React.useMemo(() => {
|
|
14972
|
-
if (!
|
|
15070
|
+
if (!hasInitialSize) {
|
|
14973
15071
|
return {
|
|
14974
15072
|
...resize,
|
|
14975
15073
|
scroll: resize?.scroll ?? true,
|
|
@@ -14981,7 +15079,7 @@ function CanvasImpl({
|
|
|
14981
15079
|
debounce: { scroll: 50, resize: 0 },
|
|
14982
15080
|
...resize
|
|
14983
15081
|
};
|
|
14984
|
-
}, [
|
|
15082
|
+
}, [hasInitialSize, resize]);
|
|
14985
15083
|
const [containerRef, containerRect] = useMeasure(measureConfig);
|
|
14986
15084
|
const effectiveSize = React.useMemo(() => {
|
|
14987
15085
|
let w = width ?? containerRect.width;
|
|
@@ -14997,9 +15095,7 @@ function CanvasImpl({
|
|
|
14997
15095
|
left: containerRect.left
|
|
14998
15096
|
};
|
|
14999
15097
|
}, [width, height, containerRect, forceEven]);
|
|
15000
|
-
if (!
|
|
15001
|
-
hasInitialSizeRef.current = true;
|
|
15002
|
-
}
|
|
15098
|
+
if (!hasInitialSize && effectiveSize.width > 0 && effectiveSize.height > 0) setHasInitialSize(true);
|
|
15003
15099
|
const canvasRef = React.useRef(null);
|
|
15004
15100
|
const divRef = React.useRef(null);
|
|
15005
15101
|
React.useImperativeHandle(ref, () => canvasRef.current);
|
|
@@ -15064,7 +15160,7 @@ function CanvasImpl({
|
|
|
15064
15160
|
onDropMissed: (...args) => handleDropMissed.current?.(...args),
|
|
15065
15161
|
onCreated: (state) => {
|
|
15066
15162
|
state.events.connect?.(
|
|
15067
|
-
eventSource ? isRef(eventSource) ? eventSource.current : eventSource : divRef.current
|
|
15163
|
+
eventSource ? isRef$1(eventSource) ? eventSource.current : eventSource : divRef.current
|
|
15068
15164
|
);
|
|
15069
15165
|
if (eventPrefix) {
|
|
15070
15166
|
state.setEvents({
|
|
@@ -15113,6 +15209,7 @@ function CanvasImpl({
|
|
|
15113
15209
|
const canvas = canvasRef.current;
|
|
15114
15210
|
if (canvas) {
|
|
15115
15211
|
return () => {
|
|
15212
|
+
if (canvas.isConnected) return;
|
|
15116
15213
|
unmountComponentAtNode(canvas);
|
|
15117
15214
|
root.current = null;
|
|
15118
15215
|
};
|
|
@@ -15177,4 +15274,4 @@ function Canvas(props) {
|
|
|
15177
15274
|
|
|
15178
15275
|
extend(THREE);
|
|
15179
15276
|
|
|
15180
|
-
export { Block, Canvas, Environment, EnvironmentCube, EnvironmentMap, EnvironmentPortal, ErrorBoundary, FROM_REF, IsObject, ONCE, Portal, R3F_BUILD_LEGACY, R3F_BUILD_WEBGPU, REACT_INTERNAL_PROPS, RESERVED_PROPS, Texture, _roots,
|
|
15277
|
+
export { Block, Canvas, Environment, EnvironmentCube, EnvironmentMap, EnvironmentPortal, ErrorBoundary, FROM_REF, IsObject, ONCE, Portal, R3F_BUILD_LEGACY, R3F_BUILD_WEBGPU, REACT_INTERNAL_PROPS, RESERVED_PROPS, Texture, _roots, addAfterEffect, addEffect, addTail, advance, applyProps, attach, buildGraph, calculateDpr, context, createEvents, createPointerEvents, createPortal, createRoot, createStore, detach, diffProps, dispose, createPointerEvents as events, extend, findInitialRoot, flushSync, fromRef, getInstanceProps, getPrimary, getPrimaryIds, getRootState, getUuidPrefix, hasConstructor, hasPrimary, invalidate, invalidateInstance, is, isColorRepresentation, isCopyable, isFromRef, isObject3D, isOnce, isOrthographicCamera, isRef$1 as isRef, isRenderer, isTexture, isVectorLike, once, prepare, presetsObj, reconciler, registerPrimary, removeInteractivity, resolve, swapInteractivity, unmountComponentAtNode, unregisterPrimary, updateCamera, updateFrustum, useBridge, useEnvironment, useFrame, useGraph, useInstanceHandle, useIsomorphicLayoutEffect, useLoader, useMutableCallback, useRenderTarget, useStore, useTexture, useTextures, useThree, waitForPrimary };
|