Merge branch 'main' into beta

flutter · Jan 31, 2024 · 765c711 · 765c711
2 parents 3e27e14 + 176c565
commit 765c711
Show file tree

Hide file tree

Showing 37 changed files with 784 additions and 13,815 deletions.
diff --git a/experimental/material_3_demo/lib/main.dart b/experimental/material_3_demo/lib/main.dart
@@ -2,12 +2,31 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
+import 'package:web_startup_analyzer/web_startup_analyzer.dart';
 
 import 'constants.dart';
 import 'home.dart';
 
-void main() {
+void main() async {
+  var analyzer = WebStartupAnalyzer(additionalFrameCount: 10);
+  debugPrint(json.encode(analyzer.startupTiming));
+  analyzer.onFirstFrame.addListener(() {
+    debugPrint(json.encode({'firstFrame': analyzer.onFirstFrame.value}));
+  });
+  analyzer.onFirstPaint.addListener(() {
+    debugPrint(json.encode({
+      'firstPaint': analyzer.onFirstPaint.value?.$1,
+      'firstContentfulPaint': analyzer.onFirstPaint.value?.$2,
+    }));
+  });
+  analyzer.onAdditionalFrames.addListener(() {
+    debugPrint(json.encode({
+      'additionalFrames': analyzer.onAdditionalFrames.value,
+    }));
+  });
   runApp(
     const App(),
   );

diff --git a/experimental/material_3_demo/pubspec.yaml b/experimental/material_3_demo/pubspec.yaml
@@ -9,13 +9,16 @@ version: 1.0.0+1
 
 environment:
   sdk: ^3.2.0
+  flutter: ^3.16.0
 
 dependencies:
   flutter:
     sdk: flutter
 
   cupertino_icons: ^1.0.2
   url_launcher: ^6.1.8
+  web_startup_analyzer:
+    path: ../../web/_packages/web_startup_analyzer
 
 dev_dependencies:
   analysis_defaults:

diff --git a/experimental/material_3_demo/web/index.html b/experimental/material_3_demo/web/index.html
@@ -38,22 +38,30 @@
   </script>
   <!-- This script adds the flutter initialization JS code -->
   <script src="flutter.js" defer></script>
+  <script type="text/javascript" src="assets/packages/web_startup_analyzer/lib/web_startup_analyzer.js"></script>
 </head>
 <body>
-  <script>
-    window.addEventListener('load', function(ev) {
-      // Download main.dart.js
-      _flutter.loader.loadEntrypoint({
-        serviceWorker: {
-          serviceWorkerVersion: serviceWorkerVersion,
-        },
-        onEntrypointLoaded: function(engineInitializer) {
-          engineInitializer.initializeEngine().then(function(appRunner) {
-            appRunner.runApp();
-          });
-        }
-      });
+<script>
+  var flutterWebStartupAnalyzer = new FlutterWebStartupAnalyzer();
+  var analyzer = flutterWebStartupAnalyzer;
+
+  window.addEventListener('load', function(ev) {
+    analyzer.markStart("loadEntrypoint");
+    _flutter.loader.loadEntrypoint({
+      serviceWorker: {
+        serviceWorkerVersion: serviceWorkerVersion,
+      },
+      onEntrypointLoaded: function(engineInitializer) {
+        analyzer.markFinished("loadEntrypoint");
+        analyzer.markStart("initializeEngine");
+        engineInitializer.initializeEngine().then(function(appRunner) {
+          analyzer.markFinished("initializeEngine");
+          analyzer.markStart("appRunnerRunApp");
+          appRunner.runApp();
+        });
+      }
     });
-  </script>
+  });
+</script>
 </body>
 </html>
diff --git a/simplistic_editor/lib/basic_text_field.dart b/simplistic_editor/lib/basic_text_field.dart
@@ -28,6 +28,8 @@ class BasicTextField extends StatefulWidget {
     VoidCallback? onSelectAll,
     VoidCallback? onLookUp,
     VoidCallback? onLiveTextInput,
+    VoidCallback? onSearchWeb,
+    VoidCallback? onShare,
     TextSelectionToolbarAnchors anchors,
   ) {
     return AdaptiveTextSelectionToolbar.editable(
@@ -38,10 +40,9 @@ class BasicTextField extends StatefulWidget {
       onSelectAll: onSelectAll,
       onLookUp: onLookUp,
       onLiveTextInput: onLiveTextInput,
+      onSearchWeb: onSearchWeb,
+      onShare: onShare,
       anchors: anchors,
-      // TODO(Renzo-Olivares): https://github.com/flutter/samples/issues/2088
-      onSearchWeb: null,
-      onShare: null,
     );
   }
 

diff --git a/simplistic_editor/lib/basic_text_input_client.dart b/simplistic_editor/lib/basic_text_input_client.dart
@@ -26,6 +26,8 @@ typedef BasicTextFieldContextMenuBuilder = Widget Function(
   VoidCallback? onSelectAll,
   VoidCallback? onLookUp,
   VoidCallback? onLiveTextInput,
+  VoidCallback? onSearchWeb,
+  VoidCallback? onShare,
   TextSelectionToolbarAnchors anchors,
 );
 
@@ -867,6 +869,13 @@ class BasicTextInputClientState extends State<BasicTextInputClient>
                 liveTextInputEnabled
                     ? () => _startLiveTextInput(SelectionChangedCause.toolbar)
                     : null,
+                searchWebEnabled
+                    ? () =>
+                        _searchWebForSelection(SelectionChangedCause.toolbar)
+                    : null,
+                shareEnabled
+                    ? () => _shareSelection(SelectionChangedCause.toolbar)
+                    : null,
                 _contextMenuAnchors,
               );
             },
@@ -1016,6 +1025,65 @@ class BasicTextInputClientState extends State<BasicTextInputClient>
     );
   }
 
+  @override
+  bool get searchWebEnabled {
+    if (defaultTargetPlatform != TargetPlatform.iOS) {
+      return false;
+    }
+
+    return !textEditingValue.selection.isCollapsed &&
+        textEditingValue.selection.textInside(textEditingValue.text).trim() !=
+            '';
+  }
+
+  /// Launch a web search on the current selection,
+  /// as in the "Search Web" edit menu button on iOS.
+  ///
+  /// Currently this is only implemented for iOS.
+  Future<void> _searchWebForSelection(SelectionChangedCause cause) async {
+    final String text =
+        textEditingValue.selection.textInside(textEditingValue.text);
+    if (text.isNotEmpty) {
+      await SystemChannels.platform.invokeMethod(
+        'SearchWeb.invoke',
+        text,
+      );
+    }
+  }
+
+  @override
+  bool get shareEnabled {
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+      case TargetPlatform.iOS:
+        return !textEditingValue.selection.isCollapsed &&
+            textEditingValue.selection
+                    .textInside(textEditingValue.text)
+                    .trim() !=
+                '';
+      case TargetPlatform.macOS:
+      case TargetPlatform.fuchsia:
+      case TargetPlatform.linux:
+      case TargetPlatform.windows:
+        return false;
+    }
+  }
+
+  /// Launch the share interface for the current selection,
+  /// as in the "Share..." edit menu button on iOS.
+  ///
+  /// Currently this is only implemented for iOS and Android.
+  Future<void> _shareSelection(SelectionChangedCause cause) async {
+    final String text =
+        textEditingValue.selection.textInside(textEditingValue.text);
+    if (text.isNotEmpty) {
+      await SystemChannels.platform.invokeMethod(
+        'Share.invoke',
+        text,
+      );
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Actions(

diff --git a/tool/flutter_ci_script_beta.sh b/tool/flutter_ci_script_beta.sh
@@ -32,7 +32,8 @@ declare -ar PROJECT_NAMES=(
     "experimental/federated_plugin/federated_plugin_web"
     "experimental/federated_plugin/federated_plugin_windows"
     "experimental/linting_tool"
-    "experimental/material_3_demo"
+    # TODO(DomesticMouse): re-enable once deps allow
+    # "experimental/material_3_demo"
     "experimental/pedometer"
     "experimental/pedometer/example"
      "experimental/varfont_shader_puzzle"

diff --git a/tool/flutter_ci_script_master.sh b/tool/flutter_ci_script_master.sh
@@ -54,7 +54,7 @@ declare -ar PROJECT_NAMES=(
     "provider_shopper"
     "simple_shader"
     "simplistic_calculator"
-    # TODO(DomesticMouse): The method 'isSelectionWithinTextBounds' isn't defined for the type 'TextEditingController'.
+    # TODO(DomesticMouse): The method 'isSelectionWithinTextBounds' isn't defined for the type 'TextEditingController'
     # "simplistic_editor"
     "testing_app"
     "veggieseasons"

diff --git a/tool/flutter_ci_script_stable.sh b/tool/flutter_ci_script_stable.sh
@@ -32,7 +32,8 @@ declare -ar PROJECT_NAMES=(
     "experimental/federated_plugin/federated_plugin_web"
     "experimental/federated_plugin/federated_plugin_windows"
     "experimental/linting_tool"
-    "experimental/material_3_demo"
+    # TODO(DomesticMouse): re-enable once deps allow
+    # "experimental/material_3_demo"
     "experimental/pedometer"
     "experimental/pedometer/example"
     "experimental/varfont_shader_puzzle"

diff --git a/web/_packages/web_startup_analyzer/.gitignore b/web/_packages/web_startup_analyzer/.gitignore
@@ -0,0 +1,29 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+.dart_tool/
+build/
diff --git a/web/_packages/web_startup_analyzer/.metadata b/web/_packages/web_startup_analyzer/.metadata
@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "f5fb61b953a631f47191124a31169701911ee1f4"
+  channel: "main"
+
+project_type: package
diff --git a/web/_packages/web_startup_analyzer/analysis_options.yaml b/web/_packages/web_startup_analyzer/analysis_options.yaml
@@ -0,0 +1,4 @@
+include: package:flutter_lints/flutter.yaml
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/web/_packages/web_startup_analyzer/example/.gitignore b/web/_packages/web_startup_analyzer/example/.gitignore
@@ -0,0 +1,43 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.pub-cache/
+.pub/
+/build/
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/web/_packages/web_startup_analyzer/example/.metadata b/web/_packages/web_startup_analyzer/example/.metadata
@@ -0,0 +1,45 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "f5fb61b953a631f47191124a31169701911ee1f4"
+  channel: "main"
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: f5fb61b953a631f47191124a31169701911ee1f4
+      base_revision: f5fb61b953a631f47191124a31169701911ee1f4
+    - platform: android
+      create_revision: f5fb61b953a631f47191124a31169701911ee1f4
+      base_revision: f5fb61b953a631f47191124a31169701911ee1f4
+    - platform: ios
+      create_revision: f5fb61b953a631f47191124a31169701911ee1f4
+      base_revision: f5fb61b953a631f47191124a31169701911ee1f4
+    - platform: linux
+      create_revision: f5fb61b953a631f47191124a31169701911ee1f4
+      base_revision: f5fb61b953a631f47191124a31169701911ee1f4
+    - platform: macos
+      create_revision: f5fb61b953a631f47191124a31169701911ee1f4
+      base_revision: f5fb61b953a631f47191124a31169701911ee1f4
+    - platform: web
+      create_revision: f5fb61b953a631f47191124a31169701911ee1f4
+      base_revision: f5fb61b953a631f47191124a31169701911ee1f4
+    - platform: windows
+      create_revision: f5fb61b953a631f47191124a31169701911ee1f4
+      base_revision: f5fb61b953a631f47191124a31169701911ee1f4
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/web/_packages/web_startup_analyzer/example/analysis_options.yaml b/web/_packages/web_startup_analyzer/example/analysis_options.yaml
@@ -0,0 +1,3 @@
+include: package:flutter_lints/flutter.yaml
+linter:
+  rules: