@oxyhq/bloom 0.82.0 → 0.84.0

package/src/theme/color-presets.ts

@@ -31,6 +31,20 @@ export type AppColorName =
  * maps those roles onto Bloom's canonical token names. A user-picked colour
  * flows through the identical path — a preset is just a fixed seed.
  */
+/**
+ * Why a preset is not offered to every user. Absent means it is.
+ *
+ * The two are NOT interchangeable and must not collapse back into one list: a
+ * `handle` preset belongs to a specific account and cannot be bought, while a
+ * `premium` one is exactly what is bought. Conflating them is how the picker
+ * came to offer both of Oxy's reserved brand colours to everybody.
+ */
+export type ColorPresetGate =
+  /** Reserved for the account whose brand it is — not purchasable. */
+  | 'handle'
+  /** Sold with a subscription. */
+  | 'premium';
+
 export interface AppColorPreset {
   name: AppColorName;
   /** The brand seed colour, `#rrggbb`. Also the value the colour picker matches. */
@@ -51,6 +65,24 @@ export interface AppColorPreset {
    * {@link AppColorPreset.secondaryHex} for the tertiary palette.
    */
   tertiaryHex?: string;
+  /**
+   * Force the fill to a tone a WHITE label fits, in BOTH modes — overriding the
+   * budget that otherwise lets an already-light seed keep its own tone in dark
+   * and take a black label.
+   *
+   * It has to be declared, because it cannot be derived: `yellow` (seed tone 86)
+   * wants to come down to a deep gold with white on it, and `faircoin` (tone 90)
+   * wants to stay a bright lime with black on it. Two seeds four tones apart,
+   * opposite answers — nothing in the hex distinguishes them, only what the brand
+   * is for.
+   */
+  label?: 'white';
+  /**
+   * Who may pick this preset. Absent = everyone. Bloom only DECLARES the gate;
+   * whether a given viewer satisfies it is the consuming app's question, since
+   * only the app knows who is signed in and what they pay for.
+   */
+  gate?: ColorPresetGate;
 }
 
 /**
@@ -63,19 +95,16 @@ export type PresetTokens = Record<string, string>;
 
 export const APP_COLOR_NAMES: readonly AppColorName[] = ['teal', 'blue', 'green', 'yellow', 'red', 'purple', 'pink', 'sky', 'orange', 'mint', 'oxy', 'faircoin', 'pumpkin', 'gray', 'brown', 'peach', 'rose', 'mono'];
 
-/** Premium-exclusive presets, hidden from the standard color picker. */
-export const PREMIUM_COLOR_NAMES: readonly AppColorName[] = ['oxy', 'faircoin'];
-
 export const HEX_TO_APP_COLOR: Record<string, AppColorName> = {
   '#005c67': 'teal',
-  '#0085fe': 'blue',
+  '#1d9bf0': 'blue',
   '#10b981': 'green',
-  '#fcdc00': 'yellow',
+  '#ffd400': 'yellow',
   '#ef4444': 'red',
   '#b866ff': 'purple',
-  '#ff3c7f': 'pink',
+  '#f91880': 'pink',
   '#03a9f4': 'sky',
-  '#ff5722': 'orange',
+  '#ff7a00': 'orange',
   '#14b8a6': 'mint',
   '#c46ede': 'oxy',
   '#9ffb50': 'faircoin',
@@ -99,12 +128,12 @@ export function hexToAppColorName(hex: string): AppColorName {
  */
 export const APP_COLOR_PRESETS: Record<AppColorName, AppColorPreset> = {
   teal: { name: 'teal', hex: '#005c67', variant: 'vivid' },
-  blue: { name: 'blue', hex: '#0085fe', variant: 'vivid' },
+  blue: { name: 'blue', hex: '#1d9bf0', variant: 'vivid' },
   green: { name: 'green', hex: '#10b981', variant: 'vivid' },
-  yellow: { name: 'yellow', hex: '#fcdc00', variant: 'vivid' },
+  yellow: { name: 'yellow', hex: '#ffd400', variant: 'vivid', label: 'white' },
   red: { name: 'red', hex: '#ef4444', variant: 'vivid' },
   purple: { name: 'purple', hex: '#b866ff', variant: 'vivid' },
-  pink: { name: 'pink', hex: '#ff3c7f', variant: 'vivid' },
+  pink: { name: 'pink', hex: '#f91880', variant: 'vivid' },
   sky: { name: 'sky', hex: '#03a9f4', variant: 'vivid' },
   // Deliberately NOT Tailwind's orange-500 (`#f97316`). That seed sits at HCT hue
   // 46, which reads as orange only because it is also light: at hue 46 the sRGB
@@ -112,10 +141,10 @@ export const APP_COLOR_PRESETS: Record<AppColorName, AppColorPreset> = {
   // the brand fill resolved to `rgb(177 76 0)` — a brown. Hue 34 carries a chroma
   // of 84 at that same tone, with the same white label and the same contrast
   // headroom, so the fill reads as orange instead of paying for the hue twice.
-  orange: { name: 'orange', hex: '#ff5722', variant: 'vivid' },
+  orange: { name: 'orange', hex: '#ff7a00', variant: 'vivid' },
   mint: { name: 'mint', hex: '#14b8a6', variant: 'vivid' },
-  oxy: { name: 'oxy', hex: '#c46ede', variant: 'vivid' },
-  faircoin: { name: 'faircoin', hex: '#9ffb50', variant: 'vivid' },
+  oxy: { name: 'oxy', hex: '#c46ede', variant: 'vivid', gate: 'handle' },
+  faircoin: { name: 'faircoin', hex: '#9ffb50', variant: 'vivid', gate: 'handle' },
   pumpkin: { name: 'pumpkin', hex: '#ff9800', variant: 'vivid' },
   gray: { name: 'gray', hex: '#607d8b', variant: 'vivid' },
   brown: { name: 'brown', hex: '#813519', variant: 'vivid' },
@@ -127,5 +156,28 @@ export const APP_COLOR_PRESETS: Record<AppColorName, AppColorPreset> = {
    * seed with none, so a user who picks a grey in the colour wheel lands here too
    * rather than on a nearly-grey approximation.
    */
-  mono: { name: 'mono', hex: '#000000', variant: 'monochrome' },
+  mono: { name: 'mono', hex: '#000000', variant: 'monochrome', gate: 'premium' },
 };
+
+/**
+ * The three gate groups, DERIVED from the presets rather than listed again, so a
+ * preset cannot be gated in one place and offered in another. Together they
+ * partition {@link APP_COLOR_NAMES} exactly — asserted in
+ * `__tests__/color-preset-gates.test.ts`, since a preset silently missing from
+ * every group would simply vanish from a picker with no error anywhere.
+ *
+ * A consumer builds its visible list from these; it must NOT start from
+ * `APP_COLOR_NAMES` and add the unlocked ones, which yields the gated presets to
+ * everybody and duplicates whatever the viewer did unlock.
+ */
+const namesGatedBy = (gate: ColorPresetGate | undefined): readonly AppColorName[] =>
+  APP_COLOR_NAMES.filter((name) => APP_COLOR_PRESETS[name].gate === gate);
+
+/** Available to every user, signed in or not. */
+export const FREE_COLOR_NAMES: readonly AppColorName[] = namesGatedBy(undefined);
+
+/** Reserved for the account whose brand it is (`oxy`, `faircoin`) — not for sale. */
+export const HANDLE_COLOR_NAMES: readonly AppColorName[] = namesGatedBy('handle');
+
+/** Sold with a subscription. */
+export const PREMIUM_COLOR_NAMES: readonly AppColorName[] = namesGatedBy('premium');

package/src/theme/index.ts

@@ -40,9 +40,11 @@ export type {
 export { useNavigationTheme } from './use-navigation-theme';
 export type { NavigationTheme, NavigationThemeFont } from './use-navigation-theme';
 export type { Theme, ThemeColors, ThemeMode, ThemeGradient, ThemeGradients } from './types';
-export type { AppColorName, AppColorPreset, PresetTokens } from './color-presets';
+export type { AppColorName, AppColorPreset, ColorPresetGate, PresetTokens } from './color-presets';
 export {
   APP_COLOR_NAMES,
+  FREE_COLOR_NAMES,
+  HANDLE_COLOR_NAMES,
   PREMIUM_COLOR_NAMES,
   APP_COLOR_PRESETS,
   HEX_TO_APP_COLOR,