From 7ca4de2f148afe385b6eabe2290eb410a4df9d6a Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Tue, 7 Feb 2023 19:48:00 -0800 Subject: [PATCH 1/4] Update __str__ for command --- .appveyor.yml | 4 +++- sdk/python/packages/flet-core/src/flet_core/protocol.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 27b6252fe..df9c614ec 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -133,7 +133,9 @@ 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 + else + dart pub publish --dry-run fi # ====================================== 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 From 2535f7ddc60c02a84150addf4de70cb470602f39 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Tue, 7 Feb 2023 19:52:43 -0800 Subject: [PATCH 2/4] dart pub publish --force --dry-run --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index df9c614ec..eadeeedb0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -135,7 +135,7 @@ for: echo $PUB_DEV_TOKEN | base64 --decode > $HOME/.config/dart/pub-credentials.json dart pub publish --force else - dart pub publish --dry-run + dart pub publish --force --dry-run fi # ====================================== From d840fb86991b22d35b39fca8214b4ae48ccf220d Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Tue, 7 Feb 2023 20:00:25 -0800 Subject: [PATCH 3/4] Remove drt run --- .appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index eadeeedb0..fdd180c0e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -134,8 +134,6 @@ for: mkdir -p $HOME/.config/dart echo $PUB_DEV_TOKEN | base64 --decode > $HOME/.config/dart/pub-credentials.json dart pub publish --force - else - dart pub publish --force --dry-run fi # ====================================== From 19521fdde05e6f8789317bc77fad79243b2b5717 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 8 Feb 2023 09:30:44 -0800 Subject: [PATCH 4/4] Fix: View with content crashes in some routing scenarios Fixed #996 --- package/lib/src/models/control_view_model.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); }