Skip to content

Step 1: SnackBarBehavior.floating offset fix - Soft breaking change #50597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shihaohong merged 11 commits into from
Feb 13, 2020
Merged

Step 1: SnackBarBehavior.floating offset fix - Soft breaking change #50597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2e17635
renamed some tests in snack_bar_test.dart
filaps Jan 11, 2020
15292f1
improved one test from snack_bar_test.dart
filaps Jan 11, 2020
1dbd586
fixed issue where snack bar was higher then should be
filaps Dec 22, 2019
19ad3f2
moved test 'Floating SnackBar is positioned above FloatingActionButto…
filaps Jan 12, 2020
66c0d19
moved test "SnackBar bottom padding is not consumed by viewInsets" to…
filaps Jan 12, 2020
de48df7
Merge branch 'master' of github.com:flutter/flutter into snackbar-fix…
Feb 11, 2020
7110b5a
Add soft breaking change flag
Feb 11, 2020
efbe774
Make flag static
Feb 11, 2020
8e42ebf
Improve deprecation warning
shihaohong Feb 12, 2020
cab8003
Merge branch 'master' of github.com:flutter/flutter into snackbar-fix…
shihaohong Feb 12, 2020
5065de1
Code review
shihaohong Feb 12, 2020
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
31 changes: 28 additions & 3 deletions packages/flutter/lib/src/material/scaffold.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// TODO(shihaohong): remove ignoring deprecated member use analysis
// when Scaffold.shouldSnackBarIgnoreFABRect parameter is removed.
// ignore_for_file: deprecated_member_use_from_same_package

import 'dart:async';
import 'dart:collection';
import 'dart:math' as math;
Expand Down Expand Up @@ -547,9 +551,19 @@ class _ScaffoldLayout extends MultiChildLayoutDelegate {
if (snackBarSize == Size.zero) {
snackBarSize = layoutChild(_ScaffoldSlot.snackBar, fullWidthConstraints);
}
final double snackBarYOffsetBase = floatingActionButtonRect != null && isSnackBarFloating
? floatingActionButtonRect.top
: contentBottom;

double snackBarYOffsetBase;
if (Scaffold.shouldSnackBarIgnoreFABRect) {
if (floatingActionButtonRect.size != Size.zero && isSnackBarFloating)
snackBarYOffsetBase = floatingActionButtonRect.top;
else
snackBarYOffsetBase = contentBottom;
} else {
snackBarYOffsetBase = floatingActionButtonRect != null && isSnackBarFloating
? floatingActionButtonRect.top
: contentBottom;
}

positionChild(_ScaffoldSlot.snackBar, Offset(0.0, snackBarYOffsetBase - snackBarSize.height));
}

Expand Down Expand Up @@ -1299,6 +1313,17 @@ class Scaffold extends StatefulWidget {
/// 20.0 will be added to `MediaQuery.of(context).padding.left`.
final double drawerEdgeDragWidth;

/// This flag is deprecated and fixes and issue with incorrect clipping
/// and positioning of the [SnackBar] set to [SnackBarBehavior.floating].
@Deprecated(
'This property controls whether to clip and position the snackbar as '
'if there is always a floating action button, even if one is not present. '
'It exists to provide backwards compatibility to ease migrations, and will '
'eventually be removed. '
'This feature was deprecated after v1.15.3.'
)
static bool shouldSnackBarIgnoreFABRect = false;

/// The state from the closest instance of this class that encloses the given context.
///
/// {@tool dartpad --template=freeform}
Expand Down
Loading