Merge remote-tracking branch 'origin/main' into chore/reconcile-main-0.18.0-to-staging

Author: OpenCode

src/components/MapView.tsx

@@ -898,6 +898,95 @@ export function MapView({
     startUserLocation();
   }, [startUserLocation, stopUserLocation]);
 
+  const stopUserLocation = useCallback(() => {
+    if (userLocationWatchIdRef.current !== null && navigator.geolocation) {
+      navigator.geolocation.clearWatch(userLocationWatchIdRef.current);
+    }
+    userLocationWatchIdRef.current = null;
+    isUserLocationActiveRef.current = false;
+    isUserLocationFollowingRef.current = false;
+    setIsUserLocationActive(false);
+    setUserLocationFix(null);
+  }, []);
+
+  useEffect(() => () => stopUserLocation(), [stopUserLocation]);
+
+  const publishLocationNotice = useCallback(
+    (message: string, tone: "info" | "warning" | "error" = "error") => {
+      onPublishNotice?.({
+        id: USER_LOCATION_NOTICE_ID,
+        message,
+        tone,
+        persistent: false,
+      });
+    },
+    [onPublishNotice],
+  );
+
+  const startUserLocation = useCallback(() => {
+    if (!navigator.geolocation) {
+      publishLocationNotice("Your browser does not support location services.");
+      return;
+    }
+    isUserLocationActiveRef.current = true;
+    isUserLocationFollowingRef.current = true;
+    setIsUserLocationActive(true);
+    setUserLocationFix(null);
+    try {
+      userLocationWatchIdRef.current = navigator.geolocation.watchPosition(
+        (position) => {
+          const nextFix: UserLocationFix = {
+            lat: position.coords.latitude,
+            lon: position.coords.longitude,
+            accuracyM: Number.isFinite(position.coords.accuracy) ? position.coords.accuracy : null,
+          };
+          setUserLocationFix(nextFix);
+          if (isUserLocationFollowingRef.current) {
+            setInteractionViewState(null);
+            const didAnimate = animateMapToCenter(mapRef, {
+              center: { lat: nextFix.lat, lon: nextFix.lon },
+              zoom: USER_LOCATION_ZOOM,
+              padding: resolveMapCameraPadding(fitChromePadding, fitBottomInset),
+            });
+            if (!didAnimate) {
+              updateMapViewport({
+                center: { lat: nextFix.lat, lon: nextFix.lon },
+                zoom: USER_LOCATION_ZOOM,
+              });
+            }
+          }
+        },
+        (error) => {
+          console.error("[user-location] geolocation watch failed", error);
+          publishLocationNotice(userLocationErrorMessage(error));
+          stopUserLocation();
+        },
+        USER_LOCATION_WATCH_OPTIONS,
+      );
+    } catch (error) {
+      console.error("[user-location] geolocation watch failed", error);
+      publishLocationNotice("Could not get your location.");
+      stopUserLocation();
+    }
+  }, [
+    fitBottomInset,
+    fitChromePadding.bottom,
+    fitChromePadding.left,
+    fitChromePadding.right,
+    fitChromePadding.top,
+    publishLocationNotice,
+    stopUserLocation,
+    updateMapViewport,
+  ]);
+
+  const toggleUserLocation = useCallback(() => {
+    if (isUserLocationActiveRef.current) {
+      stopUserLocation();
+      return;
+    }
+    startUserLocation();
+  }, [startUserLocation, stopUserLocation]);
+
   useEffect(() => {
     const handleViewportChange = () => {
       mapRef.current?.resize();

src/components/Sidebar.tsx

@@ -38,9 +38,16 @@ import type { Site } from "../types/radio";
 import { siGithub } from "simple-icons";
 import { InfoTip } from "./InfoTip";
 import { ActionButton } from "./ActionButton";
+import {
+  AccessSettingsEditor,
+  type AccessCollaborator,
+  type AccessRole,
+  type AccessVisibility,
+} from "./AccessSettingsEditor";
 import { AvatarBadge } from "./AvatarBadge";
 import { InlineCloseIconButton } from "./InlineCloseIconButton";
 import { ModalOverlay } from "./ModalOverlay";
+import { SiteBeamVisualizerPopover } from "./SiteBeamVisualizer";
 import SimulationLibraryPanel from "./SimulationLibraryPanel";
 import { Badge } from "./ui/Badge";
 import { PanelToolbar } from "./ui/PanelToolbar";
@@ -82,6 +89,7 @@ const ALL_VISIBILITY_FILTERS = VISIBILITY_FILTER_OPTIONS.map((option) => option.
 const ALL_SITE_SOURCE_FILTERS = SITE_SOURCE_FILTER_OPTIONS.map((option) => option.key);
 
 type SiteFilterGroupKey = "role" | "visibility" | "source";
+type BeamPreviewFieldKey = "add" | "edit";
 
 type SidebarProps = {
   onOpenHelp?: () => void;
@@ -1336,6 +1344,12 @@ export function Sidebar({
           </div>
         </ModalOverlay>
       ) : null}
+      <SiteBeamVisualizerPopover
+        onClose={() => setActiveBeamPreviewField(null)}
+        open={Boolean(activeBeamPreviewField && activeBeamPreviewTriggerRef?.current)}
+        triggerRef={activeBeamPreviewTriggerRef}
+        values={activeBeamPreviewValues}
+      />
       {deleteConfirm ? (
         <ModalOverlay aria-label="Confirm Delete" onClose={() => setDeleteConfirm(null)} tier="raised">
           <div className="library-manager-card user-profile-popup">

src/index.css

@@ -574,6 +574,11 @@ button {
   width: auto;
 }
 
+.gain-mode-toggle input {
+  justify-self: end;
+  width: auto;
+}
+
 .field-grid textarea {
   border: 1px solid var(--border);
   background: var(--surface);