revert last change

Author: razankv13

lib/src/code_field/browser_detection.dart

@@ -1,21 +1,13 @@
 // Use different implementations for web vs non-web platforms
-import 'package:flutter/rendering.dart';
 import 'package:flutter_code_editor/src/code_field/browser_detection_web.dart'
     if (dart.library.io) 'browser_detection_io.dart' as detection;
 
-// Function to determine if we need to use specific Chrome text selection fixes
-Map<String, dynamic> getChromeTextSelectionFixes() {
-  return detection.getChromeTextSelectionFixes();
-}
-
-// Legacy function kept for backward compatibility
-// Now returns null to use the default line height
-@deprecated
+// Function to determine the line height based on platform
 double? getChromeLineHeight() {
-  return null;
+  return detection.isChromeBrowser() ? 1.18 : null;
 }
 
-// Function to get appropriate top padding based on browser
+// Function to get appropriate top padding based on line height
 double getGutterTopPadding() {
-  return 16.0;
+  return getChromeLineHeight() == 1.18 ? 13.0 : 16.0;
 }

lib/src/code_field/browser_detection_io.dart

@@ -1,11 +1,3 @@
-import 'package:flutter/rendering.dart';
-
 bool isChromeBrowser() {
   return false;
 }
-
-Map<String, dynamic> getChromeTextSelectionFixes() {
-  return {
-    'useCustomSelectionStyle': false,
-  };
-}

lib/src/code_field/browser_detection_web.dart

@@ -1,9 +1,7 @@
 // ignore: deprecated_member_use
 import 'dart:js' as js;
-import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/rendering.dart';
 
 // Returns true if the browser is Chrome
 bool isChromeBrowser() {
@@ -21,20 +19,3 @@ bool isChromeBrowser() {
   }
   return false;
 }
-
-// Optimizes text selection in Chrome by adjusting selection behavior
-// instead of modifying line height
-Map<String, dynamic> getChromeTextSelectionFixes() {
-  if (!isChromeBrowser()) {
-    return {
-      'useCustomSelectionStyle': false,
-    };
-  }
-  
-  return {
-    'useCustomSelectionStyle': true,
-    'selectionHeightFix': true,
-    'leadingDistribution': TextLeadingDistribution.even,
-    'selectionAlignmentFix': true,
-  };
-}

lib/src/code_field/code_field.dart

