From 771c994b0fd40f11923121680f1800292037b0c2 Mon Sep 17 00:00:00 2001 From: Mouad Debbar Date: Wed, 12 Nov 2025 15:56:01 -0500 Subject: [PATCH 1/4] Remove dart:html and drawImageScaled usages --- packages/camera/camera_web/CHANGELOG.md | 1 + packages/camera/camera_web/lib/src/camera.dart | 2 +- packages/cross_file/README.md | 2 +- .../image_picker/image_picker_for_web/CHANGELOG.md | 1 + .../image_picker_for_web/lib/src/image_resizer.dart | 2 +- .../example/lib/platforms/native_widget_web.dart | 10 +++++----- .../pointer_interceptor/example/pubspec.yaml | 1 + 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/camera/camera_web/CHANGELOG.md b/packages/camera/camera_web/CHANGELOG.md index 47a3f6ee516..26568582e57 100644 --- a/packages/camera/camera_web/CHANGELOG.md +++ b/packages/camera/camera_web/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Use `CanvasRenderingContext2D.drawImage` instead of the deprecated `drawImageScaled`. * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. ## 0.3.5 diff --git a/packages/camera/camera_web/lib/src/camera.dart b/packages/camera/camera_web/lib/src/camera.dart index e5926a78d94..bbfe18b491f 100644 --- a/packages/camera/camera_web/lib/src/camera.dart +++ b/packages/camera/camera_web/lib/src/camera.dart @@ -267,7 +267,7 @@ class Camera { ..scale(-1, 1); } - canvas.context2D.drawImageScaled( + canvas.context2D.drawImage( videoElement, 0, 0, diff --git a/packages/cross_file/README.md b/packages/cross_file/README.md index bfa7b3db65d..5fc52b5e644 100644 --- a/packages/cross_file/README.md +++ b/packages/cross_file/README.md @@ -46,7 +46,7 @@ programmatically. ## Testing This package supports both web and native platforms. Unit tests need to be split -in two separate suites (because native code cannot use `dart:html`, and web code +in two separate suites (because native code cannot use `package:web`, and web code cannot use `dart:io`). When adding new features, it is likely that tests need to be added for both the diff --git a/packages/image_picker/image_picker_for_web/CHANGELOG.md b/packages/image_picker/image_picker_for_web/CHANGELOG.md index 01e7a642f42..2dfac875264 100644 --- a/packages/image_picker/image_picker_for_web/CHANGELOG.md +++ b/packages/image_picker/image_picker_for_web/CHANGELOG.md @@ -1,5 +1,6 @@ ## NEXT +* Use `CanvasRenderingContext2D.drawImage` instead of the deprecated `drawImageScaled`. * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. ## 3.1.0 diff --git a/packages/image_picker/image_picker_for_web/lib/src/image_resizer.dart b/packages/image_picker/image_picker_for_web/lib/src/image_resizer.dart index d1dfd83d1fd..bf30deca3b2 100644 --- a/packages/image_picker/image_picker_for_web/lib/src/image_resizer.dart +++ b/packages/image_picker/image_picker_for_web/lib/src/image_resizer.dart @@ -83,7 +83,7 @@ class ImageResizer { if (maxHeight == null && maxWidth == null) { context.drawImage(source, 0, 0); } else { - context.drawImageScaled( + context.drawImage( source, 0, 0, diff --git a/packages/pointer_interceptor/pointer_interceptor/example/lib/platforms/native_widget_web.dart b/packages/pointer_interceptor/pointer_interceptor/example/lib/platforms/native_widget_web.dart index 7ee8d11aa89..732cc3fd8e6 100644 --- a/packages/pointer_interceptor/pointer_interceptor/example/lib/platforms/native_widget_web.dart +++ b/packages/pointer_interceptor/pointer_interceptor/example/lib/platforms/native_widget_web.dart @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:html' as html; import 'dart:ui_web' as ui_web; import 'package:flutter/material.dart'; +import 'package:web/web.dart' as web; -/// The html.Element that will be rendered underneath the flutter UI. -html.Element htmlElement = html.DivElement() +/// The web.HTMLElement that will be rendered underneath the flutter UI. +final web.HTMLElement htmlElement = web.HTMLDivElement() ..style.width = '100%' ..style.height = '100%' ..style.backgroundColor = '#fabada' @@ -17,7 +17,7 @@ html.Element htmlElement = html.DivElement() // See other examples commented out below... -// html.Element htmlElement = html.VideoElement() +// final web.HTMLElement htmlElement = web.HTMLVideoElement() // ..style.width = '100%' // ..style.height = '100%' // ..style.cursor = 'auto' @@ -27,7 +27,7 @@ html.Element htmlElement = html.DivElement() // ..poster = 'https://peach.blender.org/wp-content/uploads/title_anouncement.jpg?x11217' // ..controls = true; -// html.Element htmlElement = html.IFrameElement() +// final web.HTMLElement htmlElement = web.HTMLIFrameElement() // ..width = '100%' // ..height = '100%' // ..id = 'background-html-view' diff --git a/packages/pointer_interceptor/pointer_interceptor/example/pubspec.yaml b/packages/pointer_interceptor/pointer_interceptor/example/pubspec.yaml index 0d88e88744d..eb28f3a8e10 100644 --- a/packages/pointer_interceptor/pointer_interceptor/example/pubspec.yaml +++ b/packages/pointer_interceptor/pointer_interceptor/example/pubspec.yaml @@ -12,6 +12,7 @@ dependencies: sdk: flutter pointer_interceptor: path: ../ + web: ^1.0.0 dev_dependencies: flutter_test: From 72b20b4fef3451ad8222584d0750037f6953d609 Mon Sep 17 00:00:00 2001 From: Mouad Debbar Date: Thu, 13 Nov 2025 17:17:14 -0500 Subject: [PATCH 2/4] new version --- packages/camera/camera_web/CHANGELOG.md | 2 +- packages/camera/camera_web/pubspec.yaml | 2 +- packages/image_picker/image_picker_for_web/CHANGELOG.md | 2 +- packages/image_picker/image_picker_for_web/pubspec.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/camera/camera_web/CHANGELOG.md b/packages/camera/camera_web/CHANGELOG.md index 26568582e57..86d8c26e13a 100644 --- a/packages/camera/camera_web/CHANGELOG.md +++ b/packages/camera/camera_web/CHANGELOG.md @@ -1,4 +1,4 @@ -## NEXT +## 0.3.6 * Use `CanvasRenderingContext2D.drawImage` instead of the deprecated `drawImageScaled`. * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. diff --git a/packages/camera/camera_web/pubspec.yaml b/packages/camera/camera_web/pubspec.yaml index 045022e9405..1d20429580d 100644 --- a/packages/camera/camera_web/pubspec.yaml +++ b/packages/camera/camera_web/pubspec.yaml @@ -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 +version: 0.3.6 environment: sdk: ^3.8.0 diff --git a/packages/image_picker/image_picker_for_web/CHANGELOG.md b/packages/image_picker/image_picker_for_web/CHANGELOG.md index 2dfac875264..40d700bbad6 100644 --- a/packages/image_picker/image_picker_for_web/CHANGELOG.md +++ b/packages/image_picker/image_picker_for_web/CHANGELOG.md @@ -1,4 +1,4 @@ -## NEXT +## 3.1.1 * Use `CanvasRenderingContext2D.drawImage` instead of the deprecated `drawImageScaled`. * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. diff --git a/packages/image_picker/image_picker_for_web/pubspec.yaml b/packages/image_picker/image_picker_for_web/pubspec.yaml index 623c3d26edc..d3036f1ef0b 100644 --- a/packages/image_picker/image_picker_for_web/pubspec.yaml +++ b/packages/image_picker/image_picker_for_web/pubspec.yaml @@ -2,7 +2,7 @@ name: image_picker_for_web description: Web platform implementation of image_picker repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_for_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 -version: 3.1.0 +version: 3.1.1 environment: sdk: ^3.8.0 From b5975e26075f764d5509da24bff4dd1602b8c00e Mon Sep 17 00:00:00 2001 From: Mouad Debbar Date: Fri, 14 Nov 2025 12:31:57 -0500 Subject: [PATCH 3/4] bump cross_file version too --- packages/cross_file/CHANGELOG.md | 3 ++- packages/cross_file/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/cross_file/CHANGELOG.md b/packages/cross_file/CHANGELOG.md index 5f384d70580..0c18b1ea279 100644 --- a/packages/cross_file/CHANGELOG.md +++ b/packages/cross_file/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 0.3.6 +* Remove README mentions of `dart:html` with `package:web`. * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. ## 0.3.5 diff --git a/packages/cross_file/pubspec.yaml b/packages/cross_file/pubspec.yaml index 8b05c8bf69a..af3993fb751 100644 --- a/packages/cross_file/pubspec.yaml +++ b/packages/cross_file/pubspec.yaml @@ -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.5 +version: 0.3.6 environment: sdk: ^3.8.0 From de207fa75c4d1d1c0d670bbeee07550cd664346d Mon Sep 17 00:00:00 2001 From: Mouad Debbar Date: Mon, 17 Nov 2025 11:33:26 -0500 Subject: [PATCH 4/4] fix versions and CHANGELOG entries --- packages/camera/camera_web/CHANGELOG.md | 4 ++-- packages/camera/camera_web/pubspec.yaml | 2 +- packages/cross_file/CHANGELOG.md | 4 ++-- packages/cross_file/pubspec.yaml | 2 +- packages/image_picker/image_picker_for_web/CHANGELOG.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/camera/camera_web/CHANGELOG.md b/packages/camera/camera_web/CHANGELOG.md index 86d8c26e13a..6fb3e44569c 100644 --- a/packages/camera/camera_web/CHANGELOG.md +++ b/packages/camera/camera_web/CHANGELOG.md @@ -1,6 +1,6 @@ -## 0.3.6 +## 0.3.5+1 -* Use `CanvasRenderingContext2D.drawImage` instead of the deprecated `drawImageScaled`. +* Uses `CanvasRenderingContext2D.drawImage` instead of the deprecated `drawImageScaled`. * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. ## 0.3.5 diff --git a/packages/camera/camera_web/pubspec.yaml b/packages/camera/camera_web/pubspec.yaml index 1d20429580d..0b8f161a6e0 100644 --- a/packages/camera/camera_web/pubspec.yaml +++ b/packages/camera/camera_web/pubspec.yaml @@ -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.6 +version: 0.3.5+1 environment: sdk: ^3.8.0 diff --git a/packages/cross_file/CHANGELOG.md b/packages/cross_file/CHANGELOG.md index 0c18b1ea279..7f37f7bd53d 100644 --- a/packages/cross_file/CHANGELOG.md +++ b/packages/cross_file/CHANGELOG.md @@ -1,6 +1,6 @@ -## 0.3.6 +## 0.3.5+1 -* Remove README mentions of `dart:html` with `package:web`. +* Replaces README mentions of `dart:html` with `package:web`. * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. ## 0.3.5 diff --git a/packages/cross_file/pubspec.yaml b/packages/cross_file/pubspec.yaml index af3993fb751..532f392faef 100644 --- a/packages/cross_file/pubspec.yaml +++ b/packages/cross_file/pubspec.yaml @@ -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.6 +version: 0.3.5+1 environment: sdk: ^3.8.0 diff --git a/packages/image_picker/image_picker_for_web/CHANGELOG.md b/packages/image_picker/image_picker_for_web/CHANGELOG.md index 40d700bbad6..b515ede46f8 100644 --- a/packages/image_picker/image_picker_for_web/CHANGELOG.md +++ b/packages/image_picker/image_picker_for_web/CHANGELOG.md @@ -1,6 +1,6 @@ ## 3.1.1 -* Use `CanvasRenderingContext2D.drawImage` instead of the deprecated `drawImageScaled`. +* Uses `CanvasRenderingContext2D.drawImage` instead of the deprecated `drawImageScaled`. * Updates minimum supported SDK version to Flutter 3.32/Dart 3.8. ## 3.1.0