@oxyhq/bloom 0.79.0 → 0.80.0

package/lib/module/scroll/scrollable.native.js

@@ -0,0 +1,54 @@
+"use strict";
+
+/**
+ * The write half of a scrollable, on native. There is no read half: native
+ * offers no way to sample a list's offset from outside it, so offsets arrive
+ * through the `onScroll` binding the hook returns instead.
+ */
+
+function hasScrollToOffset(value) {
+  return typeof value === 'object' && value !== null && typeof value.scrollToOffset === 'function';
+}
+function hasScrollTo(value) {
+  return typeof value === 'object' && value !== null && typeof value.scrollTo === 'function';
+}
+
+/**
+ * Build a {@link NativeScroller} for a target.
+ *
+ * `scrollToOffset` (`FlatList`, `FlashList`) is preferred over `scrollTo`
+ * (`ScrollView`) because a list exposes both shapes on some versions and only
+ * the former accounts for the list's own header. The `'window'` sentinel has no
+ * native meaning — there is no document scroller — so it resolves to a no-op
+ * rather than an error: a call site shared with web legitimately passes it.
+ *
+ * The handle is re-resolved on every write; it is never cached, because a ref
+ * can be swapped or detached between the schedule and the write.
+ */
+export function createScroller(target) {
+  if (target === 'window') {
+    return {
+      setOffset: () => undefined
+    };
+  }
+  return {
+    setOffset: offset => {
+      const current = target.current;
+      if (current == null) return;
+      if (hasScrollToOffset(current)) {
+        current.scrollToOffset({
+          offset,
+          animated: false
+        });
+        return;
+      }
+      if (hasScrollTo(current)) {
+        current.scrollTo({
+          y: offset,
+          animated: false
+        });
+      }
+    }
+  };
+}
+//# sourceMappingURL=scrollable.native.js.map

package/lib/module/scroll/scrollable.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["hasScrollToOffset","value","scrollToOffset","hasScrollTo","scrollTo","createScroller","target","setOffset","undefined","offset","current","animated","y"],"sourceRoot":"../../../src","sources":["scroll/scrollable.native.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;;AAKA,SAASA,iBAAiBA,CACxBC,KAAc,EAC+C;EAC7D,OACE,OAAOA,KAAK,KAAK,QAAQ,IACzBA,KAAK,KAAK,IAAI,IACd,OAAQA,KAAK,CAAsBC,cAAc,KAAK,UAAU;AAEpE;AAEA,SAASC,WAAWA,CAClBF,KAAc,EACyC;EACvD,OACE,OAAOA,KAAK,KAAK,QAAQ,IACzBA,KAAK,KAAK,IAAI,IACd,OAAQA,KAAK,CAAsBG,QAAQ,KAAK,UAAU;AAE9D;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAC5BC,MAA+B,EACf;EAChB,IAAIA,MAAM,KAAK,QAAQ,EAAE;IACvB,OAAO;MAAEC,SAAS,EAAEA,CAAA,KAAMC;IAAU,CAAC;EACvC;EAEA,OAAO;IACLD,SAAS,EAAGE,MAAM,IAAK;MACrB,MAAMC,OAAO,GAAGJ,MAAM,CAACI,OAAO;MAC9B,IAAIA,OAAO,IAAI,IAAI,EAAE;MACrB,IAAIV,iBAAiB,CAACU,OAAO,CAAC,EAAE;QAC9BA,OAAO,CAACR,cAAc,CAAC;UAAEO,MAAM;UAAEE,QAAQ,EAAE;QAAM,CAAC,CAAC;QACnD;MACF;MACA,IAAIR,WAAW,CAACO,OAAO,CAAC,EAAE;QACxBA,OAAO,CAACN,QAAQ,CAAC;UAAEQ,CAAC,EAAEH,MAAM;UAAEE,QAAQ,EAAE;QAAM,CAAC,CAAC;MAClD;IACF;EACF,CAAC;AACH","ignoreList":[]}

package/lib/module/scroll/scrollable.web.js

@@ -44,7 +44,12 @@ export function createScroller(target) {
       setOffset: offset => {
         if (typeof window !== 'undefined') window.scrollTo(0, offset);
       },
-      canScroll: () => true
+      getMaxOffset: () => {
+        if (typeof window === 'undefined' || typeof document === 'undefined') {
+          return 0;
+        }
+        return Math.max(0, document.documentElement.scrollHeight - window.innerHeight);
+      }
     };
   }
   return {
@@ -56,9 +61,10 @@ export function createScroller(target) {
       const element = resolveElement(target);
       if (element) element.scrollTop = offset;
     },
-    canScroll: () => {
+    getMaxOffset: () => {
       const element = resolveElement(target);
-      return element ? element.scrollHeight > element.clientHeight : false;
+      if (!element) return 0;
+      return Math.max(0, element.scrollHeight - element.clientHeight);
     }
   };
 }

