Skip to content
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

New BottomSheet properties: dismissible, enable_drag, show_drag_handle, use_safe_area #1468

Merged
merged 3 commits into from
Jun 12, 2023
Merged
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
20 changes: 10 additions & 10 deletions media/logo/logo-inkscape.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 13 additions & 4 deletions package/lib/src/controls/bottom_sheet.dart
Original file line number Diff line number Diff line change
@@ -49,6 +49,10 @@ class _BottomSheetControlState extends State<BottomSheetControl> {

var open = widget.control.attrBool("open", false)!;
//var modal = widget.control.attrBool("modal", true)!;
var dismissible = widget.control.attrBool("dismissible", true)!;
var enableDrag = widget.control.attrBool("enableDrag", false)!;
var showDragHandle = widget.control.attrBool("showDragHandle", false)!;
var useSafeArea = widget.control.attrBool("useSafeArea", true)!;

void resetOpenState() {
List<Map<String, String>> props = [
@@ -73,10 +77,15 @@ class _BottomSheetControlState extends State<BottomSheetControl> {

WidgetsBinding.instance.addPostFrameCallback((_) {
showModalBottomSheet<void>(
context: context,
builder: (context) {
return bottomSheet;
}).then((value) {
context: context,
builder: (context) {
return bottomSheet;
},
isDismissible: dismissible,
enableDrag: enableDrag,
showDragHandle: showDragHandle,
useSafeArea: useSafeArea)
.then((value) {
debugPrint("BottomSheet dismissed: $_open");
bool shouldDismiss = _open;
_open = false;
9 changes: 5 additions & 4 deletions package/lib/src/controls/list_tile.dart
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@ class ListTileControl extends StatelessWidget {
bool isThreeLine = control.attrBool("isThreeLine", false)!;
bool autofocus = control.attrBool("autofocus", false)!;
bool onclick = control.attrBool("onclick", false)!;
bool onLongPressDefined = control.attrBool("onLongPress", false)!;
String url = control.attrString("url", "")!;
String? urlTarget = control.attrString("urlTarget");
bool disabled = control.isDisabled || parentDisabled;
@@ -56,15 +57,15 @@ class ListTileControl extends StatelessWidget {
}
: null;

Function()? onLongPress = disabled
? null
: () {
Function()? onLongPress = onLongPressDefined && !disabled
? () {
debugPrint("Button ${control.id} clicked!");
server.sendPageEvent(
eventTarget: control.id,
eventName: "long_press",
eventData: "");
};
}
: null;

ListTile tile = ListTile(
autofocus: autofocus,
45 changes: 44 additions & 1 deletion sdk/python/packages/flet-core/src/flet_core/bottom_sheet.py
Original file line number Diff line number Diff line change
@@ -60,9 +60,12 @@ def __init__(
# Specific
#
open: bool = False,
dismissible: Optional[bool] = None,
enable_drag: Optional[bool] = None,
show_drag_handle: Optional[bool] = None,
use_safe_area: Optional[bool] = None,
on_dismiss=None,
):

Control.__init__(
self,
ref=ref,
@@ -76,6 +79,10 @@ def __init__(
self.__actions: List[Control] = []

self.open = open
self.dismissible = dismissible
self.enable_drag = enable_drag
self.show_drag_handle = show_drag_handle
self.use_safe_area = use_safe_area
self.content = content
self.on_dismiss = on_dismiss

@@ -98,6 +105,42 @@ def open(self) -> Optional[bool]:
def open(self, value: Optional[bool]):
self._set_attr("open", value)

# dismissible
@property
def dismissible(self) -> Optional[bool]:
return self._get_attr("dismissible", data_type="bool", def_value=True)

@dismissible.setter
def dismissible(self, value: Optional[bool]):
self._set_attr("dismissible", value)

# enable_drag
@property
def enable_drag(self) -> Optional[bool]:
return self._get_attr("enableDrag", data_type="bool", def_value=False)

@enable_drag.setter
def enable_drag(self, value: Optional[bool]):
self._set_attr("enableDrag", value)

# show_drag_handle
@property
def show_drag_handle(self) -> Optional[bool]:
return self._get_attr("showDragHandle", data_type="bool", def_value=False)

@show_drag_handle.setter
def show_drag_handle(self, value: Optional[bool]):
self._set_attr("showDragHandle", value)

# use_safe_area
@property
def use_safe_area(self) -> Optional[bool]:
return self._get_attr("useSafeArea", data_type="bool", def_value=True)

@use_safe_area.setter
def use_safe_area(self, value: Optional[bool]):
self._set_attr("useSafeArea", value)

# content
@property
def content(self):