Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions packages/camera/camera_web/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.3.5+3

* Fixes camera initialization failure on Safari by fixing a null check operator error using
a nullable getter and null safe practices.

## 0.3.5+2

* Fixes camera initialization failure on Firefox Android by using `{video: true}` instead
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,29 @@ void main() {

expect(facingMode, isNull);
});

testWidgets('returns null '
'when the facing mode setting is empty and '
'the facingMode capability is null', (WidgetTester tester) async {
mockVideoTrack.getSettings = () {
return createJSInteropWrapper(FakeMediaTrackSettings())
as web.MediaTrackSettings;
}.toJS;
mockVideoTrack.getCapabilities = () {
return createJSInteropWrapper(FakeMediaTrackCapabilities())
as web.MediaTrackCapabilities;
}.toJS;

when(
jsUtil.hasProperty(videoTrack, 'getCapabilities'.toJS),
).thenReturn(true);

final String? facingMode = cameraService.getFacingModeForVideoTrack(
videoTrack,
);

expect(facingMode, isNull);
});
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -284,3 +284,23 @@ class MockEventStreamProvider<T extends web.Event> extends Mock
as ElementStream<T>;
}
}

/// A fake [web.MediaTrackCapabilities] where facingMode is null/undefined.
///
/// Used to test null-safe handling when the browser doesn't provide
/// the facingMode capability.
@JSExport()
class FakeMediaTrackCapabilities {
// Dummy property required by @JSExport
bool get dummy => true;
}

/// A fake [web.MediaTrackSettings] where facingMode is null/undefined.
///
/// Used to test null-safe handling when the browser doesn't provide
/// the facingMode capability.
@JSExport()
class FakeMediaTrackSettings {
// Dummy property required by @JSExport
bool get dummy => true;
}
10 changes: 5 additions & 5 deletions packages/camera/camera_web/lib/src/camera_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,11 @@ class CameraService {

// A list of facing mode capabilities as
// the camera may support multiple facing modes.
final List<String> facingModeCapabilities = videoTrackCapabilities
.facingMode
.toDart
.map((JSString e) => e.toDart)
.toList();
final List<String> facingModeCapabilities =
videoTrackCapabilities.facingModeNullable?.toDart
.map((JSString e) => e.toDart)
.toList() ??
<String>[];

if (facingModeCapabilities.isNotEmpty) {
final String facingModeCapability = facingModeCapabilities.first;
Expand Down
3 changes: 3 additions & 0 deletions packages/camera/camera_web/lib/src/pkg_web_tweaks.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ extension NonStandardFieldsOnMediaTrackCapabilities on MediaTrackCapabilities {

@JS('torch')
external JSArray<JSBoolean>? get torchNullable;

@JS('facingMode')
external JSArray<JSString>? get facingModeNullable;
}

/// Adds missing fields to [MediaTrackSettings]
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_web/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: camera_web
description: A Flutter plugin for getting information about and controlling the camera on Web.
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_web
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
version: 0.3.5+2
version: 0.3.5+3

environment:
sdk: ^3.8.0
Expand Down