pr changes

packages/pointer_interceptor/pointer_interceptor/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.10.0
+## NEXT
 
 * Adds iOS implementation.
 

packages/pointer_interceptor/pointer_interceptor/pubspec.yaml

@@ -2,7 +2,7 @@ name: pointer_interceptor
 description: A widget to prevent clicks from being swallowed by underlying HtmlElementViews on the web.
 repository: https://github.com/flutter/packages/tree/main/packages/pointer_interceptor/pointer_interceptor
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pointer_interceptor%22
-version: 0.9.4
+version: 0.9.3+7
 # while transitioning to federated structure, removed ability to published temporarily.
 publish_to: none
 

packages/pointer_interceptor/pointer_interceptor/test/tests_exist_elsewhere_test.dart

@@ -9,6 +9,7 @@ import 'package:flutter_test/flutter_test.dart';
 void main() {
   test('Tell the user where to find the real tests', () {
     print('---');
+    // TODO(louisehsu): add non web integration tests.
     print('Please find platform tests in their respective packages.');
     print('---');
   });

packages/pointer_interceptor/pointer_interceptor_ios/example/integration_test/pointer_interceptor_test.dart

@@ -8,8 +8,7 @@ import 'package:integration_test/integration_test.dart';
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
-  // Integration tests for iOS requires a native platform view and thus
-  // can not be tested in Dart. These tests can instead
-  // be found in the XCUITests
-  testWidgets('placeholder test', (WidgetTester tester) async {});
+  // Full tests are done via XCUITest and can be found in RunnerUITests.
+  // This test just validates that the example builds and launches successfully.
+  testWidgets('launch test', (WidgetTester tester) async {});
 }

packages/pointer_interceptor/pointer_interceptor_ios/example/ios/RunnerTests/RunnerTests.swift

@@ -10,16 +10,18 @@ import XCTest
 
 class RunnerTests: XCTestCase {
   func testNonDebugMode() {
-    let view = PointerInterceptorView(frame: CGRect(x: 0, y: 0, width: 180, height: 48.0), debug: false);
+    let view = PointerInterceptorView(
+      frame: CGRect(x: 0, y: 0, width: 180, height: 48.0), debug: false)
 
-    let debugView = view.view();
+    let debugView = view.view()
     XCTAssertTrue(debugView.backgroundColor == UIColor.clear)
   }
 
   func testDebugMode() {
-    let view = PointerInterceptorView(frame: CGRect(x: 0, y: 0, width: 180, height: 48.0), debug: true);
+    let view = PointerInterceptorView(
+      frame: CGRect(x: 0, y: 0, width: 180, height: 48.0), debug: true)
 
-    let debugView = view.view();
+    let debugView = view.view()
     XCTAssertTrue(debugView.backgroundColor == UIColor(red: 1, green: 0, blue: 0, alpha: 0.5))
   }
 }

packages/pointer_interceptor/pointer_interceptor_ios/example/ios/RunnerUITests/RunnerUITests.swift

@@ -7,38 +7,38 @@ import XCTest
 final class RunnerUITests: XCTestCase {
 
   override func setUp() {
-        continueAfterFailure = false
-      }
+    continueAfterFailure = false
+  }
+
+  func testPointerInterceptorBlocksGesturesFromFlutter() {
+    let app = XCUIApplication()
+    app.launch()
+
+    let fabInitial = app.buttons["Initial"]
+    if !(fabInitial.waitForExistence(timeout: 30)) {
+      print(app.debugDescription)
+      XCTFail("Could not find Flutter button to click on")
+      return
+    }
+
+    fabInitial.tap()
 
-      func testPointerInterceptorBlocksGesturesFromFlutter() {
-        let app = XCUIApplication()
-        app.launch()
-
-        let fabInitial = app.buttons["Initial"]
-        if (!(fabInitial.waitForExistence(timeout: 30))){
-          print(app.debugDescription);
-          XCTFail("Could not find Flutter button to click on")
-          return
-        }
-
-        fabInitial.tap();
-
-        let fabAfter = app.buttons["Tapped"]
-        if (!(fabAfter.waitForExistence(timeout: 30))){
-          print(app.debugDescription);
-          XCTFail("Flutter button did not change on tap")
-          return
-        }
-
-        let exp = expectation(description: "Check platform view not clicked after 3 seconds")
-        let result = XCTWaiter.wait(for: [exp], timeout: 3.0)
-        if result == XCTWaiter.Result.timedOut {
-          let dummyButton = app.staticTexts["Not Clicked"]
-          if (!(dummyButton.waitForExistence(timeout: 30))){
-            print(app.debugDescription);
-            XCTFail("Pointer interceptor did not block gesture from hitting platform view")
-            return
-          }
-        }
+    let fabAfter = app.buttons["Tapped"]
+    if !(fabAfter.waitForExistence(timeout: 30)) {
+      print(app.debugDescription)
+      XCTFail("Flutter button did not change on tap")
+      return
+    }
+
+    let exp = expectation(description: "Check platform view not clicked after 3 seconds")
+    let result = XCTWaiter.wait(for: [exp], timeout: 3.0)
+    if result == XCTWaiter.Result.timedOut {
+      let dummyButton = app.staticTexts["Not Clicked"]
+      if !(dummyButton.waitForExistence(timeout: 30)) {
+        print(app.debugDescription)
+        XCTFail("Pointer interceptor did not block gesture from hitting platform view")
+        return
+      }
     }
+  }
 }

