@eveshipfit/ui-ingame 1.1.0 → 1.2.0

package/dist/index.mjs

@@ -2,7 +2,7 @@ import './style.css';
 import { c } from "react/compiler-runtime";
 import { useEffect, useId, useRef, useState } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { formatClock, formatDuration, formatNumber, useAttribute, useAttributeTooltip, useBayUsage, useCanFit, useChargeTree, useChargedModules, useCharges, useDrag, useFit, useFitHistory, useFitStore, useHardpoints, useHullTree, useImages, useLocalFits, useMissingSkills, useModuleTree, usePlacement, usePreview, useRackUsage, useSde, useSlots, useType, useViolations } from "@eveshipfit/react-hooks";
+import { formatClock, formatDuration, formatNumber, useAttribute, useAttributeTooltip, useBayContents, useBayUsage, useCanFit, useChargeSearch, useChargeTree, useChargedModules, useCharges, useDrag, useDroneRoom, useFit, useFitHistory, useFitStore, useHardpoints, useHullTree, useImages, useLocalFits, useMissingSkills, useModuleSearch, useModuleTree, usePlacement, usePreview, useRackUsage, useSde, useSlots, useSnapshot, useType, useViolations } from "@eveshipfit/react-hooks";
 //#region src/primitives/Dialog/Dialog.module.css
 var Dialog_module_default = {
 	"close": "kwi1cG_close",
@@ -465,6 +465,7 @@ const textures = {
 	collapse: "eveicon/system_icons/collapse_16px",
 	checkmark: "eveicon/system_icons/checkmark_16px",
 	close: "eveicon/system_icons/close_16px",
+	folder: "eveicon/system_icons/folder_16px",
 	"fits-browser": "windowicons/browser",
 	"fits-personal": "windowicons/member",
 	"fits-corporation": "windowicons/corporation",
@@ -615,7 +616,10 @@ function Tooltip(t0) {
 	if ($[7] === Symbol.for("react.memo_cache_sentinel")) {
 		t8 = () => show(true);
 		t9 = () => show(false);
-		t10 = (event) => show(event.target.matches(":focus-visible"));
+		t10 = (event) => {
+			const target = event.target;
+			setTimeout(() => show(target.matches(":focus-visible")));
+		};
 		t11 = () => show(false);
 		t12 = (event_0) => {
 			if (event_0.key === "Escape") show(false);
@@ -1272,7 +1276,7 @@ function WheelSlot(t0) {
 				})
 			});
 		}
-		t7 = row.findLastIndex(_temp$5);
+		t7 = row.findLastIndex(_temp$6);
 		$[23] = chargeTypeId;
 		$[24] = fitted;
 		$[25] = onRemoveCharge;
@@ -1457,7 +1461,7 @@ function _temp2$2(event) {
 		shiftKey: event.shiftKey
 	}));
 }
