From 5cfe5e28c8716c06ad037343644e17adfb5c78e0 Mon Sep 17 00:00:00 2001 From: Cedric van Putten Date: Thu, 20 Oct 2022 18:16:22 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Upgrade=20`@react-native-community/datetime?= =?UTF-8?q?picker@6.5.0`=20=E2=9E=A1=EF=B8=8F=20`@react-native-community/d?= =?UTF-8?q?atetimepicker@6.5.2`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datetimepicker/MinuteIntervalSnappableTimePickerDialog.java | 2 ++ .../components/datetimepicker/RNDatePickerDialogFragment.java | 2 -- .../datetimepicker/RNDismissableDatePickerDialog.java | 2 ++ .../components/datetimepicker/RNTimePickerDialogFragment.java | 2 -- apps/bare-expo/package.json | 2 +- apps/native-component-list/package.json | 2 +- packages/expo/bundledNativeModules.json | 2 +- react-native-lab/react-native | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/MinuteIntervalSnappableTimePickerDialog.java b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/MinuteIntervalSnappableTimePickerDialog.java index ca662a09581b1..24980b37ef593 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/MinuteIntervalSnappableTimePickerDialog.java +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/MinuteIntervalSnappableTimePickerDialog.java @@ -34,6 +34,7 @@ public MinuteIntervalSnappableTimePickerDialog( RNTimePickerDisplay display ) { super(context, listener, hourOfDay, minute, is24HourView); + setCanceledOnTouchOutside(true); mTimePickerInterval = minuteInterval; mTimeSetListener = listener; mDisplay = display; @@ -51,6 +52,7 @@ public MinuteIntervalSnappableTimePickerDialog( RNTimePickerDisplay display ) { super(context, theme, listener, hourOfDay, minute, is24HourView); + setCanceledOnTouchOutside(true); mTimePickerInterval = minuteInterval; mTimeSetListener = listener; mDisplay = display; diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNDatePickerDialogFragment.java b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNDatePickerDialogFragment.java index 5063eb44c62f9..2d17afcd7f987 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNDatePickerDialogFragment.java +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNDatePickerDialogFragment.java @@ -7,8 +7,6 @@ package versioned.host.exp.exponent.modules.api.components.datetimepicker; -import host.exp.expoview.R; - import android.annotation.SuppressLint; import android.app.DatePickerDialog; import android.app.DatePickerDialog.OnDateSetListener; diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNDismissableDatePickerDialog.java b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNDismissableDatePickerDialog.java index 37be7bc243371..2ead5923e1d25 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNDismissableDatePickerDialog.java +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNDismissableDatePickerDialog.java @@ -40,6 +40,7 @@ public RNDismissableDatePickerDialog( int dayOfMonth, RNDatePickerDisplay display) { super(context, callback, year, monthOfYear, dayOfMonth); + setCanceledOnTouchOutside(true); fixSpinner(context, year, monthOfYear, dayOfMonth, display); } @@ -52,6 +53,7 @@ public RNDismissableDatePickerDialog( int dayOfMonth, RNDatePickerDisplay display) { super(context, theme, callback, year, monthOfYear, dayOfMonth); + setCanceledOnTouchOutside(true); fixSpinner(context, year, monthOfYear, dayOfMonth, display); } diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNTimePickerDialogFragment.java b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNTimePickerDialogFragment.java index 14b8882ece6eb..04b5acf18f683 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNTimePickerDialogFragment.java +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNTimePickerDialogFragment.java @@ -8,8 +8,6 @@ package versioned.host.exp.exponent.modules.api.components.datetimepicker; -import host.exp.expoview.R; - import android.app.Dialog; import android.app.TimePickerDialog; import android.app.TimePickerDialog.OnTimeSetListener; diff --git a/apps/bare-expo/package.json b/apps/bare-expo/package.json index 294193861fb25..9d598265970c3 100644 --- a/apps/bare-expo/package.json +++ b/apps/bare-expo/package.json @@ -92,7 +92,7 @@ "dependencies": { "@babel/runtime": "^7.14.0", "@react-native-async-storage/async-storage": "~1.17.3", - "@react-native-community/datetimepicker": "6.5.0", + "@react-native-community/datetimepicker": "6.5.2", "@react-native-community/netinfo": "9.3.3", "@react-native-community/slider": "4.2.4", "@react-native-community/viewpager": "5.0.11", diff --git a/apps/native-component-list/package.json b/apps/native-component-list/package.json index 9e7541a3107ed..c58e657097088 100644 --- a/apps/native-component-list/package.json +++ b/apps/native-component-list/package.json @@ -42,7 +42,7 @@ "dependencies": { "@expo/react-native-action-sheet": "^3.8.0", "@react-native-async-storage/async-storage": "~1.17.3", - "@react-native-community/datetimepicker": "6.5.0", + "@react-native-community/datetimepicker": "6.5.2", "@react-native-community/netinfo": "9.3.3", "@react-native-community/slider": "4.2.4", "@react-native-masked-view/masked-view": "0.2.6", diff --git a/packages/expo/bundledNativeModules.json b/packages/expo/bundledNativeModules.json index c032fe9aec478..3ea7bb2a2451c 100644 --- a/packages/expo/bundledNativeModules.json +++ b/packages/expo/bundledNativeModules.json @@ -1,7 +1,7 @@ { "@expo/vector-icons": "^13.0.0", "@react-native-async-storage/async-storage": "~1.17.3", - "@react-native-community/datetimepicker": "6.5.0", + "@react-native-community/datetimepicker": "6.5.2", "@react-native-masked-view/masked-view": "0.2.7", "@react-native-community/netinfo": "9.3.3", "@react-native-community/slider": "4.2.4", diff --git a/react-native-lab/react-native b/react-native-lab/react-native index 02714ab44d1e2..813e4ac5956ca 160000 --- a/react-native-lab/react-native +++ b/react-native-lab/react-native @@ -1 +1 @@ -Subproject commit 02714ab44d1e206fa80e81aef618e61017cccdc1 +Subproject commit 813e4ac5956ca5d383c5e11c769cd2ab14024cca From b0922709b24e3a3fea99836f4dc4ed41701852b1 Mon Sep 17 00:00:00 2001 From: Cedric van Putten Date: Thu, 20 Oct 2022 18:23:30 +0200 Subject: [PATCH 2/3] Add missing changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec1e9f34de39c..5acab8edd496e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ Package-specific changes not released in any SDK will be added here just before - Updated `@react-native-community/slider` from `4.2.3` to `4.2.4`. ([#19424](https://github.com/expo/expo/pull/19424)) by [@kudo](https://github.com/kudo)) - Updated `react-native-svg` from `12.3.0` to `13.4.0`. ([#19434](https://github.com/expo/expo/pull/19434) by [@lukmccall](https://github.com/lukmccall)) - Updated `react-native-reanimated` from `2.10.0` to `2.11.0`. ([#19602](https://github.com/expo/expo/pull/19602) by [@lukmccall](https://github.com/lukmccall)) +- Updated `@react-native-community/datetimepicker` from `6.5.0` to `6.5.2`. ([#19642](https://github.com/expo/expo/pull/19642) by [@byCedric](https://github.com/byCedric)) ### 🛠 Breaking changes From e87676529f720edf389a44f661fa5969e561bc88 Mon Sep 17 00:00:00 2001 From: Cedric van Putten Date: Thu, 20 Oct 2022 18:26:44 +0200 Subject: [PATCH 3/3] Revert the missing R import in versioned rnc/datetimepicker --- .../components/datetimepicker/RNDatePickerDialogFragment.java | 2 ++ .../components/datetimepicker/RNTimePickerDialogFragment.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNDatePickerDialogFragment.java b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNDatePickerDialogFragment.java index 2d17afcd7f987..5063eb44c62f9 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNDatePickerDialogFragment.java +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNDatePickerDialogFragment.java @@ -7,6 +7,8 @@ package versioned.host.exp.exponent.modules.api.components.datetimepicker; +import host.exp.expoview.R; + import android.annotation.SuppressLint; import android.app.DatePickerDialog; import android.app.DatePickerDialog.OnDateSetListener; diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNTimePickerDialogFragment.java b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNTimePickerDialogFragment.java index 04b5acf18f683..14b8882ece6eb 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNTimePickerDialogFragment.java +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/datetimepicker/RNTimePickerDialogFragment.java @@ -8,6 +8,8 @@ package versioned.host.exp.exponent.modules.api.components.datetimepicker; +import host.exp.expoview.R; + import android.app.Dialog; import android.app.TimePickerDialog; import android.app.TimePickerDialog.OnTimeSetListener;