expo-app-blocker 0.1.33 → 0.1.35

package/ios/ExpoAppBlockerPickerModule.swift

@@ -34,7 +34,7 @@ public class ExpoAppBlockerPickerModule: Module {
 // MARK: - ViewModel
 
 class FamilyActivityPickerViewModel: ObservableObject {
-  @Published var selection = FamilyActivitySelection()
+  @Published var selection = FamilyActivitySelection(includeEntireCategory: true)
   @Published var colorScheme: ColorScheme? = nil
   var didSetInitial = false
 }
@@ -70,7 +70,7 @@ class FamilyActivityPickerNativeView: ExpoView {
   func setInitialSelection(_ selection: FamilyActivitySelection) {
     guard !viewModel.didSetInitial else { return }
     viewModel.didSetInitial = true
-    viewModel.selection = selection
+    viewModel.selection = normalizeSelection(selection)
   }
 
   /// Increments-only: first snapshot records baseline without clearing; higher values clear UI.
@@ -89,11 +89,21 @@ class FamilyActivityPickerNativeView: ExpoView {
     var transaction = Transaction()
     transaction.disablesAnimations = true
     withTransaction(transaction) {
-      viewModel.selection = FamilyActivitySelection()
+      viewModel.selection = FamilyActivitySelection(includeEntireCategory: true)
     }
     viewModel.didSetInitial = false
   }
 
+  private func normalizeSelection(_ selection: FamilyActivitySelection) -> FamilyActivitySelection {
+    // Apple forum reports indicate includeEntireCategory may not survive some encode/decode paths.
+    // Rehydrate into a fresh includeEntireCategory=true value so category picks expand to app tokens.
+    var normalized = FamilyActivitySelection(includeEntireCategory: true)
+    normalized.applicationTokens = selection.applicationTokens
+    normalized.categoryTokens = selection.categoryTokens
+    normalized.webDomainTokens = selection.webDomainTokens
+    return normalized
+  }
+
   func setTheme(_ theme: String) {
     switch theme.lowercased() {
     case "light":
@@ -132,15 +142,11 @@ class FamilyActivityPickerNativeView: ExpoView {
     }
 
     let items = appItems + categoryItems
-    let summary: [String: Any] = [
-      "type": "summary",
-      "totalApps": selection.applicationTokens.count,
-      "totalCategories": selection.categoryTokens.count,
-      "selectionData": selectionBase64
-    ]
 
+    // Do not append a synthetic "summary" row to `items` — JS counts `items.length` for UI and
+    // `totalApps` / `totalCategories` / `selectionData` already carry the same metadata.
     onSelectionChange([
-      "items": items + [summary],
+      "items": items,
       "totalApps": selection.applicationTokens.count,
       "totalCategories": selection.categoryTokens.count,
       "selectionData": selectionBase64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-app-blocker",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "Expo module for cross-platform app blocking. Android: UsageStatsManager + Overlay. iOS: Screen Time API (FamilyControls + ManagedSettings + DeviceActivity).",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/index.ts

@@ -258,7 +258,14 @@ export function FamilyActivityPickerView({
     initialSelection: initialSelection || "",
     theme: theme || "system",
     onSelectionChange: onSelectionChange
-      ? (e: any) => onSelectionChange(e.nativeEvent)
+      ? (e: any) => {
+          const ne = e.nativeEvent;
+          const items = (ne.items ?? []).filter(
+            (item: { type?: string }) =>
+              item?.type === "app" || item?.type === "category",
+          );
+          onSelectionChange({ ...ne, items });
+        }
       : undefined,
     ...(clearTrigger !== undefined ? { clearTrigger } : {}),
     style: [{ minHeight: 400 }, style],