Merge remote-tracking branch 'origin/master'

Author: AtlasAutocode

CHANGELOG.md

@@ -4,6 +4,25 @@
 
 All notable changes to this project will be documented in this file.
 
+## 10.5.18
+
+* feat(web): rich text paste from Clipboard using HTML by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2009
+* revert: disable rich text paste feature on web as a workaround by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2221
+* refactor: moved shortcuts and onKeyEvents to its own file by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2223
+
+
+**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.17...v10.5.18
+
+## 10.5.17
+
+* feat(l10n): localize all untranslated.json by @erdnx in https://github.com/singerdmx/flutter-quill/pull/2217
+* Fix: Block Attributes are not displayed if the editor is empty by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2210
+
+## New Contributors
+* @erdnx made their first contribution in https://github.com/singerdmx/flutter-quill/pull/2217
+
+**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.16...v10.5.17
+
 ## 10.5.16
 
 * chore: remove device_info_plus and add quill_native_bridge to access platform specific APIs by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2194

CHANGELOG_DATA.json

@@ -1,4 +1,6 @@
 {
+    "10.5.18": "* feat(web): rich text paste from Clipboard using HTML by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2009\r\n* revert: disable rich text paste feature on web as a workaround by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2221\r\n* refactor: moved shortcuts and onKeyEvents to its own file by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2223\r\n\r\n\r\n**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.17...v10.5.18",
+    "10.5.17": "* feat(l10n): localize all untranslated.json by @erdnx in https://github.com/singerdmx/flutter-quill/pull/2217\r\n* Fix: Block Attributes are not displayed if the editor is empty by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2210\r\n\r\n## New Contributors\r\n* @erdnx made their first contribution in https://github.com/singerdmx/flutter-quill/pull/2217\r\n\r\n**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.16...v10.5.17",
     "10.5.16": "* chore: remove device_info_plus and add quill_native_bridge to access platform specific APIs by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2194\r\n* Not show/update/hiden mangnifier when manifier config is disbale by @demoYang in https://github.com/singerdmx/flutter-quill/pull/2212\r\n\r\n\r\n**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.14...v10.5.16",
     "10.5.15-dev.0": "Introduce `quill_native_bridge` which is an internal plugin to use by `flutter_quill` to access platform APIs.\r\n\r\nFor now, the only functionality it supports is to check whatever the iOS app is running on iOS simulator without requiring [`device_info_plus`](pub.dev/packages/device_info_plus) as a dependency.\r\n\r\n> [!NOTE]\r\n> `quill_native_bridge` is a plugin for internal use and should not be used in production applications\r\n> as breaking changes can happen and can removed at any time.\r\n\r\nFor more details and discussion see [#2194](https://github.com/singerdmx/flutter-quill/pull/2194).\r\n\r\n**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.14...v10.5.15-dev.0",
     "10.5.14": "* chore(localization): add Greek language support by @DKalathas in https://github.com/singerdmx/flutter-quill/pull/2206\r\n\r\n## New Contributors\r\n* @DKalathas made their first contribution in https://github.com/singerdmx/flutter-quill/pull/2206\r\n\r\n**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.13...v10.5.14",

dart_quill_delta/CHANGELOG.md

@@ -4,6 +4,25 @@
 
 All notable changes to this project will be documented in this file.
 
+## 10.5.18
+
+* feat(web): rich text paste from Clipboard using HTML by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2009
+* revert: disable rich text paste feature on web as a workaround by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2221
+* refactor: moved shortcuts and onKeyEvents to its own file by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2223
+
+
+**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.17...v10.5.18
+
+## 10.5.17
+
+* feat(l10n): localize all untranslated.json by @erdnx in https://github.com/singerdmx/flutter-quill/pull/2217
+* Fix: Block Attributes are not displayed if the editor is empty by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2210
+
+## New Contributors
+* @erdnx made their first contribution in https://github.com/singerdmx/flutter-quill/pull/2217
+
+**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.16...v10.5.17
+
 ## 10.5.16
 
 * chore: remove device_info_plus and add quill_native_bridge to access platform specific APIs by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2194

dart_quill_delta/pubspec.yaml

@@ -1,6 +1,6 @@
 name: dart_quill_delta
 description: A port of quill-js-delta from typescript to dart
-version: 10.5.16
+version: 10.5.18
 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/

flutter_quill_extensions/CHANGELOG.md

@@ -4,6 +4,25 @@
 
 All notable changes to this project will be documented in this file.
 
+## 10.5.18
+
+* feat(web): rich text paste from Clipboard using HTML by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2009
+* revert: disable rich text paste feature on web as a workaround by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2221
+* refactor: moved shortcuts and onKeyEvents to its own file by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2223
+
+
+**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.17...v10.5.18
+
+## 10.5.17
+
+* feat(l10n): localize all untranslated.json by @erdnx in https://github.com/singerdmx/flutter-quill/pull/2217
+* Fix: Block Attributes are not displayed if the editor is empty by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2210
+
+## New Contributors
+* @erdnx made their first contribution in https://github.com/singerdmx/flutter-quill/pull/2217
+
+**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.16...v10.5.17
+
 ## 10.5.16
 
 * chore: remove device_info_plus and add quill_native_bridge to access platform specific APIs by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2194

flutter_quill_extensions/lib/flutter_quill_extensions.dart

@@ -26,6 +26,7 @@ export 'src/editor/video/video_web_embed.dart';
 export 'src/editor_toolbar_shared/shared_configurations.dart';
 export 'src/flutter_quill_embeds.dart';
 export 'src/toolbar/camera/camera_button.dart';
+export 'src/toolbar/camera/camera_types.dart';
 export 'src/toolbar/camera/models/camera_configurations.dart';
 export 'src/toolbar/formula/formula_button.dart';
 export 'src/toolbar/formula/models/formula_configurations.dart';

flutter_quill_extensions/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_quill_extensions
 description: Embed extensions for flutter_quill including image, video, formula and etc.
-version: 10.5.16
+version: 10.5.18
 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/

flutter_quill_test/CHANGELOG.md

@@ -4,6 +4,25 @@
 
 All notable changes to this project will be documented in this file.
 
+## 10.5.18
+
+* feat(web): rich text paste from Clipboard using HTML by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2009
+* revert: disable rich text paste feature on web as a workaround by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2221
+* refactor: moved shortcuts and onKeyEvents to its own file by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2223
+
+
+**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.17...v10.5.18
+
+## 10.5.17
+
+* feat(l10n): localize all untranslated.json by @erdnx in https://github.com/singerdmx/flutter-quill/pull/2217
+* Fix: Block Attributes are not displayed if the editor is empty by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2210
+
+## New Contributors
+* @erdnx made their first contribution in https://github.com/singerdmx/flutter-quill/pull/2217
+
+**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.16...v10.5.17
+
 ## 10.5.16
 
 * chore: remove device_info_plus and add quill_native_bridge to access platform specific APIs by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2194

flutter_quill_test/pubspec.yaml

@@ -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: 10.5.16
+version: 10.5.18
 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/

lib/src/controller/quill_controller.dart

@@ -1,26 +1,28 @@
 import 'dart:math' as math;
 
+import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/services.dart' show ClipboardData, Clipboard;
 import 'package:flutter/widgets.dart';
-import 'package:html/parser.dart' as html_parser;
 import 'package:meta/meta.dart' show experimental;
 
 import '../../quill_delta.dart';
 import '../common/structs/image_url.dart';
 import '../common/structs/offset_value.dart';
 import '../common/utils/embeds.dart';
 import '../delta/delta_diff.dart';
-import '../delta/delta_x.dart';
 import '../document/attribute.dart';
 import '../document/document.dart';
 import '../document/nodes/embeddable.dart';
 import '../document/nodes/leaf.dart';
 import '../document/structs/doc_change.dart';
 import '../document/style.dart';
 import '../editor/config/editor_configurations.dart';
-import '../editor_toolbar_controller_shared/clipboard/clipboard_service_provider.dart';
 import '../toolbar/config/simple_toolbar_configurations.dart';
 import 'quill_controller_configurations.dart';
+import 'quill_controller_rich_paste.dart';
+
+import 'web/quill_controller_web_stub.dart'
+    if (dart.library.html) 'web/quill_controller_web_real.dart';
 
 typedef ReplaceTextCallback = bool Function(int index, int len, Object? data);
 typedef DeleteCallback = void Function(int cursorPosition, bool forward);
@@ -38,7 +40,11 @@ class QuillController extends ChangeNotifier {
     this.readOnly = false,
     this.editorFocusNode,
   })  : _document = document,
