Skip to content

[FIX] UiKit/DatePicker is broken #4607

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
reinaldonetof merged 3 commits into from
Oct 21, 2022
Merged

[FIX] UiKit/DatePicker is broken #4607

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54a496f
[FIX] UiKit/DatePicker is broken
reinaldonetof Oct 13, 2022
1686317
minor tweak
reinaldonetof Oct 14, 2022
05df087
Merge branch 'develop' into fix.ui-datepicker
reinaldonetof Oct 21, 2022
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
24 changes: 17 additions & 7 deletions app/containers/UIKit/DatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState } from 'react';
import { StyleSheet, Text, View } from 'react-native';
import { StyleSheet, Text, unstable_batchedUpdates, View } from 'react-native';
import DateTimePicker, { Event } from '@react-native-community/datetimepicker';
import Touchable from 'react-native-platform-touchable';
import { BlockContext } from '@rocket.chat/ui-kit';
Expand Down Expand Up @@ -48,11 +48,15 @@ export const DatePicker = ({ element, language, action, context, loading, value,
// timestamp as number exists in Event
// @ts-ignore
const onChange = ({ nativeEvent: { timestamp } }: Event, date?: Date) => {
const newDate = date || new Date(timestamp);
onChangeDate(newDate);
action({ value: moment(newDate).format('YYYY-MM-DD') });
if (isAndroid) {
onShow(false);
if (date || timestamp) {
const newDate = date || new Date(timestamp);
unstable_batchedUpdates(() => {

@reinaldonetof reinaldonetof Oct 14, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this unstable_batchedUpdates to avoid double re-render of the calendar when using Android

onChangeDate(newDate);
if (isAndroid) {
onShow(false);
}
});
action({ value: moment(newDate).format('YYYY-MM-DD') });
}
};

Expand Down Expand Up @@ -85,7 +89,13 @@ export const DatePicker = ({ element, language, action, context, loading, value,
}

const content = show ? (
<DateTimePicker mode='date' display='default' value={currentDate} onChange={onChange} textColor={themes[theme].titleText} />
<DateTimePicker
mode='date'
display={isAndroid ? 'default' : 'inline'}
value={currentDate}
onChange={onChange}
textColor={themes[theme].titleText}
/>
) : null;

return (
Expand Down