diff --git a/lib/pangea/analytics_details_popup/morph_analytics_view.dart b/lib/pangea/analytics_details_popup/morph_analytics_view.dart index 14fcf12c4..503777308 100644 --- a/lib/pangea/analytics_details_popup/morph_analytics_view.dart +++ b/lib/pangea/analytics_details_popup/morph_analytics_view.dart @@ -31,7 +31,7 @@ class MorphAnalyticsView extends StatelessWidget { builder: (context, snapshot) { final morphs = snapshot.data ?? defaultMorphMapping; - morphs.displayFeatures.sort( + final features = morphs.displayFeatures.sorted( (a, b) => morphFeatureSortOrder .indexOf(a.feature) .compareTo(morphFeatureSortOrder.indexOf(b.feature)), @@ -40,21 +40,21 @@ class MorphAnalyticsView extends StatelessWidget { return snapshot.connectionState == ConnectionState.done ? ListView.builder( key: const PageStorageKey('morph-analytics'), - itemCount: morphs.displayFeatures.length, - itemBuilder: (context, index) => morphs - .displayFeatures[index].displayTags.isNotEmpty - ? MorphFeatureBox( - morphFeature: morphs.displayFeatures[index].feature, - allTags: snapshot.data - ?.getDisplayTags( - morphs.displayFeatures[index].feature, - ) - .map((tag) => tag.toLowerCase()) - .toSet() ?? - {}, - onConstructZoom: onConstructZoom, - ) - : const SizedBox.shrink(), + itemCount: features.length, + itemBuilder: (context, index) => + features[index].displayTags.isNotEmpty + ? MorphFeatureBox( + morphFeature: features[index].feature, + allTags: snapshot.data + ?.getDisplayTags( + features[index].feature, + ) + .map((tag) => tag.toLowerCase()) + .toSet() ?? + {}, + onConstructZoom: onConstructZoom, + ) + : const SizedBox.shrink(), ) : const Center( child: CircularProgressIndicator(), diff --git a/lib/pangea/morphs/default_morph_mapping.dart b/lib/pangea/morphs/default_morph_mapping.dart index 7e9513747..0d4a501b1 100644 --- a/lib/pangea/morphs/default_morph_mapping.dart +++ b/lib/pangea/morphs/default_morph_mapping.dart @@ -235,33 +235,33 @@ final MorphFeaturesAndTags defaultMorphMapping = MorphFeaturesAndTags.fromJson({ final List morphFeatureSortOrder = [ "pos", - "advtype", - "aspect", - "case", - "conjtype", - "definite", - "degree", - "evident", - "gender", - "mood", - "nountype", - "numform", - "numtype", - "number", - "number[psor]", - "person", - "polarity", - "polite", - "poss", - "prepcase", - "prontype", - "punctside", - "puncttype", - "reflex", "tense", + "aspect", + "mood", + "voice", "verbform", "verbtype", - "voice", + "number", + "gender", + "nountype", + "case", + "prontype", + "person", + "definite", + "reflex", + "prepcase", + "poss", + "number[psor]", + "degree", + "polarity", + "advtype", + "conjtype", + "numform", + "numtype", + "polite", + "puncttype", + "punctside", + "evident", "foreign", "x", ];