@oxy.so/bloom 3.6.0 → 4.1.0

package/lib/module/map-controls/MapCompass.js

@@ -0,0 +1,85 @@
+"use strict";
+
+import React, { memo, useContext } from 'react';
+import { View } from 'react-native';
+import { ButtonGroupItem } from "../button-group/index.js";
+import { GlassIsland } from "../glass/index.js";
+import { RiCompass3Line } from "../icons/remix/RiCompass3Line.js";
+import { MAP_CONTROL_BOX, MAP_CONTROLS_GEOMETRY } from "./constants.js";
+import { MapHeadingContext } from "./context.js";
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * The compass that floats over a map: a needle that keeps pointing at north
+ * while the map turns under it, and a press that puts the map back.
+ *
+ *   island   `GlassIsland` — one translucent capsule over content Bloom does
+ *            not own. It mounts the `ControlSurface` the item inside reads, so
+ *            the button paints flush with no `variant` written on it.
+ *   control  `ButtonGroupItem`, the island-aware control, at the 44 map rung.
+ *   needle   `RiCompass3Line` turned by MINUS the heading. The map rotates
+ *            clockwise by `heading`; the needle rotates back by the same amount
+ *            and so stays pointing north, which is the only thing a compass is
+ *            for.
+ *
+ * IT HIDES ITSELF AT NORTH by default. A compass on a map that is already
+ * pointing north is a control whose press changes nothing, and a reader has to
+ * press it to find that out.
+ */
+
+/**
+ * The needle, at module scope so its identity never changes — see
+ * `context.ts` for why the heading arrives through a context rather than
+ * through a component built per frame.
+ */
+const CompassNeedle = ({
+  width,
+  height,
+  fill
+}) => {
+  const heading = useContext(MapHeadingContext);
+  return /*#__PURE__*/_jsx(View, {
+    style: {
+      transform: [{
+        rotate: `${-heading}deg`
+      }]
+    },
+    children: /*#__PURE__*/_jsx(RiCompass3Line, {
+      width: width,
+      height: height,
+      fill: fill
+    })
+  });
+};
+CompassNeedle.displayName = 'CompassNeedle';
+function MapCompassComponent({
+  heading,
+  onPress,
+  hideAtNorth = true,
+  disabled = false,
+  accessibilityLabel,
+  style,
+  testID
+}) {
+  const pointsNorth = Math.abs((heading % 360 + 360) % 360) <= MAP_CONTROLS_GEOMETRY.northTolerance;
+  if (hideAtNorth && pointsNorth) return null;
+  const name = accessibilityLabel ?? `Facing ${Math.round(heading)} degrees. Reset to north`;
+  return /*#__PURE__*/_jsx(MapHeadingContext.Provider, {
+    value: heading,
+    children: /*#__PURE__*/_jsx(GlassIsland, {
+      style: style,
+      testID: testID,
+      children: /*#__PURE__*/_jsx(ButtonGroupItem, {
+        iconOnly: true,
+        leadingIcon: CompassNeedle,
+        accessibilityLabel: name,
+        onPress: onPress,
+        disabled: disabled,
+        style: MAP_CONTROL_BOX,
+        testID: testID ? `${testID}-button` : undefined
+      })
+    })
+  });
+}
+export const MapCompass = /*#__PURE__*/memo(MapCompassComponent);
+MapCompass.displayName = 'MapCompass';
+//# sourceMappingURL=MapCompass.js.map

