Skip to content

Commit

Permalink
Upgrade @rnc/datetimepicker@6.2.0 ➡️ @rnc/datetimepicker@6.5.0 (#…
Browse files Browse the repository at this point in the history 
…19419)

* Upgrade `@react-native-community/datetimepicker@6.2.0` ➡️ `@react-native-community/datetimepicker@6.5.0`

* Add changelog entry for rnc datetimepicker

* Add missing R imports to datetimepicker files
  • Loading branch information
@byCedric
byCedric committed Oct 6, 2022
1 parent 37043d5 commit 220e170
Show file tree
Hide file tree
Showing 14 changed files with 188 additions and 68 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Expand Up @@ -15,6 +15,7 @@ Package-specific changes not released in any SDK will be added here just before
- Updated `@react-native-picker/picker` from `2.4.2` to `2.4.6`. ([#19390](https://github.com/expo/expo/pull/19390) by [@aleqsio](https://github.com/aleqsio))
- Updated `react-native-screens` from `3.15.0` to `3.18.0`. ([#19383](https://github.com/expo/expo/pull/19383) by [@tsapeta](https://github.com/tsapeta))
- Updated `@shopify/react-native-skia` from `0.1.136` to `0.1.153`. ([#19360](https://github.com/expo/expo/pull/19360) by [@kudo](https://github.com/kudo))
- Updated `@react-native-community/datetimepicker` from `6.2.0` to `6.5.0`. ([#19419](https://github.com/expo/expo/pull/19419) by [@byCedric](https://github.com/byCedric))

### 🛠 Breaking changes

Expand Down
87 changes: 54 additions & 33 deletions ...ponent/modules/api/components/datetimepicker/MinuteIntervalSnappableTimePickerDialog.java
View file
Expand Up @@ -76,7 +76,7 @@ private boolean isSpinner() {
* @return returns 'real' minutes (0-59)
*/
private int getRealMinutes(int minutesOrSpinnerIndex) {
if (mDisplay == RNTimePickerDisplay.SPINNER) {
if (isSpinner()) {
return minutesOrSpinnerIndex * mTimePickerInterval;
}

Expand Down Expand Up @@ -147,27 +147,42 @@ private void correctEnteredMinutes(final TimePicker view, final int hourOfDay, f
runnable = new Runnable() {
@Override
public void run() {
// set valid hour & minutes
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
view.setHour(hourOfDay);
view.setMinute(correctedMinutes);
} else {
view.setCurrentHour(hourOfDay);
// we need to set minutes to 0 for this to work on older android devices
view.setCurrentMinute(0);
view.setCurrentMinute(correctedMinutes);
}
if (pickerIsInTextInputMode()) {
// move caret to the end of input
View maybeTextInput = view.findFocus();
if (maybeTextInput instanceof EditText) {
final EditText textInput = (EditText) maybeTextInput;
textInput.setSelection(textInput.getText().length());
} else {
Log.e("RN-datetimepicker", "could not set selection on time picker, this is a known issue on some Huawei devices");
}
}
if (pickerIsInTextInputMode()) {
// only rewrite input when the value makes sense to be corrected
// eg. given interval 3, when user wants to enter 53
// we don't rewrite the first number "5" to 6, because it would be confusing
// but the value will be corrected in onTimeChanged()
// however, when they enter 10, we rewrite it to 9
boolean canRewriteTextInput = correctedMinutes > 5;
if (!canRewriteTextInput) {
return;
}
fixTime();
moveCursorToEnd();
} else {
fixTime();
}
}
private void fixTime() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
view.setHour(hourOfDay);
view.setMinute(correctedMinutes);
} else {
view.setCurrentHour(hourOfDay);
// we need to set minutes to 0 first for this to work on older android devices
view.setCurrentMinute(0);
view.setCurrentMinute(correctedMinutes);
}
}
private void moveCursorToEnd() {
View maybeTextInput = view.findFocus();
if (maybeTextInput instanceof EditText) {
final EditText textInput = (EditText) maybeTextInput;
textInput.setSelection(textInput.getText().length());
} else {
Log.e("RN-datetimepicker", "could not set selection on time picker, this is a known issue on some Huawei devices");
}
}
};

handler.postDelayed(runnable, 500);
Expand All @@ -191,15 +206,17 @@ public void onTimeChanged(final TimePicker view, final int hourOfDay, final int

@Override
public void onClick(DialogInterface dialog, int which) {
if (mTimePicker != null && which == BUTTON_POSITIVE && timePickerHasCustomMinuteInterval()) {
final int hours = mTimePicker.getCurrentHour();

final int realMinutes = getRealMinutes();
int validMinutes = isSpinner() ? realMinutes : snapRealMinutesToInterval(realMinutes);

if (mTimeSetListener != null) {
mTimeSetListener.onTimeSet(mTimePicker, hours, validMinutes);
}
boolean needsCustomHandling = timePickerHasCustomMinuteInterval() || isSpinner();
if (mTimePicker != null && which == BUTTON_POSITIVE && needsCustomHandling) {
mTimePicker.clearFocus();
final int hours = mTimePicker.getCurrentHour();
int realMinutes = getRealMinutes();
int reportedMinutes = timePickerHasCustomMinuteInterval()
? snapRealMinutesToInterval(realMinutes)
: realMinutes;
if (mTimeSetListener != null) {
mTimeSetListener.onTimeSet(mTimePicker, hours, reportedMinutes);
}
} else {
super.onClick(dialog, which);
}
Expand Down Expand Up @@ -228,15 +245,19 @@ public void updateTime(int hourOfDay, int minuteOfHour) {
public void onAttachedToWindow() {
super.onAttachedToWindow();

int timePickerId = mContext.getResources().getIdentifier("timePicker", "id", "android");
mTimePicker = this.findViewById(timePickerId);

if (timePickerHasCustomMinuteInterval()) {
setupPickerDialog();
}
}

private void setupPickerDialog() {
int timePickerId = mContext.getResources().getIdentifier("timePicker", "id", "android");
mTimePicker = this.findViewById(timePickerId);

if (mTimePicker == null) {
Log.e("RN-datetimepicker", "time picker was null");
return;
}
int realMinuteBackup = mTimePicker.getCurrentMinute();

if (isSpinner()) {
Expand Down
6 changes: 3 additions & 3 deletions ...ned/host/exp/exponent/modules/api/components/datetimepicker/RNDatePickerDialogModule.java
View file
Expand Up @@ -54,7 +54,7 @@ public DatePickerDialogListener(final Promise promise) {

@Override
public void onDateSet(DatePicker view, int year, int month, int day) {
if (!mPromiseResolved && getReactApplicationContext().hasActiveCatalystInstance()) {
if (!mPromiseResolved && getReactApplicationContext().hasActiveReactInstance()) {
WritableMap result = new WritableNativeMap();
result.putString("action", RNConstants.ACTION_DATE_SET);
result.putInt("year", year);
Expand All @@ -67,7 +67,7 @@ public void onDateSet(DatePicker view, int year, int month, int day) {

@Override
public void onDismiss(DialogInterface dialog) {
if (!mPromiseResolved && getReactApplicationContext().hasActiveCatalystInstance()) {
if (!mPromiseResolved && getReactApplicationContext().hasActiveReactInstance()) {
WritableMap result = new WritableNativeMap();
result.putString("action", RNConstants.ACTION_DISMISSED);
mPromise.resolve(result);
Expand All @@ -77,7 +77,7 @@ public void onDismiss(DialogInterface dialog) {

@Override
public void onClick(DialogInterface dialog, int which) {
if (!mPromiseResolved && getReactApplicationContext().hasActiveCatalystInstance()) {
if (!mPromiseResolved && getReactApplicationContext().hasActiveReactInstance()) {
WritableMap result = new WritableNativeMap();
result.putString("action", RNConstants.ACTION_NEUTRAL_BUTTON);
mPromise.resolve(result);
Expand Down
4 changes: 4 additions & 0 deletions ...ost/exp/exponent/modules/api/components/datetimepicker/RNDismissableDatePickerDialog.java
View file
Expand Up @@ -106,5 +106,9 @@ private void fixSpinner(Context context, int year, int month, int dayOfMonth, RN
throw new RuntimeException(e);
}
}
if (display == RNDatePickerDisplay.SPINNER){
if(this.getDatePicker() != null)
this.getDatePicker().setCalendarViewShown(false);
}
}
}
5 changes: 3 additions & 2 deletions ...d/host/exp/exponent/modules/api/components/datetimepicker/RNTimePickerDialogFragment.java
View file
Expand Up @@ -17,10 +17,10 @@
import android.content.DialogInterface;
import android.content.DialogInterface.OnDismissListener;
import android.content.DialogInterface.OnClickListener;
import android.os.Build;
import android.os.Bundle;
import android.text.format.DateFormat;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;

Expand All @@ -37,6 +37,7 @@ public class RNTimePickerDialogFragment extends DialogFragment {
@Nullable
private static OnClickListener mOnNeutralButtonActionListener;

@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final Bundle args = getArguments();
Expand Down Expand Up @@ -118,7 +119,7 @@ static TimePickerDialog createDialog(
}

@Override
public void onDismiss(DialogInterface dialog) {
public void onDismiss(@NonNull DialogInterface dialog) {
super.onDismiss(dialog);
if (mOnDismissListener != null) {
mOnDismissListener.onDismiss(dialog);
Expand Down
8 changes: 5 additions & 3 deletions ...ned/host/exp/exponent/modules/api/components/datetimepicker/RNTimePickerDialogModule.java
View file
Expand Up @@ -19,6 +19,7 @@
import android.os.Bundle;
import android.widget.TimePicker;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
Expand All @@ -39,6 +40,7 @@ public RNTimePickerDialogModule(ReactApplicationContext reactContext) {
super(reactContext);
}

@NonNull
@Override
public String getName() {
return FRAGMENT_TAG;
Expand All @@ -54,7 +56,7 @@ public TimePickerDialogListener(Promise promise) {

@Override
public void onTimeSet(TimePicker view, int hour, int minute) {
if (!mPromiseResolved && getReactApplicationContext().hasActiveCatalystInstance()) {
if (!mPromiseResolved && getReactApplicationContext().hasActiveReactInstance()) {
WritableMap result = new WritableNativeMap();
result.putString("action", RNConstants.ACTION_TIME_SET);
result.putInt("hour", hour);
Expand All @@ -66,7 +68,7 @@ public void onTimeSet(TimePicker view, int hour, int minute) {

@Override
public void onDismiss(DialogInterface dialog) {
if (!mPromiseResolved && getReactApplicationContext().hasActiveCatalystInstance()) {
if (!mPromiseResolved && getReactApplicationContext().hasActiveReactInstance()) {
WritableMap result = new WritableNativeMap();
result.putString("action", RNConstants.ACTION_DISMISSED);
mPromise.resolve(result);
Expand All @@ -76,7 +78,7 @@ public void onDismiss(DialogInterface dialog) {

@Override
public void onClick(DialogInterface dialog, int which) {
if (!mPromiseResolved && getReactApplicationContext().hasActiveCatalystInstance()) {
if (!mPromiseResolved && getReactApplicationContext().hasActiveReactInstance()) {
WritableMap result = new WritableNativeMap();
result.putString("action", RNConstants.ACTION_NEUTRAL_BUTTON);
mPromise.resolve(result);
Expand Down
2 changes: 1 addition & 1 deletion apps/bare-expo/package.json
View file
Expand Up @@ -92,7 +92,7 @@
"dependencies": {
"@babel/runtime": "^7.14.0",
"@react-native-async-storage/async-storage": "~1.17.3",
"@react-native-community/datetimepicker": "6.2.0",
"@react-native-community/datetimepicker": "6.5.0",
"@react-native-community/netinfo": "9.3.3",
"@react-native-community/slider": "4.2.3",
"@react-native-community/viewpager": "5.0.11",
Expand Down
2 changes: 1 addition & 1 deletion apps/native-component-list/package.json
View file
Expand Up @@ -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.2.0",
"@react-native-community/datetimepicker": "6.5.0",
"@react-native-community/netinfo": "9.3.3",
"@react-native-community/slider": "4.2.3",
"@react-native-masked-view/masked-view": "0.2.6",
Expand Down
6 changes: 6 additions & 0 deletions ios/Exponent.xcodeproj/project.pbxproj
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion ios/Exponent/Versioned/Core/Api/Components/DateTimePicker/RNDateTimePicker.m
View file
Expand Up @@ -13,6 +13,7 @@
@interface RNDateTimePicker ()

@property (nonatomic, copy) RCTBubblingEventBlock onChange;
@property (nonatomic, copy) RCTBubblingEventBlock onPickerDismiss;
@property (nonatomic, assign) NSInteger reactMinuteInterval;

@end
Expand All @@ -22,8 +23,14 @@ @implementation RNDateTimePicker
- (instancetype)initWithFrame:(CGRect)frame
{
if ((self = [super initWithFrame:frame])) {
[self addTarget:self action:@selector(didChange)
#ifndef RCT_NEW_ARCH_ENABLED
// somehow, with Fabric, the callbacks are executed here as well as in RNDateTimePickerComponentView
// so do not register it with Fabric, to avoid potential problems
[self addTarget:self action:@selector(didChange)
forControlEvents:UIControlEventValueChanged];
[self addTarget:self action:@selector(onDismiss:) forControlEvents:UIControlEventEditingDidEnd];
#endif

_reactMinuteInterval = 1;
}
return self;
Expand All @@ -38,6 +45,13 @@ - (void)didChange
}
}

- (void)onDismiss:(RNDateTimePicker *)sender
{
if (_onPickerDismiss) {
_onPickerDismiss(@{});
}
}

- (void)setDatePickerMode:(UIDatePickerMode)datePickerMode
{
[super setDatePickerMode:datePickerMode];
Expand Down

0 comments on commit 220e170

Please sign in to comment.