cherrypick-interactive 1.10.0 → 1.11.0

package/cli.js

@@ -21,6 +21,7 @@ const pkg = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf8'));
 
 const notifier = updateNotifier({
     pkg,
+    updateCheckInterval: 1000 * 60 * 60, // 1 hour
 });
 
 // Only print if a *real* newer version exists

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cherrypick-interactive",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "Interactively cherry-pick commits that are in dev but not in main, using subject-based comparison.",
   "main": "cli.js",
   "bin": "cli.js",

package/src/tui/CommitRow.js

@@ -1,21 +1,31 @@
-import { Text, Box, Spacer } from 'ink';
+import { Text, Box } from 'ink';
 import { html } from './html.js';
 
 export function CommitRow({ hash, subject, date, isSelected, isCursor }) {
     const checkbox = isSelected ? '☑' : '☐';
     const checkColor = isSelected ? 'green' : 'gray';
     const cursor = isCursor ? '>' : ' ';
-    const cursorColor = isCursor ? 'cyan' : undefined;
-    const subjectColor = isCursor ? 'white' : 'gray';
+
+    let subjectColor = 'gray';
+    let hashColor = 'dim';
+    let dateColor = 'dim';
+    if (isCursor) {
+        subjectColor = 'white';
+        hashColor = 'cyan';
+        dateColor = 'gray';
+    } else if (isSelected) {
+        subjectColor = 'green';
+        hashColor = 'green';
+        dateColor = 'green';
+    }
 
     return html`
         <${Box}>
-            <${Text} color=${cursorColor}>${cursor} </${Text}>
+            <${Text} color=${isCursor ? 'cyan' : undefined}>${cursor} </${Text}>
             <${Text} color=${checkColor}>${checkbox} </${Text}>
-            <${Text} color="dim">${hash.slice(0, 7)}  </${Text}>
-            <${Text} color=${subjectColor} wrap="truncate">${subject}</${Text}>
-            <${Spacer} />
-            <${Text} color="dim">${date}</${Text}>
+            <${Text} color=${hashColor}>${hash.slice(0, 7)}  </${Text}>
+            <${Text} color=${subjectColor}>${subject}</${Text}>
+            <${Text} color=${dateColor}>${date ? `  (${date})` : ''}</${Text}>
         </${Box}>
     `;
 }