huypanha
/
flutter-quill
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into embedBuilder

Browse Source
pull/2074/head^2
AtlasAutocode 9 months ago committed by GitHub
parent e4e374b72d 1c3ccf7a9a
commit 14a22c0e6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 406 additions and 280 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      CHANGELOG.md
  2. 2
      CHANGELOG_DATA.json
  3. 5
      README.md
  4. 23
      dart_quill_delta/CHANGELOG.md
  5. 2
      dart_quill_delta/pubspec.yaml
  6. 23
      flutter_quill_extensions/CHANGELOG.md
  7. 11
      flutter_quill_extensions/README.md
  8. 2
      flutter_quill_extensions/pubspec.yaml
  9. 23
      flutter_quill_test/CHANGELOG.md
  10. 2
      flutter_quill_test/pubspec.yaml
  11. 3
      lib/flutter_quill.dart
  12. 17
      lib/src/document/nodes/line.dart
  13. 8
      lib/src/editor/editor.dart
  14. 13
      lib/src/editor_toolbar_controller_shared/copy_cut_service/copy_cut_service.dart
  15. 19
      lib/src/editor_toolbar_controller_shared/copy_cut_service/copy_cut_service_provider.dart
  16. 14
      lib/src/editor_toolbar_controller_shared/copy_cut_service/default_copy_cut_service.dart
  17. 494
      lib/src/toolbar/simple_toolbar.dart
  18. 2
      pubspec.yaml

23
CHANGELOG.md
Unescape View File

@ -4,6 +4,29 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## 10.1.1
* Toolbar dividers fixes + Docs updates by @troyanskiy in https://github.com/singerdmx/flutter-quill/pull/2071
## New Contributors
* @troyanskiy made their first contribution in https://github.com/singerdmx/flutter-quill/pull/2071
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.1.0...v10.1.1
## 10.1.0
* Feat: support for customize copy and cut Embeddables to Clipboard by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2067
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.0.10...v10.1.0
## 10.0.10
* fix: Hide selection toolbar if editor loses focus by @huandu in https://github.com/singerdmx/flutter-quill/pull/2066
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.0.9...v10.0.10
## 10.0.9 ## 10.0.9
* Fix: manual checking of directionality by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2063 * Fix: manual checking of directionality by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2063

2
CHANGELOG_DATA.json
View File

File diff suppressed because one or more lines are too long

5
README.md
Unescape View File

@ -94,8 +94,9 @@ dependencies:
```yaml ```yaml
dependencies: dependencies:
flutter_quill: flutter_quill:
git: https://github.com/singerdmx/flutter-quill.git git:
ref: v<latest-version-here> url: https://github.com/singerdmx/flutter-quill.git
ref: v<latest-version-here>
``` ```
> [!TIP] > [!TIP]

23
dart_quill_delta/CHANGELOG.md
Unescape View File

@ -4,6 +4,29 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## 10.1.1
* Toolbar dividers fixes + Docs updates by @troyanskiy in https://github.com/singerdmx/flutter-quill/pull/2071
## New Contributors
* @troyanskiy made their first contribution in https://github.com/singerdmx/flutter-quill/pull/2071
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.1.0...v10.1.1
## 10.1.0
* Feat: support for customize copy and cut Embeddables to Clipboard by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2067
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.0.10...v10.1.0
## 10.0.10
* fix: Hide selection toolbar if editor loses focus by @huandu in https://github.com/singerdmx/flutter-quill/pull/2066
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.0.9...v10.0.10
## 10.0.9 ## 10.0.9
* Fix: manual checking of directionality by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2063 * Fix: manual checking of directionality by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2063

2
dart_quill_delta/pubspec.yaml
Unescape View File

@ -1,6 +1,6 @@
name: dart_quill_delta name: dart_quill_delta
description: A port of quill-js-delta from typescript to dart description: A port of quill-js-delta from typescript to dart
version: 10.0.9 version: 10.1.1
homepage: https://github.com/singerdmx/flutter-quill/tree/master/dart_quill_delta/ homepage: https://github.com/singerdmx/flutter-quill/tree/master/dart_quill_delta/
repository: 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/ issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

