Skip to content

Commit 7e9ba65

Browse files
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # README.md # index.js # ios/RNTextInputMask.h # ios/RNTextInputMask.m # package.json # react-native-text-input-mask.podspec
2 parents c5c57b6 + 26698c7 commit 7e9ba65

File tree

73 files changed

+22953
-10115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+22953
-10115
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ node_modules/
99
npm-debug.log
1010
yarn-error.log
1111

12+
#typescript
13+
dist/
1214

1315
# Xcode
1416
#

README.md

Lines changed: 20 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -17,62 +17,26 @@ Text input mask for React Native on iOS and Android.
1717

1818
```bash
1919
npm install --save react-native-text-input-mask
20+
2021
# --- or ---
22+
2123
yarn add react-native-text-input-mask
2224
```
2325

2426
# Installation
2527

2628
<details>
27-
<summary><b>For RN >= 0.61</b></summary>
29+
<summary><b>For RN >= 0.60</b></summary>
2830

2931
#### iOS
3032

31-
1. Add following lines to your target in `Podfile`
33+
1. Add following lines to your target in `Podfile`. Linking is not required in React Native 0.60 and above.
34+
3235
```
3336
use_frameworks!
34-
pod 'RNInputMask', :path => '../node_modules/react-native-text-input-mask/ios/InputMask'
35-
```
36-
2. Run following command
37-
```bash
38-
cd ios && pod install
3937
```
4038

