simplify and clean up text inputs

tloncorp · Jan 8, 2025 · f0cf796 · f0cf796
1 parent 6d6ecac
commit f0cf796
Show file tree

Hide file tree

Showing 21 changed files with 503 additions and 317 deletions.
diff --git a/apps/tlon-mobile/src/screens/Onboarding/PasteInviteLinkScreen.tsx b/apps/tlon-mobile/src/screens/Onboarding/PasteInviteLinkScreen.tsx
@@ -8,7 +8,6 @@ import {
 import { useBranch, useLureMetadata } from '@tloncorp/app/contexts/branch';
 import { trackError, trackOnboardingAction } from '@tloncorp/app/utils/posthog';
 import {
-  DeepLinkData,
   createInviteLinkRegex,
   extractNormalizedInviteLink,
   getInviteLinkMeta,
@@ -17,7 +16,7 @@ import {
   Field,
   Pressable,
   ScreenHeader,
-  TextInputWithButton,
+  TextInput,
   TlonText,
   View,
   YStack,
@@ -159,16 +158,20 @@ export const PasteInviteLinkScreen = ({ navigation }: Props) => {
                 error={metadataError ?? errors.inviteLink?.message}
                 paddingTop="$l"
               >
-                <TextInputWithButton
+                <TextInput
                   placeholder="join.tlon.io/0v4.pca0n.evapv..."
                   onBlur={onBlur}
                   onChangeText={onChange}
                   value={value}
                   keyboardType="email-address"
                   autoCapitalize="none"
                   autoCorrect={false}
-                  buttonText="Paste"
-                  onButtonPress={onHandlePasteClick}
+                  rightControls={
+                    <TextInput.InnerButton
+                      label="Paste"
+                      onPress={onHandlePasteClick}
+                    />
+                  }
                 />
               </Field>
             )}

diff --git a/apps/tlon-mobile/src/screens/Onboarding/ShipLoginScreen.tsx b/apps/tlon-mobile/src/screens/Onboarding/ShipLoginScreen.tsx
@@ -16,7 +16,6 @@ import {
   OnboardingTextBlock,
   ScreenHeader,
   TextInput,
-  TextInputWithButton,
   TlonText,
   View,
   YStack,
@@ -211,7 +210,7 @@ export const ShipLoginScreen = ({ navigation }: Props) => {
               }}
               render={({ field: { onChange, onBlur, value } }) => (
                 <Field label="Access Code" error={errors.accessCode?.message}>
-                  <TextInputWithButton
+                  <TextInput
                     testID="textInput accessCode"
                     placeholder="xxxxxx-xxxxxx-xxxxxx-xxxxxx"
                     onBlur={() => {
@@ -226,8 +225,12 @@ export const ShipLoginScreen = ({ navigation }: Props) => {
                     autoCorrect={false}
                     returnKeyType="send"
                     enablesReturnKeyAutomatically
-                    buttonText={codevisible ? 'Hide' : 'Show'}
-                    onButtonPress={() => setCodeVisible(!codevisible)}
+                    rightControls={
+                      <TextInput.InnerButton
+                        label={codevisible ? 'Hide' : 'Show'}
+                        onPress={() => setCodeVisible(!codevisible)}
+                      />
+                    }
                   />
                 </Field>
               )}

diff --git a/apps/tlon-mobile/src/screens/Onboarding/TlonLoginLegacy.tsx b/apps/tlon-mobile/src/screens/Onboarding/TlonLoginLegacy.tsx
@@ -21,7 +21,6 @@ import {
   OnboardingTextBlock,
   ScreenHeader,
   TextInput,
-  TextInputWithButton,
   TlonText,
   View,
   YStack,
@@ -229,7 +228,7 @@ export const TlonLoginLegacy = ({ navigation }: Props) => {
               }}
               render={({ field: { onChange, onBlur, value } }) => (
                 <Field label="Password" error={errors.password?.message}>
-                  <TextInputWithButton
+                  <TextInput
                     placeholder="Password"
                     onBlur={() => {
                       onBlur();
@@ -243,8 +242,12 @@ export const TlonLoginLegacy = ({ navigation }: Props) => {
                     autoCorrect={false}
                     returnKeyType="send"
                     enablesReturnKeyAutomatically
-                    buttonText={passwordVisible ? 'Hide' : 'Show'}
-                    onButtonPress={() => setPasswordVisible(!passwordVisible)}
+                    rightControls={
+                      <TextInput.InnerButton
+                        label={passwordVisible ? 'Hide' : 'Show'}
+                        onPress={() => setPasswordVisible(!passwordVisible)}
+                      />
+                    }
                   />
                 </Field>
               )}

diff --git a/packages/app/fixtures/Form.fixture.tsx b/packages/app/fixtures/Form.fixture.tsx
@@ -1,6 +1,6 @@
-import { Button, ScrollView } from '@tloncorp/ui';
+import { Button, IconType, ScrollView, View } from '@tloncorp/ui';
 import * as Form from '@tloncorp/ui/src/components/Form';
-import { useMemo } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
@@ -25,7 +25,12 @@ const FormFixture = () => {
 
   const options: Form.RadioInputOption<string>[] = [
     { title: 'One', value: 'one', description: 'This is one things' },
-    { title: 'Two', value: 'two', description: 'This is two things' },
+    {
+      title: 'Two',
+      value: 'two',
+      description: 'This is two things',
+      disabled: true,
+    },
     { title: 'Three', value: 'three', description: 'This is three things' },
   ];
 
@@ -51,10 +56,21 @@ const FormFixture = () => {
       icon: 'ChannelGalleries',
     },
   ];
+  const [selectedToggleGroupOption, setSelectedToggleGroupOptions] =
+    useState('chat');
+
+  const toggleGroupOptions: { label: string; value: string }[] = [
+    { label: 'Chat', value: 'chat' },
+    { label: 'Notebook', value: 'notebook' },
+    { label: 'Gallery', value: 'gallery' },
+    { label: 'And', value: '0' },
+    { label: 'More', value: '1' },
+    { label: 'Items', value: '2' },
+  ];
 
   return (
     <ScrollView flex={1} contentContainerStyle={{ paddingTop: insets.top }}>
-      <Form.FormFrame>
+      <Form.FormFrame backgroundType="secondary">
         <Form.ControlledImageField
           name={'image'}
           label="Image"
@@ -66,6 +82,7 @@ const FormFixture = () => {
           label="Title"
           control={control}
           rules={formRules}
+          inputProps={{ icon: 'Search', placeholder: 'Type here' }}
         />
         <Form.ControlledRadioField
           options={options}
@@ -79,37 +96,107 @@ const FormFixture = () => {
           label="List input"
           control={control}
         />
-        <Form.RadioControl disabled={true} />
-        <Form.RadioControl checked={false} />
-        <Form.RadioControl checked={true} />
-        <Form.ListItemInput options={listOptions} />
+
+        <Form.Field label="Toggle group">
+          <Form.ToggleGroupInput
+            value={selectedToggleGroupOption}
+            onChange={setSelectedToggleGroupOptions}
+            options={toggleGroupOptions}
+          />
+        </Form.Field>
         <Form.Field required error="Bad thing happen" label="My label">
           <Form.TextInput placeholder="Type here" />
         </Form.Field>
-        <Button
-          onPress={() =>
-            reset({
-              title: 'monk',
-              description: '',
-            })
-          }
-        >
-          <Button.Text>Reseet</Button.Text>
-        </Button>
+
+        <Form.Field label="Button input">
+          <Button
+            secondary
+            onPress={() =>
+              reset({
+                title: 'monk',
+                description: '',
+              })
+            }
+          >
+            <Button.Text>Reseet</Button.Text>
+          </Button>
+        </Form.Field>
+
         <Form.Field label="Find Friends">
-          <Form.TextInputWithIconAndButton
+          <Form.TextInput
             icon="Search"
-            buttonText="Clear"
-            onButtonPress={() => {}}
+            rightControls={
+              <Form.TextInput.InnerButton label="Clear" onPress={() => {}} />
+            }
           />
         </Form.Field>
       </Form.FormFrame>
     </ScrollView>
   );
 };
 
-export default (
-  <FixtureWrapper fillWidth fillHeight>
-    <FormFixture />
-  </FixtureWrapper>
-);
+const accents: Form.Accent[] = ['neutral', 'positive', 'negative'];
+const icons: (IconType | undefined)[] = [undefined, 'Search'];
+const buttonLabels: (string | undefined)[] = [undefined, 'Clear'];
+const backgroundTypes = ['primary', 'secondary'] as const;
+
+export default {
+  textInput: (
+    <FixtureWrapper fillWidth fillHeight safeArea={true}>
+      <ScrollView flex={1}>
+        {backgroundTypes.map((backgroundType) => (
+          <Form.FormFrame backgroundType={backgroundType} key={backgroundType}>
+            {buttonLabels.map((buttonLabel) => (
+              <React.Fragment key={buttonLabel ?? 'no-label'}>
+                {icons.map((icon) => (
+                  <React.Fragment key={icon ?? 'no-icon'}>
+                    <Form.FieldLabel paddingVertical="$2xl" margin={0}>
+                      {!icon && !buttonLabel
+                        ? 'Default'
+                        : icon && !buttonLabel
+                          ? 'Icon, no button'
+                          : !icon && buttonLabel
+                            ? 'Button, no icon'
+                            : 'Icon and button'}
+                    </Form.FieldLabel>
+                    <React.Fragment>
+                      {accents.map((accent) => (
+                        <Form.Field
+                          label={`Accent: ${accent}`}
+                          accent={accent}
+                          error={
+                            accent === 'negative'
+                              ? 'Bad thing happen'
+                              : undefined
+                          }
+                          key={accent + icon + buttonLabel}
+                        >
+                          <Form.TextInput
+                            icon={icon}
+                            placeholder="Type here"
+                            rightControls={
+                              buttonLabel ? (
+                                <Form.TextInput.InnerButton
+                                  label={buttonLabel}
+                                />
+                              ) : undefined
+                            }
+                          />
+                        </Form.Field>
+                      ))}
+                    </React.Fragment>
+                  </React.Fragment>
+                ))}
+              </React.Fragment>
+            ))}
+          </Form.FormFrame>
+        ))}
+      </ScrollView>
+    </FixtureWrapper>
+  ),
+  full: (
+    <FixtureWrapper fillWidth fillHeight>
+      <FormFixture />
+    </FixtureWrapper>
+  ),
+};
diff --git a/packages/app/tamagui.d.ts b/packages/app/tamagui.d.ts
@@ -0,0 +1,12 @@
+import { config } from '../ui/src/tamagui.config';
+
+export type Conf = typeof config;
+
+// Sets up typing for tamagui so that theme variables autocomplete
+declare module 'tamagui' {
+  interface TamaguiCustomConfig extends Conf {}
+
+  interface TypeOverride {
+    groupNames(): 'button';
+  }
+}
diff --git a/packages/app/tsconfig.json b/packages/app/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "../../tsconfig",
-  "include": ["**/*.ts", "**/*.tsx", "window.ts"],
+  "include": ["**/*.ts", "**/*.tsx", "window.ts", "tamagui.d.ts"],
   "compilerOptions": {
     "composite": true,
     "jsx": "react-jsx",

diff --git a/packages/ui/src/components/ActionList/index.tsx b/packages/ui/src/components/ActionList/index.tsx
@@ -7,10 +7,10 @@ import ListFrame from './ListFrame';
 const ActionFrame = styled(ListItemFrame, {
   borderRadius: 'unset',
   borderBottomWidth: 0.5,
-  borderBottomColor: '$secondaryBorder',
+  borderBottomColor: '$border',
   backgroundColor: 'transparent',
   pressStyle: {
-    backgroundColor: '$secondaryBorder',
+    backgroundColor: '$border',
   },
   variants: {
     last: {

diff --git a/packages/ui/src/components/ChatList.tsx b/packages/ui/src/components/ChatList.tsx
@@ -22,7 +22,7 @@ import { Text, View, YStack, getTokenValue, useTheme } from 'tamagui';
 import { useCalm, useChatOptions } from '../contexts';
 import { getChannelTitle, getGroupTitle } from '../utils';
 import { interactionWithTiming } from '../utils/animation';
-import { TextInputWithIconAndButton } from './Form';
+import { TextInput } from './Form';
 import { ChatListItem, InteractableChatListItem } from './ListItem';
 import Pressable from './Pressable';
 import { SectionListHeader } from './SectionList';
@@ -292,16 +292,20 @@ const ChatListSearch = React.memo(function ChatListSearchComponent({
         right={0}
       >
         <View paddingHorizontal="$l" paddingTop="$xl">
-          <TextInputWithIconAndButton
+          <TextInput
             icon="Search"
             placeholder="Find by name"
             value={query}
             onChangeText={onQueryChange}
             spellCheck={false}
             autoCorrect={false}
             autoCapitalize="none"
-            buttonText={query !== '' ? 'Clear' : 'Close'}
-            onButtonPress={query !== '' ? onPressClear : onPressClose}
+            rightControls={
+              <TextInput.InnerButton
+                label={query !== '' ? 'Clear' : 'Close'}
+                onPress={query !== '' ? onPressClear : onPressClose}
+              />
+            }
           />
         </View>
       </YStack>