softbox 4.23.0 → 4.24.0

package/dist/simple-viewer.es.js

@@ -492,7 +492,7 @@ var Jt = class {
 	}
 }, Yt = class {
 	constructor(e) {
-		this.currentModel = null, this.currentVariants = [], this.modelLoader = e.modelLoader, this.scene = e.scene, this.camera = e.camera, this.controls = e.controls, this.floorAlignmentService = e.floorAlignmentService, this.sceneSetupService = e.sceneSetupService, this.autoFitToObject = e.autoFitToObject ?? !1, this.floorAlignment = e.floorAlignment ?? !0, this.unitsScaleToMeters = e.unitsScaleToMeters ?? 1;
+		this.currentModel = null, this.currentModelUrl = null, this.currentVariants = [], this.modelLoader = e.modelLoader, this.scene = e.scene, this.camera = e.camera, this.controls = e.controls, this.floorAlignmentService = e.floorAlignmentService, this.sceneSetupService = e.sceneSetupService, this.autoFitToObject = e.autoFitToObject ?? !1, this.floorAlignment = e.floorAlignment ?? !0, this.unitsScaleToMeters = e.unitsScaleToMeters ?? 1;
 	}
 	getCurrentModel() {
 		return this.currentModel;
@@ -500,6 +500,9 @@ var Jt = class {
 	getLastModelUrl() {
 		return this.lastModelUrl;
 	}
+	getCurrentModelUrl() {
+		return this.currentModelUrl;
+	}
 	getVariantNames() {
 		return [...this.currentVariants];
 	}
@@ -517,8 +520,8 @@ var Jt = class {
 					});
 				});
 				if (!t.ok) throw t.error;
