Merge branch 'singerdmx:master' into master

pull/1843/head
AtlasAutocode 12 months ago committed by GitHub
commit c9d105a532
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 5
      CHANGELOG.md
  2. 5
      dart_quill_delta/CHANGELOG.md
  3. 2
      dart_quill_delta/pubspec.yaml
  4. 5
      flutter_quill_extensions/CHANGELOG.md
  5. 2
      flutter_quill_extensions/pubspec.yaml
  6. 2
      flutter_quill_test/pubspec.yaml
  7. 12
      lib/src/models/config/editor/editor_configurations.dart
  8. 10
      lib/src/models/config/raw_editor/raw_editor_configurations.dart
  9. 4
      lib/src/packages/quill_markdown/markdown_to_delta.dart
  10. 1
      lib/src/widgets/editor/editor.dart
  11. 4
      lib/src/widgets/quill/text_block.dart
  12. 4
      lib/src/widgets/raw_editor/raw_editor_state.dart
  13. 2
      pubspec.yaml
  14. 5
      quill_html_converter/CHANGELOG.md
  15. 2
      quill_html_converter/pubspec.yaml
  16. 5
      quill_pdf_converter/CHANGELOG.md
  17. 2
      quill_pdf_converter/pubspec.yaml
  18. 2
      version.dart

@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
## 9.3.9
* fix: MD Parsing for multi space
* fix: FontFamily and FontSize toolbars track the text selected in the editor
* feat: Add checkBoxReadOnly property which can override readOnly for checkbox
## 9.3.8
* fix: removed misleading parameters
* fix: added missed translations for ru, es, de

@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
## 9.3.9
* fix: MD Parsing for multi space
* fix: FontFamily and FontSize toolbars track the text selected in the editor
* feat: Add checkBoxReadOnly property which can override readOnly for checkbox
## 9.3.8
* fix: removed misleading parameters
* fix: added missed translations for ru, es, de

@ -1,6 +1,6 @@
name: dart_quill_delta
description: A port of quill-js-delta from typescript to dart
version: 9.3.8
version: 9.3.9
homepage: https://github.com/singerdmx/flutter-quill/tree/master/dart_quill_delta/
repository: https://github.com/singerdmx/flutter-quill/tree/master/dart_quill_delta/
issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
## 9.3.9
* fix: MD Parsing for multi space
* fix: FontFamily and FontSize toolbars track the text selected in the editor
* feat: Add checkBoxReadOnly property which can override readOnly for checkbox
## 9.3.8
* fix: removed misleading parameters
* fix: added missed translations for ru, es, de

@ -1,6 +1,6 @@
name: flutter_quill_extensions
description: Embed extensions for flutter_quill including image, video, formula and etc.
version: 9.3.8
version: 9.3.9
homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_extensions/
repository: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_extensions/
issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

@ -1,6 +1,6 @@
name: flutter_quill_test
description: Test utilities for flutter_quill which includes methods to simplify interacting with the editor in test cases.
version: 9.3.8
version: 9.3.9
homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_test/
repository: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_test/
issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

