fix(tui): migrate to opentui 0.2 APIs

Author: Paliago

bun.lock

@@ -20,12 +20,12 @@
     "@awsesh/core": "workspace:*",
     "@awsesh/script": "workspace:*",
     "@clack/prompts": "^0.11.0",
-    "@opentui/core": "0.1.73",
-    "@opentui/solid": "0.1.73",
+    "@opentui/core": "0.2.2",
+    "@opentui/solid": "0.2.2",
     "fuzzysort": "^3.1.0",
     "open": "10.1.2",
     "remeda": "^2.32.0",
-    "solid-js": "1.9.9",
+    "solid-js": "1.9.12",
     "xdg-basedir": "5.1.0",
     "yargs": "18.0.0"
   },

packages/awsesh/package.json

@@ -112,11 +112,11 @@ DialogCredentialActions.show = (
   onRefresh: () => void,
   onKill: () => void
 ) => {
-  dialog.replace(() => (
+  dialog.replace(
     <DialogCredentialActions
       credentialName={credentialName}
       onRefresh={onRefresh}
       onKill={onKill}
     />
-  ))
+  )
 }

packages/awsesh/src/cli/cmd/tui/component/dialog-credential-actions.tsx

@@ -24,12 +24,10 @@ export function DialogCredentialsCleanup(props: DialogCredentialsCleanupProps) {
 DialogCredentialsCleanup.show = (dialog: DialogContext) => {
   return new Promise<boolean>((resolve) => {
     dialog.replace(
-      () => (
-        <DialogCredentialsCleanup
-          onConfirm={() => resolve(true)}
-          onCancel={() => resolve(false)}
-        />
-      ),
+      <DialogCredentialsCleanup
+        onConfirm={() => resolve(true)}
+        onCancel={() => resolve(false)}
+      />,
       () => resolve(false),
     )
   })

packages/awsesh/src/cli/cmd/tui/component/dialog-credentials-cleanup.tsx

@@ -56,14 +56,14 @@ export function DialogKeybindList() {
   }
 
   function showList() {
-    dialog.replace(() => <DialogKeybindList />)
+    dialog.replace(<DialogKeybindList />)
   }
 
   function handleSelect(opt: DialogSelectOption<keyof KeybindsConfig>) {
     const def = keybindDefinitions.find((d) => d.key === opt.value)
     if (!def) return
 
-    dialog.replace(() => (
+    dialog.replace(
       <DialogKeybindEdit
         keybindKey={def.key}
         label={def.label}
@@ -72,7 +72,7 @@ export function DialogKeybindList() {
         }}
         onBack={showList}
       />
-    ))
+    )
   }
 
   return (

packages/awsesh/src/cli/cmd/tui/component/dialog-keybind-list.tsx

@@ -43,13 +43,11 @@ export function DialogSessionDelete(props: DialogSessionDeleteProps) {
 DialogSessionDelete.show = (dialog: DialogContext, sessionName: string) => {
   return new Promise<boolean>((resolve) => {
     dialog.replace(
-      () => (
-        <DialogSessionDelete
-          sessionName={sessionName}
-          onSuccess={() => resolve(true)}
-          onCancel={() => resolve(false)}
-        />
-      ),
+      <DialogSessionDelete
+        sessionName={sessionName}
+        onSuccess={() => resolve(true)}
+        onCancel={() => resolve(false)}
+      />,
       () => resolve(false),
     )
   })

packages/awsesh/src/cli/cmd/tui/component/dialog-session-delete.tsx

@@ -65,7 +65,7 @@ export function DialogSessionForm(props: DialogSessionFormProps) {
       if (nameInput) {
         nameInput.focus()
         if (isEdit) {
-          nameInput.cursorPosition = nameInput.value.length
+          nameInput.cursorOffset = nameInput.value.length
         }
       }
     }, 1)
@@ -141,7 +141,7 @@ export function DialogSessionForm(props: DialogSessionFormProps) {
       const input = inputs()[nextIndex]
       if (input) {
         input.focus()
-        input.cursorPosition = input.value.length
+        input.cursorOffset = input.value.length
       }
     }
 
@@ -216,14 +216,12 @@ DialogSessionForm.show = (
 ) => {
   return new Promise<boolean>((resolve) => {
     dialog.replace(
-      () => (
-        <DialogSessionForm
-          mode={options.mode}
-          session={options.session}
-          onSuccess={() => resolve(true)}
-          onCancel={() => resolve(false)}
-        />
-      ),
+      <DialogSessionForm
+        mode={options.mode}
+        session={options.session}
+        onSuccess={() => resolve(true)}
+        onCancel={() => resolve(false)}
+      />,
       () => resolve(false)
     )
   })

packages/awsesh/src/cli/cmd/tui/component/dialog-session-form.tsx

@@ -20,7 +20,7 @@ export function DialogSettings() {
       value: "theme",
       category: "Appearance",
       onSelect: () => {
-        dialog.replace(() => <DialogThemeList />)
+        dialog.replace(<DialogThemeList />)
       },
     },
     {
@@ -73,7 +73,7 @@ export function DialogSettings() {
       value: "keybinds",
       category: "Preferences",
       onSelect: () => {
-        dialog.replace(() => <DialogKeybindList />)
+        dialog.replace(<DialogKeybindList />)
       },
     },
   ])

packages/awsesh/src/cli/cmd/tui/component/dialog-settings.tsx

@@ -197,7 +197,5 @@ DialogSSOLogin.show = (
   onSuccess: () => void,
   onError: (error: string) => void
 ) => {
-  dialog.replace(
-    () => <DialogSSOLogin session={session} onSuccess={onSuccess} onError={onError} />
-  )
+  dialog.replace(<DialogSSOLogin session={session} onSuccess={onSuccess} onError={onError} />)
 }

packages/awsesh/src/cli/cmd/tui/component/dialog-sso-login.tsx

@@ -74,7 +74,7 @@ function init(dialog: ReturnType<typeof useDialog>, keybind: ReturnType<typeof u
       })
     },
     show() {
-      dialog.replace(() => <DialogCommand options={options()} />)
+      dialog.replace(<DialogCommand options={options()} />)
     },
     trigger(id: string) {
       for (const option of options()) {