Remove deprecated StatefulElement.inheritFromElement (#72901)
diff --git a/packages/flutter/lib/fix_data.yaml b/packages/flutter/lib/fix_data.yaml index 55fe739..867a2b8 100644 --- a/packages/flutter/lib/fix_data.yaml +++ b/packages/flutter/lib/fix_data.yaml
@@ -11,6 +11,17 @@ version: 1 transforms: + # Changes made in https://github.com/flutter/flutter/pull/44189 + - title: 'Rename to dependOnInheritedElement' + date: 2020-12-23 + element: + uris: [ 'material.dart', 'cupertino.dart', 'widgets.dart' ] + method: 'inheritFromElement' + inClass: 'StatefulElement' + changes: + - kind: 'rename' + newName: 'dependOnInheritedElement' + # Changes made in https://github.com/flutter/flutter/pull/15303 - title: 'Replace child with builder' date: 2020-12-17 @@ -31,6 +42,7 @@ value: 'arguments[child]' - kind: 'removeParameter' name: 'child' + # Changes made in https://github.com/flutter/flutter/pull/28602 - title: 'Rename to fromMouseEvent' date: 2020-12-15
diff --git a/packages/flutter/lib/src/widgets/framework.dart b/packages/flutter/lib/src/widgets/framework.dart index 73f0515..3978fc3 100644 --- a/packages/flutter/lib/src/widgets/framework.dart +++ b/packages/flutter/lib/src/widgets/framework.dart
@@ -4919,16 +4919,6 @@ state._element = null; } - // TODO(a14n): Remove this when it goes to stable, https://github.com/flutter/flutter/pull/44189 - @Deprecated( - 'Use dependOnInheritedElement instead. ' - 'This feature was deprecated after v1.12.1.' - ) - @override - InheritedWidget inheritFromElement(Element ancestor, { Object? aspect }) { - return dependOnInheritedElement(ancestor, aspect: aspect); - } - @override InheritedWidget dependOnInheritedElement(Element ancestor, { Object? aspect }) { assert(ancestor != null);
diff --git a/packages/flutter/test_fixes/cupertino.dart b/packages/flutter/test_fixes/cupertino.dart index 43a88c1..483e236 100644 --- a/packages/flutter/test_fixes/cupertino.dart +++ b/packages/flutter/test_fixes/cupertino.dart
@@ -8,4 +8,8 @@ // Change made in https://github.com/flutter/flutter/pull/41859 const CupertinoTextThemeData themeData = CupertinoTextThemeData(brightness: Brightness.dark); themeData.copyWith(brightness: Brightness.light); + + // Changes made in https://github.com/flutter/flutter/pull/44189 + const StatefulElement statefulElement = StatefulElement(myWidget); + statefulElement.inheritFromElement(ancestor); }
diff --git a/packages/flutter/test_fixes/cupertino.dart.expect b/packages/flutter/test_fixes/cupertino.dart.expect index aa6b9fa..fba66ab 100644 --- a/packages/flutter/test_fixes/cupertino.dart.expect +++ b/packages/flutter/test_fixes/cupertino.dart.expect
@@ -8,4 +8,8 @@ // Change made in https://github.com/flutter/flutter/pull/41859 const CupertinoTextThemeData themeData = CupertinoTextThemeData(); themeData.copyWith(); + + // Changes made in https://github.com/flutter/flutter/pull/44189 + const StatefulElement statefulElement = StatefulElement(myWidget); + statefulElement.dependOnInheritedElement(ancestor); }
diff --git a/packages/flutter/test_fixes/material.dart b/packages/flutter/test_fixes/material.dart index eb7868c..30d0e35 100644 --- a/packages/flutter/test_fixes/material.dart +++ b/packages/flutter/test_fixes/material.dart
@@ -7,4 +7,8 @@ void main() { // Change made in https://github.com/flutter/flutter/pull/15303 showDialog(child: Text('Fix me.')); + + // Changes made in https://github.com/flutter/flutter/pull/44189 + const StatefulElement statefulElement = StatefulElement(myWidget); + statefulElement.inheritFromElement(ancestor); }
diff --git a/packages/flutter/test_fixes/material.dart.expect b/packages/flutter/test_fixes/material.dart.expect index d21d0db..f62668c 100644 --- a/packages/flutter/test_fixes/material.dart.expect +++ b/packages/flutter/test_fixes/material.dart.expect
@@ -7,4 +7,8 @@ void main() { // Change made in https://github.com/flutter/flutter/pull/15303 showDialog(builder: (context) => Text('Fix me.')); + + // Changes made in https://github.com/flutter/flutter/pull/44189 + const StatefulElement statefulElement = StatefulElement(myWidget); + statefulElement.dependOnInheritedElement(ancestor); }
diff --git a/packages/flutter/test_fixes/widgets.dart b/packages/flutter/test_fixes/widgets.dart new file mode 100644 index 0000000..b8c197a --- /dev/null +++ b/packages/flutter/test_fixes/widgets.dart
@@ -0,0 +1,11 @@ +// Copyright 2014 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/widgets.dart'; + +void main() { + // Changes made in https://github.com/flutter/flutter/pull/44189 + const StatefulElement statefulElement = StatefulElement(myWidget); + statefulElement.inheritFromElement(ancestor); +}
diff --git a/packages/flutter/test_fixes/widgets.dart.expect b/packages/flutter/test_fixes/widgets.dart.expect new file mode 100644 index 0000000..0659a8b --- /dev/null +++ b/packages/flutter/test_fixes/widgets.dart.expect
@@ -0,0 +1,11 @@ +// Copyright 2014 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:flutter/widgets.dart'; + +void main() { + // Changes made in https://github.com/flutter/flutter/pull/44189 + const StatefulElement statefulElement = StatefulElement(myWidget); + statefulElement.dependOnInheritedElement(ancestor); +}