fixed 3.29.0 issue and > syntax issue

saminsohag
Commit 08e512435a6711a558fa3d7cd5d6086267cdbe6f 08e51243 1 parent 32f8449a
Showing 5 changed files with 91 additions and 82 deletions
example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
example/pubspec.lock
lib/custom_widgets/selectable_adapter.dart
lib/markdown_component.dart
pubspec.yaml
--- a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View file @08e5124
+++ b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View file @08e5124
@@ -59,6 +59,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
--- a/example/pubspec.lock
View file @08e5124
+++ b/example/pubspec.lock
View file @08e5124
@@ -13,42 +13,42 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.12.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.19.0"
+    version: "1.19.1"
   cross_file:
     dependency: transitive
     description:
@@ -77,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -106,10 +106,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_svg
-      sha256: "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123"
+      sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.16"
+    version: "2.0.17"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -126,39 +126,39 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.6"
+    version: "1.0.8"
   http:
     dependency: transitive
     description:
       name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
+      sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.3.0"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
+      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.1"
+    version: "4.1.2"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
+      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.7"
+    version: "10.0.8"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
+      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.8"
+    version: "3.0.9"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -179,10 +179,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
@@ -195,10 +195,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   nested:
     dependency: transitive
     description:
@@ -211,10 +211,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   path_parsing:
     dependency: transitive
     description:
@@ -227,10 +227,10 @@ packages:
     dependency: transitive
     description:
       name: petitparser
-      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
+      sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.2"
+    version: "6.1.0"
   provider:
     dependency: transitive
     description:
@@ -248,50 +248,50 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.10.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.12.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.3"
+    version: "0.7.4"
   tuple:
     dependency: transitive
     description:
@@ -312,18 +312,18 @@ packages:
     dependency: transitive
     description:
       name: vector_graphics
-      sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7"
+      sha256: "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.15"
+    version: "1.1.18"
   vector_graphics_codec:
     dependency: transitive
     description:
       name: vector_graphics_codec
-      sha256: "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb"
+      sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.12"
+    version: "1.1.13"
   vector_graphics_compiler:
     dependency: transitive
     description:
@@ -344,10 +344,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
+      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.0"
+    version: "14.3.1"
   watcher:
     dependency: "direct main"
     description:
@@ -373,5 +373,5 @@ packages:
     source: hosted
     version: "6.5.0"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
+  dart: ">=3.7.0-0 <4.0.0"
   flutter: ">=3.22.0"
--- a/lib/custom_widgets/selectable_adapter.dart
View file @08e5124
+++ b/lib/custom_widgets/selectable_adapter.dart
View file @08e5124
@@ -3,7 +3,7 @@ import 'package:flutter/rendering.dart';
 class SelectableAdapter extends StatelessWidget {
   const SelectableAdapter(
-      {super.key, required this.selectedText, required this.child});
+      {super.key, required this.child, required this.selectedText});
   final Widget child;
   final String selectedText;
@@ -17,31 +17,26 @@ class SelectableAdapter extends StatelessWidget {
     return MouseRegion(
       cursor: SystemMouseCursors.text,
       child: _SelectableAdapter(
-        registrar: registrar,
-        selectedText: selectedText,
-        child: child,
-      ),
+          registrar: registrar, selectedText: selectedText, child: child),
     );
   }
 }
 class _SelectableAdapter extends SingleChildRenderObjectWidget {
-  const _SelectableAdapter({
-    required this.registrar,
+  const _SelectableAdapter(
+      {required this.registrar,
       required Widget child,
-    required this.selectedText,
-  }) : super(child: child);
+      required this.selectedText})
+      : super(child: child);
   final SelectionRegistrar registrar;
   final String selectedText;
-
   @override
   _RenderSelectableAdapter createRenderObject(BuildContext context) {
     return _RenderSelectableAdapter(
         DefaultSelectionStyle.of(context).selectionColor!,
-      selectedText,
         registrar,
-    );
+        selectedText);
   }
   @override
