diff --git a/packages/cupertino_ui/lib/cupertino_ui.dart b/packages/cupertino_ui/lib/cupertino_ui.dart index c951ace9dda8..1e318022d14d 100644 --- a/packages/cupertino_ui/lib/cupertino_ui.dart +++ b/packages/cupertino_ui/lib/cupertino_ui.dart @@ -19,7 +19,6 @@ /// for a catalog of all Cupertino widgets. /// * [flutter.dev/widgets](https://docs.flutter.dev/ui/widgets) /// for a catalog of commonly-used Flutter widgets. -/// @docImport 'package:flutter_test/flutter_test.dart'; /// @docImport 'package:intl/intl.dart'; library cupertino_ui; diff --git a/packages/cupertino_ui/pending_changelogs/pending_changelog_docImports_8_5.yaml b/packages/cupertino_ui/pending_changelogs/pending_changelog_docImports_8_5.yaml new file mode 100644 index 000000000000..f1b9174bd12a --- /dev/null +++ b/packages/cupertino_ui/pending_changelogs/pending_changelog_docImports_8_5.yaml @@ -0,0 +1,3 @@ +changelog: | + - Remove unresolvable doc import for flutter_test +version: patch diff --git a/packages/material_ui/lib/material_ui.dart b/packages/material_ui/lib/material_ui.dart index a4ac72616e3d..c884f04dec79 100644 --- a/packages/material_ui/lib/material_ui.dart +++ b/packages/material_ui/lib/material_ui.dart @@ -14,7 +14,6 @@ /// for a catalog of commonly-used Material component widgets. /// * [m3.material.io](https://m3.material.io/) for the Material 3 specification /// * [m2.material.io](https://m2.material.io/) for the Material 2 specification -/// @docImport 'package:flutter_test/flutter_test.dart'; /// @docImport 'package:intl/intl.dart'; library material_ui; diff --git a/packages/material_ui/lib/src/global_material_localizations.dart b/packages/material_ui/lib/src/global_material_localizations.dart index 6e2cf86034a6..8a5738a1ebcf 100644 --- a/packages/material_ui/lib/src/global_material_localizations.dart +++ b/packages/material_ui/lib/src/global_material_localizations.dart @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -/// @docImport 'package:intl/intl.dart'; -library; - import 'package:cupertino_ui/cupertino_ui.dart' show GlobalCupertinoLocalizations; import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; @@ -314,7 +311,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [selectedRowCountTitleOne], the "one" form /// * [selectedRowCountTitleTwo], the "two" form /// * [selectedRowCountTitleFew], the "few" form @@ -329,7 +325,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [selectedRowCountTitleZero], the "zero" form /// * [selectedRowCountTitleTwo], the "two" form /// * [selectedRowCountTitleFew], the "few" form @@ -344,7 +339,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [selectedRowCountTitleZero], the "zero" form /// * [selectedRowCountTitleOne], the "one" form /// * [selectedRowCountTitleFew], the "few" form @@ -359,7 +353,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [selectedRowCountTitleZero], the "zero" form /// * [selectedRowCountTitleOne], the "one" form /// * [selectedRowCountTitleTwo], the "two" form @@ -374,7 +367,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [selectedRowCountTitleZero], the "zero" form /// * [selectedRowCountTitleOne], the "one" form /// * [selectedRowCountTitleTwo], the "two" form @@ -389,7 +381,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [selectedRowCountTitleZero], the "zero" form /// * [selectedRowCountTitleOne], the "one" form /// * [selectedRowCountTitleTwo], the "two" form @@ -446,7 +437,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [licensesPackageDetailTextZero], the "zero" form /// * [licensesPackageDetailTextOne], the "one" form /// * [licensesPackageDetailTextTwo], the "two" form @@ -477,7 +467,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [licensesPackageDetailTextZero], the "zero" form /// * [licensesPackageDetailTextOne], the "one" form /// * [licensesPackageDetailTextTwo], the "two" form @@ -493,7 +482,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [licensesPackageDetailTextZero], the "zero" form /// * [licensesPackageDetailTextOne], the "one" form /// * [licensesPackageDetailTextTwo], the "two" form @@ -509,7 +497,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [licensesPackageDetailTextZero], the "zero" form /// * [licensesPackageDetailTextOne], the "one" form /// * [licensesPackageDetailTextTwo], the "two" form @@ -525,7 +512,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [licensesPackageDetailTextZero], the "zero" form /// * [licensesPackageDetailTextOne], the "one" form /// * [licensesPackageDetailTextTwo], the "two" form @@ -555,7 +541,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [remainingTextFieldCharacterCountZero], the "zero" form /// * [remainingTextFieldCharacterCountOne], the "one" form /// * [remainingTextFieldCharacterCountTwo], the "two" form @@ -586,7 +571,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [remainingTextFieldCharacterCountZero], the "zero" form /// * [remainingTextFieldCharacterCountOne], the "one" form /// * [remainingTextFieldCharacterCountTwo], the "two" form @@ -602,7 +586,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [remainingTextFieldCharacterCountZero], the "zero" form /// * [remainingTextFieldCharacterCountOne], the "one" form /// * [remainingTextFieldCharacterCountTwo], the "two" form @@ -618,7 +601,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [remainingTextFieldCharacterCountZero], the "zero" form /// * [remainingTextFieldCharacterCountOne], the "one" form /// * [remainingTextFieldCharacterCountTwo], the "two" form @@ -634,7 +616,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations { /// /// See also: /// - /// * [Intl.plural], to which this form is passed. /// * [remainingTextFieldCharacterCountZero], the "zero" form /// * [remainingTextFieldCharacterCountOne], the "one" form /// * [remainingTextFieldCharacterCountTwo], the "two" form diff --git a/packages/material_ui/lib/src/l10n/generated_material_localizations.dart b/packages/material_ui/lib/src/l10n/generated_material_localizations.dart index 8e27c5de9483..486a664dd357 100644 --- a/packages/material_ui/lib/src/l10n/generated_material_localizations.dart +++ b/packages/material_ui/lib/src/l10n/generated_material_localizations.dart @@ -6,9 +6,6 @@ // To regenerate the file, use: // dart script/l10n/bin/gen_localizations.dart --overwrite -/// @docImport 'package:intl/intl.dart'; -library; - import 'dart:collection'; import 'package:flutter/widgets.dart'; diff --git a/packages/material_ui/lib/src/paginated_data_table.dart b/packages/material_ui/lib/src/paginated_data_table.dart index fd731cfbc416..e014153125cd 100644 --- a/packages/material_ui/lib/src/paginated_data_table.dart +++ b/packages/material_ui/lib/src/paginated_data_table.dart @@ -327,7 +327,38 @@ class PaginatedDataTable extends StatefulWidget { /// {@macro flutter.widgets.scroll_view.controller} final ScrollController? controller; - /// {@macro flutter.widgets.scroll_view.primary} + /// {@template material_ui.paginated_data_table.primary} + /// Whether this is the primary scroll view associated with the parent + /// [PrimaryScrollController]. + /// + /// When this is true, the scroll view is scrollable even if it does not have + /// sufficient content to actually scroll. Otherwise, by default the user can + /// only scroll the view if it has sufficient content. See [physics]. + /// + /// Also when true, the scroll view is used for default [ScrollAction]s. If a + /// ScrollAction is not handled by an otherwise focused part of the application, + /// the ScrollAction will be evaluated using this scroll view, for example, + /// when executing [Shortcuts] key events like page up and down. + /// + /// On iOS, this also identifies the scroll view that will scroll to top in + /// response to a tap in the status bar. + /// + /// Cannot be true while a [ScrollController] is provided to `controller`, + /// only one ScrollController can be associated with a ScrollView. + /// + /// Setting to false will explicitly prevent inheriting any + /// [PrimaryScrollController]. + /// + /// Defaults to null. When null, and a controller is not provided, + /// [PrimaryScrollController.shouldInherit] is used to decide automatic + /// inheritance. + /// + /// By default, the [PrimaryScrollController] that is injected by each + /// [ModalRoute] is configured to automatically be inherited on + /// mobile platforms for ScrollViews in the [Axis.vertical] + /// scroll direction. Adding another to your app will override the + /// PrimaryScrollController above it. + /// {@endtemplate} final bool? primary; /// {@macro material_ui.dataTable.headingRowColor} diff --git a/packages/material_ui/lib/src/reorderable_list.dart b/packages/material_ui/lib/src/reorderable_list.dart index bddc9e545d30..0c423b717cc2 100644 --- a/packages/material_ui/lib/src/reorderable_list.dart +++ b/packages/material_ui/lib/src/reorderable_list.dart @@ -2,9 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -/// @docImport 'package:flutter_test/flutter_test.dart'; -/// /// @docImport 'card.dart'; +/// @docImport 'paginated_data_table.dart'; library; import 'dart:ui' show lerpDouble; @@ -37,9 +36,9 @@ import 'theme.dart'; /// /// /// -/// By default, on [TargetPlatformVariant.desktop] platforms each item will +/// By default, on desktop platforms each item will /// have a drag handle added on top of it that will allow the user to grab it -/// to move the item. On [TargetPlatformVariant.mobile], no drag handle will be +/// to move the item. On mobile platforms, no drag handle will be /// added, but when the user long presses anywhere on the item it will start /// moving the item. Displaying drag handles can be controlled with /// [ReorderableListView.buildDefaultDragHandles]. @@ -321,8 +320,8 @@ class ReorderableListView extends StatefulWidget { /// {@macro flutter.widgets.scroll_view.controller} final ScrollController? scrollController; - /// {@macro flutter.widgets.scroll_view.primary} - + /// {@macro material_ui.paginated_data_table.primary} + /// /// Defaults to true when [scrollDirection] is [Axis.vertical] and /// [scrollController] is null. final bool? primary; diff --git a/packages/material_ui/pending_changelogs/pending_changelog_docImports_8_5.yaml b/packages/material_ui/pending_changelogs/pending_changelog_docImports_8_5.yaml new file mode 100644 index 000000000000..62cd21d308d2 --- /dev/null +++ b/packages/material_ui/pending_changelogs/pending_changelog_docImports_8_5.yaml @@ -0,0 +1,3 @@ +changelog: | + - Replace unresolvable doc imports +version: patch