package/lib/module/map-controls/MapCompass.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["React","memo","useContext","View","ButtonGroupItem","GlassIsland","RiCompass3Line","MAP_CONTROL_BOX","MAP_CONTROLS_GEOMETRY","MapHeadingContext","jsx","_jsx","CompassNeedle","width","height","fill","heading","style","transform","rotate","children","displayName","MapCompassComponent","onPress","hideAtNorth","disabled","accessibilityLabel","testID","pointsNorth","Math","abs","northTolerance","name","round","Provider","value","iconOnly","leadingIcon","undefined","MapCompass"],"sourceRoot":"../../../src","sources":["map-controls/MapCompass.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,IAAI,EAAEC,UAAU,QAAQ,OAAO;AAC/C,SAASC,IAAI,QAAQ,cAAc;AAEnC,SAASC,eAAe,QAAQ,0BAAiB;AACjD,SAASC,WAAW,QAAQ,mBAAU;AACtC,SAASC,cAAc,QAAQ,kCAA+B;AAE9D,SAASC,eAAe,EAAEC,qBAAqB,QAAQ,gBAAa;AACpE,SAASC,iBAAiB,QAAQ,cAAW;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAG9C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA,MAAMC,aAAiC,GAAGA,CAAC;EAAEC,KAAK;EAAEC,MAAM;EAAEC;AAAK,CAAC,KAAK;EACrE,MAAMC,OAAO,GAAGd,UAAU,CAACO,iBAAiB,CAAC;EAC7C,oBACEE,IAAA,CAACR,IAAI;IAACc,KAAK,EAAE;MAAEC,SAAS,EAAE,CAAC;QAAEC,MAAM,EAAE,GAAG,CAACH,OAAO;MAAM,CAAC;IAAE,CAAE;IAAAI,QAAA,eACzDT,IAAA,CAACL,cAAc;MAACO,KAAK,EAAEA,KAAM;MAACC,MAAM,EAAEA,MAAO;MAACC,IAAI,EAAEA;IAAK,CAAE;EAAC,CACxD,CAAC;AAEX,CAAC;AACDH,aAAa,CAACS,WAAW,GAAG,eAAe;AAE3C,SAASC,mBAAmBA,CAAC;EAC3BN,OAAO;EACPO,OAAO;EACPC,WAAW,GAAG,IAAI;EAClBC,QAAQ,GAAG,KAAK;EAChBC,kBAAkB;EAClBT,KAAK;EACLU;AACe,CAAC,EAAE;EAClB,MAAMC,WAAW,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAEd,OAAO,GAAG,GAAG,GAAI,GAAG,IAAI,GAAG,CAAC,IAAIR,qBAAqB,CAACuB,cAAc;EACnG,IAAIP,WAAW,IAAII,WAAW,EAAE,OAAO,IAAI;EAE3C,MAAMI,IAAI,GAAGN,kBAAkB,IAAI,UAAUG,IAAI,CAACI,KAAK,CAACjB,OAAO,CAAC,0BAA0B;EAE1F,oBACEL,IAAA,CAACF,iBAAiB,CAACyB,QAAQ;IAACC,KAAK,EAAEnB,OAAQ;IAAAI,QAAA,eACzCT,IAAA,CAACN,WAAW;MAACY,KAAK,EAAEA,KAAM;MAACU,MAAM,EAAEA,MAAO;MAAAP,QAAA,eACxCT,IAAA,CAACP,eAAe;QACdgC,QAAQ;QACRC,WAAW,EAAEzB,aAAc;QAC3Bc,kBAAkB,EAAEM,IAAK;QACzBT,OAAO,EAAEA,OAAQ;QACjBE,QAAQ,EAAEA,QAAS;QACnBR,KAAK,EAAEV,eAAgB;QACvBoB,MAAM,EAAEA,MAAM,GAAG,GAAGA,MAAM,SAAS,GAAGW;MAAU,CACjD;IAAC,CACS;EAAC,CACY,CAAC;AAEjC;AAEA,OAAO,MAAMC,UAAU,gBAAGtC,IAAI,CAACqB,mBAAmB,CAAC;AACnDiB,UAAU,CAAClB,WAAW,GAAG,YAAY","ignoreList":[]}

package/lib/module/map-controls/MapControls.js

@@ -0,0 +1,131 @@
+"use strict";
+
+import React, { memo } from 'react';
+import { View } from 'react-native';
+import { ButtonGroupItem } from "../button-group/index.js";
+import { GlassIsland } from "../glass/index.js";
+import { RiAddLine } from "../icons/remix/RiAddLine.js";
+import { RiBox3Line } from "../icons/remix/RiBox3Line.js";
+import { RiFocus3Line } from "../icons/remix/RiFocus3Line.js";
+import { RiSubtractLine } from "../icons/remix/RiSubtractLine.js";
+import { MAP_CONTROL_BOX, MAP_CONTROLS_GEOMETRY } from "./constants.js";
+import { MapCompass } from "./MapCompass.js";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * The chrome that floats over a map — locate, compass, zoom, tilt — as a
+ * column of translucent capsules.
+ *
+ *   island   every group is a `GlassIsland`: rung 1 of the surface ladder at
+ *            the chrome alpha, with the material's own hairline and shadow.
+ *            One capsule per GROUP, so the column reads as separate controls
+ *            rather than as one bar — which is exactly what the island was
+ *            written for.
+ *   control  `ButtonGroupItem` at 44 square. It is Bloom's island-aware
+ *            control: it reads the `material` the island publishes through
+ *            `ControlSurface` and paints flush, with no `variant` written on
+ *            it, and it carries a toggle's `aria-pressed` and native selected
+ *            state in one prop.
+ *   zoom     ONE island, two items, laid out in a column. The island's `style`
+ *            is where that is said; nothing else about it changes.
+ *   stack    44 controls, 8 apart, hugging whichever edge `align` names.
+ *
+ * WHY NOT `FrostedIconButton`: it is one of the three glass materials Bloom
+ * grew independently, and `glass/` exists so there is not a fourth. Two glass
+ * recipes side by side in one stack is the drift the island was written to
+ * end, so the whole stack is one material. A single frosted button over a
+ * photograph is still the right control where there is no island.
+ *
+ * WHAT THIS DOES NOT DO: it never touches a map. Every control is a callback,
+ * every state is a prop, and there is no engine, no projection and no tile
+ * here — the app owns the map and tells the chrome what it is doing.
+ *
+ * The `MapLayerPicker` is not a prop: it is an island of its own, placed in
+ * `children`, so an app can put it above the stack, below it, or somewhere
+ * else entirely without this component growing a placement vocabulary.
+ */
+function MapControlsComponent({
+  onLocate,
+  following,
+  heading,
+  onResetNorth,
+  hideCompassAtNorth = true,
+  onZoomIn,
+  onZoomOut,
+  canZoomIn = true,
+  canZoomOut = true,
+  onTiltChange,
+  tilted,
+  children,
+  align = 'end',
+  labels,
+  style,
+  testID
+}) {
+  const id = part => testID ? `${testID}-${part}` : undefined;
+  const zoomLabel = labels?.zoom ?? 'Zoom';
+  const zoomable = onZoomIn !== undefined && onZoomOut !== undefined;
+  return /*#__PURE__*/_jsxs(View, {
+    role: "group",
+    accessibilityLabel: labels?.group ?? 'Map controls',
+    testID: testID,
+    style: [{
+      alignItems: align === 'start' ? 'flex-start' : 'flex-end',
+      gap: MAP_CONTROLS_GEOMETRY.gap
+    }, style],
+    children: [onLocate ? /*#__PURE__*/_jsx(GlassIsland, {
+      testID: id('locate-island'),
+      children: /*#__PURE__*/_jsx(ButtonGroupItem, {
+        iconOnly: true,
+        leadingIcon: RiFocus3Line,
+        selected: following,
+        accessibilityLabel: following ? labels?.following ?? 'Stop following my location' : labels?.locate ?? 'Show my location',
+        onPress: onLocate,
+        style: MAP_CONTROL_BOX,
+        testID: id('locate')
+      })
+    }) : null, onResetNorth && heading !== undefined ? /*#__PURE__*/_jsx(MapCompass, {
+      heading: heading,
+      onPress: onResetNorth,
+      hideAtNorth: hideCompassAtNorth,
+      testID: id('compass')
+    }) : null, zoomable ? /*#__PURE__*/_jsxs(GlassIsland, {
+      role: "group",
+      accessibilityLabel: zoomLabel,
+      style: {
+        flexDirection: 'column'
+      },
+      testID: id('zoom'),
+      children: [/*#__PURE__*/_jsx(ButtonGroupItem, {
+        iconOnly: true,
+        leadingIcon: RiAddLine,
+        accessibilityLabel: labels?.zoomIn ?? 'Zoom in',
+        onPress: onZoomIn,
+        disabled: !canZoomIn,
+        style: MAP_CONTROL_BOX,
+        testID: id('zoom-in')
+      }), /*#__PURE__*/_jsx(ButtonGroupItem, {
+        iconOnly: true,
+        leadingIcon: RiSubtractLine,
+        accessibilityLabel: labels?.zoomOut ?? 'Zoom out',
+        onPress: onZoomOut,
+        disabled: !canZoomOut,
+        style: MAP_CONTROL_BOX,
+        testID: id('zoom-out')
+      })]
+    }) : null, onTiltChange ? /*#__PURE__*/_jsx(GlassIsland, {
+      testID: id('tilt-island'),
+      children: /*#__PURE__*/_jsx(ButtonGroupItem, {
+        iconOnly: true,
+        leadingIcon: RiBox3Line,
+        selected: tilted ?? false,
+        accessibilityLabel: tilted ? labels?.tiltOff ?? 'Flatten the map' : labels?.tilt ?? 'Tilt the map',
+        onPress: () => onTiltChange(!tilted),
+        style: MAP_CONTROL_BOX,
+        testID: id('tilt')
+      })
+    }) : null, children]
+  });
+}
+export const MapControls = /*#__PURE__*/memo(MapControlsComponent);
+MapControls.displayName = 'MapControls';
+//# sourceMappingURL=MapControls.js.map

