Merge branch 'master' of github.com:singerdmx/flutter-quill into prefer-const-constructors-in-immutables

analysis_options.yaml

@@ -7,5 +7,8 @@ analyzer:
     unsafe_html: ignore
 linter:
   rules:
+    - always_put_required_named_parameters_first
     - avoid_print
+    - avoid_redundant_argument_values
+    - prefer_const_constructors
     - prefer_const_constructors_in_immutables

example/lib/pages/home_page.dart

@@ -110,7 +110,6 @@ class _HomePageState extends State<HomePage> {
                 autoFocus: false,
                 readOnly: false,
                 placeholder: 'Add content',
-                enableInteractiveSelection: true,
                 expands: false,
                 padding: EdgeInsets.zero,
                 customStyles: DefaultStyles(

example/lib/pages/read_only_page.dart

@@ -42,7 +42,6 @@ class _ReadOnlyPageState extends State<ReadOnlyPage> {
           focusNode: _focusNode,
           autoFocus: true,
           readOnly: !_edit,
-          enableInteractiveSelection: true,
           expands: false,
           padding: EdgeInsets.zero,
         ),

lib/models/documents/document.dart

@@ -183,7 +183,7 @@ class Document {
     bool nextOpIsImage =
         i + 1 < ops.length && ops[i + 1].isInsert && ops[i + 1].data is! String;
     if (nextOpIsImage && !(op.data as String).endsWith('\n')) {
-      res.push(Operation.insert('\n', null));
+      res.push(Operation.insert('\n'));
     }
     // Currently embed is equivalent to image and hence `is! String`
     bool opInsertImage = op.isInsert && op.data is! String;
@@ -193,7 +193,7 @@ class Document {
         (ops[i + 1].data as String).startsWith('\n');
     if (opInsertImage && (i + 1 == ops.length - 1 || !nextOpIsLineBreak)) {
       // automatically append '\n' for image
-      res.push(Operation.insert('\n', null));
+      res.push(Operation.insert('\n'));
     }
   }
 
@@ -213,7 +213,7 @@ class Document {
     _history.clear();
   }
 
-  String toPlainText() => _root.children.map((e) => e.toPlainText()).join('');
+  String toPlainText() => _root.children.map((e) => e.toPlainText()).join();
 
   void _loadDocument(Delta doc) {
     assert((doc.last.data as String).endsWith('\n'));

lib/models/documents/history.dart

@@ -86,7 +86,7 @@ class History {
 
   Tuple2 _change(Document doc, List<Delta> source, List<Delta> dest) {
     if (source.isEmpty) {
-      return Tuple2(false, 0);
+      return const Tuple2(false, 0);
     }
     Delta delta = source.removeLast();
     // look for insert or delete

lib/models/quill_delta.dart

@@ -294,7 +294,7 @@ class Delta {
     if (other is! Delta) return false;
     Delta typedOther = other;
     final comparator =
-        ListEquality<Operation>(const DefaultEquality<Operation>());
+        const ListEquality<Operation>(DefaultEquality<Operation>());
     return comparator.equals(_operations, typedOther._operations);
   }
 
@@ -520,7 +520,7 @@ class Delta {
       if (op.isInsert) {
         inverted.delete(op.length!);
       } else if (op.isRetain && op.isPlain) {
-        inverted.retain(op.length!, null);
+        inverted.retain(op.length!);
         baseIndex += op.length!;
       } else if (op.isDelete || (op.isRetain && op.isNotPlain)) {
         final length = op.length!;

lib/models/rules/insert.dart

@@ -378,5 +378,5 @@ Tuple2<Operation?, int?> _getNextNewLine(DeltaIterator iterator) {
       return Tuple2(op, skipped);
     }
   }
-  return Tuple2(null, null);
+  return const Tuple2(null, null);
 }

lib/models/rules/rule.dart

@@ -29,21 +29,21 @@ abstract class Rule {
 class Rules {
   final List<Rule> _rules;
   static final Rules _instance = Rules([
-    FormatLinkAtCaretPositionRule(),
+    const FormatLinkAtCaretPositionRule(),
-    ResolveLineFormatRule(),
+    const ResolveLineFormatRule(),
-    ResolveInlineFormatRule(),
+    const ResolveInlineFormatRule(),
-    InsertEmbedsRule(),
+    const InsertEmbedsRule(),
-    ForceNewlineForInsertsAroundEmbedRule(),
+    const ForceNewlineForInsertsAroundEmbedRule(),
-    AutoExitBlockRule(),
+    const AutoExitBlockRule(),
-    PreserveBlockStyleOnInsertRule(),
+    const PreserveBlockStyleOnInsertRule(),
-    PreserveLineStyleOnSplitRule(),
+    const PreserveLineStyleOnSplitRule(),
-    ResetLineFormatOnNewLineRule(),
+    const ResetLineFormatOnNewLineRule(),
-    AutoFormatLinksRule(),
+    const AutoFormatLinksRule(),
-    PreserveInlineStylesRule(),
+    const PreserveInlineStylesRule(),
-    CatchAllInsertRule(),
+    const CatchAllInsertRule(),
-    EnsureEmbedLineRule(),
+    const EnsureEmbedLineRule(),
-    PreserveLineStyleOnMergeRule(),
+    const PreserveLineStyleOnMergeRule(),
-    CatchAllDeleteRule(),
+    const CatchAllDeleteRule(),
   ]);
 
   Rules(this._rules);

lib/widgets/controller.dart

@@ -18,7 +18,9 @@ class QuillController extends ChangeNotifier {
 
   factory QuillController.basic() {
     return QuillController(
-        document: Document(), selection: TextSelection.collapsed(offset: 0));
+      document: Document(),
+      selection: const TextSelection.collapsed(offset: 0),
+    );
   }
 
   // item1: Document state before [change].
@@ -31,7 +33,6 @@ class QuillController extends ChangeNotifier {
   TextEditingValue get plainTextEditingValue => TextEditingValue(
         text: document.toPlainText(),
         selection: selection,
-        composing: TextRange.empty,
       );
 
   Style getSelectionStyle() {
@@ -73,7 +74,8 @@ class QuillController extends ChangeNotifier {
 
   bool get hasRedo => document.hasRedo;
 
-  void replaceText(int index, int len, Object? data, TextSelection? textSelection) {
+  void replaceText(
+      int index, int len, Object? data, TextSelection? textSelection) {
     assert(data is String || data is Embeddable);
 
     Delta? delta;

lib/widgets/cursor.dart

@@ -109,7 +109,8 @@ class CursorCont extends ChangeNotifier {
 
   void _cursorWaitForStart(Timer timer) {
     _cursorTimer?.cancel();
-    _cursorTimer = Timer.periodic(Duration(milliseconds: 500), _cursorTick);
+    _cursorTimer =
+        Timer.periodic(const Duration(milliseconds: 500), _cursorTick);
   }
 
   void startCursorTimer() {
@@ -117,10 +118,11 @@ class CursorCont extends ChangeNotifier {
     _blinkOpacityCont.value = 1.0;
 
     if (style.opacityAnimates) {
-      _cursorTimer =
+      _cursorTimer = Timer.periodic(
-          Timer.periodic(Duration(milliseconds: 150), _cursorWaitForStart);
+          const Duration(milliseconds: 150), _cursorWaitForStart);
     } else {
-      _cursorTimer = Timer.periodic(Duration(milliseconds: 500), _cursorTick);
+      _cursorTimer =
+          Timer.periodic(const Duration(milliseconds: 500), _cursorTick);
     }
   }
 

lib/widgets/default_styles.dart

@@ -6,9 +6,9 @@ class QuillStyles extends InheritedWidget {
   final DefaultStyles data;
 
   const QuillStyles({
-    Key? key,
     required this.data,
     required Widget child,
+    Key? key,
   }) : super(key: key, child: child);
 
   @override
@@ -86,7 +86,7 @@ class DefaultStyles {
       fontSize: 16.0,
       height: 1.3,
     );
-    Tuple2<double, double> baseSpacing = Tuple2(6.0, 0);
+    Tuple2<double, double> baseSpacing = const Tuple2(6.0, 0);
     String fontFamily;
     switch (themeData.platform) {
       case TargetPlatform.iOS:
@@ -111,8 +111,8 @@ class DefaultStyles {
               height: 1.15,
               fontWeight: FontWeight.w300,
             ),
-            Tuple2(16.0, 0.0),
+            const Tuple2(16.0, 0.0),
-            Tuple2(0.0, 0.0),
+            const Tuple2(0.0, 0.0),
             null),
         h2: DefaultTextBlockStyle(
             defaultTextStyle.style.copyWith(
@@ -121,8 +121,8 @@ class DefaultStyles {
               height: 1.15,
               fontWeight: FontWeight.normal,
             ),
-            Tuple2(8.0, 0.0),
+            const Tuple2(8.0, 0.0),
-            Tuple2(0.0, 0.0),
+            const Tuple2(0.0, 0.0),
             null),
         h3: DefaultTextBlockStyle(
             defaultTextStyle.style.copyWith(
@@ -131,15 +131,15 @@ class DefaultStyles {
               height: 1.25,
               fontWeight: FontWeight.w500,
             ),
-            Tuple2(8.0, 0.0),
+            const Tuple2(8.0, 0.0),
-            Tuple2(0.0, 0.0),
+            const Tuple2(0.0, 0.0),
             null),
         paragraph: DefaultTextBlockStyle(
-            baseStyle, Tuple2(0.0, 0.0), Tuple2(0.0, 0.0), null),
+            baseStyle, const Tuple2(0.0, 0.0), const Tuple2(0.0, 0.0), null),
-        bold: TextStyle(fontWeight: FontWeight.bold),
+        bold: const TextStyle(fontWeight: FontWeight.bold),
-        italic: TextStyle(fontStyle: FontStyle.italic),
+        italic: const TextStyle(fontStyle: FontStyle.italic),
-        underline: TextStyle(decoration: TextDecoration.underline),
+        underline: const TextStyle(decoration: TextDecoration.underline),
-        strikeThrough: TextStyle(decoration: TextDecoration.lineThrough),
+        strikeThrough: const TextStyle(decoration: TextDecoration.lineThrough),
         link: TextStyle(
           color: themeData.accentColor,
           decoration: TextDecoration.underline,
@@ -150,15 +150,15 @@ class DefaultStyles {
               height: 1.5,
               color: Colors.grey.withOpacity(0.6),
             ),
-            Tuple2(0.0, 0.0),
+            const Tuple2(0.0, 0.0),
-            Tuple2(0.0, 0.0),
+            const Tuple2(0.0, 0.0),
             null),
         lists: DefaultTextBlockStyle(
-            baseStyle, baseSpacing, Tuple2(0.0, 6.0), null),
+            baseStyle, baseSpacing, const Tuple2(0.0, 6.0), null),
         quote: DefaultTextBlockStyle(
             TextStyle(color: baseStyle.color!.withOpacity(0.6)),
             baseSpacing,
-            Tuple2(6.0, 2.0),
+            const Tuple2(6.0, 2.0),
             BoxDecoration(
               border: Border(
                 left: BorderSide(width: 4, color: Colors.grey.shade300),
@@ -172,18 +172,18 @@ class DefaultStyles {
               height: 1.15,
             ),
             baseSpacing,
-            Tuple2(0.0, 0.0),
+            const Tuple2(0.0, 0.0),
             BoxDecoration(
               color: Colors.grey.shade50,
               borderRadius: BorderRadius.circular(2),
             )),
         indent: DefaultTextBlockStyle(
-            baseStyle, baseSpacing, Tuple2(0.0, 6.0), null),
+            baseStyle, baseSpacing, const Tuple2(0.0, 6.0), null),
         align: DefaultTextBlockStyle(
-            baseStyle, Tuple2(0.0, 0.0), Tuple2(0.0, 0.0), null),
+            baseStyle, const Tuple2(0.0, 0.0), const Tuple2(0.0, 0.0), null),
-        sizeSmall: TextStyle(fontSize: 10.0),
+        sizeSmall: const TextStyle(fontSize: 10.0),
-        sizeLarge: TextStyle(fontSize: 18.0),
+        sizeLarge: const TextStyle(fontSize: 18.0),
-        sizeHuge: TextStyle(fontSize: 22.0));
+        sizeHuge: const TextStyle(fontSize: 22.0));
   }
 
   DefaultStyles merge(DefaultStyles other) {

lib/widgets/editor.dart

@@ -176,14 +176,14 @@ class QuillEditor extends StatefulWidget {
       required this.scrollable,
       required this.padding,
       required this.autoFocus,
-      this.showCursor,
       required this.readOnly,
+      required this.expands,
+      this.showCursor,
       this.placeholder,
       this.enableInteractiveSelection = true,
       this.minHeight,
       this.maxHeight,
       this.customStyles,
-      required this.expands,
       this.textCapitalization = TextCapitalization.sentences,
       this.keyboardAppearance = Brightness.light,
       this.scrollPhysics,
@@ -200,7 +200,6 @@ class QuillEditor extends StatefulWidget {
         focusNode: FocusNode(),
         autoFocus: true,
         readOnly: readOnly,
-        enableInteractiveSelection: true,
         expands: false,
         padding: EdgeInsets.zero);
   }
@@ -726,8 +725,7 @@ class RenderEditor extends RenderEditableContainerBox
     );
     if (position.offset - word.start <= 1) {
       _handleSelectionChange(
-        TextSelection.collapsed(
+        TextSelection.collapsed(offset: word.start),
-            offset: word.start, affinity: TextAffinity.downstream),
         cause,
       );
     } else {
@@ -866,6 +864,11 @@ class RenderEditor extends RenderEditableContainerBox
     );
   }
 
+  /// Returns the y-offset of the editor at which [selection] is visible.
+  ///
+  /// The offset is the distance from the top of the editor and is the minimum
+  /// from the current scroll position until [selection] becomes visible.
+  /// Returns null if [selection] is already visible.
   double? getOffsetToRevealCursor(
       double viewportHeight, double scrollOffset, double offsetInViewport) {
     List<TextSelectionPoint> endpoints = getEndpointsForSelection(selection);

lib/widgets/proxy.dart

@@ -113,7 +113,7 @@ class RenderEmbedProxy extends RenderProxyBox implements RenderContentProxyBox {
 
   @override
   TextRange getWordBoundary(TextPosition position) =>
-      TextRange(start: 0, end: 1);
+      const TextRange(start: 0, end: 1);
 
   @override
   double getPreferredLineHeight() {

lib/widgets/raw_editor.dart

@@ -382,8 +382,6 @@ class RawEditorState extends EditorState
         TextInputConfiguration(
           inputType: TextInputType.multiline,
           readOnly: widget.readOnly,
-          obscureText: false,
-          autocorrect: true,
           inputAction: TextInputAction.newline,
           keyboardAppearance: widget.keyboardAppearance,
           textCapitalization: widget.textCapitalization,
@@ -554,7 +552,7 @@ class RawEditorState extends EditorState
     }
 
     BoxConstraints constraints = widget.expands
-        ? BoxConstraints.expand()
+        ? const BoxConstraints.expand()
         : BoxConstraints(
             minHeight: widget.minHeight ?? 0.0,
             maxHeight: widget.maxHeight ?? double.infinity);
@@ -602,7 +600,7 @@ class RawEditorState extends EditorState
             widget.enableInteractiveSelection,
             _hasFocus,
             attrs.containsKey(Attribute.codeBlock.key)
-                ? EdgeInsets.all(16.0)
+                ? const EdgeInsets.all(16.0)
                 : null,
             widget.embedBuilder,
             _cursorCont,
@@ -702,6 +700,7 @@ class RawEditorState extends EditorState
       _keyboardVisible = true;
     } else {
       _keyboardVisibilityController = KeyboardVisibilityController();
+      _keyboardVisible = _keyboardVisibilityController!.isVisible;
       _keyboardVisibilitySubscription =
           _keyboardVisibilityController?.onChange.listen((bool visible) {
         _keyboardVisible = visible;
@@ -817,7 +816,8 @@ class RawEditorState extends EditorState
     String plainText = textEditingValue.text;
     if (shortcut == InputShortcut.COPY) {
       if (!selection.isCollapsed) {
-        await Clipboard.setData(ClipboardData(text: selection.textInside(plainText)));
+        await Clipboard.setData(
+            ClipboardData(text: selection.textInside(plainText)));
       }
       return;
     }
@@ -985,7 +985,7 @@ class RawEditorState extends EditorState
 
       final viewport = RenderAbstractViewport.of(getRenderEditor())!;
       final editorOffset = getRenderEditor()!
-          .localToGlobal(Offset(0.0, 0.0), ancestor: viewport);
+          .localToGlobal(const Offset(0.0, 0.0), ancestor: viewport);
       final offsetInViewport = _scrollController!.offset + editorOffset.dy;
 
       final offset = getRenderEditor()!.getOffsetToRevealCursor(
@@ -997,7 +997,7 @@ class RawEditorState extends EditorState
       if (offset != null) {
         _scrollController!.animateTo(
           offset,
-          duration: Duration(milliseconds: 100),
+          duration: const Duration(milliseconds: 100),
           curve: Curves.fastOutSlowIn,
         );
       }
@@ -1151,16 +1151,17 @@ class _Editor extends MultiChildRenderObjectWidget {
   @override
   RenderEditor createRenderObject(BuildContext context) {
     return RenderEditor(
-        null,
+      null,
-        textDirection,
+      textDirection,
-        padding,
+      padding,
-        document,
+      document,
-        selection,
+      selection,
-        hasFocus,
+      hasFocus,
-        onSelectionChanged,
+      onSelectionChanged,
-        startHandleLayerLink,
+      startHandleLayerLink,
-        endHandleLayerLink,
+      endHandleLayerLink,
-        EdgeInsets.fromLTRB(4, 4, 4, 5));
+      const EdgeInsets.fromLTRB(4, 4, 4, 5),
+    );
   }
 
   @override

lib/widgets/responsive_widget.dart

@@ -5,12 +5,12 @@ class ResponsiveWidget extends StatelessWidget {
   final Widget? mediumScreen;
   final Widget? smallScreen;
 
-  const ResponsiveWidget(
+  const ResponsiveWidget({
-      {Key? key,
+    required this.largeScreen,
-      required this.largeScreen,
+    this.mediumScreen,
-      this.mediumScreen,
+    this.smallScreen,
-      this.smallScreen})
+    Key? key,
-      : super(key: key);
+  }) : super(key: key);
 
   static bool isSmallScreen(BuildContext context) {
     return MediaQuery.of(context).size.width < 800;

lib/widgets/text_block.dart

@@ -84,7 +84,7 @@ class EditableTextBlock extends StatelessWidget {
         block,
         textDirection,
         verticalSpacing as Tuple2<double, double>,
-        _getDecorationForBlock(block, defaultStyles) ?? BoxDecoration(),
+        _getDecorationForBlock(block, defaultStyles) ?? const BoxDecoration(),
         contentPadding,
         _buildChildren(context, indentLevelCounts));
   }
@@ -253,11 +253,11 @@ class EditableTextBlock extends StatelessWidget {
 class RenderEditableTextBlock extends RenderEditableContainerBox
     implements RenderEditableBox {
   RenderEditableTextBlock({
-    List<RenderEditableBox>? children,
     required Block block,
     required TextDirection textDirection,
     required EdgeInsetsGeometry padding,
     required Decoration decoration,
+    List<RenderEditableBox>? children,
     ImageConfiguration configuration = ImageConfiguration.empty,
     EdgeInsets contentPadding = EdgeInsets.zero,
   })  : _decoration = decoration,
@@ -402,7 +402,8 @@ class RenderEditableTextBlock extends RenderEditableContainerBox
     }
 
     Offset caretOffset = child.getOffsetForCaret(childLocalPosition);
-    Offset testOffset = sibling.getOffsetForCaret(TextPosition(offset: 0));
+    Offset testOffset =
+        sibling.getOffsetForCaret(const TextPosition(offset: 0));
     Offset finalOffset = Offset(caretOffset.dx, testOffset.dy);
     return TextPosition(
         offset: sibling.getContainer().getOffset() +
@@ -558,7 +559,6 @@ class _NumberPoint extends StatelessWidget {
   final double padding;
 
   const _NumberPoint({
-    Key? key,
     required this.index,
     required this.indentLevelCounts,
     required this.count,
@@ -567,6 +567,7 @@ class _NumberPoint extends StatelessWidget {
     required this.attrs,
     this.withDot = true,
     this.padding = 0.0,
+    Key? key,
   }) : super(key: key);
 
   @override
@@ -623,7 +624,7 @@ class _NumberPoint extends StatelessWidget {
       n = (n / 26).floor();
     }
 
-    return result.toString().split('').reversed.join('');
+    return result.toString().split('').reversed.join();
   }
 
   String _intToRoman(int input) {
@@ -656,9 +657,9 @@ class _BulletPoint extends StatelessWidget {
   final double width;
 
   const _BulletPoint({
-    Key? key,
     required this.style,
     required this.width,
+    Key? key,
   }) : super(key: key);
 
   @override
@@ -666,7 +667,7 @@ class _BulletPoint extends StatelessWidget {
     return Container(
       alignment: AlignmentDirectional.topEnd,
       width: width,
-      padding: EdgeInsetsDirectional.only(end: 13.0),
+      padding: const EdgeInsetsDirectional.only(end: 13.0),
       child: Text('•', style: style),
     );
   }
@@ -707,7 +708,7 @@ class __CheckboxState extends State<_Checkbox> {
     return Container(
       alignment: AlignmentDirectional.topEnd,
       width: widget.width,
-      padding: EdgeInsetsDirectional.only(end: 13.0),
+      padding: const EdgeInsetsDirectional.only(end: 13.0),
       child: Checkbox(
         value: widget.isChecked,
         onChanged: _onCheckboxClicked,

lib/widgets/text_line.dart

@@ -27,13 +27,13 @@ class TextLine extends StatelessWidget {
   final EmbedBuilder embedBuilder;
   final DefaultStyles styles;
 
-  const TextLine(
+  const TextLine({
-      {Key? key,
+    required this.line,
-      required this.line,
+    required this.embedBuilder,
-      this.textDirection,
+    required this.styles,
-      required this.embedBuilder,
+    this.textDirection,
-      required this.styles})
+    Key? key,
-      : super(key: key);
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -87,7 +87,7 @@ class TextLine extends StatelessWidget {
         .map((node) => _getTextSpanFromNode(defaultStyles, node))
         .toList(growable: false);
 
-    TextStyle textStyle = TextStyle();
+    TextStyle textStyle = const TextStyle();
 
     if (line.style.containsKey(Attribute.placeholder.key)) {
       textStyle = defaultStyles.placeHolder!.style;
@@ -121,7 +121,7 @@ class TextLine extends StatelessWidget {
   TextSpan _getTextSpanFromNode(DefaultStyles defaultStyles, Node node) {
     leaf.Text textNode = node as leaf.Text;
     Style style = textNode.style;
-    TextStyle res = TextStyle();
+    TextStyle res = const TextStyle();
 
     Map<String, TextStyle?> m = {
       Attribute.bold.key: defaultStyles.bold,
@@ -534,7 +534,8 @@ class RenderEditableTextLine extends RenderEditableBox {
   double get cursorWidth => cursorCont.style.width;
 
   double get cursorHeight =>
-      cursorCont.style.height ?? preferredLineHeight(TextPosition(offset: 0));
+      cursorCont.style.height ??
+      preferredLineHeight(const TextPosition(offset: 0));
 
   void _computeCaretPrototype() {
     switch (defaultTargetPlatform) {
@@ -839,7 +840,8 @@ class _TextLineElement extends RenderObjectElement {
   }
 
   @override
-  void moveRenderObjectChild(RenderObject child, dynamic oldSlot, dynamic newSlot) {
+  void moveRenderObjectChild(
+      RenderObject child, dynamic oldSlot, dynamic newSlot) {
     throw UnimplementedError();
   }
 

lib/widgets/text_selection.dart

@@ -58,7 +58,7 @@ class EditorTextSelectionOverlay {
     OverlayState overlay = Overlay.of(context, rootOverlay: true)!;
 
     _toolbarController = AnimationController(
-        duration: Duration(milliseconds: 150), vsync: overlay);
+        duration: const Duration(milliseconds: 150), vsync: overlay);
   }
 
   TextSelection get _selection => value.selection;
@@ -143,13 +143,14 @@ class EditorTextSelectionOverlay {
     TextPosition textPosition;
     switch (position) {
       case _TextSelectionHandlePosition.START:
-        textPosition =
+        textPosition = newSelection != null
-            newSelection != null ? newSelection.base : TextPosition(offset: 0);
+            ? newSelection.base
+            : const TextPosition(offset: 0);
         break;
       case _TextSelectionHandlePosition.END:
         textPosition = newSelection != null
             ? newSelection.extent
-            : TextPosition(offset: 0);
+            : const TextPosition(offset: 0);
         break;
       default:
         throw ('Invalid position');
@@ -198,7 +199,7 @@ class EditorTextSelectionOverlay {
             endpoints,
             selectionDelegate,
             clipboardStatus,
-            Offset(0, 0)),
+            const Offset(0, 0)),
       ),
     );
   }
@@ -245,7 +246,6 @@ class EditorTextSelectionOverlay {
 
 class _TextSelectionHandleOverlay extends StatefulWidget {
   const _TextSelectionHandleOverlay({
-    Key? key,
     required this.selection,
     required this.position,
     required this.startHandleLayerLink,
@@ -255,6 +255,7 @@ class _TextSelectionHandleOverlay extends StatefulWidget {
     required this.onSelectionHandleTapped,
     required this.selectionControls,
     this.dragStartBehavior = DragStartBehavior.start,
+    Key? key,
   }) : super(key: key);
 
   final TextSelection selection;
@@ -292,8 +293,8 @@ class _TextSelectionHandleOverlayState
   void initState() {
     super.initState();
 
-    _controller =
+    _controller = AnimationController(
-        AnimationController(duration: Duration(milliseconds: 150), vsync: this);
+        duration: const Duration(milliseconds: 150), vsync: this);
 
     _handleVisibilityChanged();
     widget._visibility!.addListener(_handleVisibilityChanged);
@@ -468,7 +469,7 @@ class _TextSelectionHandleOverlayState
 
 class EditorTextSelectionGestureDetector extends StatefulWidget {
   const EditorTextSelectionGestureDetector({
-    Key? key,
+    required this.child,
     this.onTapDown,
     this.onForcePressStart,
     this.onForcePressEnd,
@@ -482,7 +483,7 @@ class EditorTextSelectionGestureDetector extends StatefulWidget {
     this.onDragSelectionUpdate,
     this.onDragSelectionEnd,
     this.behavior,
-    required this.child,
+    Key? key,
   }) : super(key: key);
 
   final GestureTapDownCallback? onTapDown;
@@ -579,7 +580,7 @@ class _EditorTextSelectionGestureDetectorState
   void _handleDragUpdate(DragUpdateDetails details) {
     _lastDragUpdateDetails = details;
     _dragUpdateThrottleTimer ??=
-        Timer(Duration(milliseconds: 50), _handleDragUpdateThrottled);
+        Timer(const Duration(milliseconds: 50), _handleDragUpdateThrottled);
   }
 
   void _handleDragUpdateThrottled() {

lib/widgets/toolbar.dart

@@ -25,9 +25,9 @@ class InsertEmbedButton extends StatelessWidget {
   final IconData icon;
 
   const InsertEmbedButton({
-    Key? key,
     required this.controller,
     required this.icon,
+    Key? key,
   }) : super(key: key);
 
   @override
@@ -56,9 +56,9 @@ class LinkStyleButton extends StatefulWidget {
   final IconData? icon;
 
   const LinkStyleButton({
-    Key? key,
     required this.controller,
     this.icon,
+    Key? key,
   }) : super(key: key);
 
   @override
@@ -114,7 +114,7 @@ class _LinkStyleButtonState extends State<LinkStyleButton> {
     showDialog<String>(
       context: context,
       builder: (ctx) {
-        return _LinkDialog();
+        return const _LinkDialog();
       },
     ).then(_linkSubmitted);
   }
@@ -141,14 +141,14 @@ class _LinkDialogState extends State<_LinkDialog> {
   Widget build(BuildContext context) {
     return AlertDialog(
       content: TextField(
-        decoration: InputDecoration(labelText: 'Paste a link'),
+        decoration: const InputDecoration(labelText: 'Paste a link'),
         autofocus: true,
         onChanged: _linkChanged,
       ),
       actions: [
         TextButton(
           onPressed: _link.isNotEmpty ? _applyLink : null,
-          child: Text('Apply'),
+          child: const Text('Apply'),
         ),
       ],
     );
@@ -183,11 +183,11 @@ class ToggleStyleButton extends StatefulWidget {
   final ToggleStyleButtonBuilder childBuilder;
 
   const ToggleStyleButton({
-    Key? key,
     required this.attribute,
     required this.icon,
     required this.controller,
     this.childBuilder = defaultToggleStyleButtonBuilder,
+    Key? key,
   }) : super(key: key);
 
   @override
@@ -267,11 +267,11 @@ class ToggleCheckListButton extends StatefulWidget {
   final Attribute attribute;
 
   const ToggleCheckListButton({
-    Key? key,
     required this.icon,
     required this.controller,
-    this.childBuilder = defaultToggleStyleButtonBuilder,
     required this.attribute,
+    this.childBuilder = defaultToggleStyleButtonBuilder,
+    Key? key,
   }) : super(key: key);
 
   @override
@@ -371,7 +371,7 @@ Widget defaultToggleStyleButtonBuilder(
 class SelectHeaderStyleButton extends StatefulWidget {
   final QuillController controller;
 
-  const SelectHeaderStyleButton({Key? key, required this.controller})
+  const SelectHeaderStyleButton({required this.controller, Key? key})
       : super(key: key);
 
   @override
@@ -430,7 +430,7 @@ class _SelectHeaderStyleButtonState extends State<SelectHeaderStyleButton> {
 
 Widget _selectHeadingStyleButtonBuilder(BuildContext context, Attribute? value,
     ValueChanged<Attribute?> onSelected) {
-  final style = TextStyle(fontSize: 13);
+  final style = const TextStyle(fontSize: 13);
 
   final Map<Attribute, String> _valueToText = {
     Attribute.header: 'Normal text',
@@ -478,7 +478,7 @@ Widget _selectHeadingStyleButtonBuilder(BuildContext context, Attribute? value,
                   : (value.key == 'h2')
                       ? Attribute.h2
                       : Attribute.h3]!,
-      style: TextStyle(fontSize: 13, fontWeight: FontWeight.w600),
+      style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w600),
     ),
   );
 }
@@ -494,14 +494,14 @@ class ImageButton extends StatefulWidget {
 
   final ImageSource imageSource;
 
-  const ImageButton(
+  const ImageButton({
-      {Key? key,
+    required this.icon,
-      required this.icon,
+    required this.controller,
-      required this.controller,
+    required this.imageSource,
-      required this.imageSource,
+    this.onImagePickCallback,
-      this.onImagePickCallback,
+    this.imagePickImpl,
-      this.imagePickImpl})
+    Key? key,
-      : super(key: key);
+  }) : super(key: key);
 
   @override
   _ImageButtonState createState() => _ImageButtonState();
@@ -525,7 +525,6 @@ class _ImageButtonState extends State<ImageButton> {
   Future<String?> _pickImageWeb() async {
     _paths = (await FilePicker.platform.pickFiles(
       type: _pickingType,
-      allowMultiple: false,
       allowedExtensions: (_extension?.isNotEmpty ?? false)
           ? _extension?.replaceAll(' ', '').split(',')
           : null,
@@ -601,12 +600,12 @@ class ColorButton extends StatefulWidget {
   final bool background;
   final QuillController controller;
 
-  const ColorButton(
+  const ColorButton({
-      {Key? key,
+    required this.icon,
-      required this.icon,
+    required this.controller,
-      required this.controller,
+    required this.background,
-      required this.background})
+    Key? key,
-      : super(key: key);
+  }) : super(key: key);
 
   @override
   _ColorButtonState createState() => _ColorButtonState();
@@ -726,7 +725,7 @@ class _ColorButtonState extends State<ColorButton> {
           backgroundColor: Theme.of(context).canvasColor,
           content: SingleChildScrollView(
             child: MaterialPicker(
-              pickerColor: Color(0x00000000),
+              pickerColor: const Color(0x00000000),
               onColorChanged: _changeColor,
             ),
           )),
@@ -739,12 +738,12 @@ class HistoryButton extends StatefulWidget {
   final bool undo;
   final QuillController controller;
 
-  const HistoryButton(
+  const HistoryButton({
-      {Key? key,
+    required this.icon,
-      required this.icon,
+    required this.controller,
-      required this.controller,
+    required this.undo,
-      required this.undo})
+    Key? key,
-      : super(key: key);
+  }) : super(key: key);
 
   @override
   _HistoryButtonState createState() => _HistoryButtonState();
@@ -811,12 +810,12 @@ class IndentButton extends StatefulWidget {
   final QuillController controller;
   final bool isIncrease;
 
-  const IndentButton(
+  const IndentButton({
-      {Key? key,
+    required this.icon,
-      required this.icon,
+    required this.controller,
-      required this.controller,
+    required this.isIncrease,
-      required this.isIncrease})
+    Key? key,
-      : super(key: key);
+  }) : super(key: key);
 
   @override
   _IndentButtonState createState() => _IndentButtonState();
@@ -867,7 +866,7 @@ class ClearFormatButton extends StatefulWidget {
   final QuillController controller;
 
   const ClearFormatButton(
-      {Key? key, required this.icon, required this.controller})
+      {required this.icon, required this.controller, Key? key,})
       : super(key: key);
 
   @override
@@ -898,30 +897,31 @@ class _ClearFormatButtonState extends State<ClearFormatButton> {
 class QuillToolbar extends StatefulWidget implements PreferredSizeWidget {
   final List<Widget> children;
 
-  const QuillToolbar({Key? key, required this.children}) : super(key: key);
+  const QuillToolbar({required this.children, Key? key}) : super(key: key);
-
+
-  factory QuillToolbar.basic(
+  factory QuillToolbar.basic({
-      {Key? key,
+    required QuillController controller,
-      required QuillController controller,
+    double toolbarIconSize = 18.0,
-      double toolbarIconSize = 18.0,
+    bool showBoldButton = true,
-      bool showBoldButton = true,
+    bool showItalicButton = true,
-      bool showItalicButton = true,
+    bool showUnderLineButton = true,
-      bool showUnderLineButton = true,
+    bool showStrikeThrough = true,
-      bool showStrikeThrough = true,
+    bool showColorButton = true,
-      bool showColorButton = true,
+    bool showBackgroundColorButton = true,
-      bool showBackgroundColorButton = true,
+    bool showClearFormat = true,
-      bool showClearFormat = true,
+    bool showHeaderStyle = true,
-      bool showHeaderStyle = true,
+    bool showListNumbers = true,
-      bool showListNumbers = true,
+    bool showListBullets = true,
-      bool showListBullets = true,
+    bool showListCheck = true,
-      bool showListCheck = true,
+    bool showCodeBlock = true,
-      bool showCodeBlock = true,
+    bool showQuote = true,
-      bool showQuote = true,
+    bool showIndent = true,
-      bool showIndent = true,
+    bool showLink = true,
-      bool showLink = true,
+    bool showHistory = true,
-      bool showHistory = true,
+    bool showHorizontalRule = false,
-      bool showHorizontalRule = false,
+    OnImagePickCallback? onImagePickCallback,
-      OnImagePickCallback? onImagePickCallback}) {
+    Key? key,
+  }) {
     iconSize = toolbarIconSize;
     return QuillToolbar(key: key, children: [
       Visibility(
@@ -940,7 +940,7 @@ class QuillToolbar extends StatefulWidget implements PreferredSizeWidget {
           undo: false,
         ),
       ),
-      SizedBox(width: 0.6),
+      const SizedBox(width: 0.6),
       Visibility(
         visible: showBoldButton,
         child: ToggleStyleButton(
@@ -949,7 +949,7 @@ class QuillToolbar extends StatefulWidget implements PreferredSizeWidget {
           controller: controller,
         ),
       ),
-      SizedBox(width: 0.6),
+      const SizedBox(width: 0.6),
       Visibility(
         visible: showItalicButton,
         child: ToggleStyleButton(
@@ -958,7 +958,7 @@ class QuillToolbar extends StatefulWidget implements PreferredSizeWidget {
           controller: controller,
         ),
       ),
-      SizedBox(width: 0.6),
+      const SizedBox(width: 0.6),
       Visibility(
         visible: showUnderLineButton,
         child: ToggleStyleButton(
@@ -967,7 +967,7 @@ class QuillToolbar extends StatefulWidget implements PreferredSizeWidget {
           controller: controller,
         ),
       ),
-      SizedBox(width: 0.6),
+      const SizedBox(width: 0.6),
       Visibility(
         visible: showStrikeThrough,
         child: ToggleStyleButton(
@@ -976,7 +976,7 @@ class QuillToolbar extends StatefulWidget implements PreferredSizeWidget {
           controller: controller,
         ),
       ),
-      SizedBox(width: 0.6),
+      const SizedBox(width: 0.6),
       Visibility(
         visible: showColorButton,
         child: ColorButton(
@@ -985,7 +985,7 @@ class QuillToolbar extends StatefulWidget implements PreferredSizeWidget {
           background: false,
         ),
       ),
-      SizedBox(width: 0.6),
+      const SizedBox(width: 0.6),
       Visibility(
         visible: showBackgroundColorButton,
         child: ColorButton(
@@ -994,7 +994,7 @@ class QuillToolbar extends StatefulWidget implements PreferredSizeWidget {
           background: true,
         ),
       ),
-      SizedBox(width: 0.6),
+      const SizedBox(width: 0.6),
       Visibility(
         visible: showClearFormat,
         child: ClearFormatButton(
@@ -1002,7 +1002,7 @@ class QuillToolbar extends StatefulWidget implements PreferredSizeWidget {
           controller: controller,
         ),
       ),
-      SizedBox(width: 0.6),
+      const SizedBox(width: 0.6),
       Visibility(
         visible: onImagePickCallback != null,
         child: ImageButton(
@@ -1012,7 +1012,7 @@ class QuillToolbar extends StatefulWidget implements PreferredSizeWidget {
           onImagePickCallback: onImagePickCallback,
         ),
       ),
-      SizedBox(width: 0.6),
+      const SizedBox(width: 0.6),
       Visibility(
         visible: onImagePickCallback != null,
         child: ImageButton(
@@ -1120,7 +1120,7 @@ class _QuillToolbarState extends State<QuillToolbar> {
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: EdgeInsets.symmetric(horizontal: 8),
+      padding: const EdgeInsets.symmetric(horizontal: 8),
       constraints: BoxConstraints.tightFor(height: widget.preferredSize.height),
       color: Theme.of(context).canvasColor,
       child: CustomScrollView(
@@ -1148,13 +1148,13 @@ class QuillIconButton extends StatelessWidget {
   final double highlightElevation;
 
   const QuillIconButton({
-    Key? key,
     required this.onPressed,
     this.icon,
     this.size = 40,
     this.fillColor,
     this.hoverElevation = 1,
     this.highlightElevation = 1,
+    Key? key,
   }) : super(key: key);
 
   @override
@@ -1164,7 +1164,6 @@ class QuillIconButton extends StatelessWidget {
       child: RawMaterialButton(
         visualDensity: VisualDensity.compact,
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(2)),
-        padding: EdgeInsets.zero,
         fillColor: fillColor,
         elevation: 0,
         hoverElevation: hoverElevation,
@@ -1187,15 +1186,15 @@ class QuillDropdownButton<T> extends StatefulWidget {
   final ValueChanged<T> onSelected;
 
   const QuillDropdownButton({
-    Key? key,
-    this.height = 40,
-    this.fillColor,
-    this.hoverElevation = 1,
-    this.highlightElevation = 1,
     required this.child,
     required this.initialValue,
     required this.items,
     required this.onSelected,
+    this.height = 40,
+    this.fillColor,
+    this.hoverElevation = 1,
+    this.highlightElevation = 1,
+    Key? key,
   }) : super(key: key);
 
   @override
@@ -1210,7 +1209,6 @@ class _QuillDropdownButtonState<T> extends State<QuillDropdownButton<T>> {
       child: RawMaterialButton(
         visualDensity: VisualDensity.compact,
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(2)),
-        padding: EdgeInsets.zero,
         fillColor: widget.fillColor,
         elevation: 0,
         hoverElevation: widget.hoverElevation,
@@ -1251,19 +1249,20 @@ class _QuillDropdownButtonState<T> extends State<QuillDropdownButton<T>> {
         // if (widget.onCanceled != null) widget.onCanceled();
         return null;
       }
+      widget.onSelected(newValue);
     });
   }
 
   Widget _buildContent(BuildContext context) {
     return ConstrainedBox(
-      constraints: BoxConstraints.tightFor(width: 110),
+      constraints: const BoxConstraints.tightFor(width: 110),
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 8.0),
         child: Row(
           children: [
             widget.child,
             Expanded(child: Container()),
-            Icon(Icons.arrow_drop_down, size: 15)
+            const Icon(Icons.arrow_drop_down, size: 15)
           ],
         ),
       ),