From a940adabfa9da4199d6f6cb072312b05dbd67f82 Mon Sep 17 00:00:00 2001 From: Jasper Date: Thu, 27 Jan 2022 17:29:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Avoild=20multi=20laye?= =?UTF-8?q?r=20display?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/expandableCalendar/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/expandableCalendar/index.js b/src/expandableCalendar/index.js index a0eb078895..c1d66646c5 100644 --- a/src/expandableCalendar/index.js +++ b/src/expandableCalendar/index.js @@ -620,7 +620,7 @@ class ExpandableCalendar extends Component { disableRightArrow={disableRightArrow} staticHeader /> - {horizontal && this.renderWeekCalendar()} + {horizontal && !isOpen && this.renderWeekCalendar()} {!hideKnob && this.renderKnob()} {!horizontal && this.renderHeader()} From 66bdd93b5e6e61214ca5f8f1a8836c2c957ae777 Mon Sep 17 00:00:00 2001 From: Silas Date: Fri, 28 Jan 2022 09:06:38 +0800 Subject: [PATCH 2/3] update version --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d68e03ea1d..7499655092 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "react-native-calendars", - "version": "1.22.1", + "name": "react-native-calendars-ts", + "version": "1.23.1", "main": "src/index.js", "description": "React Native Calendar Components", "scripts": { @@ -14,7 +14,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/wix/react-native-calendars" + "url": "git+https://github.com/trunk-studio/react-native-calendars-ts" }, "publishConfig": { "registry": "https://registry.npmjs.org/" From 80c8e67cd82cd3a70799be18962a14653bef7b1a Mon Sep 17 00:00:00 2001 From: Jasper Chen Date: Fri, 24 Jun 2022 04:10:42 +0000 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Android=20arrow=20dis?= =?UTF-8?q?able=20logic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calendar/header/index.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/calendar/header/index.js b/src/calendar/header/index.js index 920325cb4a..0b36c84205 100644 --- a/src/calendar/header/index.js +++ b/src/calendar/header/index.js @@ -1,7 +1,7 @@ import React, {Component} from 'react'; import {ActivityIndicator} from 'react-native'; -import { TouchableOpacity as TouchableOpacityAndroid } from 'react-native-gesture-handler' -import {View, Text, Image, TouchableOpacity, Platform} from 'react-native'; +import {TouchableOpacity as TouchableOpacityAndroid} from 'react-native-gesture-handler'; +import {View, Text, Image, TouchableOpacity, Platform} from 'react-native'; import XDate from 'xdate'; import PropTypes from 'prop-types'; import styleConstructor from './style'; @@ -42,12 +42,16 @@ const withPreventDoublePress = (WrappedComponent) => { render() { const disabled = this.state.onPressDisabled || this.props.disabled; + return ( ); } @@ -59,7 +63,7 @@ const withPreventDoublePress = (WrappedComponent) => { return PreventDoublePress; }; -const Button = withPreventDoublePress(Platform.OS==='ios' ? TouchableOpacity :TouchableOpacityAndroid); +const Button = withPreventDoublePress(TouchableOpacity); class CalendarHeader extends Component { static displayName = 'IGNORE'; @@ -158,10 +162,7 @@ class CalendarHeader extends Component { leftArrow = (