23
flutter_quill_extensions/CHANGELOG.md
Unescape View File

@ -4,6 +4,29 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## 10.1.1
* Toolbar dividers fixes + Docs updates by @troyanskiy in https://github.com/singerdmx/flutter-quill/pull/2071
## New Contributors
* @troyanskiy made their first contribution in https://github.com/singerdmx/flutter-quill/pull/2071
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.1.0...v10.1.1
## 10.1.0
* Feat: support for customize copy and cut Embeddables to Clipboard by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2067
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.0.10...v10.1.0
## 10.0.10
* fix: Hide selection toolbar if editor loses focus by @huandu in https://github.com/singerdmx/flutter-quill/pull/2066
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.0.9...v10.0.10
## 10.0.9 ## 10.0.9
* Fix: manual checking of directionality by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2063 * Fix: manual checking of directionality by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2063

11
flutter_quill_extensions/README.md
Unescape View File

@ -50,9 +50,10 @@ dependencies:
```yaml ```yaml
dependencies: dependencies:
flutter_quill_extensions: flutter_quill_extensions:
git: https://github.com/singerdmx/flutter-quill.git git:
path: flutter_quill_extensions url: https://github.com/singerdmx/flutter-quill.git
ref: v<latest-version-here> ref: v<latest-version-here>
path: flutter_quill_extensions
``` ```
## 🛠 Platform Specific Configurations ## 🛠 Platform Specific Configurations
@ -103,8 +104,8 @@ Set the `embedBuilders` and `embedToolbar` params in configurations of `QuillEdi
**Quill Toolbar**: **Quill Toolbar**:
```dart ```dart
QuillToolbar( QuillToolbar.simple(
configurations: QuillToolbarConfigurations( configurations: QuillSimpleToolbarConfigurations(
embedButtons: FlutterQuillEmbeds.toolbarButtons(), embedButtons: FlutterQuillEmbeds.toolbarButtons(),
), ),
), ),

2
flutter_quill_extensions/pubspec.yaml
Unescape View File

@ -1,6 +1,6 @@
name: flutter_quill_extensions name: flutter_quill_extensions
description: Embed extensions for flutter_quill including image, video, formula and etc. description: Embed extensions for flutter_quill including image, video, formula and etc.
version: 10.0.9 version: 10.1.1
homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_extensions/ homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_extensions/
repository: 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/ issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

23
flutter_quill_test/CHANGELOG.md
Unescape View File

@ -4,6 +4,29 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## 10.1.1
* Toolbar dividers fixes + Docs updates by @troyanskiy in https://github.com/singerdmx/flutter-quill/pull/2071
## New Contributors
* @troyanskiy made their first contribution in https://github.com/singerdmx/flutter-quill/pull/2071
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.1.0...v10.1.1
## 10.1.0
* Feat: support for customize copy and cut Embeddables to Clipboard by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2067
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.0.10...v10.1.0
## 10.0.10
* fix: Hide selection toolbar if editor loses focus by @huandu in https://github.com/singerdmx/flutter-quill/pull/2066
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.0.9...v10.0.10
## 10.0.9 ## 10.0.9
* Fix: manual checking of directionality by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2063 * Fix: manual checking of directionality by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2063

2
flutter_quill_test/pubspec.yaml
Unescape View File

@ -1,6 +1,6 @@
name: flutter_quill_test name: flutter_quill_test
description: Test utilities for flutter_quill which includes methods to simplify interacting with the editor in test cases. description: Test utilities for flutter_quill which includes methods to simplify interacting with the editor in test cases.
version: 10.0.9 version: 10.1.1
homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_test/ homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_test/
repository: 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/ issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

3
lib/flutter_quill.dart
Unescape View File

@ -28,6 +28,9 @@ export 'src/editor/style_widgets/style_widgets.dart';
export 'src/editor/widgets/cursor.dart'; export 'src/editor/widgets/cursor.dart';
export 'src/editor/widgets/default_styles.dart'; export 'src/editor/widgets/default_styles.dart';
export 'src/editor/widgets/link.dart'; export 'src/editor/widgets/link.dart';
export 'src/editor_toolbar_controller_shared/copy_cut_service/copy_cut_service.dart';
export 'src/editor_toolbar_controller_shared/copy_cut_service/copy_cut_service_provider.dart';
export 'src/editor_toolbar_controller_shared/copy_cut_service/default_copy_cut_service.dart';
export 'src/editor_toolbar_controller_shared/quill_configurations.dart'; export 'src/editor_toolbar_controller_shared/quill_configurations.dart';
export 'src/editor_toolbar_shared/quill_configurations_ext.dart'; export 'src/editor_toolbar_shared/quill_configurations_ext.dart';
export 'src/toolbar/base_toolbar.dart'; export 'src/toolbar/base_toolbar.dart';

17
lib/src/document/nodes/line.dart
Unescape View File

@ -6,6 +6,7 @@ import '../../../../quill_delta.dart';
import '../../common/structs/offset_value.dart'; import '../../common/structs/offset_value.dart';
import '../../editor/config/editor_configurations.dart'; import '../../editor/config/editor_configurations.dart';
import '../../editor/embed/embed_editor_builder.dart'; import '../../editor/embed/embed_editor_builder.dart';
import '../../editor_toolbar_controller_shared/copy_cut_service/copy_cut_service_provider.dart';
import '../attribute.dart'; import '../attribute.dart';
import '../style.dart'; import '../style.dart';
import 'block.dart'; import 'block.dart';
@ -524,7 +525,21 @@ base class Line extends QuillContainer<Leaf?> {
final text = final text =
node.toPlainText(config?.embedBuilders, config?.unknownEmbedBuilder); node.toPlainText(config?.embedBuilders, config?.unknownEmbedBuilder);
if (text == Embed.kObjectReplacementCharacter) { if (text == Embed.kObjectReplacementCharacter) {
buffer.write(Embed.kObjectReplacementCharacter); final embed = node.value as Embeddable;
final provider = CopyCutServiceProvider.instance;
// By default getCopyCutAction just return the same operation
// returning Embed.kObjectReplacementCharacter for the buffer
final action = provider.getCopyCutAction(embed.type);
final data = action.call(embed.data);
// This conditional avoid an issue where the plain data copied
// to the clipboard, when it is pasted on the editor
// the content has a unexpected behaviors
if (data != Embed.kObjectReplacementCharacter) {
buffer.write(data);
return remaining;
} else {
buffer.write(action.call(data));
}
return remaining - node.length; return remaining - node.length;
} }

8
lib/src/editor/editor.dart
Unescape View File

@ -177,15 +177,15 @@ class QuillEditorState extends State<QuillEditor>
_editorKey = configurations.editorKey ?? GlobalKey<EditorState>(); _editorKey = configurations.editorKey ?? GlobalKey<EditorState>();
_selectionGestureDetectorBuilder = _selectionGestureDetectorBuilder =
_QuillEditorSelectionGestureDetectorBuilder( _QuillEditorSelectionGestureDetectorBuilder(
this, this,
configurations.detectWordBoundary, configurations.detectWordBoundary,
); );
widget.configurations.controller.editorConfigurations ??= widget.configurations.controller.editorConfigurations ??=
widget.configurations; widget.configurations;
final focusNode = final focusNode =
widget.configurations.controller.editorFocusNode ??= widget.focusNode; widget.configurations.controller.editorFocusNode ??= widget.focusNode;
if (configurations.autoFocus) { if (configurations.autoFocus) {
focusNode.requestFocus(); focusNode.requestFocus();

13
lib/src/editor_toolbar_controller_shared/copy_cut_service/copy_cut_service.dart
Unescape View File

@ -0,0 +1,13 @@
import 'package:flutter/foundation.dart';
typedef CopyCutAction = Object? Function(dynamic data);
/// An abstraction to make it easy to provide different implementations
/// For copy or cut actions from a Line (just for embeddable blocks)
@immutable
abstract class CopyCutService {
/// Get the CopyCutAction by the type
/// of the embeddable (this type is decided by
/// the property type of that class)
CopyCutAction getCopyCutAction(String type);
}

19
lib/src/editor_toolbar_controller_shared/copy_cut_service/copy_cut_service_provider.dart
Unescape View File

@ -0,0 +1,19 @@
import 'package:flutter/foundation.dart' show immutable;
import 'copy_cut_service.dart';
import 'default_copy_cut_service.dart';
@immutable
class CopyCutServiceProvider {
const CopyCutServiceProvider._();
static CopyCutService _instance = DefaultCopyCutService();
static CopyCutService get instance => _instance;
static void setInstance(CopyCutService service) {
_instance = service;
}
static void setInstanceToDefault() {
_instance = DefaultCopyCutService();
}
}

14
lib/src/editor_toolbar_controller_shared/copy_cut_service/default_copy_cut_service.dart
Unescape View File

@ -0,0 +1,14 @@
import '../../document/nodes/leaf.dart';
import 'copy_cut_service.dart';
/// Default implementation for [CopyCutService]
///
/// This implementation always return the default embed character
/// replacemenet ([\uFFFC]) to work with the embeds from the internal
/// flutter quill plugins
class DefaultCopyCutService extends CopyCutService {
@override
CopyCutAction getCopyCutAction(String type) {
return (data) => Embed.kObjectReplacementCharacter;
}
}

494
lib/src/toolbar/simple_toolbar.dart
Unescape View File

@ -23,34 +23,6 @@ class QuillSimpleToolbar extends StatelessWidget
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theEmbedButtons = configurations.embedButtons; final theEmbedButtons = configurations.embedButtons;
final isButtonGroupShown = [
configurations.showFontFamily ||
configurations.showFontSize ||
configurations.showBoldButton ||
configurations.showItalicButton ||
configurations.showSmallButton ||
configurations.showUnderLineButton ||
configurations.showLineHeightButton ||
configurations.showStrikeThrough ||
configurations.showInlineCode ||
configurations.showColorButton ||
configurations.showBackgroundColorButton ||
configurations.showClearFormat ||
theEmbedButtons?.isNotEmpty == true,
configurations.showLeftAlignment ||
configurations.showCenterAlignment ||
configurations.showRightAlignment ||
configurations.showJustifyAlignment ||
configurations.showDirection,
configurations.showHeaderStyle,
configurations.showListNumbers ||
configurations.showListBullets ||
configurations.showListCheck ||
configurations.showCodeBlock,
configurations.showQuote || configurations.showIndent,
configurations.showLink || configurations.showSearchButton
];
List<Widget> childrenBuilder(BuildContext context) { List<Widget> childrenBuilder(BuildContext context) {
final toolbarConfigurations = final toolbarConfigurations =
context.requireQuillSimpleToolbarConfigurations; context.requireQuillSimpleToolbarConfigurations;
@ -68,251 +40,232 @@ class QuillSimpleToolbar extends StatelessWidget
space: configurations.sectionDividerSpace, space: configurations.sectionDividerSpace,
)); ));
return [ final groups = [
if (configurations.showUndo) [
QuillToolbarHistoryButton( if (configurations.showUndo)
isUndo: true, QuillToolbarHistoryButton(
options: toolbarConfigurations.buttonOptions.undoHistory, isUndo: true,
controller: globalController, options: toolbarConfigurations.buttonOptions.undoHistory,
), controller: globalController,
if (configurations.showRedo) ),
QuillToolbarHistoryButton( if (configurations.showRedo)
isUndo: false, QuillToolbarHistoryButton(
options: toolbarConfigurations.buttonOptions.redoHistory, isUndo: false,
controller: globalController, options: toolbarConfigurations.buttonOptions.redoHistory,
), controller: globalController,
if (configurations.showFontFamily) ),
QuillToolbarFontFamilyButton( if (configurations.showFontFamily)
options: toolbarConfigurations.buttonOptions.fontFamily, QuillToolbarFontFamilyButton(
controller: globalController, options: toolbarConfigurations.buttonOptions.fontFamily,
), controller: globalController,
if (configurations.showFontSize) ),
QuillToolbarFontSizeButton( if (configurations.showFontSize)
options: toolbarConfigurations.buttonOptions.fontSize, QuillToolbarFontSizeButton(
controller: globalController, options: toolbarConfigurations.buttonOptions.fontSize,
), controller: globalController,
if (configurations.showBoldButton) ),
QuillToolbarToggleStyleButton( if (configurations.showBoldButton)
attribute: Attribute.bold, QuillToolbarToggleStyleButton(
options: toolbarConfigurations.buttonOptions.bold, attribute: Attribute.bold,
controller: globalController, options: toolbarConfigurations.buttonOptions.bold,
), controller: globalController,
if (configurations.showItalicButton)
QuillToolbarToggleStyleButton(
attribute: Attribute.italic,
options: toolbarConfigurations.buttonOptions.italic,
controller: globalController,
),
if (configurations.showUnderLineButton)
QuillToolbarToggleStyleButton(
attribute: Attribute.underline,
options: toolbarConfigurations.buttonOptions.underLine,
controller: globalController,
),
if (configurations.showStrikeThrough)
QuillToolbarToggleStyleButton(
attribute: Attribute.strikeThrough,
options: toolbarConfigurations.buttonOptions.strikeThrough,
controller: globalController,
),
if (configurations.showInlineCode)
QuillToolbarToggleStyleButton(
attribute: Attribute.inlineCode,
options: toolbarConfigurations.buttonOptions.inlineCode,
controller: globalController,
),
if (configurations.showSubscript)
QuillToolbarToggleStyleButton(
attribute: Attribute.subscript,
options: toolbarConfigurations.buttonOptions.subscript,
controller: globalController,
),
if (configurations.showSuperscript)
QuillToolbarToggleStyleButton(
attribute: Attribute.superscript,
options: toolbarConfigurations.buttonOptions.superscript,
controller: globalController,
),
if (configurations.showSmallButton)
QuillToolbarToggleStyleButton(
attribute: Attribute.small,
options: toolbarConfigurations.buttonOptions.small,
controller: globalController,
),
if (configurations.showColorButton)
QuillToolbarColorButton(
controller: globalController,
isBackground: false,
options: toolbarConfigurations.buttonOptions.color,
),
if (configurations.showBackgroundColorButton)
QuillToolbarColorButton(
options: toolbarConfigurations.buttonOptions.backgroundColor,
controller: globalController,
isBackground: true,
),
if (configurations.showClearFormat)
QuillToolbarClearFormatButton(
controller: globalController,
options: toolbarConfigurations.buttonOptions.clearFormat,
),
if (theEmbedButtons != null)
for (final builder in theEmbedButtons)
builder(
globalController,
globalIconSize ?? kDefaultIconSize,
context.quillToolbarBaseButtonOptions?.iconTheme,
configurations.dialogTheme),
if (configurations.showDividers &&
isButtonGroupShown[0] &&
(isButtonGroupShown[1] ||
isButtonGroupShown[2] ||
isButtonGroupShown[3] ||
isButtonGroupShown[4] ||
isButtonGroupShown[5]))
divider,
if (configurations.showAlignmentButtons)
QuillToolbarSelectAlignmentButtons(
controller: globalController,
options: toolbarConfigurations.buttonOptions.selectAlignmentButtons
.copyWith(
showLeftAlignment: configurations.showLeftAlignment,
showCenterAlignment: configurations.showCenterAlignment,
showRightAlignment: configurations.showRightAlignment,
showJustifyAlignment: configurations.showJustifyAlignment,
), ),
), if (configurations.showItalicButton)
if (configurations.showDirection) QuillToolbarToggleStyleButton(
QuillToolbarToggleStyleButton( attribute: Attribute.italic,
attribute: Attribute.rtl, options: toolbarConfigurations.buttonOptions.italic,
options: toolbarConfigurations.buttonOptions.direction, controller: globalController,
controller: globalController, ),
), if (configurations.showUnderLineButton)
if (configurations.showDividers && QuillToolbarToggleStyleButton(
isButtonGroupShown[1] && attribute: Attribute.underline,
(isButtonGroupShown[2] || options: toolbarConfigurations.buttonOptions.underLine,
isButtonGroupShown[3] || controller: globalController,
isButtonGroupShown[4] || ),
isButtonGroupShown[5])) if (configurations.showStrikeThrough)
divider, QuillToolbarToggleStyleButton(
if (configurations.showLineHeightButton) attribute: Attribute.strikeThrough,
QuillToolbarSelectLineHeightStyleDropdownButton( options: toolbarConfigurations.buttonOptions.strikeThrough,
controller: globalController, controller: globalController,
options: toolbarConfigurations ),
.buttonOptions.selectLineHeightStyleDropdownButton, if (configurations.showInlineCode)
), QuillToolbarToggleStyleButton(
if (configurations.showHeaderStyle) ...[ attribute: Attribute.inlineCode,
if (configurations.headerStyleType.isOriginal) options: toolbarConfigurations.buttonOptions.inlineCode,
QuillToolbarSelectHeaderStyleDropdownButton( controller: globalController,
),
if (configurations.showSubscript)
QuillToolbarToggleStyleButton(
attribute: Attribute.subscript,
options: toolbarConfigurations.buttonOptions.subscript,
controller: globalController,
),
if (configurations.showSuperscript)
QuillToolbarToggleStyleButton(
attribute: Attribute.superscript,
options: toolbarConfigurations.buttonOptions.superscript,
controller: globalController,
),
if (configurations.showSmallButton)
QuillToolbarToggleStyleButton(
attribute: Attribute.small,
options: toolbarConfigurations.buttonOptions.small,
controller: globalController,
),
if (configurations.showColorButton)
QuillToolbarColorButton(
controller: globalController,
isBackground: false,
options: toolbarConfigurations.buttonOptions.color,
),
if (configurations.showBackgroundColorButton)
QuillToolbarColorButton(
options: toolbarConfigurations.buttonOptions.backgroundColor,
controller: globalController,
isBackground: true,
),
if (configurations.showClearFormat)
QuillToolbarClearFormatButton(
controller: globalController,
options: toolbarConfigurations.buttonOptions.clearFormat,
),
if (theEmbedButtons != null)
for (final builder in theEmbedButtons)
builder(
globalController,
globalIconSize ?? kDefaultIconSize,
context.quillToolbarBaseButtonOptions?.iconTheme,
configurations.dialogTheme),
],
[
if (configurations.showAlignmentButtons)
QuillToolbarSelectAlignmentButtons(
controller: globalController, controller: globalController,
options: toolbarConfigurations options: toolbarConfigurations
.buttonOptions.selectHeaderStyleDropdownButton, .buttonOptions.selectAlignmentButtons
) .copyWith(
else showLeftAlignment: configurations.showLeftAlignment,
QuillToolbarSelectHeaderStyleButtons( showCenterAlignment: configurations.showCenterAlignment,
showRightAlignment: configurations.showRightAlignment,
showJustifyAlignment: configurations.showJustifyAlignment,
),
),
if (configurations.showDirection)
QuillToolbarToggleStyleButton(
attribute: Attribute.rtl,
options: toolbarConfigurations.buttonOptions.direction,
controller: globalController, controller: globalController,
options:
toolbarConfigurations.buttonOptions.selectHeaderStyleButtons,
), ),
], ],
if (configurations.showDividers && [
configurations.showHeaderStyle && if (configurations.showLineHeightButton)
isButtonGroupShown[2] && QuillToolbarSelectLineHeightStyleDropdownButton(
(isButtonGroupShown[3] || controller: globalController,
isButtonGroupShown[4] || options: toolbarConfigurations
isButtonGroupShown[5])) .buttonOptions.selectLineHeightStyleDropdownButton,
divider, ),
if (configurations.showListNumbers) if (configurations.showHeaderStyle) ...[
QuillToolbarToggleStyleButton( if (configurations.headerStyleType.isOriginal)
attribute: Attribute.ol, QuillToolbarSelectHeaderStyleDropdownButton(
options: toolbarConfigurations.buttonOptions.listNumbers, controller: globalController,
controller: globalController, options: toolbarConfigurations
), .buttonOptions.selectHeaderStyleDropdownButton,
if (configurations.showListBullets) )
QuillToolbarToggleStyleButton( else
attribute: Attribute.ul, QuillToolbarSelectHeaderStyleButtons(
options: toolbarConfigurations.buttonOptions.listBullets, controller: globalController,
controller: globalController, options: toolbarConfigurations
), .buttonOptions.selectHeaderStyleButtons,
if (configurations.showListCheck) ),
QuillToolbarToggleCheckListButton( ],
options: toolbarConfigurations.buttonOptions.toggleCheckList, ],
controller: globalController, [
), if (configurations.showListNumbers)
if (configurations.showCodeBlock) QuillToolbarToggleStyleButton(
QuillToolbarToggleStyleButton( attribute: Attribute.ol,
attribute: Attribute.codeBlock, options: toolbarConfigurations.buttonOptions.listNumbers,
options: toolbarConfigurations.buttonOptions.codeBlock, controller: globalController,
controller: globalController, ),
), if (configurations.showListBullets)
if (configurations.showDividers && QuillToolbarToggleStyleButton(
isButtonGroupShown[3] && attribute: Attribute.ul,
(isButtonGroupShown[4] || isButtonGroupShown[5])) ...[ options: toolbarConfigurations.buttonOptions.listBullets,
divider, controller: globalController,
),
if (configurations.showListCheck)
QuillToolbarToggleCheckListButton(
options: toolbarConfigurations.buttonOptions.toggleCheckList,
controller: globalController,
),
if (configurations.showCodeBlock)
QuillToolbarToggleStyleButton(
attribute: Attribute.codeBlock,
options: toolbarConfigurations.buttonOptions.codeBlock,
controller: globalController,
),
],
[
if (configurations.showQuote)
QuillToolbarToggleStyleButton(
options: toolbarConfigurations.buttonOptions.quote,
controller: globalController,
attribute: Attribute.blockQuote,
),
if (configurations.showIndent)
QuillToolbarIndentButton(
controller: globalController,
isIncrease: true,
options: toolbarConfigurations.buttonOptions.indentIncrease,
),
if (configurations.showIndent)
QuillToolbarIndentButton(
controller: globalController,
isIncrease: false,
options: toolbarConfigurations.buttonOptions.indentDecrease,
),
], ],
if (configurations.showQuote) [
QuillToolbarToggleStyleButton( if (configurations.showLink)
options: toolbarConfigurations.buttonOptions.quote, toolbarConfigurations.linkStyleType.isOriginal
controller: globalController, ? QuillToolbarLinkStyleButton(
attribute: Attribute.blockQuote, controller: globalController,
), options: toolbarConfigurations.buttonOptions.linkStyle,
if (configurations.showIndent) )
QuillToolbarIndentButton( : QuillToolbarLinkStyleButton2(
controller: globalController, controller: globalController,
isIncrease: true, options: toolbarConfigurations.buttonOptions.linkStyle2,
options: toolbarConfigurations.buttonOptions.indentIncrease, ),
), if (configurations.showSearchButton)
if (configurations.showIndent) switch (configurations.searchButtonType) {
QuillToolbarIndentButton( SearchButtonType.legacy => QuillToolbarLegacySearchButton(
controller: globalController,
isIncrease: false,
options: toolbarConfigurations.buttonOptions.indentDecrease,
),
if (configurations.showDividers &&
isButtonGroupShown[4] &&
isButtonGroupShown[5])
divider,
if (configurations.showLink)
toolbarConfigurations.linkStyleType.isOriginal
? QuillToolbarLinkStyleButton(
controller: globalController, controller: globalController,
options: toolbarConfigurations.buttonOptions.linkStyle, options: toolbarConfigurations.buttonOptions.search,
) ),
: QuillToolbarLinkStyleButton2( SearchButtonType.modern => QuillToolbarSearchButton(
controller: globalController, controller: globalController,
options: toolbarConfigurations.buttonOptions.linkStyle2, options: toolbarConfigurations.buttonOptions.search,
), ),
if (configurations.showSearchButton) },
switch (configurations.searchButtonType) { if (configurations.showClipboardCut)
SearchButtonType.legacy => QuillToolbarLegacySearchButton( QuillToolbarClipboardButton(
controller: globalController, options: toolbarConfigurations.buttonOptions.clipboardCut,
options: toolbarConfigurations.buttonOptions.search, controller: globalController,
), clipboardAction: ClipboardAction.cut,
SearchButtonType.modern => QuillToolbarSearchButton( ),
controller: globalController, if (configurations.showClipboardCopy)
options: toolbarConfigurations.buttonOptions.search, QuillToolbarClipboardButton(
), options: toolbarConfigurations.buttonOptions.clipboardCopy,
}, controller: globalController,
if (configurations.showClipboardCut) clipboardAction: ClipboardAction.copy,
QuillToolbarClipboardButton( ),
options: toolbarConfigurations.buttonOptions.clipboardCut, if (configurations.showClipboardPaste)
controller: globalController, QuillToolbarClipboardButton(
clipboardAction: ClipboardAction.cut, options: toolbarConfigurations.buttonOptions.clipboardPaste,
), controller: globalController,
if (configurations.showClipboardCopy) clipboardAction: ClipboardAction.paste,
QuillToolbarClipboardButton( ),
options: toolbarConfigurations.buttonOptions.clipboardCopy, ],
controller: globalController, [
clipboardAction: ClipboardAction.copy,
),
if (configurations.showClipboardPaste)
QuillToolbarClipboardButton(
options: toolbarConfigurations.buttonOptions.clipboardPaste,
controller: globalController,
clipboardAction: ClipboardAction.paste,
),
if (configurations.customButtons.isNotEmpty) ...[
if (configurations.showDividers) divider,
for (final customButton in configurations.customButtons) for (final customButton in configurations.customButtons)
QuillToolbarCustomButton( QuillToolbarCustomButton(
options: customButton, options: customButton,
@ -320,6 +273,21 @@ class QuillSimpleToolbar extends StatelessWidget
), ),
], ],
]; ];
final buttonsAll = <Widget>[];
for (var i = 0; i < groups.length; i++) {
final buttons = groups[i];
if (buttons.isNotEmpty) {
if (buttonsAll.isNotEmpty) {
buttonsAll.add(divider);
}
buttonsAll.addAll(buttons);
}
}
return buttonsAll;
} }
return QuillSimpleToolbarProvider( return QuillSimpleToolbarProvider(

2
pubspec.yaml
Unescape View File

@ -1,6 +1,6 @@
name: flutter_quill 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. 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: 10.0.9 version: 10.1.1
homepage: https://1o24bbs.com/c/bulletjournal/108/ homepage: https://1o24bbs.com/c/bulletjournal/108/
repository: https://github.com/singerdmx/flutter-quill/ repository: https://github.com/singerdmx/flutter-quill/
issue_tracker: https://github.com/singerdmx/flutter-quill/issues/ issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

Write Preview
Loading…
Cancel
Save