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

Make ControlEvent.data of type Optional[str] with None as default #4800

Merged
merged 3 commits into from
Feb 10, 2025
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
2 changes: 1 addition & 1 deletion packages/flet/lib/src/controls/checkbox.dart
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class _CheckboxControlState extends State<CheckboxControl> with FletStoreMixin {

void _onFocusChange() {
widget.backend.triggerControlEvent(
widget.control.id, _focusNode.hasFocus ? "focus" : "blur", "");
widget.control.id, _focusNode.hasFocus ? "focus" : "blur");
}

@override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ class _CupertinoSlidingSegmentedButtonControlState
if (!disabled) {
widget.backend.updateControlState(widget.control.id,
{"selectedIndex": index != null ? index.toString() : ""});
widget.backend.triggerControlEvent(widget.control.id, "change",
index != null ? index.toString() : "");
widget.backend.triggerControlEvent(
widget.control.id, "change", index?.toString());
}
},
thumbColor: widget.control.attrColor(
Expand Down
5 changes: 2 additions & 3 deletions packages/flet/lib/src/controls/cupertino_textfield.dart
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,15 @@ class _CupertinoTextFieldControlState extends State<CupertinoTextFieldControl>
setState(() {
_focused = _shiftEnterfocusNode.hasFocus;
});
widget.backend.triggerControlEvent(widget.control.id,
_shiftEnterfocusNode.hasFocus ? "focus" : "blur", "");
widget.backend.triggerControlEvent(widget.control.id, _shiftEnterfocusNode.hasFocus ? "focus" : "blur");
}

void _onFocusChange() {
setState(() {
_focused = _focusNode.hasFocus;
});
widget.backend.triggerControlEvent(
widget.control.id, _focusNode.hasFocus ? "focus" : "blur", "");
widget.control.id, _focusNode.hasFocus ? "focus" : "blur");
}

@override
Expand Down
12 changes: 4 additions & 8 deletions packages/flet/lib/src/controls/datatable.dart
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,9 @@ class _DataTableControlState extends State<DataTableControl>
sortAscending: widget.control.attrBool("sortAscending", false)!,
sortColumnIndex: widget.control.attrInt("sortColumnIndex"),
onSelectAll: widget.control.attrBool("onSelectAll", false)!
? (selected) {
? (bool? selected) {
widget.backend.triggerControlEvent(
widget.control.id,
"select_all",
selected != null ? selected.toString() : "");
widget.control.id, "select_all", selected?.toString());
}
: null,
columns: viewModel.controlViews
Expand Down Expand Up @@ -143,10 +141,8 @@ class _DataTableControlState extends State<DataTableControl>
Theme.of(context), row.control, "color"),
onSelectChanged: row.control.attrBool("onSelectChanged", false)!
? (selected) {
widget.backend.triggerControlEvent(
row.control.id,
"select_changed",
selected != null ? selected.toString() : "");
widget.backend.triggerControlEvent(row.control.id,
"select_changed", selected?.toString());
}
: null,
onLongPress: row.control.attrBool("onLongPress", false)!
Expand Down
2 changes: 1 addition & 1 deletion packages/flet/lib/src/controls/markdown.dart
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class MarkdownControl extends StatelessWidget with FletStoreMixin {
openWebBrowser(href, webWindowName: autoFollowLinksTarget);
}
backend.triggerControlEvent(
control.id, "tap_link", href?.toString() ?? "");
control.id, "tap_link", href?.toString());
});

return constrainedControl(context, markdown, parent, control);
Expand Down
6 changes: 3 additions & 3 deletions packages/flet/lib/src/controls/selection_area.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';

import '../flet_control_backend.dart';
import '../models/control.dart';
Expand Down Expand Up @@ -36,9 +37,8 @@ class SelectionAreaControl extends StatelessWidget {
var selectionArea = SelectionArea(
child: createControl(control, contentCtrls.first.id, disabled,
parentAdaptive: parentAdaptive),
onSelectionChanged: (selection) {
backend.triggerControlEvent(
control.id, "change", selection?.plainText ?? "");
onSelectionChanged: (SelectedContent? selection) {
backend.triggerControlEvent(control.id, "change", selection?.plainText);
},
);

Expand Down
2 changes: 1 addition & 1 deletion packages/flet/lib/src/controls/switch.dart
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class _SwitchControlState extends State<SwitchControl> with FletStoreMixin {
widget.backend.triggerControlEvent(
widget.control.id,
_focusNode.hasFocus ? "focus" : "blur",
_focusNode.hasFocus ? _focusNode.hasPrimaryFocus.toString() : "");
_focusNode.hasPrimaryFocus.toString());
}

@override
Expand Down
5 changes: 2 additions & 3 deletions packages/flet/lib/src/controls/textfield.dart
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,15 @@ class _TextFieldControlState extends State<TextFieldControl>
setState(() {
_focused = _shiftEnterfocusNode.hasFocus;
});
widget.backend.triggerControlEvent(widget.control.id,
_shiftEnterfocusNode.hasFocus ? "focus" : "blur", "");
widget.backend.triggerControlEvent(widget.control.id, _shiftEnterfocusNode.hasFocus ? "focus" : "blur");
}

void _onFocusChange() {
setState(() {
_focused = _focusNode.hasFocus;
});
widget.backend.triggerControlEvent(
widget.control.id, _focusNode.hasFocus ? "focus" : "blur", "");
widget.control.id, _focusNode.hasFocus ? "focus" : "blur");
}

@override
Expand Down
2 changes: 1 addition & 1 deletion packages/flet/lib/src/flet_control_backend.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ abstract class FletControlBackend {
{bool client = true, bool server = true});

void triggerControlEvent(String controlId, String eventName,
[String eventData = ""]);
[String? eventData]);

void subscribeMethods(String controlId,
Future<String?> Function(String, Map<String, String>) methodHandler);
Expand Down
4 changes: 2 additions & 2 deletions packages/flet/lib/src/flet_server.dart
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ class FletServer implements FletControlBackend {

@override
void triggerControlEvent(String controlId, String eventName,
[String eventData = ""]) {
[String? eventData]) {
_sendPageEvent(
eventTarget: controlId, eventName: eventName, eventData: eventData);
}
Expand All @@ -198,7 +198,7 @@ class FletServer implements FletControlBackend {
_sendPageEvent(
{required String eventTarget,
required String eventName,
required String eventData}) {
String? eventData}) {
send(Message(
action: MessageAction.pageEventFromWeb,
payload: PageEventFromWebRequest(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class PageEventFromWebRequest {
final String eventTarget;
final String eventName;
final String eventData;
final String? eventData;

PageEventFromWebRequest(
{required this.eventTarget,
Expand Down
4 changes: 3 additions & 1 deletion sdk/python/packages/flet/src/flet/core/control_event.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from typing import Optional

from flet.core.event import Event


class ControlEvent(Event):
def __init__(self, target: str, name: str, data: str, control, page):
def __init__(self, target: str, name: str, data: Optional[str], control, page):
Event.__init__(self, target=target, name=name, data=data)

self.control = control
Expand Down
11 changes: 7 additions & 4 deletions sdk/python/packages/flet/src/flet/core/event.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
from typing import Optional


class Event:
def __init__(self, target: str, name: str, data: str):
self.target: str = target
self.name: str = name
self.data: str = data
def __init__(self, target: str, name: str, data: Optional[str]):
self.target = target
self.name = name
self.data = data

def __repr__(self):
attrs = ", ".join(f"{k}={v!r}" for k, v in self.__dict__.items())
Expand Down