package/lib/module/scroll/scrollable.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["isElement","value","HTMLElement","hasGetScrollableNode","getScrollableNode","resolveElement","target","current","node","createScroller","getOffset","window","scrollY","setOffset","offset","scrollTo","canScroll","element","scrollTop","scrollHeight","clientHeight"],"sourceRoot":"../../../src","sources":["scroll/scrollable.web.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;;AAkBA,SAASA,SAASA,CAACC,KAAc,EAAwB;EACvD,OAAO,OAAOC,WAAW,KAAK,WAAW,IAAID,KAAK,YAAYC,WAAW;AAC3E;AAEA,SAASC,oBAAoBA,CAC3BF,KAAc,EACkD;EAChE,OACE,OAAOA,KAAK,KAAK,QAAQ,IACzBA,KAAK,KAAK,IAAI,IACd,OAAQA,KAAK,CAAsBG,iBAAiB,KAAK,UAAU;AAEvE;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,cAAcA,CAACC,MAA+B,EAAsB;EAC3E,IAAIA,MAAM,KAAK,QAAQ,EAAE,OAAO,IAAI;EAEpC,MAAMC,OAAO,GAAID,MAAM,CAA0BC,OAAO;EACxD,IAAIA,OAAO,IAAI,IAAI,EAAE,OAAO,IAAI;EAEhC,IAAIP,SAAS,CAACO,OAAO,CAAC,EAAE,OAAOA,OAAO;EAEtC,IAAIJ,oBAAoB,CAACI,OAAO,CAAC,EAAE;IACjC,MAAMC,IAAI,GAAGD,OAAO,CAACH,iBAAiB,CAAC,CAAC;IACxC,IAAIJ,SAAS,CAACQ,IAAI,CAAC,EAAE,OAAOA,IAAI;EAClC;EAEA,OAAO,IAAI;AACb;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAACH,MAA+B,EAAoB;EAChF,IAAIA,MAAM,KAAK,QAAQ,EAAE;IACvB,OAAO;MACLI,SAAS,EAAEA,CAAA,KAAO,OAAOC,MAAM,KAAK,WAAW,GAAG,CAAC,GAAGA,MAAM,CAACC,OAAQ;MACrEC,SAAS,EAAGC,MAAM,IAAK;QACrB,IAAI,OAAOH,MAAM,KAAK,WAAW,EAAEA,MAAM,CAACI,QAAQ,CAAC,CAAC,EAAED,MAAM,CAAC;MAC/D,CAAC;MACDE,SAAS,EAAEA,CAAA,KAAM;IACnB,CAAC;EACH;EAEA,OAAO;IACLN,SAAS,EAAEA,CAAA,KAAM;MACf,MAAMO,OAAO,GAAGZ,cAAc,CAACC,MAAM,CAAC;MACtC,OAAOW,OAAO,GAAGA,OAAO,CAACC,SAAS,GAAG,CAAC;IACxC,CAAC;IACDL,SAAS,EAAGC,MAAM,IAAK;MACrB,MAAMG,OAAO,GAAGZ,cAAc,CAACC,MAAM,CAAC;MACtC,IAAIW,OAAO,EAAEA,OAAO,CAACC,SAAS,GAAGJ,MAAM;IACzC,CAAC;IACDE,SAAS,EAAEA,CAAA,KAAM;MACf,MAAMC,OAAO,GAAGZ,cAAc,CAACC,MAAM,CAAC;MACtC,OAAOW,OAAO,GAAGA,OAAO,CAACE,YAAY,GAAGF,OAAO,CAACG,YAAY,GAAG,KAAK;IACtE;EACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"names":["isElement","value","HTMLElement","hasGetScrollableNode","getScrollableNode","resolveElement","target","current","node","createScroller","getOffset","window","scrollY","setOffset","offset","scrollTo","getMaxOffset","document","Math","max","documentElement","scrollHeight","innerHeight","element","scrollTop","clientHeight"],"sourceRoot":"../../../src","sources":["scroll/scrollable.web.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;;AA+BA,SAASA,SAASA,CAACC,KAAc,EAAwB;EACvD,OAAO,OAAOC,WAAW,KAAK,WAAW,IAAID,KAAK,YAAYC,WAAW;AAC3E;AAEA,SAASC,oBAAoBA,CAC3BF,KAAc,EACkD;EAChE,OACE,OAAOA,KAAK,KAAK,QAAQ,IACzBA,KAAK,KAAK,IAAI,IACd,OAAQA,KAAK,CAAsBG,iBAAiB,KAAK,UAAU;AAEvE;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,cAAcA,CAACC,MAA+B,EAAsB;EAC3E,IAAIA,MAAM,KAAK,QAAQ,EAAE,OAAO,IAAI;EAEpC,MAAMC,OAAO,GAAID,MAAM,CAA0BC,OAAO;EACxD,IAAIA,OAAO,IAAI,IAAI,EAAE,OAAO,IAAI;EAEhC,IAAIP,SAAS,CAACO,OAAO,CAAC,EAAE,OAAOA,OAAO;EAEtC,IAAIJ,oBAAoB,CAACI,OAAO,CAAC,EAAE;IACjC,MAAMC,IAAI,GAAGD,OAAO,CAACH,iBAAiB,CAAC,CAAC;IACxC,IAAIJ,SAAS,CAACQ,IAAI,CAAC,EAAE,OAAOA,IAAI;EAClC;EAEA,OAAO,IAAI;AACb;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAACH,MAA+B,EAAoB;EAChF,IAAIA,MAAM,KAAK,QAAQ,EAAE;IACvB,OAAO;MACLI,SAAS,EAAEA,CAAA,KAAO,OAAOC,MAAM,KAAK,WAAW,GAAG,CAAC,GAAGA,MAAM,CAACC,OAAQ;MACrEC,SAAS,EAAGC,MAAM,IAAK;QACrB,IAAI,OAAOH,MAAM,KAAK,WAAW,EAAEA,MAAM,CAACI,QAAQ,CAAC,CAAC,EAAED,MAAM,CAAC;MAC/D,CAAC;MACDE,YAAY,EAAEA,CAAA,KAAM;QAClB,IAAI,OAAOL,MAAM,KAAK,WAAW,IAAI,OAAOM,QAAQ,KAAK,WAAW,EAAE;UACpE,OAAO,CAAC;QACV;QACA,OAAOC,IAAI,CAACC,GAAG,CACb,CAAC,EACDF,QAAQ,CAACG,eAAe,CAACC,YAAY,GAAGV,MAAM,CAACW,WACjD,CAAC;MACH;IACF,CAAC;EACH;EAEA,OAAO;IACLZ,SAAS,EAAEA,CAAA,KAAM;MACf,MAAMa,OAAO,GAAGlB,cAAc,CAACC,MAAM,CAAC;MACtC,OAAOiB,OAAO,GAAGA,OAAO,CAACC,SAAS,GAAG,CAAC;IACxC,CAAC;IACDX,SAAS,EAAGC,MAAM,IAAK;MACrB,MAAMS,OAAO,GAAGlB,cAAc,CAACC,MAAM,CAAC;MACtC,IAAIiB,OAAO,EAAEA,OAAO,CAACC,SAAS,GAAGV,MAAM;IACzC,CAAC;IACDE,YAAY,EAAEA,CAAA,KAAM;MAClB,MAAMO,OAAO,GAAGlB,cAAc,CAACC,MAAM,CAAC;MACtC,IAAI,CAACiB,OAAO,EAAE,OAAO,CAAC;MACtB,OAAOL,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEI,OAAO,CAACF,YAAY,GAAGE,OAAO,CAACE,YAAY,CAAC;IACjE;EACF,CAAC;AACH","ignoreList":[]}

package/lib/module/scroll/store.js

@@ -5,16 +5,12 @@
  *
  * This file deliberately contains NO React and NO DOM/native imports so the
  * logic can be unit-tested in isolation and shared verbatim by the web and
- * native barrels. The web barrel drives it with real scroll offsets; the
- * native barrel never instantiates it (native-stack already restores scroll).
+ * native barrels.
  */
-
 /**
- * Separator between the navigation route key and an optional caller-supplied
- * sub-key. A route may host more than one independently-scrolling list (e.g.
- * a tabbed profile screen), so each list contributes its own sub-key.
+ * Separator between the two components of a storage key.
  *
- * `\0` (NUL) can never appear in a React Navigation route key or in a
+ * `\0` (NUL) can never appear in a router-derived content id or in a
  * developer-authored sub-key, so it is collision-free as a delimiter. It is
  * written as an escape sequence (not a literal byte) so the source stays
  * text-diffable.
@@ -22,28 +18,48 @@
 const COMPOSITE_KEY_SEPARATOR = '\0';
 
 /**
- * Derive the storage key for a scrollable from its owning route key and an
- * optional caller sub-key.
+ * Derive the storage key for a scrollable from WHAT its screen is showing plus
+ * an optional caller sub-key.
+ *
+ * The key is CONTENT identity, deliberately not the navigation entry. An offset
+ * belongs to what the user was looking at, so returning to it restores however
+ * they got there — browser Back or Forward, a tab press, an in-app link — and
+ * only content never seen this session opens at the top. Keying on the entry
+ * would defeat that: a tab press and `router.replace` both mint a fresh entry,
+ * so both would open at the top even though the user has been there.
+ *
+ * The trade, chosen rather than overlooked: the same content occupying two LIVE
+ * entries now shares one offset. Pushing `/@alice` on top of `/@alice` in a
+ * native stack restores the first one's position instead of opening at the top,
+ * and while both are mounted each writes to the same key. That is the price of
+ * a tab press restoring, which is the behaviour that was asked for.
  *
- * - `routeKey` is React Navigation's stable per-route `route.key`.
- * - `subKey` distinguishes multiple scrollables that share a single route.
+ * The key is always the same two-field composite, with an absent sub-key
+ * written as empty, so two different identities can never collapse onto one key
+ * by omission.
  *
- * Returns `null` when there is no route key to anchor against (the scrollable
- * is not inside a navigator), which the caller treats as "do not persist".
+ * Returns `null` when there is no content id to anchor against (the scrollable
+ * is not inside a navigator, or the adapter cannot answer), which every caller
+ * treats as "do not persist and do not restore".
  */
-export function deriveScrollKey(routeKey, subKey) {
-  if (!routeKey) return null;
-  if (subKey === undefined || subKey === '') return routeKey;
-  return `${routeKey}${COMPOSITE_KEY_SEPARATOR}${subKey}`;
+export function deriveScrollKey(contentId, subKey) {
+  if (!contentId) return null;
+  return [contentId, subKey ?? ''].join(COMPOSITE_KEY_SEPARATOR);
 }
 
 /**
  * In-memory map of `scrollKey -> last-known scroll offset`.
  *
- * Mirrors the semantics of Bluesky's `Map<screenKey, scrollY>`: offsets live
- * only for the lifetime of the document/session. We never persist them — a
- * full reload should start at the top — and we never auto-evict, because a
- * route can be revisited via browser Forward/Back long after it blurred.
+ * Offsets live only for the lifetime of the document/session. We never persist
+ * them — a full reload should start at the top — and we never auto-evict,
+ * because an entry can be revisited via browser Forward/Back long after it
+ * blurred.
+ *
+ * Deliberately an instance held in React context rather than a module-level
+ * singleton: a dependency tree can legitimately contain two copies of Bloom
+ * (a hoisted one plus a nested one under another Oxy package), and a
+ * module-global would then exist twice with no way for either half to see the
+ * other's offsets.
  */
 export class ScrollOffsetStore {
   offsets = new Map();
@@ -54,19 +70,25 @@ export class ScrollOffsetStore {
   }
 
   /**
-   * Read the saved offset for a key. Returns `0` when nothing was saved, so
-   * callers can restore unconditionally (an unseen list restores to the top).
+   * Read the saved offset for a key. Returns `0` when nothing was saved, which
+   * is the same value a caller writes when {@link has} is false — an unseen
+   * list restores to the top.
    */
   read(key) {
     return this.offsets.get(key) ?? 0;
   }
 
-  /** Whether an offset was ever saved for this key. */
+  /**
+   * Whether an offset was ever saved for this key. This — not `read() > 0` —
+   * is what separates "restore" from "reset": a key that was never seen and a
+   * key deliberately saved at the top both read 0, and only the store knows
+   * which is which.
+   */
   has(key) {
     return this.offsets.has(key);
   }
 
-  /** Drop a saved offset (e.g. when a route is permanently removed). */
+  /** Drop a saved offset (e.g. when an entry is permanently removed). */
   forget(key) {
     this.offsets.delete(key);
   }

package/lib/module/scroll/store.js.map

@@ -1 +1 @@
-{"version":3,"names":["COMPOSITE_KEY_SEPARATOR","deriveScrollKey","routeKey","subKey","undefined","ScrollOffsetStore","offsets","Map","save","key","offset","set","read","get","has","forget","delete","clear","size"],"sourceRoot":"../../../src","sources":["scroll/store.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,uBAAuB,GAAG,IAAI;;AAEpC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAC7BC,QAA4B,EAC5BC,MAAe,EACA;EACf,IAAI,CAACD,QAAQ,EAAE,OAAO,IAAI;EAC1B,IAAIC,MAAM,KAAKC,SAAS,IAAID,MAAM,KAAK,EAAE,EAAE,OAAOD,QAAQ;EAC1D,OAAO,GAAGA,QAAQ,GAAGF,uBAAuB,GAAGG,MAAM,EAAE;AACzD;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAME,iBAAiB,CAAC;EACZC,OAAO,GAAG,IAAIC,GAAG,CAAiB,CAAC;;EAEpD;EACAC,IAAIA,CAACC,GAAW,EAAEC,MAAc,EAAQ;IACtC,IAAI,CAACJ,OAAO,CAACK,GAAG,CAACF,GAAG,EAAEC,MAAM,GAAG,CAAC,GAAGA,MAAM,GAAG,CAAC,CAAC;EAChD;;EAEA;AACF;AACA;AACA;EACEE,IAAIA,CAACH,GAAW,EAAU;IACxB,OAAO,IAAI,CAACH,OAAO,CAACO,GAAG,CAACJ,GAAG,CAAC,IAAI,CAAC;EACnC;;EAEA;EACAK,GAAGA,CAACL,GAAW,EAAW;IACxB,OAAO,IAAI,CAACH,OAAO,CAACQ,GAAG,CAACL,GAAG,CAAC;EAC9B;;EAEA;EACAM,MAAMA,CAACN,GAAW,EAAQ;IACxB,IAAI,CAACH,OAAO,CAACU,MAAM,CAACP,GAAG,CAAC;EAC1B;;EAEA;EACAQ,KAAKA,CAAA,EAAS;IACZ,IAAI,CAACX,OAAO,CAACW,KAAK,CAAC,CAAC;EACtB;;EAEA;EACA,IAAIC,IAAIA,CAAA,EAAW;IACjB,OAAO,IAAI,CAACZ,OAAO,CAACY,IAAI;EAC1B;AACF","ignoreList":[]}
+{"version":3,"names":["COMPOSITE_KEY_SEPARATOR","deriveScrollKey","contentId","subKey","join","ScrollOffsetStore","offsets","Map","save","key","offset","set","read","get","has","forget","delete","clear","size"],"sourceRoot":"../../../src","sources":["scroll/store.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,uBAAuB,GAAG,IAAI;;AAEpC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAC7BC,SAAwB,EACxBC,MAAe,EACA;EACf,IAAI,CAACD,SAAS,EAAE,OAAO,IAAI;EAC3B,OAAO,CAACA,SAAS,EAAEC,MAAM,IAAI,EAAE,CAAC,CAACC,IAAI,CAACJ,uBAAuB,CAAC;AAChE;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMK,iBAAiB,CAAC;EACZC,OAAO,GAAG,IAAIC,GAAG,CAAiB,CAAC;;EAEpD;EACAC,IAAIA,CAACC,GAAW,EAAEC,MAAc,EAAQ;IACtC,IAAI,CAACJ,OAAO,CAACK,GAAG,CAACF,GAAG,EAAEC,MAAM,GAAG,CAAC,GAAGA,MAAM,GAAG,CAAC,CAAC;EAChD;;EAEA;AACF;AACA;AACA;AACA;EACEE,IAAIA,CAACH,GAAW,EAAU;IACxB,OAAO,IAAI,CAACH,OAAO,CAACO,GAAG,CAACJ,GAAG,CAAC,IAAI,CAAC;EACnC;;EAEA;AACF;AACA;AACA;AACA;AACA;EACEK,GAAGA,CAACL,GAAW,EAAW;IACxB,OAAO,IAAI,CAACH,OAAO,CAACQ,GAAG,CAACL,GAAG,CAAC;EAC9B;;EAEA;EACAM,MAAMA,CAACN,GAAW,EAAQ;IACxB,IAAI,CAACH,OAAO,CAACU,MAAM,CAACP,GAAG,CAAC;EAC1B;;EAEA;EACAQ,KAAKA,CAAA,EAAS;IACZ,IAAI,CAACX,OAAO,CAACW,KAAK,CAAC,CAAC;EACtB;;EAEA;EACA,IAAIC,IAAIA,CAAA,EAAW;IACjB,OAAO,IAAI,CAACZ,OAAO,CAACY,IAAI;EAC1B;AACF","ignoreList":[]}