feat: add hotkey: "Yak on here and up" (#86)

README.md

@@ -43,10 +43,10 @@ utilitarian design, give Stacks a try-- I'd love to hear your thoughts!
 
 `.DMG` installers that have been notarized by Apple.
 
-- **Current version**: v0.15.11
+- **Current version**: v0.15.12
 - **Last release**: Oct 14, 2024
 
-[![MacOS (Universal)](./docs/assets/MacOS-Universal.svg)](https://stacks.cross.stream/releases/Stacks_0.15.11_universal.dmg)
+[![MacOS (Universal)](./docs/assets/MacOS-Universal.svg)](https://stacks.cross.stream/releases/Stacks_0.15.12_universal.dmg)
 
 ## Community
 

changes/v0.15.12.md

@@ -0,0 +1 @@
+- add action "Yak on here and up"

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "stacks"
-version = "0.15.11"
+version = "0.15.12"
 description = "Stacks"
 authors = ["Andy Gayton <[email protected]>"]
 license = ""

src-tauri/src/commands.rs

@@ -986,6 +986,7 @@ pub fn store_add_to_new_stack(
     state: tauri::State<SharedState>,
     name: String,
     source_id: scru128::Scru128Id,
+    and_up: bool, // fork the source_id and all items above it into the new stack
     focus: bool,
 ) {
     state.with_lock(|state| {
@@ -998,17 +999,40 @@ pub fn store_add_to_new_stack(
                 .select(state.view.get_best_focus(&state.ui.focused));
         }
 
+        // Create a new stack
         let stack_packet = state
             .store
             .add_stack(name.as_bytes(), StackLockStatus::Unlocked);
         state.merge(&stack_packet);
 
-        let item_packet =
-            state
-                .store
-                .fork(source_id, None, MimeType::TextPlain, Some(stack_packet.id));
-        state.merge(&item_packet);
+        if and_up {
+            // Fork the source_id and all items above it into the new stack
+            if let Some(item) = state.view.items.get(&source_id) {
+                if let Some(stack_id) = item.stack_id {
+                    if let Some(stack) = state.view.items.get(&stack_id) {
+                        let children = state.view.children(stack);
+                        for &item_id in children.iter().rev().skip_while(|&&id| id != source_id) {
+                            let item_packet = state.store.fork(
+                                item_id,
+                                None,
+                                MimeType::TextPlain,
+                                Some(stack_packet.id),
+                            );
+                            state.merge(&item_packet);
+                        }
+                    }
+                }
+            }
+        } else {
+            // Fork the source_id into the new stack
+            let item_packet =
+                state
+                    .store
+                    .fork(source_id, None, MimeType::TextPlain, Some(stack_packet.id));
+            state.merge(&item_packet);
+        }
     });
+
     app.emit_all("refresh-items", true).unwrap();
 }
 

src-tauri/src/store.rs

@@ -334,12 +334,8 @@ impl Store {
             .filter(|p| p.packet_type == PacketType::Update || p.packet_type == PacketType::Add)
             .for_each(|p| {
                 let meta = p.hash.and_then(|hash| content_meta_cache.get_mut(&hash));
-
-                match (meta, p.content_type) {
-                    (Some(meta), Some(content_type)) => {
-                        meta.content_type = content_type;
-                    }
-                    _ => {}
+                if let (Some(meta), Some(content_type)) = (meta, p.content_type) {
+                    meta.content_type = content_type;
                 }
             });
 

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "Stacks",
-    "version": "0.15.11"
+    "version": "0.15.12"
   },
   "build": {
     "beforeDevCommand": "npm run dev",

src/actions.tsx

@@ -70,6 +70,28 @@ export const actions: Action[] = [
             name: dn(),
             sourceId: item.id,
             focus: true,
+            andUp: false,
+          });
+        })();
+      }
+    },
+  },
+
+  {
+    name: "Yak on here and up",
+    keys: [<Icon name="IconCommandKey" />, <Icon name="IconShiftKey" />, "Y"],
+    matchKeyEvent: (event: KeyboardEvent) =>
+      matchKeyEvent(event, { meta: true, shift: true, code: "KeyY" }),
+    canApply: (stack: Stack) => !!stack.selected_item(),
+    trigger: (stack: Stack) => {
+      const item = stack.selected_item();
+      if (item) {
+        (async () => {
+          await invoke("store_add_to_new_stack", {
+            name: dn(),
+            sourceId: item.id,
+            focus: true,
+            andUp: true,
           });
         })();
       }