@@ -330,7 +330,7 @@ abstract class AssetPickerBuilderDelegate<Asset, Path> {
330
330
int ? findChildIndexBuilder ({
331
331
required String id,
332
332
required List <Asset > assets,
333
- required List <SpecialItemModel > prependSpecialItemResults ,
333
+ required List <SpecialItemModel > specialItemModels ,
334
334
int placeholderCount = 0 ,
335
335
}) =>
336
336
null ;
@@ -358,7 +358,7 @@ abstract class AssetPickerBuilderDelegate<Asset, Path> {
358
358
int index,
359
359
Asset asset,
360
360
Widget child,
361
- List <SpecialItemModel > prependSpecialItemResults ,
361
+ List <SpecialItemModel > specialItemModels ,
362
362
);
363
363
364
364
/// The item builder for audio type of asset.
@@ -1317,12 +1317,7 @@ class DefaultAssetPickerBuilderDelegate
1317
1317
id: key.value,
1318
1318
assets: assets,
1319
1319
placeholderCount: placeholderCount,
1320
- prependSpecialItemResults: specialItemModels
1321
- .where (
1322
- (item) =>
1323
- item.position == SpecialItemPosition .prepend,
1324
- )
1325
- .toList (),
1320
+ specialItemModels: specialItemModels,
1326
1321
);
1327
1322
}
1328
1323
return null ;
@@ -1492,15 +1487,18 @@ class DefaultAssetPickerBuilderDelegate
1492
1487
index,
1493
1488
asset,
1494
1489
content,
1495
- prependItems ,
1490
+ specialItemModels ,
1496
1491
);
1497
1492
}
1498
1493
1499
1494
int semanticIndex (
1500
1495
int index,
1501
- List <SpecialItemModel > prependSpecialItemResults ,
1496
+ List <SpecialItemModel > specialItemModels ,
1502
1497
) {
1503
- return index - prependSpecialItemResults.length;
1498
+ final prependSpecialItemModels = specialItemModels.where (
1499
+ (SpecialItemModel model) => model.position == SpecialItemPosition .prepend,
1500
+ );
1501
+ return index - prependSpecialItemModels.length;
1504
1502
}
1505
1503
1506
1504
@override
@@ -1509,7 +1507,7 @@ class DefaultAssetPickerBuilderDelegate
1509
1507
int index,
1510
1508
AssetEntity asset,
1511
1509
Widget child,
1512
- List <SpecialItemModel > prependSpecialItemResults ,
1510
+ List <SpecialItemModel > specialItemModels ,
1513
1511
) {
1514
1512
return ValueListenableBuilder <bool >(
1515
1513
valueListenable: isSwitchingPath,
@@ -1543,7 +1541,7 @@ class DefaultAssetPickerBuilderDelegate
1543
1541
excludeSemantics: true ,
1544
1542
focusable: ! isSwitchingPath,
1545
1543
label: '${semanticsTextDelegate .semanticTypeLabel (asset .type )}'
1546
- '${semanticIndex (index , prependSpecialItemResults )}, '
1544
+ '${semanticIndex (index , specialItemModels )}, '
1547
1545
'${asset .createDateTime .toString ().replaceAll ('.000' , '' )}' ,
1548
1546
hidden: isSwitchingPath,
1549
1547
hint: hint,
@@ -1561,7 +1559,7 @@ class DefaultAssetPickerBuilderDelegate
1561
1559
onLongPressHint: semanticsTextDelegate.sActionPreviewHint,
1562
1560
selected: isSelected,
1563
1561
sortKey: OrdinalSortKey (
1564
- semanticIndex (index, prependSpecialItemResults ).toDouble (),
1562
+ semanticIndex (index, specialItemModels ).toDouble (),
1565
1563
name: 'GridItem' ,
1566
1564
),
1567
1565
value: selectedIndex > 0 ? '$selectedIndex ' : null ,
@@ -1574,7 +1572,7 @@ class DefaultAssetPickerBuilderDelegate
1574
1572
}
1575
1573
: null ,
1576
1574
child: IndexedSemantics (
1577
- index: semanticIndex (index, prependSpecialItemResults ),
1575
+ index: semanticIndex (index, specialItemModels ),
1578
1576
child: child,
1579
1577
),
1580
1578
),
@@ -1590,11 +1588,14 @@ class DefaultAssetPickerBuilderDelegate
1590
1588
int findChildIndexBuilder ({
1591
1589
required String id,
1592
1590
required List <AssetEntity > assets,
1593
- required List <SpecialItemModel > prependSpecialItemResults ,
1591
+ required List <SpecialItemModel > specialItemModels ,
1594
1592
int placeholderCount = 0 ,
1595
1593
}) {
1594
+ final prependSpecialItemModels = specialItemModels.where (
1595
+ (SpecialItemModel model) => model.position == SpecialItemPosition .prepend,
1596
+ );
1596
1597
int index = assets.indexWhere ((AssetEntity e) => e.id == id);
1597
- index += prependSpecialItemResults .length;
1598
+ index += prependSpecialItemModels .length;
1598
1599
index += placeholderCount;
1599
1600
return index;
1600
1601
}
0 commit comments