-				o = t.value.scene, this.currentVariants = t.value.userData?.softboxVariants ?? [];
-			} else o = e, this.currentVariants = [];
+				o = t.value.scene, this.currentModelUrl = e, this.currentVariants = t.value.userData?.softboxVariants ?? [];
+			} else o = e, this.currentModelUrl = null, this.currentVariants = [];
 			if (this.unitsScaleToMeters !== 1) {
 				if (!this.sceneSetupService) throw new t("A units conversion is configured but no scene setup service is available to apply it", i.INVALID_PARAMETER);
 				let e = this.sceneSetupService.wrapInUnitsScaleGroup(o, this.unitsScaleToMeters);
@@ -1148,6 +1151,9 @@ var $t = (e) => [
 	getVariantNames() {
 		return this.modelManager.getVariantNames();
 	}
+	getModelUrl() {
+		return this.modelManager.getCurrentModelUrl();
+	}
 	setMaterialVariant(e) {
 		let n = this.modelManager.getCurrentModel();
 		return n && e !== null && !this.modelManager.getVariantNames().includes(e) ? r.err(new t(`Unknown material variant '${e}'`, i.INVALID_PARAMETER)) : (this.options.variant = e ?? void 0, !n || !this.sceneSetupService || this.sceneSetupService.applyMaterialVariant(n, e).then((e) => {
@@ -8645,33 +8651,141 @@ function cc({ active: e, onSelect: t }) {
 	});
 }
 //#endregion
+//#region src/presentation/components/arHandoff.ts
+var lc = "#softbox-ar-failed";
+function uc() {
+	return typeof document > "u" || typeof navigator > "u" ? null : document.createElement("a").relList?.supports?.("ar") ? "quick-look" : /android/i.test(navigator.userAgent) ? "scene-viewer" : null;
+}
+function dc(e) {
+	if (typeof window > "u" || typeof e != "string" || e.length === 0) return null;
+	try {
+		let t = new URL(e, window.location.href);
+		return t.protocol === "https:" ? t.toString() : null;
+	} catch {
+		return null;
+	}
+}
+function fc(e, t) {
+	let n = `file=${encodeURIComponent(e)}&mode=ar_preferred`;
+	t && (n += `&title=${encodeURIComponent(t)}`);
+	let r = new URL(window.location.href);
+	return r.hash = lc, `intent://arvr.google.com/scene-viewer/1.0?${n}#Intent;scheme=https;package=com.google.ar.core;action=android.intent.action.VIEW;S.browser_fallback_url=${encodeURIComponent(r.toString())};end;`;
+}
+function pc(e) {
+	let t = document.createElement("a");
+	t.rel = "ar", t.appendChild(document.createElement("img")), t.href = e, t.click();
+}
+function mc(e) {
+	let t = document.createElement("a");
+	t.href = e, t.click();
+}
+//#endregion
+//#region src/presentation/components/ArButton.tsx
+var hc = {
+	"top-left": {
+		top: 16,
+		left: 16
+	},
+	"top-right": {
+		top: 16,
+		right: 16
+	},
+	"bottom-left": {
+		bottom: 16,
+		left: 16
+	},
+	"bottom-right": {
+		bottom: 16,
+		right: 16
+	}
+};
+function gc({ source: e, options: t, clearPresetRow: n }) {
+	let [r, i] = k(null);
+	E(() => {
+		i(uc());
+	}, []);
+	let [a, o] = k(!1);
+	E(() => {
+		let e = () => {
+			window.location.hash === "#softbox-ar-failed" && (history.replaceState(null, "", window.location.pathname + window.location.search), o(!0));
+		};
+		return window.addEventListener("hashchange", e), () => window.removeEventListener("hashchange", e);
+	}, []);
+	let s = dc(e), c = D(() => {
+		if (a) return null;
+		if (r === "quick-look" && t.iosSrc) {
+			let e = t.iosSrc;
+			return () => pc(e);
+		}
+		return r === "scene-viewer" && s ? () => mc(fc(s, t.title)) : null;
+	}, [
+		a,
+		r,
+		t.iosSrc,
+		t.title,
+		s
+	]);
+	if (!c) return null;
+	let l = { ...hc[t.placement ?? "bottom-left"] };
+	return n && l.bottom !== void 0 && (l.bottom = 64), /* @__PURE__ */ H("button", {
+		type: "button",
+		"data-testid": "viewer-ar-button",
+		"aria-label": "View in your space (AR)",
+		onClick: c,
+		style: {
+			position: "absolute",
+			zIndex: 10,
+			padding: "8px 16px",
+			borderRadius: 999,
+			color: "#111318",
+			fontFamily: ac,
+			fontSize: 13,
+			fontWeight: 600,
+			lineHeight: 1,
+			cursor: "pointer",
+			...l,
+			...oc
+		},
+		children: "AR"
+	});
+}
+//#endregion
 //#region src/presentation/components/loadingIndicatorConfig.ts
-var lc = {
+var _c = {
 	enabled: !0,
 	label: "Loading…",
 	color: "#ffffff",
 	backdrop: "rgba(15,16,20,0.6)"
 };
-function uc(e) {
-	return e === void 0 || e === !0 ? lc : e === !1 ? {
-		...lc,
+function vc(e) {
+	return e === void 0 || e === !0 ? _c : e === !1 ? {
+		..._c,
 		enabled: !1
 	} : {
 		enabled: e.enabled ?? !0,
-		label: e.label ?? lc.label,
+		label: e.label ?? _c.label,
 		errorLabel: e.errorLabel,
-		color: e.color ?? lc.color,
-		backdrop: e.backdrop ?? lc.backdrop
+		color: e.color ?? _c.color,
+		backdrop: e.backdrop ?? _c.backdrop
 	};
 }
 //#endregion
 //#region src/presentation/components/SimpleViewer.tsx
-var dc = () => new t("Viewer is not ready yet", i.COMPONENT_NOT_MOUNTED), fc = ne(({ object: e, options: t = {}, preset: n, pathTraced: r, turntable: i, animations: a, children: s }, c) => {
+var yc = () => new t("Viewer is not ready yet", i.COMPONENT_NOT_MOUNTED), bc = ne(({ object: e, options: t = {}, preset: n, pathTraced: r, turntable: i, animations: a, children: s }, c) => {
 	let l = O(null), { activePreset: u, pickerEnabled: d, selectPreset: f } = Lo(t.preset ?? n, t.ui), { viewer: p, isInitialized: m, initError: h } = Fo(l, Ro(t, u, r, i, a)), g = zo(p, m, e), y = Vo(p);
 	Ho(p, h, t);
 	let x = p ? _(p.getCamera()) : null, S = p ? b(p.getControls()) : null, ee = p ? o(p.getRenderer()) : null, te = re(() => {
 		p?.requestRender();
-	}, [p]), C = t.helpers?.gizmo !== void 0 && t.helpers.gizmo !== !1, w = typeof t.helpers?.gizmo == "object" ? t.helpers.gizmo : {}, T = D(() => uc(t.loadingIndicator), [t.loadingIndicator]), ne = g.status === "error" || !!h, ie = T.enabled && (g.status === "loading" || ne);
+	}, [p]), C = t.helpers?.gizmo !== void 0 && t.helpers.gizmo !== !1, w = typeof t.helpers?.gizmo == "object" ? t.helpers.gizmo : {}, T = t.ar === !0 ? {} : t.ar || null, [ne, ie] = k(null);
+	E(() => {
+		if (!p) {
+			ie(null);
+			return;
+		}
+		let e = () => ie(p.getModelUrl());
+		return e(), y.on("model:loaded", e), () => y.off("model:loaded", e);
+	}, [p, y]);
+	let oe = ne ?? e, A = D(() => vc(t.loadingIndicator), [t.loadingIndicator]), se = g.status === "error" || !!h, ce = A.enabled && (g.status === "loading" || se);
 	return ae(c, () => ({
 		scene: p ? v(p.getScene()) : null,
 		camera: x,
@@ -8679,18 +8793,18 @@ var dc = () => new t("Viewer is not ready yet", i.COMPONENT_NOT_MOUNTED), fc = n
 		controls: S,
 		events: y,
 		loadModel: async (e) => {
-			if (!p) throw dc();
+			if (!p) throw yc();
 			let t = typeof e == "string" ? e : new on(e), n = await p.loadModel(t);
 			if (!n.ok) throw n.error;
 		},
 		captureStill: async (e) => {
-			if (!p) throw dc();
+			if (!p) throw yc();
 			let t = await p.captureStill(e);
 			if (!t.ok) throw t.error;
 			return t.value;
 		},
 		captureVideo: async (e) => {
-			if (!p) throw dc();
+			if (!p) throw yc();
 			let t = await p.captureVideo(e);
 			if (!t.ok) throw t.error;
 			return t.value;
@@ -8698,12 +8812,12 @@ var dc = () => new t("Viewer is not ready yet", i.COMPONENT_NOT_MOUNTED), fc = n
 		getAnimationNames: () => p?.getAnimationNames() ?? [],
 		getVariantNames: () => p?.getVariantNames() ?? [],
 		setVariant: (e) => {
-			if (!p) throw dc();
+			if (!p) throw yc();
 			let t = p.setMaterialVariant(e);
 			if (!t.ok) throw t.error;
 		},
 		playAnimations: (e) => {
-			if (!p) throw dc();
+			if (!p) throw yc();
 			let t = p.playAnimations(e);
 			if (!t.ok) throw t.error;
 		},
@@ -8711,22 +8825,22 @@ var dc = () => new t("Viewer is not ready yet", i.COMPONENT_NOT_MOUNTED), fc = n
 			p?.pauseAnimations();
 		},
 		setEnvironmentMap: async (e) => {
-			if (!p) throw dc();
+			if (!p) throw yc();
 			let t = await p.setEnvironmentMap(e);
 			if (!t.ok) throw t.error;
 		},
 		resetEnvironment: () => {
-			if (!p) throw dc();
+			if (!p) throw yc();
 			let e = p.resetEnvironment();
 			if (!e.ok) throw e.error;
 		},
 		setBackgroundImage: async (e) => {
-			if (!p) throw dc();
+			if (!p) throw yc();
 			let t = await p.setBackgroundImage(e);
 			if (!t.ok) throw t.error;
 		},
 		setBackgroundColor: (e) => {
-			if (!p) throw dc();
+			if (!p) throw yc();
 			let t = p.setBackgroundColor(e);
 			if (!t.ok) throw t.error;
 		},
@@ -8757,32 +8871,37 @@ var dc = () => new t("Viewer is not ready yet", i.COMPONENT_NOT_MOUNTED), fc = n
 					placement: w.placement,
 					size: w.size
 				}),
-				ie && /* @__PURE__ */ H(ic, {
-					status: ne ? "error" : "loading",
-					label: ne ? T.errorLabel ?? h?.message ?? g.error ?? "Failed to load model" : T.label,
-					color: T.color,
-					backdrop: T.backdrop
+				ce && /* @__PURE__ */ H(ic, {
+					status: se ? "error" : "loading",
+					label: se ? A.errorLabel ?? h?.message ?? g.error ?? "Failed to load model" : A.label,
+					color: A.color,
+					backdrop: A.backdrop
 				}),
 				d && /* @__PURE__ */ H(cc, {
 					active: u ?? "studio",
 					onSelect: f
 				}),
+				T && /* @__PURE__ */ H(gc, {
+					source: oe,
+					options: T,
+					clearPresetRow: d
+				}),
 				s
 			]
 		})
 	}) });
 });
-fc.displayName = "SimpleViewer";
+bc.displayName = "SimpleViewer";
 //#endregion
 //#region src/SimpleViewerWrapper.tsx
-var pc = ne((e, t) => /* @__PURE__ */ H(fc, {
+var xc = ne((e, t) => /* @__PURE__ */ H(bc, {
 	ref: t,
 	...e
 }));
-pc.displayName = "SimpleViewer";
+xc.displayName = "SimpleViewer";
 //#endregion
 //#region src/presentation/components/Hotspot.tsx
-var mc = () => /* @__PURE__ */ H("span", {
+var Sc = () => /* @__PURE__ */ H("span", {
 	"aria-hidden": "true",
 	style: {
 		display: "block",
@@ -8794,7 +8913,7 @@ var mc = () => /* @__PURE__ */ H("span", {
 		boxShadow: "0 2px 8px rgba(0,0,0,0.35)"
 	}
 });
-function hc({ position: e, occlude: t = !1, children: n }) {
+function Cc({ position: e, occlude: t = !1, children: n }) {
 	let { viewer: r } = Go(), i = O(null), [a, o, s] = e;
 	E(() => {
 		if (!r) return;
@@ -8847,8 +8966,8 @@ function hc({ position: e, occlude: t = !1, children: n }) {
 			zIndex: 5,
 			pointerEvents: c ? "auto" : "none"
 		},
-		children: c ? n : /* @__PURE__ */ H(mc, {})
+		children: c ? n : /* @__PURE__ */ H(Sc, {})
 	});
 }
 //#endregion
-export { Xa as ControlType, wo as DEFAULT_OUTDOOR_CONCRETE_TEXTURES, Co as DEFAULT_OUTDOOR_HDRI_URL, Eo as DEFAULT_SCENE, Za as DEFAULT_STUDIO_LOOK, i as ErrorCode, hc as Hotspot, pc as SimpleViewer, t as ThreeViewerError, n as TypedEventEmitter, Oo as VIEWER_PRESETS, To as VIEWER_SCENES, So as defaultOptions, ko as resolvePreset, Do as resolveScene };
+export { Xa as ControlType, wo as DEFAULT_OUTDOOR_CONCRETE_TEXTURES, Co as DEFAULT_OUTDOOR_HDRI_URL, Eo as DEFAULT_SCENE, Za as DEFAULT_STUDIO_LOOK, i as ErrorCode, Cc as Hotspot, xc as SimpleViewer, t as ThreeViewerError, n as TypedEventEmitter, Oo as VIEWER_PRESETS, To as VIEWER_SCENES, So as defaultOptions, ko as resolvePreset, Do as resolveScene };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "softbox",
   "private": false,
-  "version": "4.23.0",
+  "version": "4.24.0",
   "homepage": "https://leming.github.io/softbox/",
   "type": "module",
   "description": "Batteries-included React 3D viewer — any GLB looks studio-shot in one line",