@javascriptcommon/react-native-carplay 2.3.11 → 2.3.12

package/ios/RNCarPlay.m

@@ -113,7 +113,8 @@ RCT_EXPORT_MODULE();
         @"selectedPreviewForTrip",
         @"startedTrip",
         @"didSelectRowItem",
-        @"templateLoaded"
+        @"templateLoaded",
+        @"listTemplateLoadMore"
     ];
 }
 
@@ -258,6 +259,14 @@ RCT_EXPORT_METHOD(createTemplate:(NSString *)templateId config:(NSDictionary*)co
                 if (config[@"emptyViewSubtitleVariants"]) {
                     listTemplate.emptyViewSubtitleVariants = [RCTConvert NSArray:config[@"emptyViewSubtitleVariants"]];
                 }
+                
+                // Store infinite scroll configuration in userInfo
+                NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:@{ @"templateId": templateId }];
+                if (config[@"loadMoreThreshold"]) {
+                    userInfo[@"loadMoreThreshold"] = [RCTConvert NSNumber:config[@"loadMoreThreshold"]];
+                }
+                [listTemplate setUserInfo:userInfo];
+                
                 listTemplate.delegate = self;
                 carPlayTemplate = listTemplate;
             } else {
@@ -265,6 +274,14 @@ RCT_EXPORT_METHOD(createTemplate:(NSString *)templateId config:(NSDictionary*)co
                 CPListTemplate *listTemplate = [[CPListTemplate alloc] initWithTitle:title sections:sections];
                 [listTemplate setLeadingNavigationBarButtons:leadingNavigationBarButtons];
                 [listTemplate setTrailingNavigationBarButtons:trailingNavigationBarButtons];
+                
+                // Store infinite scroll configuration in userInfo
+                NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:@{ @"templateId": templateId }];
+                if (config[@"loadMoreThreshold"]) {
+                    userInfo[@"loadMoreThreshold"] = [RCTConvert NSNumber:config[@"loadMoreThreshold"]];
+                }
+                [listTemplate setUserInfo:userInfo];
+                
                 listTemplate.delegate = self;
                 carPlayTemplate = listTemplate;
             }
@@ -1204,15 +1221,17 @@ RCT_EXPORT_METHOD(updateMapTemplateMapButtons:(NSString*) templateId mapButtons:
 - (NSArray<CPListSection*>*)parseSections:(NSArray*)sections templateId:(NSString *)templateId API_AVAILABLE(ios(12.0)) {
     NSMutableArray *result = [NSMutableArray array];
     int index = 0;
+    int sectionIndex = 0;
     for (NSDictionary *section in sections) {
         NSArray *items = [section objectForKey:@"items"];
         NSString *_sectionIndexTitle = [section objectForKey:@"sectionIndexTitle"];
         NSString *_header = [section objectForKey:@"header"];
-        NSArray *_items = [self parseListItems:items startIndex:index templateId:templateId];
+        NSArray *_items = [self parseListItems:items startIndex:index sectionIndex:sectionIndex templateId:templateId];
         CPListSection *_section = [[CPListSection alloc] initWithItems:_items header:_header sectionIndexTitle:_sectionIndexTitle];
         [result addObject:_section];
         int count = (int) [items count];
         index = index + count;
+        sectionIndex++;
     }
     return result;
 }
@@ -1230,7 +1249,7 @@ RCT_EXPORT_METHOD(updateMapTemplateMapButtons:(NSString*) templateId mapButtons:
 }
 
 
-- (NSArray<CPListItem*>*)parseListItems:(NSArray*)items startIndex:(int)startIndex templateId:(NSString *)templateId API_AVAILABLE(ios(12.0)) {
+- (NSArray<CPListItem*>*)parseListItems:(NSArray*)items startIndex:(int)startIndex sectionIndex:(int)sectionIndex templateId:(NSString *)templateId API_AVAILABLE(ios(12.0)) {
     NSMutableArray *_items = [NSMutableArray array];
     int index = startIndex;
     UIImage *placeholder = [UIImage imageNamed: @"Placeholder"];
@@ -1297,7 +1316,7 @@ RCT_EXPORT_METHOD(updateMapTemplateMapButtons:(NSString*) templateId mapButtons:
                     }
                 };
                 
-                [_imageRowItem setUserInfo:@{ @"index": @(index) }];
+                [_imageRowItem setUserInfo:@{ @"index": @(index - startIndex), @"sectionIndex": @(sectionIndex) }];
                 [_items addObject:_imageRowItem];
                 index = index + 1;
                 continue;
@@ -1356,7 +1375,7 @@ RCT_EXPORT_METHOD(updateMapTemplateMapButtons:(NSString*) templateId mapButtons:
                 }
             }
         }