package/lib/module/map-controls/MapControls.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["React","memo","View","ButtonGroupItem","GlassIsland","RiAddLine","RiBox3Line","RiFocus3Line","RiSubtractLine","MAP_CONTROL_BOX","MAP_CONTROLS_GEOMETRY","MapCompass","jsx","_jsx","jsxs","_jsxs","MapControlsComponent","onLocate","following","heading","onResetNorth","hideCompassAtNorth","onZoomIn","onZoomOut","canZoomIn","canZoomOut","onTiltChange","tilted","children","align","labels","style","testID","id","part","undefined","zoomLabel","zoom","zoomable","role","accessibilityLabel","group","alignItems","gap","iconOnly","leadingIcon","selected","locate","onPress","hideAtNorth","flexDirection","zoomIn","disabled","zoomOut","tiltOff","tilt","MapControls","displayName"],"sourceRoot":"../../../src","sources":["map-controls/MapControls.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/map-controls/MapLayerPicker.js

@@ -0,0 +1,105 @@
+"use strict";
+
+import React, { memo } from 'react';
+import { ButtonGroupItem } from "../button-group/index.js";
+import { DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuContent, DropdownMenuLabel, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuSeparator, DropdownMenuTrigger } from '../dropdown-menu';
+import { GlassIsland } from "../glass/index.js";
+import { RiStackLine } from "../icons/remix/RiStackLine.js";
+import { MAP_CONTROL_BOX } from "./constants.js";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * What the map is DRAWN as, and what is drawn ON it.
+ *
+ * Two vocabularies in one menu, because they are two questions a reader asks in
+ * the same breath and they answer differently:
+ *
+ *   map types   exactly one — standard, satellite, transit. A
+ *               `DropdownMenuRadioGroup`, so the announced tree is a radio
+ *               group and the chosen one carries `aria-checked`.
+ *   overlays    any number — traffic, bike lanes. `DropdownMenuCheckboxItem`s,
+ *               each its own checkbox.
+ *
+ * Neither is a control this family wrote. The rows, the indicators, the
+ * keyboard handling, the dismissal and the anchoring are `dropdown-menu`'s; the
+ * trigger is a `ButtonGroupItem` composed through `asChild`, which is why it
+ * announces its own expanded state; and the capsule it sits in is the same
+ * `GlassIsland` every other map control sits in, so the picker lands in the
+ * stack as one more island rather than as a different kind of thing.
+ */
+function MapLayerPickerComponent({
+  layers,
+  layerId,
+  onLayerChange,
+  overlays,
+  activeOverlayIds,
+  onOverlayChange,
+  icon = RiStackLine,
+  disabled = false,
+  open,
+  defaultOpen,
+  onOpenChange,
+  labels,
+  style,
+  testID
+}) {
+  const triggerLabel = labels?.trigger ?? 'Map layers';
+  const layersLabel = labels?.layers ?? 'Map';
+  const overlaysLabel = labels?.overlays ?? 'Overlays';
+  const active = new Set(activeOverlayIds ?? []);
+  return /*#__PURE__*/_jsxs(DropdownMenu, {
+    open: open,
+    defaultOpen: defaultOpen,
+    onOpenChange: onOpenChange,
+    children: [/*#__PURE__*/_jsx(GlassIsland, {
+      style: style,
+      testID: testID,
+      children: /*#__PURE__*/_jsx(DropdownMenuTrigger, {
+        asChild: true,
+        label: triggerLabel,
+        disabled: disabled,
+        children: /*#__PURE__*/_jsx(ButtonGroupItem, {
+          iconOnly: true,
+          leadingIcon: icon,
+          accessibilityLabel: triggerLabel,
+          disabled: disabled,
+          style: MAP_CONTROL_BOX,
+          testID: testID ? `${testID}-trigger` : undefined
+        })
+      })
+    }), /*#__PURE__*/_jsxs(DropdownMenuContent, {
+      label: triggerLabel,
+      testID: testID ? `${testID}-content` : undefined,
+      children: [/*#__PURE__*/_jsx(DropdownMenuLabel, {
+        children: layersLabel
+      }), /*#__PURE__*/_jsx(DropdownMenuRadioGroup, {
+        value: layerId,
+        onValueChange: next => onLayerChange?.(next),
+        children: layers.map(layer => /*#__PURE__*/_jsx(DropdownMenuRadioItem, {
+          value: layer.id,
+          trailing: layer.icon ? /*#__PURE__*/_jsx(layer.icon, {
+            width: 16,
+            height: 16
+          }) : undefined,
+          testID: testID ? `${testID}-layer-${layer.id}` : undefined,
+          children: layer.label
+        }, layer.id))
+      }), overlays && overlays.length > 0 ? /*#__PURE__*/_jsxs(_Fragment, {
+        children: [/*#__PURE__*/_jsx(DropdownMenuSeparator, {}), /*#__PURE__*/_jsx(DropdownMenuLabel, {
+          children: overlaysLabel
+        }), overlays.map(overlay => /*#__PURE__*/_jsx(DropdownMenuCheckboxItem, {
+          checked: active.has(overlay.id),
+          onCheckedChange: next => onOverlayChange?.(overlay.id, next),
+          trailing: overlay.icon ? /*#__PURE__*/_jsx(overlay.icon, {
+            width: 16,
+            height: 16
+          }) : undefined,
+          testID: testID ? `${testID}-overlay-${overlay.id}` : undefined,
+          children: overlay.label
+        }, overlay.id))]
+      }) : null]
+    })]
+  });
+}
+export const MapLayerPicker = /*#__PURE__*/memo(MapLayerPickerComponent);
+MapLayerPicker.displayName = 'MapLayerPicker';
+//# sourceMappingURL=MapLayerPicker.js.map

package/lib/module/map-controls/MapLayerPicker.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["React","memo","ButtonGroupItem","DropdownMenu","DropdownMenuCheckboxItem","DropdownMenuContent","DropdownMenuLabel","DropdownMenuRadioGroup","DropdownMenuRadioItem","DropdownMenuSeparator","DropdownMenuTrigger","GlassIsland","RiStackLine","MAP_CONTROL_BOX","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","MapLayerPickerComponent","layers","layerId","onLayerChange","overlays","activeOverlayIds","onOverlayChange","icon","disabled","open","defaultOpen","onOpenChange","labels","style","testID","triggerLabel","trigger","layersLabel","overlaysLabel","active","Set","children","asChild","label","iconOnly","leadingIcon","accessibilityLabel","undefined","value","onValueChange","next","map","layer","id","trailing","width","height","length","overlay","checked","has","onCheckedChange","MapLayerPicker","displayName"],"sourceRoot":"../../../src","sources":["map-controls/MapLayerPicker.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/map-controls/constants.js

@@ -0,0 +1,24 @@
+"use strict";
+
+/**
+ * 44 is the target, not the 34 the button group's `medium` rung draws.
+ *
+ * A group rung is sized for a toolbar standing beside other chrome, where the
+ * row as a whole is the target a finger aims at. A map control is a LONE
+ * circle over a moving map with a finger already on the glass, and 34 is under
+ * every platform's minimum. The item takes the size through its own `style`,
+ * which is the override `ButtonGroupItem` publishes — nothing about its fill,
+ * its hover, its press or its focus ring changes.
+ */
+export const MAP_CONTROLS_GEOMETRY = {
+  control: 44,
+  gap: 8,
+  northTolerance: 0.5
+};
+
+/** The square every control in the stack takes. */
+export const MAP_CONTROL_BOX = {
+  width: MAP_CONTROLS_GEOMETRY.control,
+  height: MAP_CONTROLS_GEOMETRY.control
+};
+//# sourceMappingURL=constants.js.map

package/lib/module/map-controls/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MAP_CONTROLS_GEOMETRY","control","gap","northTolerance","MAP_CONTROL_BOX","width","height"],"sourceRoot":"../../../src","sources":["map-controls/constants.ts"],"mappings":";;AAYA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,qBAA0C,GAAG;EACxDC,OAAO,EAAE,EAAE;EACXC,GAAG,EAAE,CAAC;EACNC,cAAc,EAAE;AAClB,CAAC;;AAED;AACA,OAAO,MAAMC,eAAe,GAAG;EAC7BC,KAAK,EAAEL,qBAAqB,CAACC,OAAO;EACpCK,MAAM,EAAEN,qBAAqB,CAACC;AAChC,CAAU","ignoreList":[]}

package/lib/module/map-controls/context.js

@@ -0,0 +1,16 @@
+"use strict";
+
+import { createContext } from 'react';
+
+/**
+ * The map's heading, in degrees clockwise from north, for the compass needle.
+ *
+ * WHY A CONTEXT FOR ONE NUMBER: `ButtonGroupItem` takes its glyph as a
+ * COMPONENT (`leadingIcon={RiCompass3Line}`), and a needle has to rotate. A
+ * component built from the heading would be a new component TYPE on every
+ * degree, so React would unmount and remount the SVG on every frame of a map
+ * rotation. A module-scope component reading the heading from here keeps one
+ * identity for the life of the control, and only the needle re-renders.
+ */
+export const MapHeadingContext = /*#__PURE__*/createContext(0);
+//# sourceMappingURL=context.js.map

package/lib/module/map-controls/context.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createContext","MapHeadingContext"],"sourceRoot":"../../../src","sources":["map-controls/context.ts"],"mappings":";;AAAA,SAASA,aAAa,QAAQ,OAAO;;AAErC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,iBAAiB,gBAAGD,aAAa,CAAC,CAAC,CAAC","ignoreList":[]}

package/lib/module/map-controls/index.js

@@ -0,0 +1,7 @@
+"use strict";
+
+export { MapControls } from "./MapControls.js";
+export { MapCompass } from "./MapCompass.js";
+export { MapLayerPicker } from "./MapLayerPicker.js";
+export { MAP_CONTROL_BOX, MAP_CONTROLS_GEOMETRY } from "./constants.js";
+//# sourceMappingURL=index.js.map

package/lib/module/map-controls/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MapControls","MapCompass","MapLayerPicker","MAP_CONTROL_BOX","MAP_CONTROLS_GEOMETRY"],"sourceRoot":"../../../src","sources":["map-controls/index.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,kBAAe;AAC3C,SAASC,UAAU,QAAQ,iBAAc;AACzC,SAASC,cAAc,QAAQ,qBAAkB;AACjD,SAASC,eAAe,EAAEC,qBAAqB,QAAQ,gBAAa","ignoreList":[]}

package/lib/module/map-controls/types.js

@@ -0,0 +1,4 @@
+"use strict";
+
+export {};
+//# sourceMappingURL=types.js.map

package/lib/module/map-controls/types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../src","sources":["map-controls/types.ts"],"mappings":"","ignoreList":[]}

package/lib/module/map-marker/shared.js

@@ -36,8 +36,7 @@ export const AREA_BORDER_WIDTH = 1.5;
 export function resolveMapMarkerPaint(theme) {
   const menu = resolveMenuPalette(theme);
   const {
-    accent,
-    neutral: n
+    accent
   } = resolveButtonRamps(theme);
   // `error`, not `negative` — the same red as the listing card's heart: dark
   // mode's `negative` is a pale tint for text and reads salmon on a pill.
@@ -49,15 +48,15 @@ export function resolveMapMarkerPaint(theme) {
     hoverBorder: menu.trigger.hoverBorder,
     hoverSurface: menu.trigger.hoverBackground,
     label: menu.text,
-    labelSecondary: dark ? n[400] : n[500],
+    labelSecondary: theme.colors.textSecondary,
     activeFill: theme.colors.text,
-    activeLabel: dark ? n[900] : theme.colors.card,
-    visitedFill: dark ? n[900] : n[100],
-    visitedBorder: dark ? n[700] : n[200],
-    visitedLabel: dark ? n[400] : n[500],
+    activeLabel: theme.colors.background,
+    visitedFill: theme.colors.backgroundSecondary,
+    visitedBorder: theme.colors.border,
+    visitedLabel: theme.colors.textSecondary,
     heart: red[500],
     activeHeart: dark ? red[700] : red[400],
-    placeholder: dark ? n[700] : n[100],
+    placeholder: theme.colors.backgroundTertiary,
     ring: accent[500],
     area: dark ? accent[400] : accent[500]
   };

package/lib/module/map-marker/shared.js.map

@@ -1 +1 @@
-{"version":3,"names":["Platform","colorRamp","DANGER_TABLE","resolveButtonRamps","resolveMenuPalette","IS_WEB","OS","AREA_FILL_OPACITY","AREA_BORDER_WIDTH","resolveMapMarkerPaint","theme","menu","accent","neutral","n","red","colors","error","dark","isDark","surface","border","hoverBorder","trigger","hoverSurface","hoverBackground","label","text","labelSecondary","activeFill","activeLabel","card","visitedFill","visitedBorder","visitedLabel","heart","activeHeart","placeholder","ring","area","mapWebData","data","dataSet","MAP_MARKER_STYLE_ID","MAP_MARKER_CSS"],"sourceRoot":"../../../src","sources":["map-marker/shared.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,QAAQ,QAAQ,cAAc;AAEvC,SAASC,SAAS,EAAEC,YAAY,EAAEC,kBAAkB,QAAQ,qBAAkB;AAC9E,SAASC,kBAAkB,QAAQ,6BAA0B;AAG7D,MAAMC,MAAM,GAAGL,QAAQ,CAACM,EAAE,KAAK,KAAK;AAuBpC;AACA,OAAO,MAAMC,iBAAiB,GAAG,IAAI;AACrC;AACA,OAAO,MAAMC,iBAAiB,GAAG,GAAG;;AAEpC;AACA,OAAO,SAASC,qBAAqBA,CAACC,KAAY,EAAkB;EAClE,MAAMC,IAAI,GAAGP,kBAAkB,CAACM,KAAK,CAAC;EACtC,MAAM;IAAEE,MAAM;IAAEC,OAAO,EAAEC;EAAE,CAAC,GAAGX,kBAAkB,CAACO,KAAK,CAAC;EACxD;EACA;EACA,MAAMK,GAAG,GAAGd,SAAS,CAACS,KAAK,CAACM,MAAM,CAACC,KAAK,EAAEf,YAAY,CAAC;EACvD,MAAMgB,IAAI,GAAGR,KAAK,CAACS,MAAM;EACzB,OAAO;IACLC,OAAO,EAAET,IAAI,CAACS,OAAO;IACrBC,MAAM,EAAEV,IAAI,CAACU,MAAM;IACnBC,WAAW,EAAEX,IAAI,CAACY,OAAO,CAACD,WAAW;IACrCE,YAAY,EAAEb,IAAI,CAACY,OAAO,CAACE,eAAe;IAC1CC,KAAK,EAAEf,IAAI,CAACgB,IAAI;IAChBC,cAAc,EAAEV,IAAI,GAAGJ,CAAC,CAAC,GAAG,CAAC,GAAGA,CAAC,CAAC,GAAG,CAAC;IACtCe,UAAU,EAAEnB,KAAK,CAACM,MAAM,CAACW,IAAI;IAC7BG,WAAW,EAAEZ,IAAI,GAAGJ,CAAC,CAAC,GAAG,CAAC,GAAGJ,KAAK,CAACM,MAAM,CAACe,IAAI;IAC9CC,WAAW,EAAEd,IAAI,GAAGJ,CAAC,CAAC,GAAG,CAAC,GAAGA,CAAC,CAAC,GAAG,CAAC;IACnCmB,aAAa,EAAEf,IAAI,GAAGJ,CAAC,CAAC,GAAG,CAAC,GAAGA,CAAC,CAAC,GAAG,CAAC;IACrCoB,YAAY,EAAEhB,IAAI,GAAGJ,CAAC,CAAC,GAAG,CAAC,GAAGA,CAAC,CAAC,GAAG,CAAC;IACpCqB,KAAK,EAAEpB,GAAG,CAAC,GAAG,CAAC;IACfqB,WAAW,EAAElB,IAAI,GAAGH,GAAG,CAAC,GAAG,CAAC,GAAGA,GAAG,CAAC,GAAG,CAAC;IACvCsB,WAAW,EAAEnB,IAAI,GAAGJ,CAAC,CAAC,GAAG,CAAC,GAAGA,CAAC,CAAC,GAAG,CAAC;IACnCwB,IAAI,EAAE1B,MAAM,CAAC,GAAG,CAAC;IACjB2B,IAAI,EAAErB,IAAI,GAAGN,MAAM,CAAC,GAAG,CAAC,GAAGA,MAAM,CAAC,GAAG;EACvC,CAAC;AACH;;AAEA;AACA,OAAO,SAAS4B,UAAUA,CAACC,IAA4B,EAA2B;EAChF,OAAOpC,MAAM,GAAG;IAAEqC,OAAO,EAAED;EAAK,CAAC,GAAG,CAAC,CAAC;AACxC;AAEA,OAAO,MAAME,mBAAmB,GAAG,0BAA0B;;AAE7D;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAG;AAC9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC","ignoreList":[]}
+{"version":3,"names":["Platform","colorRamp","DANGER_TABLE","resolveButtonRamps","resolveMenuPalette","IS_WEB","OS","AREA_FILL_OPACITY","AREA_BORDER_WIDTH","resolveMapMarkerPaint","theme","menu","accent","red","colors","error","dark","isDark","surface","border","hoverBorder","trigger","hoverSurface","hoverBackground","label","text","labelSecondary","textSecondary","activeFill","activeLabel","background","visitedFill","backgroundSecondary","visitedBorder","visitedLabel","heart","activeHeart","placeholder","backgroundTertiary","ring","area","mapWebData","data","dataSet","MAP_MARKER_STYLE_ID","MAP_MARKER_CSS"],"sourceRoot":"../../../src","sources":["map-marker/shared.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,QAAQ,QAAQ,cAAc;AAEvC,SAASC,SAAS,EAAEC,YAAY,EAAEC,kBAAkB,QAAQ,qBAAkB;AAC9E,SAASC,kBAAkB,QAAQ,6BAA0B;AAG7D,MAAMC,MAAM,GAAGL,QAAQ,CAACM,EAAE,KAAK,KAAK;AAuBpC;AACA,OAAO,MAAMC,iBAAiB,GAAG,IAAI;AACrC;AACA,OAAO,MAAMC,iBAAiB,GAAG,GAAG;;AAEpC;AACA,OAAO,SAASC,qBAAqBA,CAACC,KAAY,EAAkB;EAClE,MAAMC,IAAI,GAAGP,kBAAkB,CAACM,KAAK,CAAC;EACtC,MAAM;IAAEE;EAAO,CAAC,GAAGT,kBAAkB,CAACO,KAAK,CAAC;EAC5C;EACA;EACA,MAAMG,GAAG,GAAGZ,SAAS,CAACS,KAAK,CAACI,MAAM,CAACC,KAAK,EAAEb,YAAY,CAAC;EACvD,MAAMc,IAAI,GAAGN,KAAK,CAACO,MAAM;EACzB,OAAO;IACLC,OAAO,EAAEP,IAAI,CAACO,OAAO;IACrBC,MAAM,EAAER,IAAI,CAACQ,MAAM;IACnBC,WAAW,EAAET,IAAI,CAACU,OAAO,CAACD,WAAW;IACrCE,YAAY,EAAEX,IAAI,CAACU,OAAO,CAACE,eAAe;IAC1CC,KAAK,EAAEb,IAAI,CAACc,IAAI;IAChBC,cAAc,EAAEhB,KAAK,CAACI,MAAM,CAACa,aAAa;IAC1CC,UAAU,EAAElB,KAAK,CAACI,MAAM,CAACW,IAAI;IAC7BI,WAAW,EAAEnB,KAAK,CAACI,MAAM,CAACgB,UAAU;IACpCC,WAAW,EAAErB,KAAK,CAACI,MAAM,CAACkB,mBAAmB;IAC7CC,aAAa,EAAEvB,KAAK,CAACI,MAAM,CAACK,MAAM;IAClCe,YAAY,EAAExB,KAAK,CAACI,MAAM,CAACa,aAAa;IACxCQ,KAAK,EAAEtB,GAAG,CAAC,GAAG,CAAC;IACfuB,WAAW,EAAEpB,IAAI,GAAGH,GAAG,CAAC,GAAG,CAAC,GAAGA,GAAG,CAAC,GAAG,CAAC;IACvCwB,WAAW,EAAE3B,KAAK,CAACI,MAAM,CAACwB,kBAAkB;IAC5CC,IAAI,EAAE3B,MAAM,CAAC,GAAG,CAAC;IACjB4B,IAAI,EAAExB,IAAI,GAAGJ,MAAM,CAAC,GAAG,CAAC,GAAGA,MAAM,CAAC,GAAG;EACvC,CAAC;AACH;;AAEA;AACA,OAAO,SAAS6B,UAAUA,CAACC,IAA4B,EAA2B;EAChF,OAAOrC,MAAM,GAAG;IAAEsC,OAAO,EAAED;EAAK,CAAC,GAAG,CAAC,CAAC;AACxC;AAEA,OAAO,MAAME,mBAAmB,GAAG,0BAA0B;;AAE7D;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAG;AAC9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC","ignoreList":[]}

package/lib/module/media-card/shared.js

@@ -108,7 +108,7 @@ const COVER_GRADIENT_FALLOFF = 0.25;
  * takes for BOTH foregrounds — the title and the muted line under it — to clear
  * AA on it; the gradient's bottom is a further 25% darker, so the text keeps its
  * contrast all the way down. Without a colour — or with one that does not parse
- * — the cover is the theme's neutral 700 → 900, which clears it in both modes.
+ * — the cover darkens the theme's background until both artwork inks clear AA.
  *
  * Checking `textMuted` too is what the previous implementation did not do, and
  * it painted a muted line at 4.18:1 over the palest artwork colours.
@@ -119,11 +119,8 @@ const COVER_GRADIENT_FALLOFF = 0.25;
  * channel; scaling keeps the channels' ratio, so a darkened teal is still teal.
  */
 export function resolveCoverTint(theme, color) {
-  const {
-    neutral: n
-  } = resolveButtonRamps(theme);
-  const text = n[50];
-  const textMuted = mixColor(n[50], n[300], 0.35);
+  const text = '#ffffff';
+  const textMuted = '#e5e5e5';
   const shade = color ? darkenUntilContrast(color, [text, textMuted], AA_TEXT_CONTRAST) : null;
   if (shade) {
     return {
@@ -133,9 +130,10 @@ export function resolveCoverTint(theme, color) {
       textMuted
     };
   }
+  const top = darkenUntilContrast(theme.colors.background, [text, textMuted], AA_TEXT_CONTRAST).color;
   return {
-    top: n[700],
-    bottom: n[900],
+    top,
+    bottom: darken(top, COVER_GRADIENT_FALLOFF),
     text,
     textMuted
   };
@@ -155,8 +153,7 @@ export function resolveCoverTint(theme, color) {
  */
 export function resolveMediaCardPaint(theme) {
   const {
-    accent,
-    neutral: n
+    accent
   } = resolveButtonRamps(theme);
   const {
     colors,
@@ -172,7 +169,7 @@ export function resolveMediaCardPaint(theme) {
     placeholderGlyph: mixColor(colors.background, colors.text, 0.4),
     tile: mixColor(colors.background, colors.text, isDark ? 0.1 : 0.07),
     tileHover: mixColor(colors.background, colors.text, isDark ? 0.16 : 0.12),
-    rail: isDark ? n[700] : n[200],
+    rail: colors.contrast50,
     fill: accent[500],
     accent: accent[500],
     surface: colors.background,

package/lib/module/media-card/shared.js.map

@@ -1 +1 @@
-{"version":3,"names":["Platform","mixColor","resolveButtonRamps","isImageUrl","AA_TEXT_CONTRAST","contrastRatio","darken","darkenUntilContrast","relativeLuminance","IS_WEB","OS","TILE_ARTWORK","large","medium","small","ROW_ARTWORK","TILE_PADDING","TILE_RADIUS","ROW_PADDING","ROW_RADIUS","TEXT_GAP","squareRadius","size","layout","PODCAST_RADIUS","GENRE_RADIUS","QUICK_TILE_HEIGHT","QUICK_TILE_RADIUS","GENRE_ARTWORK_ROTATION","RECAP_RADIUS","artworkSide","resolvePlayVisibility","mode","hasOnPlay","playing","loading","current","web","resolveArtworkUri","source","resolver","variant","undefined","composeName","parts","filter","part","trim","join","joinMeta","COVER_GRADIENT_FALLOFF","resolveCoverTint","theme","color","neutral","n","text","textMuted","shade","top","bottom","resolveMediaCardPaint","accent","colors","isDark","textSecondary","hover","background","selected","selectedHover","placeholder","placeholderGlyph","tile","tileHover","rail","fill","surface","ring","MEDIA_CARD_STYLE_ID","CARD","LINK","REVEAL","MEDIA_CARD_CSS"],"sourceRoot":"../../../src","sources":["media-card/shared.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Platform","mixColor","resolveButtonRamps","isImageUrl","AA_TEXT_CONTRAST","contrastRatio","darken","darkenUntilContrast","relativeLuminance","IS_WEB","OS","TILE_ARTWORK","large","medium","small","ROW_ARTWORK","TILE_PADDING","TILE_RADIUS","ROW_PADDING","ROW_RADIUS","TEXT_GAP","squareRadius","size","layout","PODCAST_RADIUS","GENRE_RADIUS","QUICK_TILE_HEIGHT","QUICK_TILE_RADIUS","GENRE_ARTWORK_ROTATION","RECAP_RADIUS","artworkSide","resolvePlayVisibility","mode","hasOnPlay","playing","loading","current","web","resolveArtworkUri","source","resolver","variant","undefined","composeName","parts","filter","part","trim","join","joinMeta","COVER_GRADIENT_FALLOFF","resolveCoverTint","theme","color","text","textMuted","shade","top","bottom","colors","background","resolveMediaCardPaint","accent","isDark","textSecondary","hover","selected","selectedHover","placeholder","placeholderGlyph","tile","tileHover","rail","contrast50","fill","surface","ring","MEDIA_CARD_STYLE_ID","CARD","LINK","REVEAL","MEDIA_CARD_CSS"],"sourceRoot":"../../../src","sources":["media-card/shared.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/media-controls/shared.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { surfaceFillOn, surfaceTextOn } from "../styles/surface-levels.js";
 import { Platform } from 'react-native';
 import { mixColor, resolveButtonRamps } from "../button/shared.js";
 export const IS_WEB = Platform.OS === 'web';
@@ -22,8 +23,7 @@ export function formatDuration(seconds) {
 
 export function resolveMediaControlsPaint(theme) {
   const {
-    accent,
-    neutral: n
+    accent
   } = resolveButtonRamps(theme);
   const dark = theme.isDark;
   const {
@@ -38,11 +38,11 @@ export function resolveMediaControlsPaint(theme) {
     inverseHover: mixColor(colors.text, colors.background, 0.16),
     onInverse: colors.background,
     text: colors.text,
-    textMuted: dark ? n[400] : n[500],
-    wash: dark ? n[800] : n[100],
-    rail: dark ? n[700] : n[200],
-    buffered: dark ? n[500] : n[300],
-    badge: dark ? n[400] : n[500],
+    textMuted: surfaceTextOn(theme, colors.background).textSecondary,
+    wash: surfaceFillOn(theme, colors.background),
+    rail: colors.contrast50,
+    buffered: colors.border,
+    badge: surfaceTextOn(theme, colors.background).textSecondary,
     onBadge: colors.background,
     ring: accent[500]
   };

package/lib/module/media-controls/shared.js.map

@@ -1 +1 @@
-{"version":3,"names":["Platform","mixColor","resolveButtonRamps","IS_WEB","OS","formatDuration","seconds","total","Number","isFinite","Math","floor","h","m","s","ss","String","padStart","resolveMediaControlsPaint","theme","accent","neutral","n","dark","isDark","colors","accentHover","accentPressed","onAccent","primaryForeground","inverse","text","inverseHover","background","onInverse","textMuted","wash","rail","buffered","badge","onBadge","ring","MEDIA_CONTROLS_STYLE_ID","FOCUSABLE","THUMB","TRACK","VOLUME","VOLUME_SLIDER","MEDIA_CONTROLS_CSS"],"sourceRoot":"../../../src","sources":["media-controls/shared.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["surfaceFillOn","surfaceTextOn","Platform","mixColor","resolveButtonRamps","IS_WEB","OS","formatDuration","seconds","total","Number","isFinite","Math","floor","h","m","s","ss","String","padStart","resolveMediaControlsPaint","theme","accent","dark","isDark","colors","accentHover","accentPressed","onAccent","primaryForeground","inverse","text","inverseHover","background","onInverse","textMuted","textSecondary","wash","rail","contrast50","buffered","border","badge","onBadge","ring","MEDIA_CONTROLS_STYLE_ID","FOCUSABLE","THUMB","TRACK","VOLUME","VOLUME_SLIDER","MEDIA_CONTROLS_CSS"],"sourceRoot":"../../../src","sources":["media-controls/shared.ts"],"mappings":"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","ignoreList":[]}