@oxy.so/services 13.2.0 → 13.3.0

package/lib/commonjs/ui/client.js

@@ -255,6 +255,18 @@ Object.defineProperty(exports, "useAccountColorSave", {
     return _useAccountColor.useAccountColorSave;
   }
 });
+Object.defineProperty(exports, "useAccountTheme", {
+  enumerable: true,
+  get: function () {
+    return _useAccountTheme.useAccountTheme;
+  }
+});
+Object.defineProperty(exports, "useAccountThemeControls", {
+  enumerable: true,
+  get: function () {
+    return _useAccountTheme.useAccountThemeControls;
+  }
+});
 Object.defineProperty(exports, "useAppAssertion", {
   enumerable: true,
   get: function () {
@@ -426,6 +438,7 @@ var _OxyPayButton = _interopRequireDefault(require("./components/OxyPayButton.js
 var _OxyContext = require("./context/OxyContext.js");
 var _useAuth = require("./hooks/useAuth.js");
 var _useAccountColor = require("./hooks/useAccountColor.js");
+var _useAccountTheme = require("./hooks/useAccountTheme.js");
 var _AppAssertionContext = require("./appAssertion/AppAssertionContext.js");
 var _productAnalytics = require("./analytics/productAnalytics.js");
 var _useFollow = require("./hooks/useFollow.js");

package/lib/commonjs/ui/client.js.map

@@ -1 +1 @@
-{"version":3,"names":["require","_OxyProvider","_interopRequireDefault","_OxySignInButton","_OxyAuthPrompt","_LogoIcon","_LogoText","_FollowButton","_FollowTargetButton","_followLabels","_ProfileButton","_PeableButton","_OxyPayButton","_OxyContext","_useAuth","_useAccountColor","_AppAssertionContext","_productAnalytics","_useFollow","_useFollowTarget","_useSupervision","_useAccountQueries","_useStorage","_useOxyEvent","_useAccountMutations","_useFileDownloadUrl","_useMutationStatus","_useOnlineStatus","_useDisplayCurrency","_useDisplayPrice","_DisplayCurrencySelector","_followRules","_queryKeys","_userCache","_authStore","_errorHandlers","e","__esModule","default"],"sourceRoot":"../../../src","sources":["ui/client.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAeAA,OAAA;AAGA,IAAAC,YAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAD,sBAAA,CAAAF,OAAA;AACA,IAAAI,cAAA,GAAAF,sBAAA,CAAAF,OAAA;AAEA,IAAAK,SAAA,GAAAL,OAAA;AACA,IAAAM,SAAA,GAAAN,OAAA;AACA,IAAAO,aAAA,GAAAL,sBAAA,CAAAF,OAAA;AAMA,IAAAQ,mBAAA,GAAAR,OAAA;AAGA,IAAAS,aAAA,GAAAT,OAAA;AAEA,IAAAU,cAAA,GAAAR,sBAAA,CAAAF,OAAA;AAEA,IAAAW,aAAA,GAAAT,sBAAA,CAAAF,OAAA;AAGA,IAAAY,aAAA,GAAAV,sBAAA,CAAAF,OAAA;AAKA,IAAAa,WAAA,GAAAb,OAAA;AAGA,IAAAc,QAAA,GAAAd,OAAA;AACA,IAAAe,gBAAA,GAAAf,OAAA;AAQA,IAAAgB,oBAAA,GAAAhB,OAAA;AAOA,IAAAiB,iBAAA,GAAAjB,OAAA;AAEA,IAAAkB,UAAA,GAAAlB,OAAA;AACA,IAAAmB,gBAAA,GAAAnB,OAAA;AACA,IAAAoB,eAAA,GAAApB,OAAA;AAEA,IAAAqB,kBAAA,GAAArB,OAAA;AAOA,IAAAsB,WAAA,GAAAtB,OAAA;AAGA,IAAAuB,YAAA,GAAAvB,OAAA;AAKA,IAAAwB,oBAAA,GAAAxB,OAAA;AAKA,IAAAyB,mBAAA,GAAAzB,OAAA;AACA,IAAA0B,kBAAA,GAAA1B,OAAA;AAEA,IAAA2B,gBAAA,GAAA3B,OAAA;AACA,IAAA4B,mBAAA,GAAA5B,OAAA;AACA,IAAA6B,gBAAA,GAAA7B,OAAA;AACA,IAAA8B,wBAAA,GAAA9B,OAAA;AAOA,IAAA+B,YAAA,GAAA/B,OAAA;AAQA,IAAAgC,UAAA,GAAAhC,OAAA;AAaA,IAAAiC,UAAA,GAAAjC,OAAA;AAcA,IAAAkC,UAAA,GAAAlC,OAAA;AAGA,IAAAmC,cAAA,GAAAnC,OAAA;AAK+B,SAAAE,uBAAAkC,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA","ignoreList":[]}
+{"version":3,"names":["require","_OxyProvider","_interopRequireDefault","_OxySignInButton","_OxyAuthPrompt","_LogoIcon","_LogoText","_FollowButton","_FollowTargetButton","_followLabels","_ProfileButton","_PeableButton","_OxyPayButton","_OxyContext","_useAuth","_useAccountColor","_useAccountTheme","_AppAssertionContext","_productAnalytics","_useFollow","_useFollowTarget","_useSupervision","_useAccountQueries","_useStorage","_useOxyEvent","_useAccountMutations","_useFileDownloadUrl","_useMutationStatus","_useOnlineStatus","_useDisplayCurrency","_useDisplayPrice","_DisplayCurrencySelector","_followRules","_queryKeys","_userCache","_authStore","_errorHandlers","e","__esModule","default"],"sourceRoot":"../../../src","sources":["ui/client.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAeAA,OAAA;AAGA,IAAAC,YAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAD,sBAAA,CAAAF,OAAA;AACA,IAAAI,cAAA,GAAAF,sBAAA,CAAAF,OAAA;AAEA,IAAAK,SAAA,GAAAL,OAAA;AACA,IAAAM,SAAA,GAAAN,OAAA;AACA,IAAAO,aAAA,GAAAL,sBAAA,CAAAF,OAAA;AAMA,IAAAQ,mBAAA,GAAAR,OAAA;AAGA,IAAAS,aAAA,GAAAT,OAAA;AAEA,IAAAU,cAAA,GAAAR,sBAAA,CAAAF,OAAA;AAEA,IAAAW,aAAA,GAAAT,sBAAA,CAAAF,OAAA;AAGA,IAAAY,aAAA,GAAAV,sBAAA,CAAAF,OAAA;AAKA,IAAAa,WAAA,GAAAb,OAAA;AAGA,IAAAc,QAAA,GAAAd,OAAA;AACA,IAAAe,gBAAA,GAAAf,OAAA;AAMA,IAAAgB,gBAAA,GAAAhB,OAAA;AAIA,IAAAiB,oBAAA,GAAAjB,OAAA;AAOA,IAAAkB,iBAAA,GAAAlB,OAAA;AAEA,IAAAmB,UAAA,GAAAnB,OAAA;AACA,IAAAoB,gBAAA,GAAApB,OAAA;AACA,IAAAqB,eAAA,GAAArB,OAAA;AAEA,IAAAsB,kBAAA,GAAAtB,OAAA;AAOA,IAAAuB,WAAA,GAAAvB,OAAA;AAGA,IAAAwB,YAAA,GAAAxB,OAAA;AAKA,IAAAyB,oBAAA,GAAAzB,OAAA;AAKA,IAAA0B,mBAAA,GAAA1B,OAAA;AACA,IAAA2B,kBAAA,GAAA3B,OAAA;AAEA,IAAA4B,gBAAA,GAAA5B,OAAA;AACA,IAAA6B,mBAAA,GAAA7B,OAAA;AACA,IAAA8B,gBAAA,GAAA9B,OAAA;AACA,IAAA+B,wBAAA,GAAA/B,OAAA;AAOA,IAAAgC,YAAA,GAAAhC,OAAA;AAQA,IAAAiC,UAAA,GAAAjC,OAAA;AAaA,IAAAkC,UAAA,GAAAlC,OAAA;AAcA,IAAAmC,UAAA,GAAAnC,OAAA;AAGA,IAAAoC,cAAA,GAAApC,OAAA;AAK+B,SAAAE,uBAAAmC,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA","ignoreList":[]}

package/lib/commonjs/ui/hooks/useAccountTheme.js

@@ -0,0 +1,182 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useAccountTheme = useAccountTheme;
+exports.useAccountThemeControls = useAccountThemeControls;
+var _react = require("react");
+var _zustand = require("zustand");
+var _core = require("@oxy.so/core");
+var _theme = require("@oxy.so/bloom/theme");
+var _storageHelpers = require("../utils/storageHelpers.js");
+var _useAccountColor = require("./useAccountColor.js");
+var _useAuth = require("./useAuth.js");
+var _useAccountMutations = require("./mutations/useAccountMutations.js");
+/**
+ * useAccountTheme / useAccountThemeControls
+ *
+ * The Oxy account carries a portable theme (`user.themePreference`: a mode and
+ * a colour preset) that every Oxy app can wear. The COLOUR is the account
+ * colour and always applies (`useAccountColor`). Whether an app also follows
+ * the account's MODE is the viewer's choice per device: the theme SOURCE.
+ *
+ * - `account` (the default): the account's mode is applied to Bloom, and a mode
+ *   chosen here is written back to the account for the other Oxy apps.
+ * - `app`: the mode stays on this device; nothing is written to the account.
+ *
+ * The source is a local preference, never sent anywhere. On web it is read
+ * synchronously, so the first paint already knows it; on native it resolves
+ * from AsyncStorage right after mount. Bloom's own persistence still paints the
+ * last theme instantly on cold boot, so the account theme lands without a flash
+ * once the session resolves.
+ */
+
+/** Where the app's theme MODE comes from on this device. */
+
+const THEME_SOURCE_KEY = 'oxy.theme.source';
+function normalizeSource(stored) {
+  return stored === 'app' ? 'app' : 'account';
+}
+
+/**
+ * Bloom's richer mode set onto the portable subset the account stores
+ * (`adaptive` has no cross-app meaning, so it is `system`).
+ */
+function toPortableMode(mode) {
+  return mode === 'light' || mode === 'dark' ? mode : 'system';
+}
+
+/** Web reads `localStorage` synchronously; native resolves in `hydrate`. */
+function readInitialSource() {
+  if ((0, _storageHelpers.isReactNative)() || typeof window === 'undefined') {
+    return {
+      source: 'account',
+      hydrated: false
+    };
+  }
+  try {
+    return {
+      source: normalizeSource(window.localStorage?.getItem(THEME_SOURCE_KEY)),
+      hydrated: true
+    };
+  } catch {
+    // A sandboxed document's storage getter throws: no stored choice.
+    return {
+      source: 'account',
+      hydrated: true
+    };
+  }
+}
+const useThemeSourceStore = (0, _zustand.create)((set, get) => ({
+  ...readInitialSource(),
+  setSource(source) {
+    set({
+      source,
+      hydrated: true
+    });
+    void (0, _storageHelpers.createPlatformStorage)().then(storage => storage.setItem(THEME_SOURCE_KEY, source)).catch(() => undefined);
+  },
+  async hydrate() {
+    if (get().hydrated) return;
+    const stored = await (0, _storageHelpers.createPlatformStorage)().then(storage => storage.getItem(THEME_SOURCE_KEY)).catch(() => null);
+    // A choice made while storage was being read wins over the stored one.
+    if (!get().hydrated) set({
+      source: normalizeSource(stored),
+      hydrated: true
+    });
+  }
+}));
+
+/**
+ * Apply the account theme to Bloom: the colour always (through
+ * `useAccountColor`, which `canUse` can narrow), the mode while this device's
+ * source is `account`. Mount ONCE, inside `OxyProvider` and Bloom's theme
+ * provider.
+ */
+function useAccountTheme({
+  canUse
+} = {}) {
+  const {
+    isAuthenticated,
+    user
+  } = (0, _useAuth.useAuth)();
+  const source = useThemeSourceStore(state => state.source);
+  const hydrated = useThemeSourceStore(state => state.hydrated);
+  const hydrate = useThemeSourceStore(state => state.hydrate);
+  const {
+    setMode
+  } = (0, _theme.useBloomTheme)();
+  (0, _useAccountColor.useAccountColor)({
+    canUse
+  });
+  (0, _react.useEffect)(() => {
+    void hydrate();
+  }, [hydrate]);
+  const accountMode = user?.themePreference?.mode;
+  (0, _react.useEffect)(() => {
+    if (!hydrated || !isAuthenticated || source !== 'account' || !accountMode) return;
+    setMode(accountMode);
+  }, [hydrated, isAuthenticated, source, accountMode, setMode]);
+}
+/**
+ * Source-aware theme mode changes for a settings screen. Bloom changes at once;
+ * on the `account` source the account's portable theme follows. Without a
+ * usable session the effective source is `app`, so changes stay local, and the
+ * stored choice applies again once signed in. The colour is chosen with
+ * `useAccountColorSave`.
+ */
+function useAccountThemeControls() {
+  const {
+    user,
+    canUsePrivateApi
+  } = (0, _useAuth.useAuth)();
+  const {
+    mode,
+    colorPreset,
+    setMode
+  } = (0, _theme.useBloomTheme)();
+  const {
+    mutateAsync
+  } = (0, _useAccountMutations.useUpdateProfile)();
+  const storedSource = useThemeSourceStore(state => state.source);
+  const setSource = useThemeSourceStore(state => state.setSource);
+  const source = canUsePrivateApi ? storedSource : 'app';
+  const persist = (0, _react.useCallback)(async next => {
+    await mutateAsync({
+      themePreference: {
+        mode: toPortableMode(next.mode),
+        colorPreset: next.colorPreset
+      }
+    });
+  }, [mutateAsync]);
+  const changeThemeMode = (0, _react.useCallback)(async nextMode => {
+    setMode(nextMode);
+    if (source === 'account') await persist({
+      mode: nextMode,
+      colorPreset
+    });
+  }, [setMode, source, persist, colorPreset]);
+  const accountTheme = user?.themePreference;
+  const hasAccountTheme = !!accountTheme && (0, _useAccountColor.resolveAccountColor)({
+    themePreference: accountTheme
+  }) !== null;
+  const changeThemeSource = (0, _react.useCallback)(nextSource => {
+    setSource(nextSource);
+    // An existing account theme is applied by `useAccountTheme`; only an
+    // account without one is seeded, from what the viewer sees now.
+    if (nextSource !== 'account' || !canUsePrivateApi || hasAccountTheme) return;
+    persist({
+      mode,
+      colorPreset
+    }).catch(error => {
+      _core.logger.error('Failed to seed the account theme', error);
+    });
+  }, [setSource, canUsePrivateApi, hasAccountTheme, persist, mode, colorPreset]);
+  return {
+    source,
+    changeThemeSource,
+    changeThemeMode
+  };
+}
+//# sourceMappingURL=useAccountTheme.js.map

package/lib/commonjs/ui/hooks/useAccountTheme.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","_zustand","_core","_theme","_storageHelpers","_useAccountColor","_useAuth","_useAccountMutations","THEME_SOURCE_KEY","normalizeSource","stored","toPortableMode","mode","readInitialSource","isReactNative","window","source","hydrated","localStorage","getItem","useThemeSourceStore","create","set","get","setSource","createPlatformStorage","then","storage","setItem","catch","undefined","hydrate","useAccountTheme","canUse","isAuthenticated","user","useAuth","state","setMode","useBloomTheme","useAccountColor","useEffect","accountMode","themePreference","useAccountThemeControls","canUsePrivateApi","colorPreset","mutateAsync","useUpdateProfile","storedSource","persist","useCallback","next","changeThemeMode","nextMode","accountTheme","hasAccountTheme","resolveAccountColor","changeThemeSource","nextSource","error","logger"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAccountTheme.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/hooks/useFileDownloadUrl.js

@@ -5,63 +5,83 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useFileDownloadUrl = void 0;
 var _react = require("react");
+var _oxyRuntimeContext = require("../context/oxyRuntimeContext.js");
+function isAbsoluteUrl(ref) {
+  return ref.startsWith('http://') || ref.startsWith('https://');
+}
+
 /**
- * Hook to resolve a file's download URL asynchronously.
+ * Resolve a file's download URL for the current caller.
+ *
+ * A URL `assets.url` already resolved is answered in the FIRST render from
+ * core's identity-scoped cache (`assets.cachedUrl`): no request, no loading
+ * frame. Only a miss resolves asynchronously, through `assets.url`, which
+ * returns a scoped media-token stream URL for a private asset. There is no
+ * public-CDN fallback: `assets.publicUrl` 404s for private uploads. A
+ * reference that is already an absolute `http(s)` URL is returned unchanged.
  *
- * Uses `getFileDownloadUrlAsync`, which returns a scoped media-token stream URL
- * for private assets. There is no sync CDN fallback — the synchronous
- * `getFileDownloadUrl` is public-CDN-only and 404s for private uploads.
+ * For a synchronous, render-only answer (an image resolver, a list row) use
+ * `oxyServices.assets.renderUrl`, which reads the same cache.
  */
 const useFileDownloadUrl = (oxyServices, fileId, options) => {
-  const [url, setUrl] = (0, _react.useState)(null);
-  const [loading, setLoading] = (0, _react.useState)(false);
-  const [error, setError] = (0, _react.useState)(null);
   const variant = options?.variant;
   const expiresIn = options?.expiresIn;
+  // A resolved URL can carry the viewer's scoped media token, so the viewer is
+  // part of what was asked: an account switch never shows the previous one's.
+  const viewerId = (0, _oxyRuntimeContext.useOptionalOxy)()?.user?.id ?? '';
+  const request = fileId ? `${viewerId}|${fileId}|${variant ?? ''}|${expiresIn ?? ''}` : null;
+  const immediate = !fileId ? null : isAbsoluteUrl(fileId) ? fileId : oxyServices?.assets.cachedUrl(fileId, variant, expiresIn) ?? null;
+  const needsResolve = !!fileId && !!oxyServices && immediate === null;
+  const [settled, setSettled] = (0, _react.useState)(null);
   (0, _react.useEffect)(() => {
-    if (!fileId) {
-      setUrl(null);
-      setLoading(false);
-      setError(null);
-      return;
-    }
-    if (!oxyServices) {
-      setUrl(null);
-      setLoading(false);
-      setError(new Error('OxyServices instance not configured for useFileDownloadUrl'));
-      return;
-    }
+    if (!needsResolve || !fileId || !oxyServices || !request) return;
     let cancelled = false;
-    const instance = oxyServices;
-    const targetFileId = fileId;
-    const load = async () => {
-      setLoading(true);
-      setError(null);
-      try {
-        const resolvedUrl = await instance.assets.url(targetFileId, variant, expiresIn);
-        if (!cancelled) {
-          setUrl(resolvedUrl || null);
-        }
-      } catch (err) {
-        if (!cancelled) {
-          setUrl(null);
-          setError(err instanceof Error ? err : new Error(String(err)));
-        }
-      } finally {
-        if (!cancelled) {
-          setLoading(false);
-        }
+    oxyServices.assets.url(fileId, variant, expiresIn).then(url => {
+      if (!cancelled) setSettled({
+        request,
+        url: url || null,
+        error: null
+      });
+    }, err => {
+      if (!cancelled) {
+        setSettled({
+          request,
+          url: null,
+          error: err instanceof Error ? err : new Error(String(err))
+        });
       }
-    };
-    load();
+    });
     return () => {
       cancelled = true;
     };
-  }, [fileId, oxyServices, variant, expiresIn]);
+  }, [needsResolve, fileId, oxyServices, variant, expiresIn, request]);
+  if (!fileId) return {
+    url: null,
+    loading: false,
+    error: null
+  };
+  if (immediate !== null) return {
+    url: immediate,
+    loading: false,
+    error: null
+  };
+  if (!oxyServices) {
+    return {
+      url: null,
+      loading: false,
+      error: new Error('OxyServices instance not configured for useFileDownloadUrl')
+    };
+  }
+  // A result settled for another file, variant or expiry is never shown.
+  if (settled?.request !== request) return {
+    url: null,
+    loading: true,
+    error: null
+  };
   return {
-    url,
-    loading,
-    error
+    url: settled.url,
+    loading: false,
+    error: settled.error
   };
 };
 exports.useFileDownloadUrl = useFileDownloadUrl;

package/lib/commonjs/ui/hooks/useFileDownloadUrl.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","useFileDownloadUrl","oxyServices","fileId","options","url","setUrl","useState","loading","setLoading","error","setError","variant","expiresIn","useEffect","Error","cancelled","instance","targetFileId","load","resolvedUrl","assets","err","String","exports"],"sourceRoot":"../../../../src","sources":["ui/hooks/useFileDownloadUrl.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAcA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,kBAAkB,GAAGA,CAChCC,WAA2C,EAC3CC,MAAiC,EACjCC,OAAmC,KACN;EAC7B,MAAM,CAACC,GAAG,EAAEC,MAAM,CAAC,GAAG,IAAAC,eAAQ,EAAgB,IAAI,CAAC;EACnD,MAAM,CAACC,OAAO,EAAEC,UAAU,CAAC,GAAG,IAAAF,eAAQ,EAAC,KAAK,CAAC;EAC7C,MAAM,CAACG,KAAK,EAAEC,QAAQ,CAAC,GAAG,IAAAJ,eAAQ,EAAe,IAAI,CAAC;EAEtD,MAAMK,OAAO,GAAGR,OAAO,EAAEQ,OAAO;EAChC,MAAMC,SAAS,GAAGT,OAAO,EAAES,SAAS;EAEpC,IAAAC,gBAAS,EAAC,MAAM;IACd,IAAI,CAACX,MAAM,EAAE;MACXG,MAAM,CAAC,IAAI,CAAC;MACZG,UAAU,CAAC,KAAK,CAAC;MACjBE,QAAQ,CAAC,IAAI,CAAC;MACd;IACF;IAEA,IAAI,CAACT,WAAW,EAAE;MAChBI,MAAM,CAAC,IAAI,CAAC;MACZG,UAAU,CAAC,KAAK,CAAC;MACjBE,QAAQ,CAAC,IAAII,KAAK,CAAC,4DAA4D,CAAC,CAAC;MACjF;IACF;IAEA,IAAIC,SAAS,GAAG,KAAK;IACrB,MAAMC,QAAQ,GAAGf,WAAW;IAC5B,MAAMgB,YAAY,GAAGf,MAAM;IAE3B,MAAMgB,IAAI,GAAG,MAAAA,CAAA,KAAY;MACvBV,UAAU,CAAC,IAAI,CAAC;MAChBE,QAAQ,CAAC,IAAI,CAAC;MAEd,IAAI;QACF,MAAMS,WAAW,GAAG,MAAMH,QAAQ,CAACI,MAAM,CAAChB,GAAG,CAACa,YAAY,EAAEN,OAAO,EAAEC,SAAS,CAAC;QAE/E,IAAI,CAACG,SAAS,EAAE;UACdV,MAAM,CAACc,WAAW,IAAI,IAAI,CAAC;QAC7B;MACF,CAAC,CAAC,OAAOE,GAAY,EAAE;QACrB,IAAI,CAACN,SAAS,EAAE;UACdV,MAAM,CAAC,IAAI,CAAC;UACZK,QAAQ,CAACW,GAAG,YAAYP,KAAK,GAAGO,GAAG,GAAG,IAAIP,KAAK,CAACQ,MAAM,CAACD,GAAG,CAAC,CAAC,CAAC;QAC/D;MACF,CAAC,SAAS;QACR,IAAI,CAACN,SAAS,EAAE;UACdP,UAAU,CAAC,KAAK,CAAC;QACnB;MACF;IACF,CAAC;IAEDU,IAAI,CAAC,CAAC;IAEN,OAAO,MAAM;MACXH,SAAS,GAAG,IAAI;IAClB,CAAC;EACH,CAAC,EAAE,CAACb,MAAM,EAAED,WAAW,EAAEU,OAAO,EAAEC,SAAS,CAAC,CAAC;EAE7C,OAAO;IAAER,GAAG;IAAEG,OAAO;IAAEE;EAAM,CAAC;AAChC,CAAC;AAACc,OAAA,CAAAvB,kBAAA,GAAAA,kBAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","_oxyRuntimeContext","isAbsoluteUrl","ref","startsWith","useFileDownloadUrl","oxyServices","fileId","options","variant","expiresIn","viewerId","useOptionalOxy","user","id","request","immediate","assets","cachedUrl","needsResolve","settled","setSettled","useState","useEffect","cancelled","url","then","error","err","Error","String","loading","exports"],"sourceRoot":"../../../../src","sources":["ui/hooks/useFileDownloadUrl.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/client.js

@@ -38,6 +38,7 @@ export { useOxy, useOptionalOxy, OxyProviderMissingError } from "./context/OxyCo
 // Hooks
 export { useAuth } from "./hooks/useAuth.js";
 export { useAccountColor, useAccountColorSave, resolveAccountColor, entitledAccountColors } from "./hooks/useAccountColor.js";
+export { useAccountTheme, useAccountThemeControls } from "./hooks/useAccountTheme.js";
 // This app's Oxy-signed assertion of which app it is (ADR 0045), for an SDK
 // that attaches it to its own requests without pulling in the account screens.
 export { useAppAssertion, AppAssertionProviderMissingError } from "./appAssertion/AppAssertionContext.js";

package/lib/module/ui/client.js.map

@@ -1 +1 @@
-{"version":3,"names":["default","OxyProvider","OxySignInButton","OxyAuthPrompt","LogoIcon","LogoText","FollowButton","FollowTargetButton","useFollowErrorMessage","ProfileButton","PeableButton","OxyPayButton","useOxy","useOptionalOxy","OxyProviderMissingError","useAuth","useAccountColor","useAccountColorSave","resolveAccountColor","entitledAccountColors","useAppAssertion","AppAssertionProviderMissingError","createDeferredProductAnalytics","useFollow","useFollowerCounts","useSeedFollowStatuses","useFollowTarget","useSupervision","supervisionQueryKeys","useUserProfile","useUserProfiles","useCurrentUser","useUserById","useUserByUsername","useStorage","useOxyEvent","useUpdateProfile","useUploadAvatar","useUploadFile","useFileDownloadUrl","useMutationStatus","useOnlineStatus","useDisplayCurrency","useDisplayPrice","DisplayCurrencySelector","buildFollowMenuItems","resolveFollowPrimaryAction","FOLLOW_ACTION_LEAVES_ACTIVE","queryKeys","invalidateAccountQueries","invalidateUserQueries","invalidateSessionQueries","invalidateDeviceQueries","invalidatePrivacyQueries","invalidateSecurityQueries","invalidateStorageQueries","invalidatePaymentsQueries","invalidateConnectedAppsQueries","invalidateAuthMethodsQueries","upsertCachedUser","upsertCachedUsers","CLEARABLE_USER_FIELDS","clearedFieldsFromProfileUpdate","clearedFieldsFromAccountUpdate","useAuthStore","handleAuthError","isInvalidSessionError","isTimeoutOrNetworkError","extractErrorMessage"],"sourceRoot":"../../../src","sources":["ui/client.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,OAAO,wBAAqB;;AAE5B;AACA,SAASA,OAAO,IAAIC,WAAW,QAAQ,6BAA0B;AACjE,SAASD,OAAO,IAAIE,eAAe,QAAQ,iCAA8B;AACzE,SAASF,OAAO,IAAIG,aAAa,QAAQ,+BAA4B;AAErE,SAASC,QAAQ,QAAQ,+BAA4B;AACrD,SAASC,QAAQ,QAAQ,+BAA4B;AACrD,SAASL,OAAO,IAAIM,YAAY,QAAQ,8BAA2B;AAMnE,SAASC,kBAAkB,QAAQ,oCAAiC;AAGpE,SAASC,qBAAqB,QAAQ,8BAA2B;AAEjE,SAASR,OAAO,IAAIS,aAAa,QAAQ,+BAA4B;AAErE,SAAST,OAAO,IAAIU,YAAY,QAAQ,8BAA2B;AAEnE;AACA,SAASV,OAAO,IAAIW,YAAY,QAAQ,8BAA2B;AACnE;;AAGA;AACA,SAASC,MAAM,EAAEC,cAAc,EAAEC,uBAAuB,QAAQ,yBAAsB;;AAEtF;AACA,SAASC,OAAO,QAAQ,oBAAiB;AACzC,SACEC,eAAe,EACfC,mBAAmB,EACnBC,mBAAmB,EACnBC,qBAAqB,QAChB,4BAAyB;AAChC;AACA;AACA,SACEC,eAAe,EACfC,gCAAgC,QAC3B,uCAAoC;AAI3C,SAASC,8BAA8B,QAAQ,iCAA8B;AAE7E,SAASC,SAAS,EAAEC,iBAAiB,EAAEC,qBAAqB,QAAQ,sBAAmB;AACvF,SAASC,eAAe,QAAQ,4BAAyB;AACzD,SAASC,cAAc,EAAEC,oBAAoB,QAAQ,mCAAgC;AAErF,SACEC,cAAc,EACdC,eAAe,EACfC,cAAc,EACdC,WAAW,EACXC,iBAAiB,QACZ,sCAAmC;AAC1C,SAASC,UAAU,QAAQ,uBAAoB;AAC/C;AACA;AACA,SAASC,WAAW,QAAQ,wBAAqB;AACjD;AACA;AACA;AACA;AACA,SACEC,gBAAgB,EAChBC,eAAe,EACfC,aAAa,QACR,0CAAuC;AAC9C,SAASC,kBAAkB,QAAQ,+BAA4B;AAC/D,SAASC,iBAAiB,QAAQ,8BAA2B;AAE7D,SAASC,eAAe,QAAQ,4BAAyB;AACzD,SAASC,kBAAkB,QAAQ,+BAA4B;AAC/D,SAASC,eAAe,QAAQ,4BAAyB;AACzD,SAASC,uBAAuB,QAAQ,yCAAsC;AAG9E;AACA;;AAEA;AACA,SACEC,oBAAoB,EACpBC,0BAA0B,EAC1BC,2BAA2B,QACtB,6BAA0B;AAGjC;AACA,SACEC,SAAS,EACTC,wBAAwB,EACxBC,qBAAqB,EACrBC,wBAAwB,EACxBC,uBAAuB,EACvBC,wBAAwB,EACxBC,yBAAyB,EACzBC,wBAAwB,EACxBC,yBAAyB,EACzBC,8BAA8B,EAC9BC,4BAA4B,QACvB,8BAA2B;AAClC,SACEC,gBAAgB,EAChBC,iBAAiB,EACjBC,qBAAqB,EACrBC,8BAA8B,EAC9BC,8BAA8B,QACzB,8BAA2B;AAOlC;AACA,SAASC,YAAY,QAAQ,uBAAoB;;AAEjD;AACA,SACEC,eAAe,EACfC,qBAAqB,EACrBC,uBAAuB,EACvBC,mBAAmB,QACd,0BAAuB","ignoreList":[]}
+{"version":3,"names":["default","OxyProvider","OxySignInButton","OxyAuthPrompt","LogoIcon","LogoText","FollowButton","FollowTargetButton","useFollowErrorMessage","ProfileButton","PeableButton","OxyPayButton","useOxy","useOptionalOxy","OxyProviderMissingError","useAuth","useAccountColor","useAccountColorSave","resolveAccountColor","entitledAccountColors","useAccountTheme","useAccountThemeControls","useAppAssertion","AppAssertionProviderMissingError","createDeferredProductAnalytics","useFollow","useFollowerCounts","useSeedFollowStatuses","useFollowTarget","useSupervision","supervisionQueryKeys","useUserProfile","useUserProfiles","useCurrentUser","useUserById","useUserByUsername","useStorage","useOxyEvent","useUpdateProfile","useUploadAvatar","useUploadFile","useFileDownloadUrl","useMutationStatus","useOnlineStatus","useDisplayCurrency","useDisplayPrice","DisplayCurrencySelector","buildFollowMenuItems","resolveFollowPrimaryAction","FOLLOW_ACTION_LEAVES_ACTIVE","queryKeys","invalidateAccountQueries","invalidateUserQueries","invalidateSessionQueries","invalidateDeviceQueries","invalidatePrivacyQueries","invalidateSecurityQueries","invalidateStorageQueries","invalidatePaymentsQueries","invalidateConnectedAppsQueries","invalidateAuthMethodsQueries","upsertCachedUser","upsertCachedUsers","CLEARABLE_USER_FIELDS","clearedFieldsFromProfileUpdate","clearedFieldsFromAccountUpdate","useAuthStore","handleAuthError","isInvalidSessionError","isTimeoutOrNetworkError","extractErrorMessage"],"sourceRoot":"../../../src","sources":["ui/client.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,OAAO,wBAAqB;;AAE5B;AACA,SAASA,OAAO,IAAIC,WAAW,QAAQ,6BAA0B;AACjE,SAASD,OAAO,IAAIE,eAAe,QAAQ,iCAA8B;AACzE,SAASF,OAAO,IAAIG,aAAa,QAAQ,+BAA4B;AAErE,SAASC,QAAQ,QAAQ,+BAA4B;AACrD,SAASC,QAAQ,QAAQ,+BAA4B;AACrD,SAASL,OAAO,IAAIM,YAAY,QAAQ,8BAA2B;AAMnE,SAASC,kBAAkB,QAAQ,oCAAiC;AAGpE,SAASC,qBAAqB,QAAQ,8BAA2B;AAEjE,SAASR,OAAO,IAAIS,aAAa,QAAQ,+BAA4B;AAErE,SAAST,OAAO,IAAIU,YAAY,QAAQ,8BAA2B;AAEnE;AACA,SAASV,OAAO,IAAIW,YAAY,QAAQ,8BAA2B;AACnE;;AAGA;AACA,SAASC,MAAM,EAAEC,cAAc,EAAEC,uBAAuB,QAAQ,yBAAsB;;AAEtF;AACA,SAASC,OAAO,QAAQ,oBAAiB;AACzC,SACEC,eAAe,EACfC,mBAAmB,EACnBC,mBAAmB,EACnBC,qBAAqB,QAChB,4BAAyB;AAChC,SAASC,eAAe,EAAEC,uBAAuB,QAAQ,4BAAyB;AAElF;AACA;AACA,SACEC,eAAe,EACfC,gCAAgC,QAC3B,uCAAoC;AAI3C,SAASC,8BAA8B,QAAQ,iCAA8B;AAE7E,SAASC,SAAS,EAAEC,iBAAiB,EAAEC,qBAAqB,QAAQ,sBAAmB;AACvF,SAASC,eAAe,QAAQ,4BAAyB;AACzD,SAASC,cAAc,EAAEC,oBAAoB,QAAQ,mCAAgC;AAErF,SACEC,cAAc,EACdC,eAAe,EACfC,cAAc,EACdC,WAAW,EACXC,iBAAiB,QACZ,sCAAmC;AAC1C,SAASC,UAAU,QAAQ,uBAAoB;AAC/C;AACA;AACA,SAASC,WAAW,QAAQ,wBAAqB;AACjD;AACA;AACA;AACA;AACA,SACEC,gBAAgB,EAChBC,eAAe,EACfC,aAAa,QACR,0CAAuC;AAC9C,SAASC,kBAAkB,QAAQ,+BAA4B;AAC/D,SAASC,iBAAiB,QAAQ,8BAA2B;AAE7D,SAASC,eAAe,QAAQ,4BAAyB;AACzD,SAASC,kBAAkB,QAAQ,+BAA4B;AAC/D,SAASC,eAAe,QAAQ,4BAAyB;AACzD,SAASC,uBAAuB,QAAQ,yCAAsC;AAG9E;AACA;;AAEA;AACA,SACEC,oBAAoB,EACpBC,0BAA0B,EAC1BC,2BAA2B,QACtB,6BAA0B;AAGjC;AACA,SACEC,SAAS,EACTC,wBAAwB,EACxBC,qBAAqB,EACrBC,wBAAwB,EACxBC,uBAAuB,EACvBC,wBAAwB,EACxBC,yBAAyB,EACzBC,wBAAwB,EACxBC,yBAAyB,EACzBC,8BAA8B,EAC9BC,4BAA4B,QACvB,8BAA2B;AAClC,SACEC,gBAAgB,EAChBC,iBAAiB,EACjBC,qBAAqB,EACrBC,8BAA8B,EAC9BC,8BAA8B,QACzB,8BAA2B;AAOlC;AACA,SAASC,YAAY,QAAQ,uBAAoB;;AAEjD;AACA,SACEC,eAAe,EACfC,qBAAqB,EACrBC,uBAAuB,EACvBC,mBAAmB,QACd,0BAAuB","ignoreList":[]}

package/lib/module/ui/hooks/useAccountTheme.js

@@ -0,0 +1,178 @@
+"use strict";
+
+/**
+ * useAccountTheme / useAccountThemeControls
+ *
+ * The Oxy account carries a portable theme (`user.themePreference`: a mode and
+ * a colour preset) that every Oxy app can wear. The COLOUR is the account
+ * colour and always applies (`useAccountColor`). Whether an app also follows
+ * the account's MODE is the viewer's choice per device: the theme SOURCE.
+ *
+ * - `account` (the default): the account's mode is applied to Bloom, and a mode
+ *   chosen here is written back to the account for the other Oxy apps.
+ * - `app`: the mode stays on this device; nothing is written to the account.
+ *
+ * The source is a local preference, never sent anywhere. On web it is read
+ * synchronously, so the first paint already knows it; on native it resolves
+ * from AsyncStorage right after mount. Bloom's own persistence still paints the
+ * last theme instantly on cold boot, so the account theme lands without a flash
+ * once the session resolves.
+ */
+
+import { useCallback, useEffect } from 'react';
+import { create } from 'zustand';
+import { logger } from '@oxy.so/core';
+import { useBloomTheme } from '@oxy.so/bloom/theme';
+import { createPlatformStorage, isReactNative } from "../utils/storageHelpers.js";
+import { resolveAccountColor, useAccountColor } from "./useAccountColor.js";
+import { useAuth } from "./useAuth.js";
+import { useUpdateProfile } from "./mutations/useAccountMutations.js";
+
+/** Where the app's theme MODE comes from on this device. */
+
+const THEME_SOURCE_KEY = 'oxy.theme.source';
+function normalizeSource(stored) {
+  return stored === 'app' ? 'app' : 'account';
+}
+
+/**
+ * Bloom's richer mode set onto the portable subset the account stores
+ * (`adaptive` has no cross-app meaning, so it is `system`).
+ */
+function toPortableMode(mode) {
+  return mode === 'light' || mode === 'dark' ? mode : 'system';
+}
+
+/** Web reads `localStorage` synchronously; native resolves in `hydrate`. */
+function readInitialSource() {
+  if (isReactNative() || typeof window === 'undefined') {
+    return {
+      source: 'account',
+      hydrated: false
+    };
+  }
+  try {
+    return {
+      source: normalizeSource(window.localStorage?.getItem(THEME_SOURCE_KEY)),
+      hydrated: true
+    };
+  } catch {
+    // A sandboxed document's storage getter throws: no stored choice.
+    return {
+      source: 'account',
+      hydrated: true
+    };
+  }
+}
+const useThemeSourceStore = create((set, get) => ({
+  ...readInitialSource(),
+  setSource(source) {
+    set({
+      source,
+      hydrated: true
+    });
+    void createPlatformStorage().then(storage => storage.setItem(THEME_SOURCE_KEY, source)).catch(() => undefined);
+  },
+  async hydrate() {
+    if (get().hydrated) return;
+    const stored = await createPlatformStorage().then(storage => storage.getItem(THEME_SOURCE_KEY)).catch(() => null);
+    // A choice made while storage was being read wins over the stored one.
+    if (!get().hydrated) set({
+      source: normalizeSource(stored),
+      hydrated: true
+    });
+  }
+}));
+
+/**
+ * Apply the account theme to Bloom: the colour always (through
+ * `useAccountColor`, which `canUse` can narrow), the mode while this device's
+ * source is `account`. Mount ONCE, inside `OxyProvider` and Bloom's theme
+ * provider.
+ */
+export function useAccountTheme({
+  canUse
+} = {}) {
+  const {
+    isAuthenticated,
+    user
+  } = useAuth();
+  const source = useThemeSourceStore(state => state.source);
+  const hydrated = useThemeSourceStore(state => state.hydrated);
+  const hydrate = useThemeSourceStore(state => state.hydrate);
+  const {
+    setMode
+  } = useBloomTheme();
+  useAccountColor({
+    canUse
+  });
+  useEffect(() => {
+    void hydrate();
+  }, [hydrate]);
+  const accountMode = user?.themePreference?.mode;
+  useEffect(() => {
+    if (!hydrated || !isAuthenticated || source !== 'account' || !accountMode) return;
+    setMode(accountMode);
+  }, [hydrated, isAuthenticated, source, accountMode, setMode]);
+}
+/**
+ * Source-aware theme mode changes for a settings screen. Bloom changes at once;
+ * on the `account` source the account's portable theme follows. Without a
+ * usable session the effective source is `app`, so changes stay local, and the
+ * stored choice applies again once signed in. The colour is chosen with
+ * `useAccountColorSave`.
+ */
+export function useAccountThemeControls() {
+  const {
+    user,
+    canUsePrivateApi
+  } = useAuth();
+  const {
+    mode,
+    colorPreset,
+    setMode
+  } = useBloomTheme();
+  const {
+    mutateAsync
+  } = useUpdateProfile();
+  const storedSource = useThemeSourceStore(state => state.source);
+  const setSource = useThemeSourceStore(state => state.setSource);
+  const source = canUsePrivateApi ? storedSource : 'app';
+  const persist = useCallback(async next => {
+    await mutateAsync({
+      themePreference: {
+        mode: toPortableMode(next.mode),
+        colorPreset: next.colorPreset
+      }
+    });
+  }, [mutateAsync]);
+  const changeThemeMode = useCallback(async nextMode => {
+    setMode(nextMode);
+    if (source === 'account') await persist({
+      mode: nextMode,
+      colorPreset
+    });
+  }, [setMode, source, persist, colorPreset]);
+  const accountTheme = user?.themePreference;
+  const hasAccountTheme = !!accountTheme && resolveAccountColor({
+    themePreference: accountTheme
+  }) !== null;
+  const changeThemeSource = useCallback(nextSource => {
+    setSource(nextSource);
+    // An existing account theme is applied by `useAccountTheme`; only an
+    // account without one is seeded, from what the viewer sees now.
+    if (nextSource !== 'account' || !canUsePrivateApi || hasAccountTheme) return;
+    persist({
+      mode,
+      colorPreset
+    }).catch(error => {
+      logger.error('Failed to seed the account theme', error);
+    });
+  }, [setSource, canUsePrivateApi, hasAccountTheme, persist, mode, colorPreset]);
+  return {
+    source,
+    changeThemeSource,
+    changeThemeMode
+  };
+}
+//# sourceMappingURL=useAccountTheme.js.map

package/lib/module/ui/hooks/useAccountTheme.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useCallback","useEffect","create","logger","useBloomTheme","createPlatformStorage","isReactNative","resolveAccountColor","useAccountColor","useAuth","useUpdateProfile","THEME_SOURCE_KEY","normalizeSource","stored","toPortableMode","mode","readInitialSource","window","source","hydrated","localStorage","getItem","useThemeSourceStore","set","get","setSource","then","storage","setItem","catch","undefined","hydrate","useAccountTheme","canUse","isAuthenticated","user","state","setMode","accountMode","themePreference","useAccountThemeControls","canUsePrivateApi","colorPreset","mutateAsync","storedSource","persist","next","changeThemeMode","nextMode","accountTheme","hasAccountTheme","changeThemeSource","nextSource","error"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAccountTheme.ts"],"mappings":"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","ignoreList":[]}