@dotdirfm/ui 0.1.5 → 0.1.6

package/dist/dotdir.mjs

@@ -3006,18 +3006,6 @@ function _t() {
 				n.preventDefault(), n.stopPropagation(), t((e) => !e);
 				return;
 			}
-			if (!e) {
-				if (n.target.closest(`.${U["terminal-container"]}`)) {
-					let e = n.metaKey || n.ctrlKey, t = e && [
-						"c",
-						"d",
-						"z",
-						"v"
-					].includes(n.key.toLowerCase());
-					if (!e || t) return;
-				}
-				H.handleKeyboardEvent(n);
-			}
 		};
 		return window.addEventListener("keydown", n, !0), () => window.removeEventListener("keydown", n, !0);
 	}, [e]), {
@@ -3309,18 +3297,27 @@ function zt() {
 	It.clear();
 }
 //#endregion
-//#region lib/styleHost.ts
+//#region lib/fileListHandlers.ts
 var Bt = null;
 function Vt(e) {
 	Bt = e;
 }
-function Ht() {
-	return Bt ?? document.documentElement;
+function J() {
+	return Bt;
 }
+//#endregion
+//#region lib/styleHost.ts
+var Ht = null;
 function Ut(e) {
+	Ht = e;
+}
+function Wt() {
+	return Ht ?? document.documentElement;
+}
+function Gt(e) {
 	return e.includes("\0");
 }
-function Wt(e) {
+function Kt(e) {
 	let t = e.lastIndexOf("\0");
 	if (t < 0) throw Error("Not a container path: " + JSON.stringify(e));
 	let n = e.slice(0, t), r = e.slice(t + 1);
@@ -3329,25 +3326,25 @@ function Wt(e) {
 		innerPath: r.startsWith("/") ? r : "/" + r
 	};
 }
-function Gt(e, t) {
+function qt(e, t) {
 	let n = t.startsWith("/") ? t : "/" + t;
 	return n.length > 1 && n.endsWith("/") && (n = n.slice(0, -1)), e + "\0" + n;
 }
 //#endregion
 //#region lib/utils/vfs.ts
-function Kt(e) {
+function Jt(e) {
 	return e.split("/").map((e) => encodeURIComponent(e)).join("/");
 }
-function qt(e) {
+function Yt(e) {
 	return e.replace(/\\/g, "/").replace(/(^|\/)([A-Za-z]):(?=\/|$)/g, "$1$2/");
 }
-function Jt(e) {
+function Xt(e) {
 	let t = e.startsWith("/") ? e : `/${e}`;
-	return "__TAURI_INTERNALS__" in window ? typeof navigator < "u" && /Windows/i.test(navigator.userAgent) ? `http://vfs.localhost${Kt(qt(t))}` : `vfs://vfs${Kt(t)}` : `${window.location.origin}/vfs/${Kt(t.replace(/^\/+/, ""))}`;
+	return "__TAURI_INTERNALS__" in window ? typeof navigator < "u" && /Windows/i.test(navigator.userAgent) ? `http://vfs.localhost${Jt(Yt(t))}` : `vfs://vfs${Jt(t)}` : `${window.location.origin}/vfs/${Jt(t.replace(/^\/+/, ""))}`;
 }
 //#endregion
 //#region lib/viewerEditorRegistry.ts
-function Yt(e, t) {
+function Zt(e, t) {
 	if (e === "*" || e === "*.*") return !0;
 	if (e.startsWith("*.")) {
 		let n = e.slice(1);
@@ -3355,14 +3352,14 @@ function Yt(e, t) {
 	}
 	return t.toLowerCase() === e.toLowerCase();
 }
-function Xt(e, t) {
-	return e.some((e) => Yt(e, t));
+function Qt(e, t) {
+	return e.some((e) => Zt(e, t));
 }
-function Zt(e, t) {
-	let n = e.filter((e) => Xt(e.contribution.patterns, t));
+function $t(e, t) {
+	let n = e.filter((e) => Qt(e.contribution.patterns, t));
 	return n.length === 0 ? null : (n.sort((e, t) => (t.contribution.priority ?? 0) - (e.contribution.priority ?? 0)), n[0]);
 }
-var Qt = class {
+var en = class {
 	entries = [];
 	listeners = /* @__PURE__ */ new Set();
 	clear() {
@@ -3375,7 +3372,7 @@ var Qt = class {
 		});
 	}
 	resolve(e) {
-		return Zt(this.entries, e);
+		return $t(this.entries, e);
 	}
 	getAll() {
 		return this.entries;
@@ -3388,7 +3385,7 @@ var Qt = class {
 	notifyListeners() {
 		for (let e of this.listeners) e();
 	}
-}, $t = class {
+}, tn = class {
 	entries = [];
 	listeners = /* @__PURE__ */ new Set();
 	clear() {
@@ -3401,7 +3398,7 @@ var Qt = class {
 		});
 	}
 	resolve(e) {
-		return Zt(this.entries, e);
+		return $t(this.entries, e);
 	}
 	getAll() {
 		return this.entries;
@@ -3414,7 +3411,7 @@ var Qt = class {
 	notifyListeners() {
 		for (let e of this.listeners) e();
 	}
-}, en = class {
+}, nn = class {
 	entries = [];
 	listeners = /* @__PURE__ */ new Set();
 	clear() {
@@ -3427,7 +3424,7 @@ var Qt = class {
 		});
 	}
 	resolve(e) {
-		return Zt(this.entries, e);
+		return $t(this.entries, e);
 	}
 	onChange(e) {
 		return this.listeners.add(e), () => {
@@ -3437,19 +3434,19 @@ var Qt = class {
 	notifyListeners() {
 		for (let e of this.listeners) e();
 	}
-}, tn = new Qt(), nn = new $t(), rn = new en();
-function an(e) {
-	tn.clear(), nn.clear(), rn.clear();
+}, rn = new en(), an = new tn(), on = new nn();
+function sn(e) {
+	rn.clear(), an.clear(), on.clear();
 	for (let t of e) {
-		if (t.viewers) for (let e of t.viewers) tn.register(e, t.dirPath);
-		if (t.editors) for (let e of t.editors) nn.register(e, t.dirPath);
-		if (t.fsProviders) for (let e of t.fsProviders) rn.register(e, t.dirPath);
+		if (t.viewers) for (let e of t.viewers) rn.register(e, t.dirPath);
+		if (t.editors) for (let e of t.editors) an.register(e, t.dirPath);
+		if (t.fsProviders) for (let e of t.fsProviders) on.register(e, t.dirPath);
 	}
-	tn.notifyListeners(), nn.notifyListeners(), rn.notifyListeners();
+	rn.notifyListeners(), an.notifyListeners(), on.notifyListeners();
 }
 //#endregion
 //#region lib/vscodeColorTheme.ts
-var on = [
+var cn = [
 	{
 		cssVar: "--bg",
 		keys: ["editor.background"]
@@ -3548,12 +3545,12 @@ var on = [
 		keys: ["activityBarBadge.foreground"]
 	}
 ];
-async function sn(e, t, n = 3) {
+async function ln(e, t, n = 3) {
 	let r = S(await Nt(e, t), void 0, { allowTrailingComma: !0 });
 	if (r.include && n > 0) {
 		let i = K(G(t), r.include);
 		try {
-			let t = await sn(e, i, n - 1);
+			let t = await ln(e, i, n - 1);
 			r.colors = {
 				...t.colors,
 				...r.colors
@@ -3562,56 +3559,47 @@ async function sn(e, t, n = 3) {
 	}
 	return r;
 }
-var cn = [], ln = 0, un = null, dn = [];
-function fn() {
-	return un;
+var un = [], dn = 0, fn = null, pn = [];
+function mn() {
+	return fn;
 }
-function pn(e) {
-	return dn.push(e), () => {
-		dn = dn.filter((t) => t !== e);
+function hn(e) {
+	return pn.push(e), () => {
+		pn = pn.filter((t) => t !== e);
 	};
 }
-function mn() {
-	if (un) for (let e of dn) e(un);
+function gn() {
+	if (fn) for (let e of pn) e(fn);
 }
-function hn(e) {
-	gn();
-	let t = Ht().style;
-	for (let n of on) for (let r of n.keys) {
+function _n(e) {
+	vn();
+	let t = Wt().style;
+	for (let n of cn) for (let r of n.keys) {
 		let i = e[r];
 		if (i) {
-			t.setProperty(n.cssVar, i), cn.push(n.cssVar);
+			t.setProperty(n.cssVar, i), un.push(n.cssVar);
 			break;
 		}
 	}
 }
-function gn() {
-	ln++;
-	let e = Ht().style;
-	for (let t of cn) e.removeProperty(t);
-	cn = [];
-	let t = un !== null;
-	if (un = null, t) for (let e of dn) e({ kind: Ht().dataset.theme === "light" ? "light" : "dark" });
+function vn() {
+	dn++;
+	let e = Wt().style;
+	for (let t of un) e.removeProperty(t);
+	un = [];
+	let t = fn !== null;
+	if (fn = null, t) for (let e of pn) e({ kind: Wt().dataset.theme === "light" ? "light" : "dark" });
 }
-function _n(e) {
+function yn(e) {
 	return e === "vs" || e === "hc-light" ? "light" : "dark";
 }
-async function vn(e, t, n) {
-	let r = ++ln, i = await sn(e, t);
-	return r === ln ? (i.colors && hn(i.colors), un = {
-		kind: n ? _n(n) : i.type === "light" ? "light" : "dark",
+async function bn(e, t, n) {
+	let r = ++dn, i = await ln(e, t);
+	return r === dn ? (i.colors && _n(i.colors), fn = {
+		kind: n ? yn(n) : i.type === "light" ? "light" : "dark",
 		colors: i.colors,
 		tokenColors: i.tokenColors
-	}, mn(), i) : i;
-}
-//#endregion
-//#region lib/fileListHandlers.ts
-var yn = null;
-function bn(e) {
-	yn = e;
-}
-function J() {
-	return yn;
+	}, gn(), i) : i;
 }
 //#endregion
 //#region lib/styles/viewers.module.css
@@ -3625,7 +3613,7 @@ var xn = {
 //#endregion
 //#region lib/components/ExtensionContainer.tsx
 async function Sn(e, t, n, r) {
-	let { containerFile: i, innerPath: a } = Wt(t), o = rn.resolve(q(i));
+	let { containerFile: i, innerPath: a } = Kt(t), o = on.resolve(q(i));
 	if (!o) throw Error(`No fsProvider registered for "${q(i)}"`);
 	if (o.contribution.runtime === "backend" && e.fsProvider) {
 		let t = K(o.extensionDirPath, o.contribution.entry);
@@ -3638,7 +3626,7 @@ async function Sn(e, t, n, r) {
 function Cn(e) {
 	let { extensionDirPath: t, entry: n, kind: r, props: a, onClose: s, className: c, style: l, active: f } = e, h = ke(), g = u(null), [_, v] = d(null), [y, b] = d(!0), x = u(s);
 	x.current = s;
-	let S = r === "viewer" && !!a.inline, C = r === "editor" || r === "viewer" && !S, w = u(null), T = u(!1), E = u(!1);
+	let S = r === "viewer" && !!a.inline, C = r === "viewer" && !S, w = u(null), T = u(!1), E = u(!1);
 	o(() => {
 		S && (w.current = document.activeElement, T.current = !1, E.current = !1);
 	}, [S]), o(() => {
@@ -3704,11 +3692,11 @@ function Cn(e) {
 	let M = i(() => ({
 		async readFile(e) {
 			let t = W(e);
-			return Ut(t) ? Sn(h, t, 0, 64 * 1024 * 1024) : h.fs.readFile(t);
+			return Gt(t) ? Sn(h, t, 0, 64 * 1024 * 1024) : h.fs.readFile(t);
 		},
 		async readFileRange(e, t, n) {
 			let r = W(e);
-			if (Ut(r)) return Sn(h, r, t, n);
+			if (Gt(r)) return Sn(h, r, t, n);
 			let i = D.current, a = i;
 			if (!a || a.path !== r) {
 				if (i) try {
@@ -3725,7 +3713,7 @@ function Cn(e) {
 		},
 		async readFileText(e) {
 			let t = W(e);
-			if (Ut(t)) {
+			if (Gt(t)) {
 				let t = await this.readFile(e);
 				return new TextDecoder().decode(t);
 			}
@@ -3733,7 +3721,7 @@ function Cn(e) {
 		},
 		async statFile(e) {
 			let t = W(e);
-			if (Ut(t)) return {
+			if (Gt(t)) return {
 				size: (await Sn(h, t, 0, 64 * 1024 * 1024)).byteLength,
 				mtimeMs: 0
 			};
@@ -3762,10 +3750,10 @@ function Cn(e) {
 			return h.theme.get();
 		},
 		getColorTheme() {
-			return fn();
+			return mn();
 		},
 		onThemeChange(e) {
-			let t = pn(e);
+			let t = hn(e);
 			return () => t();
 		},
 		onClose() {
@@ -3793,7 +3781,7 @@ function Cn(e) {
 	}), []), N = i(() => {
 		let e = {};
 		try {
-			let t = getComputedStyle(Ht());
+			let t = getComputedStyle(Wt());
 			for (let n = 0; n < t.length; n++) {
 				let r = t[n];
 				if (!r || !r.startsWith("--")) continue;
@@ -3809,7 +3797,7 @@ function Cn(e) {
 		b(!0), v(null);
 		let o = M(), s = i.contentWindow;
 		if (!s) return;
-		let c = W(n.replace(/^\.\//, "")) || "index.js", l = K(t, c), u = Jt(l), d = /\.mjs(?:\?|$)/i.test(c), f = 1, p = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map(), _ = /* @__PURE__ */ new Map(), y = /* @__PURE__ */ new Map(), x = (t) => {
+		let c = W(n.replace(/^\.\//, "")) || "index.js", l = K(t, c), u = Xt(l), d = /\.mjs(?:\?|$)/i.test(c), f = 1, p = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map(), _ = /* @__PURE__ */ new Map(), y = /* @__PURE__ */ new Map(), x = (t) => {
 			if (t.source !== s) return;
 			let n = t.data;
 			if (!(!n || typeof n != "object")) {
@@ -3974,7 +3962,7 @@ function Cn(e) {
 					themeVars: N()
 				}, "*");
 			} catch {}
-		}, E = pn(() => C()), k = !1, j = async () => {
+		}, E = hn(() => C()), k = !1, j = async () => {
 			if (k) return;
 			k = !0, O.current = a.filePath;
 			let t;
@@ -4063,7 +4051,7 @@ function Cn(e) {
 			_
 		]
 	});
-	let F = Jt(`/_ext/${G(K(t, W(n.replace(/^\.\//, "")) || "index.js")).replace(/^\//, "")}/`);
+	let F = Xt(`/_ext/${G(K(t, W(n.replace(/^\.\//, "")) || "index.js")).replace(/^\//, "")}/`);
 	return /* @__PURE__ */ m("div", {
 		className: c,
 		style: {
@@ -4100,16 +4088,33 @@ function Cn(e) {
 	});
 }
 function wn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, fileSize: a, inline: s, visible: c, onClose: d, onExecuteCommand: f }) {
-	let h = u(!1), g = c ?? !0, _ = i(() => {
-		requestAnimationFrame(() => {
-			J()?.focus();
-		});
-	}, []), v = i(() => {
-		d(), _();
-	}, [d, _]);
+	let h = u(!1), g = u(null), _ = c ?? !0, v = i(() => {
+		A.set("panel");
+		let e = (t = 0) => {
+			let n = g.current;
+			if (n && n.isConnected) try {
+				n.focus({ preventScroll: !0 });
+				return;
+			} catch {
+				try {
+					n.focus();
+					return;
+				} catch {}
+			}
+			let r = J();
+			if (r) {
+				r.focus();
+				return;
+			}
+			t < 2 && requestAnimationFrame(() => e(t + 1));
+		};
+		requestAnimationFrame(() => e());
+	}, []), y = i(() => {
+		d(), v();
+	}, [d, v]);
 	o(() => {
 		if (!s) {
-			if (g) h.current ||= (A.push("viewer"), !0);
+			if (_) h.current ||= (g.current = document.activeElement, A.push("viewer"), !0);
 			else if (h.current) {
 				try {
 					A.pop("viewer");
@@ -4117,7 +4122,7 @@ function wn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, fileSize:
 				h.current = !1;
 			}
 		}
-	}, [s, g]), o(() => () => {
+	}, [s, _]), o(() => () => {
 		if (h.current) {
 			try {
 				A.pop("viewer");
@@ -4125,7 +4130,7 @@ function wn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, fileSize:
 			h.current = !1;
 		}
 	}, []);
-	let y = l(() => ({
+	let b = l(() => ({
 		filePath: n,
 		fileName: r,
 		fileSize: a,
@@ -4135,7 +4140,7 @@ function wn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, fileSize:
 		r,
 		a,
 		s
-	]), b = /* @__PURE__ */ m("div", {
+	]), x = /* @__PURE__ */ m("div", {
 		style: {
 			display: "flex",
 			alignItems: "center",
@@ -4158,7 +4163,7 @@ function wn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, fileSize:
 		}), /* @__PURE__ */ p("button", {
 			type: "button",
 			title: "Close (Esc)",
-			onClick: v,
+			onClick: y,
 			style: {
 				background: "transparent",
 				border: "none",
@@ -4171,13 +4176,13 @@ function wn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, fileSize:
 			"aria-label": "Close",
 			children: "×"
 		})]
-	}), x = /* @__PURE__ */ p(Cn, {
+	}), S = /* @__PURE__ */ p(Cn, {
 		kind: "viewer",
 		extensionDirPath: e,
 		entry: t,
-		props: y,
-		active: g,
-		onClose: v,
+		props: b,
+		active: _,
+		onClose: y,
 		onExecuteCommand: f,
 		style: {
 			width: "100%",
@@ -4196,11 +4201,11 @@ function wn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, fileSize:
 				flex: 1,
 				minHeight: 0
 			},
-			children: x
+			children: S
 		})
 	}) : /* @__PURE__ */ p("div", {
 		className: xn["file-viewer-overlay"],
-		style: { display: g ? "flex" : "none" },
+		style: { display: _ ? "flex" : "none" },
 		children: /* @__PURE__ */ m("div", {
 			className: xn["file-viewer"],
 			style: {
@@ -4208,35 +4213,52 @@ function wn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, fileSize:
 				flexDirection: "column",
 				padding: 0
 			},
-			children: [b, /* @__PURE__ */ p("div", {
+			children: [x, /* @__PURE__ */ p("div", {
 				style: {
 					flex: 1,
 					minHeight: 0
 				},
-				children: x
+				children: S
 			})]
 		})
 	});
 }
 function Tn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, langId: a, visible: s, onClose: c, onDirtyChange: h, languages: g, grammars: _ }) {
-	let [v, y] = d(a), b = u(!1), x = s ?? !0, S = i(() => {
-		requestAnimationFrame(() => {
-			J()?.focus();
-		});
-	}, []), C = i(() => {
-		c(), S();
-	}, [c, S]);
+	let [v, y] = d(a), b = u(!1), x = u(null), S = s ?? !0, C = i(() => {
+		A.set("panel");
+		let e = (t = 0) => {
+			let n = x.current;
+			if (n && n.isConnected) try {
+				n.focus({ preventScroll: !0 });
+				return;
+			} catch {
+				try {
+					n.focus();
+					return;
+				} catch {}
+			}
+			let r = J();
+			if (r) {
+				r.focus();
+				return;
+			}
+			t < 2 && requestAnimationFrame(() => e(t + 1));
+		};
+		requestAnimationFrame(() => e());
+	}, []), w = i(() => {
+		c(), C();
+	}, [c, C]);
 	o(() => {
 		y(a);
 	}, [a]), o(() => {
-		if (x) b.current ||= (A.push("editor"), !0);
+		if (S) b.current ||= (x.current = document.activeElement, A.push("editor"), !0);
 		else if (b.current) {
 			try {
 				A.pop("editor");
 			} catch {}
 			b.current = !1;
 		}
-	}, [x]), o(() => () => {
+	}, [S]), o(() => () => {
 		if (b.current) {
 			try {
 				A.pop("editor");
@@ -4244,7 +4266,7 @@ function Tn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, langId: a
 			b.current = !1;
 		}
 	}, []);
-	let w = l(() => ({
+	let T = l(() => ({
 		filePath: n,
 		fileName: r,
 		langId: v,
@@ -4259,16 +4281,16 @@ function Tn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, langId: a
 		e,
 		g,
 		_
-	]), T = (e) => {
+	]), E = (e) => {
 		let t = e.target.value;
 		y(t);
-	}, E = l(() => {
+	}, D = l(() => {
 		let e = g ?? [], t = /* @__PURE__ */ new Set();
 		return e.filter((e) => t.has(e.id) ? !1 : (t.add(e.id), !0));
-	}, [g]), D = E.length > 0;
+	}, [g]), O = D.length > 0;
 	return /* @__PURE__ */ p("div", {
 		className: xn["file-editor-overlay"],
-		style: { display: x ? "flex" : "none" },
+		style: { display: S ? "flex" : "none" },
 		children: /* @__PURE__ */ m("div", {
 			className: xn["file-editor"],
 			style: {
@@ -4298,14 +4320,14 @@ function Tn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, langId: a
 						title: r,
 						children: r
 					}),
-					D && /* @__PURE__ */ m(f, { children: [/* @__PURE__ */ p("label", {
+					O && /* @__PURE__ */ m(f, { children: [/* @__PURE__ */ p("label", {
 						htmlFor: "editor-lang-select",
 						style: { whiteSpace: "nowrap" },
 						children: "Language:"
 					}), /* @__PURE__ */ m("select", {
 						id: "editor-lang-select",
 						value: v,
-						onChange: T,
+						onChange: E,
 						style: {
 							minWidth: 120,
 							padding: "2px 6px"
@@ -4313,7 +4335,7 @@ function Tn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, langId: a
 						children: [/* @__PURE__ */ p("option", {
 							value: "plaintext",
 							children: "Plain Text"
-						}), E.map((e) => /* @__PURE__ */ p("option", {
+						}), D.map((e) => /* @__PURE__ */ p("option", {
 							value: e.id,
 							children: e.aliases?.[0] ?? e.id
 						}, e.id))]
@@ -4321,7 +4343,7 @@ function Tn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, langId: a
 					/* @__PURE__ */ p("button", {
 						type: "button",
 						title: "Close (Esc)",
-						onClick: C,
+						onClick: w,
 						style: {
 							background: "transparent",
 							border: "none",
@@ -4344,9 +4366,9 @@ function Tn({ extensionDirPath: e, entry: t, filePath: n, fileName: r, langId: a
 					kind: "editor",
 					extensionDirPath: e,
 					entry: t,
-					props: w,
-					active: x,
-					onClose: C,
+					props: T,
+					active: S,
+					onClose: w,
 					onDirtyChange: h,
 					style: {
 						width: "100%",
@@ -5976,7 +5998,7 @@ var yi = r(function({ currentPath: e, parentNode: t, entries: n, onNavigate: r,
 	]);
 	let ye = i(() => {
 		let e = V.current[L.current], t = e?.entry.type === "file", n = t && e != null && !!e.entry.meta.executable, r = e?.entry.name ?? "";
-		H.beginBatch(), H.setContext("listItemIsFile", t), H.setContext("listItemIsFolder", !t && e != null), H.setContext("listItemIsExecutable", n), H.setContext("listItemHasViewer", t && tn.resolve(r) !== null), H.setContext("listItemHasEditor", t && nn.resolve(r) !== null), H.endBatch();
+		H.beginBatch(), H.setContext("listItemIsFile", t), H.setContext("listItemIsFolder", !t && e != null), H.setContext("listItemIsExecutable", n), H.setContext("listItemHasViewer", t && rn.resolve(r) !== null), H.setContext("listItemHasEditor", t && an.resolve(r) !== null), H.endBatch();
 	}, []);
 	o(() => {
 		s && ye();
@@ -5987,12 +6009,12 @@ var yi = r(function({ currentPath: e, parentNode: t, entries: n, onNavigate: r,
 		ye
 	]), o(() => {
 		if (!s) return;
-		let e = tn.onChange(ye), t = nn.onChange(ye);
+		let e = rn.onChange(ye), t = an.onChange(ye);
 		return () => {
 			e(), t();
 		};
 	}, [s, ye]), o(() => {
-		if (s) return bn({
+		if (s) return Vt({
 			focus: () => {
 				_.current?.focus({ preventScroll: !0 });
 			},
@@ -6133,7 +6155,7 @@ var yi = r(function({ currentPath: e, parentNode: t, entries: n, onNavigate: r,
 				let n = (e.entry.path ?? "").split("\0")[0], r = /^[a-zA-Z0-9._+/:-]+$/.test(n) ? n : JSON.stringify(n);
 				t.pasteToCommandLine(r);
 			})
-		}), () => bn(null);
+		}), () => Vt(null);
 	}, [
 		s,
 		R,
@@ -6508,7 +6530,7 @@ function Wi({ side: e, panel: t, onRememberExpectedTerminalCwd: n, selectionKey:
 				}, T.id) : T?.type === "preview" ? (() => {
 					let e = T;
 					if (e.type !== "preview") return null;
-					let t = tn.resolve(e.name);
+					let t = rn.resolve(e.name);
 					return t ? /* @__PURE__ */ p(wn, {
 						extensionDirPath: t.extensionDirPath,
 						entry: t.contribution.entry,
@@ -7179,8 +7201,8 @@ function ha({ settingsLoaded: e, onRefreshPanels: t }) {
 	v.current = t;
 	let x = u([]), S = u([]), C = u(!1);
 	o(() => {
-		let e = s ? Jn(x.current, s) : null, t = e ? _n(e.theme.uiTheme) : c === "light" || c === "high-contrast-light" ? "light" : "dark";
-		Ht().dataset.theme = t, h(t);
+		let e = s ? Jn(x.current, s) : null, t = e ? yn(e.theme.uiTheme) : c === "light" || c === "high-contrast-light" ? "light" : "dark";
+		Wt().dataset.theme = t, h(t);
 	}, [c, s]);
 	let w = i(async (e, t) => {
 		if (!t) return;
@@ -7200,10 +7222,10 @@ function ha({ settingsLoaded: e, onRefreshPanels: t }) {
 			v.current();
 		})();
 	}, [a, w]), o(() => {
-		if (C.current) if (!s) gn();
+		if (C.current) if (!s) vn();
 		else {
 			let e = Jn(x.current, s);
-			e && vn(n, e.theme.jsonPath, e.theme.uiTheme).catch(() => gn());
+			e && bn(n, e.theme.jsonPath, e.theme.uiTheme).catch(() => vn());
 		}
 	}, [s]), o(() => {
 		if (!e) return;
@@ -7221,19 +7243,19 @@ function ha({ settingsLoaded: e, onRefreshPanels: t }) {
 			n?.vscodeIconThemePath ? await m("vscode", n.vscodeIconThemePath) : n?.iconThemeFssPath ? await m("fss") : await m("none");
 		}, a = async (e, t) => {
 			if (!t) {
-				gn();
+				vn();
 				return;
 			}
 			let r = Jn(e, t);
 			if (r) {
-				let e = _n(r.theme.uiTheme);
-				Ht().dataset.theme = e, h(e);
+				let e = yn(r.theme.uiTheme);
+				Wt().dataset.theme = e, h(e);
 				try {
-					await vn(n, r.theme.jsonPath, r.theme.uiTheme);
+					await bn(n, r.theme.jsonPath, r.theme.uiTheme);
 				} catch (e) {
-					console.warn("[ExtHost] Failed to load color theme:", t, e), gn();
+					console.warn("[ExtHost] Failed to load color theme:", t, e), vn();
 				}
-			} else gn();
+			} else vn();
 		}, o = (e) => {
 			for (let e of S.current) try {
 				e();
@@ -7254,7 +7276,7 @@ function ha({ settingsLoaded: e, onRefreshPanels: t }) {
 			}
 		}, s = r.onLoaded((e) => {
 			(async () => {
-				if (x.current = e, l(e), an(e), zt(), n.fsProvider) {
+				if (x.current = e, l(e), sn(e), zt(), n.fsProvider) {
 					for (let t of e) for (let e of t.fsProviders ?? []) if (e.runtime === "backend") {
 						let r = K(t.dirPath, e.entry);
 						n.fsProvider.load(r).catch(() => {});
@@ -7379,8 +7401,8 @@ function _a(e, t, n, r) {
 			destPath: o,
 			onConfirm: async (e, t) => {
 				try {
-					if (r.some((e) => Ut(e))) {
-						if (!r.every((e) => Ut(e))) throw Error("Cannot copy files from archives and local files in the same operation");
+					if (r.some((e) => Gt(e))) {
+						if (!r.every((e) => Gt(e))) throw Error("Cannot copy files from archives and local files in the same operation");
 						let e = {
 							type: "copyProgress",
 							bytesCopied: 0,
@@ -7393,7 +7415,7 @@ function _a(e, t, n, r) {
 						f.current = e, a(e);
 						let n = [];
 						for (let e of r) {
-							let { containerFile: t, innerPath: r } = Wt(e), i = rn.resolve(q(t));
+							let { containerFile: t, innerPath: r } = Kt(e), i = on.resolve(q(t));
 							if (!i) throw Error(`No fsProvider registered for "${q(t)}"`);
 							let a = null, o = null;
 							i.contribution.runtime === "backend" && l.fsProvider ? a = K(i.extensionDirPath, i.contribution.entry) : o = await Rt(l, i.extensionDirPath, i.contribution.entry), (await ga(async (e) => a ? l.fsProvider.listEntries(a, t, e) : (await o.listEntries(t, e)).map((e) => ({
@@ -8466,8 +8488,8 @@ function $a(e) {
 			n.current.leftRef.current.cancelNavigation(), n.current.rightRef.current.cancelNavigation();
 		})), e.push(H.registerCommand("dotdir.goToParent", () => {
 			let { leftRef: e, rightRef: t } = n.current, r = g.current === "left" ? e.current : t.current, i = r.currentPath;
-			if (Ut(i)) {
-				let { containerFile: e, innerPath: t } = Wt(i);
+			if (Gt(i)) {
+				let { containerFile: e, innerPath: t } = Kt(i);
 				if (t === "/" || t === "") {
 					r.navigateTo(G(e), !1, q(e));
 					return;
@@ -8653,8 +8675,8 @@ function co(e) {
 		p.current = i, f.current = setTimeout(() => c(!0), 300);
 		try {
 			let n = (async () => {
-				if (v.current = e, Ut(e)) {
-					let { containerFile: n, innerPath: o } = Wt(e), s = rn.resolve(q(n));
+				if (v.current = e, Gt(e)) {
+					let { containerFile: n, innerPath: o } = Kt(e), s = on.resolve(q(n));
 					if (!s) throw Error(`No fsProvider registered for "${q(n)}"`);
 					let c;
 					if (s.contribution.runtime === "backend" && t.fsProvider) {
@@ -8688,7 +8710,7 @@ function co(e) {
 									nlink: 1,
 									entryKind: e.type === "directory" ? "directory" : "file"
 								},
-								path: Gt(n, t),
+								path: qt(n, t),
 								parent: l
 							});
 						}),
@@ -9190,7 +9212,7 @@ function Mo({ widget: e }) {
 		H.setContext("dialogOpen", h !== null);
 	}, [h]);
 	let lt = i((e, t, n) => {
-		if (rn.resolve(q(e))) {
+		if (on.resolve(q(e))) {
 			Qe.current(e + "\0");
 			return;
 		}
@@ -9258,7 +9280,7 @@ function Mo({ widget: e }) {
 			index: i,
 			total: r.length
 		};
-	}, [O, ht]), yt = O ? tn.resolve(O.name) : null, bt = j ? nn.resolve(j.name) : null;
+	}, [O, ht]), yt = O ? rn.resolve(O.name) : null, bt = j ? an.resolve(j.name) : null;
 	o(() => {
 		yt && P((e) => e?.dirPath === yt.extensionDirPath && e?.entry === yt.contribution.entry ? e : {
 			dirPath: yt.extensionDirPath,
@@ -9484,13 +9506,12 @@ function Mo({ widget: e }) {
 				message: "No viewer extension found for this file type. Install viewer extensions (e.g. Image Viewer, File Viewer) from the extensions panel.",
 				onClose: () => k(null)
 			}),
-			N && /* @__PURE__ */ p(wn, {
+			N && O && yt && /* @__PURE__ */ p(wn, {
 				extensionDirPath: N.dirPath,
 				entry: N.entry,
-				filePath: O?.path ?? "",
-				fileName: O?.name ?? "",
-				fileSize: O?.size ?? 0,
-				visible: O != null && yt != null,
+				filePath: O.path,
+				fileName: O.name,
+				fileSize: O.size,
 				onClose: () => k(null),
 				onExecuteCommand: vt
 			}, `viewer:${N.dirPath}:${N.entry}`),
@@ -9499,7 +9520,7 @@ function Mo({ widget: e }) {
 				message: "No editor extension found for this file type. Install an editor extension (e.g. Monaco Editor) from the extensions panel.",
 				onClose: () => M(null)
 			}),
-			I && (() => {
+			I && j && bt && (() => {
 				let e = ge.flatMap((e) => e.languages ?? []), t = ge.flatMap((e) => e.grammarRefs ?? []).map((e) => ({
 					contribution: e.contribution,
 					path: e.path
@@ -9507,10 +9528,9 @@ function Mo({ widget: e }) {
 				return /* @__PURE__ */ p(Tn, {
 					extensionDirPath: I.dirPath,
 					entry: I.entry,
-					filePath: j?.path ?? "",
-					fileName: j?.name ?? "",
-					langId: j?.langId ?? "plaintext",
-					visible: j != null && bt != null,
+					filePath: j.path,
+					fileName: j.name,
+					langId: j.langId,
 					onClose: () => M(null),
 					languages: e,
 					grammars: t
@@ -9533,8 +9553,8 @@ function No({ bridge: e, widget: t }) {
 		H.registerContributions(je);
 	}, []), o(() => {
 		let e = n.current;
-		if (e) return Vt(e), () => {
-			n.current === e && Vt(null);
+		if (e) return Ut(e), () => {
+			n.current === e && Ut(null);
 		};
 	}, []), /* @__PURE__ */ p("div", {
 		ref: n,