diff --git a/lib/src/models/rules/insert.dart b/lib/src/models/rules/insert.dart index b97058bc..873b1cc4 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( - _oneLineLinkPattern, - caseSensitive: false, - ); + 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( - _detectLinkPattern, - caseSensitive: false, - ); - static final linkRegExp = oneLineLinkRegExp; + RegExp get detectLinkRegExp => RegExp( + _detectLinkPattern, + caseSensitive: false, + ); + 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..bdc4388d 100644 --- a/lib/src/widgets/toolbar/buttons/link_style2_button.dart +++ b/lib/src/widgets/toolbar/buttons/link_style2_button.dart @@ -413,7 +413,9 @@ 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..3831f8b3 100644 --- a/lib/src/widgets/toolbar/buttons/link_style_button.dart +++ b/lib/src/widgets/toolbar/buttons/link_style_button.dart @@ -196,7 +196,8 @@ 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;