flutter/packages
1
0
Fork 0
mirror of https://github.com/flutter/packages.git synced 2025-07-04 09:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

[web] Removes a few deprecated API usages. (#6177)

Browse Source 
This PR removes a bunch of deprecated APIs from the following packages:

* `web_benchmarks`
* `file_selector_web`
* `cross_file`
* `image_picker_platform_interface`

## Issues

* Fixes https://github.com/flutter/flutter/issues/143113
* Fixes https://github.com/flutter/flutter/issues/143399
* Fixes https://github.com/flutter/flutter/issues/143878
* Fixes https://github.com/flutter/flutter/issues/143892
* Closes https://github.com/flutter/packages/pull/5248
This commit is contained in:
David Iglesias
2024-02-22 14:31:42 -08:00
committed by GitHub
parent 67470fc95e
commit 7df2085c80
17 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/cross_file/CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 0.3.4+1
* Removes a few deprecated API usages.
## 0.3.4
* Updates to web code to package `web: ^0.5.0`.

30
packages/cross_file/lib/src/types/html.dart
View File

@ -8,7 +8,7 @@ import 'dart:js_interop';
import 'dart:typed_data';
import 'package:meta/meta.dart';
import 'package:web/helpers.dart';
import 'package:web/web.dart';
import '../web_helpers/web_helpers.dart';
import 'base.dart';
@ -133,22 +133,26 @@ class XFile extends XFileBase {
throw Exception('Safari cannot handle XFiles larger than 4GB.');
}
final Completer<Blob> blobCompleter = Completer<Blob>();
late XMLHttpRequest request;
try {
request = await HttpRequest.request(path, responseType: 'blob');
} on ProgressEvent catch (e) {
request = XMLHttpRequest()
..open('get', path, true)
..responseType = 'blob'
..onLoad.listen((ProgressEvent e) {
assert(request.response != null,
'The Blob backing this XFile cannot be null!');
blobCompleter.complete(request.response! as Blob);
})
..onError.listen((ProgressEvent e) {
if (e.type == 'error') {
throw Exception(
'Could not load Blob from its URL. Has it been revoked?');
}
rethrow;
blobCompleter.completeError(Exception(
'Could not load Blob from its URL. Has it been revoked?'));
}
})
..send();
_browserBlob = request.response as Blob?;
assert(_browserBlob != null, 'The Blob backing this XFile cannot be null!');
return _browserBlob!;
return blobCompleter.future;
}
@override

