From bb616481df1d9f6671d5da7bd4e7bb1dbaddfcd2 Mon Sep 17 00:00:00 2001 From: Joep Heijnen Date: Wed, 19 Jun 2024 12:13:20 +0200 Subject: [PATCH] fix: Enabled link regex to be overridden --- lib/src/models/rules/insert.dart | 6 +++--- lib/src/widgets/toolbar/buttons/link_style2_button.dart | 2 +- lib/src/widgets/toolbar/buttons/link_style_button.dart | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/src/models/rules/insert.dart b/lib/src/models/rules/insert.dart index b97058bc..f9cb7b79 100644 --- a/lib/src/models/rules/insert.dart +++ b/lib/src/models/rules/insert.dart @@ -371,18 +371,18 @@ class AutoFormatMultipleLinksRule extends InsertRule { r'https?:\/\/[\w\-]+(\.[\w\-]+)*(:\d+)?(\/[^\s]*)?'; /// It requires a valid link in one link - static final oneLineLinkRegExp = RegExp( + RegExp get oneLineLinkRegExp => RegExp( _oneLineLinkPattern, caseSensitive: false, ); /// It detect if there is a link in the text whatever if it in the middle etc // Used to solve bug https://github.com/singerdmx/flutter-quill/issues/1432 - static final detectLinkRegExp = RegExp( + RegExp get detectLinkRegExp => RegExp( _detectLinkPattern, caseSensitive: false, ); - static final linkRegExp = oneLineLinkRegExp; + RegExp get linkRegExp => oneLineLinkRegExp; @override Delta? applyRule( diff --git a/lib/src/widgets/toolbar/buttons/link_style2_button.dart b/lib/src/widgets/toolbar/buttons/link_style2_button.dart index b6178cdd..8d6cd508 100644 --- a/lib/src/widgets/toolbar/buttons/link_style2_button.dart +++ b/lib/src/widgets/toolbar/buttons/link_style2_button.dart @@ -413,7 +413,7 @@ class _LinkStyleDialogState extends State { String? _validateLink(String? value) { if ((value?.isEmpty ?? false) || - !AutoFormatMultipleLinksRule.oneLineLinkRegExp.hasMatch(value!)) { + !const AutoFormatMultipleLinksRule().oneLineLinkRegExp.hasMatch(value!)) { return widget.validationMessage ?? 'That is not a valid URL'; } diff --git a/lib/src/widgets/toolbar/buttons/link_style_button.dart b/lib/src/widgets/toolbar/buttons/link_style_button.dart index 92724012..a345034d 100644 --- a/lib/src/widgets/toolbar/buttons/link_style_button.dart +++ b/lib/src/widgets/toolbar/buttons/link_style_button.dart @@ -196,7 +196,7 @@ class _LinkDialogState extends State<_LinkDialog> { late String _text; RegExp get linkRegExp { - return widget.linkRegExp ?? AutoFormatMultipleLinksRule.oneLineLinkRegExp; + return widget.linkRegExp ?? const AutoFormatMultipleLinksRule().oneLineLinkRegExp; } late TextEditingController _linkController;