Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/cupertino_ui/lib/cupertino_ui.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We thought this could fix some references coming from the widgets library as it is re-exported (for now) from these packages. Since flutter_test is only a dev dependency, doc import will not work.

/// @docImport 'package:intl/intl.dart';
library cupertino_ui;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
changelog: |
- Remove unresolvable doc import for flutter_test
version: patch
1 change: 0 additions & 1 deletion packages/material_ui/lib/material_ui.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We thought this could fix some references coming from the widgets library as it is re-exported (for now) from these packages. Since flutter_test is only a dev dependency, doc import will not work.

/// @docImport 'package:intl/intl.dart';
library material_ui;

Expand Down
19 changes: 0 additions & 19 deletions packages/material_ui/lib/src/global_material_localizations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since package:intl is imported with a prefix intl the doc references to Intl.plural could not resolve (should be inlt.Intl.plural), which then propagated through all of the subclasses.

This was the cause of the bulk of the 1,400 doc reference issues we are seeing on pub.

The same was not true of cupertino_ui, turns out cupertino_ui does not even make the below references - because it is actually incorrect! So, I just removed them.

library;

import 'package:cupertino_ui/cupertino_ui.dart' show GlobalCupertinoLocalizations;
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
Expand Down Expand Up @@ -314,7 +311,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [selectedRowCountTitleOne], the "one" form
/// * [selectedRowCountTitleTwo], the "two" form
/// * [selectedRowCountTitleFew], the "few" form
Expand All @@ -329,7 +325,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [selectedRowCountTitleZero], the "zero" form
/// * [selectedRowCountTitleTwo], the "two" form
/// * [selectedRowCountTitleFew], the "few" form
Expand All @@ -344,7 +339,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [selectedRowCountTitleZero], the "zero" form
/// * [selectedRowCountTitleOne], the "one" form
/// * [selectedRowCountTitleFew], the "few" form
Expand All @@ -359,7 +353,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [selectedRowCountTitleZero], the "zero" form
/// * [selectedRowCountTitleOne], the "one" form
/// * [selectedRowCountTitleTwo], the "two" form
Expand All @@ -374,7 +367,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [selectedRowCountTitleZero], the "zero" form
/// * [selectedRowCountTitleOne], the "one" form
/// * [selectedRowCountTitleTwo], the "two" form
Expand All @@ -389,7 +381,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [selectedRowCountTitleZero], the "zero" form
/// * [selectedRowCountTitleOne], the "one" form
/// * [selectedRowCountTitleTwo], the "two" form
Expand Down Expand Up @@ -446,7 +437,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [licensesPackageDetailTextZero], the "zero" form
/// * [licensesPackageDetailTextOne], the "one" form
/// * [licensesPackageDetailTextTwo], the "two" form
Expand Down Expand Up @@ -477,7 +467,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [licensesPackageDetailTextZero], the "zero" form
/// * [licensesPackageDetailTextOne], the "one" form
/// * [licensesPackageDetailTextTwo], the "two" form
Expand All @@ -493,7 +482,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [licensesPackageDetailTextZero], the "zero" form
/// * [licensesPackageDetailTextOne], the "one" form
/// * [licensesPackageDetailTextTwo], the "two" form
Expand All @@ -509,7 +497,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [licensesPackageDetailTextZero], the "zero" form
/// * [licensesPackageDetailTextOne], the "one" form
/// * [licensesPackageDetailTextTwo], the "two" form
Expand All @@ -525,7 +512,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [licensesPackageDetailTextZero], the "zero" form
/// * [licensesPackageDetailTextOne], the "one" form
/// * [licensesPackageDetailTextTwo], the "two" form
Expand Down Expand Up @@ -555,7 +541,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [remainingTextFieldCharacterCountZero], the "zero" form
/// * [remainingTextFieldCharacterCountOne], the "one" form
/// * [remainingTextFieldCharacterCountTwo], the "two" form
Expand Down Expand Up @@ -586,7 +571,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [remainingTextFieldCharacterCountZero], the "zero" form
/// * [remainingTextFieldCharacterCountOne], the "one" form
/// * [remainingTextFieldCharacterCountTwo], the "two" form
Expand All @@ -602,7 +586,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [remainingTextFieldCharacterCountZero], the "zero" form
/// * [remainingTextFieldCharacterCountOne], the "one" form
/// * [remainingTextFieldCharacterCountTwo], the "two" form
Expand All @@ -618,7 +601,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [remainingTextFieldCharacterCountZero], the "zero" form
/// * [remainingTextFieldCharacterCountOne], the "one" form
/// * [remainingTextFieldCharacterCountTwo], the "two" form
Expand All @@ -634,7 +616,6 @@ abstract class GlobalMaterialLocalizations implements MaterialLocalizations {
///
/// See also:
///
/// * [Intl.plural], to which this form is passed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment above.

/// * [remainingTextFieldCharacterCountZero], the "zero" form
/// * [remainingTextFieldCharacterCountOne], the "one" form
/// * [remainingTextFieldCharacterCountTwo], the "two" form
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
// To regenerate the file, use:
// dart script/l10n/bin/gen_localizations.dart --overwrite

/// @docImport 'package:intl/intl.dart';

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are no references to intl in this file, and they would need the intl prefix as it is imported below anyways. removed since it is not needed.

library;

import 'dart:collection';

import 'package:flutter/widgets.dart';
Expand Down
33 changes: 32 additions & 1 deletion packages/material_ui/lib/src/paginated_data_table.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes references to TargetPlatformVariant coming from widgets.dart, which cannot resolve in the dart docs for this package.

/// 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}
Expand Down
11 changes: 5 additions & 6 deletions packages/material_ui/lib/src/reorderable_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cannot resolve in this package.

///
/// @docImport 'card.dart';
/// @docImport 'paginated_data_table.dart';
library;
Comment thread
Piinks marked this conversation as resolved.

import 'dart:ui' show lerpDouble;
Expand Down Expand Up @@ -37,9 +36,9 @@ import 'theme.dart';
///
/// </callout-box>
///
/// 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
Comment on lines -40 to -42

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above, since these come from flutter_test and flutter_test references cannot be resolved since they are not a direct dev dependency, removed.

/// 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].
Expand Down Expand Up @@ -321,8 +320,8 @@ class ReorderableListView extends StatefulWidget {
/// {@macro flutter.widgets.scroll_view.controller}
final ScrollController? scrollController;

/// {@macro flutter.widgets.scroll_view.primary}

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated for new macro that removes references to TargetPlatformVariant


/// {@macro material_ui.paginated_data_table.primary}
///
/// Defaults to true when [scrollDirection] is [Axis.vertical] and
/// [scrollController] is null.
final bool? primary;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
changelog: |
- Replace unresolvable doc imports
version: patch
Loading