Skip to content

Recreate controller when the widget change #18

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
74 changes: 30 additions & 44 deletions lib/sliding_up_panel_widget.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import 'package:flutter/material.dart';

/// On panel status changed
typedef OnSlidingUpPanelStatusChanged = void Function(
SlidingUpPanelStatus status);
typedef OnSlidingUpPanelStatusChanged = void Function(SlidingUpPanelStatus status);

/// On drag down when user drag down this panel
typedef OnSlidingUpPanelDragDown = void Function(DragDownDetails details);
Expand Down Expand Up @@ -140,16 +139,13 @@ class SlidingUpPanelWidget extends StatefulWidget {
}
}

class _SlidingUpPanelWidgetState extends State<SlidingUpPanelWidget>
with SingleTickerProviderStateMixin<SlidingUpPanelWidget> {
class _SlidingUpPanelWidgetState extends State<SlidingUpPanelWidget> with SingleTickerProviderStateMixin<SlidingUpPanelWidget> {
late Animation<Offset> animation;

final GlobalKey _childKey =
GlobalKey(debugLabel: 'SlidingUpPanelWidget child');
final GlobalKey _childKey = GlobalKey(debugLabel: 'SlidingUpPanelWidget child');

double? get _childHeight {
RenderBox renderBox =
_childKey.currentContext!.findRenderObject()! as RenderBox;
RenderBox renderBox = _childKey.currentContext!.findRenderObject()! as RenderBox;
return renderBox.size.height;
}

Expand All @@ -163,16 +159,12 @@ class _SlidingUpPanelWidgetState extends State<SlidingUpPanelWidget>
void initState() {
widget.panelController.addListener(handlePanelStatusChanged);
if (widget.animationController == null) {
_animationController =
SlidingUpPanelWidget.createAnimationController(this);
_animationController = SlidingUpPanelWidget.createAnimationController(this);
} else {
_animationController = widget.animationController!;
}
animation = _animationController.drive(
Tween(
begin: Offset(0.0, widget.upperBound),
end: Offset(0.0, widget.minimumBound))
.chain(
Tween(begin: Offset(0.0, widget.upperBound), end: Offset(0.0, widget.minimumBound)).chain(
CurveTween(
curve: Curves.linear,
),
Expand All @@ -188,12 +180,19 @@ class _SlidingUpPanelWidgetState extends State<SlidingUpPanelWidget>
WidgetsBinding.instance.addPostFrameCallback((_) => _initData(context));
}

@override
void didUpdateWidget(SlidingUpPanelWidget oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.panelController != widget.panelController) {
oldWidget.panelController.removeListener(handlePanelStatusChanged);
widget.panelController.addListener(handlePanelStatusChanged);
}
}

/// ReCalculate collapse fraction
void reCalculateCollapseFraction() {
if (widget.controlHeight / MediaQuery.of(context).size.height >
widget.minimumBound) {
collapseFraction =
widget.controlHeight / MediaQuery.of(context).size.height;
if (widget.controlHeight / MediaQuery.of(context).size.height > widget.minimumBound) {
collapseFraction = widget.controlHeight / MediaQuery.of(context).size.height;
} else {
collapseFraction = widget.minimumBound;
}
Expand Down Expand Up @@ -273,14 +272,11 @@ class _SlidingUpPanelWidgetState extends State<SlidingUpPanelWidget>
onTap: widget.enableOnTap
? (widget.onTap ??
() {
if (SlidingUpPanelStatus.anchored ==
widget.panelController.status) {
if (SlidingUpPanelStatus.anchored == widget.panelController.status) {
collapse();
} else if (SlidingUpPanelStatus.collapsed ==
widget.panelController.status) {
} else if (SlidingUpPanelStatus.collapsed == widget.panelController.status) {
anchor();
} else if (SlidingUpPanelStatus.expanded ==
widget.panelController.status) {
} else if (SlidingUpPanelStatus.expanded == widget.panelController.status) {
collapse();
} else {
collapse();
Expand All @@ -307,8 +303,7 @@ class _SlidingUpPanelWidgetState extends State<SlidingUpPanelWidget>

///Handle method when user drag the panel
void _handleDragUpdate(DragUpdateDetails details) {
_animationController.value -=
details.primaryDelta! / (_childHeight ?? details.primaryDelta!);
_animationController.value -= details.primaryDelta! / (_childHeight ?? details.primaryDelta!);
widget.panelController.value = SlidingUpPanelStatus.dragging;
widget.onStatusChanged?.call(widget.panelController.status);
widget.dragUpdate?.call(details);
Expand All @@ -319,28 +314,24 @@ class _SlidingUpPanelWidgetState extends State<SlidingUpPanelWidget>
if (details.velocity.pixelsPerSecond.dy < -_kMinFlingVelocity) {
if (SlidingUpPanelStatus.collapsed == widget.panelController.status) {
anchor();
} else if ((SlidingUpPanelStatus.anchored ==
widget.panelController.status)) {
} else if ((SlidingUpPanelStatus.anchored == widget.panelController.status)) {
expand();
} else {
expand();
}
} else if (details.velocity.pixelsPerSecond.dy > _kMinFlingVelocity) {
if (SlidingUpPanelStatus.expanded == widget.panelController.status) {
anchor();
} else if ((SlidingUpPanelStatus.anchored ==
widget.panelController.status)) {
} else if ((SlidingUpPanelStatus.anchored == widget.panelController.status)) {
collapse();
} else {
collapse();
}
} else if (_animationController.value < _kCloseProgressThreshold) {
collapse();
} else if ((_animationController.value >=
(anchorFraction + widget.upperBound) / 2)) {
} else if ((_animationController.value >= (anchorFraction + widget.upperBound) / 2)) {
expand();
} else if (_animationController.value >= _kCloseProgressThreshold &&
_animationController.value < (anchorFraction + widget.upperBound) / 2) {
} else if (_animationController.value >= _kCloseProgressThreshold && _animationController.value < (anchorFraction + widget.upperBound) / 2) {
anchor();
} else {
collapse();
Expand All @@ -351,32 +342,28 @@ class _SlidingUpPanelWidgetState extends State<SlidingUpPanelWidget>
///Collapse the panel
void collapse() {
reCalculateCollapseFraction();
_animationController.animateTo(collapseFraction,
curve: Curves.linearToEaseOut, duration: _kSlidingUpPanelDuration);
_animationController.animateTo(collapseFraction, curve: Curves.linearToEaseOut, duration: _kSlidingUpPanelDuration);
widget.panelController.value = SlidingUpPanelStatus.collapsed;
widget.onStatusChanged?.call(widget.panelController.status);
}

///Expand the panel
void expand() {
_animationController.animateTo(widget.upperBound,
curve: Curves.linearToEaseOut, duration: _kSlidingUpPanelDuration);
_animationController.animateTo(widget.upperBound, curve: Curves.linearToEaseOut, duration: _kSlidingUpPanelDuration);
widget.panelController.value = SlidingUpPanelStatus.expanded;
widget.onStatusChanged?.call(widget.panelController.status);
}

///Anchor the panel
void anchor() {
_animationController.animateTo(anchorFraction,
curve: Curves.linearToEaseOut, duration: _kSlidingUpPanelDuration);
_animationController.animateTo(anchorFraction, curve: Curves.linearToEaseOut, duration: _kSlidingUpPanelDuration);
widget.panelController.value = SlidingUpPanelStatus.anchored;
widget.onStatusChanged?.call(widget.panelController.status);
}

///Hide the panel
void hide() {
_animationController.animateTo(0,
curve: Curves.linearToEaseOut, duration: _kSlidingUpPanelDuration);
_animationController.animateTo(0, curve: Curves.linearToEaseOut, duration: _kSlidingUpPanelDuration);
widget.panelController.value = SlidingUpPanelStatus.hidden;
widget.onStatusChanged?.call(widget.panelController.status);
}
Expand Down Expand Up @@ -414,8 +401,7 @@ class _SlidingUpPanelWidgetState extends State<SlidingUpPanelWidget>

///The controller of SlidingUpPanelWidget
class SlidingUpPanelController extends ValueNotifier<SlidingUpPanelStatus> {
SlidingUpPanelController({SlidingUpPanelStatus? value})
: super(value != null ? value : SlidingUpPanelStatus.collapsed);
SlidingUpPanelController({SlidingUpPanelStatus? value}) : super(value != null ? value : SlidingUpPanelStatus.collapsed);

SlidingUpPanelStatus get status => value;

Expand Down