From 0f6b1ac1b42cae0e836c9289a0c91da933c0d0c6 Mon Sep 17 00:00:00 2001 From: Jonas <63404212+jay-k98@users.noreply.github.com> Date: Sat, 11 May 2024 00:51:58 +0200 Subject: [PATCH 1/5] Fix typo in QuillHtmlConverter (#1855) Co-authored-by: Jonas Klock --- quill_html_converter/lib/quill_html_converter.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quill_html_converter/lib/quill_html_converter.dart b/quill_html_converter/lib/quill_html_converter.dart index 7ed4fe0b..460b74dc 100644 --- a/quill_html_converter/lib/quill_html_converter.dart +++ b/quill_html_converter/lib/quill_html_converter.dart @@ -2,9 +2,9 @@ library quill_html_converter; import 'package:dart_quill_delta/dart_quill_delta.dart'; import 'package:vsc_quill_delta_to_html/vsc_quill_delta_to_html.dart' - as conventer show ConverterOptions, QuillDeltaToHtmlConverter; + as converter show ConverterOptions, QuillDeltaToHtmlConverter; -typedef ConverterOptions = conventer.ConverterOptions; +typedef ConverterOptions = converter.ConverterOptions; /// A extension for [Delta] which comes from `flutter_quill` to extends /// the functionality of it to support converting the [Delta] to/from HTML @@ -19,7 +19,7 @@ extension DeltaHtmlExt on Delta { /// that designed specifically for converting the quill delta to html String toHtml({ConverterOptions? options}) { final json = toJson(); - final html = conventer.QuillDeltaToHtmlConverter( + final html = converter.QuillDeltaToHtmlConverter( List.castFrom(json), options, ).convert(); From 6acd475efa1fdb8077cb3fa24027a6234cb7e58f Mon Sep 17 00:00:00 2001 From: AtlasAutocode <165201146+AtlasAutocode@users.noreply.github.com> Date: Fri, 10 May 2024 16:56:01 -0600 Subject: [PATCH 2/5] Fix re-create checkbox (#1857) * toggle_style_button : calls to options.afterButtonPressed replaced by call to class function afterButtonPressed to allow default call to base button settings quill_icon_button: L26 build for isSelected updated to call afterButtonPressed = same as if not selected QuillController _updateSelection removed param=source because not used; added new param insertNewline when true set tog to style of preceding char (last entered); updated replaceText to call _updateSelection for NL document collectStyle: Selecting the start of a line, user expects the style to be the visible style of the line including inline styles * color_button calls afterButtonPressed insert at start of line uses style for line * Remove comments * Fix formatting issue * Fix FontFamily and Size button actions * Fix FontFamily and Size button actions * Value setting Stateful toolbar buttons derive from base class * Rename base class as QuillToolbarBaseValueButton * Fixes for before_push script * Removed deprecated functions * Move clipboard actions to QuillController * Fix: collectAllIndividualStylesAndEmbed for result span * Add: Clipboard toolbar buttons * export: Clipboard toolbar buttons * Fix: Dividers not shown in toolbar when multiRowsDisplay. Fix: Toolbar drop buttons clipped when !multiRowsDisplay * Add: test for QuillController clipboard Dart Formatted * Localizations updated * QuillControllerConfigurations and clipboard paste * Fix: CheckList action --------- Co-authored-by: Douglas Ward --- lib/src/models/rules/insert.dart | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/src/models/rules/insert.dart b/lib/src/models/rules/insert.dart index 731be9cf..73fd044e 100644 --- a/lib/src/models/rules/insert.dart +++ b/lib/src/models/rules/insert.dart @@ -560,13 +560,15 @@ class PreserveInlineStylesRule extends InsertRule { final itr = DeltaIterator(document); var prev = itr.skip(len == 0 ? index : index + 1); - if (prev == null || - (prev.data is String && (prev.data as String).endsWith('\n'))) { - prev = itr.next(); - } - if (prev.data is! String) { - return null; + if (prev == null || prev.data is! String) return null; + + if ((prev.data as String).endsWith('\n')) { + if (prev.attributes?.containsKey(Attribute.list.key) == true) { + return null; + } + prev = itr + .next(); // at the start of a line, apply the style for the current line and not the style for the preceding line } final attributes = prev.attributes; From 0fb4c9580d8ce48ef7adf38b9c56319deef613c1 Mon Sep 17 00:00:00 2001 From: Cheryl Date: Fri, 10 May 2024 16:01:54 -0700 Subject: [PATCH 3/5] Upgrade to 9.3.11 --- CHANGELOG.md | 4 ++++ dart_quill_delta/CHANGELOG.md | 4 ++++ dart_quill_delta/pubspec.yaml | 2 +- flutter_quill_extensions/CHANGELOG.md | 4 ++++ flutter_quill_extensions/pubspec.yaml | 2 +- flutter_quill_test/CHANGELOG.md | 4 ++++ flutter_quill_test/pubspec.yaml | 2 +- pubspec.yaml | 2 +- quill_html_converter/CHANGELOG.md | 4 ++++ quill_html_converter/pubspec.yaml | 2 +- quill_pdf_converter/CHANGELOG.md | 4 ++++ quill_pdf_converter/pubspec.yaml | 2 +- version.dart | 2 +- 13 files changed, 31 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e9dd5f3..a4d26e5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## 9.3.11 +* Fix typo in QuillHtmlConverter +* Fix re-create checkbox + ## 9.3.10 * Support clipboard actions from the toolbar diff --git a/dart_quill_delta/CHANGELOG.md b/dart_quill_delta/CHANGELOG.md index 6e9dd5f3..a4d26e5b 100644 --- a/dart_quill_delta/CHANGELOG.md +++ b/dart_quill_delta/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## 9.3.11 +* Fix typo in QuillHtmlConverter +* Fix re-create checkbox + ## 9.3.10 * Support clipboard actions from the toolbar diff --git a/dart_quill_delta/pubspec.yaml b/dart_quill_delta/pubspec.yaml index 7fda6954..84b99dea 100644 --- a/dart_quill_delta/pubspec.yaml +++ b/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: 9.3.10 +version: 9.3.11 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/ diff --git a/flutter_quill_extensions/CHANGELOG.md b/flutter_quill_extensions/CHANGELOG.md index 6e9dd5f3..a4d26e5b 100644 --- a/flutter_quill_extensions/CHANGELOG.md +++ b/flutter_quill_extensions/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## 9.3.11 +* Fix typo in QuillHtmlConverter +* Fix re-create checkbox + ## 9.3.10 * Support clipboard actions from the toolbar diff --git a/flutter_quill_extensions/pubspec.yaml b/flutter_quill_extensions/pubspec.yaml index e069e58f..fe49272b 100644 --- a/flutter_quill_extensions/pubspec.yaml +++ b/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: 9.3.10 +version: 9.3.11 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/ diff --git a/flutter_quill_test/CHANGELOG.md b/flutter_quill_test/CHANGELOG.md index 6e9dd5f3..a4d26e5b 100644 --- a/flutter_quill_test/CHANGELOG.md +++ b/flutter_quill_test/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## 9.3.11 +* Fix typo in QuillHtmlConverter +* Fix re-create checkbox + ## 9.3.10 * Support clipboard actions from the toolbar diff --git a/flutter_quill_test/pubspec.yaml b/flutter_quill_test/pubspec.yaml index f37787d1..3e0e3486 100644 --- a/flutter_quill_test/pubspec.yaml +++ b/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: 9.3.10 +version: 9.3.11 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/ diff --git a/pubspec.yaml b/pubspec.yaml index b17ba031..ad1f3779 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_quill description: A rich text editor built for the modern Android, iOS, web and desktop platforms. It is the WYSIWYG editor and a Quill component for Flutter. -version: 9.3.10 +version: 9.3.11 homepage: https://1o24bbs.com/c/bulletjournal/108/ repository: https://github.com/singerdmx/flutter-quill/ issue_tracker: https://github.com/singerdmx/flutter-quill/issues/ diff --git a/quill_html_converter/CHANGELOG.md b/quill_html_converter/CHANGELOG.md index 6e9dd5f3..a4d26e5b 100644 --- a/quill_html_converter/CHANGELOG.md +++ b/quill_html_converter/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## 9.3.11 +* Fix typo in QuillHtmlConverter +* Fix re-create checkbox + ## 9.3.10 * Support clipboard actions from the toolbar diff --git a/quill_html_converter/pubspec.yaml b/quill_html_converter/pubspec.yaml index 9026042a..7ea7f857 100644 --- a/quill_html_converter/pubspec.yaml +++ b/quill_html_converter/pubspec.yaml @@ -1,6 +1,6 @@ name: quill_html_converter description: A extension for flutter_quill package to add support for dealing with conversion to/from html -version: 9.3.10 +version: 9.3.11 homepage: https://github.com/singerdmx/flutter-quill/tree/master/quill_html_converter/ repository: https://github.com/singerdmx/flutter-quill/tree/master/quill_html_converter/ issue_tracker: https://github.com/singerdmx/flutter-quill/issues/ diff --git a/quill_pdf_converter/CHANGELOG.md b/quill_pdf_converter/CHANGELOG.md index 6e9dd5f3..a4d26e5b 100644 --- a/quill_pdf_converter/CHANGELOG.md +++ b/quill_pdf_converter/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## 9.3.11 +* Fix typo in QuillHtmlConverter +* Fix re-create checkbox + ## 9.3.10 * Support clipboard actions from the toolbar diff --git a/quill_pdf_converter/pubspec.yaml b/quill_pdf_converter/pubspec.yaml index d4f1b338..95f99b61 100644 --- a/quill_pdf_converter/pubspec.yaml +++ b/quill_pdf_converter/pubspec.yaml @@ -1,6 +1,6 @@ name: quill_pdf_converter description: A extension for flutter_quill package to add support for dealing with conversion to pdf -version: 9.3.10 +version: 9.3.11 homepage: https://github.com/singerdmx/flutter-quill/tree/master/quill_pdf_converter/ repository: https://github.com/singerdmx/flutter-quill/tree/master/quill_pdf_converter/ issue_tracker: https://github.com/singerdmx/flutter-quill/issues/ diff --git a/version.dart b/version.dart index 7344fadf..d655354b 100644 --- a/version.dart +++ b/version.dart @@ -1 +1 @@ -const version = '9.3.10'; +const version = '9.3.11'; From ab17019de83f2b2677ac3846208c8796662ec181 Mon Sep 17 00:00:00 2001 From: Ellet <73608287+ellet0@users.noreply.github.com> Date: Sun, 12 May 2024 14:52:49 +0300 Subject: [PATCH 4/5] Update build.yml to fix and update the Linux build requirements --- .github/workflows/build.yml | 99 +++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f66fa40..af18ce5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,70 +21,73 @@ jobs: - name: Enable Local Dev run: ./scripts/enable_local_dev.sh - + - name: Install dependencies run: flutter pub get - + - name: Flutter build Web run: flutter build web --release --verbose --dart-define=CI=true working-directory: ./example + - name: Updates APT Linux Package Lists && Upgrade + run: sudo apt update -y && sudo apt upgrade -y + - name: Install flutter Linux prerequisites - run: sudo apt-get install clang cmake git ninja-build pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev -y + run: sudo apt install -y curl git unzip xz-utils zip libglu1-mesa -y - name: Flutter build Linux run: flutter build linux --release --verbose --dart-define=CI=true working-directory: ./example - # build_windows: - # name: Build Windows App - # runs-on: windows-latest - - # steps: - # - uses: actions/checkout@v4 - # - uses: subosito/flutter-action@v2 - # with: - # channel: 'stable' - # cache: true - - # - name: Check flutter version - # run: flutter --version - - # # Sh scripts is not supported on windows - # - name: Enable Local Dev - # run: ./scripts/enable_local_dev.sh - - # - name: Install dependencies - # run: flutter pub get - - # - name: Flutter build windows - # run: flutter build windows --release --verbose --dart-define=CI=true - # working-directory: ./example + # build_windows: + # name: Build Windows App + # runs-on: windows-latest + + # steps: + # - uses: actions/checkout@v4 + # - uses: subosito/flutter-action@v2 + # with: + # channel: 'stable' + # cache: true + + # - name: Check flutter version + # run: flutter --version + + # # Sh scripts is not supported on windows + # - name: Enable Local Dev + # run: ./scripts/enable_local_dev.sh + + # - name: Install dependencies + # run: flutter pub get + + # - name: Flutter build windows + # run: flutter build windows --release --verbose --dart-define=CI=true + # working-directory: ./example + + # build_macOS: + # name: Build macOS App + # runs-on: macos-latest + + # steps: + # - uses: actions/checkout@v4 + # - uses: subosito/flutter-action@v2 + # with: + # channel: 'stable' + # cache: true + + # - name: Check flutter version + # run: flutter --version + + # - name: Enable Local Dev + # run: ./scripts/enable_local_dev.sh + + # - name: Install dependencies + # run: flutter pub get - # build_macOS: - # name: Build macOS App - # runs-on: macos-latest - - # steps: - # - uses: actions/checkout@v4 - # - uses: subosito/flutter-action@v2 - # with: - # channel: 'stable' - # cache: true - - # - name: Check flutter version - # run: flutter --version - - # - name: Enable Local Dev - # run: ./scripts/enable_local_dev.sh - - # - name: Install dependencies - # run: flutter pub get - # - name: Flutter build macOS # run: flutter build macos --release --verbose --dart-define=CI=true # working-directory: ./example # - name: Flutter build iOS # run: flutter build ios --release --verbose --dart-define=CI=true - # working-directory: ./example \ No newline at end of file + # working-directory: ./example From 9d84ef65439c93b4ee90ad1e8e5eddae587ad3d7 Mon Sep 17 00:00:00 2001 From: Ellet <73608287+ellet0@users.noreply.github.com> Date: Sun, 12 May 2024 14:54:23 +0300 Subject: [PATCH 5/5] Update build.yml to remove duplicated -y yes confirmation when installing Linux requirements --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af18ce5a..72a76630 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: run: sudo apt update -y && sudo apt upgrade -y - name: Install flutter Linux prerequisites - run: sudo apt install -y curl git unzip xz-utils zip libglu1-mesa -y + run: sudo apt install -y curl git unzip xz-utils zip libglu1-mesa - name: Flutter build Linux run: flutter build linux --release --verbose --dart-define=CI=true