packages/pointer_interceptor/pointer_interceptor_ios/example/lib/main.dart

@@ -4,7 +4,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:pointer_interceptor/pointer_interceptor.dart';
+import 'package:pointer_interceptor_platform_interface/pointer_interceptor_platform_interface.dart';
 
 void main() {
   runApp(const MaterialApp(home: PointerInterceptorIOSExample()));
@@ -50,7 +50,7 @@ class _PointerInterceptorIOSExampleState
         alignment: AlignmentDirectional.center,
         children: <Widget>[
           const _DummyPlatformView(),
-          PointerInterceptor(
+          PointerInterceptorPlatform.instance.buildWidget(
               child: TextButton(
                   style: TextButton.styleFrom(foregroundColor: Colors.red),
                   child: _buttonTapped

packages/pointer_interceptor/pointer_interceptor_ios/example/pubspec.yaml

@@ -1,21 +1,18 @@
 name: pointer_interceptor_ios_example
 description: "Demonstrates how to use the pointer_interceptor_ios plugin."
-# The following line prevents the package from being accidentally published to
-# pub.dev using `flutter pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
+publish_to: 'none'
 
 environment:
-  sdk: '>=3.1.0-134.0.dev <4.0.0'
+  sdk: '>=3.1.0 <4.0.0'
+  flutter: '>=3.13.0'
 
 dependencies:
   cupertino_icons: ^1.0.2
   flutter:
     sdk: flutter
-  pointer_interceptor:
-    path: ../../pointer_interceptor
+  pointer_interceptor_platform_interface: ^0.10.0
 
 dev_dependencies:
-  flutter_lints: ^2.0.0
   flutter_test:
     sdk: flutter
   integration_test:

packages/pointer_interceptor/pointer_interceptor_ios/ios/Classes/PointerInterceptorFactory.swift

@@ -4,12 +4,14 @@
 import Flutter
 
 class PointerInterceptorFactory: NSObject, FlutterPlatformViewFactory {
-  func create(withFrame frame: CGRect, viewIdentifier viewId: Int64, arguments args: Any?) -> FlutterPlatformView {
+  func create(withFrame frame: CGRect, viewIdentifier viewId: Int64, arguments args: Any?)
+    -> FlutterPlatformView
+  {
     let debug = (args as? [String: Any])?["debug"] as? Bool ?? false
     return PointerInterceptorView(frame: frame, debug: debug)
   }
 
   public func createArgsCodec() -> FlutterMessageCodec & NSObjectProtocol {
-        return FlutterStandardMessageCodec.sharedInstance()
+    return FlutterStandardMessageCodec.sharedInstance()
   }
 }

packages/pointer_interceptor/pointer_interceptor_ios/ios/Classes/PointerInterceptorIosPlugin.swift

@@ -6,6 +6,7 @@ import UIKit
 
 public class PointerInterceptorIosPlugin: NSObject, FlutterPlugin {
   public static func register(with registrar: FlutterPluginRegistrar) {
-    registrar.register(PointerInterceptorFactory(), withId: "plugins.flutter.dev/pointer_interceptor_ios")
+    registrar.register(
+      PointerInterceptorFactory(), withId: "plugins.flutter.dev/pointer_interceptor_ios")
   }
 }

packages/pointer_interceptor/pointer_interceptor_ios/ios/Classes/PointerInterceptorView.swift

@@ -8,12 +8,13 @@ public class PointerInterceptorView: NSObject, FlutterPlatformView {
 
   let interceptorView: UIView
 
-  init(frame:CGRect, debug:Bool) {
-    interceptorView = UIView(frame:frame)
-    interceptorView.backgroundColor = debug ? UIColor(red: 1, green: 0, blue: 0, alpha: 0.5) : UIColor.clear
+  init(frame: CGRect, debug: Bool) {
+    interceptorView = UIView(frame: frame)
+    interceptorView.backgroundColor =
+      debug ? UIColor(red: 1, green: 0, blue: 0, alpha: 0.5) : UIColor.clear
   }
 
   public func view() -> UIView {
-    return interceptorView;
+    return interceptorView
   }
 }

packages/pointer_interceptor/pointer_interceptor_ios/pubspec.yaml

@@ -1,7 +1,7 @@
 name: pointer_interceptor_ios
 description: iOS implementation of the pointer_interceptor plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/pointer_interceptor/pointer_interceptor_ios
-issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3Apointer_interceptor_ios
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3Apointer_interceptor
 version: 0.10.0
 
 environment:

packages/pointer_interceptor/pointer_interceptor_web/CHANGELOG.md

@@ -1,4 +1,4 @@
 ## 0.10.0
 
-* Moved web implementation to own package.
+* Moves web implementation to its own package.
 

packages/pointer_interceptor/pointer_interceptor_web/example/lib/main.dart

@@ -7,7 +7,7 @@ import 'dart:html' as html;
 import 'dart:ui_web' as ui_web;
 
 import 'package:flutter/material.dart';
-import 'package:pointer_interceptor/pointer_interceptor.dart';
+import 'package:pointer_interceptor_platform_interface/pointer_interceptor_platform_interface.dart';
 
 const String _htmlElementViewType = '_htmlElementViewType';
 const double _videoWidth = 640;
@@ -86,7 +86,7 @@ class _MyHomePageState extends State<MyHomePage> {
       appBar: AppBar(
         title: const Text('PointerInterceptor demo'),
         actions: <Widget>[
-          PointerInterceptor(
+          PointerInterceptorPlatform.instance.buildWidget(
             // debug: true,
             child: IconButton(
               icon: const Icon(Icons.add_alert),
@@ -129,8 +129,7 @@ class _MyHomePageState extends State<MyHomePage> {
                           _clickedOn('transparent-button');
                         },
                       ),
-                      PointerInterceptor(
-                        intercepting: false,
+                      PointerInterceptorPlatform.instance.buildWidget(
                         child: ElevatedButton(
                           key: const Key('wrapped-transparent-button'),
                           child:
@@ -140,7 +139,7 @@ class _MyHomePageState extends State<MyHomePage> {
                           },
                         ),
                       ),
-                      PointerInterceptor(
+                      PointerInterceptorPlatform.instance.buildWidget(
                         child: ElevatedButton(
                           key: const Key('clickable-button'),
                           child: const Text('Works As Expected'),
@@ -160,7 +159,7 @@ class _MyHomePageState extends State<MyHomePage> {
       floatingActionButton: Row(
         mainAxisAlignment: MainAxisAlignment.end,
         children: <Widget>[
-          PointerInterceptor(
+          PointerInterceptorPlatform.instance.buildWidget(
             // debug: true,
             child: FloatingActionButton(
               child: const Icon(Icons.navigation),
@@ -172,7 +171,7 @@ class _MyHomePageState extends State<MyHomePage> {
         ],
       ),
       drawer: Drawer(
-        child: PointerInterceptor(
+        child: PointerInterceptorPlatform.instance.buildWidget(
           // debug: true, // Enable this to "see" the interceptor covering the column.
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,

packages/pointer_interceptor/pointer_interceptor_web/example/pubspec.yaml

@@ -1,18 +1,16 @@
 name: pointer_interceptor_web_example
 description: "Demonstrates how to use the pointer_interceptor_web plugin."
-# The following line prevents the package from being accidentally published to
-# pub.dev using `flutter pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
+publish_to: 'none'
 
 environment:
-  sdk: '>=3.1.0-134.0.dev <4.0.0'
+  sdk: ">=3.1.0 <4.0.0"
+  flutter: ">=3.13.0"
 
 dependencies:
   cupertino_icons: ^1.0.2
   flutter:
     sdk: flutter
-  pointer_interceptor:
-    path: ../../pointer_interceptor
+  pointer_interceptor_platform_interface: ^0.10.0
 
 dev_dependencies:
   flutter_lints: ^2.0.0

packages/pointer_interceptor/pointer_interceptor_web/pubspec.yaml

@@ -1,7 +1,7 @@
 name: pointer_interceptor_web
 description: Web implementation of the pointer_interceptor plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/pointer_interceptor/pointer_interceptor_web
-issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3Apointer_interceptor_web
+issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3Apointer_interceptor
 version: 0.10.0
 
 environment: