expo-app-blocker 0.1.34 → 0.1.36

package/ios/ExpoAppBlockerModule.swift

@@ -161,6 +161,7 @@ public class ExpoAppBlockerModule: Module {
         self.cancelRelockActivity()
         self.store.shield.applications = nil
         self.store.shield.applicationCategories = nil
+        self.store.shield.webDomains = nil
         self.currentBlockConfig = nil
         self.userDefaults.removeObject(forKey: self.blockConfigStorageKey)
         self.sharedDefaults?.removeObject(forKey: self.blockConfigStorageKey)
@@ -204,6 +205,7 @@ public class ExpoAppBlockerModule: Module {
         DispatchQueue.main.async {
           self.store.shield.applications = nil
           self.store.shield.applicationCategories = nil
+          self.store.shield.webDomains = nil
         }
 
         // Try to schedule relock, but don't fail if schedule is too short
@@ -353,6 +355,7 @@ public class ExpoAppBlockerModule: Module {
         DispatchQueue.main.async {
           self.store.shield.applications = nil
           self.store.shield.applicationCategories = nil
+          self.store.shield.webDomains = nil
         }
 
         do {
@@ -393,16 +396,26 @@ public class ExpoAppBlockerModule: Module {
       }
 
       let itemTypeRaw = (selection["type"] as? String ?? "app").lowercased()
-      let itemType: BlockedItemType = itemTypeRaw == "category" ? .category : .app
+      let itemType: BlockedItemType
+      switch itemTypeRaw {
+      case "category":
+        itemType = .category
+      case "webdomain":
+        itemType = .webDomain
+      default:
+        itemType = .app
+      }
 
       return BlockedItemInfo(
         type: itemType,
         tokenId: tokenString,
         appToken: itemType == .app ? self.decodeApplicationToken(from: tokenString) : nil,
         categoryToken: itemType == .category ? self.decodeCategoryToken(from: tokenString) : nil,
+        webDomainToken: itemType == .webDomain ? self.decodeWebDomainToken(from: tokenString) : nil,
         bundleIdentifier: selection["bundleIdentifier"] as? String,
         displayName: selection["displayName"] as? String,
         categoryName: selection["categoryName"] as? String,
+        domain: selection["domain"] as? String,
         iconBase64: selection["iconBase64"] as? String
       )
     }
@@ -426,21 +439,25 @@ public class ExpoAppBlockerModule: Module {
     guard config.isActive else {
       store.shield.applications = nil
       store.shield.applicationCategories = nil
+      store.shield.webDomains = nil
       return
     }
 
     if isTemporarilyUnlockedInternal() {
       store.shield.applications = nil
       store.shield.applicationCategories = nil
+      store.shield.webDomains = nil
       return
     }
 
     let validAppTokens = config.items.compactMap { $0.appToken }
     let validCategoryTokens = config.items.compactMap { $0.categoryToken }
+    let validWebDomainTokens = config.items.compactMap { $0.webDomainToken }
 
-    guard !validAppTokens.isEmpty || !validCategoryTokens.isEmpty else {
+    guard !validAppTokens.isEmpty || !validCategoryTokens.isEmpty || !validWebDomainTokens.isEmpty else {
       store.shield.applications = nil
       store.shield.applicationCategories = nil
+      store.shield.webDomains = nil
       return
     }
 
@@ -455,6 +472,12 @@ public class ExpoAppBlockerModule: Module {
     } else {
       store.shield.applicationCategories = nil
     }
+
+    if !validWebDomainTokens.isEmpty {
+      store.shield.webDomains = .specific(Set(validWebDomainTokens))
+    } else {
+      store.shield.webDomains = nil
+    }
   }
 
   private func relockApps() {
@@ -558,6 +581,10 @@ public class ExpoAppBlockerModule: Module {
           if let token = tokenInfo.categoryToken, let encoded = self.encodeCategoryToken(token) {
             tokenId = encoded
           }
+        case .webDomain:
+          if let token = tokenInfo.webDomainToken, let encoded = self.encodeWebDomainToken(token) {
+            tokenId = encoded
+          }
         }
       }
 
@@ -579,6 +606,9 @@ public class ExpoAppBlockerModule: Module {
       if let categoryName = tokenInfo.categoryName {
         dict["categoryName"] = categoryName
       }
+      if let domain = tokenInfo.domain {
+        dict["domain"] = domain
+      }
       if let iconBase64 = tokenInfo.iconBase64 {
         dict["iconBase64"] = iconBase64
       }
@@ -669,6 +699,22 @@ public class ExpoAppBlockerModule: Module {
     return Self.decodeCategoryTokenStatic(from: encoded)
   }
 
+  private func encodeWebDomainToken(_ token: WebDomainToken) -> String? {
+    do {
+      let data = try JSONEncoder().encode(token)
+      return data.base64EncodedString()
+    } catch {
+      return nil
+    }
+  }
+
+  private func decodeWebDomainToken(from encoded: String) -> WebDomainToken? {
+    guard let data = Data(base64Encoded: encoded) else {
+      return nil
+    }
+    return try? JSONDecoder().decode(WebDomainToken.self, from: data)
+  }
+
   // Static versions for use in View prop closures
   static func decodeApplicationTokenStatic(from encoded: String) -> ApplicationToken? {
     guard let data = Data(base64Encoded: encoded) else { return nil }
@@ -789,6 +835,7 @@ struct BlockedAppsContentView: View {
 enum BlockedItemType: String {
   case app
   case category
+  case webDomain
 }
 
 struct BlockedItemInfo {
@@ -796,9 +843,11 @@ struct BlockedItemInfo {
   let tokenId: String
   let appToken: ApplicationToken?
   let categoryToken: ActivityCategoryToken?
+  let webDomainToken: WebDomainToken?
   let bundleIdentifier: String?
   let displayName: String?
   let categoryName: String?
+  let domain: String?
   let iconBase64: String?
 }
 
@@ -932,17 +981,30 @@ struct FamilyActivityPickerView: View {
       ]
     }
 
+    let webDomainItems: [[String: Any]] = selection.webDomainTokens.compactMap { webDomainToken in
+      guard let tokenId = encodeSelectionWebDomainToken(webDomainToken) else {
+        return nil
+      }
+      let domain = String(describing: webDomainToken)
+      return [
+        "type": "webDomain",
+        "token": tokenId,
+        "domain": domain
+      ]
+    }
+
     // Serialize the full FamilyActivitySelection for the native view
     var selectionBase64 = ""
     if let selectionData = try? JSONEncoder().encode(selection) {
       selectionBase64 = selectionData.base64EncodedString()
     }
 
-    var result: [[String: Any]] = appItems + categoryItems
+    var result: [[String: Any]] = appItems + categoryItems + webDomainItems
     result.append([
       "type": "summary",
       "totalApps": selection.applications.count,
       "totalCategories": selection.categoryTokens.count,
+      "totalWebDomains": selection.webDomainTokens.count,
       "selectionData": selectionBase64
     ])
 
@@ -970,6 +1032,15 @@ struct FamilyActivityPickerView: View {
     }
   }
 
+  private func encodeSelectionWebDomainToken(_ token: WebDomainToken) -> String? {
+    do {
+      let data = try JSONEncoder().encode(token)
+      return data.base64EncodedString()
+    } catch {
+      return nil
+    }
+  }
+
   private func resolveCategoryName(_ token: ActivityCategoryToken) -> String {
     let raw = String(describing: token)
     return raw.isEmpty ? "Category" : raw

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":
@@ -126,12 +136,23 @@ class FamilyActivityPickerNativeView: ExpoView {
       }
     }
 
+    var webDomainItems: [[String: Any]] = []
+    for token in selection.webDomainTokens {
+      if let data = try? JSONEncoder().encode(token) {
+        webDomainItems.append([
+          "type": "webDomain",
+          "token": data.base64EncodedString(),
+          "domain": String(describing: token)
+        ])
+      }
+    }
+
     var selectionBase64 = ""
     if let selectionData = try? JSONEncoder().encode(selection) {
       selectionBase64 = selectionData.base64EncodedString()
     }
 
-    let items = appItems + categoryItems
+    let items = appItems + categoryItems + webDomainItems
 
     // Do not append a synthetic "summary" row to `items` — JS counts `items.length` for UI and
     // `totalApps` / `totalCategories` / `selectionData` already carry the same metadata.
@@ -139,6 +160,7 @@ class FamilyActivityPickerNativeView: ExpoView {
       "items": items,
       "totalApps": selection.applicationTokens.count,
       "totalCategories": selection.categoryTokens.count,
+      "totalWebDomains": selection.webDomainTokens.count,
       "selectionData": selectionBase64
     ])
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-app-blocker",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "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/ExpoAppBlocker.types.ts

@@ -30,11 +30,12 @@ export interface AndroidBlockableApp {
 }
 
 export interface IOSBlockedItem {
-  type: "app" | "category";
+  type: "app" | "category" | "webDomain";
   token: string;
   bundleIdentifier?: string;
   displayName?: string;
   categoryName?: string;
+  domain?: string;
   iconBase64?: string;
 }
 
@@ -63,12 +64,14 @@ export interface RelockResult {
 }
 
 export interface FamilyActivityPickerSelectionEvent {
-  /** Selected apps and categories (pass to setBlockConfiguration) */
+  /** Selected apps, categories, and web domains (pass to setBlockConfiguration) */
   items: IOSBlockedItem[];
   /** Number of individual apps selected */
   totalApps: number;
   /** Number of categories selected */
   totalCategories: number;
+  /** Number of web domains selected */
+  totalWebDomains: number;
   /** Base64 string - save and pass back as initialSelection to restore state */
   selectionData: string;
 }

package/src/index.ts

@@ -262,7 +262,9 @@ export function FamilyActivityPickerView({
           const ne = e.nativeEvent;
           const items = (ne.items ?? []).filter(
             (item: { type?: string }) =>
-              item?.type === "app" || item?.type === "category",
+              item?.type === "app" ||
+              item?.type === "category" ||
+              item?.type === "webDomain",
           );
           onSelectionChange({ ...ne, items });
         }

package/targets/DeviceActivityMonitor/DeviceActivityMonitor.swift

@@ -34,6 +34,7 @@ class AppBlockerDeviceActivityMonitor: DeviceActivityMonitor {
     guard let configDict = userDefaults.dictionary(forKey: blockConfigStorageKey) else {
       store.shield.applications = nil
       store.shield.applicationCategories = nil
+      store.shield.webDomains = nil
       return
     }
 
@@ -64,13 +65,22 @@ class AppBlockerDeviceActivityMonitor: DeviceActivityMonitor {
       }
 
       let itemTypeRaw = (selection["type"] as? String ?? "app").lowercased()
-      let itemType: MonitorBlockedItemType = itemTypeRaw == "category" ? .category : .app
+      let itemType: MonitorBlockedItemType
+      switch itemTypeRaw {
+      case "category":
+        itemType = .category
+      case "webdomain":
+        itemType = .webDomain
+      default:
+        itemType = .app
+      }
 
       return MonitorBlockedItemInfo(
         type: itemType,
         tokenId: tokenString,
         appToken: itemType == .app ? decodeApplicationToken(from: tokenString) : nil,
-        categoryToken: itemType == .category ? decodeCategoryToken(from: tokenString) : nil
+        categoryToken: itemType == .category ? decodeCategoryToken(from: tokenString) : nil,
+        webDomainToken: itemType == .webDomain ? decodeWebDomainToken(from: tokenString) : nil
       )
     }
 
@@ -82,15 +92,18 @@ class AppBlockerDeviceActivityMonitor: DeviceActivityMonitor {
     guard config.isActive else {
       store.shield.applications = nil
       store.shield.applicationCategories = nil
+      store.shield.webDomains = nil
       return
     }
 
     let validAppTokens = config.items.compactMap { $0.appToken }
     let validCategoryTokens = config.items.compactMap { $0.categoryToken }
+    let validWebDomainTokens = config.items.compactMap { $0.webDomainToken }
 
-    guard !validAppTokens.isEmpty || !validCategoryTokens.isEmpty else {
+    guard !validAppTokens.isEmpty || !validCategoryTokens.isEmpty || !validWebDomainTokens.isEmpty else {
       store.shield.applications = nil
       store.shield.applicationCategories = nil
+      store.shield.webDomains = nil
       return
     }
 
@@ -105,6 +118,12 @@ class AppBlockerDeviceActivityMonitor: DeviceActivityMonitor {
     } else {
       store.shield.applicationCategories = nil
     }
+
+    if !validWebDomainTokens.isEmpty {
+      store.shield.webDomains = .specific(Set(validWebDomainTokens))
+    } else {
+      store.shield.webDomains = nil
+    }
   }
 
   private func decodeApplicationToken(from encoded: String) -> ApplicationToken? {
@@ -130,11 +149,24 @@ class AppBlockerDeviceActivityMonitor: DeviceActivityMonitor {
       return nil
     }
   }
+
+  private func decodeWebDomainToken(from encoded: String) -> WebDomainToken? {
+    guard let data = Data(base64Encoded: encoded) else {
+      return nil
+    }
+
+    do {
+      return try JSONDecoder().decode(WebDomainToken.self, from: data)
+    } catch {
+      return nil
+    }
+  }
 }
 
 enum MonitorBlockedItemType: String {
   case app
   case category
+  case webDomain
 }
 
 struct MonitorBlockedItemInfo {
@@ -142,6 +174,7 @@ struct MonitorBlockedItemInfo {
   let tokenId: String
   let appToken: ApplicationToken?
   let categoryToken: ActivityCategoryToken?
+  let webDomainToken: WebDomainToken?
 }
 
 struct MonitorBlockConfig {