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

Jump to bottom

Pass the currentPosition of the item on press event along with the item data. #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Pass the currentPosition of the item on press event along with the item data. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5039897
Pass the currentPosition of the item on press event along with the it…
Jun 25, 2019
c9e9856
Bump package version.
Jun 25, 2019
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"sortable",
"grid"
],
"version": "1.1.0",
"version": "1.1.1",
"description": "A draggable grid for react native",
"main": "built/index.js",
"types": "src/index.ts",
Expand Down
81 changes: 45 additions & 36 deletions src/draggable-grid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ interface IBaseItemType {
key:string;
}

export interface IDraggableGridProps<DataType extends IBaseItemType>{
export interface IDraggableGridProps<DataType extends IBaseItemType> {
dragEnabled:boolean;
Copy link
Owner

Choose a reason for hiding this comment

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

is this should be dragEnabled?:boolean;?

Copy link
Author

Choose a reason for hiding this comment

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

We can name it dragDisabled and set default value to false.

numColumns:number;
data:DataType[];
renderItem:(item:DataType, order:number) => React.ReactElement<any>;
style?:ViewStyle;
itemHeight?:number;
dragStartAnimation?:StyleProp<any>;
onItemPress?:(item:DataType) => void;
onItemPress?:(item:DataType, position:Animated.AnimatedValueXY) => void;
onDragStart?:(item:DataType) => void;
onDragRelease?:(newSortedData:DataType[]) => void;
}
Expand Down Expand Up @@ -61,7 +62,11 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
private items: IItem<DataType>[] = [];
private blockPositions:IPositionOffset[] = [];
private activeBlockOffset:IPositionOffset = {x:0, y:0};


static defaultProps = {
dragEnabled: true,
};

public constructor(props:IDraggableGridProps<DataType>) {
super(props);
this.panResponderCapture = false;
Expand Down Expand Up @@ -90,13 +95,13 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
},
};
}

private resetGridHeight = () => {
const {props} = this;
const rowCount = Math.ceil(props.data.length / props.numColumns);
this.state.gridHeight.setValue(rowCount * this.state.blockHeight)
}

public componentWillReceiveProps(nextProps:IDraggableGridProps<DataType>) {
nextProps.data.forEach((item, index) => {
if (this.orderMap[item.key]) {
Expand All @@ -117,11 +122,11 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
this.removeItem(item);
});
}

public componentDidUpdate() {
this.resetGridHeight();
}

private addItem = (item:DataType, index:number) => {
this.blockPositions.push(this.getBlockPositionByOrder(this.items.length));
this.orderMap[item.key] = {
Expand All @@ -132,16 +137,16 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
itemData:item,
currentPosition:new Animated.ValueXY(this.getBlockPositionByOrder(index)),
});

}

private removeItem = (item:IItem<DataType>) => {
const itemIndex = findIndex(this.items, (curItem) => curItem.key === item.key);
this.items.splice(itemIndex, 1);
this.blockPositions.pop();
delete this.orderMap[item.key];
}

public componentWillMount() {
this.items = this.props.data.map((item, index) => {
this.orderMap[item.key] = {
Expand All @@ -154,7 +159,7 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
};
})
}

public render() {
return (
<Animated.View
Expand Down Expand Up @@ -188,11 +193,11 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
</Animated.View>
);
}

private onBlockPress(itemIndex:number) {
this.props.onItemPress && this.props.onItemPress(this.items[itemIndex].itemData);
this.props.onItemPress && this.props.onItemPress(this.items[itemIndex].itemData, this.items[itemIndex].currentPosition);
}

private getBlockStyle = (itemIndex:number) => {
return [
{
Expand All @@ -207,23 +212,27 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
left:this.items[itemIndex].currentPosition.getLayout().left,
},
];

}

private setActiveBlock = (itemIndex:number) => {
if (!this.props.dragEnabled) {
return false;
}

this.panResponderCapture = true;
this.setState({
activeItemIndex:itemIndex,
}, () => {
this.startDragStartAnimation();
});
}

