Merge pull request #1121 from EnsembleUI/fix-keyboard

fix: keyboard hides textfield
EnsembleUI · Jan 9, 2024 · 5b102a4 · 5b102a4
2 parents a05e88c + e38b93e
commit 5b102a4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/lib/framework/data_context.dart b/lib/framework/data_context.dart
@@ -458,9 +458,11 @@ class NativeInvokable extends ActionInvokable {
         screenName: screenName, pageArgs: inputMap, asModal: true);
     // how do we handle onModalDismiss in Typescript?
   }
+
   void closeAllDialogs() {
     ScreenController().executeAction(buildContext, CloseAllDialogsAction());
   }
+
   void showDialog(dynamic widget) {
     ScreenController()
         .executeAction(buildContext, ShowDialogAction(widget: widget));

diff --git a/lib/framework/view/page.dart b/lib/framework/view/page.dart
@@ -408,6 +408,10 @@ class PageState extends State<Page>
       );
     }
 
+    Widget getBodyContent() => isScrollableView
+        ? buildScrollablePageContent(hasDrawer)
+        : buildFixedPageContent(fixedAppBar != null);
+
     Widget rtn = DataScopeWidget(
       scopeManager: _scopeManager,
       child: Unfocus(
@@ -421,13 +425,17 @@ class PageState extends State<Page>
 
             // appBar is inside CustomScrollView if defined
             appBar: fixedAppBar,
-            body: isScrollableView
-                ? buildScrollablePageContent(hasDrawer)
-                : buildFixedPageContent(fixedAppBar != null),
+            body: footerWidget == null
+                ? getBodyContent()
+                : Column(
+                    children: [
+                      Expanded(child: getBodyContent()),
+                      footerWidget!,
+                    ],
+                  ),
             bottomNavigationBar: _bottomNavBar,
             drawer: _drawer,
             endDrawer: _endDrawer,
-            bottomSheet: footerWidget,
             floatingActionButton: closeModalButton,
             floatingActionButtonLocation:
                 widget._pageModel.pageStyles?['navigationIconPosition'] ==