Skip to content

Support hover mouse pointer on links in Flutter Web #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 29, 2021
Merged

Support hover mouse pointer on links in Flutter Web #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9f34275
Support hover mouse pointer on links in Flutter Web
tneotia Mar 6, 2021
ca63837
Undo previous changes and add new mouseCursor property to TextSpans
tneotia Apr 24, 2021
61c6da5
Merge branch 'master' of https://github.com/Sub6Resources/flutter_htm…
tneotia Apr 24, 2021
228e5b2
Merge branch 'master' of https://github.com/Sub6Resources/flutter_htm…
tneotia Apr 29, 2021
c06640c
Update min Flutter SDK to 2.2.0
tneotia May 19, 2021
37f93a2
Merge branch 'master' of https://github.com/Sub6Resources/flutter_htm…
tneotia May 26, 2021
03045d3
Merge changes with nested link fixes
tneotia May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions lib/html_parser.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:csslib/parser.dart' as cssparser;
import 'package:csslib/visitor.dart' as css;
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:flutter_html/image_render.dart';
import 'package:flutter_html/src/anchor.dart';
Expand Down Expand Up @@ -410,6 +411,7 @@ class HtmlParser extends StatelessWidget {
InlineSpan addTaps(InlineSpan childSpan, TextStyle childStyle) {
if (childSpan is TextSpan) {
return TextSpan(
mouseCursor: SystemMouseCursors.click,
text: childSpan.text,
children: childSpan.children
?.map((e) => addTaps(e, childStyle.merge(childSpan.style)))
Expand All @@ -425,29 +427,34 @@ class HtmlParser extends StatelessWidget {
);
} else {
return WidgetSpan(
child: MultipleTapGestureDetector(
onTap: _onAnchorTap != null
? () => _onAnchorTap!(tree.href, context, tree.attributes, tree.element)
: null,
child: GestureDetector(
key: AnchorKey.of(key, tree),
child: MouseRegion(
key: AnchorKey.of(key, tree),
cursor: SystemMouseCursors.click,
child: MultipleTapGestureDetector(
onTap: _onAnchorTap != null
? () => _onAnchorTap!(tree.href, context, tree.attributes, tree.element)
? () => _onAnchorTap!(tree.href, context, tree.attributes, tree.element)
: null,
child: (childSpan as WidgetSpan).child,
child: GestureDetector(
key: AnchorKey.of(key, tree),
onTap: _onAnchorTap != null
? () => _onAnchorTap!(tree.href, context, tree.attributes, tree.element)
: null,
child: (childSpan as WidgetSpan).child,
),
),
),
);
}
}

return TextSpan(
mouseCursor: SystemMouseCursors.click,
children: tree.children
.map((tree) => parseTree(newContext, tree))
.map((childSpan) {
return addTaps(childSpan,
newContext.style.generateTextStyle().merge(childSpan.style));
}).toList(),
return addTaps(childSpan,
newContext.style.generateTextStyle().merge(childSpan.style));
}).toList(),
);
} else if (tree is LayoutElement) {
return WidgetSpan(
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ homepage: https://github.com/Sub6Resources/flutter_html

environment:
sdk: '>=2.12.0 <3.0.0'
flutter: '>=1.17.0'
flutter: '>=2.2.0'

dependencies:
# Plugin for parsing html
Expand Down