Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[web] @JS('Intl') #39211

Merged
merged 4 commits into from
Jan 30, 2023
Merged

[web] @JS('Intl') #39211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fd6dc6
[web] @JS('Intl')
mdebbar Jan 27, 2023
d475221
Fix call sites
mdebbar Jan 27, 2023
4a4f511
Merge branch 'main' into dom_intl
mdebbar Jan 30, 2023
0e6d1ec
one more place
mdebbar Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/web_ui/lib/src/engine/dom.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ extension DomWindowExtension on DomWindow {
/// The Trusted Types API (when available).
/// See: https://developer.mozilla.org/en-US/docs/Web/API/Trusted_Types_API
external DomTrustedTypePolicyFactory? get trustedTypes;

// ignore: non_constant_identifier_names
external DomIntl get Intl;
}

typedef DomRequestAnimationFrameCallback = void Function(num highResTime);
Expand All @@ -83,6 +80,9 @@ extension DomConsoleExtension on DomConsole {
@JS('window')
external DomWindow get domWindow;

@JS('Intl')
external DomIntl get domIntl;

@JS()
@staticInterop
class DomNavigator {}
Expand Down Expand Up @@ -1815,7 +1815,7 @@ extension DomV8BreakIteratorExtension on DomV8BreakIterator {
}

DomV8BreakIterator createV8BreakIterator() {
final Object? v8BreakIterator = domWindow.Intl.v8BreakIterator;
final Object? v8BreakIterator = domIntl.v8BreakIterator;
if (v8BreakIterator == null) {
throw UnimplementedError('v8BreakIterator is not supported.');
}
Expand Down
4 changes: 2 additions & 2 deletions lib/web_ui/lib/src/engine/text/line_breaker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ enum LineBreakType {
/// Splits [text] into fragments based on line breaks.
abstract class LineBreakFragmenter extends TextFragmenter {
factory LineBreakFragmenter(String text) {
if (domWindow.Intl.v8BreakIterator != null) {
if (domIntl.v8BreakIterator != null) {
return V8LineBreakFragmenter(text);
}
return FWLineBreakFragmenter(text);
Expand All @@ -66,7 +66,7 @@ class FWLineBreakFragmenter extends TextFragmenter implements LineBreakFragmente
/// `v8BreakIterator` API to find line breaks in the given [text].
class V8LineBreakFragmenter extends TextFragmenter implements LineBreakFragmenter {
V8LineBreakFragmenter(super.text)
: assert(domWindow.Intl.v8BreakIterator != null);
: assert(domIntl.v8BreakIterator != null);

@override
List<LineBreakFragment> fragment() {
Expand Down
2 changes: 1 addition & 1 deletion lib/web_ui/test/text/line_breaker_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ void groupForEachFragmenter(GroupBody callback) {
() => callback(isV8: false),
);

if (domWindow.Intl.v8BreakIterator != null) {
if (domIntl.v8BreakIterator != null) {
group(
'$V8LineBreakFragmenter',
() => callback(isV8: true),
Expand Down