-function _temp$5(action) {
+function _temp$6(action) {
 	return action !== void 0;
 }
 function Action(t0) {
@@ -1918,11 +1922,14 @@ function StatsSection(t0) {
 }
 //#endregion
 //#region src/primitives/ResistanceBar/ResistanceBar.module.css
-var ResistanceBar_module_default = { "bar": "QyA-_q_bar" };
+var ResistanceBar_module_default = {
+	"bar": "QyA-_q_bar",
+	"text": "QyA-_q_text"
+};
 //#endregion
 //#region src/primitives/ResistanceBar/ResistanceBar.tsx
 function ResistanceBar(t0) {
-	const $ = c(11);
+	const $ = c(13);
 	const { damage, label, resistance, children } = t0;
 	let t1;
 	if ($[0] !== resistance) {
@@ -1932,8 +1939,17 @@ function ResistanceBar(t0) {
 	} else t1 = $[1];
 	const t2 = t1;
 	let t3;
-	if ($[2] !== children || $[3] !== damage || $[4] !== label || $[5] !== resistance || $[6] !== t2) {
-		t3 = /* @__PURE__ */ jsx("div", {
+	if ($[2] !== children) {
+		t3 = /* @__PURE__ */ jsx("span", {
+			className: ResistanceBar_module_default.text,
+			children
+		});
+		$[2] = children;
+		$[3] = t3;
+	} else t3 = $[3];
+	let t4;
+	if ($[4] !== damage || $[5] !== label || $[6] !== resistance || $[7] !== t2 || $[8] !== t3) {
+		t4 = /* @__PURE__ */ jsx("div", {
 			className: ResistanceBar_module_default.bar,
 			role: "meter",
 			"aria-label": label,
@@ -1942,26 +1958,26 @@ function ResistanceBar(t0) {
 			"aria-valuenow": resistance,
 			"data-damage": damage,
 			style: t2,
-			children
+			children: t3
 		});
-		$[2] = children;
-		$[3] = damage;
-		$[4] = label;
-		$[5] = resistance;
-		$[6] = t2;
-		$[7] = t3;
-	} else t3 = $[7];
-	let t4;
-	if ($[8] !== label || $[9] !== t3) {
-		t4 = /* @__PURE__ */ jsx(Tooltip, {
+		$[4] = damage;
+		$[5] = label;
+		$[6] = resistance;
+		$[7] = t2;
+		$[8] = t3;
+		$[9] = t4;
+	} else t4 = $[9];
+	let t5;
+	if ($[10] !== label || $[11] !== t4) {
+		t5 = /* @__PURE__ */ jsx(Tooltip, {
 			label,
-			children: t3
+			children: t4
 		});
-		$[8] = label;
-		$[9] = t3;
-		$[10] = t4;
-	} else t4 = $[10];
-	return t4;
+		$[10] = label;
+		$[11] = t4;
+		$[12] = t5;
+	} else t5 = $[12];
+	return t5;
 }
 //#endregion
 //#region src/primitives/CapacitorRing/CapacitorRing.module.css
@@ -2092,23 +2108,15 @@ function FittingWheel(t0) {
 	const ship = useFit().ship.type_id;
 	const { turret, launcher } = useHardpoints();
 	const { show, clear } = usePreview();
-	const previewing = useRef(void 0);
 	let t2;
 	if ($[0] !== show) {
-		t2 = (target, edit) => {
-			previewing.current = target;
-			show(edit);
-		};
+		t2 = (target, edit) => show(edit, target);
 		$[0] = show;
 		$[1] = t2;
 	} else t2 = $[1];
 	let t3;
 	if ($[2] !== clear) {
-		t3 = (target_0) => {
-			if (previewing.current !== target_0) return;
-			previewing.current = void 0;
-			clear();
-		};
+		t3 = (target_0) => clear(target_0);
 		$[2] = clear;
 		$[3] = t3;
 	} else t3 = $[3];
@@ -2137,7 +2145,7 @@ function FittingWheel(t0) {
 	} else t6 = $[10];
 	let t7;
 	if ($[11] === Symbol.for("react.memo_cache_sentinel")) {
-		t7 = markedRacks.map(_temp$4);
+		t7 = markedRacks.map(_temp$5);
 		$[11] = t7;
 	} else t7 = $[11];
 	let t8;
@@ -2211,7 +2219,7 @@ function FittingWheel(t0) {
 	return t13;
 }
 /** What a drop would do, shown while dragging over a target. */
-function _temp$4(rack) {
+function _temp$5(rack) {
 	return /* @__PURE__ */ jsx(WheelRackMarker, { rack }, rack);
 }
 function FittingRack(t0) {
@@ -2239,47 +2247,56 @@ function FittingRack(t0) {
 }
 /** Fits a type dropped in the middle of the wheel, and unfits a fitted item. */
 function FittingCentre(t0) {
-	const $ = c(21);
+	const $ = c(25);
 	const { dropPreview } = t0;
 	const store = useFitStore();
 	const fit = useFit();
 	const { dragging, end } = useDrag();
 	let t1;
-	if ($[0] !== fit) {
-		t1 = (item) => item !== void 0 && (item.type === "type" || fit.items[item.ref] !== void 0);
-		$[0] = fit;
-		$[1] = t1;
-	} else t1 = $[1];
-	const takes = t1;
+	if ($[0] !== dragging || $[1] !== store) {
+		t1 = dragging?.type === "type" && placesSomewhere(store, dragging.typeId);
+		$[0] = dragging;
+		$[1] = store;
+		$[2] = t1;
+	} else t1 = $[2];
+	const fits = t1;
 	let t2;
-	if ($[2] !== dragging || $[3] !== dropPreview) {
-		t2 = () => {
+	if ($[3] !== fit || $[4] !== fits) {
+		t2 = (item) => item !== void 0 && (item.type === "type" ? fits : fit.items[item.ref] !== void 0);
+		$[3] = fit;
+		$[4] = fits;
+		$[5] = t2;
+	} else t2 = $[5];
+	const takes = t2;
+	let t3;
+	if ($[6] !== dragging || $[7] !== dropPreview) {
+		t3 = () => {
 			if (dragging?.type !== "type") return;
 			const { typeId } = dragging;
 			dropPreview.show("centre", (draft) => void draft.fit(typeId));
 		};
-		$[2] = dragging;
-		$[3] = dropPreview;
-		$[4] = t2;
-	} else t2 = $[4];
-	let t3;
-	if ($[5] !== dropPreview) {
-		t3 = () => dropPreview.hide("centre");
-		$[5] = dropPreview;
-		$[6] = t3;
-	} else t3 = $[6];
+		$[6] = dragging;
+		$[7] = dropPreview;
+		$[8] = t3;
+	} else t3 = $[8];
 	let t4;
-	if ($[7] !== dragging || $[8] !== takes) {
-		t4 = (event) => {
+	if ($[9] !== dropPreview) {
+		t4 = () => dropPreview.hide("centre");
+		$[9] = dropPreview;
+		$[10] = t4;
+	} else t4 = $[10];
+	let t5;
+	if ($[11] !== dragging || $[12] !== takes) {
+		t5 = (event) => {
 			if (takes(dragging)) allowDrop(event, dragging);
 		};
-		$[7] = dragging;
-		$[8] = takes;
-		$[9] = t4;
-	} else t4 = $[9];
-	let t5;
-	if ($[10] !== dragging || $[11] !== dropPreview || $[12] !== end || $[13] !== store || $[14] !== takes) {
-		t5 = (event_0) => {
+		$[11] = dragging;
+		$[12] = takes;
+		$[13] = t5;
+	} else t5 = $[13];
+	let t6;
+	if ($[14] !== dragging || $[15] !== dropPreview || $[16] !== end || $[17] !== store || $[18] !== takes) {
+		t6 = (event_0) => {
 			if (!takes(dragging)) return;
 			event_0.preventDefault();
 			dropPreview.hide("centre");
@@ -2287,30 +2304,30 @@ function FittingCentre(t0) {
 			else store.remove(dragging.ref);
 			end();
 		};
-		$[10] = dragging;
-		$[11] = dropPreview;
-		$[12] = end;
-		$[13] = store;
-		$[14] = takes;
-		$[15] = t5;
-	} else t5 = $[15];
-	let t6;
-	if ($[16] !== t2 || $[17] !== t3 || $[18] !== t4 || $[19] !== t5) {
-		t6 = /* @__PURE__ */ jsx("div", {
+		$[14] = dragging;
+		$[15] = dropPreview;
+		$[16] = end;
+		$[17] = store;
+		$[18] = takes;
+		$[19] = t6;
+	} else t6 = $[19];
+	let t7;
+	if ($[20] !== t3 || $[21] !== t4 || $[22] !== t5 || $[23] !== t6) {
+		t7 = /* @__PURE__ */ jsx("div", {
 			className: FittingWheel_module_default.centre,
 			"data-centre": true,
-			onDragEnter: t2,
-			onDragLeave: t3,
-			onDragOver: t4,
-			onDrop: t5
+			onDragEnter: t3,
+			onDragLeave: t4,
+			onDragOver: t5,
+			onDrop: t6
 		});
-		$[16] = t2;
-		$[17] = t3;
-		$[18] = t4;
-		$[19] = t5;
-		$[20] = t6;
-	} else t6 = $[20];
-	return t6;
+		$[20] = t3;
+		$[21] = t4;
+		$[22] = t5;
+		$[23] = t6;
+		$[24] = t7;
+	} else t7 = $[24];
+	return t7;
 }
 function FittingSlot(t0) {
 	const $ = c(80);
@@ -2545,6 +2562,13 @@ function movesTo(fit, ref, rack, index) {
 	if (item === void 0 || rack === "subsystem" || item.slot.type !== rack) return false;
 	return "index" in item.slot && item.slot.index !== index;
 }
+function placesSomewhere(store, typeId) {
+	let placed = false;
+	store.preview((draft) => {
+		placed = draft.fit(typeId) !== void 0;
+	});
+	return placed;
+}
 function allowDrop(event, dragging) {
 	event.preventDefault();
 	event.dataTransfer.dropEffect = dragging.type === "type" ? "copy" : "move";
@@ -2579,9 +2603,449 @@ function FittingGauge(t0) {
 	return t4;
 }
 //#endregion
+//#region src/components/ShipStatistics/AttributeTooltip.tsx
+/** What EVE shows when hovering the attribute; its name, for one without. */
+function AttributeTooltip(t0) {
+	const $ = c(7);
+	const { attribute } = t0;
+	const sde = useSde();
+	const tooltip = useAttributeTooltip(attribute);
+	let t1;
+	if ($[0] !== attribute || $[1] !== sde || $[2] !== tooltip?.title) {
+		t1 = tooltip?.title ?? sde.attribute(sde.attributeId(attribute) ?? 0)?.displayName ?? attribute;
+		$[0] = attribute;
+		$[1] = sde;
+		$[2] = tooltip?.title;
+		$[3] = t1;
+	} else t1 = $[3];
+	const title = t1;
+	const t2 = tooltip?.description;
+	let t3;
+	if ($[4] !== t2 || $[5] !== title) {
+		t3 = /* @__PURE__ */ jsx(TooltipText, {
+			title,
+			description: t2
+		});
+		$[4] = t2;
+		$[5] = title;
+		$[6] = t3;
+	} else t3 = $[6];
+	return t3;
+}
+//#endregion
+//#region src/components/FittingWindow/BayContents.module.css
+var BayContents_module_default = {
+	"activeDrones": "gVdevq_activeDrones",
+	"box": "gVdevq_box",
+	"count": "gVdevq_count",
+	"icon": "gVdevq_icon",
+	"list": "gVdevq_list",
+	"middle": "gVdevq_middle",
+	"name": "gVdevq_name",
+	"panel": "gVdevq_panel",
+	"quantity": "gVdevq_quantity",
+	"remove": "gVdevq_remove",
+	"removeAll": "gVdevq_removeAll",
+	"row": "gVdevq_row",
+	"selection": "gVdevq_selection",
+	"steps": "gVdevq_steps",
+	"times": "gVdevq_times"
+};
+//#endregion
+//#region src/components/FittingWindow/BayContents.tsx
+const emptyText = {
+	cargo: "No Cargo Items Simulated",
+	droneBay: "No Drones Simulated"
+};
+/** EVE's list of what is in a bay, as a popover anchored to `--bay-anchor`. */
+function BayContents(t0) {
+	const $ = c(26);
+	const { id, bay, label } = t0;
+	const store = useFitStore();
+	const contents = useBayContents(bay);
+	const panel = useRef(null);
+	const drones = bay === "droneBay";
+	const { stats } = useSnapshot();
+	let t1;
+	if ($[0] !== stats.character) {
+		t1 = stats.character.get("maxActiveDrones") ?? 0;
+		$[0] = stats.character;
+		$[1] = t1;
+	} else t1 = $[1];
+	const maxActive = t1;
+	if (contents.length === 0) {
+		const t2 = emptyText[bay];
+		let t3;
+		if ($[2] !== id || $[3] !== t2) {
+			t3 = /* @__PURE__ */ jsx("div", {
+				id,
+				className: BayContents_module_default.panel,
+				popover: "auto",
+				"data-empty": true,
+				children: t2
+			});
+			$[2] = id;
+			$[3] = t2;
+			$[4] = t3;
+		} else t3 = $[4];
+		return t3;
+	}
+	const t2 = drones || void 0;
+	let t3;
+	if ($[5] !== drones || $[6] !== maxActive || $[7] !== stats.ship) {
+		t3 = drones && /* @__PURE__ */ jsxs("div", {
+			className: BayContents_module_default.activeDrones,
+			children: [
+				"Active drones: ",
+				stats.ship.get("droneActive") ?? 0,
+				" / ",
+				maxActive
+			]
+		});
+		$[5] = drones;
+		$[6] = maxActive;
+		$[7] = stats.ship;
+		$[8] = t3;
+	} else t3 = $[8];
+	let t4;
+	if ($[9] !== contents || $[10] !== drones || $[11] !== maxActive || $[12] !== store) {
+		t4 = contents.map((content) => {
+			const { type, quantity, refs } = content;
+			return /* @__PURE__ */ jsxs("li", {
+				className: BayContents_module_default.row,
+				children: [
+					/* @__PURE__ */ jsx(Quantity, {
+						name: type.name,
+						value: quantity,
+						onChange: (value) => drones ? store.setDroneQuantity(type.id, value) : store.setCargoQuantity(type.id, value)
+					}),
+					/* @__PURE__ */ jsx("span", {
+						className: BayContents_module_default.icon,
+						children: /* @__PURE__ */ jsx(TypeIcon, { typeId: type.id })
+					}),
+					/* @__PURE__ */ jsxs("span", {
+						className: BayContents_module_default.middle,
+						children: [/* @__PURE__ */ jsx("span", {
+							className: BayContents_module_default.name,
+							children: type.name
+						}), drones && /* @__PURE__ */ jsx(DroneSelection, {
+							content,
+							max: maxActive
+						})]
+					}),
+					/* @__PURE__ */ jsx("button", {
+						type: "button",
+						className: BayContents_module_default.remove,
+						"aria-label": `Remove ${type.name}`,
+						onClick: (event) => {
+							const row = event.currentTarget.closest("li");
+							const next = row.nextElementSibling ?? row.previousElementSibling;
+							store.remove(...refs);
+							if (next === null) panel.current?.hidePopover();
+							else next.querySelector(`.${BayContents_module_default.remove}`)?.focus();
+						},
+						children: /* @__PURE__ */ jsx(Icon, { name: "close" })
+					})
+				]
+			}, type.id);
+		});
+		$[9] = contents;
+		$[10] = drones;
+		$[11] = maxActive;
+		$[12] = store;
+		$[13] = t4;
+	} else t4 = $[13];
+	let t5;
+	if ($[14] !== label || $[15] !== t4) {
+		t5 = /* @__PURE__ */ jsx("ul", {
+			className: BayContents_module_default.list,
+			"aria-label": label,
+			children: t4
+		});
+		$[14] = label;
+		$[15] = t4;
+		$[16] = t5;
+	} else t5 = $[16];
+	let t6;
+	if ($[17] !== contents || $[18] !== store) {
+		t6 = /* @__PURE__ */ jsx("button", {
+			type: "button",
+			className: BayContents_module_default.removeAll,
+			onClick: () => {
+				store.remove(...contents.flatMap(_temp$4));
+				panel.current?.hidePopover();
+			},
+			children: "Remove All"
+		});
+		$[17] = contents;
+		$[18] = store;
+		$[19] = t6;
+	} else t6 = $[19];
+	let t7;
+	if ($[20] !== id || $[21] !== t2 || $[22] !== t3 || $[23] !== t5 || $[24] !== t6) {
+		t7 = /* @__PURE__ */ jsxs("div", {
+			ref: panel,
+			id,
+			className: BayContents_module_default.panel,
+			popover: "auto",
+			"data-drones": t2,
+			children: [
+				t3,
+				t5,
+				t6
+			]
+		});
+		$[20] = id;
+		$[21] = t2;
+		$[22] = t3;
+		$[23] = t5;
+		$[24] = t6;
+		$[25] = t7;
+	} else t7 = $[25];
+	return t7;
+}
+/** One box per drone the character can launch. */
+function _temp$4(t0) {
+	const { refs: refs_0 } = t0;
+	return refs_0;
+}
+function DroneSelection(t0) {
+	const $ = c(16);
+	const { content: t1, max } = t0;
+	const { type, quantity, active } = t1;
+	const store = useFitStore();
+	const room = useDroneRoom(type);
+	const t2 = `Active ${type.name}`;
+	let t3;
+	if ($[0] !== active || $[1] !== max || $[2] !== quantity || $[3] !== room || $[4] !== store || $[5] !== type.id) {
+		let t4;
+		if ($[7] !== active || $[8] !== quantity || $[9] !== room || $[10] !== store || $[11] !== type.id) {
+			t4 = (_, index) => {
+				const count = index + 1;
+				const state = count <= active ? "active" : count > quantity ? "none" : count <= active + room ? "open" : "over";
+				return /* @__PURE__ */ jsx("button", {
+					type: "button",
+					className: BayContents_module_default.box,
+					"aria-label": `${count} active`,
+					"aria-pressed": count === active,
+					"data-state": state,
+					disabled: state === "over" || state === "none",
+					onClick: () => store.setActiveDrones(type.id, count === active ? count - 1 : count),
+					children: count <= active && "×"
+				}, count);
+			};
+			$[7] = active;
+			$[8] = quantity;
+			$[9] = room;
+			$[10] = store;
+			$[11] = type.id;
+			$[12] = t4;
+		} else t4 = $[12];
+		t3 = Array.from({ length: Math.max(max, active) }, t4);
+		$[0] = active;
+		$[1] = max;
+		$[2] = quantity;
+		$[3] = room;
+		$[4] = store;
+		$[5] = type.id;
+		$[6] = t3;
+	} else t3 = $[6];
+	let t4;
+	if ($[13] !== t2 || $[14] !== t3) {
+		t4 = /* @__PURE__ */ jsxs("span", {
+			className: BayContents_module_default.selection,
+			role: "group",
+			"aria-label": t2,
+			children: ["Selected:", t3]
+		});
+		$[13] = t2;
+		$[14] = t3;
+		$[15] = t4;
+	} else t4 = $[15];
+	return t4;
+}
+/** EVE's count of a row, which turns into a spinner on hover and focus. */
+function Quantity(t0) {
+	const $ = c(43);
+	const { name, value, onChange } = t0;
+	const [draft, setDraft] = useState();
+	const cancelled = useRef(false);
+	let t1;
+	if ($[0] !== draft || $[1] !== value) {
+		t1 = draft !== void 0 && /^\d+$/.test(draft) ? Number(draft) : value;
+		$[0] = draft;
+		$[1] = value;
+		$[2] = t1;
+	} else t1 = $[2];
+	const current = t1;
+	const shown = draft ?? String(value);
+	let t2;
+	if ($[3] !== onChange || $[4] !== value) {
+		t2 = (next) => {
+			setDraft(void 0);
+			if (Number.isSafeInteger(next) && next >= 1 && next !== value) onChange(next);
+		};
+		$[3] = onChange;
+		$[4] = value;
+		$[5] = t2;
+	} else t2 = $[5];
+	const set = t2;
+	let t3;
+	if ($[6] !== current || $[7] !== set) {
+		t3 = (event) => {
+			if (event.key === "Enter") set(current);
+			if (event.key === "Escape") {
+				cancelled.current = true;
+				setDraft(void 0);
+			}
+			if (event.key === "ArrowUp" || event.key === "ArrowDown") {
+				event.preventDefault();
+				set(current + (event.key === "ArrowUp" ? 1 : -1));
+			}
+		};
+		$[6] = current;
+		$[7] = set;
+		$[8] = t3;
+	} else t3 = $[8];
+	const onKeyDown = t3;
+	const t4 = `${Math.max(1, shown.length)}ch`;
+	let t5;
+	if ($[9] !== t4) {
+		t5 = { width: t4 };
+		$[9] = t4;
+		$[10] = t5;
+	} else t5 = $[10];
+	const t6 = `Number of ${name}`;
+	let t7;
+	if ($[11] === Symbol.for("react.memo_cache_sentinel")) {
+		t7 = (event_0) => {
+			cancelled.current = false;
+			setDraft(event_0.target.value);
+		};
+		$[11] = t7;
+	} else t7 = $[11];
+	let t8;
+	if ($[12] !== current || $[13] !== draft || $[14] !== set) {
+		t8 = () => {
+			if (draft !== void 0 && !cancelled.current) set(current);
+			else setDraft(void 0);
+		};
+		$[12] = current;
+		$[13] = draft;
+		$[14] = set;
+		$[15] = t8;
+	} else t8 = $[15];
+	let t9;
+	if ($[16] !== onKeyDown || $[17] !== shown || $[18] !== t5 || $[19] !== t6 || $[20] !== t8) {
+		t9 = /* @__PURE__ */ jsx("input", {
+			type: "number",
+			className: BayContents_module_default.count,
+			style: t5,
+			"aria-label": t6,
+			min: 1,
+			value: shown,
+			onChange: t7,
+			onKeyDown,
+			onBlur: t8
+		});
+		$[16] = onKeyDown;
+		$[17] = shown;
+		$[18] = t5;
+		$[19] = t6;
+		$[20] = t8;
+		$[21] = t9;
+	} else t9 = $[21];
+	let t10;
+	if ($[22] === Symbol.for("react.memo_cache_sentinel")) {
+		t10 = /* @__PURE__ */ jsx("span", {
+			className: BayContents_module_default.times,
+			children: "x"
+		});
+		$[22] = t10;
+	} else t10 = $[22];
+	const t11 = `One more ${name}`;
+	let t12;
+	if ($[23] !== current || $[24] !== set) {
+		t12 = () => set(current + 1);
+		$[23] = current;
+		$[24] = set;
+		$[25] = t12;
+	} else t12 = $[25];
+	let t13;
+	if ($[26] === Symbol.for("react.memo_cache_sentinel")) {
+		t13 = /* @__PURE__ */ jsx(Icon, { name: "arrow-up" });
+		$[26] = t13;
+	} else t13 = $[26];
+	let t14;
+	if ($[27] !== t11 || $[28] !== t12) {
+		t14 = /* @__PURE__ */ jsx("button", {
+			type: "button",
+			tabIndex: -1,
+			"aria-label": t11,
+			onClick: t12,
+			children: t13
+		});
+		$[27] = t11;
+		$[28] = t12;
+		$[29] = t14;
+	} else t14 = $[29];
+	const t15 = `One fewer ${name}`;
+	let t16;
+	if ($[30] !== current || $[31] !== set) {
+		t16 = () => set(current - 1);
+		$[30] = current;
+		$[31] = set;
+		$[32] = t16;
+	} else t16 = $[32];
+	let t17;
+	if ($[33] === Symbol.for("react.memo_cache_sentinel")) {
+		t17 = /* @__PURE__ */ jsx(Icon, { name: "arrow-down" });
+		$[33] = t17;
+	} else t17 = $[33];
+	let t18;
+	if ($[34] !== t15 || $[35] !== t16) {
+		t18 = /* @__PURE__ */ jsx("button", {
+			type: "button",
+			tabIndex: -1,
+			"aria-label": t15,
+			onClick: t16,
+			children: t17
+		});
+		$[34] = t15;
+		$[35] = t16;
+		$[36] = t18;
+	} else t18 = $[36];
+	let t19;
+	if ($[37] !== t14 || $[38] !== t18) {
+		t19 = /* @__PURE__ */ jsxs("span", {
+			className: BayContents_module_default.steps,
+			children: [t14, t18]
+		});
+		$[37] = t14;
+		$[38] = t18;
+		$[39] = t19;
+	} else t19 = $[39];
+	let t20;
+	if ($[40] !== t19 || $[41] !== t9) {
+		t20 = /* @__PURE__ */ jsxs("span", {
+			className: BayContents_module_default.quantity,
+			children: [
+				t9,
+				t10,
+				t19
+			]
+		});
+		$[40] = t19;
+		$[41] = t9;
+		$[42] = t20;
+	} else t20 = $[42];
+	return t20;
+}
+//#endregion
 //#region src/components/FittingWindow/FittingWindow.module.css
 var FittingWindow_module_default = {
 	"bay": "L9t91q_bay",
+	"bayAnchor": "L9t91q_bayAnchor",
 	"bays": "L9t91q_bays",
 	"browser": "L9t91q_browser",
 	"count": "L9t91q_count",
@@ -2994,160 +3458,318 @@ function NotImplementedButton(t0) {
 	return t4;
 }
 function Bay(t0) {
-	const $ = c(21);
+	const $ = c(36);
 	const { bay, icon, label } = t0;
 	const { used, total } = useBayUsage(bay);
-	const t1 = used > total || void 0;
-	let t2;
-	if ($[0] !== icon) {
-		t2 = /* @__PURE__ */ jsx(Icon, { name: icon });
-		$[0] = icon;
-		$[1] = t2;
-	} else t2 = $[1];
-	let t3;
-	if ($[2] !== used) {
-		t3 = oneDecimal.format(used);
-		$[2] = used;
-		$[3] = t3;
-	} else t3 = $[3];
-	let t4;
-	if ($[4] !== t3) {
-		t4 = /* @__PURE__ */ jsx("span", {
+	const id = useId();
+	const drop = useBayDrop(bay);
+	let t1;
+	if ($[0] !== id) {
+		let t2;
+		if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
+			t2 = /[^\w-]/g;
+			$[2] = t2;
+		} else t2 = $[2];
+		t1 = id.replace(t2, "");
+		$[0] = id;
+		$[1] = t1;
+	} else t1 = $[1];
+	const t2 = `--bay-${t1}`;
+	let t3;
+	if ($[3] !== t2) {
+		t3 = { "--bay-anchor": t2 };
+		$[3] = t2;
+		$[4] = t3;
+	} else t3 = $[4];
+	const t4 = t3;
+	const t5 = used > total || void 0;
+	let t6;
+	if ($[5] !== icon) {
+		t6 = /* @__PURE__ */ jsx(Icon, { name: icon });
+		$[5] = icon;
+		$[6] = t6;
+	} else t6 = $[6];
+	let t7;
+	if ($[7] !== used) {
+		t7 = oneDecimal.format(used);
+		$[7] = used;
+		$[8] = t7;
+	} else t7 = $[8];
+	let t8;
+	if ($[9] !== t7) {
+		t8 = /* @__PURE__ */ jsx("span", {
 			className: FittingWindow_module_default.used,
-			children: t3
+			children: t7
 		});
-		$[4] = t3;
-		$[5] = t4;
-	} else t4 = $[5];
-	let t5;
-	if ($[6] === Symbol.for("react.memo_cache_sentinel")) {
-		t5 = /* @__PURE__ */ jsx("span", {
+		$[9] = t7;
+		$[10] = t8;
+	} else t8 = $[10];
+	let t9;
+	if ($[11] === Symbol.for("react.memo_cache_sentinel")) {
+		t9 = /* @__PURE__ */ jsx("span", {
 			className: FittingWindow_module_default.slash,
 			children: "/"
 		});
-		$[6] = t5;
-	} else t5 = $[6];
-	let t6;
-	if ($[7] !== total) {
-		t6 = oneDecimal.format(total);
-		$[7] = total;
-		$[8] = t6;
-	} else t6 = $[8];
-	let t7;
-	if ($[9] !== t6) {
-		t7 = /* @__PURE__ */ jsx("span", {
+		$[11] = t9;
+	} else t9 = $[11];
+	let t10;
+	if ($[12] !== total) {
+		t10 = oneDecimal.format(total);
+		$[12] = total;
+		$[13] = t10;
+	} else t10 = $[13];
+	let t11;
+	if ($[14] !== t10) {
+		t11 = /* @__PURE__ */ jsx("span", {
 			className: FittingWindow_module_default.total,
-			children: t6
+			children: t10
 		});
-		$[9] = t6;
-		$[10] = t7;
-	} else t7 = $[10];
-	let t8;
-	if ($[11] === Symbol.for("react.memo_cache_sentinel")) {
-		t8 = /* @__PURE__ */ jsx("span", {
+		$[14] = t10;
+		$[15] = t11;
+	} else t11 = $[15];
+	let t12;
+	if ($[16] === Symbol.for("react.memo_cache_sentinel")) {
+		t12 = /* @__PURE__ */ jsx("span", {
 			className: FittingWindow_module_default.unit,
 			children: "m3"
 		});
-		$[11] = t8;
-	} else t8 = $[11];
-	let t9;
-	if ($[12] !== label || $[13] !== t1 || $[14] !== t2 || $[15] !== t4 || $[16] !== t7) {
-		t9 = /* @__PURE__ */ jsxs("div", {
+		$[16] = t12;
+	} else t12 = $[16];
+	let t13;
+	if ($[17] !== drop || $[18] !== id || $[19] !== label || $[20] !== t11 || $[21] !== t5 || $[22] !== t6 || $[23] !== t8) {
+		t13 = /* @__PURE__ */ jsxs("button", {
+			type: "button",
 			className: FittingWindow_module_default.bay,
-			role: "group",
 			"aria-label": label,
-			"data-over": t1,
+			popoverTarget: id,
+			"data-over": t5,
+			...drop,
 			children: [
-				t2,
-				t4,
-				t5,
-				t7,
-				t8
+				t6,
+				t8,
+				t9,
+				t11,
+				t12
 			]
 		});
-		$[12] = label;
-		$[13] = t1;
-		$[14] = t2;
-		$[15] = t4;
-		$[16] = t7;
-		$[17] = t9;
-	} else t9 = $[17];
-	let t10;
-	if ($[18] !== label || $[19] !== t9) {
-		t10 = /* @__PURE__ */ jsx(Tooltip, {
+		$[17] = drop;
+		$[18] = id;
+		$[19] = label;
+		$[20] = t11;
+		$[21] = t5;
+		$[22] = t6;
+		$[23] = t8;
+		$[24] = t13;
+	} else t13 = $[24];
+	let t14;
+	if ($[25] !== label || $[26] !== t13) {
+		t14 = /* @__PURE__ */ jsx(Tooltip, {
 			label,
-			children: t9
+			children: t13
 		});
-		$[18] = label;
-		$[19] = t9;
-		$[20] = t10;
-	} else t10 = $[20];
-	return t10;
+		$[25] = label;
+		$[26] = t13;
+		$[27] = t14;
+	} else t14 = $[27];
+	let t15;
+	if ($[28] !== bay || $[29] !== id || $[30] !== label) {
+		t15 = /* @__PURE__ */ jsx(BayContents, {
+			id,
+			bay,
+			label
+		});
+		$[28] = bay;
+		$[29] = id;
+		$[30] = label;
+		$[31] = t15;
+	} else t15 = $[31];
+	let t16;
+	if ($[32] !== t14 || $[33] !== t15 || $[34] !== t4) {
+		t16 = /* @__PURE__ */ jsxs("div", {
+			className: FittingWindow_module_default.bayAnchor,
+			style: t4,
+			children: [t14, t15]
+		});
+		$[32] = t14;
+		$[33] = t15;
+		$[34] = t4;
+		$[35] = t16;
+	} else t16 = $[35];
+	return t16;
+}
+const baySlots = {
+	cargo: { type: "cargo" },
+	droneBay: { type: "drone_bay" }
+};
+/** Puts a type dragged onto a bay in it: anything in the cargo, drones in the drone bay. */
+function useBayDrop(bay) {
+	const $ = c(29);
+	const store = useFitStore();
+	const sde = useSde();
+	const placement = usePlacement();
+	const canFit = useCanFit();
+	const { dragging, end } = useDrag();
+	const { show, clear } = usePreview();
+	const slot = baySlots[bay];
+	let t0;
+	let type;
+	if ($[0] !== bay || $[1] !== canFit || $[2] !== dragging || $[3] !== placement || $[4] !== sde) {
+		type = dragging?.type === "type" ? sde.type(dragging.typeId) : void 0;
+		t0 = type !== void 0 && (bay === "cargo" ? placement(type) !== void 0 : placement(type)?.type === "drone_bay" && canFit(type));
+		$[0] = bay;
+		$[1] = canFit;
+		$[2] = dragging;
+		$[3] = placement;
+		$[4] = sde;
+		$[5] = t0;
+		$[6] = type;
+	} else {
+		t0 = $[5];
+		type = $[6];
+	}
+	const taken = t0 ? type : void 0;
+	const target = `bay-${bay}`;
+	let t1;
+	if ($[7] !== show || $[8] !== slot || $[9] !== taken || $[10] !== target) {
+		t1 = () => {
+			if (taken) show((draft) => void draft.fit(taken.id, slot), target);
+		};
+		$[7] = show;
+		$[8] = slot;
+		$[9] = taken;
+		$[10] = target;
+		$[11] = t1;
+	} else t1 = $[11];
+	let t2;
+	if ($[12] !== clear || $[13] !== target) {
+		t2 = () => clear(target);
+		$[12] = clear;
+		$[13] = target;
+		$[14] = t2;
+	} else t2 = $[14];
+	let t3;
+	if ($[15] !== taken) {
+		t3 = (event) => {
+			if (!taken) return;
+			event.preventDefault();
+			event.dataTransfer.dropEffect = "copy";
+		};
+		$[15] = taken;
+		$[16] = t3;
+	} else t3 = $[16];
+	let t4;
+	if ($[17] !== clear || $[18] !== end || $[19] !== slot || $[20] !== store || $[21] !== taken || $[22] !== target) {
+		t4 = (event_0) => {
+			if (!taken) return;
+			event_0.preventDefault();
+			clear(target);
+			store.fit(taken.id, slot);
+			end();
+		};
+		$[17] = clear;
+		$[18] = end;
+		$[19] = slot;
+		$[20] = store;
+		$[21] = taken;
+		$[22] = target;
+		$[23] = t4;
+	} else t4 = $[23];
+	let t5;
+	if ($[24] !== t1 || $[25] !== t2 || $[26] !== t3 || $[27] !== t4) {
+		t5 = {
+			onDragEnter: t1,
+			onDragLeave: t2,
+			onDragOver: t3,
+			onDrop: t4
+		};
+		$[24] = t1;
+		$[25] = t2;
+		$[26] = t3;
+		$[27] = t4;
+		$[28] = t5;
+	} else t5 = $[28];
+	return t5;
 }
 function Resource(t0) {
-	const $ = c(16);
+	const $ = c(21);
 	const { title, free, output } = t0;
 	const left = useAttribute(free);
 	const total = useAttribute(output).value ?? 0;
 	const value = left.value ?? 0;
-	const t1 = value < 0 || void 0;
-	const t2 = left.change;
-	let t3;
-	if ($[0] !== title) {
-		t3 = /* @__PURE__ */ jsx("span", {
+	let t1;
+	if ($[0] !== output) {
+		t1 = /* @__PURE__ */ jsx(AttributeTooltip, { attribute: output });
+		$[0] = output;
+		$[1] = t1;
+	} else t1 = $[1];
+	const t2 = value < 0 || void 0;
+	const t3 = left.change;
+	let t4;
+	if ($[2] !== title) {
+		t4 = /* @__PURE__ */ jsx("span", {
 			className: FittingWindow_module_default.title,
 			children: title
 		});
-		$[0] = title;
-		$[1] = t3;
-	} else t3 = $[1];
-	let t4;
-	if ($[2] !== value) {
-		t4 = oneDecimal.format(value);
-		$[2] = value;
+		$[2] = title;
 		$[3] = t4;
 	} else t4 = $[3];
 	let t5;
-	if ($[4] !== t4) {
-		t5 = /* @__PURE__ */ jsx("span", {
-			className: FittingWindow_module_default.free,
-			children: t4
-		});
-		$[4] = t4;
+	if ($[4] !== value) {
+		t5 = oneDecimal.format(value);
+		$[4] = value;
 		$[5] = t5;
 	} else t5 = $[5];
 	let t6;
-	if ($[6] !== total) {
-		t6 = oneDecimal.format(total);
-		$[6] = total;
+	if ($[6] !== t5) {
+		t6 = /* @__PURE__ */ jsx("span", {
+			className: FittingWindow_module_default.free,
+			children: t5
+		});
+		$[6] = t5;
 		$[7] = t6;
 	} else t6 = $[7];
 	let t7;
-	if ($[8] !== t5 || $[9] !== t6) {
-		t7 = /* @__PURE__ */ jsxs("span", { children: [
-			t5,
+	if ($[8] !== total) {
+		t7 = oneDecimal.format(total);
+		$[8] = total;
+		$[9] = t7;
+	} else t7 = $[9];
+	let t8;
+	if ($[10] !== t6 || $[11] !== t7) {
+		t8 = /* @__PURE__ */ jsxs("span", { children: [
+			t6,
 			"/",
-			t6
+			t7
 		] });
-		$[8] = t5;
-		$[9] = t6;
-		$[10] = t7;
-	} else t7 = $[10];
-	let t8;
-	if ($[11] !== left.change || $[12] !== t1 || $[13] !== t3 || $[14] !== t7) {
-		t8 = /* @__PURE__ */ jsxs("div", {
+		$[10] = t6;
+		$[11] = t7;
+		$[12] = t8;
+	} else t8 = $[12];
+	let t9;
+	if ($[13] !== left.change || $[14] !== t2 || $[15] !== t4 || $[16] !== t8) {
+		t9 = /* @__PURE__ */ jsxs("div", {
 			className: FittingWindow_module_default.resource,
-			"data-over": t1,
-			"data-change": t2,
-			children: [t3, t7]
+			"data-over": t2,
+			"data-change": t3,
+			children: [t4, t8]
 		});
-		$[11] = left.change;
-		$[12] = t1;
-		$[13] = t3;
-		$[14] = t7;
-		$[15] = t8;
-	} else t8 = $[15];
-	return t8;
+		$[13] = left.change;
+		$[14] = t2;
+		$[15] = t4;
+		$[16] = t8;
+		$[17] = t9;
+	} else t9 = $[17];
+	let t10;
+	if ($[18] !== t1 || $[19] !== t9) {
+		t10 = /* @__PURE__ */ jsx(Tooltip, {
+			label: t1,
+			children: t9
+		});
+		$[18] = t1;
+		$[19] = t9;
+		$[20] = t10;
+	} else t10 = $[20];
+	return t10;
 }
 function SimulationHistory() {
 	const $ = c(4);
@@ -3175,6 +3797,7 @@ var ItemBrowser_module_default = {
 	"count": "xFSZwa_count",
 	"counts": "xFSZwa_counts",
 	"dragImage": "xFSZwa_dragImage",
+	"empty": "xFSZwa_empty",
 	"field": "xFSZwa_field",
 	"filters": "xFSZwa_filters",
 	"flyable": "xFSZwa_flyable",
@@ -3438,8 +4061,8 @@ function TypeLeaf(t0) {
 }
 /** The types, then their faction, officer and deadspace folders. */
 function TypeLeaves(t0) {
-	const $ = c(21);
-	const { sorted, open, actions, icon } = t0;
+	const $ = c(19);
+	const { sorted, actions, icon } = t0;
 	const images = useImages();
 	let t1;
 	if ($[0] !== actions || $[1] !== icon || $[2] !== sorted.types) {
@@ -3461,15 +4084,14 @@ function TypeLeaves(t0) {
 		$[3] = t1;
 	} else t1 = $[3];
 	let t2;
-	if ($[7] !== actions || $[8] !== icon || $[9] !== images || $[10] !== open || $[11] !== sorted.folders) {
+	if ($[7] !== actions || $[8] !== icon || $[9] !== images || $[10] !== sorted.folders) {
 		let t3;
-		if ($[13] !== actions || $[14] !== icon || $[15] !== images || $[16] !== open) {
+		if ($[12] !== actions || $[13] !== icon || $[14] !== images) {
 			t3 = (t4) => {
 				const { folder, types } = t4;
 				return /* @__PURE__ */ jsx(TreeGroup, {
 					label: folders[folder].label,
 					icon: images.metaGroupIcon(folders[folder].metaGroupId),
-					defaultOpen: open,
 					children: () => types.map((type_0) => /* @__PURE__ */ jsx(TypeLeaf, {
 						type: type_0,
 						actions,
@@ -3477,222 +4099,301 @@ function TypeLeaves(t0) {
 					}, type_0.id))
 				}, folder);
 			};
-			$[13] = actions;
-			$[14] = icon;
-			$[15] = images;
-			$[16] = open;
-			$[17] = t3;
-		} else t3 = $[17];
+			$[12] = actions;
+			$[13] = icon;
+			$[14] = images;
+			$[15] = t3;
+		} else t3 = $[15];
 		t2 = sorted.folders.map(t3);
 		$[7] = actions;
 		$[8] = icon;
 		$[9] = images;
-		$[10] = open;
-		$[11] = sorted.folders;
-		$[12] = t2;
-	} else t2 = $[12];
+		$[10] = sorted.folders;
+		$[11] = t2;
+	} else t2 = $[11];
 	let t3;
-	if ($[18] !== t1 || $[19] !== t2) {
+	if ($[16] !== t1 || $[17] !== t2) {
 		t3 = /* @__PURE__ */ jsxs(Fragment, { children: [t1, t2] });
-		$[18] = t1;
-		$[19] = t2;
-		$[20] = t3;
-	} else t3 = $[20];
+		$[16] = t1;
+		$[17] = t2;
+		$[18] = t3;
+	} else t3 = $[18];
 	return t3;
 }
 function countLeaves(sorted) {
 	return sorted.folders.reduce((count, folder) => count + folder.types.length, sorted.types.length);
 }
+/** A market group's icon, or a folder for one without. */
+function useMarketGroupIcon() {
+	const $ = c(3);
+	const images = useImages();
+	const folder = useIconUrl("folder");
+	let t0;
+	if ($[0] !== folder || $[1] !== images) {
+		t0 = (marketGroupId) => images.marketGroupIcon(marketGroupId) ?? folder;
+		$[0] = folder;
+		$[1] = images;
+		$[2] = t0;
+	} else t0 = $[2];
+	return t0;
+}
+/** A market group: its groups, then its types. */
+function TypeGroup(t0) {
+	const $ = c(10);
+	const { node, actions } = t0;
+	const marketGroupIcon = useMarketGroupIcon();
+	const t1 = node.group.name;
+	let t2;
+	if ($[0] !== marketGroupIcon || $[1] !== node.group.id) {
+		t2 = marketGroupIcon(node.group.id);
+		$[0] = marketGroupIcon;
+		$[1] = node.group.id;
+		$[2] = t2;
+	} else t2 = $[2];
+	let t3;
+	if ($[3] !== actions || $[4] !== node) {
+		t3 = () => /* @__PURE__ */ jsxs(Fragment, { children: [node.children.map((child) => /* @__PURE__ */ jsx(TypeGroup, {
+			node: child,
+			actions
+		}, child.group.id)), /* @__PURE__ */ jsx(TypeLeaves, {
+			sorted: node,
+			actions
+		})] });
+		$[3] = actions;
+		$[4] = node;
+		$[5] = t3;
+	} else t3 = $[5];
+	let t4;
+	if ($[6] !== node.group.name || $[7] !== t2 || $[8] !== t3) {
+		t4 = /* @__PURE__ */ jsx(TreeGroup, {
+			label: t1,
+			icon: t2,
+			children: t3
+		});
+		$[6] = node.group.name;
+		$[7] = t2;
+		$[8] = t3;
+		$[9] = t4;
+	} else t4 = $[9];
+	return t4;
+}
+/** Search results by root market group; a lone root shows only its types. */
+function SearchResults(t0) {
+	const $ = c(8);
+	const { roots, actions } = t0;
+	const [only] = roots;
+	if (roots.length === 1 && only !== void 0) {
+		let t1;
+		if ($[0] !== actions || $[1] !== only) {
+			t1 = /* @__PURE__ */ jsx(TypeLeaves, {
+				sorted: only,
+				actions
+			});
+			$[0] = actions;
+			$[1] = only;
+			$[2] = t1;
+		} else t1 = $[2];
+		return t1;
+	}
+	let t1;
+	if ($[3] !== actions || $[4] !== roots) {
+		let t2;
+		if ($[6] !== actions) {
+			t2 = (node) => /* @__PURE__ */ jsx(TypeGroup, {
+				node,
+				actions
+			}, node.group.id);
+			$[6] = actions;
+			$[7] = t2;
+		} else t2 = $[7];
+		t1 = roots.map(t2);
+		$[3] = actions;
+		$[4] = roots;
+		$[5] = t1;
+	} else t1 = $[5];
+	return t1;
+}
 //#endregion
 //#region src/components/ItemBrowser/Charges.tsx
 /** The Charges tab of the `ItemBrowser`: every charge by market group, or only those a fitted module loads. */
 function Charges() {
-	const $ = c(49);
+	const $ = c(48);
 	const sde = useSde();
 	const { actions, clear, dragImage } = useTypeActions();
 	const modules = useChargedModules();
 	const [picked, setPicked] = useState();
 	const [search, setSearch] = useState("");
+	const [collapses, setCollapses] = useState(0);
 	let t0;
-	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-		t0 = { times: 0 };
-		$[0] = t0;
-	} else t0 = $[0];
-	const [collapsed, setCollapsed] = useState(t0);
+	if ($[0] !== modules || $[1] !== picked) {
+		t0 = modules.some((module) => module.id === picked) ? picked : void 0;
+		$[0] = modules;
+		$[1] = picked;
+		$[2] = t0;
+	} else t0 = $[2];
+	const selected = t0;
 	let t1;
-	if ($[1] !== modules || $[2] !== picked) {
-		t1 = modules.some((module) => module.id === picked) ? picked : void 0;
-		$[1] = modules;
-		$[2] = picked;
-		$[3] = t1;
-	} else t1 = $[3];
-	const selected = t1;
+	if ($[3] !== search) {
+		t1 = search.trim().toLowerCase();
+		$[3] = search;
+		$[4] = t1;
+	} else t1 = $[4];
+	const query = t1;
 	let t2;
-	if ($[4] !== search) {
-		t2 = search.trim().toLowerCase();
-		$[4] = search;
-		$[5] = t2;
-	} else t2 = $[5];
-	const query = t2;
-	let t3;
-	if ($[6] !== query || $[7] !== selected) {
-		t3 = selected === void 0 && query !== "" ? (type) => type.name.toLowerCase().includes(query) : void 0;
-		$[6] = query;
-		$[7] = selected;
-		$[8] = t3;
-	} else t3 = $[8];
-	const groups = useChargeTree(t3);
+	if ($[5] !== query || $[6] !== selected) {
+		t2 = selected === void 0 && query !== "" ? (type) => type.name.toLowerCase().includes(query) : void 0;
+		$[5] = query;
+		$[6] = selected;
+		$[7] = t2;
+	} else t2 = $[7];
+	const matches = t2;
+	const groups = useChargeTree();
+	const found = useChargeSearch(matches);
 	const charges = useCharges(selected);
+	let t3;
+	if ($[8] !== charges || $[9] !== query || $[10] !== sde) {
+		let t4;
+		if ($[12] !== query) {
+			t4 = (type_0) => type_0.name.toLowerCase().includes(query);
+			$[12] = query;
+			$[13] = t4;
+		} else t4 = $[13];
+		t3 = sde.sortByMeta(charges.filter(t4));
+		$[8] = charges;
+		$[9] = query;
+		$[10] = sde;
+		$[11] = t3;
+	} else t3 = $[11];
+	const loadable = t3;
 	let t4;
-	if ($[9] !== charges || $[10] !== query || $[11] !== sde) {
-		let t5;
-		if ($[13] !== query) {
-			t5 = (type_0) => type_0.name.toLowerCase().includes(query);
-			$[13] = query;
-			$[14] = t5;
-		} else t5 = $[14];
-		t4 = sde.sortByMeta(charges.filter(t5));
-		$[9] = charges;
-		$[10] = query;
-		$[11] = sde;
-		$[12] = t4;
-	} else t4 = $[12];
-	const loadable = t4;
-	let t5;
-	if ($[15] !== groups || $[16] !== loadable || $[17] !== selected) {
-		t5 = selected === void 0 ? countTypes$1(groups) : countLeaves(loadable);
-		$[15] = groups;
-		$[16] = loadable;
+	if ($[14] !== found || $[15] !== loadable || $[16] !== matches || $[17] !== selected) {
+		t4 = selected === void 0 ? matches !== void 0 && found.length === 0 : countLeaves(loadable) === 0;
+		$[14] = found;
+		$[15] = loadable;
+		$[16] = matches;
 		$[17] = selected;
-		$[18] = t5;
-	} else t5 = $[18];
-	const count = t5;
-	const open = query !== "" && query !== collapsed.query && count <= 200;
-	let t6;
+		$[18] = t4;
+	} else t4 = $[18];
+	const empty = t4;
+	let t5;
 	if ($[19] !== clear) {
-		t6 = (value) => {
+		t5 = (value) => {
 			clear();
 			setSearch(value);
 		};
 		$[19] = clear;
-		$[20] = t6;
-	} else t6 = $[20];
+		$[20] = t5;
+	} else t5 = $[20];
+	let t6;
+	if ($[21] !== collapses) {
+		t6 = () => setCollapses(collapses + 1);
+		$[21] = collapses;
+		$[22] = t6;
+	} else t6 = $[22];
 	let t7;
-	if ($[21] !== collapsed.times || $[22] !== query) {
-		t7 = () => setCollapsed({
-			times: collapsed.times + 1,
-			query
-		});
-		$[21] = collapsed.times;
-		$[22] = query;
-		$[23] = t7;
-	} else t7 = $[23];
-	let t8;
-	if ($[24] !== search || $[25] !== t6 || $[26] !== t7) {
-		t8 = /* @__PURE__ */ jsx(Search, {
+	if ($[23] !== search || $[24] !== t5 || $[25] !== t6) {
+		t7 = /* @__PURE__ */ jsx(Search, {
 			value: search,
-			onChange: t6,
-			onCollapse: t7
+			onChange: t5,
+			onCollapse: t6
 		});
-		$[24] = search;
+		$[23] = search;
+		$[24] = t5;
 		$[25] = t6;
 		$[26] = t7;
-		$[27] = t8;
-	} else t8 = $[27];
-	let t9;
-	if ($[28] !== modules || $[29] !== selected) {
-		let t10;
-		if ($[31] !== selected) {
-			t10 = (module_0) => /* @__PURE__ */ jsx(FilterToggle, {
+	} else t7 = $[26];
+	let t8;
+	if ($[27] !== modules || $[28] !== selected) {
+		let t9;
+		if ($[30] !== selected) {
+			t9 = (module_0) => /* @__PURE__ */ jsx(FilterToggle, {
 				typeId: module_0.id,
 				label: module_0.name,
 				pressed: selected === module_0.id,
 				onPressedChange: (pressed) => setPicked(pressed ? module_0.id : void 0)
 			}, module_0.id);
-			$[31] = selected;
-			$[32] = t10;
-		} else t10 = $[32];
-		t9 = modules.map(t10);
-		$[28] = modules;
-		$[29] = selected;
-		$[30] = t9;
-	} else t9 = $[30];
-	let t10;
-	if ($[33] !== t9) {
-		t10 = /* @__PURE__ */ jsx("fieldset", {
+			$[30] = selected;
+			$[31] = t9;
+		} else t9 = $[31];
+		t8 = modules.map(t9);
+		$[27] = modules;
+		$[28] = selected;
+		$[29] = t8;
+	} else t8 = $[29];
+	let t9;
+	if ($[32] !== t8) {
+		t9 = /* @__PURE__ */ jsx("fieldset", {
 			className: ItemBrowser_module_default.filters,
 			"aria-label": "Filters",
-			children: t9
+			children: t8
 		});
+		$[32] = t8;
 		$[33] = t9;
-		$[34] = t10;
-	} else t10 = $[34];
-	const t11 = `${collapsed.times}-${open}-${selected}`;
-	let t12;
-	if ($[35] !== actions || $[36] !== groups || $[37] !== loadable || $[38] !== open || $[39] !== selected) {
-		t12 = selected === void 0 ? groups.map((node) => /* @__PURE__ */ jsx(ChargeGroup, {
-			node,
-			open,
-			actions
-		}, node.group.id)) : /* @__PURE__ */ jsx(TypeLeaves, {
-			sorted: loadable,
-			open,
-			actions,
-			icon: true
-		});
-		$[35] = actions;
-		$[36] = groups;
-		$[37] = loadable;
-		$[38] = open;
-		$[39] = selected;
-		$[40] = t12;
-	} else t12 = $[40];
-	let t13;
-	if ($[41] !== t11 || $[42] !== t12) {
-		t13 = /* @__PURE__ */ jsx("div", {
+	} else t9 = $[33];
+	let t10;
+	if ($[34] !== actions || $[35] !== collapses || $[36] !== empty || $[37] !== found || $[38] !== groups || $[39] !== loadable || $[40] !== matches || $[41] !== selected) {
+		t10 = /* @__PURE__ */ jsx("div", {
 			className: ItemBrowser_module_default.tree,
-			children: /* @__PURE__ */ jsx(TreeList, {
+			children: empty ? /* @__PURE__ */ jsx("p", {
+				className: ItemBrowser_module_default.empty,
+				children: "No charges found"
+			}) : /* @__PURE__ */ jsx(TreeList, {
 				label: "Charges",
-				children: t12
-			}, t11)
-		});
-		$[41] = t11;
-		$[42] = t12;
-		$[43] = t13;
-	} else t13 = $[43];
-	let t14;
-	if ($[44] !== dragImage || $[45] !== t10 || $[46] !== t13 || $[47] !== t8) {
-		t14 = /* @__PURE__ */ jsxs(Fragment, { children: [
-			t8,
+				children: selected !== void 0 ? /* @__PURE__ */ jsx(TypeLeaves, {
+					sorted: loadable,
+					actions,
+					icon: true
+				}) : matches !== void 0 ? /* @__PURE__ */ jsx(SearchResults, {
+					roots: found,
+					actions
+				}) : groups.map((node) => /* @__PURE__ */ jsx(ChargeGroup, {
+					node,
+					actions
+				}, node.group.id))
+			}, `${collapses}-${selected}`)
+		});
+		$[34] = actions;
+		$[35] = collapses;
+		$[36] = empty;
+		$[37] = found;
+		$[38] = groups;
+		$[39] = loadable;
+		$[40] = matches;
+		$[41] = selected;
+		$[42] = t10;
+	} else t10 = $[42];
+	let t11;
+	if ($[43] !== dragImage || $[44] !== t10 || $[45] !== t7 || $[46] !== t9) {
+		t11 = /* @__PURE__ */ jsxs(Fragment, { children: [
+			t7,
+			t9,
 			t10,
-			t13,
 			dragImage
 		] });
-		$[44] = dragImage;
-		$[45] = t10;
-		$[46] = t13;
-		$[47] = t8;
-		$[48] = t14;
-	} else t14 = $[48];
-	return t14;
+		$[43] = dragImage;
+		$[44] = t10;
+		$[45] = t7;
+		$[46] = t9;
+		$[47] = t11;
+	} else t11 = $[47];
+	return t11;
 }
 function ChargeGroup(t0) {
-	const $ = c(13);
-	const { node, open, actions } = t0;
-	const images = useImages();
+	const $ = c(11);
+	const { node, actions } = t0;
+	const marketGroupIcon = useMarketGroupIcon();
 	const t1 = node.group.name;
 	let t2;
-	if ($[0] !== images || $[1] !== node.group.id) {
-		t2 = images.marketGroupIcon(node.group.id);
-		$[0] = images;
+	if ($[0] !== marketGroupIcon || $[1] !== node.group.id) {
+		t2 = marketGroupIcon(node.group.id);
+		$[0] = marketGroupIcon;
 		$[1] = node.group.id;
 		$[2] = t2;
 	} else t2 = $[2];
 	let t3;
-	if ($[3] !== actions || $[4] !== node.children || $[5] !== node.types || $[6] !== open) {
+	if ($[3] !== actions || $[4] !== node.children || $[5] !== node.types) {
 		t3 = () => /* @__PURE__ */ jsxs(Fragment, { children: [node.children.map((child) => /* @__PURE__ */ jsx(ChargeGroup, {
 			node: child,
-			open,
 			actions
 		}, child.group.id)), node.types.map((type) => /* @__PURE__ */ jsx(TypeLeaf, {
 			type,
@@ -3701,34 +4402,29 @@ function ChargeGroup(t0) {
 		$[3] = actions;
 		$[4] = node.children;
 		$[5] = node.types;
-		$[6] = open;
-		$[7] = t3;
-	} else t3 = $[7];
+		$[6] = t3;
+	} else t3 = $[6];
 	let t4;
-	if ($[8] !== node.group.name || $[9] !== open || $[10] !== t2 || $[11] !== t3) {
+	if ($[7] !== node.group.name || $[8] !== t2 || $[9] !== t3) {
 		t4 = /* @__PURE__ */ jsx(TreeGroup, {
 			label: t1,
 			icon: t2,
-			defaultOpen: open,
 			children: t3
 		});
-		$[8] = node.group.name;
-		$[9] = open;
-		$[10] = t2;
-		$[11] = t3;
-		$[12] = t4;
-	} else t4 = $[12];
+		$[7] = node.group.name;
+		$[8] = t2;
+		$[9] = t3;
+		$[10] = t4;
+	} else t4 = $[10];
 	return t4;
 }
-function countTypes$1(nodes) {
-	return nodes.reduce((count, node) => count + countTypes$1(node.children) + node.types.length, 0);
-}
 //#endregion
 //#region src/components/ItemBrowser/HullsAndFits.tsx
 const noFits = [];
+const SHIPS_MARKET_GROUP_ID = 4;
 /** The Hulls & Fits tab of the `ItemBrowser`: EVE's hulls by group and race, with the fits saved for each. */
 function HullsAndFits() {
-	const $ = c(75);
+	const $ = c(61);
 	const currentShipId = useFit().ship.type_id;
 	const images = useImages();
 	const store = useFitStore();
@@ -3738,233 +4434,186 @@ function HullsAndFits() {
 	const [browserFits, setBrowserFits] = useState(false);
 	const [currentHull, setCurrentHull] = useState(false);
 	const [flyable, setFlyable] = useState(false);
+	const [collapses, setCollapses] = useState(0);
 	let t0;
-	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-		t0 = {
-			key: 0,
-			open: false
-		};
-		$[0] = t0;
-	} else t0 = $[0];
-	const [tree, setTree] = useState(t0);
+	if ($[0] !== search) {
+		t0 = search.trim().toLowerCase();
+		$[0] = search;
+		$[1] = t0;
+	} else t0 = $[1];
+	const query = t0;
 	let t1;
-	if ($[1] !== search) {
-		t1 = search.trim().toLowerCase();
-		$[1] = search;
-		$[2] = t1;
-	} else t1 = $[2];
-	const query = t1;
-	const narrowed = query !== "" || currentHull;
-	let t2;
-	if ($[3] !== query) {
-		t2 = (name) => (name ?? "").toLowerCase().includes(query);
-		$[3] = query;
-		$[4] = t2;
-	} else t2 = $[4];
-	const matches = t2;
+	if ($[2] !== query) {
+		t1 = (name) => (name ?? "").toLowerCase().includes(query);
+		$[2] = query;
+		$[3] = t1;
+	} else t1 = $[3];
+	const matches = t1;
+	let t2;
+	if ($[4] !== fits) {
+		t2 = Map.groupBy(fits, _temp$3);
+		$[4] = fits;
+		$[5] = t2;
+	} else t2 = $[5];
+	const fitsByHull = t2;
 	let t3;
-	if ($[5] !== fits) {
-		t3 = Map.groupBy(fits, _temp$3);
-		$[5] = fits;
-		$[6] = t3;
-	} else t3 = $[6];
-	const fitsByHull = t3;
-	let t4;
-	if ($[7] !== fitsByHull || $[8] !== flyable || $[9] !== matches || $[10] !== missingSkills) {
-		t4 = (ship) => {
+	if ($[6] !== fitsByHull || $[7] !== flyable || $[8] !== matches || $[9] !== missingSkills) {
+		t3 = (ship) => {
 			const saved_0 = fitsByHull.get(ship.id) ?? noFits;
 			const kept = flyable ? saved_0.filter((one) => missingSkills(one).length === 0) : saved_0;
 			return matches(ship.name) ? kept : kept.filter((one_0) => matches(one_0.name));
 		};
-		$[7] = fitsByHull;
-		$[8] = flyable;
-		$[9] = matches;
-		$[10] = missingSkills;
-		$[11] = t4;
-	} else t4 = $[11];
-	const shownFits = t4;
-	let t5;
-	if ($[12] !== browserFits || $[13] !== currentHull || $[14] !== currentShipId || $[15] !== flyable || $[16] !== matches || $[17] !== missingSkills || $[18] !== narrowed || $[19] !== shownFits) {
-		t5 = narrowed || browserFits || flyable ? (ship_0) => {
+		$[6] = fitsByHull;
+		$[7] = flyable;
+		$[8] = matches;
+		$[9] = missingSkills;
+		$[10] = t3;
+	} else t3 = $[10];
+	const shownFits = t3;
+	let t4;
+	if ($[11] !== browserFits || $[12] !== currentHull || $[13] !== currentShipId || $[14] !== flyable || $[15] !== matches || $[16] !== missingSkills || $[17] !== query || $[18] !== shownFits) {
+		t4 = query !== "" || currentHull || browserFits || flyable ? (ship_0) => {
 			if (currentHull && ship_0.id !== currentShipId) return false;
 			if (flyable && missingSkills([ship_0.id]).length > 0) return false;
 			const shown = shownFits(ship_0);
 			if (browserFits && shown.length === 0) return false;
 			return matches(ship_0.name) || shown.length > 0;
 		} : void 0;
-		$[12] = browserFits;
-		$[13] = currentHull;
-		$[14] = currentShipId;
-		$[15] = flyable;
-		$[16] = matches;
-		$[17] = missingSkills;
-		$[18] = narrowed;
-		$[19] = shownFits;
-		$[20] = t5;
-	} else t5 = $[20];
-	const groups = useHullTree(t5);
+		$[11] = browserFits;
+		$[12] = currentHull;
+		$[13] = currentShipId;
+		$[14] = flyable;
+		$[15] = matches;
+		$[16] = missingSkills;
+		$[17] = query;
+		$[18] = shownFits;
+		$[19] = t4;
+	} else t4 = $[19];
+	const groups = useHullTree(t4);
+	let t5;
+	if ($[20] !== store) {
+		t5 = (shipTypeId) => store.replace({
+			ship: { type_id: shipTypeId },
+			items: []
+		});
+		$[20] = store;
+		$[21] = t5;
+	} else t5 = $[21];
+	const simulate = t5;
 	let t6;
-	if ($[21] !== narrowed || $[22] !== tree.key) {
-		t6 = (nextSearch, nextCurrentHull) => {
-			const nextNarrowed = nextSearch.trim() !== "" || nextCurrentHull;
-			if (nextNarrowed !== narrowed) setTree({
-				key: tree.key + 1,
-				open: nextNarrowed
-			});
-			setSearch(nextSearch);
-			setCurrentHull(nextCurrentHull);
-		};
-		$[21] = narrowed;
-		$[22] = tree.key;
+	if ($[22] !== collapses) {
+		t6 = () => setCollapses(collapses + 1);
+		$[22] = collapses;
 		$[23] = t6;
 	} else t6 = $[23];
-	const narrow = t6;
 	let t7;
-	if ($[24] !== store) {
-		t7 = (shipTypeId) => store.replace({
-			ship: { type_id: shipTypeId },
-			items: []
-		});
-		$[24] = store;
-		$[25] = t7;
-	} else t7 = $[25];
-	const simulate = t7;
-	let t8;
-	if ($[26] !== currentHull || $[27] !== narrow) {
-		t8 = (value) => narrow(value, currentHull);
-		$[26] = currentHull;
-		$[27] = narrow;
-		$[28] = t8;
-	} else t8 = $[28];
-	let t9;
-	if ($[29] !== tree.key) {
-		t9 = () => setTree({
-			key: tree.key + 1,
-			open: false
-		});
-		$[29] = tree.key;
-		$[30] = t9;
-	} else t9 = $[30];
-	let t10;
-	if ($[31] !== search || $[32] !== t8 || $[33] !== t9) {
-		t10 = /* @__PURE__ */ jsx(Search, {
+	if ($[24] !== search || $[25] !== t6) {
+		t7 = /* @__PURE__ */ jsx(Search, {
 			value: search,
-			onChange: t8,
-			onCollapse: t9
+			onChange: setSearch,
+			onCollapse: t6
 		});
-		$[31] = search;
-		$[32] = t8;
-		$[33] = t9;
-		$[34] = t10;
-	} else t10 = $[34];
-	let t11;
-	if ($[35] !== browserFits) {
-		t11 = /* @__PURE__ */ jsx(FilterToggle, {
+		$[24] = search;
+		$[25] = t6;
+		$[26] = t7;
+	} else t7 = $[26];
+	let t8;
+	if ($[27] !== browserFits) {
+		t8 = /* @__PURE__ */ jsx(FilterToggle, {
 			icon: "fits-browser",
 			label: "Browser Fittings",
 			pressed: browserFits,
 			onPressedChange: setBrowserFits
 		});
-		$[35] = browserFits;
-		$[36] = t11;
-	} else t11 = $[36];
+		$[27] = browserFits;
+		$[28] = t8;
+	} else t8 = $[28];
+	let t10;
+	let t11;
 	let t12;
-	let t13;
-	let t14;
-	let t15;
-	if ($[37] === Symbol.for("react.memo_cache_sentinel")) {
-		t12 = /* @__PURE__ */ jsx(FilterToggle, {
+	let t9;
+	if ($[29] === Symbol.for("react.memo_cache_sentinel")) {
+		t9 = /* @__PURE__ */ jsx(FilterToggle, {
 			icon: "fits-personal",
 			label: "Personal Fittings"
 		});
-		t13 = /* @__PURE__ */ jsx(FilterToggle, {
+		t10 = /* @__PURE__ */ jsx(FilterToggle, {
 			icon: "fits-corporation",
 			label: "Corporation Fittings"
 		});
-		t14 = /* @__PURE__ */ jsx(FilterToggle, {
+		t11 = /* @__PURE__ */ jsx(FilterToggle, {
 			icon: "fits-alliance",
 			label: "Alliance Fittings"
 		});
-		t15 = /* @__PURE__ */ jsx(FilterToggle, {
+		t12 = /* @__PURE__ */ jsx(FilterToggle, {
 			icon: "fits-community",
 			label: "Community Fittings"
 		});
-		$[37] = t12;
-		$[38] = t13;
-		$[39] = t14;
-		$[40] = t15;
+		$[29] = t10;
+		$[30] = t11;
+		$[31] = t12;
+		$[32] = t9;
 	} else {
-		t12 = $[37];
-		t13 = $[38];
-		t14 = $[39];
-		t15 = $[40];
+		t10 = $[29];
+		t11 = $[30];
+		t12 = $[31];
+		t9 = $[32];
 	}
-	let t16;
-	if ($[41] !== narrow || $[42] !== search) {
-		t16 = (pressed) => narrow(search, pressed);
-		$[41] = narrow;
-		$[42] = search;
-		$[43] = t16;
-	} else t16 = $[43];
-	let t17;
-	if ($[44] !== currentHull || $[45] !== t16) {
-		t17 = /* @__PURE__ */ jsx(FilterToggle, {
+	let t13;
+	if ($[33] !== currentHull) {
+		t13 = /* @__PURE__ */ jsx(FilterToggle, {
 			icon: "current-hull",
 			label: "Current Hull",
 			pressed: currentHull,
-			onPressedChange: t16
+			onPressedChange: setCurrentHull
 		});
-		$[44] = currentHull;
-		$[45] = t16;
-		$[46] = t17;
-	} else t17 = $[46];
-	let t18;
-	if ($[47] !== flyable) {
-		t18 = /* @__PURE__ */ jsx(FilterToggle, {
+		$[33] = currentHull;
+		$[34] = t13;
+	} else t13 = $[34];
+	let t14;
+	if ($[35] !== flyable) {
+		t14 = /* @__PURE__ */ jsx(FilterToggle, {
 			icon: "skills",
 			label: "Skills",
 			pressed: flyable,
 			onPressedChange: setFlyable
 		});
-		$[47] = flyable;
-		$[48] = t18;
-	} else t18 = $[48];
-	let t19;
-	if ($[49] !== t11 || $[50] !== t17 || $[51] !== t18) {
-		t19 = /* @__PURE__ */ jsxs("fieldset", {
+		$[35] = flyable;
+		$[36] = t14;
+	} else t14 = $[36];
+	let t15;
+	if ($[37] !== t13 || $[38] !== t14 || $[39] !== t8) {
+		t15 = /* @__PURE__ */ jsxs("fieldset", {
 			className: ItemBrowser_module_default.filters,
 			"aria-label": "Filters",
 			children: [
+				t8,
+				t9,
+				t10,
 				t11,
 				t12,
 				t13,
-				t14,
-				t15,
-				t17,
-				t18
+				t14
 			]
 		});
-		$[49] = t11;
-		$[50] = t17;
-		$[51] = t18;
-		$[52] = t19;
-	} else t19 = $[52];
-	const t20 = tree.key;
-	let t21;
-	if ($[53] !== fitsByHull || $[54] !== groups || $[55] !== images || $[56] !== shownFits || $[57] !== simulate || $[58] !== store || $[59] !== tree.open) {
-		let t22;
-		if ($[61] !== fitsByHull || $[62] !== images || $[63] !== shownFits || $[64] !== simulate || $[65] !== store || $[66] !== tree.open) {
-			t22 = (t23) => {
-				const { group, races } = t23;
+		$[37] = t13;
+		$[38] = t14;
+		$[39] = t8;
+		$[40] = t15;
+	} else t15 = $[40];
+	let t16;
+	if ($[41] !== fitsByHull || $[42] !== groups || $[43] !== images || $[44] !== shownFits || $[45] !== simulate || $[46] !== store) {
+		let t17;
+		if ($[48] !== fitsByHull || $[49] !== images || $[50] !== shownFits || $[51] !== simulate || $[52] !== store) {
+			t17 = (t18) => {
+				const { group, races } = t18;
 				return /* @__PURE__ */ jsx(TreeGroup, {
 					label: group.name,
-					defaultOpen: tree.open,
-					children: () => races.map((t24) => {
-						const { race, factionId, ships } = t24;
+					children: () => races.map((t19) => {
+						const { race, factionId, ships } = t19;
 						return /* @__PURE__ */ jsx(TreeGroup, {
 							label: `${raceName(race)} [${ships.length}]`,
-							icon: factionId === void 0 ? void 0 : images.factionIcon(factionId),
-							defaultOpen: tree.open,
+							icon: factionId === void 0 ? images.marketGroupIcon(SHIPS_MARKET_GROUP_ID) : images.factionIcon(factionId),
 							children: () => ships.map((ship_1) => {
 								const shown_0 = shownFits(ship_1);
 								const simulateShip = /* @__PURE__ */ jsx(Tooltip, {
@@ -3977,24 +4626,15 @@ function HullsAndFits() {
 										children: /* @__PURE__ */ jsx(Icon, { name: "simulate" })
 									})
 								});
-								if (shown_0.length === 0) return /* @__PURE__ */ jsx(TreeLeaf, {
-									label: /* @__PURE__ */ jsx("span", {
-										className: ItemBrowser_module_default.hull,
-										children: ship_1.name
-									}),
-									typeId: ship_1.id,
-									after: simulateShip
-								}, ship_1.id);
 								return /* @__PURE__ */ jsx(TreeGroup, {
 									label: /* @__PURE__ */ jsx("span", {
 										className: ItemBrowser_module_default.hull,
 										children: ship_1.name
 									}),
-									description: /* @__PURE__ */ jsx(Counts, { browserFits: fitsByHull.get(ship_1.id)?.length ?? 0 }),
+									description: shown_0.length > 0 ? /* @__PURE__ */ jsx(Counts, { browserFits: fitsByHull.get(ship_1.id)?.length ?? 0 }) : void 0,
 									typeId: ship_1.id,
-									defaultOpen: tree.open,
 									after: simulateShip,
-									children: () => shown_0.map((saved_1) => /* @__PURE__ */ jsx(TreeLeaf, {
+									children: () => shown_0.length === 0 ? /* @__PURE__ */ jsx(TreeLeaf, { label: "No Item" }) : shown_0.map((saved_1) => /* @__PURE__ */ jsx(TreeLeaf, {
 										label: /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
 											className: ItemBrowser_module_default.kind,
 											children: /* @__PURE__ */ jsx(Icon, { name: "fits-browser" })
@@ -4008,50 +4648,48 @@ function HullsAndFits() {
 					})
 				}, group.id);
 			};
-			$[61] = fitsByHull;
-			$[62] = images;
-			$[63] = shownFits;
-			$[64] = simulate;
-			$[65] = store;
-			$[66] = tree.open;
-			$[67] = t22;
-		} else t22 = $[67];
-		t21 = groups.map(t22);
-		$[53] = fitsByHull;
-		$[54] = groups;
-		$[55] = images;
-		$[56] = shownFits;
-		$[57] = simulate;
-		$[58] = store;
-		$[59] = tree.open;
-		$[60] = t21;
-	} else t21 = $[60];
-	let t22;
-	if ($[68] !== t21 || $[69] !== tree.key) {
-		t22 = /* @__PURE__ */ jsx("div", {
+			$[48] = fitsByHull;
+			$[49] = images;
+			$[50] = shownFits;
+			$[51] = simulate;
+			$[52] = store;
+			$[53] = t17;
+		} else t17 = $[53];
+		t16 = groups.map(t17);
+		$[41] = fitsByHull;
+		$[42] = groups;
+		$[43] = images;
+		$[44] = shownFits;
+		$[45] = simulate;
+		$[46] = store;
+		$[47] = t16;
+	} else t16 = $[47];
+	let t17;
+	if ($[54] !== collapses || $[55] !== t16) {
+		t17 = /* @__PURE__ */ jsx("div", {
 			className: ItemBrowser_module_default.tree,
 			children: /* @__PURE__ */ jsx(TreeList, {
 				label: "Hulls",
-				children: t21
-			}, t20)
+				children: t16
+			}, collapses)
 		});
-		$[68] = t21;
-		$[69] = tree.key;
-		$[70] = t22;
-	} else t22 = $[70];
-	let t23;
-	if ($[71] !== t10 || $[72] !== t19 || $[73] !== t22) {
-		t23 = /* @__PURE__ */ jsxs(Fragment, { children: [
-			t10,
-			t19,
-			t22
+		$[54] = collapses;
+		$[55] = t16;
+		$[56] = t17;
+	} else t17 = $[56];
+	let t18;
+	if ($[57] !== t15 || $[58] !== t17 || $[59] !== t7) {
+		t18 = /* @__PURE__ */ jsxs(Fragment, { children: [
+			t7,
+			t15,
+			t17
 		] });
-		$[71] = t10;
-		$[72] = t19;
-		$[73] = t22;
-		$[74] = t23;
-	} else t23 = $[74];
-	return t23;
+		$[57] = t15;
+		$[58] = t17;
+		$[59] = t7;
+		$[60] = t18;
+	} else t18 = $[60];
+	return t18;
 }
 function _temp$3(saved) {
 	return saved.ship.type_id;
@@ -4235,7 +4873,7 @@ const slotFilters = [
 ];
 /** The Modules tab of the `ItemBrowser`: what goes on a ship, by market group. */
 function Modules() {
-	const $ = c(51);
+	const $ = c(44);
 	const { actions, clear, dragImage } = useTypeActions();
 	const placement = usePlacement();
 	const canFit = useCanFit();
@@ -4244,32 +4882,27 @@ function Modules() {
 	const [slots, setSlots] = useState(_temp$2);
 	const [hullRestrictions, setHullRestrictions] = useState(false);
 	const [flyable, setFlyable] = useState(false);
+	const [collapses, setCollapses] = useState(0);
 	let t0;
-	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-		t0 = { times: 0 };
-		$[0] = t0;
-	} else t0 = $[0];
-	const [collapsed, setCollapsed] = useState(t0);
+	if ($[0] !== search) {
+		t0 = search.trim().toLowerCase();
+		$[0] = search;
+		$[1] = t0;
+	} else t0 = $[1];
+	const query = t0;
 	let t1;
-	if ($[1] !== search) {
-		t1 = search.trim().toLowerCase();
-		$[1] = search;
-		$[2] = t1;
-	} else t1 = $[2];
-	const query = t1;
-	let t2;
-	if ($[3] !== slots) {
-		t2 = new Set(slotFilters.filter((t3) => {
-			const { filter } = t3;
+	if ($[2] !== slots) {
+		t1 = new Set(slotFilters.filter((t2) => {
+			const { filter } = t2;
 			return slots.has(filter);
 		}).flatMap(_temp2$1));
-		$[3] = slots;
-		$[4] = t2;
-	} else t2 = $[4];
-	const places = t2;
-	let t3;
-	if ($[5] !== canFit || $[6] !== flyable || $[7] !== hullRestrictions || $[8] !== missingSkills || $[9] !== placement || $[10] !== places || $[11] !== query) {
-		t3 = query !== "" || places.size > 0 || hullRestrictions || flyable ? (type) => {
+		$[2] = slots;
+		$[3] = t1;
+	} else t1 = $[3];
+	const places = t1;
+	let t2;
+	if ($[4] !== canFit || $[5] !== flyable || $[6] !== hullRestrictions || $[7] !== missingSkills || $[8] !== placement || $[9] !== places || $[10] !== query) {
+		t2 = query !== "" || places.size > 0 || hullRestrictions || flyable ? (type) => {
 			if (places.size > 0) {
 				const place = placement(type)?.type;
 				if (place === void 0 || !places.has(place)) return false;
@@ -4278,64 +4911,62 @@ function Modules() {
 			if (flyable && missingSkills([type.id]).length > 0) return false;
 			return type.name.toLowerCase().includes(query);
 		} : void 0;
-		$[5] = canFit;
-		$[6] = flyable;
-		$[7] = hullRestrictions;
-		$[8] = missingSkills;
-		$[9] = placement;
-		$[10] = places;
-		$[11] = query;
-		$[12] = t3;
-	} else t3 = $[12];
-	const groups = useModuleTree(t3);
-	const open = query !== "" && query !== collapsed.query && countTypes(groups) <= 200;
-	let t4;
-	if ($[13] !== slots) {
-		t4 = (filter_0, pressed) => {
+		$[4] = canFit;
+		$[5] = flyable;
+		$[6] = hullRestrictions;
+		$[7] = missingSkills;
+		$[8] = placement;
+		$[9] = places;
+		$[10] = query;
+		$[11] = t2;
+	} else t2 = $[11];
+	const keep = t2;
+	const tree = useModuleTree(query === "" ? keep : void 0);
+	const found = useModuleSearch(query === "" ? void 0 : keep);
+	const groups = query === "" ? tree : found;
+	let t3;
+	if ($[12] !== slots) {
+		t3 = (filter_0, pressed) => {
 			const next = new Set(slots);
 			if (pressed) next.add(filter_0);
 			else next.delete(filter_0);
 			setSlots(next);
 		};
-		$[13] = slots;
-		$[14] = t4;
-	} else t4 = $[14];
-	const toggleSlot = t4;
-	let t5;
-	if ($[15] !== clear) {
-		t5 = (value) => {
+		$[12] = slots;
+		$[13] = t3;
+	} else t3 = $[13];
+	const toggleSlot = t3;
+	let t4;
+	if ($[14] !== clear) {
+		t4 = (value) => {
 			clear();
 			setSearch(value);
 		};
-		$[15] = clear;
-		$[16] = t5;
-	} else t5 = $[16];
+		$[14] = clear;
+		$[15] = t4;
+	} else t4 = $[15];
+	let t5;
+	if ($[16] !== collapses) {
+		t5 = () => setCollapses(collapses + 1);
+		$[16] = collapses;
+		$[17] = t5;
+	} else t5 = $[17];
 	let t6;
-	if ($[17] !== collapsed.times || $[18] !== query) {
-		t6 = () => setCollapsed({
-			times: collapsed.times + 1,
-			query
-		});
-		$[17] = collapsed.times;
-		$[18] = query;
-		$[19] = t6;
-	} else t6 = $[19];
-	let t7;
-	if ($[20] !== search || $[21] !== t5 || $[22] !== t6) {
-		t7 = /* @__PURE__ */ jsx(Search, {
+	if ($[18] !== search || $[19] !== t4 || $[20] !== t5) {
+		t6 = /* @__PURE__ */ jsx(Search, {
 			value: search,
-			onChange: t5,
-			onCollapse: t6
+			onChange: t4,
+			onCollapse: t5
 		});
-		$[20] = search;
-		$[21] = t5;
-		$[22] = t6;
-		$[23] = t7;
-	} else t7 = $[23];
-	let t8;
-	if ($[24] !== slots || $[25] !== toggleSlot) {
-		t8 = slotFilters.map((t9) => {
-			const { filter: filter_1, icon, label } = t9;
+		$[18] = search;
+		$[19] = t4;
+		$[20] = t5;
+		$[21] = t6;
+	} else t6 = $[21];
+	let t7;
+	if ($[22] !== slots || $[23] !== toggleSlot) {
+		t7 = slotFilters.map((t8) => {
+			const { filter: filter_1, icon, label } = t8;
 			return /* @__PURE__ */ jsx(FilterToggle, {
 				icon,
 				label,
@@ -4343,105 +4974,96 @@ function Modules() {
 				onPressedChange: (pressed_0) => toggleSlot(filter_1, pressed_0)
 			}, filter_1);
 		});
-		$[24] = slots;
-		$[25] = toggleSlot;
-		$[26] = t8;
-	} else t8 = $[26];
-	let t9;
-	if ($[27] !== hullRestrictions) {
-		t9 = /* @__PURE__ */ jsx(FilterToggle, {
+		$[22] = slots;
+		$[23] = toggleSlot;
+		$[24] = t7;
+	} else t7 = $[24];
+	let t8;
+	if ($[25] !== hullRestrictions) {
+		t8 = /* @__PURE__ */ jsx(FilterToggle, {
 			icon: "filter-hull-restrictions",
 			label: "Hull Restrictions",
 			pressed: hullRestrictions,
 			onPressedChange: setHullRestrictions
 		});
-		$[27] = hullRestrictions;
-		$[28] = t9;
-	} else t9 = $[28];
-	let t10;
-	if ($[29] === Symbol.for("react.memo_cache_sentinel")) {
-		t10 = /* @__PURE__ */ jsx(FilterToggle, {
+		$[25] = hullRestrictions;
+		$[26] = t8;
+	} else t8 = $[26];
+	let t9;
+	if ($[27] === Symbol.for("react.memo_cache_sentinel")) {
+		t9 = /* @__PURE__ */ jsx(FilterToggle, {
 			icon: "filter-resources",
 			label: "Resources"
 		});
-		$[29] = t10;
-	} else t10 = $[29];
-	let t11;
-	if ($[30] !== flyable) {
-		t11 = /* @__PURE__ */ jsx(FilterToggle, {
+		$[27] = t9;
+	} else t9 = $[27];
+	let t10;
+	if ($[28] !== flyable) {
+		t10 = /* @__PURE__ */ jsx(FilterToggle, {
 			icon: "skills",
 			label: "Skills",
 			pressed: flyable,
 			onPressedChange: setFlyable
 		});
-		$[30] = flyable;
-		$[31] = t11;
-	} else t11 = $[31];
-	let t12;
-	if ($[32] !== t11 || $[33] !== t8 || $[34] !== t9) {
-		t12 = /* @__PURE__ */ jsxs("fieldset", {
+		$[28] = flyable;
+		$[29] = t10;
+	} else t10 = $[29];
+	let t11;
+	if ($[30] !== t10 || $[31] !== t7 || $[32] !== t8) {
+		t11 = /* @__PURE__ */ jsxs("fieldset", {
 			className: ItemBrowser_module_default.filters,
 			"aria-label": "Filters",
 			children: [
+				t7,
 				t8,
 				t9,
-				t10,
-				t11
+				t10
 			]
 		});
-		$[32] = t11;
-		$[33] = t8;
-		$[34] = t9;
-		$[35] = t12;
-	} else t12 = $[35];
-	const t13 = `${collapsed.times}-${open}`;
-	let t14;
-	if ($[36] !== actions || $[37] !== groups || $[38] !== open) {
-		let t15;
-		if ($[40] !== actions || $[41] !== open) {
-			t15 = (node) => /* @__PURE__ */ jsx(ModuleGroup, {
-				node,
-				open,
-				actions
-			}, node.group.id);
-			$[40] = actions;
-			$[41] = open;
-			$[42] = t15;
-		} else t15 = $[42];
-		t14 = groups.map(t15);
-		$[36] = actions;
-		$[37] = groups;
-		$[38] = open;
-		$[39] = t14;
-	} else t14 = $[39];
-	let t15;
-	if ($[43] !== t13 || $[44] !== t14) {
-		t15 = /* @__PURE__ */ jsx("div", {
+		$[30] = t10;
+		$[31] = t7;
+		$[32] = t8;
+		$[33] = t11;
+	} else t11 = $[33];
+	let t12;
+	if ($[34] !== actions || $[35] !== collapses || $[36] !== groups || $[37] !== query) {
+		t12 = /* @__PURE__ */ jsx("div", {
 			className: ItemBrowser_module_default.tree,
-			children: /* @__PURE__ */ jsx(TreeList, {
+			children: groups.length === 0 ? /* @__PURE__ */ jsx("p", {
+				className: ItemBrowser_module_default.empty,
+				children: "No modules found"
+			}) : /* @__PURE__ */ jsx(TreeList, {
 				label: "Modules",
-				children: t14
-			}, t13)
+				children: query === "" ? groups.map((node) => /* @__PURE__ */ jsx(TypeGroup, {
+					node,
+					actions
+				}, node.group.id)) : /* @__PURE__ */ jsx(SearchResults, {
+					roots: groups,
+					actions
+				})
+			}, collapses)
 		});
-		$[43] = t13;
-		$[44] = t14;
-		$[45] = t15;
-	} else t15 = $[45];
-	let t16;
-	if ($[46] !== dragImage || $[47] !== t12 || $[48] !== t15 || $[49] !== t7) {
-		t16 = /* @__PURE__ */ jsxs(Fragment, { children: [
-			t7,
+		$[34] = actions;
+		$[35] = collapses;
+		$[36] = groups;
+		$[37] = query;
+		$[38] = t12;
+	} else t12 = $[38];
+	let t13;
+	if ($[39] !== dragImage || $[40] !== t11 || $[41] !== t12 || $[42] !== t6) {
+		t13 = /* @__PURE__ */ jsxs(Fragment, { children: [
+			t6,
+			t11,
 			t12,
-			t15,
 			dragImage
 		] });
-		$[46] = dragImage;
-		$[47] = t12;
-		$[48] = t15;
-		$[49] = t7;
-		$[50] = t16;
-	} else t16 = $[50];
-	return t16;
+		$[39] = dragImage;
+		$[40] = t11;
+		$[41] = t12;
+		$[42] = t6;
+		$[43] = t13;
+	} else t13 = $[43];
+	return t13;
 }
 function _temp2$1(slot) {
 	return slot.places;
@@ -4449,53 +5071,6 @@ function _temp2$1(slot) {
 function _temp$2() {
 	return /* @__PURE__ */ new Set();
 }
-function ModuleGroup(t0) {
-	const $ = c(12);
-	const { node, open, actions } = t0;
-	const images = useImages();
-	const t1 = node.group.name;
-	let t2;
-	if ($[0] !== images || $[1] !== node.group.id) {
-		t2 = images.marketGroupIcon(node.group.id);
-		$[0] = images;
-		$[1] = node.group.id;
-		$[2] = t2;
-	} else t2 = $[2];
-	let t3;
-	if ($[3] !== actions || $[4] !== node || $[5] !== open) {
-		t3 = () => /* @__PURE__ */ jsxs(Fragment, { children: [node.children.map((child) => /* @__PURE__ */ jsx(ModuleGroup, {
-			node: child,
-			open,
-			actions
-		}, child.group.id)), /* @__PURE__ */ jsx(TypeLeaves, {
-			sorted: node,
-			open,
-			actions
-		})] });
-		$[3] = actions;
-		$[4] = node;
-		$[5] = open;
-		$[6] = t3;
-	} else t3 = $[6];
-	let t4;
-	if ($[7] !== node.group.name || $[8] !== open || $[9] !== t2 || $[10] !== t3) {
-		t4 = /* @__PURE__ */ jsx(TreeGroup, {
-			label: t1,
-			icon: t2,
-			defaultOpen: open,
-			children: t3
-		});
-		$[7] = node.group.name;
-		$[8] = open;
-		$[9] = t2;
-		$[10] = t3;
-		$[11] = t4;
-	} else t4 = $[11];
-	return t4;
-}
-function countTypes(nodes) {
-	return nodes.reduce((count, node) => count + countTypes(node.children) + countLeaves(node), 0);
-}
 //#endregion
 //#region src/components/ItemBrowser/ItemBrowser.tsx
 /** EVE's browser of hulls and fits, modules and charges, left of the fitting wheel. */
@@ -4619,36 +5194,6 @@ function AttributeText(t0) {
 	return t1;
 }
 //#endregion
-//#region src/components/ShipStatistics/AttributeTooltip.tsx
-/** What EVE shows when hovering the attribute; its name, for one without. */
-function AttributeTooltip(t0) {
-	const $ = c(7);
-	const { attribute } = t0;
-	const sde = useSde();
-	const tooltip = useAttributeTooltip(attribute);
-	let t1;
-	if ($[0] !== attribute || $[1] !== sde || $[2] !== tooltip?.title) {
-		t1 = tooltip?.title ?? sde.attribute(sde.attributeId(attribute) ?? 0)?.displayName ?? attribute;
-		$[0] = attribute;
-		$[1] = sde;
-		$[2] = tooltip?.title;
-		$[3] = t1;
-	} else t1 = $[3];
-	const title = t1;
-	const t2 = tooltip?.description;
-	let t3;
-	if ($[4] !== t2 || $[5] !== title) {
-		t3 = /* @__PURE__ */ jsx(TooltipText, {
-			title,
-			description: t2
-		});
-		$[4] = t2;
-		$[5] = title;
-		$[6] = t3;
-	} else t3 = $[6];
-	return t3;
-}
-//#endregion
 //#region src/components/ShipStatistics/units.ts
 /** For the `format` of `useAttribute`. */
 function unit(suffix, divisor = 1) {