address comments

flutter · jonahwilliams · Jul 3, 2018 · May 25, 2018 · May 25, 2018 · May 29, 2018
commit 440c96290b491af7ac4532d680b66f267c9f46b5
diff --git a/packages/flutter/lib/src/material/button.dart b/packages/flutter/lib/src/material/button.dart
@@ -401,6 +401,14 @@ class MaterialButton extends StatelessWidget {
     final ThemeData theme = Theme.of(context);
     final ButtonThemeData buttonTheme = ButtonTheme.of(context);
     final Color textColor = _getTextColor(theme, buttonTheme, color);
+    BoxConstraints outerConstraints;
+    switch (theme.materialTapTargetSize) {
+      case MaterialTapTargetSize.expanded:
+        outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
+        break;
+      case MaterialTapTargetSize.collapsed:
+        break;
+    }
 
     return new RawMaterialButton(
       onPressed: onPressed,
@@ -417,9 +425,7 @@ class MaterialButton extends StatelessWidget {
       ),
       shape: buttonTheme.shape,
       child: child,
-      outerConstraints: theme.materialTapTargetSize == MaterialTapTargetSize.expanded
-        ? const BoxConstraints(minHeight: 48.0)
-        : null,
+      outerConstraints: outerConstraints,
     );
   }
 

diff --git a/packages/flutter/lib/src/material/chip.dart b/packages/flutter/lib/src/material/chip.dart
@@ -46,7 +46,7 @@ const Icon _kDefaultDeleteIcon = const Icon(Icons.cancel, size: _kDeleteIconSize
 ///
 /// The defaults mentioned in the documentation for each attribute are what
 /// the implementing classes typically use for defaults (but this class doesn't
-/// provide or enforce them).f
+/// provide or enforce them).
 ///
 /// See also:
 ///
@@ -1432,7 +1432,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
         ),
       ),
     );
