Merge branch 'superlistapp:main' into feature/allow-scrolling-within-super-text-field

Author: CillianMyles

super_editor/clones/quill/lib/app.dart

@@ -122,11 +122,11 @@ This is a code block.
 /// current block. This is especially important for a code block, in which pressing
 /// Enter inserts a newline inside the code block - it doesn't insert a new paragraph
 /// below the code block.
-class _AlwaysTrailingParagraphReaction implements EditReaction {
+class _AlwaysTrailingParagraphReaction extends EditReaction {
   @override
-  void react(EditContext editorContext, RequestDispatcher requestDispatcher, List<EditEvent> changeList) {
+  void modifyContent(EditContext editorContext, RequestDispatcher requestDispatcher, List<EditEvent> changeList) {
     final document = editorContext.find<MutableDocument>(Editor.documentKey);
-    final lastNode = document.nodes.lastOrNull;
+    final lastNode = document.lastOrNull;
 
     if (lastNode != null &&
         lastNode is ParagraphNode &&
@@ -140,7 +140,7 @@ class _AlwaysTrailingParagraphReaction implements EditReaction {
     // We need to insert a trailing empty paragraph.
     requestDispatcher.execute([
       InsertNodeAtIndexRequest(
-        nodeIndex: document.nodes.length,
+        nodeIndex: document.nodeCount,
         newNode: ParagraphNode(
           id: Editor.createNodeId(),
           text: AttributedText(""),

super_editor/clones/quill/lib/deltas/deltas_display.dart

@@ -1,5 +1,4 @@
 import 'package:dart_quill_delta/dart_quill_delta.dart';
-import 'package:feather/infrastructure/super_editor_extensions.dart';
 import 'package:flutter/material.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:super_editor/super_editor.dart';

super_editor/clones/quill/lib/editor/editor.dart

@@ -28,27 +28,6 @@ class FeatherEditor extends StatefulWidget {
 class _FeatherEditorState extends State<FeatherEditor> {
   final _editorFocusNode = FocusNode();
 
-  late MutableDocument _document;
-  late MutableDocumentComposer _composer;
-
-  @override
-  void initState() {
-    super.initState();
-
-    _document = widget.editor.context.find<MutableDocument>(Editor.documentKey);
-    _composer = widget.editor.context.find<MutableDocumentComposer>(Editor.composerKey);
-  }
-
-  @override
-  void didUpdateWidget(FeatherEditor oldWidget) {
-    super.didUpdateWidget(oldWidget);
-
-    if (widget.editor != oldWidget.editor) {
-      _document = widget.editor.context.find<MutableDocument>(Editor.documentKey);
-      _composer = widget.editor.context.find<MutableDocumentComposer>(Editor.composerKey);
-    }
-  }
-
   @override
   void dispose() {
     _editorFocusNode.dispose();
@@ -90,8 +69,6 @@ class _FeatherEditorState extends State<FeatherEditor> {
       child: SuperEditor(
         focusNode: _editorFocusNode,
         editor: widget.editor,
-        document: _document,
-        composer: _composer,
         stylesheet: featherStylesheet,
         componentBuilders: const [
           FeatherBlockquoteComponentBuilder(),
@@ -126,7 +103,7 @@ class ClearSelectedStylesRequest implements EditRequest {
   const ClearSelectedStylesRequest();
 }
 
-class ClearSelectedStylesCommand implements EditCommand {
+class ClearSelectedStylesCommand extends EditCommand {
   const ClearSelectedStylesCommand();
 
   @override
@@ -181,7 +158,7 @@ class ClearTextAttributionsRequest implements EditRequest {
   int get hashCode => documentRange.hashCode;
 }
 
-class ClearTextAttributionsCommand implements EditCommand {
+class ClearTextAttributionsCommand extends EditCommand {
   const ClearTextAttributionsCommand(this.documentRange);
 
   final DocumentRange documentRange;
@@ -288,7 +265,7 @@ class ToggleInlineFormatRequest implements EditRequest {
   int get hashCode => inlineFormat.hashCode;
 }
 
-class ToggleInlineFormatCommand implements EditCommand {
+class ToggleInlineFormatCommand extends EditCommand {
   const ToggleInlineFormatCommand(this.inlineFormat);
 
   final Attribution inlineFormat;

super_editor/clones/quill/lib/editor/toolbar.dart

@@ -4,7 +4,6 @@ import 'package:feather/infrastructure/popovers/color_selector.dart';
 import 'package:feather/editor/editor.dart';
 import 'package:feather/infrastructure/popovers/icon_selector.dart';
 import 'package:feather/infrastructure/popovers/text_item_selector.dart';
-import 'package:feather/infrastructure/super_editor_extensions.dart';
 import 'package:feather/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
@@ -185,7 +184,7 @@ class _FormattingToolbarState extends State<FormattingToolbar> {
     ]);
 
     // Clear the field and hide the URL bar
-    _urlController!.clear();
+    _urlController!.clearTextAndSelection();
     _urlFocusNode.unfocus(disposition: UnfocusDisposition.previouslyFocusedChild);
     _linkPopoverController.close();
     setState(() {});
@@ -220,7 +219,7 @@ class _FormattingToolbarState extends State<FormattingToolbar> {
     }
 
     // Clear the field and hide the URL bar
-    _imageController!.clear();
+    _imageController!.clearTextAndSelection();
     _imageFocusNode.unfocus(disposition: UnfocusDisposition.previouslyFocusedChild);
     _imagePopoverController.close();
     setState(() {});
@@ -535,7 +534,7 @@ class _FormattingToolbarState extends State<FormattingToolbar> {
               onPressed: () {
                 setState(() {
                   _urlFocusNode.unfocus();
-                  _urlController!.clear();
+                  _urlController!.clearTextAndSelection();
                 });
               },
             ),
@@ -605,7 +604,7 @@ class _FormattingToolbarState extends State<FormattingToolbar> {
               onPressed: () {
                 setState(() {
                   _imageFocusNode.unfocus();
-                  _imageController!.clear();
+                  _imageController!.clearTextAndSelection();
                 });
               },
             ),

super_editor/clones/quill/lib/infrastructure/super_editor_extensions.dart

@@ -71,8 +71,6 @@ class _TextWithHintDemoState extends State<TextWithHintDemo> {
   Widget build(BuildContext context) {
     return SuperEditor(
       editor: _docEditor,
-      document: _doc,
-      composer: _composer,
       stylesheet: Stylesheet(
         documentPadding: const EdgeInsets.symmetric(vertical: 56, horizontal: 24),
         rules: defaultStylesheet.rules,

super_editor/example/lib/demos/components/demo_text_with_hint.dart

@@ -52,8 +52,6 @@ class _UnselectableHrDemoState extends State<UnselectableHrDemo> {
   Widget build(BuildContext context) {
     return SuperEditor(
       editor: _docEditor,
-      document: _doc,
-      composer: _composer,
       stylesheet: defaultStylesheet.copyWith(
         documentPadding: const EdgeInsets.symmetric(vertical: 56, horizontal: 24),
       ),

super_editor/example/lib/demos/components/demo_unselectable_hr.dart

@@ -52,8 +52,6 @@ class _AnimatedTaskHeightDemoState extends State<AnimatedTaskHeightDemo> {
     print("Building the entire demo");
     return SuperEditor(
       editor: _docEditor,
-      document: _doc,
-      composer: _composer,
       stylesheet: defaultStylesheet.copyWith(
         documentPadding: const EdgeInsets.symmetric(vertical: 56, horizontal: 24),
       ),

super_editor/example/lib/demos/demo_animated_task_height.dart

@@ -52,11 +52,7 @@ class _AppShortcutsDemoState extends State<AppShortcutsDemo> {
             child: Column(
               children: [
                 Expanded(
-                  child: SuperEditor(
-                    editor: _editor,
-                    document: _doc,
-                    composer: _composer,
-                  ),
+                  child: SuperEditor(editor: _editor),
                 ),
                 const TextField(
                   decoration: InputDecoration(

super_editor/example/lib/demos/demo_app_shortcuts.dart

@@ -41,8 +41,6 @@ class _LoseFocusDemoState extends State<LoseFocusDemo> {
               ),
               child: SuperEditor(
                 editor: _docEditor,
-                document: _doc,
-                composer: _composer,
                 inputSource: TextInputSource.ime,
                 stylesheet: defaultStylesheet.copyWith(
                   documentPadding: const EdgeInsets.symmetric(vertical: 56, horizontal: 24),