private getDragStartAnimation = (itemIndex:number) => {
if (this.state.activeItemIndex != itemIndex) {
return;
}

let dragStartAnimation;
if (this.props.dragStartAnimation) {
dragStartAnimation = this.props.dragStartAnimation;
Expand All @@ -235,7 +244,7 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
...dragStartAnimation,
};
}

private getDefaultDragStartAnimation = () => {
return {
transform:[
Expand All @@ -252,7 +261,7 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
},
};
}

private startDragStartAnimation = () => {
if (!this.props.dragStartAnimation) {
this.state.dragStartAnimatedValue.setValue(1);
Expand All @@ -262,7 +271,7 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
}).start();
}
}

private getBlockPositionByOrder = (order:number) => {
if (this.blockPositions[order]) {
return this.blockPositions[order];
Expand All @@ -275,7 +284,7 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
x,y
}
}

private assessGridSize = (event:IOnLayoutEvent) => {
if (!this.state.hadInitBlockSize) {
let blockWidth,blockHeight;
Expand All @@ -291,7 +300,7 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
});
}
}

private initBlockPositions = () => {
this.items.forEach((item, index) => {
this.blockPositions[index] = this.getBlockPositionByOrder(index);
Expand All @@ -301,18 +310,18 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
})
this.setState({hadInitBlockSize:true});
}

private getActiveItem = () => {
if (this.state.activeItemIndex === undefined) return false;
return this.items[this.state.activeItemIndex];
}

private getDistance = (startOffset:IPositionOffset, endOffset:IPositionOffset) => {
const xDistance = startOffset.x + this.activeBlockOffset.x - endOffset.x;
const yDistance = startOffset.y + this.activeBlockOffset.y - endOffset.y;
return Math.sqrt(Math.pow(xDistance, 2) + Math.pow(yDistance, 2));
}

private onStartDrag(nativeEvent:GestureResponderEvent, gestureState:PanResponderGestureState) {
const activeItem = this.getActiveItem();
if (!activeItem) return false;
Expand All @@ -334,26 +343,26 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
y:moveY,
})
}

private onHandMove(nativeEvent:GestureResponderEvent, gestureState:PanResponderGestureState) {
const activeItem = this.getActiveItem();
if (!activeItem) return false;
const {moveX, moveY } = gestureState;

const xChokeAmount = Math.max(0, (this.activeBlockOffset.x + moveX) - (this.state.gridLayout.width - this.state.blockWidth));
const xMinChokeAmount = Math.min(0, this.activeBlockOffset.x + moveX);

const dragPosition = {
x:moveX - xChokeAmount - xMinChokeAmount,
y:moveY,
};
const originPosition = this.blockPositions[this.orderMap[activeItem.key].order];
const dragPositionToActivePositionDistance = this.getDistance(dragPosition, originPosition);
activeItem.currentPosition.setValue(dragPosition);

let closetItemIndex = this.state.activeItemIndex as number;
let closetDistance = dragPositionToActivePositionDistance;

this.items.forEach((item, index) => {
if (
index != this.state.activeItemIndex
Expand All @@ -374,7 +383,7 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
this.orderMap[activeItem.key].order = closetOrder;
}
}

private resetBlockPositionByOrder = (startOrder:number, endOrder:number) => {
if (startOrder > endOrder) {
for (let i = startOrder - 1; i >= endOrder; i--) {
Expand All @@ -390,7 +399,7 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
}
}
}

private moveBlockToBlockOrderPosition = (itemKey:string) => {
const itemIndex = findIndex(this.items, (item) => item.key === itemKey);
this.items[itemIndex].currentPosition.flattenOffset();
Expand All @@ -402,11 +411,11 @@ export class DraggableGrid<DataType extends IBaseItemType> extends React.Compone
}
).start();
}

private getKeyByOrder = (order:number) => {
return findKey(this.orderMap, (item:IOrderMapItem) => item.order === order) as string;
}

private onHandRelease() {
const activeItem = this.getActiveItem();
if (!activeItem) return false;
Expand All @@ -432,4 +441,4 @@ const styles = StyleSheet.create({
flexDirection:'row',
flexWrap:'wrap',
},
});
});