Fix missing scrolling in export pdf select dialogs, closes #633

LinwoodDev · Mar 18, 2024 · cdae317 · cdae317
1 parent 5819d83
commit cdae317
Show file tree

Hide file tree

Showing 6 changed files with 638 additions and 522 deletions.
diff --git a/app/lib/dialogs/export/pdf.dart b/app/lib/dialogs/export/pdf.dart
@@ -268,34 +268,38 @@ class _AreaSelectionDialogState extends State<_AreaSelectionDialog> {
             ),
           ),
           Flexible(
-            child: BlocBuilder<DocumentBloc, DocumentState>(
-                buildWhen: (previous, current) =>
-                    previous.page != current.page ||
-                    previous.pageName != current.pageName,
-                builder: (context, state) => Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: widget.document
-                          .getPages()
-                          .expand(
-                            (page) =>
-                                (page == state.pageName
-                                        ? state.page
-                                        : widget.document.getPage(page))
-                                    ?.areas
-                                    .where((element) =>
-                                        element.name.contains(_searchQuery))
-                                    .map((e) {
-                                  return ListTile(
-                                    title: Text(e.name),
-                                    subtitle: Text(page),
-                                    onTap: () =>
-                                        Navigator.of(context).pop((page, e)),
-                                  );
-                                }).toList() ??
-                                <Widget>[],
-                          )
-                          .toList(),
-                    )),
+            child: Material(
+              type: MaterialType.transparency,
+              child: BlocBuilder<DocumentBloc, DocumentState>(
+                  buildWhen: (previous, current) =>
+                      previous.page != current.page ||
+                      previous.pageName != current.pageName,
+                  builder: (context, state) => ListView(
+                        shrinkWrap: true,
+                        children: widget.document
+                            .getPages()
+                            .expand(
+                              (page) =>
+                                  (page == state.pageName
+                                          ? state.page
+                                          : widget.document.getPage(page))
+                                      ?.areas
+                                      .where((element) =>
+                                          element.name.contains(_searchQuery))
+                                      .map((e) {
+                                    return ListTile(
+                                      title: Text(e.name),
+                                      subtitle: Text(page),
+                                      key: ObjectKey(e.name),
+                                      onTap: () =>
+                                          Navigator.of(context).pop((page, e)),
+                                    );
+                                  }).toList() ??
+                                  <Widget>[],
+                            )
+                            .toList(),
+                      )),
+            ),
           ),
           Padding(
             padding: const EdgeInsets.all(8.0),
@@ -367,7 +371,7 @@ class _ExportPresetsDialogState extends State<ExportPresetsDialog> {
             child: BlocBuilder<DocumentBloc, DocumentState>(
                 builder: (context, state) {
               if (state is! DocumentLoadSuccess) return Container();
-              return Column(mainAxisSize: MainAxisSize.min, children: [
+              return ListView(shrinkWrap: true, children: [
                 ...state.info.exportPresets
                     .where((element) => element.name.contains(_searchQuery))
                     .map((e) => Dismissible(

diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -524,10 +524,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_native_splash
-      sha256: "558f10070f03ee71f850a78f7136ab239a67636a294a44a06b6b7345178edb1e"
+      sha256: edf39bcf4d74aca1eb2c1e43c3e445fd9f494013df7f0da752fefe72020eedc0
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.10"
+    version: "2.4.0"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:

diff --git a/app/pubspec.yaml b/app/pubspec.yaml
@@ -93,7 +93,7 @@ dependencies:
   device_info_plus: ^9.1.2
   image: ^4.1.7
 dev_dependencies:
-  flutter_native_splash: ^2.3.10
+  flutter_native_splash: ^2.4.0
   #flutter_launcher_icons: ^0.11.0
   flutter_lints: ^3.0.1
   flutter_test:

diff --git a/docs/package.json b/docs/package.json
@@ -25,7 +25,7 @@
     "@docusaurus/theme-common": "3.1.1",
     "@mdx-js/react": "^3.0.1",
     "@phosphor-icons/react": "^2.0.15",
-    "@swc/core": "^1.4.6",
+    "@swc/core": "^1.4.8",
     "animate.css": "^4.1.1",
     "clsx": "^2.1.0",
     "node-fetch": "^3.3.2",