6
packages/cross_file/lib/src/web_helpers/web_helpers.dart
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:web/helpers.dart';
import 'package:web/web.dart';
/// Create anchor element with download attribute
HTMLAnchorElement createAnchorElement(String href, String? suggestedName) =>
@ -20,11 +20,11 @@ void addElementToContainerAndClick(Element container, HTMLElement element) {
/// Initializes a DOM container where elements can be injected.
Element ensureInitialized(String id) {
Element? target = querySelector('#$id');
Element? target = document.querySelector('#$id');
if (target == null) {
final Element targetElement = document.createElement('flt-x-file')..id = id;
querySelector('body')!.appendChild(targetElement);
document.body!.appendChild(targetElement);
target = targetElement;
}
return target;

2
packages/cross_file/pubspec.yaml
View File

@ -2,7 +2,7 @@ name: cross_file
description: An abstraction to allow working with files across multiple platforms.
repository: https://github.com/flutter/packages/tree/main/packages/cross_file
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+cross_file%22
version: 0.3.4
version: 0.3.4+1
environment:
sdk: ^3.3.0

6
packages/cross_file/test/x_file_html_test.dart
View File

@ -11,7 +11,7 @@ import 'dart:typed_data';
import 'package:cross_file/cross_file.dart';
import 'package:test/test.dart';
import 'package:web/helpers.dart' as html;
import 'package:web/web.dart' as html;
const String expectedStringContents = 'Hello, world! I ❤ ñ! 空手';
final Uint8List bytes = Uint8List.fromList(utf8.encode(expectedStringContents));
@ -95,7 +95,7 @@ void main() {
await file.saveTo('');
final html.Element? container =
html.querySelector('#$crossFileDomElementId');
html.document.querySelector('#$crossFileDomElementId');
expect(container, isNotNull);
});
@ -106,7 +106,7 @@ void main() {
await file.saveTo('path');
final html.Element container =
html.querySelector('#$crossFileDomElementId')!;
html.document.querySelector('#$crossFileDomElementId')!;
late html.HTMLAnchorElement element;
for (int i = 0; i < container.childNodes.length; i++) {

4
packages/file_selector/file_selector_web/CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 0.9.4+1
* Removes a few deprecated API usages.
## 0.9.4
* Updates web code to package `web: ^0.5.0`.

5
packages/file_selector/file_selector_web/example/integration_test/dom_helper_test.dart
View File

@ -8,7 +8,7 @@ import 'package:file_selector_platform_interface/file_selector_platform_interfac
import 'package:file_selector_web/src/dom_helper.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
import 'package:web/helpers.dart';
import 'package:web/web.dart';
void main() {
group('dom_helper', () {
@ -41,7 +41,8 @@ void main() {
setUp(() {
domHelper = DomHelper();
input = (createElementTag('input') as HTMLInputElement)..type = 'file';
input = (document.createElement('input') as HTMLInputElement)
..type = 'file';
});
group('getFiles', () {

2
packages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart
View File

@ -9,7 +9,7 @@ import 'package:file_selector_web/file_selector_web.dart';
import 'package:file_selector_web/src/dom_helper.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
import 'package:web/helpers.dart';
import 'package:web/web.dart';
void main() {
group('FileSelectorWeb', () {

2
packages/file_selector/file_selector_web/lib/src/dom_helper.dart
View File

@ -8,7 +8,7 @@ import 'dart:js_interop';
import 'package:file_selector_platform_interface/file_selector_platform_interface.dart';
import 'package:flutter/foundation.dart' show visibleForTesting;
import 'package:flutter/services.dart';
import 'package:web/helpers.dart';
import 'package:web/web.dart';
/// Class to manipulate the DOM with the intention of reading files from it.
class DomHelper {

2
packages/file_selector/file_selector_web/pubspec.yaml
View File

@ -2,7 +2,7 @@ name: file_selector_web
description: Web platform implementation of file_selector
repository: https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_web
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
version: 0.9.4
version: 0.9.4+1
environment:
sdk: ^3.3.0

5
packages/image_picker/image_picker_platform_interface/CHANGELOG.md
View File

@ -1,6 +1,7 @@
## NEXT
## 2.9.4
* Updates minimum supported SDK version to Flutter 3.13/Dart 3.1.
* Updates minimum supported SDK version to Flutter 3.19/Dart 3.3.
* Removes a few deprecated API usages.
## 2.9.3

2
packages/image_picker/image_picker_platform_interface/lib/src/types/picked_file/html.dart
View File

@ -27,7 +27,7 @@ class PickedFile extends PickedFileBase {
Future<Uint8List> get _bytes async {
if (_initBytes != null) {
return Future<Uint8List>.value(UnmodifiableUint8ListView(_initBytes!));
return _initBytes.asUnmodifiableView();
}
return http.readBytes(Uri.parse(path));
}

6
packages/image_picker/image_picker_platform_interface/pubspec.yaml
View File

@ -4,11 +4,11 @@ repository: https://github.com/flutter/packages/tree/main/packages/image_picker/
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
# NOTE: We strongly prefer non-breaking changes, even at the expense of a
# less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
version: 2.9.3
version: 2.9.4
environment:
sdk: ^3.1.0
flutter: ">=3.13.0"
sdk: ^3.3.0
flutter: ">=3.19.0"
dependencies:
cross_file: ^0.3.1+1

4
packages/web_benchmarks/CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 1.2.1
* Removes a few deprecated API usages.
## 1.2.0
* Updates to web code to package `web: ^0.5.0`.

14
packages/web_benchmarks/lib/client.dart
View File

@ -318,7 +318,7 @@ class LocalBenchmarkServerClient {
/// DevTools Protocol.
Future<void> startPerformanceTracing(String? benchmarkName) async {
_checkNotManualMode();
await HttpRequest.request(
await _requestXhr(
'/start-performance-tracing?label=$benchmarkName',
method: 'POST',
mimeType: 'application/json',
@ -328,7 +328,7 @@ class LocalBenchmarkServerClient {
/// Stops the performance tracing session started by [startPerformanceTracing].
Future<void> stopPerformanceTracing() async {
_checkNotManualMode();
await HttpRequest.request(
await _requestXhr(
'/stop-performance-tracing',
method: 'POST',
mimeType: 'application/json',
@ -356,7 +356,7 @@ class LocalBenchmarkServerClient {
/// The server will halt the devicelab task and log the error.
Future<void> reportError(dynamic error, StackTrace stackTrace) async {
_checkNotManualMode();
await HttpRequest.request(
await _requestXhr(
'/on-error',
method: 'POST',
mimeType: 'application/json',
@ -370,7 +370,7 @@ class LocalBenchmarkServerClient {
/// Reports a message about the demo to the benchmark server.
Future<void> printToConsole(String report) async {
_checkNotManualMode();
await HttpRequest.request(
await _requestXhr(
'/print-to-console',
method: 'POST',
mimeType: 'text/plain',
@ -384,7 +384,7 @@ class LocalBenchmarkServerClient {
String url, {
required String method,
required String mimeType,
required String sendData,
String? sendData,
}) {
final Completer<XMLHttpRequest> completer = Completer<XMLHttpRequest>();
final XMLHttpRequest xhr = XMLHttpRequest();
@ -394,7 +394,11 @@ class LocalBenchmarkServerClient {
completer.complete(xhr);
});
xhr.onError.listen(completer.completeError);
if (sendData != null) {
xhr.send(sendData.toJS);
} else {
xhr.send();
}
return completer.future;
}
}

5
packages/web_benchmarks/lib/src/recorder.dart
View File

@ -248,6 +248,7 @@ abstract class SceneBuilderRecorder extends Recorder {
}
};
PlatformDispatcher.instance.onDrawFrame = () {
final FlutterView? view = PlatformDispatcher.instance.implicitView;
try {
_profile.record('drawFrameDuration', () {
final SceneBuilder sceneBuilder = SceneBuilder();
@ -255,7 +256,9 @@ abstract class SceneBuilderRecorder extends Recorder {
_profile.record('sceneBuildDuration', () {
final Scene scene = sceneBuilder.build();
_profile.record('windowRenderDuration', () {
window.render(scene);
assert(view != null,
'Cannot profile windowRenderDuration on a null View.');
view!.render(scene);
}, reported: false);
}, reported: false);
}, reported: true);

3
packages/web_benchmarks/pubspec.yaml
View File

@ -2,7 +2,7 @@ name: web_benchmarks
description: A benchmark harness for performance-testing Flutter apps in Chrome.
repository: https://github.com/flutter/packages/tree/main/packages/web_benchmarks
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+web_benchmarks%22
version: 1.2.0
version: 1.2.1
environment:
sdk: ^3.3.0
@ -14,7 +14,6 @@ dependencies:
sdk: flutter
flutter_test:
sdk: flutter
http: ^1.0.0
logging: ^1.0.2
meta: ^1.7.0
path: ^1.8.0