Skip to content

Commit 769a246

Browse files
committed
不再使用 --desktop-compact-history-center-x,只保留一次性的 historyOffsetX
移除 historyCenterX 传递和 CSS 写入
1 parent 5a4346b commit 769a246

3 files changed

Lines changed: 4 additions & 22 deletions

File tree

frontend/react-neko-chat/src/styles.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2321,10 +2321,7 @@ body.electron-chat-window.subtitle-web-host .compact-chat-surface-shell {
23212321
);
23222322
--compact-export-history-half-inline-size: calc(var(--compact-export-history-inline-size) / 2);
23232323
--compact-export-history-safe-inset: calc(var(--compact-export-history-viewport-gutter) / 2);
2324-
--compact-export-history-center-x: var(
2325-
--desktop-compact-history-center-x,
2326-
calc(var(--desktop-compact-surface-left, var(--compact-surface-left, 50vw)) + (var(--compact-export-surface-width) / 2) + var(--desktop-compact-history-offset-x, 0px))
2327-
);
2324+
--compact-export-history-center-x: calc(var(--desktop-compact-surface-left, var(--compact-surface-left, 50vw)) + (var(--compact-export-surface-width) / 2) + var(--desktop-compact-history-offset-x, 0px));
23282325
left: clamp(
23292326
calc(var(--compact-export-history-viewport-inline-start) + var(--compact-export-history-half-inline-size) + var(--compact-export-history-safe-inset)),
23302327
var(--compact-export-history-center-x),

static/app-react-chat-window.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@
375375
var workArea = normalizeCompactDesktopWorkArea(layout.workArea);
376376
var windowBounds = normalizeCompactDesktopWindowBounds(layout.windowBounds);
377377
var historyOffsetX = Number(layout.historyOffsetX);
378-
var historyCenterX = Number(layout.historyCenterX);
379378
var compactChoicePlacement = layout.compactChoicePlacement === 'above' || layout.compactChoicePlacement === 'below'
380379
? layout.compactChoicePlacement
381380
: null;
@@ -386,7 +385,6 @@
386385
workArea: workArea,
387386
windowBounds: windowBounds,
388387
historyOffsetX: Number.isFinite(historyOffsetX) ? historyOffsetX : 0,
389-
historyCenterX: Number.isFinite(historyCenterX) ? historyCenterX : null,
390388
compactChoicePlacement: compactChoicePlacement
391389
};
392390
}
@@ -1140,8 +1138,7 @@
11401138
}
11411139
parts.push(
11421140
'history',
1143-
Math.round(layoutOverride.historyOffsetX || 0),
1144-
Number.isFinite(layoutOverride.historyCenterX) ? Math.round(layoutOverride.historyCenterX) : 'none'
1141+
Math.round(layoutOverride.historyOffsetX || 0)
11451142
);
11461143
return parts.join(':');
11471144
}
@@ -1621,7 +1618,6 @@
16211618
document.documentElement.style.removeProperty('--compact-desktop-workarea-width');
16221619
document.documentElement.style.removeProperty('--compact-desktop-workarea-height');
16231620
document.documentElement.style.removeProperty('--desktop-compact-history-offset-x');
1624-
document.documentElement.style.removeProperty('--desktop-compact-history-center-x');
16251621
compactSurfaceAnchorSnapshot = '';
16261622
compactSurfaceAnchorLocked = false;
16271623
dispatchCompactSurfaceLayoutChange(null);
@@ -1682,11 +1678,6 @@
16821678
document.documentElement.style.setProperty('--desktop-compact-surface-width', Math.round(target.width) + 'px');
16831679
document.documentElement.style.setProperty('--desktop-compact-surface-height', Math.round(target.height || COMPACT_SURFACE_DEFAULT_HEIGHT) + 'px');
16841680
document.documentElement.style.setProperty('--desktop-compact-history-offset-x', Math.round(layoutOverride.historyOffsetX || 0) + 'px');
1685-
if (Number.isFinite(layoutOverride.historyCenterX)) {
1686-
document.documentElement.style.setProperty('--desktop-compact-history-center-x', Math.round(layoutOverride.historyCenterX) + 'px');
1687-
} else {
1688-
document.documentElement.style.removeProperty('--desktop-compact-history-center-x');
1689-
}
16901681
}
16911682
if (layoutOverride && layoutOverride.workArea) {
16921683
var workAreaWindowX = layoutOverride.windowBounds ? Math.round(layoutOverride.windowBounds.x) : Math.round(layoutOverride.workArea.left);

tests/unit/test_react_chat_window_static.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -195,20 +195,15 @@ def test_desktop_compact_history_uses_workarea_not_browserwindow_viewport():
195195
assert "--compact-desktop-workarea-width" in script
196196
assert "--compact-desktop-workarea-height" in script
197197
assert "var historyOffsetX = Number(layout.historyOffsetX);" in script
198-
assert "var historyCenterX = Number(layout.historyCenterX);" in script
199198
assert "historyOffsetX: Number.isFinite(historyOffsetX) ? historyOffsetX : 0" in script
200-
assert "historyCenterX: Number.isFinite(historyCenterX) ? historyCenterX : null" in script
201199
assert "document.documentElement.style.setProperty('--desktop-compact-history-offset-x', Math.round(layoutOverride.historyOffsetX || 0) + 'px');" in script
202-
assert "document.documentElement.style.setProperty('--desktop-compact-history-center-x', Math.round(layoutOverride.historyCenterX) + 'px');" in script
203200
assert "document.documentElement.style.removeProperty('--desktop-compact-history-offset-x');" in script
204-
assert "document.documentElement.style.removeProperty('--desktop-compact-history-center-x');" in script
205201
assert "var workAreaWindowX = layoutOverride.windowBounds ? Math.round(layoutOverride.windowBounds.x) : Math.round(layoutOverride.workArea.left);" in script
206202
assert "Math.round(layoutOverride.workArea.left - workAreaWindowX) + 'px'" in script
207203
assert "Math.round(layoutOverride.workArea.right - workAreaWindowX) + 'px'" in script
208204
assert "function getCompactDesktopCssVarSnapshot(layoutOverride)" in script
209205
assert "Math.round(layoutOverride.workArea.left - workAreaWindowX)" in script
210206
assert "Math.round(layoutOverride.workArea.right - workAreaWindowX)" in script
211-
assert "Number.isFinite(layoutOverride.historyCenterX) ? Math.round(layoutOverride.historyCenterX) : 'none'" in script
212207

213208
sync_anchor_block = script.split("function syncCompactSurfaceAnchor()", 1)[1].split(
214209
"function stopCompactMinimizeBallTracking()",
@@ -268,9 +263,8 @@ def test_compact_history_size_tokens_are_ratio_based_for_ui_optimization():
268263
assert "calc(var(--compact-export-surface-width) * var(--compact-export-history-width-ratio))" in anchor_block
269264
assert "--compact-export-history-half-inline-size: calc(var(--compact-export-history-inline-size) / 2);" in anchor_block
270265
assert "--compact-export-history-safe-inset: calc(var(--compact-export-history-viewport-gutter) / 2);" in anchor_block
271-
assert "--compact-export-history-center-x: var(" in anchor_block
272-
assert "--desktop-compact-history-center-x," in anchor_block
273-
assert "calc(var(--desktop-compact-surface-left, var(--compact-surface-left, 50vw)) + (var(--compact-export-surface-width) / 2) + var(--desktop-compact-history-offset-x, 0px))" in anchor_block
266+
assert "--compact-export-history-center-x: calc(var(--desktop-compact-surface-left, var(--compact-surface-left, 50vw)) + (var(--compact-export-surface-width) / 2) + var(--desktop-compact-history-offset-x, 0px));" in anchor_block
267+
assert "--desktop-compact-history-center-x" not in anchor_block
274268
assert "--compact-export-history-viewport-inline-start: 0px;" in anchor_block
275269
assert "--compact-export-history-viewport-inline-size: 100vw;" in anchor_block
276270
assert "--compact-export-history-viewport-inline-end: calc(" in anchor_block

0 commit comments

Comments
 (0)