-        [_item setUserInfo:@{ @"index": @(index) }];
+        [_item setUserInfo:@{ @"index": @(index - startIndex), @"sectionIndex": @(sectionIndex) }];
         [_items addObject:_item];
         index = index + 1;
     }
@@ -1699,6 +1718,34 @@ RCT_EXPORT_METHOD(updateMapTemplateMapButtons:(NSString*) templateId mapButtons:
         NSNumber* index = [item.userInfo objectForKey:@"index"];
         [self sendTemplateEventWithName:listTemplate name:@"didSelectListItem" json:@{ @"index": index }];
         self.selectedResultBlock = completionHandler;
+        
+        // Check for infinite scroll threshold
+        NSNumber* loadMoreThreshold = [listTemplate.userInfo objectForKey:@"loadMoreThreshold"];
+        if (loadMoreThreshold != nil) {
+            // Calculate total items across all sections
+            NSInteger totalItems = 0;
+            for (CPListSection *section in listTemplate.sections) {
+                totalItems += section.items.count;
+            }
+            
+            // Calculate the current absolute index across all sections
+            NSInteger absoluteIndex = [index integerValue];
+            NSInteger sectionIndex = [[item.userInfo objectForKey:@"sectionIndex"] integerValue];
+            for (NSInteger i = 0; i < sectionIndex; i++) {
+                if (i < listTemplate.sections.count) {
+                    absoluteIndex += listTemplate.sections[i].items.count;
+                }
+            }
+            
+            // Trigger load more if within threshold of the end
+            NSInteger threshold = [loadMoreThreshold integerValue];
+            if (totalItems > 0 && (totalItems - absoluteIndex) <= threshold) {
+                [self sendTemplateEventWithName:listTemplate name:@"listTemplateLoadMore" json:@{
+                    @"index": @(absoluteIndex),
+                    @"totalItems": @(totalItems)
+                }];
+            }
+        }
     }
 }
 

package/lib/templates/ListTemplate.js

@@ -44,6 +44,11 @@ class ListTemplate extends Template_1.Template {
                 void Promise.resolve(config.onTemplateLoaded());
             }
         });
+        CarPlay_1.CarPlay.emitter.addListener('listTemplateLoadMore', e => {
+            if (config.onLoadMoreItems && e.templateId === this.id) {
+                config.onLoadMoreItems({ index: e.index, totalItems: e.totalItems });
+            }
+        });
     }
     updateSections = (sections) => {
         return CarPlay_1.CarPlay.bridge.updateListTemplateSections(this.id, this.parseConfig(sections));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@javascriptcommon/react-native-carplay",
-  "version": "2.3.11",
+  "version": "2.3.12",
   "description": "CarPlay for React Native",
   "main": "lib/index.js",
   "react-native": "src/index.ts",

package/src/templates/ListTemplate.ts

@@ -93,6 +93,21 @@ export interface ListTemplateConfig extends TemplateConfig {
    * Set to true if you want to receive the onTemplateLoaded callback
    */
   needsTemplateLoadedCallback: boolean;
+
+  /**
+   * Threshold for triggering the onLoadMoreItems callback.
+   * When the user selects an item within this many items from the end,
+   * the onLoadMoreItems callback will be triggered.
+   * For example, if set to 5, selecting any of the last 5 items will trigger the callback.
+   */
+  loadMoreThreshold?: number;
+
+  /**
+   * Fired when the user scrolls near the end of the list (based on loadMoreThreshold).
+   * This can be used to implement infinite scrolling by loading more items.
+   * @param item Object with the current index and total items
+   */
+  onLoadMoreItems?(item: { index: number; totalItems: number }): void;
 }
 
 /**
@@ -139,6 +154,12 @@ export class ListTemplate extends Template<ListTemplateConfig> {
         void Promise.resolve(config.onTemplateLoaded())
       }
     });
+
+    CarPlay.emitter.addListener('listTemplateLoadMore', e => {
+      if (config.onLoadMoreItems && e.templateId === this.id) {
+        config.onLoadMoreItems({ index: e.index, totalItems: e.totalItems });
+      }
+    });
   }
 
   public updateSections = (sections: ListSection[]) => {