[sc] task text entry improvements

a-type · Jun 9, 2024 · a3e5ab7 · a3e5ab7
1 parent ce9bfb0
commit a3e5ab7
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 58 deletions.
diff --git a/apps/gnocchi/hub/package.json b/apps/gnocchi/hub/package.json
@@ -20,7 +20,7 @@
     "typecheck": "tsc --build tsconfig.json"
   },
   "dependencies": {
-    "@a-type/ui": "^0.8.18",
+    "@a-type/ui": "^0.8.19",
     "@a-type/utils": "^1.0.8",
     "@tiptap/core": "^2.2.4",
     "@tiptap/extension-document": "^2.2.4",

diff --git a/apps/gnocchi/web/package.json b/apps/gnocchi/web/package.json
@@ -14,7 +14,7 @@
     "typecheck": "tsc --build tsconfig.json"
   },
   "dependencies": {
-    "@a-type/ui": "^0.8.18",
+    "@a-type/ui": "^0.8.19",
     "@a-type/utils": "^1.0.8",
     "@biscuits/client": "workspace:*",
     "@biscuits/error": "workspace:*",

diff --git a/apps/marginalia/web/package.json b/apps/marginalia/web/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@a-type/ui": "0.8.18",
+    "@a-type/ui": "0.8.19",
     "@a-type/utils": "1.1.0",
     "@biscuits/client": "workspace:*",
     "@marginalia.biscuits/verdant": "workspace:*",

diff --git a/apps/shopping/web/package.json b/apps/shopping/web/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@a-type/ui": "^0.8.18",
+    "@a-type/ui": "^0.8.19",
     "@a-type/utils": "^1.0.8",
     "@biscuits/client": "workspace:*",
     "@react-spring/web": "^9.7.3",

diff --git a/apps/star-chart/web/package.json b/apps/star-chart/web/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@a-type/ui": "0.8.18",
+    "@a-type/ui": "0.8.19",
     "@a-type/utils": "1.1.2",
     "@biscuits/client": "workspace:*",
     "@react-spring/web": "^9.7.3",

diff --git a/apps/star-chart/web/src/components/project/TaskNode.tsx b/apps/star-chart/web/src/components/project/TaskNode.tsx
@@ -81,8 +81,8 @@ export function TaskNode({ task }: TaskNodeProps) {
         !selected && pendingSelect && 'layer-variants:border-primary-light',
         !!completedAt &&
           (downstreamUncompleted
-            ? 'opacity-[calc(var(--zoom,1)*var(--zoom,1))]'
-            : 'opacity-[calc(var(--zoom,1)*var(--zoom,1)*0.5)]'),
+            ? 'opacity-[var(--zoom,1)]'
+            : 'opacity-[calc(var(--zoom,1)*var(--zoom,1))] sm:opacity-[calc(var(--zoom,1)*var(--zoom,1)*0.5)]'),
         activeConnectionTarget === id && 'bg-accent-light border-accent',
       )}
       style={style}
@@ -136,6 +136,11 @@ function TaskFullContent({
     [client, id, projectId],
   );
 
+  const canvas = useCanvas();
+  const commitAndEndEditing = () => {
+    canvas.selections.remove(id);
+  };
+
   return (
     <div className="row items-start p-2">
       <Checkbox
@@ -149,11 +154,25 @@ function TaskFullContent({
       />
       {exclusive ? (
         <LiveUpdateTextField
-          className="text-sm min-w-80px w-auto py-0px h-full"
+          className="text-sm min-w-80px w-auto py-0px h-full rounded-md"
           value={content}
           onChange={(v) => task.set('content', v)}
           autoSelect
           autoFocus
+          textArea
+          onKeyDown={(ev) => {
+            if (ev.key === 'Enter') {
+              ev.preventDefault();
+              task.set('content', content);
+              commitAndEndEditing();
+            }
+
+            const isModifiedKeypress = ev.metaKey || ev.ctrlKey;
+            if (!isModifiedKeypress) {
+              // capture all keypresses that aren't modified
+              ev.stopPropagation();
+            }
+          }}
         />
       ) : (
         <div

diff --git a/apps/trip-tick/web/package.json b/apps/trip-tick/web/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@a-type/ui": "^0.8.18",
+    "@a-type/ui": "^0.8.19",
     "@a-type/utils": "^1.0.6",
     "@biscuits/client": "workspace:*",
     "@radix-ui/react-progress": "^1.0.3",

diff --git a/blog/package.json b/blog/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@a-type/ui": "^0.8.18",
+    "@a-type/ui": "^0.8.19",
     "@astrojs/check": "^0.5.10",
     "@astrojs/mdx": "^2.3.1",
     "@astrojs/rss": "^4.0.5",

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -56,7 +56,7 @@
     "vite-plugin-pwa": "0.19.2"
   },
   "devDependencies": {
-    "@a-type/ui": "^0.8.18",
+    "@a-type/ui": "^0.8.19",
     "@types/react": "18.2.79",
     "@verdant-web/store": "^3.6.3",
     "react": "^18.2.0",