@artenx/dshb 0.1.27 → 0.1.28

package/lib/client.js

@@ -1158,19 +1158,8 @@ window.__ModuleLoader__.load({
      overflow: visible !important;
    }
 
-  /* 模型选择器弹窗：JS（installModelMenuPosition）在窄屏下改为 position:fixed
-     视口级浮层（fixed 不受祖先 overflow 裁剪），这里仅做静态兜底（JS 未生效时
-     仍从触发按钮左缘向右展开、宽度收进视口）。 */
-  [class*="7KE1Ra_menu"],
-  [class*="_menu"]:has([class*="modelName"]) {
-    left: 0 !important;
-    right: auto !important;
-    width: calc(100vw - 32px) !important;
-    min-width: 0 !important;
-    max-width: calc(100vw - 32px) !important;
-    overflow-y: auto !important;
-    max-height: calc(100vh - 120px) !important;
-  }
+  /* 菜单定位完全交还上游（0.2.1-rc.2 起菜单 position:fixed 且自带视口钳制；
+     此前插件的 left/width !important 兜底会覆盖上游 place() 的计算结果）。 */
 
   /* 工具调用执行结果/代码/JSON：窄屏可横向滑动。details 抽屉宽 min(92%,420px)
      较窄，命令行输出/JSON 长行溢出被外层 overflow:hidden 裁剪看不到。命令行输出
@@ -1595,69 +1584,11 @@ window.__ModuleLoader__.load({
 				};
 			}, "dshb-mobile: stats line");
 		}
-		/** 浮层 fixed 定位需管理的内联样式键，清理时逐一移除以交还上游 CSS。 */
-		const SHEET_PROPS = [
-			"position",
-			"width",
-			"left",
-			"right",
-			"top",
-			"bottom",
-			"min-width",
-			"max-width",
-			"max-height",
-			"overflow-y",
-			"box-sizing"
-		];
 		/** 幂等写入 important 内联样式：值未变化时跳过，避免 MutationObserver(attributes) 自触发循环。 */
 		function setImportantIfChanged(el, prop, value) {
 			if (el.style.getPropertyValue(prop) === value && el.style.getPropertyPriority(prop) === "important") return;
 			el.style.setProperty(prop, value, "important");
 		}
-		/** 当前视口下的可视区域（手机键盘弹出时 visualViewport 与布局视口错位）。 */
-		function visibleViewport() {
-			const vv = window.visualViewport;
-			if (vv) return {
-				vw: vv.width,
-				vh: vv.offsetTop + vv.height,
-				top: vv.offsetTop
-			};
-			return {
-				vw: window.innerWidth,
-				vh: window.innerHeight,
-				top: 0
-			};
-		}
-		/** Keep the model menu anchored to its trigger while fitting it in the viewport. */
-		function positionAnchoredMenu(el, triggerRect, maxWidth, maxHeight) {
-			const margin = 8;
-			const { vw, vh } = visibleViewport();
-			setImportantIfChanged(el, "position", "fixed");
-			setImportantIfChanged(el, "box-sizing", "border-box");
-			setImportantIfChanged(el, "left", "0");
-			setImportantIfChanged(el, "right", "auto");
-			setImportantIfChanged(el, "top", "0");
-			setImportantIfChanged(el, "bottom", "auto");
-			setImportantIfChanged(el, "min-width", "0");
-			setImportantIfChanged(el, "max-width", `${Math.max(0, Math.min(maxWidth, vw - 16))}px`);
-			setImportantIfChanged(el, "max-height", `${Math.max(0, Math.min(maxHeight, vh - 16))}px`);
-			setImportantIfChanged(el, "overflow-y", "auto");
-			let width = el.offsetWidth;
-			let height = el.offsetHeight;
-			const { top: viewportTop } = visibleViewport();
-			const spaceAbove = Math.max(0, triggerRect.top - viewportTop - 16);
-			const spaceBelow = Math.max(0, vh - triggerRect.bottom - 16);
-			const expandUp = height <= spaceAbove || spaceAbove >= spaceBelow;
-			const available = expandUp ? spaceAbove : spaceBelow;
-			if (height > available) {
-				setImportantIfChanged(el, "max-height", `${Math.max(0, available - margin)}px`);
-				height = el.offsetHeight;
-				width = el.offsetWidth;
-			}
-			const top = expandUp ? triggerRect.top - margin - height : triggerRect.bottom + margin;
-			setImportantIfChanged(el, "left", `${Math.max(margin, Math.min(triggerRect.right - width, vw - width - margin))}px`);
-			setImportantIfChanged(el, "top", `${Math.max(viewportTop + margin, Math.min(top, vh - height - margin))}px`);
-		}
 		/**
 		* 模型名多为纯连字符词（DeepSeek-V4-Flash-Vision-Exp）；white-space:normal 下
 		* 每个 "-" 都是软断点，名字一旦超列宽就在第一个连字符处断行（"换行太早"）。
@@ -1709,18 +1640,13 @@ window.__ModuleLoader__.load({
 				n.style.removeProperty("font-size");
 			}
 		}
-		/** 清除 anchored menu 写入的内联样式，交还上游 CSS。 */
-		function clearFixedSheet(el) {
-			if (el === null || el === void 0) return;
-			for (const key of SHEET_PROPS) el.style.removeProperty(key);
-		}
 		/**
-		* 模型选择弹窗（dsh-client-ui-model-selection）是两级 pane 的同一个 `_7KE1Ra_menu`
-		* 元素：一级 Model/Effort 单元格列表（cellLabel），点击后切到模型列表（modelName）
-		* 或档位列表。上游默认 `position:absolute;right:0` 贴触发按钮右缘，触发按钮在
-		* 可横向滚动的 stats 行内时菜单会整体出屏。两级 pane 都必须接管（不能只按
-		* modelName 匹配，否则一级 pane 漏掉）。所有视口都把菜单锚定到触发按钮，
-		* 在上方/下方可用空间中选择更合适的一侧，避免上游空间不足时把菜单钳到屏幕顶端。
+		* 模型选择弹窗（dsh-client-ui-model-selection）：上游 0.2.1-rc.2 起菜单已是
+		* `position:fixed` 并自带 place() 视口钳制定位（portal 到 body，ResizeObserver
+		* 跟随尺寸变化）。插件不再接管定位——此前写入的 fixed/left/top 与上游 menuPos
+		* 内联样式互相拉扯；且对自动聚焦搜索框的 blur 拦截会触发上游 onBlur 的
+		* close()（焦点移出菜单即关闭），手机上表现为菜单刚打开就被关掉（"弹不出来"）。
+		* 这里只保留窄屏下的视觉适配：模型名不换行连字符 + 按最宽名字缩放字号。
 		*/
 		function installModelMenuPosition(ctx) {
 			ctx.effect(() => {
@@ -1734,45 +1660,27 @@ window.__ModuleLoader__.load({
 					fallbackLast = now;
 					return Array.from(document.querySelectorAll("[class*=\"_menu\"]")).filter((el) => el.querySelector("[class*=\"cellLabel\"], [class*=\"modelName\"]") !== null);
 				};
-				const findTrigger = (menu) => {
-					if (menu.id) {
-						const controlled = Array.from(document.querySelectorAll("[aria-controls]")).find((el) => el.getAttribute("aria-controls") === menu.id);
-						if (controlled) return controlled;
-					}
-					return document.querySelector("[class*=\"7KE1Ra_trigger\"][aria-expanded=\"true\"]");
-				};
 				let fittedVw = 0;
 				let fittedSig = -1;
 				let fittedMenus = [];
-				let positionedMenus = [];
 				const sync = () => {
-					const menus = findMenus();
 					let vw = 0;
 					let sig = 0;
 					const modelMenus = [];
-					const visibleMenus = [];
-					for (const menu of menus) {
-						const trigger = findTrigger(menu);
-						if (trigger === null || trigger.getAttribute("aria-expanded") !== "true") continue;
-						const rect = menu.getBoundingClientRect();
-						if (rect.width === 0 && rect.height === 0) continue;
-						positionAnchoredMenu(menu, trigger.getBoundingClientRect(), Math.min(420, window.innerWidth - 16), 360);
-						visibleMenus.push(menu);
-						if (menu.querySelector("[class*=\"modelName\"]")) {
-							modelMenus.push(menu);
-							if (narrow.matches) {
-								applyNonBreakingHyphens(menu);
-								vw = window.innerWidth;
-								for (const n of menu.querySelectorAll("[class*=\"modelName\"]")) sig += n.textContent?.length ?? 0;
-							}
+					for (const menu of findMenus()) {
+						if (!menu.querySelector("[class*=\"modelName\"]")) continue;
+						if (menu.getBoundingClientRect().width === 0) continue;
+						modelMenus.push(menu);
+						if (narrow.matches) {
+							applyNonBreakingHyphens(menu);
+							vw = window.innerWidth;
+							for (const n of menu.querySelectorAll("[class*=\"modelName\"]")) sig += n.textContent?.length ?? 0;
 						}
 					}
-					for (const previous of positionedMenus) {
-						if (visibleMenus.includes(previous)) continue;
-						clearFixedSheet(previous);
+					for (const previous of fittedMenus) {
+						if (modelMenus.includes(previous)) continue;
 						clearModelNameFit(previous);
 					}
-					positionedMenus = visibleMenus;
 					if (!narrow.matches) {
 						for (const menu of modelMenus) clearModelNameFit(menu);
 						fittedVw = 0;
@@ -1792,42 +1700,14 @@ window.__ModuleLoader__.load({
 				const mo = new MutationObserver(() => requestAnimationFrame(sync));
 				mo.observe(document.documentElement, {
 					childList: true,
-					subtree: true,
-					attributes: true,
-					attributeFilter: ["style"]
+					subtree: true
 				});
 				narrow.addEventListener("change", sync);
 				window.addEventListener("resize", sync);
-				window.addEventListener("scroll", sync, true);
-				window.visualViewport?.addEventListener("resize", sync);
-				window.visualViewport?.addEventListener("scroll", sync);
-				let lastPointerTarget = null;
-				const keyboardLikelyOpen = () => {
-					const vv = window.visualViewport;
-					if (!vv) return false;
-					return window.innerHeight - vv.height > 150;
-				};
-				const onPointerDown = (event) => {
-					lastPointerTarget = event.target instanceof Element ? event.target : null;
-				};
-				const onFocusIn = (event) => {
-					if (!narrow.matches || !(event.target instanceof Element) || keyboardLikelyOpen()) return;
-					const input = event.target.closest("input");
-					if (!input || input.closest("[class*=\"7KE1Ra_menu\"], [class*=\"_menu\"]") === null) return;
-					if (lastPointerTarget !== null && (lastPointerTarget === input || input.contains(lastPointerTarget))) return;
-					input.blur();
-				};
-				document.addEventListener("pointerdown", onPointerDown, true);
-				document.addEventListener("focusin", onFocusIn, true);
 				return () => {
 					mo.disconnect();
 					narrow.removeEventListener("change", sync);
 					window.removeEventListener("resize", sync);
-					window.removeEventListener("scroll", sync, true);
-					window.visualViewport?.removeEventListener("resize", sync);
-					window.visualViewport?.removeEventListener("scroll", sync);
-					document.removeEventListener("pointerdown", onPointerDown, true);
-					document.removeEventListener("focusin", onFocusIn, true);
 				};
 			}, "dshb-mobile: model menu position");
 		}