-    switch(theme.materialTapTargetSize) {
+    switch (theme.materialTapTargetSize) {
       case MaterialTapTargetSize.expanded:
         result = new ConstrainedBox(
           constraints: const BoxConstraints(minWidth: 48.0, minHeight: 48.0),
@@ -1442,7 +1442,6 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
             heightFactor: 1.0,
           ),
         );
-
         if (canTap) {
           result = new GestureDetector(
             behavior: HitTestBehavior.translucent,
@@ -1455,6 +1454,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
         }
         break;
       case MaterialTapTargetSize.collapsed:
+        break;
     }
 
     return new Semantics(

diff --git a/packages/flutter/lib/src/material/flat_button.dart b/packages/flutter/lib/src/material/flat_button.dart
@@ -281,6 +281,14 @@ class FlatButton extends StatelessWidget {
     final ButtonThemeData buttonTheme = ButtonTheme.of(context);
     final Color fillColor = enabled ? color : disabledColor;
     final Color textColor = _getTextColor(theme, buttonTheme, fillColor);
+    BoxConstraints outerConstraints;
+    switch (theme.materialTapTargetSize) {
+      case MaterialTapTargetSize.expanded:
+        outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
+        break;
+      case MaterialTapTargetSize.collapsed:
+        break;
+    }
 
     return new RawMaterialButton(
       onPressed: onPressed,
@@ -291,9 +299,7 @@ class FlatButton extends StatelessWidget {
       splashColor: _getSplashColor(theme, buttonTheme),
       elevation: 0.0,
       highlightElevation: 0.0,
-      outerConstraints: theme.materialTapTargetSize == MaterialTapTargetSize.expanded
-        ? const BoxConstraints(minHeight: 48.0)
-        : null,
+      outerConstraints: outerConstraints,
       padding: padding ?? buttonTheme.padding,
       constraints: buttonTheme.constraints,
       shape: shape ?? buttonTheme.shape,

diff --git a/packages/flutter/lib/src/material/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart
@@ -264,16 +264,21 @@ class _FloatingActionButtonState extends State<FloatingActionButton> {
       result = widget.child != null ? tooltip : new SizedBox.expand(child: tooltip);
     }
 
-    final BoxConstraints outerConstraints = (widget.mini && theme.materialTapTargetSize == MaterialTapTargetSize.expanded)
-      ? const BoxConstraints(minHeight: 48.0, minWidth: 48.0)
-      : null;
+    BoxConstraints outerConstraints;
+    switch (theme.materialTapTargetSize) {
+      case MaterialTapTargetSize.expanded:
+        outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
+        break;
+      case MaterialTapTargetSize.collapsed:
+        break;
+    }
 
     result = new RawMaterialButton(
       onPressed: widget.onPressed,
       onHighlightChanged: _handleHighlightChanged,
       elevation: _highlight ? widget.highlightElevation : widget.elevation,
       constraints: widget._sizeConstraints,
-      outerConstraints: outerConstraints,
+      outerConstraints: widget.mini ? outerConstraints : null,
       fillColor: widget.backgroundColor ?? theme.accentColor,
       textStyle: theme.accentTextTheme.button.copyWith(
         color: foregroundColor,

diff --git a/packages/flutter/lib/src/material/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart
@@ -365,6 +365,14 @@ class RaisedButton extends StatelessWidget {
     final ButtonThemeData buttonTheme = ButtonTheme.of(context);
     final Color fillColor = _getFillColor(theme, buttonTheme);
     final Color textColor = _getTextColor(theme, buttonTheme, fillColor);
+    BoxConstraints outerConstraints;
+    switch (theme.materialTapTargetSize) {
+      case MaterialTapTargetSize.expanded:
+        outerConstraints = const BoxConstraints(minHeight: 48.0, minWidth: 48.0);
+        break;
+      case MaterialTapTargetSize.collapsed:
+        break;
+    }
 
     return new RawMaterialButton(
       onPressed: onPressed,
@@ -381,6 +389,7 @@ class RaisedButton extends StatelessWidget {
       shape: shape ?? buttonTheme.shape,
       animationDuration: animationDuration,
       child: child,
+      outerConstraints: outerConstraints
     );
   }
 

diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
@@ -38,16 +38,23 @@ const Color _kDarkThemeSplashColor = const Color(0x40CCCCCC);
 
 /// Configures the tap target and layout size of certain Material widgets.
 ///
-/// The following widgets are impacted:
+/// Some of the impacted widgets include:
 ///
 ///   * [FloatingActionButton], only the mini tap target size is increased.
 ///   * [MaterialButton]
 ///   * [OutlineButton]
 ///   * [FlatButton]
+///   * [RaisedButton]
 ///   * [TimePicker]
 ///   * [SnackBar]
+///   * [Chip]
+///   * [RawChip]
+///   * [InputChip]
+///   * [ChoiceChip]
+///   * [FilterChip]
+///   * [ActionChip]
 enum MaterialTapTargetSize {
-  /// Expands the minimum tap target size to 48dp by 48dp.
+  /// Expands the minimum tap target size to 48px by 48px.
   ///
   /// This is the default value of [ThemeData.materialHitTestSize] and the
   /// recommended behavior to conform to Android accessibility recommendations.

diff --git a/packages/flutter/test/material/buttons_test.dart b/packages/flutter/test/material/buttons_test.dart
@@ -187,7 +187,9 @@ void main() {
       new Directionality(
         textDirection: TextDirection.ltr,
         child: new Theme(
-          data: new ThemeData(),
+          data: new ThemeData(
+            materialTapTargetSize: MaterialTapTargetSize.collapsed,
+          ),
           child: buttonWidget,
         ),
       ),
@@ -233,6 +235,7 @@ void main() {
           data: new ThemeData(
             highlightColor: themeHighlightColor1,
             splashColor: themeSplashColor1,
+            materialTapTargetSize: MaterialTapTargetSize.collapsed,
           ),
           child: buttonWidget,
         ),
@@ -260,6 +263,7 @@ void main() {
           data: new ThemeData(
             highlightColor: themeHighlightColor2,
             splashColor: themeSplashColor2,
+            materialTapTargetSize: MaterialTapTargetSize.collapsed,
           ),
           child: buttonWidget, // same widget, so does not get updated because of us
         ),
@@ -274,7 +278,7 @@ void main() {
     );
 
     await gesture.up();
-  }, skip: true);
+  });
 
   testWidgets('Disabled MaterialButton has same semantic size as enabled and exposes disabled semantics', (WidgetTester tester) async {
     final SemanticsTester semantics = new SemanticsTester(tester);