Skip to content

Commit 710fc34

Browse files
authored
Merge pull request #33 from Xazin/chore/backwards-compatibility
chore: backwards compatibility
2 parents c1df769 + 3160306 commit 710fc34

File tree

10 files changed

+56
-58
lines changed

10 files changed

+56
-58
lines changed

example/lib/samples/multi_directional_scroll.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ class _MultiDirectionalScrollSampleState
5555
scrollDirection: Axis.horizontal,
5656
child: Column(
5757
children: [
58-
for (var index = 0; index < 1; index++)
58+
for (var index = 0; index < 100; index++)
5959
Container(
60-
height: 500,
61-
width: 100,
60+
height: 1000,
61+
width: 100000,
6262
color: colorForIndex(index),
6363
),
6464
],
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

example/pubspec.lock

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ packages:
55
dependency: transitive
66
description:
77
name: async
8-
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
8+
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "2.12.0"
11+
version: "2.11.0"
1212
auto_scrolling:
1313
dependency: "direct main"
1414
description:
@@ -20,42 +20,42 @@ packages:
2020
dependency: transitive
2121
description:
2222
name: boolean_selector
23-
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
23+
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
2424
url: "https://pub.dev"
2525
source: hosted
26-
version: "2.1.2"
26+
version: "2.1.1"
2727
characters:
2828
dependency: transitive
2929
description:
3030
name: characters
31-
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
31+
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
3232
url: "https://pub.dev"
3333
source: hosted
34-
version: "1.4.0"
34+
version: "1.3.0"
3535
clock:
3636
dependency: transitive
3737
description:
3838
name: clock
39-
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
39+
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
4040
url: "https://pub.dev"
4141
source: hosted
42-
version: "1.1.2"
42+
version: "1.1.1"
4343
collection:
4444
dependency: transitive
4545
description:
4646
name: collection
47-
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
47+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
4848
url: "https://pub.dev"
4949
source: hosted
50-
version: "1.19.1"
50+
version: "1.18.0"
5151
fake_async:
5252
dependency: transitive
5353
description:
5454
name: fake_async
55-
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
55+
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
5656
url: "https://pub.dev"
5757
source: hosted
58-
version: "1.3.2"
58+
version: "1.3.1"
5959
flutter:
6060
dependency: "direct main"
6161
description: flutter
@@ -65,10 +65,10 @@ packages:
6565
dependency: "direct dev"
6666
description:
6767
name: flutter_lints
68-
sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
68+
sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
6969
url: "https://pub.dev"
7070
source: hosted
71-
version: "5.0.0"
71+
version: "4.0.0"
7272
flutter_test:
7373
dependency: "direct dev"
7474
description: flutter
@@ -78,119 +78,119 @@ packages:
7878
dependency: transitive
7979
description:
8080
name: leak_tracker
81-
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
81+
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
8282
url: "https://pub.dev"
8383
source: hosted
84-
version: "10.0.8"
84+
version: "10.0.0"
8585
leak_tracker_flutter_testing:
8686
dependency: transitive
8787
description:
8888
name: leak_tracker_flutter_testing
89-
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
89+
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
9090
url: "https://pub.dev"
9191
source: hosted
92-
version: "3.0.9"
92+
version: "2.0.1"
9393
leak_tracker_testing:
9494
dependency: transitive
9595
description:
9696
name: leak_tracker_testing
97-
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
97+
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
9898
url: "https://pub.dev"
9999
source: hosted
100-
version: "3.0.1"
100+
version: "2.0.1"
101101
lints:
102102
dependency: transitive
103103
description:
104104
name: lints
105-
sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
105+
sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
106106
url: "https://pub.dev"
107107
source: hosted
108-
version: "5.1.1"
108+
version: "4.0.0"
109109
matcher:
110110
dependency: transitive
111111
description:
112112
name: matcher
113-
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
113+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
114114
url: "https://pub.dev"
115115
source: hosted
116-
version: "0.12.17"
116+
version: "0.12.16+1"
117117
material_color_utilities:
118118
dependency: transitive
119119
description:
120120
name: material_color_utilities
121-
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
121+
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
122122
url: "https://pub.dev"
123123
source: hosted
124-
version: "0.11.1"
124+
version: "0.8.0"
125125
meta:
126126
dependency: transitive
127127
description:
128128
name: meta
129-
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
129+
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
130130
url: "https://pub.dev"
131131
source: hosted
132-
version: "1.16.0"
132+
version: "1.11.0"
133133
path:
134134
dependency: transitive
135135
description:
136136
name: path
137-
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
137+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
138138
url: "https://pub.dev"
139139
source: hosted
140-
version: "1.9.1"
140+
version: "1.9.0"
141141
sky_engine:
142142
dependency: transitive
143143
description: flutter
144144
source: sdk
145-
version: "0.0.0"
145+
version: "0.0.99"
146146
source_span:
147147
dependency: transitive
148148
description:
149149
name: source_span
150-
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
150+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
151151
url: "https://pub.dev"
152152
source: hosted
153-
version: "1.10.1"
153+
version: "1.10.0"
154154
stack_trace:
155155
dependency: transitive
156156
description:
157157
name: stack_trace
158-
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
158+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
159159
url: "https://pub.dev"
160160
source: hosted
161-
version: "1.12.1"
161+
version: "1.11.1"
162162
stream_channel:
163163
dependency: transitive
164164
description:
165165
name: stream_channel
166-
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
166+
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
167167
url: "https://pub.dev"
168168
source: hosted
169-
version: "2.1.4"
169+
version: "2.1.2"
170170
string_scanner:
171171
dependency: transitive
172172
description:
173173
name: string_scanner
174-
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
174+
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
175175
url: "https://pub.dev"
176176
source: hosted
177-
version: "1.4.1"
177+
version: "1.2.0"
178178
term_glyph:
179179
dependency: transitive
180180
description:
181181
name: term_glyph
182-
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
182+
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
183183
url: "https://pub.dev"
184184
source: hosted
185-
version: "1.2.2"
185+
version: "1.2.1"
186186
test_api:
187187
dependency: transitive
188188
description:
189189
name: test_api
190-
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
190+
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
191191
url: "https://pub.dev"
192192
source: hosted
193-
version: "0.7.4"
193+
version: "0.6.1"
194194
vector_math:
195195
dependency: transitive
196196
description:
@@ -203,10 +203,10 @@ packages:
203203
dependency: transitive
204204
description:
205205
name: vm_service
206-
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
206+
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
207207
url: "https://pub.dev"
208208
source: hosted
209-
version: "14.3.1"
209+
version: "13.0.0"
210210
sdks:
211-
dart: ">=3.7.0-0 <4.0.0"
212-
flutter: ">=3.18.0-18.0.pre.54"
211+
dart: ">=3.3.2 <4.0.0"
212+
flutter: ">=1.20.0"

example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ publish_to: "none"
55
version: 1.0.0+1
66

77
environment:
8-
sdk: ^3.4.0
8+
sdk: ^3.3.2
99

1010
dependencies:
1111
flutter:
@@ -17,7 +17,7 @@ dev_dependencies:
1717
flutter_test:
1818
sdk: flutter
1919

20-
flutter_lints: ^5.0.0
20+
flutter_lints: ^4.0.0
2121

2222
flutter:
2323
uses-material-design: true
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

lib/src/auto_scroll.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ class _AutoScrollState extends State<AutoScroll> {
132132
AutoScrollDirection direction = AutoScrollDirection.none;
133133

134134
bool get useCustomCursor =>
135+
startOffset != null &&
135136
widget.cursorBuilder != null &&
136137
(widget.willUseCustomCursor?.call(direction) ?? false);
137138

@@ -157,9 +158,7 @@ class _AutoScrollState extends State<AutoScroll> {
157158
@override
158159
Widget build(BuildContext context) {
159160
return MouseRegion(
160-
cursor: startOffset != null && useCustomCursor
161-
? SystemMouseCursors.none
162-
: MouseCursor.defer,
161+
cursor: useCustomCursor ? SystemMouseCursors.none : MouseCursor.defer,
163162
child: Stack(
164163
key: _key,
165164
children: [

lib/src/multi_axis_auto_scroll.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ class _MultiAxisAutoScrollState extends State<MultiAxisAutoScroll> {
132132
AutoScrollDirection direction = AutoScrollDirection.none;
133133

134134
bool get useCustomCursor =>
135+
startOffset != null &&
135136
widget.cursorBuilder != null &&
136137
(widget.willUseCustomCursor?.call(direction) ?? false);
137138

@@ -159,9 +160,7 @@ class _MultiAxisAutoScrollState extends State<MultiAxisAutoScroll> {
159160
@override
160161
Widget build(BuildContext context) {
161162
return MouseRegion(
162-
cursor: startOffset != null && useCustomCursor
163-
? SystemMouseCursors.none
164-
: MouseCursor.defer,
163+
cursor: useCustomCursor ? SystemMouseCursors.none : MouseCursor.defer,
165164
child: Stack(
166165
key: _key,
167166
children: [

0 commit comments

Comments
 (0)