41-
#### Android
42-
43-
No need to do anything.
44-
45-
</details>
46-
47-
<details>
48-
<summary><b>For RN = 0.60.*</b></summary>
49-
50-
#### iOS
51-
52-
1. In XCode, in the project navigator, right click your `[your project's name]` folder, choose ➜ `Add Files to [your project's name]`
53-
54-
![Create Swift File](https://i.imgur.com/00K5UZ1.png)
55-
56-
2. Select `Swift File``Next`
57-
58-
![Create Swift File](https://i.imgur.com/Mdc9MLk.png)
59-
60-
3. Specify name for example `Dummy.swift``Create`
61-
62-
![Create Swift File](https://i.imgur.com/2HSk7Jp.png)
63-
64-
4. Now a pop up is shown select `Create Bridging Header`
65-
66-
![Create Swift File](https://i.imgur.com/f2zA0n9.png)
67-
68-
5. Add following line to your target in `Podfile`
69-
```
70-
pod 'RNInputMask', :path => '../node_modules/react-native-text-input-mask/ios/InputMask'
71-
```
72-
6. Run following command
73-
```bash
74-
cd ios && pod install
75-
```
39+
2. Run `pod install` in the `ios` directory.
7640

7741
#### Android
7842

@@ -82,7 +46,9 @@ No need to do anything.
8246

8347
<details><summary><b>For RN < 0.60</b></summary>
8448

85-
### Auto Linking
49+
### WARNING! This is no longer officially supported, these instructions are out of date and may no longer work, we recommend upgrading to a newer version of React Native.
50+
51+
### Link
8652
```bash
8753
react-native link react-native-text-input-mask
8854
```
@@ -122,7 +88,6 @@ react-native link react-native-text-input-mask
12288
import TextInputMask from 'react-native-text-input-mask';
12389
...
12490
<TextInputMask
125-
refInput={ref => { this.input = ref }}
12691
onChangeText={(formatted, extracted) => {
12792
console.log(formatted) // +1 (123) 456-78-90
12893
console.log(extracted) // 1234567890
@@ -132,6 +97,17 @@ import TextInputMask from 'react-native-text-input-mask';
13297
...
13398
```
13499

100+
## Testing
101+
102+
### Jest
103+
104+
Make sure to [mock](https://jestjs.io/docs/en/manual-mocks#mocking-node-modules) the following to `jest.setup.js`:
105+
```javascript
106+
jest.mock('react-native-text-input-mask', () => ({
107+
default: jest.fn(),
108+
}))
109+
```
110+
135111
## More info
136112

137113
[RedMadRobot Input Mask Android](https://github.com/RedMadRobot/input-mask-android)

android/build.gradle

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,29 @@ android {
2424
}
2525
}
2626

27+
buildscript {
28+
repositories {
29+
jcenter()
30+
google()
31+
mavenCentral()
32+
}
33+
dependencies {
34+
classpath 'com.android.tools.build:gradle:4.1.2'
35+
}
36+
}
37+
38+
repositories {
39+
jcenter()
40+
google()
41+
mavenCentral()
42+
maven {
43+
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
44+
url "$rootDir/../node_modules/react-native/android"
45+
}
46+
}
47+
2748
dependencies {
2849
implementation 'com.facebook.react:react-native:+'
29-
implementation 'com.redmadrobot:inputmask:4.1.0'
30-
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.21'
50+
implementation 'com.redmadrobot:input-mask-android:6.0.0'
51+
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.21'
3152
}
57.8 KB
Binary file not shown.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

android/gradlew

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
19+
##############################################################################
20+
##
21+
## Gradle start up script for UN*X
22+
##
23+
##############################################################################
24+
25+
# Attempt to set APP_HOME
26+
# Resolve links: $0 may be a link
27+
PRG="$0"
28+
# Need this for relative symlinks.
29+
while [ -h "$PRG" ] ; do
30+
ls=`ls -ld "$PRG"`
31+
link=`expr "$ls" : '.*-> \(.*\)$'`
32+
if expr "$link" : '/.*' > /dev/null; then
33+
PRG="$link"
34+
else
35+
PRG=`dirname "$PRG"`"/$link"
36+
fi
37+
done
38+
SAVED="`pwd`"
39+
cd "`dirname \"$PRG\"`/" >/dev/null
40+
APP_HOME="`pwd -P`"
41+
cd "$SAVED" >/dev/null
42+
43+
APP_NAME="Gradle"
44+
APP_BASE_NAME=`basename "$0"`
45+
46+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
48+
49+
# Use the maximum available, or set MAX_FD != -1 to use that value.
50+
MAX_FD="maximum"
51+
52+
warn () {
53+
echo "$*"
54+
}
55+
56+
die () {
57+
echo
58+
echo "$*"
59+
echo
60+
exit 1
61+
}
62+
63+
# OS specific support (must be 'true' or 'false').
64+
cygwin=false
65+
msys=false
66+
darwin=false
67+
nonstop=false
68+
case "`uname`" in
69+
CYGWIN* )
70+
cygwin=true
71+
;;
72+
Darwin* )
73+
darwin=true
74+
;;
75+
MINGW* )
76+
msys=true
77+
;;
78+
NONSTOP* )
79+
nonstop=true
80+
;;
81+
esac
82+
83+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
84+
85+
86+
# Determine the Java command to use to start the JVM.
87+
if [ -n "$JAVA_HOME" ] ; then
88+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
89+
# IBM's JDK on AIX uses strange locations for the executables
90+
JAVACMD="$JAVA_HOME/jre/sh/java"
91+
else
92+
JAVACMD="$JAVA_HOME/bin/java"
93+
fi
94+
if [ ! -x "$JAVACMD" ] ; then
95+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
96+
97+
Please set the JAVA_HOME variable in your environment to match the
98+
location of your Java installation."
99+
fi
100+
else
101+
JAVACMD="java"
102+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
103+
104+
Please set the JAVA_HOME variable in your environment to match the
105+
location of your Java installation."
106+
fi
107+
108+
# Increase the maximum file descriptors if we can.
109+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
110+
MAX_FD_LIMIT=`ulimit -H -n`
111+
if [ $? -eq 0 ] ; then
112+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
113+
MAX_FD="$MAX_FD_LIMIT"
114+
fi
115+
ulimit -n $MAX_FD
116+
if [ $? -ne 0 ] ; then
117+
warn "Could not set maximum file descriptor limit: $MAX_FD"
118+
fi
119+
else
120+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
121+
fi
122+
fi
123+
124+
# For Darwin, add options to specify how the application appears in the dock
125+
if $darwin; then
126+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
127+
fi
128+
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
134+
JAVACMD=`cygpath --unix "$JAVACMD"`
135+
136+
# We build the pattern for arguments to be converted via cygpath
137+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
138+
SEP=""
139+
for dir in $ROOTDIRSRAW ; do
140+
ROOTDIRS="$ROOTDIRS$SEP$dir"
141+
SEP="|"
142+
done
143+
OURCYGPATTERN="(^($ROOTDIRS))"
144+
# Add a user-defined pattern to the cygpath arguments
145+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
146+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
147+
fi
148+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
149+
i=0
150+
for arg in "$@" ; do
151+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
152+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
153+
154+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
155+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
156+
else
157+
eval `echo args$i`="\"$arg\""
158+
fi
159+
i=`expr $i + 1`
160+
done
161+
case $i in
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
172+
esac
173+
fi
174+
175+
# Escape application args
176+
save () {
177+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
178+
echo " "
179+
}
180+
APP_ARGS=`save "$@"`
181+
182+
# Collect all arguments for the java command, following the shell quoting and substitution rules
183+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
184+
185+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)