Skip to content

fix: resolve conflict #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
honghoangsts merged 20 commits into from
Nov 3, 2025
Merged

fix: resolve conflict #124

Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
50c5203
chore: add publish config
honghp95 May 25, 2024
4714ebe
v0.0.11
honghoangsts May 25, 2024
f23ff7b
chore: release 0.0.12
honghoangsts May 26, 2024
3071a00
Merge pull request #104 from saigontechnology/develop
honghoangsts Jun 5, 2024
52f173a
chore: bump version
honghoangsts Jun 5, 2024
7266aec
chore: release 0.1.0
honghoangsts Jun 5, 2024
cc62eca
feat: refactor component (#105)
loc-nguyenthien Dec 23, 2024
c27fd26
chore: release 0.2.0
honghp95 Dec 23, 2024
9a18c7f
fix: text not recognize type (#106)
huydosgtech Mar 11, 2025
4a003b6
feat: enhance CodeInput component with improved quality and documenta…
honghoangsts Jul 17, 2025
40d0795
chore: release 0.3.0
honghp95 Jul 17, 2025
8266350
feat: add focusCellWrapperStyle
honghp95 Jul 17, 2025
48e50f4
chore: release 0.4.0
honghp95 Jul 17, 2025
fb40960
release 0.5.0 (#110)
honghoangsts Aug 7, 2025
dbbf2e2
feat: remove unused import
honghoangsts Aug 7, 2025
1e6e0aa
chore: release 0.5.0
honghp95 Aug 7, 2025
be07f4e
feat: remove podspec file that causing error on expo 54 (#118)
loc-nguyenthien Oct 24, 2025
4fe61bd
feat: apply theme for TextInput (#121)
loc-nguyenthien Oct 25, 2025
50bcea5
Merge branch 'develop'
hoangSTS Nov 3, 2025
924a264
fix: duplicated import
hoangSTS Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/components/TextInput/TextInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ import type {
TextStyle,
ViewStyle,
} from 'react-native'
import {TextInput as RNTextInput, StyleSheet, View} from 'react-native'
import {TextInput as RNTextInput, View} from 'react-native'
import styled from 'styled-components/native'
import TextInputOutlined from './TextInputOutlined'
import {CustomIcon, CustomIconProps, Error} from './components'
import {isIOS} from '../../helpers'
import {useTheme} from '../../hooks'
import TextInputFlat from './TextInputFlat'
import {useTheme} from '../../hooks'

export interface TextInputProps extends RNTextInputProperties {
/** Style for container */
Expand Down