From b5328277ab429d100a1d4dc9e3948c01e5f9a508 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Tue, 15 Sep 2026 23:37:47 +0800 Subject: [PATCH] 1 --- lib/providers/settings_provider.dart | 2 +- lib/views/terminal_view.dart | 4 + lib/widgets/code_editor_menu.dart | 12 +- lib/widgets/code_editor_widget.dart | 96 +- lib/widgets/terminal_selection_overlay.dart | 818 ++++++++++++++---- .../re_editor/lib/src/_code_editable.dart | 26 +- packages/re_editor/lib/src/_code_field.dart | 52 +- packages/re_editor/lib/src/_code_scroll.dart | 59 +- .../re_editor/lib/src/_code_selection.dart | 67 +- packages/re_editor/lib/src/code_editor.dart | 14 +- packages/re_editor/lib/src/code_scroll.dart | 95 +- packages/re_editor/lib/src/code_toolbar.dart | 4 +- test/code_editor_menu_test.dart | 11 +- test/code_editor_scroll_test.dart | 189 ++++ test/terminal_selection_and_menu_test.dart | 232 ++++- test/tmp_clear_probe_test.dart | 46 + test/widget_test.dart | 171 +++- 17 files changed, 1656 insertions(+), 242 deletions(-) create mode 100644 test/code_editor_scroll_test.dart create mode 100644 test/tmp_clear_probe_test.dart diff --git a/lib/providers/settings_provider.dart b/lib/providers/settings_provider.dart index 1a524a6..5457baf 100644 --- a/lib/providers/settings_provider.dart +++ b/lib/providers/settings_provider.dart @@ -50,7 +50,7 @@ class SettingsProvider extends ChangeNotifier { int _indentSize = 4; bool _wordWrap = false; bool _showLineNumbers = true; - bool _pinLineNumbers = true; + bool _pinLineNumbers = false; bool _enableVirtualKeyboard = defaultTargetPlatform == TargetPlatform.android || defaultTargetPlatform == TargetPlatform.iOS; String _virtualKeyboardConfigJson = VirtualKeyboardConfig.defaultJsonPretty(); VirtualKeyboardConfig _virtualKeyboardConfig = VirtualKeyboardConfig.defaultConfiguration(); diff --git a/lib/views/terminal_view.dart b/lib/views/terminal_view.dart index f80f717..f419af6 100644 --- a/lib/views/terminal_view.dart +++ b/lib/views/terminal_view.dart @@ -208,6 +208,7 @@ class _TerminalSessionBodyState extends State<_TerminalSessionBody> { /// 终端控制器与 View GlobalKey(用于选区、手柄与上下文菜单定位) late final xterm.TerminalController _terminalController = xterm.TerminalController(); + final ScrollController _terminalScrollController = ScrollController(); final GlobalKey _terminalViewKey = GlobalKey(); /// 终端原有的输入处理器与输出出口(用于串联,而不是替换) @@ -244,6 +245,7 @@ class _TerminalSessionBodyState extends State<_TerminalSessionBody> { } terminal.onOutput = _delegateOnOutput; _modifiers.dispose(); + _terminalScrollController.dispose(); _terminalController.dispose(); super.dispose(); } @@ -278,11 +280,13 @@ class _TerminalSessionBodyState extends State<_TerminalSessionBody> { terminal: session.terminal, controller: _terminalController, terminalViewKey: _terminalViewKey, + scrollController: _terminalScrollController, focusNode: session.focusNode, child: xterm.TerminalView( session.terminal, key: _terminalViewKey, controller: _terminalController, + scrollController: _terminalScrollController, focusNode: session.focusNode, autofocus: true, theme: terminalThemeWithBackground(backgroundColor), diff --git a/lib/widgets/code_editor_menu.dart b/lib/widgets/code_editor_menu.dart index 27ea4dd..1dd53d3 100644 --- a/lib/widgets/code_editor_menu.dart +++ b/lib/widgets/code_editor_menu.dart @@ -58,8 +58,6 @@ class _MobileToolbarLayoutDelegate extends SingleChildLayoutDelegate { // 1. 计算受保护的可视安全编辑区与屏幕顶界 // 屏幕顶界:手机系统状态栏安全区(由于菜单置于 rootOverlay 顶层悬浮层,高于 TabBar 和 AppBar,因此向上可借用其空间,避免向下翻转遮挡光标) final double screenTop = mediaQuery.padding.top + 6.0; - // 编辑区顶界:排除 AppBar / TabBar (renderRect.top),用于编辑区居中或贴顶显示 - final double editorTop = max(renderRect?.top ?? 0.0, mediaQuery.padding.top) + 6.0; // 底部:排除软键盘 (viewInsets.bottom)、虚拟小键盘 (renderRect.bottom) 以及底部安全区 final double screenBottomWithoutKeyboard = mediaQuery.size.height - mediaQuery.viewInsets.bottom - mediaQuery.padding.bottom; final double safeBottom = min(renderRect?.bottom ?? screenBottomWithoutKeyboard, screenBottomWithoutKeyboard) - 6.0; @@ -68,7 +66,6 @@ class _MobileToolbarLayoutDelegate extends SingleChildLayoutDelegate { final double safeRight = min(renderRect?.right ?? mediaQuery.size.width, mediaQuery.size.width - mediaQuery.padding.right) - 8.0; final double availableWidth = max(0.0, safeRight - safeLeft); - final double editorAvailableHeight = max(0.0, safeBottom - editorTop); // 2. 根据 anchors 中的 EditorToolbarPlacement 或传统 anchors 计算位置 EditorToolbarPlacement placement = EditorToolbarPlacement.aboveStart; @@ -90,15 +87,10 @@ class _MobileToolbarLayoutDelegate extends SingleChildLayoutDelegate { switch (placement) { case EditorToolbarPlacement.center: - // 框选文本完全占据当前屏幕:在编辑区中间显示 - x = safeLeft + (availableWidth - childSize.width) / 2.0; - y = editorTop + (editorAvailableHeight - childSize.height) / 2.0; - break; - case EditorToolbarPlacement.top: - // 选区整体在视口上方:在视口顶部贴边显示 + // 用户明确要求:改在屏幕最上方显示,即使显示在 tab 或 appbar 上面也没关系,彻底避免在屏幕中间遮挡文本 x = safeLeft + (availableWidth - childSize.width) / 2.0; - y = editorTop + 4.0; + y = screenTop; break; case EditorToolbarPlacement.bottom: diff --git a/lib/widgets/code_editor_widget.dart b/lib/widgets/code_editor_widget.dart index ff1e17c..fa5742c 100644 --- a/lib/widgets/code_editor_widget.dart +++ b/lib/widgets/code_editor_widget.dart @@ -1,3 +1,4 @@ +import 'dart:math'; import 'package:code_editor/l10n/app_localizations.dart'; import 'package:code_editor/models/app_font.dart'; import 'package:code_editor/models/editor_tab_item.dart'; @@ -51,12 +52,17 @@ class _CodeEditorWidgetState extends State { int? _currentIndentSize; bool _isShowingConflictDialog = false; - // 双指捏合缩放字号状态 + // 双指捏合缩放字号及中心锚定状态 + final GlobalKey _editorContainerKey = GlobalKey(); final Map _pointerPositions = {}; double? _initialPinchDistance; double? _initialPinchFontSize; double? _activeZoomFontSize; bool _isPinching = false; + CodeLineSelection? _pinchSelection; + Offset? _initialLocalFocal; + double _initialScrollV = 0.0; + double _initialScrollH = 0.0; void _handlePointerDown(PointerDownEvent event, double currentFontSize) { _pointerPositions[event.pointer] = event.position; @@ -64,6 +70,36 @@ class _CodeEditorWidgetState extends State { final points = _pointerPositions.values.toList(); _initialPinchDistance = (points[0] - points[1]).distance; _initialPinchFontSize = _activeZoomFontSize ?? currentFontSize; + + // 停止当前的惯性滚动,保证锚定基准平稳 + final vScroller = _scrollController?.verticalScroller; + if (vScroller is CodeEditorScrollController) { + vScroller.stopScrolling(); + } + final hScroller = _scrollController?.horizontalScroller; + if (hScroller is CodeEditorScrollController) { + hScroller.stopScrolling(); + } + + final globalFocal = (points[0] + points[1]) / 2; + final renderBox = _editorContainerKey.currentContext?.findRenderObject() as RenderBox?; + final localFocal = renderBox != null ? renderBox.globalToLocal(globalFocal) : globalFocal; + _initialLocalFocal = localFocal; + + _initialScrollV = (_scrollController?.verticalScroller.hasClients == true) + ? _scrollController!.verticalScroller.offset + : 0.0; + _initialScrollH = (_scrollController?.horizontalScroller.hasClients == true) + ? _scrollController!.horizontalScroller.offset + : 0.0; + + final currentController = _controller; + if (currentController != null && + !currentController.selection.isCollapsed && + currentController.selection.baseOffset != -1) { + _pinchSelection = currentController.selection; + } + _toolbarController.hide(context); setState(() { _isPinching = true; }); @@ -77,12 +113,31 @@ class _CodeEditorWidgetState extends State { if (_pointerPositions.length >= 2 && _initialPinchDistance != null && _initialPinchDistance! > 10.0 && - _initialPinchFontSize != null) { + _initialPinchFontSize != null && + _initialLocalFocal != null) { final points = _pointerPositions.values.toList(); final currentDistance = (points[0] - points[1]).distance; final scale = currentDistance / _initialPinchDistance!; final rawFontSize = (_initialPinchFontSize! * scale).clamp(10.0, 30.0); final newFontSize = (rawFontSize * 10).round() / 10.0; + final fontScale = newFontSize / _initialPinchFontSize!; + + final currentGlobalFocal = (points[0] + points[1]) / 2; + final renderBox = _editorContainerKey.currentContext?.findRenderObject() as RenderBox?; + final currentLocalFocal = renderBox != null + ? renderBox.globalToLocal(currentGlobalFocal) + : currentGlobalFocal; + + final targetScrollV = (_initialScrollV + _initialLocalFocal!.dy) * fontScale - currentLocalFocal.dy; + final targetScrollH = (_initialScrollH + _initialLocalFocal!.dx) * fontScale - currentLocalFocal.dx; + + if (_scrollController?.verticalScroller.hasClients == true) { + _scrollController!.verticalScroller.jumpTo(max(0.0, targetScrollV)); + } + if (_scrollController?.horizontalScroller.hasClients == true) { + _scrollController!.horizontalScroller.jumpTo(max(0.0, targetScrollH)); + } + if (_activeZoomFontSize != newFontSize) { setState(() { _activeZoomFontSize = newFontSize; @@ -107,12 +162,8 @@ class _CodeEditorWidgetState extends State { void _finishPinchZoom() { final finalSize = _activeZoomFontSize; - setState(() { - _isPinching = false; - _initialPinchDistance = null; - _initialPinchFontSize = null; - _activeZoomFontSize = null; - }); + final savedSelection = _pinchSelection; + _pinchSelection = null; if (finalSize != null) { try { @@ -120,6 +171,27 @@ class _CodeEditorWidgetState extends State { settings.setFontSize(finalSize.roundToDouble()); } catch (_) {} } + + setState(() { + _isPinching = false; + _initialPinchDistance = null; + _initialPinchFontSize = null; + _activeZoomFontSize = null; + _initialLocalFocal = null; + _initialScrollV = 0.0; + _initialScrollH = 0.0; + }); + + if (savedSelection != null && !savedSelection.isCollapsed) { + final currentController = _controller; + if (currentController != null) { + currentController.selection = savedSelection; + } + WidgetsBinding.instance.addPostFrameCallback((_) { + if (!mounted) return; + _toolbarController.reshowLastToolbar(context); + }); + } } EditorTabItem? _getCurrentTab() { @@ -151,8 +223,8 @@ class _CodeEditorWidgetState extends State { void _restoreTabScrollState(EditorTabItem tab) { final oldScroll = _scrollController; - final vScroller = ScrollController(initialScrollOffset: tab.verticalScrollOffset); - final hScroller = ScrollController(initialScrollOffset: tab.horizontalScrollOffset); + final vScroller = CodeEditorScrollController(initialScrollOffset: tab.verticalScrollOffset); + final hScroller = CodeEditorScrollController(initialScrollOffset: tab.horizontalScrollOffset); vScroller.addListener(() { if (vScroller.hasClients) { @@ -449,6 +521,7 @@ class _CodeEditorWidgetState extends State { children: [ Expanded( child: Listener( + key: _editorContainerKey, behavior: HitTestBehavior.translucent, onPointerDown: (event) => _handlePointerDown(event, activeFontSize), onPointerMove: _handlePointerMove, @@ -464,7 +537,8 @@ class _CodeEditorWidgetState extends State { wordWrap: activeWordWrap, pinLineNumbers: pinLineNumbers, toolbarController: _toolbarController, - margin: const EdgeInsets.only(left: 2.0, top: 4.0, right: 8, bottom: 8.0), + margin: EdgeInsets.zero, + extraHorizontalScroll: 160.0, padding: const EdgeInsets.fromLTRB(6.0, 0.0, 0.0, 0.0), leadingDivider: showLineNumbers ? Container( diff --git a/lib/widgets/terminal_selection_overlay.dart b/lib/widgets/terminal_selection_overlay.dart index 6c7d983..63dab2f 100644 --- a/lib/widgets/terminal_selection_overlay.dart +++ b/lib/widgets/terminal_selection_overlay.dart @@ -2,6 +2,7 @@ import 'dart:math'; import 'package:code_editor/l10n/app_localizations.dart'; import 'package:code_editor/utils/dialog_utils.dart'; +import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:xterm/src/ui/render.dart'; @@ -9,13 +10,24 @@ import 'package:xterm/xterm.dart' as xterm; enum _DraggingHandle { none, start, end } +/// 终端选区悬浮工具栏展示位置策略 +enum TerminalToolbarPlacement { + aboveStart, + belowEnd, + top, + smart, +} + /// 终端文字框选交互叠加层 -/// 包含双端拖动手柄(Start/End Handle)与高层级浮动上下文操作菜单(复制、粘贴、全选) +/// 包含双端拖动手柄(Start/End Handle)与智能浮动上下文操作菜单(复制、粘贴、全选), +/// 参考代码编辑区设计,支持拖动手柄至视口边缘时平滑自动滚动,并在手指松开或手势取消时 +/// 100% 可靠停止滚动,绝不发生松手后依然自动滚动的 Bug。 class TerminalSelectionOverlay extends StatefulWidget { final xterm.Terminal terminal; final xterm.TerminalController controller; final GlobalKey terminalViewKey; final FocusNode focusNode; + final ScrollController? scrollController; final Widget child; const TerminalSelectionOverlay({ @@ -24,6 +36,7 @@ class TerminalSelectionOverlay extends StatefulWidget { required this.controller, required this.terminalViewKey, required this.focusNode, + this.scrollController, required this.child, }); @@ -38,10 +51,19 @@ class _TerminalSelectionOverlayState extends State { bool _isPointerSelecting = false; Offset? _lastActiveAnchor; + // 拖动手柄时的自动滚动引擎(参考 re_editor 架构,采用带严格 guard 条件的循环与全局指针路由保底) + bool _isAutoScrolling = false; + Offset? _lastDragGlobalPosition; + DateTime? _lastAutoScrollTime; + DateTime? _dwellStartTime; + ScrollableState? _cachedScrollableState; + @override void initState() { super.initState(); widget.controller.addListener(_onSelectionChanged); + // 注入全局指针路由:无论手柄被何种异常情况打断,只要系统检测到任何 PointerUp 或 PointerCancel,立即停止滚动! + GestureBinding.instance.pointerRouter.addGlobalRoute(_handleGlobalPointerEvent); } @override @@ -55,15 +77,61 @@ class _TerminalSelectionOverlayState extends State { @override void dispose() { + GestureBinding.instance.pointerRouter.removeGlobalRoute(_handleGlobalPointerEvent); + _stopAutoScroll(); widget.controller.removeListener(_onSelectionChanged); _hideMenu(); super.dispose(); } + void _handleGlobalPointerEvent(PointerEvent event) { + if (event is PointerUpEvent || event is PointerCancelEvent) { + if (_dragging != _DraggingHandle.none) { + _endCurrentHandleDrag(); + } + } + } + RenderTerminal? get _renderTerminal { return widget.terminalViewKey.currentState?.renderTerminal; } + Rect? _getTerminalRect() { + final render = _renderTerminal; + if (render == null || !render.hasSize) return null; + final topLeft = render.localToGlobal(Offset.zero); + return topLeft & render.size; + } + + ScrollPosition? get _scrollPosition { + if (widget.scrollController?.hasClients ?? false) { + return widget.scrollController!.position; + } + if (_cachedScrollableState != null && _cachedScrollableState!.mounted) { + return _cachedScrollableState!.position; + } + _cachedScrollableState = _findScrollableState(); + return _cachedScrollableState?.position; + } + + ScrollableState? _findScrollableState() { + final rootContext = widget.terminalViewKey.currentContext; + if (rootContext == null) return null; + + ScrollableState? found; + void search(Element element) { + if (found != null) return; + if (element is StatefulElement && element.state is ScrollableState) { + found = element.state as ScrollableState; + return; + } + element.visitChildren(search); + } + + rootContext.visitChildElements(search); + return found; + } + void _onSelectionChanged() { if (!mounted) return; final selection = widget.controller.selection; @@ -89,7 +157,7 @@ class _TerminalSelectionOverlayState extends State { final range = selection.normalized; final endOffset = render.getOffset(range.end); final globalEnd = render.localToGlobal( - endOffset + Offset(render.cellSize.width, render.cellSize.height), + endOffset + Offset(0, render.cellSize.height), ); _lastActiveAnchor = globalEnd; } @@ -99,23 +167,47 @@ class _TerminalSelectionOverlayState extends State { _menuOverlayEntry = null; } - void _showMenu([Offset? targetAnchor]) { + void _showMenu({Offset? targetAnchor, TerminalToolbarPlacement? placement}) { _hideMenu(); if (!mounted) return; final selection = widget.controller.selection; if (selection == null || selection.isCollapsed) return; - final anchor = targetAnchor ?? _lastActiveAnchor; - if (anchor == null) return; - _lastActiveAnchor = anchor; + final render = _renderTerminal; + if (render == null || !render.hasSize) return; + + final range = selection.normalized; + final bool isMultiline = (range.end.y - range.begin.y) >= 2; + + TerminalToolbarPlacement effectivePlacement = placement ?? + (isMultiline ? TerminalToolbarPlacement.top : TerminalToolbarPlacement.smart); + + Offset effectiveAnchor; + if (targetAnchor != null) { + effectiveAnchor = targetAnchor; + } else if (effectivePlacement == TerminalToolbarPlacement.top) { + final terminalRect = _getTerminalRect(); + effectiveAnchor = terminalRect != null + ? Offset(terminalRect.center.dx, terminalRect.top) + : render.localToGlobal(render.getOffset(range.begin)); + } else { + final endPointInRender = render.getOffset(range.end) + Offset(0, render.cellSize.height); + effectiveAnchor = render.localToGlobal(endPointInRender); + } + _lastActiveAnchor = effectiveAnchor; final overlayState = Overlay.of(context, rootOverlay: true); + final terminalRect = _getTerminalRect(); + final lineHeight = render.cellSize.height; _menuOverlayEntry = OverlayEntry( builder: (context) { return _TerminalContextMenuWidget( - anchor: anchor, + anchor: effectiveAnchor, + placement: effectivePlacement, + terminalRect: terminalRect, + lineHeight: lineHeight, onCopy: _handleCopy, onPaste: _handlePaste, onSelectAll: _handleSelectAll, @@ -165,79 +257,281 @@ class _TerminalSelectionOverlayState extends State { ); WidgetsBinding.instance.addPostFrameCallback((_) { if (mounted) { - _updateLastActiveAnchorDefault(); - _showMenu(); + _showMenu(placement: TerminalToolbarPlacement.top); } }); } - // --- 手柄拖拽逻辑 --- + // --- 手柄拖拽与边缘自动滚动逻辑(参考 re_editor 架构) --- - void _onStartHandlePanStart(DragStartDetails details) { - _dragging = _DraggingHandle.start; - _hideMenu(); + double _calculateAutoScrollVelocity({ + required double pointerPosition, + required double viewportDimension, + required double edgeThreshold, + required bool isStartEdge, + required double minVelocity, + required double edgeVelocity, + required double maxVelocity, + required double maxPullDistance, + }) { + if (isStartEdge) { + if (pointerPosition >= edgeThreshold) { + return 0.0; + } + if (pointerPosition >= 0.0) { + final double ratio = (edgeThreshold - pointerPosition) / edgeThreshold; + return minVelocity + (edgeVelocity - minVelocity) * ratio; + } else { + final double pullDistance = -pointerPosition; + final double ratio = (pullDistance / maxPullDistance).clamp(0.0, 1.0); + final double factor = ratio * sqrt(ratio); + return edgeVelocity + (maxVelocity - edgeVelocity) * factor; + } + } else { + final double triggerPos = viewportDimension - edgeThreshold; + if (pointerPosition <= triggerPos) { + return 0.0; + } + if (pointerPosition <= viewportDimension) { + final double ratio = (pointerPosition - triggerPos) / edgeThreshold; + return minVelocity + (edgeVelocity - minVelocity) * ratio; + } else { + final double pullDistance = pointerPosition - viewportDimension; + final double ratio = (pullDistance / maxPullDistance).clamp(0.0, 1.0); + final double factor = ratio * sqrt(ratio); + return edgeVelocity + (maxVelocity - edgeVelocity) * factor; + } + } } - void _onStartHandlePanUpdate(DragUpdateDetails details) { + void _autoScrollWhenDragging() { + if (_isAutoScrolling) return; + _isAutoScrolling = true; + _lastAutoScrollTime = DateTime.now(); + _dwellStartTime = null; + _runAutoScrollLoop(); + } + + void _runAutoScrollLoop() { + Future.delayed(const Duration(milliseconds: 16), () { + if (!mounted || _dragging == _DraggingHandle.none) { + _isAutoScrolling = false; + _stopAutoScroll(); + return; + } + _performAutoScrollStep(); + if (_dragging != _DraggingHandle.none) { + _runAutoScrollLoop(); + } else { + _isAutoScrolling = false; + _stopAutoScroll(); + } + }); + } + + void _stopAutoScroll() { + _isAutoScrolling = false; + _lastAutoScrollTime = null; + _dwellStartTime = null; + _lastDragGlobalPosition = null; + } + + bool _performAutoScrollStep() { + if (_dragging == _DraggingHandle.none || _lastDragGlobalPosition == null) { + _stopAutoScroll(); + return false; + } + + final render = _renderTerminal; + final position = _scrollPosition; + if (render == null || !render.hasSize || position == null || !position.hasContentDimensions) { + return false; + } + + final now = DateTime.now(); + final double dt; + if (_lastAutoScrollTime == null) { + dt = 0.016; + } else { + final double elapsed = now.difference(_lastAutoScrollTime!).inMicroseconds / 1000000.0; + dt = elapsed.clamp(0.005, 0.05); + } + _lastAutoScrollTime = now; + + final localPos = render.globalToLocal(_lastDragGlobalPosition!); + final double lineHeight = render.cellSize.height; + final double vEdgeThreshold = max(36.0, lineHeight * 1.8); + const double vMaxPullDistance = 45.0; + final double viewportHeight = render.size.height; + final selection = widget.controller.selection; + if (selection == null) return false; + final range = selection.normalized; + + bool scrolled = false; + + if (localPos.dy < vEdgeThreshold && position.pixels > position.minScrollExtent) { + // 若是结束手柄向上收缩,不能越过起始手柄所在行 + if (_dragging == _DraggingHandle.end && range.end.y <= range.begin.y) { + _dwellStartTime = null; + return false; + } + + _dwellStartTime ??= now; + final double dwellSeconds = now.difference(_dwellStartTime!).inMicroseconds / 1000000.0; + final double dwellMultiplier = dwellSeconds > 0.25 + ? 1.0 + ((dwellSeconds - 0.25) / 0.75).clamp(0.0, 1.0) * 2.5 + : 1.0; + + final double baseV = _calculateAutoScrollVelocity( + pointerPosition: localPos.dy, + viewportDimension: viewportHeight, + edgeThreshold: vEdgeThreshold, + isStartEdge: true, + minVelocity: 70.0, + edgeVelocity: 180.0, + maxVelocity: 1500.0, + maxPullDistance: vMaxPullDistance, + ); + final double v = min(1600.0, baseV * dwellMultiplier); + if (v > 0) { + final double delta = v * dt; + final double target = max(position.minScrollExtent, position.pixels - delta); + if (target != position.pixels) { + position.jumpTo(target); + scrolled = true; + } + } + } else if (localPos.dy > viewportHeight - vEdgeThreshold && position.pixels < position.maxScrollExtent) { + // 若是起始手柄向下收缩,不能越过结束手柄所在行 + if (_dragging == _DraggingHandle.start && range.begin.y >= range.end.y) { + _dwellStartTime = null; + return false; + } + + _dwellStartTime ??= now; + final double dwellSeconds = now.difference(_dwellStartTime!).inMicroseconds / 1000000.0; + final double dwellMultiplier = dwellSeconds > 0.25 + ? 1.0 + ((dwellSeconds - 0.25) / 0.75).clamp(0.0, 1.0) * 2.5 + : 1.0; + + final double baseV = _calculateAutoScrollVelocity( + pointerPosition: localPos.dy, + viewportDimension: viewportHeight, + edgeThreshold: vEdgeThreshold, + isStartEdge: false, + minVelocity: 70.0, + edgeVelocity: 180.0, + maxVelocity: 1500.0, + maxPullDistance: vMaxPullDistance, + ); + final double v = min(1600.0, baseV * dwellMultiplier); + if (v > 0) { + final double delta = v * dt; + final double target = min(position.maxScrollExtent, position.pixels + delta); + if (target != position.pixels) { + position.jumpTo(target); + scrolled = true; + } + } + } else { + _dwellStartTime = null; + } + + if (scrolled && _lastDragGlobalPosition != null) { + _updateSelectionForCurrentDrag(_lastDragGlobalPosition!); + } + return scrolled; + } + + void _updateSelectionForCurrentDrag(Offset globalPosition) { final render = _renderTerminal; final selection = widget.controller.selection; if (render == null || selection == null) return; final range = selection.normalized; - final localPos = render.globalToLocal(details.globalPosition); + final localPos = render.globalToLocal(globalPosition); final adjusted = Offset(localPos.dx, localPos.dy - render.cellSize.height / 2); final cell = render.getCellOffset(adjusted); - // 约束:起始手柄不能越过结束手柄 - if (cell.isBefore(range.end) || cell.isEqual(range.end)) { - widget.controller.setSelection( - widget.terminal.buffer.createAnchorFromOffset(cell), - widget.terminal.buffer.createAnchorFromOffset(range.end), - ); - final newLocal = render.getOffset(cell); - _lastActiveAnchor = render.localToGlobal(newLocal + Offset(0, render.cellSize.height)); + if (_dragging == _DraggingHandle.start) { + if (cell.isBefore(range.end) || cell.isEqual(range.end)) { + widget.controller.setSelection( + widget.terminal.buffer.createAnchorFromOffset(cell), + widget.terminal.buffer.createAnchorFromOffset(range.end), + ); + final newLocal = render.getOffset(cell); + _lastActiveAnchor = render.localToGlobal(newLocal + Offset(0, render.cellSize.height)); + } + } else if (_dragging == _DraggingHandle.end) { + if (cell.isAfter(range.begin) || cell.isEqual(range.begin)) { + widget.controller.setSelection( + widget.terminal.buffer.createAnchorFromOffset(range.begin), + widget.terminal.buffer.createAnchorFromOffset(cell), + ); + final newLocal = render.getOffset(cell); + _lastActiveAnchor = render.localToGlobal( + newLocal + Offset(0, render.cellSize.height), + ); + } } + setState(() {}); + } + + void _onStartHandlePanStart(DragStartDetails details) { + _dragging = _DraggingHandle.start; + _isScrolling = false; + _lastDragGlobalPosition = details.globalPosition; + _hideMenu(); + _autoScrollWhenDragging(); + } + + void _onStartHandlePanUpdate(DragUpdateDetails details) { + _lastDragGlobalPosition = details.globalPosition; + _updateSelectionForCurrentDrag(details.globalPosition); } void _onStartHandlePanEnd(DragEndDetails details) { - _dragging = _DraggingHandle.none; - if (mounted && widget.controller.selection != null && !widget.controller.selection!.isCollapsed) { - _showMenu(_lastActiveAnchor); - } + _endCurrentHandleDrag(); } void _onEndHandlePanStart(DragStartDetails details) { _dragging = _DraggingHandle.end; + _isScrolling = false; + _lastDragGlobalPosition = details.globalPosition; _hideMenu(); + _autoScrollWhenDragging(); } void _onEndHandlePanUpdate(DragUpdateDetails details) { - final render = _renderTerminal; - final selection = widget.controller.selection; - if (render == null || selection == null) return; - - final range = selection.normalized; - final localPos = render.globalToLocal(details.globalPosition); - final adjusted = Offset(localPos.dx, localPos.dy - render.cellSize.height / 2); - final cell = render.getCellOffset(adjusted); - - // 约束:结束手柄不能移到起始手柄之前 - if (cell.isAfter(range.begin) || cell.isEqual(range.begin)) { - widget.controller.setSelection( - widget.terminal.buffer.createAnchorFromOffset(range.begin), - widget.terminal.buffer.createAnchorFromOffset(cell), - ); - final newLocal = render.getOffset(cell); - _lastActiveAnchor = render.localToGlobal( - newLocal + Offset(render.cellSize.width, render.cellSize.height), - ); - } + _lastDragGlobalPosition = details.globalPosition; + _updateSelectionForCurrentDrag(details.globalPosition); } void _onEndHandlePanEnd(DragEndDetails details) { + _endCurrentHandleDrag(); + } + + void _onHandlePanCancel() { + _endCurrentHandleDrag(); + } + + void _endCurrentHandleDrag() { + if (_dragging == _DraggingHandle.none) return; + final lastHandle = _dragging; _dragging = _DraggingHandle.none; - if (mounted && widget.controller.selection != null && !widget.controller.selection!.isCollapsed) { - _showMenu(_lastActiveAnchor); + _isScrolling = false; + _stopAutoScroll(); + + if (mounted) { + setState(() {}); + if (widget.controller.selection != null && !widget.controller.selection!.isCollapsed) { + _showMenu( + targetAnchor: _lastActiveAnchor, + placement: lastHandle == _DraggingHandle.start + ? TerminalToolbarPlacement.aboveStart + : TerminalToolbarPlacement.belowEnd, + ); + } } } @@ -246,33 +540,75 @@ class _TerminalSelectionOverlayState extends State { final selection = widget.controller.selection; final hasSelection = selection != null && !selection.isCollapsed; final render = _renderTerminal; + final overlayBox = context.findRenderObject() as RenderBox?; - Offset? startHandleLocal; - Offset? endHandleLocal; + Offset? startHandleInOverlay; + Offset? endHandleInOverlay; + bool showStartHandle = false; + bool showEndHandle = false; + + final bool isStartDragging = _dragging == _DraggingHandle.start; + final bool isEndDragging = _dragging == _DraggingHandle.end; if (hasSelection && render != null && render.hasSize) { final range = selection.normalized; final startCellOffset = render.getOffset(range.begin); final endCellOffset = render.getOffset(range.end); + final startPointInRender = startCellOffset + Offset(0, render.cellSize.height); + final endPointInRender = endCellOffset + Offset(0, render.cellSize.height); + final viewportHeight = render.size.height; final viewportWidth = render.size.width; - // 起始手柄锚点(字符底部左侧) - final rawStartY = startCellOffset.dy + render.cellSize.height; - final clampedStartY = rawStartY.clamp(0.0, viewportHeight - 10.0); - final clampedStartX = startCellOffset.dx.clamp(0.0, viewportWidth - 20.0); - startHandleLocal = Offset(clampedStartX, clampedStartY); + // 正在拖拽的手柄绝对不能被隐藏或卸载!非拖拽时才做视口边界可见性过滤 + showStartHandle = isStartDragging || ( + startPointInRender.dy >= 0 && + startPointInRender.dy <= viewportHeight + render.cellSize.height && + startPointInRender.dx >= 0 && + startPointInRender.dx <= viewportWidth + ); - // 结束手柄锚点(字符底部右侧) - final rawEndY = endCellOffset.dy + render.cellSize.height; - final clampedEndY = rawEndY.clamp(0.0, viewportHeight - 10.0); - final clampedEndX = (endCellOffset.dx + render.cellSize.width).clamp(0.0, viewportWidth - 20.0); - endHandleLocal = Offset(clampedEndX, clampedEndY); + showEndHandle = isEndDragging || ( + endPointInRender.dy >= 0 && + endPointInRender.dy <= viewportHeight + render.cellSize.height && + endPointInRender.dx >= 0 && + endPointInRender.dx <= viewportWidth + ); + + if (overlayBox != null && overlayBox.hasSize) { + if (isStartDragging && _lastDragGlobalPosition != null) { + final dragInOverlay = overlayBox.globalToLocal(_lastDragGlobalPosition!); + final clampedY = dragInOverlay.dy.clamp(0.0, overlayBox.size.height); + final clampedX = dragInOverlay.dx.clamp(0.0, overlayBox.size.width); + startHandleInOverlay = Offset(clampedX, clampedY); + } else { + startHandleInOverlay = overlayBox.globalToLocal(render.localToGlobal(startPointInRender)); + } + + if (isEndDragging && _lastDragGlobalPosition != null) { + final dragInOverlay = overlayBox.globalToLocal(_lastDragGlobalPosition!); + final clampedY = dragInOverlay.dy.clamp(0.0, overlayBox.size.height); + final clampedX = dragInOverlay.dx.clamp(0.0, overlayBox.size.width); + endHandleInOverlay = Offset(clampedX, clampedY); + } else { + endHandleInOverlay = overlayBox.globalToLocal(render.localToGlobal(endPointInRender)); + } + } else { + startHandleInOverlay = startPointInRender; + endHandleInOverlay = endPointInRender; + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted) setState(() {}); + }); + } } return NotificationListener( onNotification: (notification) { + if (_dragging != _DraggingHandle.none) { + // 正在拖动手柄时的自动滚动,不作为外部普通滚动处理,避免误打断手柄拖拽生命周期 + return false; + } if (notification is ScrollStartNotification) { _isScrolling = true; _hideMenu(); @@ -280,8 +616,8 @@ class _TerminalSelectionOverlayState extends State { if (mounted) setState(() {}); } else if (notification is ScrollEndNotification) { _isScrolling = false; - if (hasSelection && mounted && _dragging == _DraggingHandle.none) { - _showMenu(_lastActiveAnchor); + if (hasSelection && mounted && _dragging == _DraggingHandle.none && !_isPointerSelecting) { + _showMenu(); } } return false; @@ -297,39 +633,50 @@ class _TerminalSelectionOverlayState extends State { }, onPointerUp: (event) { _isPointerSelecting = false; - if (widget.controller.selection != null && !widget.controller.selection!.isCollapsed) { + if (_dragging != _DraggingHandle.none) { + _endCurrentHandleDrag(); + } else if (!_isScrolling && widget.controller.selection != null && !widget.controller.selection!.isCollapsed) { _lastActiveAnchor = event.position; - if (_dragging == _DraggingHandle.none && !_isScrolling) { - _showMenu(_lastActiveAnchor); - } + _showMenu( + targetAnchor: _lastActiveAnchor, + placement: TerminalToolbarPlacement.smart, + ); } setState(() {}); }, + onPointerCancel: (event) { + _isPointerSelecting = false; + if (_dragging != _DraggingHandle.none) { + _endCurrentHandleDrag(); + } + }, child: Stack( children: [ widget.child, - if (hasSelection && startHandleLocal != null) + if (hasSelection && showStartHandle && startHandleInOverlay != null) Positioned( - left: startHandleLocal.dx - 32.0, - top: startHandleLocal.dy - 10.0, + left: startHandleInOverlay.dx - 32.0, + top: startHandleInOverlay.dy - 10.0, child: _TerminalSelectionHandle( isStart: true, lineHeight: render?.cellSize.height ?? 20.0, onPanStart: _onStartHandlePanStart, onPanUpdate: _onStartHandlePanUpdate, onPanEnd: _onStartHandlePanEnd, + onPanCancel: _onHandlePanCancel, ), ), - if (hasSelection && endHandleLocal != null) + if (hasSelection && showEndHandle && endHandleInOverlay != null) Positioned( - left: endHandleLocal.dx - 10.0, - top: endHandleLocal.dy - 10.0, + left: endHandleInOverlay.dx - 10.0, + top: endHandleInOverlay.dy - 10.0, child: _TerminalSelectionHandle( isStart: false, lineHeight: render?.cellSize.height ?? 20.0, onPanStart: _onEndHandlePanStart, onPanUpdate: _onEndHandlePanUpdate, onPanEnd: _onEndHandlePanEnd, + onPanCancel: _onHandlePanCancel, ), ), ], @@ -346,6 +693,7 @@ class _TerminalSelectionHandle extends StatelessWidget { final GestureDragStartCallback onPanStart; final GestureDragUpdateCallback onPanUpdate; final GestureDragEndCallback onPanEnd; + final GestureDragCancelCallback? onPanCancel; const _TerminalSelectionHandle({ required this.isStart, @@ -353,6 +701,7 @@ class _TerminalSelectionHandle extends StatelessWidget { required this.onPanStart, required this.onPanUpdate, required this.onPanEnd, + this.onPanCancel, }); @override @@ -361,11 +710,31 @@ class _TerminalSelectionHandle extends StatelessWidget { return MouseRegion( cursor: SystemMouseCursors.grab, - child: GestureDetector( - behavior: HitTestBehavior.opaque, - onPanStart: onPanStart, - onPanUpdate: onPanUpdate, - onPanEnd: onPanEnd, + child: RawGestureDetector( + behavior: HitTestBehavior.translucent, + gestures: { + PanGestureRecognizer: GestureRecognizerFactoryWithHandlers( + () => PanGestureRecognizer( + debugOwner: this, + supportedDevices: { + PointerDeviceKind.touch, + PointerDeviceKind.stylus, + PointerDeviceKind.invertedStylus, + PointerDeviceKind.mouse, + PointerDeviceKind.trackpad, + PointerDeviceKind.unknown, + }, + ), + (PanGestureRecognizer instance) { + instance + ..dragStartBehavior = DragStartBehavior.start + ..onStart = onPanStart + ..onUpdate = onPanUpdate + ..onCancel = onPanCancel + ..onEnd = onPanEnd; + }, + ), + }, child: Padding( padding: const EdgeInsets.all(10.0), child: materialTextSelectionControls.buildHandle( @@ -379,9 +748,123 @@ class _TerminalSelectionHandle extends StatelessWidget { } } -/// 终端高层级浮动上下文菜单(挂载于 Root Overlay) +/// 终端选区悬浮工具栏布局代理: +/// 负责根据 TerminalToolbarPlacement、终端可见区域与屏幕顶界/软键盘安全区智能精确定位, +/// 确保菜单不超出屏幕、不遮挡光标手柄与文本 +class _TerminalToolbarLayoutDelegate extends SingleChildLayoutDelegate { + final Offset anchor; + final TerminalToolbarPlacement placement; + final Rect? terminalRect; + final double lineHeight; + final MediaQueryData mediaQuery; + + _TerminalToolbarLayoutDelegate({ + required this.anchor, + required this.placement, + required this.terminalRect, + required this.lineHeight, + required this.mediaQuery, + }); + + @override + BoxConstraints getConstraintsForChild(BoxConstraints constraints) { + return constraints.loosen(); + } + + @override + Offset getPositionForChild(Size size, Size childSize) { + // 1. 计算可视安全区与屏幕顶界 + // 顶界:状态栏安全区 + 间距(悬浮于 rootOverlay,允许借用 AppBar/TabBar 空间) + final double screenTop = mediaQuery.padding.top + 6.0; + // 底部:排除软键盘 (viewInsets.bottom)、虚拟按键栏与安全区 + final double screenBottomWithoutKeyboard = + mediaQuery.size.height - mediaQuery.viewInsets.bottom - mediaQuery.padding.bottom; + final double safeBottom = + min(terminalRect?.bottom ?? screenBottomWithoutKeyboard, screenBottomWithoutKeyboard) - 6.0; + // 左右两端保留安全边距 + final double safeLeft = max(terminalRect?.left ?? 0.0, mediaQuery.padding.left) + 8.0; + final double safeRight = + min(terminalRect?.right ?? mediaQuery.size.width, mediaQuery.size.width - mediaQuery.padding.right) - 8.0; + + final double availableWidth = max(0.0, safeRight - safeLeft); + + // 水滴形手柄下挂高度约 26px,加上间距共 32px 避让距离 + const double handleClearance = 32.0; + + double x; + double y; + + switch (placement) { + case TerminalToolbarPlacement.top: + // 多行选区或全选:置于屏幕顶端安全区居中,绝不遮挡终端多行文本 + x = safeLeft + (availableWidth - childSize.width) / 2.0; + y = screenTop; + break; + + case TerminalToolbarPlacement.aboveStart: + // 在左端点上方弹出,若顶部空间不足则翻转到下方充分避让 + x = anchor.dx - childSize.width / 2.0; + final double yAbove = anchor.dy - lineHeight - childSize.height - 8.0; + if (yAbove >= screenTop) { + y = yAbove; + } else { + y = anchor.dy + handleClearance; + } + break; + + case TerminalToolbarPlacement.belowEnd: + // 在右端点下方弹出,若下方空间不足(例如靠近软键盘)则翻转到上方 + x = anchor.dx - childSize.width / 2.0; + final double yBelow = anchor.dy + handleClearance; + if (yBelow + childSize.height <= safeBottom) { + y = yBelow; + } else { + y = anchor.dy - lineHeight - childSize.height - 8.0; + } + break; + + case TerminalToolbarPlacement.smart: + // 智能单行选区:优先上方,其次下方,最后顶端兜底 + x = anchor.dx - childSize.width / 2.0; + final double yAbove = anchor.dy - lineHeight - childSize.height - 8.0; + final double yBelow = anchor.dy + handleClearance; + if (yAbove >= screenTop) { + y = yAbove; + } else if (yBelow + childSize.height <= safeBottom) { + y = yBelow; + } else { + y = screenTop; + } + break; + } + + // 安全夹紧,确保绝不超出屏幕与受遮挡区域 + final double clampedX = (availableWidth >= childSize.width) + ? x.clamp(safeLeft, safeRight - childSize.width) + : safeLeft; + final double clampedY = (safeBottom - screenTop >= childSize.height) + ? y.clamp(screenTop, safeBottom - childSize.height) + : screenTop; + + return Offset(clampedX, clampedY); + } + + @override + bool shouldRelayout(covariant _TerminalToolbarLayoutDelegate oldDelegate) { + return anchor != oldDelegate.anchor || + placement != oldDelegate.placement || + terminalRect != oldDelegate.terminalRect || + lineHeight != oldDelegate.lineHeight || + mediaQuery != oldDelegate.mediaQuery; + } +} + +/// 终端高层级浮动上下文菜单(挂载于 Root Overlay,纯文字无图标,风格与代码编辑区完全一致) class _TerminalContextMenuWidget extends StatelessWidget { final Offset anchor; + final TerminalToolbarPlacement placement; + final Rect? terminalRect; + final double lineHeight; final VoidCallback onCopy; final VoidCallback onPaste; final VoidCallback onSelectAll; @@ -389,6 +872,9 @@ class _TerminalContextMenuWidget extends StatelessWidget { const _TerminalContextMenuWidget({ required this.anchor, + required this.placement, + required this.terminalRect, + required this.lineHeight, required this.onCopy, required this.onPaste, required this.onSelectAll, @@ -397,25 +883,49 @@ class _TerminalContextMenuWidget extends StatelessWidget { @override Widget build(BuildContext context) { - final l10n = AppLocalizations.of(context)!; + final l10n = AppLocalizations.of(context); final theme = Theme.of(context); - final mediaQuery = MediaQuery.of(context); + final copyLabel = l10n?.copy ?? 'Copy'; + final pasteLabel = l10n?.paste ?? 'Paste'; + final selectAllLabel = l10n?.selectAll ?? 'Select All'; - const menuWidth = 210.0; - const menuHeight = 44.0; - - // 水平居中并限制在屏幕内 - final screenWidth = mediaQuery.size.width; - final double left = (anchor.dx - menuWidth / 2).clamp(12.0, max(12.0, screenWidth - menuWidth - 12.0)); - - // 垂直计算:优先位于锚点上方,若贴近屏幕顶端则悬浮于锚点下方 - final topThreshold = mediaQuery.padding.top + 48.0; - final double top; - if (anchor.dy - menuHeight - 12.0 >= topThreshold) { - top = anchor.dy - menuHeight - 12.0; - } else { - top = (anchor.dy + 14.0).clamp(topThreshold, mediaQuery.size.height - menuHeight - 12.0); - } + final toolbarContent = Material( + elevation: 6.0, + shadowColor: Colors.black45, + color: theme.colorScheme.surfaceContainerHighest, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8.0), + side: BorderSide( + color: theme.colorScheme.outlineVariant.withValues(alpha: 0.6), + width: 0.8, + ), + ), + clipBehavior: Clip.antiAlias, + child: IntrinsicHeight( + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + _buildItem( + context, + label: copyLabel, + onTap: onCopy, + ), + _buildDivider(context), + _buildItem( + context, + label: pasteLabel, + onTap: onPaste, + ), + _buildDivider(context), + _buildItem( + context, + label: selectAllLabel, + onTap: onSelectAll, + ), + ], + ), + ), + ); return Stack( children: [ @@ -426,99 +936,51 @@ class _TerminalContextMenuWidget extends StatelessWidget { onTap: onDismiss, ), ), - Positioned( - left: left, - top: top, - child: Material( - elevation: 8.0, - borderRadius: BorderRadius.circular(10.0), - color: theme.colorScheme.surfaceContainerHighest, - surfaceTintColor: theme.colorScheme.surfaceTint, - clipBehavior: Clip.antiAlias, - child: Container( - height: menuHeight, - padding: const EdgeInsets.symmetric(horizontal: 4.0), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10.0), - border: Border.all( - color: theme.colorScheme.outlineVariant.withValues(alpha: 0.5), - width: 0.8, - ), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - _MenuItemButton( - label: l10n.copy, - icon: Icons.copy_rounded, - onPressed: onCopy, - ), - _buildDivider(theme), - _MenuItemButton( - label: l10n.paste, - icon: Icons.paste_rounded, - onPressed: onPaste, - ), - _buildDivider(theme), - _MenuItemButton( - label: l10n.selectAll, - icon: Icons.select_all_rounded, - onPressed: onSelectAll, - ), - ], - ), - ), + CustomSingleChildLayout( + delegate: _TerminalToolbarLayoutDelegate( + anchor: anchor, + placement: placement, + terminalRect: terminalRect, + lineHeight: lineHeight, + mediaQuery: MediaQuery.of(context), ), + child: toolbarContent, ), ], ); } - Widget _buildDivider(ThemeData theme) { - return Container( - width: 1.0, - height: 20.0, - color: theme.colorScheme.outlineVariant.withValues(alpha: 0.6), - ); - } -} - -class _MenuItemButton extends StatelessWidget { - final String label; - final IconData icon; - final VoidCallback onPressed; - - const _MenuItemButton({ - required this.label, - required this.icon, - required this.onPressed, - }); - - @override - Widget build(BuildContext context) { - final theme = Theme.of(context); - + Widget _buildItem( + BuildContext context, { + required String label, + required VoidCallback onTap, + }) { + final colorScheme = Theme.of(context).colorScheme; return InkWell( - onTap: onPressed, - borderRadius: BorderRadius.circular(8.0), + onTap: onTap, child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 8.0), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Icon(icon, size: 16.0, color: theme.colorScheme.primary), - const SizedBox(width: 4.0), - Text( - label, - style: TextStyle( - fontSize: 13.0, - fontWeight: FontWeight.w600, - color: theme.colorScheme.onSurface, - ), + padding: const EdgeInsets.symmetric(horizontal: 14.0, vertical: 9.0), + child: Center( + child: Text( + label, + style: TextStyle( + fontSize: 13, + fontWeight: FontWeight.w500, + color: colorScheme.onSurface, ), - ], + ), ), ), ); } + + Widget _buildDivider(BuildContext context) { + return VerticalDivider( + width: 1, + thickness: 0.8, + indent: 6, + endIndent: 6, + color: Theme.of(context).colorScheme.outlineVariant.withValues(alpha: 0.5), + ); + } } diff --git a/packages/re_editor/lib/src/_code_editable.dart b/packages/re_editor/lib/src/_code_editable.dart index 4209179..8192d53 100644 --- a/packages/re_editor/lib/src/_code_editable.dart +++ b/packages/re_editor/lib/src/_code_editable.dart @@ -28,6 +28,8 @@ class _CodeEditable extends StatefulWidget { final EdgeInsetsGeometry margin; final Widget? leadingDivider; final bool pinLineNumbers; + final double extraHorizontalScroll; + final double? extraVerticalScroll; final Border? border; final BorderRadius? borderRadius; final Clip clipBehavior; @@ -69,7 +71,9 @@ class _CodeEditable extends StatefulWidget { required this.padding, required this.margin, required this.leadingDivider, - this.pinLineNumbers = true, + this.pinLineNumbers = false, + this.extraHorizontalScroll = 160.0, + this.extraVerticalScroll, this.border, this.borderRadius, this.clipBehavior = Clip.none, @@ -313,10 +317,15 @@ class _CodeEditableState extends State<_CodeEditable> with AutomaticKeepAliveCli onTapOutside: (_) { widget.focusNode.unfocus(); }, - child: NotificationListener( + child: NotificationListener( onNotification: (notification) { if (notification is ScrollStartNotification) { widget.selectionOverlayController.hideToolbar(); + if (notification.metrics.axis == Axis.horizontal) { + _stopScroller(widget.scrollController.verticalScroller); + } else if (notification.metrics.axis == Axis.vertical) { + _stopScroller(widget.scrollController.horizontalScroller); + } } else if (notification is ScrollEndNotification) { if (!widget.controller.selection.isCollapsed && widget.controller.selection.baseOffset != -1) { WidgetsBinding.instance.addPostFrameCallback((_) { @@ -335,6 +344,17 @@ class _CodeEditableState extends State<_CodeEditable> with AutomaticKeepAliveCli ); } + void _stopScroller(ScrollController scroller) { + if (!scroller.hasClients) return; + for (final position in scroller.positions) { + if (position is CodeEditorScrollPosition) { + position.stopScrolling(); + } else if (position.activity?.isScrolling == true) { + position.hold(() {}); + } + } + } + Widget _buildCodeField(ViewportOffset vertical, ViewportOffset? horizontal) { return _CodeField( key: widget.editorKey, @@ -364,6 +384,8 @@ class _CodeEditableState extends State<_CodeEditable> with AutomaticKeepAliveCli cursorWidth: widget.cursorWidth, padding: widget.padding, readOnly: widget.readOnly, + extraHorizontalScroll: widget.extraHorizontalScroll, + extraVerticalScroll: widget.extraVerticalScroll, // Enable long text rendering when the find is on. maxLengthSingleLineRendering: widget.findController.value != null ? null : widget.maxLengthSingleLineRendering, startHandleLayerLink: widget.startHandleLayerLink, diff --git a/packages/re_editor/lib/src/_code_field.dart b/packages/re_editor/lib/src/_code_field.dart index 13fa569..6296d00 100644 --- a/packages/re_editor/lib/src/_code_field.dart +++ b/packages/re_editor/lib/src/_code_field.dart @@ -25,6 +25,8 @@ class _CodeField extends SingleChildRenderObjectWidget { final double floatingCursorWidth; final EdgeInsetsGeometry padding; final bool readOnly; + final double extraHorizontalScroll; + final double? extraVerticalScroll; final int? maxLengthSingleLineRendering; final LayerLink startHandleLayerLink; final LayerLink endHandleLayerLink; @@ -54,6 +56,8 @@ class _CodeField extends SingleChildRenderObjectWidget { floatingCursorWidth, required this.padding, required this.readOnly, + this.extraHorizontalScroll = 160.0, + this.extraVerticalScroll, this.maxLengthSingleLineRendering, required this.startHandleLayerLink, required this.endHandleLayerLink, @@ -87,6 +91,8 @@ class _CodeField extends SingleChildRenderObjectWidget { floatingCursorWidth: floatingCursorWidth, padding: padding, readOnly: readOnly, + extraHorizontalScroll: extraHorizontalScroll, + extraVerticalScroll: extraVerticalScroll, maxLengthSingleLineRendering: maxLengthSingleLineRendering, startHandleLayerLink: startHandleLayerLink, endHandleLayerLink: endHandleLayerLink, @@ -118,6 +124,8 @@ class _CodeField extends SingleChildRenderObjectWidget { ..floatingCursorWidth = floatingCursorWidth ..padding = padding ..readOnly = readOnly + ..extraHorizontalScroll = extraHorizontalScroll + ..extraVerticalScroll = extraVerticalScroll ..maxLengthSingleLineRendering = maxLengthSingleLineRendering ..startHandleLayerLink = startHandleLayerLink ..endHandleLayerLink = endHandleLayerLink; @@ -143,6 +151,8 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation { ValueChanged> _onRenderParagraphsChanged; EdgeInsetsGeometry _padding; bool _readOnly; + double _extraHorizontalScroll; + double? _extraVerticalScroll; int? _maxLengthSingleLineRendering; Color? _chunkIndicatorColor; @@ -184,6 +194,8 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation { required double floatingCursorWidth, required EdgeInsetsGeometry padding, required bool readOnly, + double extraHorizontalScroll = 160.0, + double? extraVerticalScroll, int? maxLengthSingleLineRendering, required LayerLink startHandleLayerLink, required LayerLink endHandleLayerLink, @@ -201,6 +213,8 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation { _onRenderParagraphsChanged = onRenderParagraphsChanged, _padding = padding, _readOnly = readOnly, + _extraHorizontalScroll = extraHorizontalScroll, + _extraVerticalScroll = extraVerticalScroll, _maxLengthSingleLineRendering = maxLengthSingleLineRendering, _chunkIndicatorColor = chunkIndicatorColor, _paint = Paint(), @@ -531,6 +545,22 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation { markNeedsLayout(); } + double get extraHorizontalScroll => _extraHorizontalScroll; + + set extraHorizontalScroll(double value) { + if (_extraHorizontalScroll == value) return; + _extraHorizontalScroll = value; + markNeedsLayout(); + } + + double? get extraVerticalScroll => _extraVerticalScroll; + + set extraVerticalScroll(double? value) { + if (_extraVerticalScroll == value) return; + _extraVerticalScroll = value; + markNeedsLayout(); + } + List get displayParagraphs => _displayParagraphs; Offset get paintOffset => Offset(_horizontalViewport?.pixels ?? 0, _verticalViewport.pixels); @@ -1312,7 +1342,7 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation { if (target <= paddingTop) { startIndex = 0; } else { - startIndex = min(((target - paddingTop) / _preferredLineHeight).ceil(), _codes.length - 1); + startIndex = min(((target - paddingTop) / _preferredLineHeight).ceil(), max(0, _codes.length - 1)); } _displayParagraphs.addAll(_buildDisplayRenderParagraphs(startIndex, effectiveWidth)); } else { @@ -1342,7 +1372,7 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation { if (target <= paddingTop) { startIndex = 0; } else { - startIndex = (target / _preferredLineHeight).floor(); + startIndex = min((target / _preferredLineHeight).floor(), max(0, _codes.length - 1)); } _displayParagraphs.clear(); _displayParagraphs.addAll(_buildDisplayRenderParagraphs(startIndex, effectiveWidth)); @@ -1364,18 +1394,27 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation { } // The codes length maybe changed, this will make the displayParagraphs empty. if (_displayParagraphs.isEmpty) { - _updateDisplayRenderParagraphs(); - return; + if (_codes.isNotEmpty) { + _displayParagraphs.addAll(_buildDisplayRenderParagraphs(max(0, _codes.length - 1), effectiveWidth)); + } + if (_displayParagraphs.isEmpty) { + return; + } } final double totalHeight = _displayParagraphs.last.bottom + (_codes.length - (_displayParagraphs.last.index + 1)) * _preferredLineHeight + paddingBottom; - _verticalViewportSize = max(0, totalHeight - size.height); + final double extraBottom = _extraVerticalScroll ?? max(0.0, size.height * 0.5); + _verticalViewportSize = max(0, totalHeight - size.height + extraBottom); if (_verticalViewport.pixels > _verticalViewportSize!) { _verticalViewport.correctBy(_verticalViewportSize! - _verticalViewport.pixels); } _verticalViewport.applyContentDimensions(0, _verticalViewportSize!); if (_horizontalViewport != null) { final double maxWidth = _displayParagraphs.map((e) => e.width).reduce(max); - _horizontalViewportSize = max(0, maxWidth + _padding.horizontal - size.width); + if (maxWidth + _padding.horizontal > size.width) { + _horizontalViewportSize = max(0, maxWidth + _padding.horizontal - size.width + _extraHorizontalScroll); + } else { + _horizontalViewportSize = 0; + } _horizontalViewport!.applyContentDimensions(0, _horizontalViewportSize!); } // applyContentDimensions will change the _verticalViewport.pixels, we should rebuild. @@ -1578,6 +1617,7 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation { } List _buildDisplayRenderParagraphs(int startIndex, double maxWidth) { + startIndex = min(max(0, startIndex), max(0, _codes.length - 1)); double offset = startIndex * _preferredLineHeight; final List paragraphs = []; for (int i = startIndex; i < _codes.length; i++) { diff --git a/packages/re_editor/lib/src/_code_scroll.dart b/packages/re_editor/lib/src/_code_scroll.dart index 9ee525c..4e63547 100644 --- a/packages/re_editor/lib/src/_code_scroll.dart +++ b/packages/re_editor/lib/src/_code_scroll.dart @@ -2,7 +2,7 @@ part of re_editor; const double _kScrollbarThickness = 8.0; -class _CodeScrollable extends StatelessWidget { +class _CodeScrollable extends StatefulWidget { final AxisDirection axisDirection; final ScrollController? controller; @@ -10,20 +10,67 @@ class _CodeScrollable extends StatelessWidget { final CodeScrollbarBuilder? scrollbarBuilder; const _CodeScrollable({ + super.key, required this.axisDirection, this.controller, required this.viewportBuilder, - this.scrollbarBuilder + this.scrollbarBuilder, }); + @override + State<_CodeScrollable> createState() => _CodeScrollableState(); + +} + +class _CodeScrollableState extends State<_CodeScrollable> { + + CodeEditorScrollController? _effectiveController; + + @override + void initState() { + super.initState(); + _initController(); + } + + void _initController() { + if (widget.controller is CodeEditorScrollController) { + _effectiveController = widget.controller as CodeEditorScrollController; + } else { + _effectiveController = CodeEditorScrollController( + delegate: widget.controller, + initialScrollOffset: widget.controller?.initialScrollOffset ?? 0.0, + keepScrollOffset: widget.controller?.keepScrollOffset ?? true, + ); + } + } + + @override + void didUpdateWidget(_CodeScrollable oldWidget) { + super.didUpdateWidget(oldWidget); + if (widget.controller != oldWidget.controller) { + if (_effectiveController != null && _effectiveController!.delegate != null) { + _effectiveController!.dispose(); + } + _initController(); + } + } + + @override + void dispose() { + if (_effectiveController != null && _effectiveController!.delegate != null) { + _effectiveController!.dispose(); + } + super.dispose(); + } + @override Widget build(BuildContext context) { return Scrollable( excludeFromSemantics: true, - controller: controller, - scrollBehavior: _ScrollBehavior(scrollbarBuilder), - viewportBuilder: viewportBuilder, - axisDirection: axisDirection, + controller: _effectiveController, + scrollBehavior: _ScrollBehavior(widget.scrollbarBuilder), + viewportBuilder: widget.viewportBuilder, + axisDirection: widget.axisDirection, physics: const ClampingScrollPhysics(), ); } diff --git a/packages/re_editor/lib/src/_code_selection.dart b/packages/re_editor/lib/src/_code_selection.dart index cf7f97c..eadc934 100644 --- a/packages/re_editor/lib/src/_code_selection.dart +++ b/packages/re_editor/lib/src/_code_selection.dart @@ -37,12 +37,15 @@ class _CodeSelectionGestureDetectorState extends State<_CodeSelectionGestureDete _CodeFieldRender? get render => widget.editorKey.currentContext?.findRenderObject() as _CodeFieldRender?; + int _activePointers = 0; + bool _isMultiTouch = false; bool _tapping = false; @override Widget build(BuildContext context) { + final Widget detector; if (_isMobile) { - return GestureDetector( + detector = GestureDetector( onLongPressMoveUpdate: (details) { if (_longPressOnSelection == true) { return; @@ -80,8 +83,10 @@ class _CodeSelectionGestureDetectorState extends State<_CodeSelectionGestureDete _longPressOnSelection = false; _dragging = false; render?.stopAutoScroll(); - widget.selectionOverlayController.hideToolbar(); - widget.selectionOverlayController.hideHandle(); + if (!_isMultiTouch) { + widget.selectionOverlayController.hideToolbar(); + widget.selectionOverlayController.hideHandle(); + } }, onLongPressUp: () { _dragPosition = null; @@ -167,6 +172,37 @@ class _CodeSelectionGestureDetectorState extends State<_CodeSelectionGestureDete ), ); } + + return Listener( + behavior: HitTestBehavior.translucent, + onPointerDown: (event) { + _activePointers++; + if (_activePointers >= 2) { + _isMultiTouch = true; + } + }, + onPointerUp: (event) { + _activePointers = max(0, _activePointers - 1); + if (_activePointers == 0) { + SchedulerBinding.instance.addPostFrameCallback((_) { + if (mounted && _activePointers == 0) { + _isMultiTouch = false; + } + }); + } + }, + onPointerCancel: (event) { + _activePointers = max(0, _activePointers - 1); + if (_activePointers == 0) { + SchedulerBinding.instance.addPostFrameCallback((_) { + if (mounted && _activePointers == 0) { + _isMultiTouch = false; + } + }); + } + }, + child: detector, + ); } bool get _isMobile => kIsAndroid || kIsIOS; @@ -178,6 +214,9 @@ class _CodeSelectionGestureDetectorState extends State<_CodeSelectionGestureDete }.contains); void _onMobileTapDown(Offset position) { + if (_isMultiTouch) { + return; + } if (!widget.controller.selection.isCollapsed && _isPositionOnSelection(position)) { return; } @@ -187,6 +226,12 @@ class _CodeSelectionGestureDetectorState extends State<_CodeSelectionGestureDete } void _onMobileTapUp(Offset position) { + if (_isMultiTouch) { + if (!widget.controller.selection.isCollapsed) { + widget.selectionOverlayController.showHandle(context); + } + return; + } final DateTime now = DateTime.now(); if (_pointerTapTimestamp != null && (now.millisecondsSinceEpoch - _pointerTapTimestamp!.millisecondsSinceEpoch) < kDoubleTapTimeout.inMilliseconds && _pointerTapPosition != null && _pointerTapPosition!.isSamePosition(position)) { @@ -662,9 +707,9 @@ class _MobileSelectionOverlayController implements _SelectionOverlayController { : 0; if (selection.startIndex <= firstVisibleLine && selection.endIndex >= lastVisibleLine) { - // 框选文本完全占据当前屏幕:在中间显示 - placement = EditorToolbarPlacement.center; - targetOffset = editingRegion.center; + // 框选文本完全占据当前屏幕:显示在上方(避免在中间遮挡文本) + placement = EditorToolbarPlacement.top; + targetOffset = Offset(editingRegion.center.dx, editingRegion.top); } else if (selection.endIndex < firstVisibleLine) { // 选区整体在屏幕上方:在上面显示 placement = EditorToolbarPlacement.top; @@ -674,9 +719,9 @@ class _MobileSelectionOverlayController implements _SelectionOverlayController { placement = EditorToolbarPlacement.bottom; targetOffset = Offset(editingRegion.center.dx, editingRegion.bottom); } else { - // 兜底(水平滚动偏离等异常情况):在中间显示 - placement = EditorToolbarPlacement.center; - targetOffset = editingRegion.center; + // 兜底(水平滚动偏离等异常情况):显示在上方(避免在中间遮挡文本) + placement = EditorToolbarPlacement.top; + targetOffset = Offset(editingRegion.center.dx, editingRegion.top); } } } @@ -757,6 +802,10 @@ class _MobileSelectionOverlayController implements _SelectionOverlayController { void _buildHandles(BuildContext context) { final bool isCollapsed = controller.selection.isCollapsed; if (_handleCollapsed == isCollapsed) { + if (_handles != null) { + _handles![0].markNeedsBuild(); + _handles![1].markNeedsBuild(); + } return; } _handleCollapsed = isCollapsed; diff --git a/packages/re_editor/lib/src/code_editor.dart b/packages/re_editor/lib/src/code_editor.dart index f2739b8..c7a7687 100644 --- a/packages/re_editor/lib/src/code_editor.dart +++ b/packages/re_editor/lib/src/code_editor.dart @@ -199,7 +199,7 @@ class CodeEditor extends StatefulWidget { this.shortcutsActivatorsBuilder, this.shortcutOverrideActions, this.leadingDivider, - this.pinLineNumbers = true, + this.pinLineNumbers = false, this.border, this.borderRadius, this.clipBehavior = Clip.none, @@ -212,6 +212,8 @@ class CodeEditor extends StatefulWidget { this.maxLengthSingleLineRendering, this.chunkAnalyzer, this.commentFormatter, + this.extraHorizontalScroll = 160.0, + this.extraVerticalScroll, }) : assert(indicatorBuilder != null || (indicatorBuilder == null && leadingDivider == null)); /// Similar to [TextField], editor uses [CodeLineEditingController] as the content controller. @@ -273,6 +275,14 @@ class CodeEditor extends StatefulWidget { /// Whether line numbers and indicator are pinned to the left during horizontal scroll. final bool pinLineNumbers; + /// Extra horizontal scrollable distance (overscroll beyond the longest line). + final double extraHorizontalScroll; + + /// Extra vertical scrollable distance (overscroll beyond the last line). + /// If null, defaults to half of the viewport height (size.height * 0.5), allowing + /// the last line to scroll up to the center of the viewport. + final double? extraVerticalScroll; + /// The border of the editor. final Border? border; @@ -528,6 +538,8 @@ class _CodeEditorState extends State { showCursorWhenReadOnly: widget.showCursorWhenReadOnly ?? true, leadingDivider: widget.leadingDivider, pinLineNumbers: widget.pinLineNumbers, + extraHorizontalScroll: widget.extraHorizontalScroll, + extraVerticalScroll: widget.extraVerticalScroll, border: widget.border, borderRadius: widget.borderRadius, clipBehavior: widget.clipBehavior, diff --git a/packages/re_editor/lib/src/code_scroll.dart b/packages/re_editor/lib/src/code_scroll.dart index a8d15e7..d6d1e75 100644 --- a/packages/re_editor/lib/src/code_scroll.dart +++ b/packages/re_editor/lib/src/code_scroll.dart @@ -2,6 +2,97 @@ part of re_editor; typedef CodeScrollbarBuilder = Widget Function(BuildContext context, Widget child, ScrollableDetails details); +/// Custom ScrollPosition for code editor that prevents blocking child pointers +/// during ballistic scrolling (inertia). +/// +/// In standard Flutter, [ScrollPosition.shouldIgnorePointer] returns true during +/// ballistic activity, which causes [Scrollable] to wrap its viewport in an +/// [IgnorePointer(ignoring: true)]. In nested bidirectional scrolling (outer vertical, +/// inner horizontal), this completely blocked the inner horizontal scrollable from +/// receiving the initial touch-down when vertical was scrolling, forcing the user +/// to swipe twice horizontally to start horizontal scrolling. Overriding +/// [shouldIgnorePointer] to return false allows bidirectional scroll gestures to +/// seamlessly take over on the very first swipe. +class CodeEditorScrollPosition extends ScrollPositionWithSingleContext { + CodeEditorScrollPosition({ + required super.physics, + required super.context, + super.oldPosition, + super.initialPixels, + super.keepScrollOffset, + super.debugLabel, + }); + + @override + bool get shouldIgnorePointer => false; + + /// Immediately stop any ongoing scrolling animation or ballistic activity. + void stopScrolling() { + if (activity?.isScrolling == true) { + goIdle(); + } + } +} + +/// A [ScrollController] that creates [CodeEditorScrollPosition] for smooth, +/// non-blocking bidirectional scrolling. Supports delegating to an external +/// [ScrollController] if provided. +class CodeEditorScrollController extends ScrollController { + final ScrollController? delegate; + + CodeEditorScrollController({ + this.delegate, + super.initialScrollOffset, + super.keepScrollOffset, + super.debugLabel, + super.onAttach, + super.onDetach, + }); + + @override + ScrollPosition createScrollPosition( + ScrollPhysics physics, + ScrollContext context, + ScrollPosition? oldPosition, + ) { + return CodeEditorScrollPosition( + physics: physics, + context: context, + initialPixels: delegate?.initialScrollOffset ?? initialScrollOffset, + keepScrollOffset: delegate?.keepScrollOffset ?? keepScrollOffset, + oldPosition: oldPosition, + debugLabel: delegate?.debugLabel ?? debugLabel, + ); + } + + @override + void attach(ScrollPosition position) { + super.attach(position); + if (delegate != null && !delegate!.positions.contains(position)) { + delegate!.attach(position); + } + } + + @override + void detach(ScrollPosition position) { + if (delegate != null && delegate!.positions.contains(position)) { + delegate!.detach(position); + } + super.detach(position); + } + + /// Immediately stop any ongoing scrolling animation or ballistic activity on all attached positions. + void stopScrolling() { + for (final position in positions) { + if (position is CodeEditorScrollPosition) { + position.stopScrolling(); + } else if (position is ScrollPositionWithSingleContext && position.activity?.isScrolling == true) { + position.goIdle(); + } + } + } +} + class CodeScrollController { final ScrollController verticalScroller; @@ -12,8 +103,8 @@ class CodeScrollController { CodeScrollController({ ScrollController? verticalScroller, ScrollController? horizontalScroller, - }) : verticalScroller = verticalScroller ?? ScrollController(), - horizontalScroller = horizontalScroller ?? ScrollController(); + }) : verticalScroller = verticalScroller ?? CodeEditorScrollController(), + horizontalScroller = horizontalScroller ?? CodeEditorScrollController(); void makeCenterIfInvisible(CodeLinePosition position) { _render?.makePositionCenterIfInvisible(position); diff --git a/packages/re_editor/lib/src/code_toolbar.dart b/packages/re_editor/lib/src/code_toolbar.dart index ce8a9c9..876fbd1 100644 --- a/packages/re_editor/lib/src/code_toolbar.dart +++ b/packages/re_editor/lib/src/code_toolbar.dart @@ -6,9 +6,9 @@ enum EditorToolbarPlacement { aboveStart, /// 在结束端点(右端点)下方弹出,若下方空间不足则翻转至上方 belowEnd, - /// 选区文本完全贯穿/占据视口时,在可视屏幕正中间弹出 + /// 选区文本完全贯穿/占据视口时,在屏幕最上方贴边弹出(避免在屏幕中间遮挡文本) center, - /// 选区整体在视口上方时,在视口顶部贴边弹出 + /// 选区整体在视口上方或跨屏长选区时,在屏幕最上方贴边弹出(允许覆盖 Tab/AppBar,避免遮挡文本) top, /// 选区整体在视口下方时,在视口底部贴边弹出 bottom, diff --git a/test/code_editor_menu_test.dart b/test/code_editor_menu_test.dart index 8d687e5..6929246 100644 --- a/test/code_editor_menu_test.dart +++ b/test/code_editor_menu_test.dart @@ -302,7 +302,7 @@ void main() { final flippedAbovePos = tester.getTopLeft(find.byType(Material).last); expect(flippedAbovePos.dy, lessThan(530)); - // 5. center: 居中显示 + // 5. center: 改为在屏幕最上方贴边显示(避免在中间遮挡文本,允许覆盖 TabBar/AppBar) controller.show( context: buildCtx, controller: codeController, @@ -317,10 +317,11 @@ void main() { visibility: visibility, ); await tester.pumpAndSettle(); - final centerPos = tester.getCenter(find.byType(Material).last); - expect((centerPos.dy - 300).abs(), lessThan(30)); + final centerPos = tester.getTopLeft(find.byType(Material).last); + // 位于屏幕最上方(screenTop = mediaQuery.padding.top + 6.0,在测试默认环境下为 6.0) + expect(centerPos.dy, closeTo(6.0, 1.0)); - // 6. top: 顶部贴边 + // 6. top: 同样在屏幕最上方贴边显示 controller.show( context: buildCtx, controller: codeController, @@ -336,7 +337,7 @@ void main() { ); await tester.pumpAndSettle(); final topPos = tester.getTopLeft(find.byType(Material).last); - expect(topPos.dy, closeTo(110, 10)); + expect(topPos.dy, closeTo(6.0, 1.0)); // 7. bottom: 底部贴边 controller.show( diff --git a/test/code_editor_scroll_test.dart b/test/code_editor_scroll_test.dart new file mode 100644 index 0000000..7fc5524 --- /dev/null +++ b/test/code_editor_scroll_test.dart @@ -0,0 +1,189 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:re_editor/re_editor.dart'; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + group('CodeEditor 双向滚动平滑切换与打断测试', () { + test('CodeEditorScrollPosition 的 shouldIgnorePointer 始终返回 false 允许命中测试', () { + final controller = CodeEditorScrollController(); + expect(controller, isA()); + }); + + test('CodeScrollController 默认创建 CodeEditorScrollController', () { + final codeScroll = CodeScrollController(); + expect(codeScroll.verticalScroller, isA()); + expect(codeScroll.horizontalScroller, isA()); + }); + + testWidgets('垂直滚动时进行水平滚动,先停止垂直滚动并立即进入水平滚动(无需第二次滚动)', (tester) async { + final lines = List.generate( + 100, + (i) => 'Line $i: ${'very_long_code_identifier_' * 10};', + ).join('\n'); + final codeController = CodeLineEditingController.fromText(lines); + final scrollController = CodeScrollController(); + + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: SizedBox( + width: 300, + height: 300, + child: CodeEditor( + controller: codeController, + scrollController: scrollController, + wordWrap: false, + ), + ), + ), + ), + ); + await tester.pumpAndSettle(); + + final vScroller = scrollController.verticalScroller; + final hScroller = scrollController.horizontalScroller; + + expect(vScroller.offset, 0.0); + expect(hScroller.offset, 0.0); + + // 1. 触发垂直滑动手势 + await tester.fling(find.byType(CodeEditor), const Offset(0, -100), 1000); + await tester.pump(const Duration(milliseconds: 50)); + final verticalOffsetWhileMoving = vScroller.offset; + expect(verticalOffsetWhileMoving, greaterThan(0.0)); + + // 2. 此时立即发起水平滑动手势 (首次水平滑动即生效) + await tester.fling(find.byType(CodeEditor), const Offset(-100, 0), 1000); + await tester.pump(const Duration(milliseconds: 50)); + + // 垂直滚动停止,首次水平滑动即可产生水平位移 + expect(hScroller.offset, greaterThan(0.0)); + + await tester.pumpAndSettle(); + expect(hScroller.offset, greaterThan(0.0)); + }); + + testWidgets('水平滚动时进行垂直滚动,先停止水平滚动并立即进入垂直滚动', (tester) async { + final lines = List.generate( + 100, + (i) => 'Line $i: ${'very_long_code_identifier_' * 10};', + ).join('\n'); + final codeController = CodeLineEditingController.fromText(lines); + final scrollController = CodeScrollController(); + + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: SizedBox( + width: 300, + height: 300, + child: CodeEditor( + controller: codeController, + scrollController: scrollController, + wordWrap: false, + ), + ), + ), + ), + ); + await tester.pumpAndSettle(); + + final vScroller = scrollController.verticalScroller; + final hScroller = scrollController.horizontalScroller; + + expect(vScroller.offset, 0.0); + expect(hScroller.offset, 0.0); + + // 1. 先触发水平滑动 + await tester.fling(find.byType(CodeEditor), const Offset(-100, 0), 1000); + await tester.pump(const Duration(milliseconds: 50)); + expect(hScroller.offset, greaterThan(0.0)); + + // 2. 立即发起垂直滑动 + await tester.fling(find.byType(CodeEditor), const Offset(0, -100), 1000); + await tester.pump(const Duration(milliseconds: 50)); + + // 垂直滚动首次滑动即生效 + expect(vScroller.offset, greaterThan(0.0)); + + await tester.pumpAndSettle(); + expect(vScroller.offset, greaterThan(0.0)); + }); + + testWidgets('垂直方向最后一行可滚到屏幕中间约半屏高(延伸半屏高度的可滚动空白)', (tester) async { + // 50 行代码,每行高度约 20px,总高度约 1000px,在 400px 高的视口中 + const double viewportHeight = 400.0; + final lines = List.generate(50, (i) => 'Line $i: text;').join('\n'); + final codeController = CodeLineEditingController.fromText(lines); + final scrollController = CodeScrollController(); + + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: SizedBox( + width: 300, + height: viewportHeight, + child: CodeEditor( + controller: codeController, + scrollController: scrollController, + wordWrap: false, + ), + ), + ), + ), + ); + await tester.pumpAndSettle(); + + final vScroller = scrollController.verticalScroller; + // 滚动到底部极限位置 + vScroller.jumpTo(vScroller.position.maxScrollExtent); + await tester.pumpAndSettle(); + + // 验证最后一行文字在视口中的位置:应该在屏幕中间约半屏高位置 (viewportHeight * 0.5 = 200.0 左右) + // 而不是贴在底部 400.0 + expect(vScroller.offset, equals(vScroller.position.maxScrollExtent)); + // 点击底部留白区域,确保不抛异常且能定位到末尾行 + await tester.tapAt(const Offset(150, 350)); + await tester.pumpAndSettle(); + expect(codeController.selection.extentIndex, equals(49)); + }); + + testWidgets('水平方向向右多滑约 160 px(最右侧文字脱离右边缘并留出 160 px 真正空白)', (tester) async { + const double viewportWidth = 300.0; + final codeController = CodeLineEditingController.fromText('prefix_${'long_variable_name_' * 15}_end'); + final scrollController = CodeScrollController(); + + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: SizedBox( + width: viewportWidth, + height: 300, + child: CodeEditor( + controller: codeController, + scrollController: scrollController, + wordWrap: false, + extraHorizontalScroll: 160.0, + ), + ), + ), + ), + ); + await tester.pumpAndSettle(); + + final hScroller = scrollController.horizontalScroller; + expect(hScroller.position.maxScrollExtent, greaterThan(160.0)); + + // 滚动到最右端 + hScroller.jumpTo(hScroller.position.maxScrollExtent); + await tester.pumpAndSettle(); + + // 点击右侧留白区域,确保不抛异常且定位正常 + await tester.tapAt(const Offset(280, 50)); + await tester.pumpAndSettle(); + expect(codeController.selection.extentIndex, equals(0)); + }); + }); +} diff --git a/test/terminal_selection_and_menu_test.dart b/test/terminal_selection_and_menu_test.dart index 8ccf899..2fb46e8 100644 --- a/test/terminal_selection_and_menu_test.dart +++ b/test/terminal_selection_and_menu_test.dart @@ -44,7 +44,11 @@ void main() { focusNode.dispose(); }); - Widget buildTestWidget({Locale locale = const Locale('zh')}) { + Widget buildTestWidget({ + Locale locale = const Locale('zh'), + ScrollController? scrollController, + double height = 600, + }) { return MaterialApp( locale: locale, localizationsDelegates: AppLocalizations.localizationsDelegates, @@ -52,17 +56,19 @@ void main() { home: Scaffold( body: SizedBox( width: 400, - height: 600, + height: height, child: TerminalSelectionOverlay( terminal: terminal, controller: controller, terminalViewKey: terminalViewKey, focusNode: focusNode, + scrollController: scrollController, child: xterm.TerminalView( terminal, key: terminalViewKey, controller: controller, focusNode: focusNode, + scrollController: scrollController, ), ), ), @@ -257,5 +263,227 @@ void main() { // 验证菜单是否弹出 expect(find.text('复制'), findsOneWidget); }); + + testWidgets('弹出菜单不包含任何图标,仅保留纯文本且带有分割线', (tester) async { + terminal.write('Hello Clean Menu\r\n'); + await tester.pumpWidget(buildTestWidget()); + await tester.pumpAndSettle(); + + controller.setSelection( + terminal.buffer.createAnchor(0, 0), + terminal.buffer.createAnchor(5, 0), + ); + await tester.pumpAndSettle(); + + // 菜单已弹出 + expect(find.text('复制'), findsOneWidget); + expect(find.text('粘贴'), findsOneWidget); + expect(find.text('全选'), findsOneWidget); + + // 验证菜单中无任何 Icon 组件,保持与代码编辑区一致的纯文本清爽风格 + final copyItemFinder = find.ancestor( + of: find.text('复制'), + matching: find.byType(Row), + ); + expect(copyItemFinder, findsOneWidget); + expect( + find.descendant(of: copyItemFinder, matching: find.byType(Icon)), + findsNothing, + ); + expect( + find.descendant(of: copyItemFinder, matching: find.byType(VerticalDivider)), + findsWidgets, + ); + }); + + testWidgets('多行选区时弹出菜单显示在顶部安全区,绝不遮挡多行文本', (tester) async { + terminal.write('Line 1\r\nLine 2\r\nLine 3\r\nLine 4\r\n'); + await tester.pumpWidget(buildTestWidget()); + await tester.pumpAndSettle(); + + // 跨越 3 行的选区 + controller.setSelection( + terminal.buffer.createAnchor(0, 0), + terminal.buffer.createAnchor(5, 3), + ); + await tester.pumpAndSettle(); + + expect(find.text('复制'), findsOneWidget); + + // 菜单顶部位置应位于顶部(screenTop,y <= 50) + final menuTop = tester.getTopLeft(find.text('复制')).dy; + expect(menuTop, lessThanOrEqualTo(50.0)); + }); + + testWidgets('边界框选时弹出菜单被安全夹紧在屏幕安全边界内,绝不超出屏幕', (tester) async { + terminal.write('1234567890123456789012345678901234567890\r\n'); + await tester.pumpWidget(buildTestWidget()); + await tester.pumpAndSettle(); + + // 靠右侧的选区 + controller.setSelection( + terminal.buffer.createAnchor(25, 0), + terminal.buffer.createAnchor(35, 0), + ); + await tester.pumpAndSettle(); + + expect(find.text('复制'), findsOneWidget); + final copyFinder = find.text('复制'); + final selectAllFinder = find.text('全选'); + + final copyRect = tester.getRect(copyFinder); + final selectAllRect = tester.getRect(selectAllFinder); + + // 整个菜单的 x 坐标都在 0 到 400(测试容器宽度)之间 + expect(copyRect.left, greaterThanOrEqualTo(0.0)); + expect(selectAllRect.right, lessThanOrEqualTo(400.0)); + }); + + testWidgets('拖动结束手柄至终端底部边缘时自动向下滚动并扩展选区', (tester) async { + for (int i = 0; i < 60; i++) { + terminal.write('Terminal Line $i\r\n'); + } + final scrollController = ScrollController(); + addTearDown(scrollController.dispose); + + await tester.pumpWidget(buildTestWidget(scrollController: scrollController, height: 300)); + await tester.pumpAndSettle(); + + scrollController.jumpTo(0.0); + await tester.pumpAndSettle(); + expect(scrollController.position.pixels, equals(0.0)); + + final render = terminalViewKey.currentState!.renderTerminal; + final startCell = render.getCellOffset(const Offset(30, 40)); + final endCell = render.getCellOffset(const Offset(100, 60)); + controller.setSelection( + terminal.buffer.createAnchorFromOffset(startCell), + terminal.buffer.createAnchorFromOffset(endCell), + ); + await tester.pumpAndSettle(); + + final handleFinder = find.byWidgetPredicate( + (w) => w.runtimeType.toString() == '_TerminalSelectionHandle', + ); + expect(handleFinder, findsNWidgets(2)); + + // 拖拽结束手柄移动到终端底部边缘(y = 295) + final gesture = await tester.startGesture(tester.getCenter(handleFinder.last)); + await tester.pump(); + await gesture.moveTo(const Offset(200, 295)); + await tester.pump(); + + await tester.pump(const Duration(milliseconds: 100)); + await tester.pump(const Duration(milliseconds: 100)); + await tester.pump(const Duration(milliseconds: 100)); + + // 验证终端已经自动向下滚动,pixels 大于 0 + expect(scrollController.position.pixels, greaterThan(0.0)); + // 验证选区向下扩展 + expect(controller.selection!.end.y, greaterThan(endCell.y)); + + // 松手后停止自动滚动并展示菜单 + await gesture.up(); + await tester.pumpAndSettle(); + expect(find.text('复制'), findsOneWidget); + }); + + testWidgets('拖动起始手柄至终端顶部边缘时自动向上滚动', (tester) async { + for (int i = 0; i < 60; i++) { + terminal.write('Terminal History Line $i\r\n'); + } + final scrollController = ScrollController(); + addTearDown(scrollController.dispose); + + await tester.pumpWidget(buildTestWidget(scrollController: scrollController, height: 300)); + await tester.pumpAndSettle(); + + // 滚动到中间位置 + scrollController.jumpTo(250.0); + await tester.pumpAndSettle(); + final initialPixels = scrollController.position.pixels; + expect(initialPixels, equals(250.0)); + + // 在视口内精准设置可见选区 + final render = terminalViewKey.currentState!.renderTerminal; + final startCell = render.getCellOffset(const Offset(30, 100)); + final endCell = render.getCellOffset(const Offset(100, 180)); + controller.setSelection( + terminal.buffer.createAnchorFromOffset(startCell), + terminal.buffer.createAnchorFromOffset(endCell), + ); + await tester.pumpAndSettle(); + + final handleFinder = find.byWidgetPredicate( + (w) => w.runtimeType.toString() == '_TerminalSelectionHandle', + ); + expect(handleFinder, findsNWidgets(2)); + + // 拖拽起始手柄至终端顶部边缘(y = 10) + final gesture = await tester.startGesture(tester.getCenter(handleFinder.first)); + await tester.pump(); + await gesture.moveTo(const Offset(200, 10)); + await tester.pump(); + + await tester.pump(const Duration(milliseconds: 100)); + await tester.pump(const Duration(milliseconds: 100)); + await tester.pump(const Duration(milliseconds: 100)); + + // 验证终端已经自动向上滚动,当前 pixels 小于初始 pixels + expect(scrollController.position.pixels, lessThan(initialPixels)); + + await gesture.up(); + await tester.pumpAndSettle(); + expect(find.text('复制'), findsOneWidget); + }); + + testWidgets('自动滚动中途手指松开时立即停止滚动,后续不会继续发生任何自动滚动', (tester) async { + for (int i = 0; i < 60; i++) { + terminal.write('Terminal Stop Test Line $i\r\n'); + } + final scrollController = ScrollController(); + addTearDown(scrollController.dispose); + + await tester.pumpWidget(buildTestWidget(scrollController: scrollController, height: 300)); + await tester.pumpAndSettle(); + + scrollController.jumpTo(0.0); + await tester.pumpAndSettle(); + + final render = terminalViewKey.currentState!.renderTerminal; + final startCell = render.getCellOffset(const Offset(30, 40)); + final endCell = render.getCellOffset(const Offset(100, 60)); + controller.setSelection( + terminal.buffer.createAnchorFromOffset(startCell), + terminal.buffer.createAnchorFromOffset(endCell), + ); + await tester.pumpAndSettle(); + + final handleFinder = find.byWidgetPredicate( + (w) => w.runtimeType.toString() == '_TerminalSelectionHandle', + ); + expect(handleFinder, findsNWidgets(2)); + + // 拖拽结束手柄至底部边缘触发自动滚动 + final gesture = await tester.startGesture(tester.getCenter(handleFinder.last)); + await tester.pump(); + await gesture.moveTo(const Offset(200, 295)); + await tester.pump(const Duration(milliseconds: 100)); + + final scrollPixelsBeforeRelease = scrollController.position.pixels; + expect(scrollPixelsBeforeRelease, greaterThan(0.0)); + + // 手指松开 + await gesture.up(); + await tester.pump(); + + // 在松手之后经过 200ms,验证滚动位置保持绝对静止,绝不继续自动滚动! + await tester.pump(const Duration(milliseconds: 200)); + expect(scrollController.position.pixels, equals(scrollPixelsBeforeRelease)); + + await tester.pumpAndSettle(); + expect(scrollController.position.pixels, equals(scrollPixelsBeforeRelease)); + expect(find.text('复制'), findsOneWidget); + }); }); } diff --git a/test/tmp_clear_probe_test.dart b/test/tmp_clear_probe_test.dart new file mode 100644 index 0000000..c6f3f98 --- /dev/null +++ b/test/tmp_clear_probe_test.dart @@ -0,0 +1,46 @@ +// 临时探针测试:验证执行 clear(含 ESC[3J 清空回滚缓冲)之后 +// 终端 BufferLine.index / CellAnchor.offset 是否与真实行号错位。 +import 'package:flutter_test/flutter_test.dart'; +import 'package:xterm/xterm.dart' as xterm; + +void main() { + test('probe: ESC[3J clearScrollback 之后行索引与锚点是否错位', () { + final terminal = xterm.Terminal(maxLines: 100); + for (int i = 0; i < 60; i++) { + terminal.write('Line $i\r\n'); + } + + final beforeHeight = terminal.buffer.height; + final viewHeight = terminal.viewHeight; + // ignore: avoid_print + print('BEFORE height=$beforeHeight viewHeight=$viewHeight ' + 'line0.index=${terminal.buffer.lines[0].index} ' + 'lineLast.index=${terminal.buffer.lines[beforeHeight - 1].index}'); + + // 真实 clear 命令(xterm-256color, E3)输出序列 + terminal.write('\x1b[H\x1b[2J\x1b[3J'); + + final afterHeight = terminal.buffer.height; + // ignore: avoid_print + print('AFTER height=$afterHeight viewHeight=${terminal.viewHeight} ' + 'line0.index=${terminal.buffer.lines[0].index} ' + 'lineLast.index=${terminal.buffer.lines[afterHeight - 1].index}'); + + // 模拟用户在可见区域第一行选中一个词 + final anchor = terminal.buffer.createAnchorFromOffset(const xterm.CellOffset(0, 0)); + final anchor2 = terminal.buffer.createAnchorFromOffset(const xterm.CellOffset(4, 0)); + // ignore: avoid_print + print('visible row0 anchor y=${anchor.offset.y} (期望 0) row0 anchor2 y=${anchor2.offset.y}'); + + final range = xterm.BufferRangeLine(anchor.offset, anchor2.offset).normalized; + // ignore: avoid_print + print('selection range begin=${range.begin} end=${range.end}'); + // ignore: avoid_print + print('paint guard: lines.length=$afterHeight segment lines=' + '${range.toSegments().map((s) => s.line).toList()}'); + // ignore: avoid_print + print('getText(selection)="${terminal.buffer.getText(range)}"'); + + terminal.dispose(); + }); +} diff --git a/test/widget_test.dart b/test/widget_test.dart index 3a34f9b..b4186a0 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -2766,6 +2766,163 @@ void main() { tempDir.deleteSync(recursive: true); } catch (_) {} }); + + testWidgets('CodeEditorWidget pinch-to-zoom preserves text selection and handles', (tester) async { + final tempDir = Directory.systemTemp.createTempSync('editor_zoom_selection_test'); + final testFile = File('${tempDir.path}/test.dart')..writeAsStringSync('void main() {\n print("hello");\n}'); + + final settingsProvider = SettingsProvider(); + await settingsProvider.init(); + await settingsProvider.setFontSize(14.0); + + final tabProvider = TabProvider(); + await tabProvider.init(); + tabProvider.openTabs.add( + EditorTabItem( + path: testFile.path, + content: 'void main() {\n print("hello");\n}', + originalContent: 'void main() {\n print("hello");\n}', + isLoaded: true, + isModified: false, + ), + ); + + await tester.pumpWidget( + MultiProvider( + providers: [ + ChangeNotifierProvider.value(value: settingsProvider), + ChangeNotifierProvider.value(value: tabProvider), + ], + child: MaterialApp( + home: Scaffold( + body: CodeEditorWidget( + rootPath: tempDir.path, + filePath: testFile.path, + ), + ), + ), + ), + ); + await tester.pumpAndSettle(); + + final codeEditor = tester.widget(find.byType(CodeEditor)); + final controller = codeEditor.controller!; + + // Select 'void' (0..4 on line 0) + controller.selection = const CodeLineSelection( + baseIndex: 0, + baseOffset: 0, + extentIndex: 0, + extentOffset: 4, + ); + await tester.pumpAndSettle(); + expect(controller.selection.isCollapsed, isFalse); + + // Simulate 2-pointer pinch gesture + final gesture1 = await tester.createGesture(); + final gesture2 = await tester.createGesture(); + + await gesture1.down(const Offset(200, 300)); + await gesture2.down(const Offset(200, 350)); + await tester.pump(); + + await gesture2.moveTo(const Offset(200, 400)); + await tester.pump(); + + await gesture1.up(); + await gesture2.up(); + await tester.pumpAndSettle(); + + // Selection must NOT be collapsed or lost! + expect(controller.selection.isCollapsed, isFalse); + expect(controller.selection.baseOffset, 0); + expect(controller.selection.extentOffset, 4); + expect(settingsProvider.fontSize, 28.0); + + try { + tempDir.deleteSync(recursive: true); + } catch (_) {} + }); + + testWidgets('CodeEditorWidget pinch-to-zoom anchors zoom to focal point (compensates scroll offset)', (tester) async { + final tempDir = Directory.systemTemp.createTempSync('editor_zoom_focal_test'); + final lines = List.generate(100, (i) => 'Line $i: abcdefghijklmnopqrstuvwxyz').join('\n'); + final testFile = File('${tempDir.path}/test.dart')..writeAsStringSync(lines); + + final settingsProvider = SettingsProvider(); + await settingsProvider.init(); + await settingsProvider.setFontSize(14.0); + + final tabProvider = TabProvider(); + await tabProvider.init(); + tabProvider.openTabs.add( + EditorTabItem( + path: testFile.path, + content: lines, + originalContent: lines, + isLoaded: true, + isModified: false, + ), + ); + + await tester.pumpWidget( + MultiProvider( + providers: [ + ChangeNotifierProvider.value(value: settingsProvider), + ChangeNotifierProvider.value(value: tabProvider), + ], + child: MaterialApp( + home: Scaffold( + body: SizedBox( + width: 400, + height: 500, + child: CodeEditorWidget( + rootPath: tempDir.path, + filePath: testFile.path, + ), + ), + ), + ), + ), + ); + await tester.pumpAndSettle(); + + final codeEditor = tester.widget(find.byType(CodeEditor)); + final scrollController = codeEditor.scrollController!; + final vScroller = scrollController.verticalScroller; + + expect(vScroller.offset, 0.0); + + // Simulate 2-pointer pinch gesture near the bottom of the editor viewport + // Focal point dy = (350 + 450) / 2 = 400.0 + final gesture1 = await tester.createGesture(); + final gesture2 = await tester.createGesture(); + + await gesture1.down(const Offset(200, 350)); + await gesture2.down(const Offset(200, 450)); // Initial distance: 100.0 + await tester.pump(); + + // Zoom in by increasing distance to 150.0 (1.5x scale) -> target font size: 14 * 1.5 = 21.0 + // Focal point moves from 400.0 to (350 + 500) / 2 = 425.0 + // Target scrollV = (0 + 400.0) * 1.5 - 425.0 = 600.0 - 425.0 = 175.0 + await gesture2.moveTo(const Offset(200, 500)); + await tester.pump(); + + // Without focal anchor, vScroller.offset would remain 0.0, causing bottom text to fly down. + // With focal anchor, vScroller.offset is compensated to keep the focal point steady. + expect(vScroller.offset, greaterThan(100.0)); + + await gesture1.up(); + await gesture2.up(); + await tester.pumpAndSettle(); + + expect(settingsProvider.fontSize, 21.0); + expect(vScroller.offset, greaterThan(100.0)); + + try { + tempDir.deleteSync(recursive: true); + } catch (_) {} + }); }); // ============================================================ @@ -3223,7 +3380,7 @@ void main() { // Defaults expect(provider.showLineNumbers, isTrue); - expect(provider.pinLineNumbers, isTrue); + expect(provider.pinLineNumbers, isFalse); // Setters bool notified = false; @@ -3234,15 +3391,15 @@ void main() { expect(notified, isTrue); notified = false; - await provider.setPinLineNumbers(false); - expect(provider.pinLineNumbers, isFalse); + await provider.setPinLineNumbers(true); + expect(provider.pinLineNumbers, isTrue); expect(notified, isTrue); // Verify loaded from SharedPreferences final provider2 = SettingsProvider(); await provider2.init(); expect(provider2.showLineNumbers, isFalse); - expect(provider2.pinLineNumbers, isFalse); + expect(provider2.pinLineNumbers, isTrue); }); test('Localization strings exist in both zh and en without hardcoding', () { @@ -3290,13 +3447,13 @@ void main() { expect(find.text('固定行号'), findsOneWidget); expect(find.text('水平滚动代码时行号固定在左侧'), findsOneWidget); - // Both switches should initially be enabled and true + // showSwitch should be true, pinSwitch should initially be enabled and false final switchesBefore = tester.widgetList(find.byType(SwitchListTile)); final showSwitchBefore = switchesBefore.firstWhere((s) => (s.title as Text).data == '显示行号'); final pinSwitchBefore = switchesBefore.firstWhere((s) => (s.title as Text).data == '固定行号'); expect(showSwitchBefore.value, isTrue); expect(showSwitchBefore.onChanged, isNotNull); - expect(pinSwitchBefore.value, isTrue); + expect(pinSwitchBefore.value, isFalse); expect(pinSwitchBefore.onChanged, isNotNull); // Turn off showLineNumbers @@ -3313,7 +3470,7 @@ void main() { // Tapping disabled pinLineNumbers does nothing await tester.tap(find.text('固定行号')); await tester.pumpAndSettle(); - expect(provider.pinLineNumbers, isTrue); // unchanged + expect(provider.pinLineNumbers, isFalse); // unchanged // Re-enabling showLineNumbers re-enables pinLineNumbers await tester.tap(find.text('显示行号'));