From fecc1ec31b0be4c8dbc7418b6b810073faf57963 Mon Sep 17 00:00:00 2001
From: sky1095 <sudhanshuexcel.yadav@gmail.com>
Date: Sun, 31 Jul 2022 13:36:52 +0530
Subject: [PATCH] fix: ProviderNotFound exception in overlay demo example

---
 .../lib/src/flowy_overlay/list_overlay.dart   | 28 ++++++++++---------
 .../src/flowy_overlay/overlay_container.dart  |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/list_overlay.dart b/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/list_overlay.dart
index 16d3b55f47..0b247267eb 100644
--- a/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/list_overlay.dart
+++ b/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/list_overlay.dart
@@ -41,20 +41,22 @@ class ListOverlay extends StatelessWidget {
     return OverlayContainer(
       constraints: BoxConstraints.tight(Size(width, totalHeight)),
       padding: padding,
-      child: Column(
-        children: [
-          ListView.builder(
-            shrinkWrap: true,
-            itemBuilder: itemBuilder,
-            itemCount: itemCount,
-            controller: controller,
-          ),
-          if (footer != null)
-            Padding(
-              padding: footer!.padding,
-              child: footer!.widget,
+      child: SingleChildScrollView(
+        child: Column(
+          children: [
+            ListView.builder(
+              shrinkWrap: true,
+              itemBuilder: itemBuilder,
+              itemCount: itemCount,
+              controller: controller,
             ),
-        ],
+            if (footer != null)
+              Padding(
+                padding: footer!.padding,
+                child: footer!.widget,
+              ),
+          ],
+        ),
       ),
     );
   }
diff --git a/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/overlay_container.dart b/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/overlay_container.dart
index 85de2c71a7..96b566b308 100644
--- a/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/overlay_container.dart
+++ b/frontend/app_flowy/packages/flowy_infra_ui/lib/src/flowy_overlay/overlay_container.dart
@@ -18,7 +18,7 @@ class OverlayContainer extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final theme = context.watch<AppTheme>();
+    final theme = context.watch<AppTheme?>() ?? AppTheme.fromType(ThemeType.light);
     return Material(
       type: MaterialType.transparency,
       child: Container(