diff --git a/.appveyor.yml b/.appveyor.yml index 27b6252fe..fdd180c0e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -133,7 +133,7 @@ for: if [[ "$APPVEYOR_REPO_TAG_NAME" != "" ]]; then mkdir -p $HOME/.config/dart echo $PUB_DEV_TOKEN | base64 --decode > $HOME/.config/dart/pub-credentials.json - #dart pub publish -f + dart pub publish --force fi # ====================================== diff --git a/package/lib/src/models/control_view_model.dart b/package/lib/src/models/control_view_model.dart index 5384278f2..f012670d4 100644 --- a/package/lib/src/models/control_view_model.dart +++ b/package/lib/src/models/control_view_model.dart @@ -1,3 +1,4 @@ +import 'package:collection/collection.dart'; import 'package:equatable/equatable.dart'; import 'package:redux/redux.dart'; @@ -16,7 +17,8 @@ class ControlViewModel extends Equatable { return ControlViewModel( control: store.state.controls[id]!, children: store.state.controls[id]!.childIds - .map((childId) => store.state.controls[childId]!) + .map((childId) => store.state.controls[childId]) + .whereNotNull() .toList(), dispatch: store.dispatch); } diff --git a/sdk/python/packages/flet-core/src/flet_core/protocol.py b/sdk/python/packages/flet-core/src/flet_core/protocol.py index aac958f2c..d7b0ee2a5 100644 --- a/sdk/python/packages/flet-core/src/flet_core/protocol.py +++ b/sdk/python/packages/flet-core/src/flet_core/protocol.py @@ -44,7 +44,7 @@ class Command: commands: List[Any] = field(default_factory=list) def __str__(self): - return "{} {}".format(self.values, self.attrs) + return "{} {} {}".format(self.name, self.values, self.attrs) @dataclass