Skip to content

Commit 92dcb8b

Browse files
authored
Merge branch 'master' into translations_uz
2 parents bbcf9b3 + e14689b commit 92dcb8b

20 files changed

+639
-96
lines changed

CHANGELOG.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
1111
## [Unreleased]
1212

13+
### Added
14+
15+
- Added localization support for `mn` (Mongolian, Mongolia)
16+
17+
## [11.5.0] - 2025-10-18
18+
19+
### Fixed
20+
21+
- Fixed `View.of(context)` calls throwing when used with the `screenshot` package [#2662](https://github.com/singerdmx/flutter-quill/pull/2662).
22+
23+
### Added
24+
25+
- Add missing Brazilian Portuguese translations
26+
1327
## [11.4.2] - 2025-07-22
1428

1529
### Fixed
@@ -173,7 +187,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
173187
- Apple-specific font dependency for subscript and superscript functionality from the example.
174188
- **BREAKING**: The [`super_clipboard`](https://pub.dev/packages/super_clipboard) plugin, To restore legacy behavior for `super_clipboard`, use [`flutter_quill_extensions`](https://pub.dev/packages/flutter_quill_extensions) package and `FlutterQuillExtensions.useSuperClipboardPlugin()`.
175189

176-
[unreleased]: https://github.com/singerdmx/flutter-quill/compare/v11.4.2...HEAD
190+
[unreleased]: https://github.com/singerdmx/flutter-quill/compare/v11.5.0...HEAD
191+
[11.5.0]: https://github.com/singerdmx/flutter-quill/compare/v10.0.0...v11.5.0
177192
[11.4.2]: https://github.com/singerdmx/flutter-quill/compare/v10.0.0...v11.4.2
178193
[11.4.1]: https://github.com/singerdmx/flutter-quill/compare/v10.0.0...v11.4.1
179194
[11.4.0]: https://github.com/singerdmx/flutter-quill/compare/v10.0.0...v11.4.0

doc/translation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ your `WidgetsApp` for example `MaterialApp` which usually follows the system loc
55

66
## 🌐 Supported Locales
77

8-
Currently, translations are available for these 48 locales:
8+
Currently, translations are available for these 49 locales:
99

1010
* `ar`, `bg`, `bn`, `ca`, `cs`, `da`, `de`
1111
* `en`, `en_US`, `es`, `fa`, `fr`, `he`
1212
* `hi`, `id`, `it`, `ja`, `ko`, `km`, `ku`
13-
* `ms`, `ne`, `nl`, `no`, `pl`, `pt`
13+
* `mn`, `ms`, `ne`, `nl`, `no`, `pl`, `pt`
1414
* `pt_BR`, `ro`, `ro_RO`, `ru`, `sk`, `sr`
1515
* `sv`, `sw`, `th`, `tk`, `tr`, `uk`, `ur`
1616
* `vi`, `zh`, `zh_CN`, `zh_HK`, `hr`

example/pubspec.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ packages:
230230
path: ".."
231231
relative: true
232232
source: path
233-
version: "11.4.2"
233+
version: "11.5.0"
234234
flutter_quill_delta_from_html:
235235
dependency: transitive
236236
description:
@@ -373,26 +373,26 @@ packages:
373373
dependency: transitive
374374
description:
375375
name: leak_tracker
376-
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
376+
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
377377
url: "https://pub.dev"
378378
source: hosted
379-
version: "10.0.8"
379+
version: "11.0.2"
380380
leak_tracker_flutter_testing:
381381
dependency: transitive
382382
description:
383383
name: leak_tracker_flutter_testing
384-
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
384+
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
385385
url: "https://pub.dev"
386386
source: hosted
387-
version: "3.0.9"
387+
version: "3.0.10"
388388
leak_tracker_testing:
389389
dependency: transitive
390390
description:
391391
name: leak_tracker_testing
392-
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
392+
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
393393
url: "https://pub.dev"
394394
source: hosted
395-
version: "3.0.1"
395+
version: "3.0.2"
396396
lints:
397397
dependency: transitive
398398
description:
@@ -610,10 +610,10 @@ packages:
610610
dependency: transitive
611611
description:
612612
name: test_api
613-
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
613+
sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
614614
url: "https://pub.dev"
615615
source: hosted
616-
version: "0.7.4"
616+
version: "0.7.6"
617617
typed_data:
618618
dependency: transitive
619619
description:
@@ -690,10 +690,10 @@ packages:
690690
dependency: transitive
691691
description:
692692
name: vector_math
693-
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
693+
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
694694
url: "https://pub.dev"
695695
source: hosted
696-
version: "2.1.4"
696+
version: "2.2.0"
697697
video_player:
698698
dependency: transitive
699699
description:

flutter_quill_extensions/lib/src/editor/image/image_save_utils.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import 'package:flutter/foundation.dart';
55
import 'package:flutter/material.dart';
66
import 'package:flutter/services.dart';
77
import 'package:flutter_quill/internal.dart';
8-
import 'package:meta/meta.dart';
98
import 'package:path/path.dart' as p;
109

1110
import 'image_load_utils.dart';
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import 'package:flutter/widgets.dart';
2+
3+
extension ViewIdExt on BuildContext {
4+
int? getViewId() {
5+
late final platformDispatcher = WidgetsBinding.instance.platformDispatcher;
6+
return View.maybeOf(this)?.viewId ??
7+
// If context has no View, check platformDispatcher
8+
platformDispatcher.views.firstOrNull?.viewId ??
9+
platformDispatcher.implicitView?.viewId;
10+
}
11+
}

lib/src/common/structs/horizontal_spacing.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ class HorizontalSpacing {
2525
@override
2626
bool operator ==(Object other) =>
2727
identical(this, other) ||
28-
other is HorizontalSpacing &&
29-
left == other.left &&
30-
right == other.right;
28+
other is HorizontalSpacing && left == other.left && right == other.right;
3129

3230
@override
3331
int get hashCode => Object.hash(left, right);

lib/src/common/structs/vertical_spacing.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ class VerticalSpacing {
2525
@override
2626
bool operator ==(Object other) =>
2727
identical(this, other) ||
28-
other is VerticalSpacing &&
29-
top == other.top &&
30-
bottom == other.bottom;
28+
other is VerticalSpacing && top == other.top && bottom == other.bottom;
3129

3230
@override
3331
int get hashCode => Object.hash(top, bottom);

lib/src/editor/raw_editor/raw_editor_state_text_input_client_mixin.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import 'package:flutter/foundation.dart';
55
import 'package:flutter/material.dart';
66
import 'package:flutter/scheduler.dart';
77
import 'package:flutter/services.dart';
8-
import 'package:meta/meta.dart';
98

9+
import '../../common/extensions/view_id_ext.dart';
1010
import '../../delta/delta_diff.dart';
1111
import '../../document/document.dart';
1212
import '../editor.dart';
@@ -89,7 +89,7 @@ mixin RawEditorStateTextInputClientMixin on EditorState
8989
allowedMimeTypes: widget.config.contentInsertionConfiguration == null
9090
? const <String>[]
9191
: widget.config.contentInsertionConfiguration!.allowedMimeTypes,
92-
viewId: View.of(context).viewId,
92+
viewId: context.getViewId(),
9393
),
9494
);
9595

lib/src/editor/raw_editor/scribble_focusable.dart

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
22
import 'package:flutter/rendering.dart';
33
import 'package:flutter/services.dart';
44

5+
import '../../common/extensions/view_id_ext.dart';
6+
57
class ScribbleFocusable extends StatefulWidget {
68
const ScribbleFocusable({
79
required this.child,
@@ -87,10 +89,16 @@ class _ScribbleFocusableState extends State<ScribbleFocusable>
8789
if (!calculatedBounds.overlaps(rect)) {
8890
return false;
8991
}
92+
93+
final viewId = context.getViewId();
94+
if (viewId == null) {
95+
// Can't perform hit testing without a viewId
96+
return false;
97+
}
98+
9099
final intersection = calculatedBounds.intersect(rect);
91100
final result = HitTestResult();
92-
WidgetsBinding.instance
93-
.hitTestInView(result, intersection.center, View.of(context).viewId);
101+
WidgetsBinding.instance.hitTestInView(result, intersection.center, viewId);
94102
return result.path.any((entry) =>
95103
entry.target == _renderBoxForEditor ||
96104
entry.target == _renderBoxForBounds);

lib/src/editor/widgets/default_styles.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class DefaultListBlockStyle extends DefaultTextBlockStyle {
207207
checkboxUIBuilder ?? this.checkboxUIBuilder,
208208
indentWidthBuilder: indentWidthBuilder ?? this.indentWidthBuilder,
209209
numberPointWidthBuilder:
210-
numberPointWidthBuilder ?? this.numberPointWidthBuilder,
210+
numberPointWidthBuilder ?? this.numberPointWidthBuilder,
211211
);
212212
}
213213
}

0 commit comments

Comments
 (0)