New recording flow

apps/desktop/package.json

@@ -28,6 +28,7 @@
     "@solid-primitives/event-listener": "^2.3.3",
     "@solid-primitives/history": "^0.1.5",
     "@solid-primitives/memo": "^1.4.2",
+    "@solid-primitives/mouse": "^2.1.2",
     "@solid-primitives/refs": "^1.0.8",
     "@solid-primitives/resize-observer": "^2.0.26",
     "@solid-primitives/scheduled": "^1.4.3",

apps/desktop/src-tauri/Cargo.toml

@@ -88,6 +88,8 @@ cap-media = { path = "../../../crates/media" }
 cap-flags = { path = "../../../crates/flags" }
 cap-recording = { path = "../../../crates/recording" }
 cap-export = { path = "../../../crates/export" }
+cap-displays = { path = "../../../crates/displays" }
+
 flume.workspace = true
 tracing-subscriber = "0.3.19"
 tracing-appender = "0.2.3"

apps/desktop/src-tauri/src/general_settings.rs

@@ -80,18 +80,38 @@ pub struct GeneralSettingsStore {
     pub server_url: String,
     #[serde(default)]
     pub recording_countdown: Option<u32>,
-    #[serde(default, alias = "open_editor_after_recording")]
-    #[deprecated]
-    _open_editor_after_recording: bool,
-    #[deprecated = "can be removed when native camera preview is ready"]
-    #[serde(default)]
+    // #[deprecated = "can be removed when native camera preview is ready"]
+    #[serde(
+        default = "default_enable_native_camera_preview",
+        skip_serializing_if = "no"
+    )]
     pub enable_native_camera_preview: bool,
     #[serde(default)]
     pub auto_zoom_on_clicks: bool,
+    // #[deprecated = "can be removed when new recording flow is the default"]
+    #[serde(
+        default = "default_enable_new_recording_flow",
+        skip_serializing_if = "no"
+    )]
+    pub enable_new_recording_flow: bool,
     #[serde(default)]
     pub post_deletion_behaviour: PostDeletionBehaviour,
 }
 
+fn default_enable_native_camera_preview() -> bool {
+    // TODO:
+    // cfg!(target_os = "macos")
+    false
+}
+
+fn default_enable_new_recording_flow() -> bool {
+    cfg!(debug_assertions)
+}
+
+fn no(_: &bool) -> bool {
+    false
+}
+
 fn default_server_url() -> String {
     std::option_env!("VITE_SERVER_URL")
         .unwrap_or("https://cap.so")
@@ -127,9 +147,9 @@ impl Default for GeneralSettingsStore {
             custom_cursor_capture: false,
             server_url: default_server_url(),
             recording_countdown: Some(3),
-            _open_editor_after_recording: false,
-            enable_native_camera_preview: false,
+            enable_native_camera_preview: default_enable_native_camera_preview(),
             auto_zoom_on_clicks: false,
+            enable_new_recording_flow: default_enable_new_recording_flow(),
             post_deletion_behaviour: PostDeletionBehaviour::DoNothing,
         }
     }

apps/desktop/src-tauri/src/hotkeys.rs

@@ -65,6 +65,9 @@ impl HotkeysStore {
     }
 }
 
+#[derive(Serialize, Type, tauri_specta::Event, Debug, Clone)]
+pub struct OnEscapePress;
+
 pub type HotkeysState = Mutex<HotkeysStore>;
 pub fn init(app: &AppHandle) {
     app.plugin(
@@ -74,6 +77,10 @@ pub fn init(app: &AppHandle) {
                     return;
                 }
 
+                if shortcut.key == Code::Escape {
+                    OnEscapePress.emit(app).ok();
+                }
+
                 let state = app.state::<HotkeysState>();
                 let store = state.lock().unwrap();
 
@@ -90,7 +97,6 @@ pub fn init(app: &AppHandle) {
     let store = HotkeysStore::get(app).unwrap().unwrap_or_default();
 
     let global_shortcut = app.global_shortcut();
-
     for hotkey in store.hotkeys.values() {
         global_shortcut.register(Shortcut::from(*hotkey)).ok();
     }

apps/desktop/src-tauri/src/lib.rs

@@ -16,6 +16,7 @@ mod permissions;
 mod platform;
 mod presets;
 mod recording;
+mod target_select_overlay;
 mod tray;
 mod upload;
 mod web_api;
@@ -69,6 +70,7 @@ use tauri::Window;
 use tauri::{AppHandle, Manager, State, WindowEvent};
 use tauri_plugin_deep_link::DeepLinkExt;
 use tauri_plugin_dialog::DialogExt;
+use tauri_plugin_global_shortcut::GlobalShortcutExt;
 use tauri_plugin_notification::{NotificationExt, PermissionState};
 use tauri_plugin_opener::OpenerExt;
 use tauri_plugin_shell::ShellExt;
@@ -1758,7 +1760,7 @@ async fn get_system_audio_waveforms(
 #[tauri::command]
 #[specta::specta]
 async fn show_window(app: AppHandle, window: ShowCapWindow) -> Result<(), String> {
-    window.show(&app).await.unwrap();
+    let _ = window.show(&app).await;
     Ok(())
 }
 
@@ -1951,7 +1953,9 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
             captions::download_whisper_model,
             captions::check_model_exists,
             captions::delete_whisper_model,
-            captions::export_captions_srt
+            captions::export_captions_srt,
+            target_select_overlay::open_target_select_overlays,
+            target_select_overlay::close_target_select_overlays,
         ])
         .events(tauri_specta::collect_events![
             RecordingOptionsChanged,
@@ -1971,7 +1975,9 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
             UploadProgress,
             captions::DownloadProgress,
             recording::RecordingEvent,
-            RecordingDeleted
+            RecordingDeleted,
+            target_select_overlay::TargetUnderCursor,
+            hotkeys::OnEscapePress
         ])
         .error_handling(tauri_specta::ErrorHandlingMode::Throw)
         .typ::<ProjectConfiguration>()
@@ -2042,6 +2048,7 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
                 .with_denylist(&[
                     CapWindowId::Setup.label().as_str(),
                     "window-capture-occluder",
+                    "target-select-overlay",
                     CapWindowId::CaptureArea.label().as_str(),
                     CapWindowId::Camera.label().as_str(),
                     CapWindowId::RecordingsOverlay.label().as_str(),
@@ -2053,6 +2060,7 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
                     label if label.starts_with("window-capture-occluder-") => {
                         "window-capture-occluder"
                     }
+                    label if label.starts_with("target-select-overlay") => "target-select-overlay",
                     _ => label,
                 })
                 .build(),
@@ -2064,6 +2072,7 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
             hotkeys::init(&app);
             general_settings::init(&app);
             fake_window::init(&app);
+            app.manage(target_select_overlay::WindowFocusManager::default());
             app.manage(EditorWindowIds::default());
 
             if let Ok(Some(auth)) = AuthStore::load(&app) {
@@ -2197,6 +2206,10 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
                                 }
                                 return;
                             }
+                            CapWindowId::TargetSelectOverlay { display_id } => {
+                                app.state::<target_select_overlay::WindowFocusManager>()
+                                    .destroy(&display_id, app.global_shortcut());
+                            }
                             _ => {}
                         };
                     }
@@ -2256,7 +2269,9 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
                     }
                 } else {
                     let handle = handle.clone();
-                    tokio::spawn(async move { ShowCapWindow::Main.show(&handle).await });
+                    tokio::spawn(async move {
+                        let _ = ShowCapWindow::Main.show(&handle).await;
+                    });
                 }
             }
             tauri::RunEvent::ExitRequested { code, api, .. } => {