Skip to content
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

Feature: pinch vertical gesture #316

Merged
merged 4 commits into from
Aug 18, 2023
Merged

Feature: pinch vertical gesture #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4f0fac
Implement vertical pinch gesture
pdpino May 13, 2023
1d24d10
Add enableVerticalPinch prop
pdpino May 13, 2023
1a43986
Update docs with vertical-pinch
pdpino May 13, 2023
7152672
Fix tests
pdpino Jun 8, 2023
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
1 change: 1 addition & 0 deletions example/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ const App = ({}) => {
editEventConfig={EDIT_EVENT_CONFIG}
dragEventConfig={DRAG_EVENT_CONFIG}
runOnJS={false}
enableVerticalPinch
/>
</SafeAreaView>
</>
Expand Down
135 changes: 67 additions & 68 deletions src/Event/Event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ import { View, Text } from 'react-native';
import { GestureDetector, Gesture } from 'react-native-gesture-handler';
import Animated, {
useAnimatedStyle,
useAnimatedReaction,
useSharedValue,
withTiming,
withSpring,
runOnJS,
useDerivedValue,
Expand All @@ -18,26 +16,17 @@ import {
DragEventConfigPropType,
} from '../utils/types';
import { RunGesturesOnJSContext } from '../utils/gestures';
import {
computeHeight,
computeWidth,
computeLeft,
computeTop,
} from '../pipeline/position';
import { useVerticalDimensionContext } from '../utils/VerticalDimContext';

const DEFAULT_COLOR = 'red';
const UPDATE_EVENT_ANIMATION_DURATION = 150;
const SIDES = ['bottom', 'top', 'left', 'right'];

const useCurrentDimension = (dimension) => {
const currentDimension = useSharedValue(dimension);
useAnimatedReaction(
() => dimension,
(newValue) => {
if (currentDimension.value !== newValue) {
currentDimension.value = withTiming(newValue, {
duration: UPDATE_EVENT_ANIMATION_DURATION,
});
}
},
);
return currentDimension;
};

const Circle = ({ side }) => (
<View
style={circleStyles[side]}
Expand Down Expand Up @@ -67,10 +56,12 @@ const DRAG_STATUS = {

const Event = ({
event,
top,
left,
height,
width,
boxStartTimestamp,
boxEndTimestamp,
lane,
nLanes,
stackPosition,
dayWidth,
onPress,
onLongPress,
EventComponent,
Expand All @@ -90,39 +81,16 @@ const Event = ({
!!onDrag && editingEventId == null && !event.disableDrag;

const runGesturesOnJS = React.useContext(RunGesturesOnJSContext);
const { verticalResolution, beginAgendaAt } = useVerticalDimensionContext();

// Wrappers are needed due to RN-reanimated runOnJS behavior. See docs:
// https://docs.swmansion.com/react-native-reanimated/docs/api/miscellaneous/runOnJS
const onPressWrapper = () => onPress && onPress(event);
const onLongPressWrapper = () => onLongPress && onLongPress(event);
const onDragWrapper = (dx, dy) => {
if (!onDrag) return;

const newX = left + dx;
const newY = top + dy;
onDrag(event, newX, newY, width);
};
const onEditWrapper = (side, resizedAmount) => {
if (!onEdit) return;

const params = {};
switch (side) {
case 'top':
params.top = top + resizedAmount;
break;
case 'bottom':
params.bottom = top + height + resizedAmount;
break;
case 'left':
params.left = left + resizedAmount;
break;
case 'right':
params.right = left + width + resizedAmount;
break;
default:
}
onEdit(event, params);
};
const onDragWrapper = (newX, newY, width) =>
onDrag && onDrag(event, newX, newY, width);
const onEditWrapper = (side, newPosition) =>
onEdit && onEdit(event, side, newPosition);

const resizeByEdit = {
bottom: useSharedValue(0),
Expand All @@ -132,10 +100,25 @@ const Event = ({
};

const translatedByDrag = useSharedValue({ x: 0, y: 0 });
const currentWidth = useCurrentDimension(width);
const currentLeft = useCurrentDimension(left);
const currentTop = useCurrentDimension(top);
const currentHeight = useCurrentDimension(height);
const currentWidth = useDerivedValue(() =>
computeWidth(
boxStartTimestamp,
boxEndTimestamp,
nLanes,
stackPosition,
dayWidth,
),
);
const currentLeft = useDerivedValue(
() => computeLeft(lane, nLanes, stackPosition, dayWidth),
[boxStartTimestamp, lane, nLanes, stackPosition, dayWidth],
);
const currentTop = useDerivedValue(() =>
computeTop(boxStartTimestamp, verticalResolution, beginAgendaAt),
);
const currentHeight = useDerivedValue(() =>
computeHeight(boxStartTimestamp, boxEndTimestamp, verticalResolution),
);

const dragStatus = useSharedValue(DRAG_STATUS.STATIC);
const isPressing = useSharedValue(false);
Expand Down Expand Up @@ -196,11 +179,17 @@ const Event = ({
}
const { translationX, translationY } = evt;

// NOTE: do not delete these auxiliar variables
// currentDimension.value might be updated asyncly in some cases
const newX = currentLeft.value + translationX;
const newY = currentTop.value + translationY;
const width = currentWidth.value;

currentTop.value += translationY;
currentLeft.value += translationX;
translatedByDrag.value = { x: 0, y: 0 };

runOnJS(onDragWrapper)(translationX, translationY);
runOnJS(onDragWrapper)(newX, newY, width);
})
.onFinalize(() => {
dragStatus.value = DRAG_STATUS.STATIC;
Expand Down Expand Up @@ -265,22 +254,22 @@ const Event = ({
const { translationX, translationY } = panEvt;
switch (side) {
case 'top':
if (translationY < height) {
if (translationY < currentHeight.value) {
resizeByEdit.top.value = translationY;
}
break;
case 'bottom':
if (translationY > -height) {
if (translationY > -currentHeight.value) {
resizeByEdit.bottom.value = translationY;
}
break;
case 'left':
if (translationX < width) {
if (translationX < currentWidth.value) {
resizeByEdit.left.value = translationX;
}
break;
case 'right':
if (translationX > -width) {
if (translationX > -currentWidth.value) {
resizeByEdit.right.value = translationX;
}
break;
Expand All @@ -294,26 +283,37 @@ const Event = ({
}
const resizedAmount = resizeByEdit[side].value;
resizeByEdit[side].value = 0;
let newPosition = 0;

switch (side) {
case 'top':
newPosition = currentTop.value + resizedAmount;

currentTop.value += resizedAmount;
currentHeight.value -= resizedAmount;
break;
case 'bottom':
newPosition =
currentTop.value + currentHeight.value + resizedAmount;

currentHeight.value += resizedAmount;
break;
case 'left':
newPosition = currentLeft.value + resizedAmount;

currentLeft.value += resizedAmount;
currentWidth.value -= resizedAmount;
break;
case 'right':
newPosition =
currentLeft.value + currentWidth.value + resizedAmount;

currentWidth.value += resizedAmount;
break;
default:
}

runOnJS(onEditWrapper)(side, resizedAmount);
runOnJS(onEditWrapper)(side, newPosition);
});

return (
Expand All @@ -334,10 +334,7 @@ const Event = ({
]}
>
{EventComponent ? (
<EventComponent
event={event}
position={{ top, left, height, width }}
/>
<EventComponent event={event} />
) : (
<Text style={[styles.description, textStyle, event.textStyle]}>
{event.description}
Expand All @@ -355,10 +352,12 @@ const Event = ({

Event.propTypes = {
event: EventPropType.isRequired,
top: PropTypes.number.isRequired,
left: PropTypes.number.isRequired,
height: PropTypes.number.isRequired,
width: PropTypes.number.isRequired,
boxStartTimestamp: PropTypes.number.isRequired,
boxEndTimestamp: PropTypes.number.isRequired,
lane: PropTypes.number,
nLanes: PropTypes.number,
stackPosition: PropTypes.number,
dayWidth: PropTypes.number.isRequired,
onPress: PropTypes.func,
onLongPress: PropTypes.func,
containerStyle: PropTypes.object,
Expand Down
Loading