-        _selection = selection;
+        _selection = selection {
+    if (kIsWeb) {
+      initializeWebPasteEvent();
+    }
+  }
 
   factory QuillController.basic(
           {QuillControllerConfigurations configurations =
@@ -132,8 +138,8 @@ class QuillController extends ChangeNotifier {
 
   bool ignoreFocusOnTextChange = false;
 
-  /// Skip requestKeyboard being called in
-  /// RawEditorState#_didChangeTextEditingValue
+  /// Skip requestKeyboard being called
+  /// in [QuillRawEditorState._didChangeTextEditingValue]
   bool skipRequestKeyboard = false;
 
   /// True when this [QuillController] instance has been disposed.
@@ -472,6 +478,9 @@ class QuillController extends ChangeNotifier {
     }
 
     _isDisposed = true;
+    if (kIsWeb) {
+      closeWebPasteEvent();
+    }
     super.dispose();
   }
 
@@ -565,13 +574,13 @@ class QuillController extends ChangeNotifier {
       return true;
     }
 
-    final pasteUsingHtmlSuccess = await _pasteHTML();
+    final pasteUsingHtmlSuccess = await pasteHTML();
     if (pasteUsingHtmlSuccess) {
       updateEditor?.call();
       return true;
     }
 
-    final pasteUsingMarkdownSuccess = await _pasteMarkdown();
+    final pasteUsingMarkdownSuccess = await pasteMarkdown();
     if (pasteUsingMarkdownSuccess) {
       updateEditor?.call();
       return true;
@@ -616,15 +625,6 @@ class QuillController extends ChangeNotifier {
     return false;
   }
 
-  void _pasteUsingDelta(Delta deltaFromClipboard) {
-    replaceText(
-      selection.start,
-      selection.end - selection.start,
-      deltaFromClipboard,
-      TextSelection.collapsed(offset: selection.end),
-    );
-  }
-
   /// Return true if can paste internal image
   Future<bool> _pasteInternalImage() async {
     final copiedImageUrl = _copiedImageUrl;
@@ -653,59 +653,6 @@ class QuillController extends ChangeNotifier {
     return false;
   }
 
-  /// Return true if can paste using HTML
-  Future<bool> _pasteHTML() async {
-    final clipboardService = ClipboardServiceProvider.instance;
-
-    Future<String?> getHTML() async {
-      if (await clipboardService.canProvideHtmlTextFromFile()) {
-        return await clipboardService.getHtmlTextFromFile();
-      }
-      if (await clipboardService.canProvideHtmlText()) {
-        return await clipboardService.getHtmlText();
-      }
-      return null;
-    }
-
-    final htmlText = await getHTML();
-    if (htmlText != null) {
-      final htmlBody = html_parser.parse(htmlText).body?.outerHtml;
-      // ignore: deprecated_member_use_from_same_package
-      final deltaFromClipboard = DeltaX.fromHtml(htmlBody ?? htmlText);
-
-      _pasteUsingDelta(deltaFromClipboard);
-
-      return true;
-    }
-    return false;
-  }
-
-  /// Return true if can paste using Markdown
-  Future<bool> _pasteMarkdown() async {
-    final clipboardService = ClipboardServiceProvider.instance;
-
-    Future<String?> getMarkdown() async {
-      if (await clipboardService.canProvideMarkdownTextFromFile()) {
-        return await clipboardService.getMarkdownTextFromFile();
-      }
-      if (await clipboardService.canProvideMarkdownText()) {
-        return await clipboardService.getMarkdownText();
-      }
-      return null;
-    }
-
-    final markdownText = await getMarkdown();
-    if (markdownText != null) {
-      // ignore: deprecated_member_use_from_same_package
-      final deltaFromClipboard = DeltaX.fromMarkdown(markdownText);
-
-      _pasteUsingDelta(deltaFromClipboard);
-
-      return true;
-    }
-    return false;
-  }
-
   void replaceTextWithEmbeds(
     int index,
     int len,