diff --git a/README.md b/README.md
index 1fe203da16..7aa644bbd3 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,13 @@ With Storybook for React Native you can design and develop individual React Nati
This readme will be used for 6.0 documentation going forward, [find the 5.3 readme here](https://github.com/storybookjs/react-native/tree/v5.3.25#readme)
-The 6.0 alpha is out now `6.0.1-alpha.6` to try it out follow [this guide](https://github.com/storybookjs/react-native/blob/next-6.0/v6README.md) (work in progress)
+The 6.0 alpha is out now `6.0.1-alpha.7` to try it out follow [this guide](https://github.com/storybookjs/react-native/blob/next-6.0/v6README.md) (work in progress).
+
+To try out the 6.0 alpha alongside react native web storybook you can use the expo template, [see here for more info](https://github.com/dannyhw/expo-template-storybook).
+
+```
+expo init --template expo-template-storybook AwesomeStorybook
+```
For more information visit: [storybook.js.org](https://storybook.js.org)
diff --git a/addons/ondevice-controls/package.json b/addons/ondevice-controls/package.json
index 479a5e2bcb..6395d07ded 100644
--- a/addons/ondevice-controls/package.json
+++ b/addons/ondevice-controls/package.json
@@ -36,8 +36,8 @@
"core-js": "^3.0.1",
"deep-equal": "^1.0.1",
"prop-types": "^15.7.2",
- "react-native-modal-datetime-picker": "^10.1.0",
- "react-native-modal-selector": "^2.0.2",
+ "react-native-modal-datetime-picker": "^13.0.1",
+ "react-native-modal-selector": "^2.1.0",
"tinycolor2": "^1.4.1"
},
"devDependencies": {
diff --git a/addons/ondevice-controls/src/types/Date.tsx b/addons/ondevice-controls/src/types/Date.tsx
index df3bf567e0..89e25ca8ee 100644
--- a/addons/ondevice-controls/src/types/Date.tsx
+++ b/addons/ondevice-controls/src/types/Date.tsx
@@ -32,7 +32,14 @@ const DateType = ({ onChange, arg: { name, value } }: DateProps) => {
setVisiblePicker('none');
};
- const date = useMemo(() => new Date(value), [value]);
+ const date = useMemo(() => {
+ const dateValue = new Date(value);
+ if (isNaN(dateValue.valueOf())) {
+ return new Date();
+ }
+
+ return dateValue;
+ }, [value]);
// https://stackoverflow.com/a/30272803
const dateString = useMemo(
diff --git a/app/react-native/package.json b/app/react-native/package.json
index 1a4770ed4a..3293d0b976 100644
--- a/app/react-native/package.json
+++ b/app/react-native/package.json
@@ -66,7 +66,7 @@
"util": "^0.12.4"
},
"devDependencies": {
- "@types/react-native": "^0.65.1",
+ "@types/react-native": "^0.66.15",
"babel-jest": "^26.6.3",
"jest": "^26.6.3",
"react-test-renderer": "17.0.2"
diff --git a/examples/native/.bundle/config b/examples/native/.bundle/config
new file mode 100644
index 0000000000..848943bb52
--- /dev/null
+++ b/examples/native/.bundle/config
@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1
diff --git a/examples/native/.ruby-version b/examples/native/.ruby-version
new file mode 100644
index 0000000000..74500cee16
--- /dev/null
+++ b/examples/native/.ruby-version
@@ -0,0 +1 @@
+2.7.4
\ No newline at end of file
diff --git a/examples/native/.tool-versions b/examples/native/.tool-versions
new file mode 100644
index 0000000000..6961380dd5
--- /dev/null
+++ b/examples/native/.tool-versions
@@ -0,0 +1 @@
+java adoptopenjdk-8.0.312+7
diff --git a/examples/native/Gemfile b/examples/native/Gemfile
new file mode 100644
index 0000000000..c72a1ae2c6
--- /dev/null
+++ b/examples/native/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby '2.7.4'
+gem 'cocoapods', '~> 1.11', '>= 1.11.2'
diff --git a/examples/native/android/app/build.gradle b/examples/native/android/app/build.gradle
index ae547900d3..1e7788d6c9 100644
--- a/examples/native/android/app/build.gradle
+++ b/examples/native/android/app/build.gradle
@@ -78,7 +78,7 @@ import com.android.build.OutputFile
*/
project.ext.react = [
- enableHermes: false, // clean and rebuild if changing
+ enableHermes: true, // clean and rebuild if changing
cliPath: "../../../../node_modules/react-native/cli.js",
]
diff --git a/examples/native/android/app/proguard-rules.pro b/examples/native/android/app/proguard-rules.pro
index 11b025724a..9195e03e83 100644
--- a/examples/native/android/app/proguard-rules.pro
+++ b/examples/native/android/app/proguard-rules.pro
@@ -8,3 +8,5 @@
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
+-keep class com.facebook.hermes.unicode.** { *; }
+-keep class com.facebook.jni.** { *; }
\ No newline at end of file
diff --git a/examples/native/android/app/src/main/res/drawable/rn_edit_text_material.xml b/examples/native/android/app/src/main/res/drawable/rn_edit_text_material.xml
new file mode 100644
index 0000000000..bb6f578c3f
--- /dev/null
+++ b/examples/native/android/app/src/main/res/drawable/rn_edit_text_material.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+