@ -33,6 +33,7 @@ class QuillEditorConfigurations extends Equatable {
this.expands = false,
this.placeholder,
this.readOnly = false,
this.checkBoxReadOnly,
this.disableClipboard = false,
this.textSelectionThemeData,
this.showCursor,
@ -97,6 +98,15 @@ class QuillEditorConfigurations extends Equatable {
/// Defaults to `false`. Must not be `null`.
final bool readOnly;
/// Override [readOnly] for checkbox.
///
/// When this is set to `false`, the checkbox can be checked
/// or unchecked while [readOnly] is set to `true`.
/// When this is set to `null`, the [readOnly] value is used.
///
/// Defaults to `null`.
final bool? checkBoxReadOnly;
/// Disable Clipboard features
///
/// when this is set to `true` clipboard can not be used
@ -369,6 +379,7 @@ class QuillEditorConfigurations extends Equatable {
QuillController? controller,
String? placeholder,
bool? readOnly,
bool? checkBoxReadOnly,
bool? disableClipboard,
bool? scrollable,
double? scrollBottomInset,
@ -421,6 +432,7 @@ class QuillEditorConfigurations extends Equatable {
controller: controller ?? this.controller,
placeholder: placeholder ?? this.placeholder,
readOnly: readOnly ?? this.readOnly,
checkBoxReadOnly: checkBoxReadOnly ?? this.checkBoxReadOnly,
disableClipboard: disableClipboard ?? this.disableClipboard,
scrollable: scrollable ?? this.scrollable,
scrollBottomInset: scrollBottomInset ?? this.scrollBottomInset,

@ -50,6 +50,7 @@ class QuillRawEditorConfigurations extends Equatable {
this.scrollable = true,
this.padding = EdgeInsets.zero,
this.readOnly = false,
this.checkBoxReadOnly,
this.disableClipboard = false,
this.placeholder,
this.onLaunchUrl,
@ -104,6 +105,15 @@ class QuillRawEditorConfigurations extends Equatable {
/// Defaults to false. Must not be null.
final bool readOnly;
/// Override readOnly for checkbox.
///
/// When this is set to false, the checkbox can be checked
/// or unchecked while readOnly is set to true.
/// When this is set to null, the readOnly value is used.
///
/// Defaults to null.
final bool? checkBoxReadOnly;
/// Disable Clipboard features
///
/// when this is set to true clipboard can not be used

@ -117,9 +117,7 @@ class MarkdownToDelta extends Converter<String, Delta>
_justPreviousBlockExit = false;
_listItemIndent = -1;
final lines = const LineSplitter().convert(input);
final mdNodes = markdownDocument.parseLines(lines);
final mdNodes = markdownDocument.parseInline(input);
_topLevelNodes.addAll(mdNodes);
for (final node in mdNodes) {

@ -235,6 +235,7 @@ class QuillEditorState extends State<QuillEditor>
scrollBottomInset: configurations.scrollBottomInset,
padding: configurations.padding,
readOnly: configurations.readOnly,
checkBoxReadOnly: configurations.checkBoxReadOnly,
disableClipboard: configurations.disableClipboard,
placeholder: configurations.placeholder,
onLaunchUrl: configurations.onLaunchUrl,

@ -74,6 +74,7 @@ class EditableTextBlock extends StatelessWidget {
required this.clearIndents,
required this.onCheckboxTap,
required this.readOnly,
this.checkBoxReadOnly,
this.onLaunchUrl,
this.customStyleBuilder,
this.customLinkPrefixes = const <String>[],
@ -100,6 +101,7 @@ class EditableTextBlock extends StatelessWidget {
final bool clearIndents;
final Function(int, bool) onCheckboxTap;
final bool readOnly;
final bool? checkBoxReadOnly;
final List<String> customLinkPrefixes;
@override
@ -279,7 +281,7 @@ class EditableTextBlock extends StatelessWidget {
return QuillEditorCheckboxPoint(
size: fontSize,
value: attrs[Attribute.list.key] == Attribute.checked,
enabled: !readOnly,
enabled: !(checkBoxReadOnly ?? readOnly),
onChanged: (checked) => onCheckboxTap(line.documentOffset, checked),
uiBuilder: defaultStyles.lists?.checkboxUIBuilder,
);

@ -998,7 +998,8 @@ class QuillRawEditorState extends EditorState
void _handleCheckboxTap(int offset, bool value) {
final requestKeyboardFocusOnCheckListChanged =
widget.configurations.requestKeyboardFocusOnCheckListChanged;
if (!widget.configurations.readOnly) {
if (!(widget.configurations.checkBoxReadOnly ??
widget.configurations.readOnly)) {
_disableScrollControllerAnimateOnce = true;
final currentSelection = controller.selection.copyWith();
final attribute = value ? Attribute.checked : Attribute.unchecked;
@ -1074,6 +1075,7 @@ class QuillRawEditorState extends EditorState
clearIndents: clearIndents,
onCheckboxTap: _handleCheckboxTap,
readOnly: widget.configurations.readOnly,
checkBoxReadOnly: widget.configurations.checkBoxReadOnly,
customStyleBuilder: widget.configurations.customStyleBuilder,
customLinkPrefixes: widget.configurations.customLinkPrefixes,
);

@ -1,6 +1,6 @@
name: flutter_quill
description: A rich text editor built for the modern Android, iOS, web and desktop platforms. It is the WYSIWYG editor and a Quill component for Flutter.
version: 9.3.8
version: 9.3.9
homepage: https://1o24bbs.com/c/bulletjournal/108/
repository: https://github.com/singerdmx/flutter-quill/
issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
## 9.3.9
* fix: MD Parsing for multi space
* fix: FontFamily and FontSize toolbars track the text selected in the editor
* feat: Add checkBoxReadOnly property which can override readOnly for checkbox
## 9.3.8
* fix: removed misleading parameters
* fix: added missed translations for ru, es, de

@ -1,6 +1,6 @@
name: quill_html_converter
description: A extension for flutter_quill package to add support for dealing with conversion to/from html
version: 9.3.8
version: 9.3.9
homepage: https://github.com/singerdmx/flutter-quill/tree/master/quill_html_converter/
repository: https://github.com/singerdmx/flutter-quill/tree/master/quill_html_converter/
issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
## 9.3.9
* fix: MD Parsing for multi space
* fix: FontFamily and FontSize toolbars track the text selected in the editor
* feat: Add checkBoxReadOnly property which can override readOnly for checkbox
## 9.3.8
* fix: removed misleading parameters
* fix: added missed translations for ru, es, de

@ -1,6 +1,6 @@
name: quill_pdf_converter
description: A extension for flutter_quill package to add support for dealing with conversion to pdf
version: 9.3.8
version: 9.3.9
homepage: https://github.com/singerdmx/flutter-quill/tree/master/quill_pdf_converter/
repository: https://github.com/singerdmx/flutter-quill/tree/master/quill_pdf_converter/
issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

@ -1 +1 @@
const version = '9.3.8';
const version = '9.3.9';

Loading…
Cancel
Save