Fix creating packs from the selection menu, fixes #1178

CodeDoctorDE · CodeDoctorDE · commit f00bb9dfb9fc · 2026-07-21T20:11:37.000+02:00
diff --git a/app/lib/api/file_system.dart b/app/lib/api/file_system.dart
@@ -388,6 +388,25 @@ class ButterflyFileSystem {
   PackFileSystem buildDefaultPackSystem({bool forceRecreate = false}) =>
       buildPackSystem(settingsCubit.state.getDefaultRemote(), forceRecreate);
 
+  Future<String> createPack(
+    NoteData pack, {
+    String? name,
+    ExternalStorage? storage,
+  }) async {
+    final fallback = pack.name?.trim().isNotEmpty == true ? pack.name! : 'pack';
+    var fileName = name?.trim().isNotEmpty == true ? name! : fallback;
+    if (!fileName.endsWith('.bfly')) fileName = '$fileName.bfly';
+    final fileSystem = buildPackSystem(storage);
+    await fileSystem.initialize();
+    await fileSystem.createFile(fileName, pack);
+    final files = await fileSystem.getFiles();
+    return files
+            .where((file) => file.pathWithoutLeadingSlash == fileName)
+            .firstOrNull
+            ?.path ??
+        fileName;
+  }
+
   Future<PackItem<T>?> findPack<T extends PackAsset>(
     NamedItem<T>? Function(NoteData) test, [
     ExternalStorage? storage,
diff --git a/app/lib/dialogs/packs/asset.dart b/app/lib/dialogs/packs/asset.dart
@@ -14,31 +14,67 @@ import 'package:phosphor_flutter/phosphor_flutter.dart';
 import '../../bloc/document_bloc.dart';
 import 'pack.dart';
 
-class AssetDialog extends StatelessWidget {
+class AssetDialog extends StatefulWidget {
   final PackAssetLocation? value;
   final String initialName;
 
   const AssetDialog({super.key, this.value, this.initialName = ''});
 
+  @override
+  State<AssetDialog> createState() => _AssetDialogState();
+}
+
+class _AssetDialogState extends State<AssetDialog> {
+  late final ButterflyFileSystem _fileSystem;
+  late final PackFileSystem _packSystem;
+  late Future<List<FileSystemFile<NoteData>>> _packsFuture;
+  late String _name;
+  String? _pack;
+
+  @override
+  void initState() {
+    super.initState();
+    _fileSystem = context.read<ButterflyFileSystem>();
+    _packSystem = _fileSystem.buildDefaultPackSystem();
+    _packsFuture = _getPacks();
+    _pack = widget.value?.namespace;
+    _name = widget.value?.key ?? widget.initialName;
+  }
+
+  Future<List<FileSystemFile<NoteData>>> _getPacks() =>
+      _packSystem.initialize().then((_) => _packSystem.getFiles());
+
+  Future<void> _createPack() async {
+    final pack = await showDialog<NoteData>(
+      context: context,
+      builder: (context) => const PackDialog(),
+    );
+    if (pack == null) return;
+    final createdPath = await _fileSystem.createPack(
+      pack,
+      storage: _packSystem.storage,
+    );
+    final packs = await _packSystem.getFiles();
+    if (!mounted) return;
+    setState(() {
+      _pack = createdPath;
+      _packsFuture = Future.value(packs);
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
-    String? pack = value?.namespace;
-    String name = value?.key ?? initialName;
-    final bloc = context.read<DocumentBloc>();
-    final packSystem = context
-        .read<ButterflyFileSystem>()
-        .buildDefaultPackSystem();
     return FutureBuilder<List<FileSystemFile<NoteData>>>(
-      future: packSystem.initialize().then((_) => packSystem.getFiles()),
+      future: _packsFuture,
       builder: (context, snapshot) => BlocBuilder<DocumentBloc, DocumentState>(
         buildWhen: (previous, current) => previous.data != current.data,
         builder: (context, state) {
           if (state is! DocumentLoaded) return const SizedBox();
           final packs = snapshot.data ?? <FileSystemFile<NoteData>>[];
-          pack ??= packs.firstOrNull?.path;
+          _pack ??= packs.firstOrNull?.path;
           return AlertDialog(
             title: Text(
-              value == null
+              widget.value == null
                   ? AppLocalizations.of(context).addAsset
                   : AppLocalizations.of(context).editAsset,
             ),
@@ -62,24 +98,15 @@ class AssetDialog extends StatelessWidget {
                             ),
                           );
                         }).toList(),
-                        onSelected: (value) {
-                          pack = value;
-                        },
-                        initialSelection: pack,
+                        onSelected: (value) => _pack = value,
+                        initialSelection: _pack,
                         expandedInsets: const EdgeInsets.all(0),
                       ),
                     ),
                     const SizedBox(width: 8),
                     IconButton(
                       icon: const PhosphorIcon(PhosphorIconsLight.plusCircle),
-                      onPressed: () async {
-                        final pack = await showDialog<NoteData>(
-                          context: context,
-                          builder: (context) => const PackDialog(),
-                        );
-                        if (pack == null) return;
-                        bloc.add(PackAdded(pack));
-                      },
+                      onPressed: _createPack,
                       tooltip: AppLocalizations.of(context).createPack,
                     ),
                   ],
@@ -90,10 +117,8 @@ class AssetDialog extends StatelessWidget {
                     labelText: LeapLocalizations.of(context).name,
                     filled: true,
                   ),
-                  initialValue: name,
-                  onChanged: (value) {
-                    name = value;
-                  },
+                  initialValue: _name,
+                  onChanged: (value) => _name = value,
                 ),
               ],
             ),
@@ -108,8 +133,8 @@ class AssetDialog extends StatelessWidget {
               ),
               ElevatedButton(
                 onPressed: () {
-                  if (pack == null) return;
-                  Navigator.of(context).pop(PackAssetLocation(pack!, name));
+                  if (_pack == null) return;
+                  Navigator.of(context).pop(PackAssetLocation(_pack!, _name));
                 },
                 child: Text(MaterialLocalizations.of(context).okButtonLabel),
               ),
diff --git a/app/lib/dialogs/packs/dialog.dart b/app/lib/dialogs/packs/dialog.dart
@@ -242,14 +242,12 @@ class _PacksDialogState extends State<PacksDialog>
     );
   }
 
-  String _normalizePackFileName(String? name, NoteData pack) {
-    final fallback = pack.name?.trim().isNotEmpty == true ? pack.name! : 'pack';
-    final fileName = name?.trim().isNotEmpty == true ? name! : fallback;
-    return fileName.endsWith('.bfly') ? fileName : '$fileName.bfly';
-  }
-
   Future<void> _addPack(NoteData pack, {String? name}) async {
-    await _packSystem.createFile(_normalizePackFileName(name, pack), pack);
+    await _fileSystem.createPack(
+      pack,
+      name: name,
+      storage: _packSystem.storage,
+    );
     _refresh();
   }
 
diff --git a/app/test/dialogs/pack_regression_test.dart b/app/test/dialogs/pack_regression_test.dart
@@ -0,0 +1,30 @@
+import 'package:butterfly/cubits/settings.dart';
+import 'package:butterfly/models/defaults.dart';
+import 'package:butterfly_api/butterfly_api.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+
+import '../helpers/mocks.dart';
+
+void main() {
+  test('creating a pack stores it in the global pack filesystem', () async {
+    final fileSystem = MockButterflyFileSystem();
+    final settingsCubit = fileSystem.settingsCubit as MockSettingsCubit;
+    when(
+      () => settingsCubit.state,
+    ).thenReturn(const ButterflySettings(autosave: false));
+    final packSystem = fileSystem.buildDefaultPackSystem();
+    final pack = DocumentDefaults.createPack().setMetadata(
+      DocumentDefaults.createMetadata(
+        type: NoteFileType.pack,
+        name: 'New Pack',
+      ),
+    );
+
+    final createdPath = await fileSystem.createPack(pack);
+    final packs = await packSystem.getFiles();
+
+    expect(createdPath, packs.single.path);
+    expect(packs.single.pathWithoutLeadingSlash, 'New Pack.bfly');
+  });
+}
diff --git a/app/test/helpers/mocks.dart b/app/test/helpers/mocks.dart
@@ -36,6 +36,26 @@ class MockButterflyFileSystem implements ButterflyFileSystem {
   PackFileSystem buildDefaultPackSystem({bool forceRecreate = false}) =>
       _packFileSystem;
 
+  @override
+  Future<String> createPack(
+    NoteData pack, {
+    String? name,
+    ExternalStorage? storage,
+  }) async {
+    final fallback = pack.name?.trim().isNotEmpty == true ? pack.name! : 'pack';
+    var fileName = name?.trim().isNotEmpty == true ? name! : fallback;
+    if (!fileName.endsWith('.bfly')) fileName = '$fileName.bfly';
+    final fileSystem = buildPackSystem(storage);
+    await fileSystem.initialize();
+    await fileSystem.createFile(fileName, pack);
+    final files = await fileSystem.getFiles();
+    return files
+            .where((file) => file.pathWithoutLeadingSlash == fileName)
+            .firstOrNull
+            ?.path ??
+        fileName;
+  }
+
   @override
   TemplateFileSystem buildDefaultTemplateSystem({bool forceRecreate = false}) =>
       _templateFileSystem;
diff --git a/metadata/en-US/changelogs/190.txt b/metadata/en-US/changelogs/190.txt
@@ -10,5 +10,6 @@
 * Fix file previews resetting the language to the system locale
 * Fix filename preview appearing when renaming existing documents
 * Fix navigation menus broken on mobile layout ([#1177](https://github.com/LinwoodDev/Butterfly/issues/1177))
+* Fix creating packs from the selection menu ([#1178](https://github.com/LinwoodDev/Butterfly/issues/1178))
 
-Read more here: https://linwood.dev/butterfly/2.6.0-beta.3
+Read more here: https://linwood.dev/butterfly/2.6.0-beta.3
