fix: use label for consistency, made label optional

Vali-98 · Feb 4, 2025 · ae5894a · ae5894a
1 parent af8f5bc
commit ae5894a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/app/ComponentTest.tsx b/app/ComponentTest.tsx
@@ -45,7 +45,7 @@ const ComponentTest = () => {
             </View>
 
             <StringArrayEditor title="Test Input Label" value={data} setValue={setData} />
-            <ThemedCheckbox name="Test Checkbox" value={checkbox} onChangeValue={setCheckbox} />
+            <ThemedCheckbox label="Test Checkbox" value={checkbox} onChangeValue={setCheckbox} />
             <ThemedSwitch label="Test Switch" value={sw} onChangeValue={setSw} />
             <ThemedSlider
                 value={slider}

diff --git a/app/SamplerMenu.tsx b/app/SamplerMenu.tsx
@@ -218,7 +218,7 @@ const SamplerMenu = () => {
                                                 },
                                             })
                                         }}
-                                        name={samplerItem.friendlyName}
+                                        label={samplerItem.friendlyName}
                                     />
                                 )
                             case 'textinput':

diff --git a/app/components/input/ThemedCheckbox.tsx b/app/components/input/ThemedCheckbox.tsx
@@ -13,14 +13,14 @@ import Animated, {
 } from 'react-native-reanimated'
 
 type ThemedCheckboxProps = {
-    name: string
+    label?: string
     value: boolean
     onChangeValue?: (item: boolean) => void
     style?: ViewStyle
 }
 
 const ThemedCheckbox: React.FC<ThemedCheckboxProps> = ({
-    name,
+    label = undefined,
     value,
     onChangeValue = () => {},
     style = {},
@@ -73,13 +73,15 @@ const ThemedCheckbox: React.FC<ThemedCheckboxProps> = ({
                     </Animated.View>
                 )}
             </Animated.View>
-            <Text
-                style={{
-                    paddingLeft: 12,
-                    color: value ? theme.color.text._100 : theme.color.text._400,
-                }}>
-                {name}
-            </Text>
+            {label && (
+                <Text
+                    style={{
+                        paddingLeft: 12,
+                        color: value ? theme.color.text._100 : theme.color.text._400,
+                    }}>
+                    {label}
+                </Text>
+            )}
         </Pressable>
     )
 }

diff --git a/app/screens/FormattingManager/index.tsx b/app/screens/FormattingManager/index.tsx
@@ -338,7 +338,7 @@ const FormattingManager = () => {
                             }}>
                             <View>
                                 <ThemedCheckbox
-                                    name="Wrap In Newline"
+                                    label="Wrap In Newline"
                                     value={currentInstruct.wrap}
                                     onChangeValue={(b) => {
                                         setCurrentInstruct({
@@ -348,7 +348,7 @@ const FormattingManager = () => {
                                     }}
                                 />
                                 <ThemedCheckbox
-                                    name="Include Names"
+                                    label="Include Names"
                                     value={currentInstruct.names}
                                     onChangeValue={(b) => {
                                         setCurrentInstruct({
@@ -358,7 +358,7 @@ const FormattingManager = () => {
                                     }}
                                 />
                                 <ThemedCheckbox
-                                    name="Add Timestamp"
+                                    label="Add Timestamp"
                                     value={currentInstruct.timestamp}
                                     onChangeValue={(b) => {
                                         setCurrentInstruct({
@@ -370,7 +370,7 @@ const FormattingManager = () => {
                             </View>
                             <View>
                                 <ThemedCheckbox
-                                    name="Use Examples"
+                                    label="Use Examples"
                                     value={currentInstruct.examples}
                                     onChangeValue={(b) => {
                                         setCurrentInstruct({
@@ -380,7 +380,7 @@ const FormattingManager = () => {
                                     }}
                                 />
                                 <ThemedCheckbox
-                                    name="Use Scenario"
+                                    label="Use Scenario"
                                     value={currentInstruct.scenario}
                                     onChangeValue={(b) => {
                                         setCurrentInstruct({
@@ -391,7 +391,7 @@ const FormattingManager = () => {
                                 />
 
                                 <ThemedCheckbox
-                                    name="Use Personality"
+                                    label="Use Personality"
                                     value={currentInstruct.personality}
                                     onChangeValue={(b) => {
                                         setCurrentInstruct({
@@ -430,7 +430,7 @@ const FormattingManager = () => {
                                 {autoformatterData.map((item, index) => (
                                     <ThemedCheckbox
                                         key={item.label}
-                                        name={item.label}
+                                        label={item.label}
                                         value={currentInstruct.format_type === index}
                                         onChangeValue={(b) => {
                                             if (b)
-Original file line number
+Diff line change
@@ Expand Up / @@ -218,7 +218,7 @@ const SamplerMenu = () => { @@
                                                     },
                                                 })
                                             }}
-                                            name={samplerItem.friendlyName}
+                                            label={samplerItem.friendlyName}
                                         />
                                     )
                                 case 'textinput':
@@ Expand Down @@