Skip to content
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.

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

linkStyle replaced by linkStyleBuilder #134

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
31 changes: 17 additions & 14 deletions lib/flutter_linkify.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ export 'package:linkify/linkify.dart'
/// Callback clicked link
typedef LinkCallback = void Function(LinkableElement link);

/// Turns link to TextStyle
typedef LinkStyleBuilder = TextStyle? Function(LinkableElement link);

/// Turns URLs into links
class Linkify extends StatelessWidget {
/// Text to be linkified
Expand All @@ -37,7 +40,7 @@ class Linkify extends StatelessWidget {
final TextStyle? style;

/// Style of link text
final TextStyle? linkStyle;
final LinkStyleBuilder? linkStyleBuilder;

// Text.rich

Expand Down Expand Up @@ -82,7 +85,7 @@ class Linkify extends StatelessWidget {
this.options = const LinkifyOptions(),
// TextSpan
this.style,
this.linkStyle,
this.linkStyleBuilder,
// RichText
this.textAlign = TextAlign.start,
this.textDirection,
Expand Down Expand Up @@ -111,12 +114,12 @@ class Linkify extends StatelessWidget {
style: style ?? Theme.of(context).textTheme.bodyMedium,
onOpen: onOpen,
useMouseRegion: useMouseRegion,
linkStyle: (style ?? Theme.of(context).textTheme.bodyMedium)
linkStyleBuilder: (link) => (style ?? Theme.of(context).textTheme.bodyMedium)
?.copyWith(
color: Colors.blueAccent,
decoration: TextDecoration.underline,
)
.merge(linkStyle),
.merge(linkStyleBuilder?.call(link)),
),
textAlign: textAlign,
textDirection: textDirection,
Expand Down Expand Up @@ -155,7 +158,7 @@ class SelectableLinkify extends StatelessWidget {
final TextStyle? style;

/// Style of link text
final TextStyle? linkStyle;
final LinkStyleBuilder? linkStyleBuilder;

// Text.rich

Expand Down Expand Up @@ -234,7 +237,7 @@ class SelectableLinkify extends StatelessWidget {
this.options = const LinkifyOptions(),
// TextSpan
this.style,
this.linkStyle,
this.linkStyleBuilder,
// RichText
this.textAlign,
this.textDirection,
Expand Down Expand Up @@ -275,12 +278,12 @@ class SelectableLinkify extends StatelessWidget {
elements,
style: style ?? Theme.of(context).textTheme.bodyMedium,
onOpen: onOpen,
linkStyle: (style ?? Theme.of(context).textTheme.bodyMedium)
linkStyleBuilder:(link) => (style ?? Theme.of(context).textTheme.bodyMedium)
?.copyWith(
color: Colors.blueAccent,
decoration: TextDecoration.underline,
)
.merge(linkStyle),
.merge(linkStyleBuilder?.call(link)),
useMouseRegion: useMouseRegion,
),
textAlign: textAlign,
Expand Down Expand Up @@ -327,15 +330,15 @@ class LinkableSpan extends WidgetSpan {
TextSpan buildTextSpan(
List<LinkifyElement> elements, {
TextStyle? style,
TextStyle? linkStyle,
LinkStyleBuilder? linkStyleBuilder,
LinkCallback? onOpen,
bool useMouseRegion = false,
}) =>
TextSpan(
children: buildTextSpanChildren(
elements,
style: style,
linkStyle: linkStyle,
linkStyleBuilder: linkStyleBuilder,
onOpen: onOpen,
useMouseRegion: useMouseRegion,
),
Expand All @@ -345,7 +348,7 @@ TextSpan buildTextSpan(
List<InlineSpan>? buildTextSpanChildren(
List<LinkifyElement> elements, {
TextStyle? style,
TextStyle? linkStyle,
LinkStyleBuilder? linkStyleBuilder,
LinkCallback? onOpen,
bool useMouseRegion = false,
}) =>
Expand All @@ -354,7 +357,7 @@ List<InlineSpan>? buildTextSpanChildren(
if (element is LinkableElement)
TextSpan(
text: element.text,
style: linkStyle,
style: linkStyleBuilder?.call(element),
recognizer: onOpen != null
? (TapGestureRecognizer()..onTap = () => onOpen(element))
: null,
Expand All @@ -370,7 +373,7 @@ List<InlineSpan>? buildTextSpanChildren(
class LinkifySpan extends TextSpan {
LinkifySpan({
required String text,
TextStyle? linkStyle,
LinkStyleBuilder? linkStyleBuilder,
LinkCallback? onOpen,
LinkifyOptions options = const LinkifyOptions(),
List<Linkifier> linkifiers = defaultLinkifiers,
Expand All @@ -387,7 +390,7 @@ class LinkifySpan extends TextSpan {
children: buildTextSpanChildren(
linkify(text, options: options, linkifiers: linkifiers),
style: style,
linkStyle: linkStyle,
linkStyleBuilder: linkStyleBuilder,
onOpen: onOpen,
useMouseRegion: useMouseRegion,
),
Expand Down