@@ -55,23 +50,23 @@ class _SelectableAdapter extends SingleChildRenderObjectWidget {
 class _RenderSelectableAdapter extends RenderProxyBox
     with Selectable, SelectionRegistrant {
-  String selectionText;
   _RenderSelectableAdapter(
-    Color selectionColor,
-    this.selectionText,
-    SelectionRegistrar registrar,
-  )   : _selectionColor = selectionColor,
+      Color selectionColor, SelectionRegistrar registrar, this.selectedText)
+      : _selectionColor = selectionColor,
         _geometry = ValueNotifier<SelectionGeometry>(_noSelection) {
     this.registrar = registrar;
     _geometry.addListener(markNeedsPaint);
   }
-  static const SelectionGeometry _noSelection =
-      SelectionGeometry(status: SelectionStatus.none, hasContent: true);
-  final ValueNotifier<SelectionGeometry> _geometry;
+  final String selectedText;
+  static const SelectionGeometry _noSelection = SelectionGeometry(
+    status: SelectionStatus.none,
+    hasContent: true,
+  );
+  final ValueNotifier<SelectionGeometry> _geometry;
   Color get selectionColor => _selectionColor;
-  late Color _selectionColor;
+  Color _selectionColor;
   set selectionColor(Color value) {
     if (_selectionColor == value) {
       return;
@@ -100,8 +95,12 @@ class _RenderSelectableAdapter extends RenderProxyBox
   // Adjust this value to enlarge or shrink the selection highlight.
   static const double _padding = 0.0;
   Rect _getSelectionHighlightRect() {
-    return Rect.fromLTWH(0 - _padding, 0 - _padding, size.width + _padding * 2,
-        size.height + _padding * 2);
+    return Rect.fromLTWH(
+      0 - _padding,
+      0 - _padding,
+      size.width + _padding * 2,
+      size.height + _padding * 2,
+    );
   }
   Offset? _start;
@@ -263,10 +262,19 @@ class _RenderSelectableAdapter extends RenderProxyBox
   // widget into clipboard.
   @override
   SelectedContent? getSelectedContent() {
-    return value.hasSelection
-        ? SelectedContent(plainText: selectionText)
-        : null;
+    return value.hasSelection ? SelectedContent(plainText: selectedText) : null;
+  }
+
+  @override
+  SelectedContentRange? getSelection() {
+    if (!value.hasSelection) {
+      return null;
     }
+    return const SelectedContentRange(startOffset: 0, endOffset: 1);
+  }
+
+  @override
+  int get contentLength => 1;
   LayerLink? _startHandle;
   LayerLink? _endHandle;
@@ -299,8 +307,7 @@ class _RenderSelectableAdapter extends RenderProxyBox
       context.pushLayer(
         LeaderLayer(
             link: _startHandle!,
-          offset: offset + value.startSelectionPoint!.localPosition,
-        ),
+            offset: offset + value.startSelectionPoint!.localPosition),
         (PaintingContext context, Offset offset) {},
         Offset.zero,
       );
@@ -309,8 +316,7 @@ class _RenderSelectableAdapter extends RenderProxyBox
       context.pushLayer(
         LeaderLayer(
             link: _endHandle!,
-          offset: offset + value.endSelectionPoint!.localPosition,
-        ),
+            offset: offset + value.endSelectionPoint!.localPosition),
         (PaintingContext context, Offset offset) {},
         Offset.zero,
       );
@@ -320,6 +326,8 @@ class _RenderSelectableAdapter extends RenderProxyBox
   @override
   void dispose() {
     _geometry.dispose();
+    _startHandle = null;
+    _endHandle = null;
     super.dispose();
   }
 }
--- a/lib/markdown_component.dart
View file @08e5124
+++ b/lib/markdown_component.dart
View file @08e5124
@@ -342,7 +342,7 @@ class IndentMd extends InlineMd {
                 direction: config.textDirection,
                 child: Padding(
                   padding: const EdgeInsetsDirectional.only(start: 10.0),
-                  child: Expanded(child: config.getRich(child)),
+                  child: config.getRich(child),
                 ),
               ),
             ),
--- a/pubspec.yaml
View file @08e5124
+++ b/pubspec.yaml
View file @08e5124
@@ -15,7 +15,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
 flutter: