@liveblocks/react 2.17.0-rc1 → 2.17.0-usrnotsettings2

package/dist/{chunk-XWYTEJGO.mjs → chunk-D5P6PENM.mjs}

@@ -1,6 +1,6 @@
 // src/version.ts
 var PKG_NAME = "@liveblocks/react";
-var PKG_VERSION = "2.17.0-rc1";
+var PKG_VERSION = "2.17.0-usrnotsettings2";
 var PKG_FORMAT = "esm";
 
 // src/ClientSideSuspense.tsx
@@ -20,4 +20,4 @@ export {
   PKG_FORMAT,
   ClientSideSuspense
 };
-//# sourceMappingURL=chunk-XWYTEJGO.mjs.map
+//# sourceMappingURL=chunk-D5P6PENM.mjs.map

package/dist/{chunk-DR4OUZTF.js → chunk-QJATV7TB.js}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});// src/version.ts
 var PKG_NAME = "@liveblocks/react";
-var PKG_VERSION = "2.17.0-rc1";
+var PKG_VERSION = "2.17.0-usrnotsettings2";
 var PKG_FORMAT = "cjs";
 
 // src/ClientSideSuspense.tsx
@@ -20,4 +20,4 @@ function ClientSideSuspense(props) {
 
 
 exports.PKG_NAME = PKG_NAME; exports.PKG_VERSION = PKG_VERSION; exports.PKG_FORMAT = PKG_FORMAT; exports.ClientSideSuspense = ClientSideSuspense;
-//# sourceMappingURL=chunk-DR4OUZTF.js.map
+//# sourceMappingURL=chunk-QJATV7TB.js.map

package/dist/chunk-QJATV7TB.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["/home/runner/work/liveblocks/liveblocks/packages/liveblocks-react/dist/chunk-QJATV7TB.js","../src/version.ts","../src/ClientSideSuspense.tsx"],"names":[],"mappings":"AAAA;ACGO,IAAM,SAAA,EAAW,mBAAA;AACjB,IAAM,YAAA,EAAiD,wBAAA;AACvD,IAAM,WAAA,EAAgD,KAAA;ADD7D;AACA;AEJA,8BAA8C;AAkC1C,+CAAA;AAVG,SAAS,kBAAA,CAAmB,KAAA,EAAc;AAC/C,EAAA,MAAM,CAAC,OAAA,EAAS,UAAU,EAAA,EAAI,6BAAA,KAAc,CAAA;AAE5C,EAAA,8BAAA,CAAU,EAAA,GAAM;AAGd,IAAA,UAAA,CAAW,IAAI,CAAA;AAAA,EACjB,CAAA,EAAG,CAAC,CAAC,CAAA;AAEL,EAAA,uBACE,6BAAA,eAAC,EAAA,EAAS,QAAA,EAAU,KAAA,CAAM,QAAA,EACvB,QAAA,EAAA,QAAA,EACG,OAAO,KAAA,CAAM,SAAA,IAAa,WAAA,EACxB,KAAA,CAAM,QAAA,CAAS,EAAA,EACf,KAAA,CAAM,SAAA,EACR,KAAA,CAAM,SAAA,CACZ,CAAA;AAEJ;AF5BA;AACA;AACE;AACA;AACA;AACA;AACF,iJAAC","file":"/home/runner/work/liveblocks/liveblocks/packages/liveblocks-react/dist/chunk-QJATV7TB.js","sourcesContent":[null,"declare const __VERSION__: string;\ndeclare const TSUP_FORMAT: string;\n\nexport const PKG_NAME = \"@liveblocks/react\";\nexport const PKG_VERSION = typeof __VERSION__ === \"string\" && __VERSION__;\nexport const PKG_FORMAT = typeof TSUP_FORMAT === \"string\" && TSUP_FORMAT;\n","import type { ReactNode } from \"react\";\nimport { Suspense, useEffect, useState } from \"react\";\n\ntype Props = {\n  fallback: ReactNode;\n  children: (() => ReactNode | undefined) | ReactNode | undefined;\n};\n\n/**\n * Almost like a normal <Suspense> component, except that for server-side\n * renders, the fallback will be used.\n *\n * The child props will have to be provided in a function, i.e. change:\n *\n *   <Suspense fallback={<Loading />}>\n *     <MyRealComponent a={1} />\n *   </Suspense>\n *\n * To:\n *\n *   <ClientSideSuspense fallback={<Loading />}>\n *     <MyRealComponent a={1} />\n *   </ClientSideSuspense>\n *\n */\nexport function ClientSideSuspense(props: Props) {\n  const [mounted, setMounted] = useState(false);\n\n  useEffect(() => {\n    // Effects are never executed on the server side. The point of this is to\n    // delay the flipping of this boolean until after hydration has happened.\n    setMounted(true);\n  }, []);\n\n  return (\n    <Suspense fallback={props.fallback}>\n      {mounted\n        ? typeof props.children === \"function\"\n          ? props.children()\n          : props.children\n        : props.fallback}\n    </Suspense>\n  );\n}\n"]}

package/dist/{chunk-4KNGHD4I.mjs → chunk-X2FQ2FNK.mjs}

@@ -130,7 +130,9 @@ var config = {
   HISTORY_VERSIONS_POLL_INTERVAL: 1 * MINUTES,
   HISTORY_VERSIONS_MAX_STALE_TIME: 5 * SECONDS,
   NOTIFICATION_SETTINGS_POLL_INTERVAL: 1 * MINUTES,
-  NOTIFICATION_SETTINGS_MAX_STALE_TIME: 5 * SECONDS
+  NOTIFICATION_SETTINGS_MAX_STALE_TIME: 5 * SECONDS,
+  USER_NOTIFICATION_SETTINGS_INTERVAL: 5 * MINUTES,
+  USER_NOTIFICATION_SETTINGS_MAX_STALE_TIME: 1 * MINUTES
 };
 
 // src/lib/AsyncResult.ts
@@ -233,6 +235,8 @@ import {
   console as console2,
   DefaultMap,
   DerivedSignal,
+  entries,
+  keys,
   kInternal,
   MutableSignal as MutableSignal2,
   nanoid,
@@ -723,6 +727,26 @@ function createStore_forPermissionHints() {
     update
   };
 }
+function createStore_forUserNotificationSettings(updates) {
+  const signal = new Signal({});
+  function update(settings) {
+    signal.set((prevSettings) => {
+      return {
+        ...prevSettings,
+        ...settings
+      };
+    });
+  }
+  return {
+    signal: DerivedSignal.from(
+      signal,
+      updates,
+      (base, updates2) => applyOptimisticUpdates_forUserNotificationSettings(base, updates2)
+    ),
+    // Mutations
+    update
+  };
+}
 function createStore_forOptimistic(client) {
   const signal = new Signal([]);
   const syncSource = client[kInternal].createSyncSource();
@@ -756,15 +780,17 @@ var UmbrellaStore = class {
   //
   //   Mutate inputs...                                             ...observe clean/consistent output!
   //
-  //            .-> Base ThreadDB ---------+                 +----> Clean threads by ID       (Part 1)
+  //            .-> Base ThreadDB ---------+                 +----> Clean threads by ID           (Part 1)
   //           /                           |                 |
-  //   mutate ----> Base Notifications --+ |                 | +--> Clean notifications       (Part 1)
+  //   mutate ----> Base Notifications --+ |                 | +--> Clean notifications           (Part 1)
   //          \                          | |                 | |    & notifications by ID
   //         | \                         | |      Apply      | |
-  //         |   `-> OptimisticUpdates --+--+--> Optimistic --+-+--> Notification Settings    (Part 2)
-  //          \                          |        Updates       |
-  //           `------- etc etc ---------+                      +--> History Versions         (Part 3)
-  //                       ^
+  //         |   `-> OptimisticUpdates --+--+--> Optimistic --+-+--> Room Notification Settings   (Part 2)
+  //          \                          |        Updates    |  |
+  //           `------- etc etc ---------+                   |  +--> History Versions             (Part 3)
+  //                       ^                                 |
+  //                       |                                 +-----> User Notification Settings   (Part 4)
+  //                       |
   //                       |
   //                       |                        ^                  ^
   //                    Signal                      |                  |
@@ -785,6 +811,7 @@ var UmbrellaStore = class {
   // prettier-ignore
   historyVersions;
   permissionHints;
+  userNotificationSettings;
   optimisticUpdates;
   //
   // Output signals.
@@ -805,6 +832,8 @@ var UmbrellaStore = class {
   #userThreadsLastRequestedAt = null;
   // Room versions
   #roomVersionsLastRequestedAtByRoom = /* @__PURE__ */ new Map();
+  // User Notification Settings
+  #userNotificationSettings;
   constructor(client) {
     this.#client = client[kInternal].as();
     this.optimisticUpdates = createStore_forOptimistic(this.#client);
@@ -820,6 +849,16 @@ var UmbrellaStore = class {
         return nextCursor;
       }
     );
+    const userNotificationSettingsFetcher = async () => {
+      const result = await this.#client.getNotificationSettings();
+      this.userNotificationSettings.update(result);
+    };
+    this.userNotificationSettings = createStore_forUserNotificationSettings(
+      this.optimisticUpdates.signal
+    );
+    this.#userNotificationSettings = new SinglePageResource(
+      userNotificationSettingsFetcher
+    );
     this.threads = new ThreadDB();
     this.notifications = createStore_forNotifications();
     this.roomNotificationSettings = createStore_forRoomNotificationSettings(
@@ -997,6 +1036,19 @@ var UmbrellaStore = class {
         return { signal, waitUntilLoaded: resource.waitUntilLoaded };
       }
     );
+    const userNotificationSettings = {
+      signal: DerivedSignal.from(() => {
+        const result = this.#userNotificationSettings.get();
+        if (result.isLoading || result.error) {
+          return result;
+        }
+        return ASYNC_OK(
+          "settings",
+          nn(this.userNotificationSettings.signal.get())
+        );
+      }, shallow3),
+      waitUntilLoaded: this.#userNotificationSettings.waitUntilLoaded
+    };
     this.outputs = {
       threadifications,
       threads,
@@ -1005,7 +1057,8 @@ var UmbrellaStore = class {
       notifications,
       loadingNotifications,
       settingsByRoomId,
-      versionsByRoomId
+      versionsByRoomId,
+      userNotificationSettings
     };
     autobind(this);
   }
@@ -1250,6 +1303,25 @@ var UmbrellaStore = class {
     const result = await room.getNotificationSettings({ signal });
     this.roomNotificationSettings.update(roomId, result);
   }
+  /**
+   * Refresh User Notification Settings from poller
+   */
+  async refreshUserNotificationSettings(signal) {
+    const result = await this.#client.getNotificationSettings({
+      signal
+    });
+    this.userNotificationSettings.update(result);
+  }
+  /**
+   * Updates user notification settings with a new value, replacing the
+   * corresponding optimistic update.
+   */
+  updateUserNotificationSettings_confirmOptimisticUpdate(settings, optimisticUpdateId) {
+    batch2(() => {
+      this.optimisticUpdates.remove(optimisticUpdateId);
+      this.userNotificationSettings.update(settings);
+    });
+  }
 };
 function applyOptimisticUpdates_forThreadifications(baseThreadsDB, notificationsLUT, optimisticUpdates) {
   const threadsDB = baseThreadsDB.clone();
@@ -1424,6 +1496,33 @@ function applyOptimisticUpdates_forSettings(settingsLUT, optimisticUpdates) {
   }
   return settingsByRoomId;
 }
+function applyOptimisticUpdates_forUserNotificationSettings(baseSettings, optimisticUpdates) {
+  const outcomingSettings = { ...baseSettings };
+  for (const optimisticUpdate of optimisticUpdates) {
+    switch (optimisticUpdate.type) {
+      case "update-user-notification-settings": {
+        const incomingSettings = optimisticUpdate.settings;
+        for (const channelKey of keys(incomingSettings)) {
+          const key = channelKey;
+          const channelUpdates = incomingSettings[key];
+          if (channelUpdates) {
+            const realChannelUpdates = Object.fromEntries(
+              entries(channelUpdates).filter(
+                ([_, value]) => value !== void 0
+              )
+            );
+            outcomingSettings[key] = {
+              ...outcomingSettings[key],
+              ...realChannelUpdates
+            };
+          }
+        }
+        break;
+      }
+    }
+  }
+  return outcomingSettings;
+}
 function compareInboxNotifications(inboxNotificationA, inboxNotificationB) {
   if (inboxNotificationA.notifiedAt > inboxNotificationB.notifiedAt) {
     return 1;
@@ -1717,10 +1816,25 @@ function makeLiveblocksExtrasForClient(client) {
     config.USER_THREADS_POLL_INTERVAL,
     { maxStaleTimeMs: config.USER_THREADS_MAX_STALE_TIME }
   );
+  const userNotificationSettingsPoller = makePoller(
+    async (signal) => {
+      try {
+        return await store.refreshUserNotificationSettings(signal);
+      } catch (err) {
+        console.warn(
+          `Polling new user notification settings failed: ${String(err)}`
+        );
+        throw err;
+      }
+    },
+    config.USER_NOTIFICATION_SETTINGS_INTERVAL,
+    { maxStaleTimeMs: config.USER_NOTIFICATION_SETTINGS_MAX_STALE_TIME }
+  );
   return {
     store,
     notificationsPoller,
-    userThreadsPoller
+    userThreadsPoller,
+    userNotificationSettingsPoller
   };
 }
 function makeLiveblocksContextBundle(client) {
@@ -1729,6 +1843,7 @@ function makeLiveblocksContextBundle(client) {
   const useMarkAllInboxNotificationsAsRead2 = () => useMarkAllInboxNotificationsAsRead_withClient(client);
   const useDeleteInboxNotification2 = () => useDeleteInboxNotification_withClient(client);
   const useDeleteAllInboxNotifications2 = () => useDeleteAllInboxNotifications_withClient(client);
+  const useUpdateNotificationSettings2 = () => useUpdateNotificationSettings_withClient(client);
   function LiveblocksProvider2(props) {
     useEnsureNoLiveblocksProvider();
     return /* @__PURE__ */ jsx(ClientContext.Provider, { value: client, children: props.children });
@@ -1742,6 +1857,8 @@ function makeLiveblocksContextBundle(client) {
     useMarkAllInboxNotificationsAsRead: useMarkAllInboxNotificationsAsRead2,
     useDeleteInboxNotification: useDeleteInboxNotification2,
     useDeleteAllInboxNotifications: useDeleteAllInboxNotifications2,
+    useNotificationSettings: () => useNotificationSettings_withClient(client),
+    useUpdateNotificationSettings: useUpdateNotificationSettings2,
     useInboxNotificationThread: useInboxNotificationThread2,
     useUserThreads_experimental,
     ...shared.classic,
@@ -1754,6 +1871,8 @@ function makeLiveblocksContextBundle(client) {
       useDeleteInboxNotification: useDeleteInboxNotification2,
       useDeleteAllInboxNotifications: useDeleteAllInboxNotifications2,
       useInboxNotificationThread: useInboxNotificationThread2,
+      useNotificationSettings: () => useNotificationSettingsSuspense_withClient(client),
+      useUpdateNotificationSettings: useUpdateNotificationSettings2,
       useUserThreads_experimental: useUserThreadsSuspense_experimental,
       ...shared.suspense
     }
@@ -1938,6 +2057,58 @@ function useInboxNotificationThread_withClient(client, inboxNotificationId) {
     )
   );
 }
+function useUpdateNotificationSettings_withClient(client) {
+  return useCallback2(
+    (settings) => {
+      const { store } = getLiveblocksExtrasForClient(client);
+      const optimisticUpdateId = store.optimisticUpdates.add({
+        type: "update-user-notification-settings",
+        settings
+      });
+      client.updateNotificationSettings(settings).then(
+        (settings2) => {
+          store.updateUserNotificationSettings_confirmOptimisticUpdate(
+            settings2,
+            optimisticUpdateId
+          );
+        },
+        () => {
+          store.optimisticUpdates.remove(optimisticUpdateId);
+        }
+      );
+    },
+    [client]
+  );
+}
+function useNotificationSettings_withClient(client) {
+  const updateNotificationSettings = useUpdateNotificationSettings_withClient(client);
+  const { store, userNotificationSettingsPoller: poller } = getLiveblocksExtrasForClient(client);
+  useEffect3(() => {
+    void store.outputs.userNotificationSettings.waitUntilLoaded();
+  });
+  useEffect3(() => {
+    poller.inc();
+    poller.pollNowIfStale();
+    return () => {
+      poller.dec();
+    };
+  }, [poller]);
+  const settings = useSignal(store.outputs.userNotificationSettings.signal);
+  return useMemo2(() => {
+    return [settings, updateNotificationSettings];
+  }, [settings, updateNotificationSettings]);
+}
+function useNotificationSettingsSuspense_withClient(client) {
+  ensureNotServerSide();
+  const store = getLiveblocksExtrasForClient(client).store;
+  use(store.outputs.userNotificationSettings.waitUntilLoaded());
+  const [settings, updateNotificationSettings] = useNotificationSettings_withClient(client);
+  assert(!settings.error, "Did not expect error");
+  assert(!settings.isLoading, "Did not expect loading");
+  return useMemo2(() => {
+    return [settings, updateNotificationSettings];
+  }, [settings, updateNotificationSettings]);
+}
 function useUser_withClient(client, userId) {
   const usersStore = client[kInternal2].usersStore;
   const getUserState = useCallback2(
@@ -2111,7 +2282,6 @@ function LiveblocksProvider(props) {
     lostConnectionTimeout: useInitial(o.lostConnectionTimeout),
     backgroundKeepAliveTimeout: useInitial(o.backgroundKeepAliveTimeout),
     polyfills: useInitial(o.polyfills),
-    largeMessageStrategy: useInitial(o.largeMessageStrategy),
     unstable_fallbackToHTTP: useInitial(o.unstable_fallbackToHTTP),
     unstable_streamData: useInitial(o.unstable_streamData),
     preventUnsavedChanges: useInitial(o.preventUnsavedChanges),
@@ -2203,6 +2373,15 @@ function useUnreadInboxNotificationsCount() {
 function useUnreadInboxNotificationsCountSuspense() {
   return useUnreadInboxNotificationsCountSuspense_withClient(useClient());
 }
+function useNotificationSettings() {
+  return useNotificationSettings_withClient(useClient());
+}
+function useNotificationSettingsSuspense() {
+  return useNotificationSettingsSuspense_withClient(useClient());
+}
+function useUpdateNotificationSettings() {
+  return useUpdateNotificationSettings_withClient(useClient());
+}
 function useUser(userId) {
   const client = useClient();
   return useUser_withClient(client, userId);
@@ -3850,6 +4029,9 @@ export {
   useDeleteInboxNotification,
   useUnreadInboxNotificationsCount,
   useUnreadInboxNotificationsCountSuspense,
+  useNotificationSettings,
+  useNotificationSettingsSuspense,
+  useUpdateNotificationSettings,
   useRoomInfo,
   useRoomInfoSuspense,
   _useInboxNotificationThread,
@@ -3934,4 +4116,4 @@ export {
   _useStorageRoot,
   _useUpdateMyPresence
 };
-//# sourceMappingURL=chunk-4KNGHD4I.mjs.map
+//# sourceMappingURL=chunk-X2FQ2FNK.mjs.map