Add option to reoder area

LinwoodDev · Feb 14, 2024 · 4995406 · 4995406
1 parent 5f031f4
commit 4995406
Show file tree

Hide file tree

Showing 6 changed files with 828 additions and 47 deletions.
diff --git a/api/lib/src/protocol/event.dart b/api/lib/src/protocol/event.dart
@@ -141,6 +141,11 @@ class DocumentEvent extends ReplayEvent with _$DocumentEvent {
     Area area,
   ) = AreaChanged;
 
+  const factory DocumentEvent.areaReordered(
+    String name,
+    int newIndex,
+  ) = AreaReordered;
+
   const factory DocumentEvent.currentAreaChanged(
     String name,
   ) = CurrentAreaChanged;

diff --git a/api/lib/src/protocol/event.freezed.dart b/api/lib/src/protocol/event.freezed.dart
diff --git a/api/lib/src/protocol/event.g.dart b/api/lib/src/protocol/event.g.dart
diff --git a/app/lib/bloc/document_bloc.dart b/app/lib/bloc/document_bloc.dart
@@ -711,6 +711,19 @@ class DocumentBloc extends ReplayBloc<DocumentEvent, DocumentState> {
         }
       }
     });
+    on<AreaReordered>((event, emit) {
+      final current = state;
+      if (current is! DocumentLoadSuccess) return;
+      if (!(current.embedding?.editable ?? true)) return;
+      final areas = List<Area>.from(current.page.areas);
+      final area =
+          areas.firstWhereOrNull((element) => element.name == event.name);
+      if (area == null) return;
+      areas.remove(area);
+      areas.insert(event.newIndex, area);
+      final currentDocument = current.page.copyWith(areas: areas);
+      _saveState(emit, current.copyWith(page: currentDocument));
+    });
     on<ExportPresetCreated>((event, emit) {
       final current = state;
       if (current is! DocumentLoadSuccess) return;

diff --git a/app/lib/handlers/area.dart b/app/lib/handlers/area.dart
@@ -216,6 +216,13 @@ class AreaHandler extends Handler<AreaTool> {
         context.getCameraTransform().localToGlobal(localPosition);
     final areas = state.page.getAreas(globalPosition, distance);
     var area = areas.firstOrNull ?? state.currentArea;
+    if (_selectionManager.isValid) {
+      if (_selectionManager.selection.contains(globalPosition)) {
+        area = _currentArea;
+      }
+      _selectionManager.deselect();
+      _currentArea = null;
+    }
     if (area == null) return;
     if (areas.length > 1) {
       area = await showDialog<Area>(

diff --git a/app/lib/views/navigator/areas.dart b/app/lib/views/navigator/areas.dart
@@ -69,12 +69,17 @@ class AreasView extends StatelessWidget {
                                     .contains(
                                         _searchController.text.toLowerCase()))
                                 .toList();
-                            return ListView.builder(
+                            return ReorderableListView.builder(
                                 itemCount: areas.length,
+                                onReorder: (oldIndex, newIndex) => context
+                                    .read<DocumentBloc>()
+                                    .add(AreaReordered(
+                                        areas[oldIndex].name, newIndex)),
                                 itemBuilder: (BuildContext context, int index) {
                                   final area = areas[index];
                                   return EditableListTile(
                                     initialValue: area.name,
+                                    key: ValueKey(area.name),
                                     onTap: () {
                                       final screen = context
                                           .read<CurrentIndexCubit>()