@@ -366,16 +366,11 @@ class _CodeFieldState extends State<CodeField> {
 
     textStyle = defaultTextStyle.merge(widget.textStyle);
 
-    // Get Chrome-specific text selection fixes
-    final chromeTextSelectionFixes = getChromeTextSelectionFixes();
-    final useCustomSelectionStyle = chromeTextSelectionFixes['useCustomSelectionStyle'] as bool;
-
-    // Adjust textStyle to have consistent line height and Chrome-specific fixes
+    // Adjust textStyle to have consistent line height
+    // This is a key fix for Chrome selection issues
     final adjustedTextStyle = textStyle.copyWith(
-      height: getLineHeight(),
-      leadingDistribution: useCustomSelectionStyle 
-          ? chromeTextSelectionFixes['leadingDistribution'] as TextLeadingDistribution 
-          : TextLeadingDistribution.proportional,
+      height: getLineHeight(), // Use the function instead of constant
+      leadingDistribution: TextLeadingDistribution.even, // Added for consistent text baselines
     );
 
     final codeField = TextField(
@@ -389,17 +384,15 @@ class _CodeFieldState extends State<CodeField> {
       scrollController: _codeScroll,
       keyboardType: widget.keyboardType,
       selectionControls: kIsWeb ? DesktopTextSelectionControls() : MaterialTextSelectionControls(),
-      decoration: InputDecoration(
+      decoration: const InputDecoration(
         isCollapsed: true,
-        // Add vertical padding - adjust based on selection fixes
-        contentPadding: EdgeInsets.symmetric(
-          vertical: useCustomSelectionStyle ? 14.0 : 16.0,
-        ),
+        // Add more vertical padding to help with line selection
+        contentPadding: EdgeInsets.symmetric(vertical: 16),
         disabledBorder: InputBorder.none,
         border: InputBorder.none,
         focusedBorder: InputBorder.none,
       ),
-      textAlignVertical: TextAlignVertical.top,
+      textAlignVertical: TextAlignVertical.top, // Align text at the top for better matching
       cursorColor: widget.cursorColor ?? defaultTextStyle.color,
       cursorHeight: widget.cursorHeight,
       autocorrect: false,
@@ -421,7 +414,14 @@ class _CodeFieldState extends State<CodeField> {
 
     final editingField = Theme(
       data: Theme.of(context).copyWith(
-        textSelectionTheme: _getTextSelectionTheme(context),
+        textSelectionTheme: widget.textSelectionTheme ??
+            TextSelectionThemeData(
+              // Use a more pronounced and distinguishable selection color
+              // This helps with Chrome's selection rendering
+              selectionColor: Theme.of(context).colorScheme.primary.withOpacity(0.5),
+              cursorColor: widget.cursorColor ?? defaultTextStyle.color,
+              selectionHandleColor: Theme.of(context).colorScheme.primary,
+            ),
       ),
       child: LayoutBuilder(
         builder: (BuildContext context, BoxConstraints constraints) {
@@ -458,20 +458,14 @@ class _CodeFieldState extends State<CodeField> {
     final lineNumberSize = textStyle.fontSize;
     final lineNumberColor = widget.gutterStyle.textStyle?.color ?? textStyle.color?.withOpacity(.5);
 
-    // Get Chrome-specific text selection fixes
-    final chromeTextSelectionFixes = getChromeTextSelectionFixes();
-    final useCustomSelectionStyle = chromeTextSelectionFixes['useCustomSelectionStyle'] as bool;
-
     // Ensure same text style properties for consistent line height
     final lineNumberTextStyle = (widget.gutterStyle.textStyle ?? textStyle).copyWith(
       color: lineNumberColor,
       fontFamily: textStyle.fontFamily,
       fontSize: lineNumberSize,
-      height: getLineHeight(),
+      height: getLineHeight(), // Use the function instead of constant
       // Add additional properties to ensure metrics consistency
-      leadingDistribution: useCustomSelectionStyle 
-          ? chromeTextSelectionFixes['leadingDistribution'] as TextLeadingDistribution 
-          : TextLeadingDistribution.proportional,
+      leadingDistribution: TextLeadingDistribution.even,
     );
 
     final gutterStyle = widget.gutterStyle.copyWith(
@@ -555,11 +549,9 @@ class _CodeFieldState extends State<CodeField> {
       return renderBox.localToGlobal(Offset.zero);
     }
 
-    // Get Chrome-specific text selection fixes
-    final chromeTextSelectionFixes = getChromeTextSelectionFixes();
-    final useCustomSelectionStyle = chromeTextSelectionFixes['useCustomSelectionStyle'] as bool;
-    final selectionHeightFix = useCustomSelectionStyle ? 
-        (chromeTextSelectionFixes['selectionHeightFix'] as bool? ?? false) : false;
+    // Instead of calculating line position based on newlines,
+    // we'll use the TextPainter's getOffsetForCaret method which
+    // properly accounts for text wrapping
 
     // Create a text painter for the entire text
     final fullTextPainter = TextPainter(
@@ -585,21 +577,15 @@ class _CodeFieldState extends State<CodeField> {
 
     // Apply scroll offsets
     final double adjustedX = rawOffset.dx - horizontalScrollOffset;
-    double adjustedY = rawOffset.dy - scrollY;
-    
-    // Apply Chrome-specific vertical adjustment if needed
-    if (selectionHeightFix) {
-      // This small offset helps Chrome render selections correctly without changing line height
-      adjustedY += 2.0;
-    }
+    final double adjustedY = rawOffset.dy - scrollY;
 
     // Convert to global coordinates
     return renderBox.localToGlobal(Offset(adjustedX, adjustedY));
   }
 
   double getLineHeight() {
-    // Use a consistent line height that looks good (not the special Chrome value)
-    return textStyle.height ?? 1.2;
+    // Default line height multiple if not specified in the style
+    return getChromeLineHeight() ?? (textStyle.height ?? 1.2);
   }
 
   void _onPopupStateChanged() {
@@ -654,27 +640,4 @@ class _CodeFieldState extends State<CodeField> {
       }
     }
   }
-
-  TextSelectionThemeData _getTextSelectionTheme(BuildContext context) {
-    final chromeTextSelectionFixes = getChromeTextSelectionFixes();
-    final useCustomSelectionStyle = chromeTextSelectionFixes['useCustomSelectionStyle'] as bool;
-    
-    // Create a more optimized selection style for Chrome
-    if (useCustomSelectionStyle) {
-      return widget.textSelectionTheme ??
-          TextSelectionThemeData(
-            selectionColor: Theme.of(context).colorScheme.primary.withOpacity(0.3),
-            cursorColor: widget.cursorColor ?? textStyle.color,
-            selectionHandleColor: Theme.of(context).colorScheme.primary,
-          );
-    }
-    
-    // Default selection style for other browsers
-    return widget.textSelectionTheme ??
-        TextSelectionThemeData(
-          selectionColor: Theme.of(context).colorScheme.primary.withOpacity(0.5),
-          cursorColor: widget.cursorColor ?? textStyle.color,
-          selectionHandleColor: Theme.of(context).colorScheme.primary,
-        );
-  }
 }