git-stack-cli 1.6.0 → 1.6.1

package/dist/cjs/index.cjs

@@ -28700,10 +28700,17 @@ function SelectCommitRanges() {
 function SelectCommitRangesInternal(props) {
     const actions = Store.useActions();
     const argv = Store.useState((state) => state.argv);
-    const [selected_group_id, set_selected_group_id] = reactExports.useState(props.commit_range.UNASSIGNED);
+    const [selected_group_id, set_selected_group_id] = reactExports.useState(() => {
+        const first_group = props.commit_range.group_list.find((g) => g.id !== props.commit_range.UNASSIGNED);
+        if (first_group) {
+            return first_group.id;
+        }
+        return props.commit_range.UNASSIGNED;
+    });
     const [group_input, set_group_input] = reactExports.useState(false);
     const [new_group_list, create_group] = reactExports.useReducer((group_list, group) => {
-        return group_list.concat(group);
+        const next_group_list = group_list.concat(group);
+        return next_group_list;
     }, []);
     const [commit_map, update_commit_map] = reactExports.useReducer((map, args) => {
         map.set(args.key, args.value);
@@ -28724,9 +28731,10 @@ function SelectCommitRangesInternal(props) {
             unassigned_count++;
         }
     }
-    group_list.push(...new_group_list);
     const total_group_count = new_group_list.length + props.commit_range.group_list.length;
-    for (const group of props.commit_range.group_list) {
+    for (let i = 0; i < props.commit_range.group_list.length; i++) {
+        const index = props.commit_range.group_list.length - i - 1;
+        const group = props.commit_range.group_list[index];
         if (group.pr?.state === "MERGED")
             continue;
         if (group.id === props.commit_range.UNASSIGNED) {
@@ -28744,6 +28752,7 @@ function SelectCommitRangesInternal(props) {
             title: group.pr?.title || group.title || group.id,
         });
     }
+    group_list.push(...new_group_list);
     let current_index = group_list.findIndex((g) => g.id === selected_group_id);
     if (current_index === -1) {
         current_index = 0;
@@ -34452,7 +34461,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.6.0" )
+        .version("1.6.1" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
         .help("help", "Show usage via `git stack help`").argv);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/SelectCommitRanges.tsx

@@ -35,15 +35,24 @@ function SelectCommitRangesInternal(props: Props) {
 
   const argv = Store.useState((state) => state.argv);
 
-  const [selected_group_id, set_selected_group_id] = React.useState(
-    props.commit_range.UNASSIGNED
-  );
+  const [selected_group_id, set_selected_group_id] = React.useState(() => {
+    const first_group = props.commit_range.group_list.find(
+      (g) => g.id !== props.commit_range.UNASSIGNED
+    );
+
+    if (first_group) {
+      return first_group.id;
+    }
+
+    return props.commit_range.UNASSIGNED;
+  });
 
   const [group_input, set_group_input] = React.useState(false);
 
   const [new_group_list, create_group] = React.useReducer(
     (group_list: Array<SimpleGroup>, group: SimpleGroup) => {
-      return group_list.concat(group);
+      const next_group_list = group_list.concat(group);
+      return next_group_list;
     },
     []
   );
@@ -79,12 +88,13 @@ function SelectCommitRangesInternal(props: Props) {
     }
   }
 
-  group_list.push(...new_group_list);
-
   const total_group_count =
     new_group_list.length + props.commit_range.group_list.length;
 
-  for (const group of props.commit_range.group_list) {
+  for (let i = 0; i < props.commit_range.group_list.length; i++) {
+    const index = props.commit_range.group_list.length - i - 1;
+    const group = props.commit_range.group_list[index];
+
     if (group.pr?.state === "MERGED") continue;
 
     if (group.id === props.commit_range.UNASSIGNED) {
@@ -105,6 +115,8 @@ function SelectCommitRangesInternal(props: Props) {
     });
   }
 
+  group_list.push(...new_group_list);
+
   let current_index = group_list.findIndex((g) => g.id === selected_group_id);
   if (current_index === -1) {
     current_index = 0;