Merge branch 'flutter:main' into feature/google_maps_flutter_platform…

…_interface_marker_clustering
flutter · Feb 23, 2024 · 14096cb · 14096cb
2 parents b3da94c + 7df2085
commit 14096cb
Show file tree

Hide file tree

Showing 21 changed files with 576 additions and 46 deletions.
diff --git a/packages/cross_file/CHANGELOG.md b/packages/cross_file/CHANGELOG.md
@@ -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`.

diff --git a/packages/cross_file/lib/src/types/html.dart b/packages/cross_file/lib/src/types/html.dart
@@ -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.');
     }
 
-    late XMLHttpRequest request;
-    try {
-      request = await HttpRequest.request(path, responseType: 'blob');
-    } on ProgressEvent catch (e) {
-      if (e.type == 'error') {
-        throw Exception(
-            'Could not load Blob from its URL. Has it been revoked?');
-      }
-      rethrow;
-    }
-
-    _browserBlob = request.response as Blob?;
+    final Completer<Blob> blobCompleter = Completer<Blob>();
 
-    assert(_browserBlob != null, 'The Blob backing this XFile cannot be null!');
-
-    return _browserBlob!;
+    late XMLHttpRequest request;
+    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') {
+          blobCompleter.completeError(Exception(
+              'Could not load Blob from its URL. Has it been revoked?'));
+        }
+      })
+      ..send();
+
+    return blobCompleter.future;
   }
 
   @override

diff --git a/packages/cross_file/lib/src/web_helpers/web_helpers.dart b/packages/cross_file/lib/src/web_helpers/web_helpers.dart
@@ -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;

diff --git 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.4
+version: 0.3.4+1
 
 environment:
   sdk: ^3.3.0

diff --git a/packages/cross_file/test/x_file_html_test.dart b/packages/cross_file/test/x_file_html_test.dart
@@ -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++) {

diff --git a/packages/file_selector/file_selector_web/CHANGELOG.md b/packages/file_selector/file_selector_web/CHANGELOG.md
@@ -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`.

diff --git a/packages/file_selector/file_selector_web/example/integration_test/dom_helper_test.dart b/packages/file_selector/file_selector_web/example/integration_test/dom_helper_test.dart
@@ -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', () {

diff --git a/...ages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart b/...ages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart
@@ -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', () {

diff --git a/packages/file_selector/file_selector_web/lib/src/dom_helper.dart b/packages/file_selector/file_selector_web/lib/src/dom_helper.dart
@@ -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 {

diff --git a/packages/file_selector/file_selector_web/pubspec.yaml b/packages/file_selector/file_selector_web/pubspec.yaml
@@ -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

diff --git a/packages/image_picker/image_picker_platform_interface/CHANGELOG.md b/packages/image_picker/image_picker_platform_interface/CHANGELOG.md
@@ -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
 

diff --git a/packages/image_picker/image_picker_platform_interface/lib/src/types/picked_file/html.dart b/packages/image_picker/image_picker_platform_interface/lib/src/types/picked_file/html.dart
@@ -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));
   }

diff --git a/packages/image_picker/image_picker_platform_interface/pubspec.yaml b/packages/image_picker/image_picker_platform_interface/pubspec.yaml
@@ -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

diff --git a/packages/two_dimensional_scrollables/CHANGELOG.md b/packages/two_dimensional_scrollables/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.1
+
+* Fixes a layout issue when pinned cells are merged.
+
 ## 0.1.0
 
 * [Breaking change] Adds support for merged cells in the TableView.

diff --git a/packages/two_dimensional_scrollables/lib/src/table_view/table.dart b/packages/two_dimensional_scrollables/lib/src/table_view/table.dart
@@ -801,15 +801,41 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
             //       | <--------- extent of merged cell ---------> |
 
             // Compute height and layout offset for merged rows.
-            mergedRowOffset = -verticalOffset.pixels +
+            final bool rowIsInPinnedColumn = _lastPinnedColumn != null &&
+                vicinity.column <= _lastPinnedColumn!;
+            final bool rowIsPinned =
+                _lastPinnedRow != null && firstRow <= _lastPinnedRow!;
+            final double baseRowOffset =
+                switch ((rowIsInPinnedColumn, rowIsPinned)) {
+              // Both row and column are pinned at this cell, or just pinned row.
+              (true, true) || (false, true) => 0.0,
+              // Cell is within a pinned column
+              (true, false) => _pinnedRowsExtent - verticalOffset.pixels,
+              // Cell is within a pinned row, or no pinned portion.
+              (false, false) => -verticalOffset.pixels,
+            };
+            mergedRowOffset = baseRowOffset +
                 _rowMetrics[firstRow]!.leadingOffset +
                 _rowMetrics[firstRow]!.configuration.padding.leading;
             mergedRowHeight = _rowMetrics[lastRow]!.trailingOffset -
                 _rowMetrics[firstRow]!.leadingOffset -
                 _rowMetrics[lastRow]!.configuration.padding.trailing -
                 _rowMetrics[firstRow]!.configuration.padding.leading;
             // Compute width and layout offset for merged columns.
-            mergedColumnOffset = -horizontalOffset.pixels +
+            final bool columnIsInPinnedRow =
+                _lastPinnedRow != null && vicinity.row <= _lastPinnedRow!;
+            final bool columnIsPinned =
+                _lastPinnedColumn != null && firstColumn <= _lastPinnedColumn!;
+            final double baseColumnOffset =
+                switch ((columnIsInPinnedRow, columnIsPinned)) {
+              // Both row and column are pinned at this cell, or just pinned column.
+              (true, true) || (false, true) => 0.0,
+              // Cell is within a pinned row.
+              (true, false) => _pinnedColumnsExtent - horizontalOffset.pixels,
+              // No pinned portion.
+              (false, false) => -horizontalOffset.pixels,
+            };
+            mergedColumnOffset = baseColumnOffset +
                 _columnMetrics[firstColumn]!.leadingOffset +
                 _columnMetrics[firstColumn]!.configuration.padding.leading;
             mergedColumnWidth = _columnMetrics[lastColumn]!.trailingOffset -

diff --git a/packages/two_dimensional_scrollables/pubspec.yaml b/packages/two_dimensional_scrollables/pubspec.yaml
@@ -1,6 +1,6 @@
 name: two_dimensional_scrollables
 description: Widgets that scroll using the two dimensional scrolling foundation.
-version: 0.1.0
+version: 0.1.1
 repository: https://github.com/flutter/packages/tree/main/packages/two_dimensional_scrollables
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+two_dimensional_scrollables%22+