Merge pull request #4096 from tloncorp/po/tlon-3106-re-enable-autofoc…

…us-upgrade-tentap input: update tentap, fixes backspace on autofocus, re-enable autofocus
tloncorp · Oct 21, 2024 · 788e76b · 788e76b
2 parents 8ea66dd + 9ac3bc1
commit 788e76b
Show file tree

Hide file tree

Showing 9 changed files with 1,073 additions and 329 deletions.
diff --git a/apps/tlon-mobile/ios/Podfile.lock b/apps/tlon-mobile/ios/Podfile.lock
@@ -1388,7 +1388,7 @@ PODS:
   - sqlite3 (3.42.0):
     - sqlite3/common (= 3.42.0)
   - sqlite3/common (3.42.0)
-  - tentap (0.5.11):
+  - tentap (0.5.21):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1878,7 +1878,7 @@ SPEC CHECKSUMS:
   SDWebImageWebPCoder: af09429398d99d524cae2fe00f6f0f6e491ed102
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   sqlite3: f163dbbb7aa3339ad8fc622782c2d9d7b72f7e9c
-  tentap: 4871503ab3d587fe80fe13f6fe712fde98b57525
+  tentap: 2cf2e387dd284bf867010eb7d0f91618fb35b673
   UMAppLoader: 5df85360d65cabaef544be5424ac64672e648482
   Yoga: fb61b2337c7688c81a137e5560b3cbb515289f91
 

diff --git a/apps/tlon-mobile/package.json b/apps/tlon-mobile/package.json
@@ -37,7 +37,7 @@
     ]
   },
   "dependencies": {
-    "@10play/tentap-editor": "~0.5.11",
+    "@10play/tentap-editor": "~0.5.21",
     "@aws-sdk/client-s3": "^3.190.0",
     "@aws-sdk/s3-request-presigner": "^3.190.0",
     "@dev-plugins/async-storage": "^0.0.3",

diff --git a/package.json b/package.json
@@ -56,7 +56,7 @@
     "allowNonAppliedPatches": true,
     "overrides": {
       "typescript": "5.4.5",
-      "@10play/tentap-editor": "0.5.11",
+      "@10play/tentap-editor": "0.5.21",
       "@tiptap/suggestion": "2.6.0",
       "@tiptap/extension-mention": "2.6.0",
       "@tiptap/extension-hard-break": "2.6.0",

diff --git a/packages/editor/package.json b/packages/editor/package.json
@@ -38,6 +38,6 @@
   },
   "peerDependencies": {
     "react": "^18.2.0",
-    "@10play/tentap-editor": "~0.5.11"
+    "@10play/tentap-editor": "~0.5.21"
   }
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -52,7 +52,7 @@
     "urbit-ob": "^5.0.1"
   },
   "peerDependencies": {
-    "@10play/tentap-editor": "~0.5.11",
+    "@10play/tentap-editor": "~0.5.21",
     "@urbit/sigil-js": "^2.2.0",
     "expo-image": "*",
     "react": "*",

diff --git a/packages/ui/src/components/BigInput.native.tsx b/packages/ui/src/components/BigInput.native.tsx
@@ -153,8 +153,7 @@ export function BigInput({
           placeholder={placeholder}
           bigInput
           channelType={channelType}
-          // TODO: figure out why autofocus breaks backspace
-          // shouldAutoFocus
+          shouldAutoFocus
           draftType={channelType === 'gallery' ? 'text' : undefined}
           ref={editorRef}
         />

diff --git a/packages/ui/src/components/PostScreenView.tsx b/packages/ui/src/components/PostScreenView.tsx
@@ -221,11 +221,10 @@ export function PostScreenView({
                   editPost={editPost}
                   channelType="chat"
                   getDraft={getDraft}
-                  // TODO: figure out why autofocus breaks backspace
-                  // shouldAutoFocus={
-                  // (channel.type === 'chat' && parentPost?.replyCount === 0) ||
-                  // !!editingPost
-                  // }
+                  shouldAutoFocus={
+                    (channel.type === 'chat' && parentPost?.replyCount === 0) ||
+                    !!editingPost
+                  }
                   ref={editorRef}
                 />
               )}

diff --git a/packages/ui/src/components/draftInputs/ChatInput.tsx b/packages/ui/src/components/draftInputs/ChatInput.tsx
@@ -39,8 +39,7 @@ export function ChatInput({
           setEditingPost={setEditingPost}
           editPost={editPost}
           channelType={channel.type}
-          // TODO: figure out why autoFocus breaks backspace
-          // shouldAutoFocus={!!editingPost}
+          shouldAutoFocus={!!editingPost}
           showInlineAttachments
           showAttachmentButton
         />

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml