Skip to content

implement ghost style prop #138

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

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

implement ghost style prop #138

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
0731998
implement ghost style prop
corupta Sep 21, 2021
52fe895
Update Readme, add ghostStyle
corupta Sep 21, 2021
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ isRequired if there is a * in the name field
|**onScrollRef** | (ref: any) => void
|**areaOverlapRatio**|number| Must be greater than 0.5
|**movedWrapStyle**| StyleProp<ViewStyle> |style
|**ghostStyle**| StyleProp<ViewStyle> |style
|**childMarginTop**|number
|**childMarginBottom**|number
|**childMarginLeft**|number
Expand Down
26 changes: 16 additions & 10 deletions lib/AnySizeDragSortableView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export default class AnySizeDragSortableView extends React.PureComponent {
const curLayout = this.layoutMap.get(key)
const firstOffsetY = (this.curScrollData && this.curScrollData.offsetY) || 0
const initTop = parseInt(curLayout.y - firstOffsetY + headerViewHeight + 0.5)
this.setState({
this.setState({
scrollEnabled: false,
selectedItem: item,
selectedKey: key,
Expand Down Expand Up @@ -280,7 +280,7 @@ export default class AnySizeDragSortableView extends React.PureComponent {
break
}
// When sliding to the end, there is no assistance
if (!this.isUpdating && nextLineLastLayout &&
if (!this.isUpdating && nextLineLastLayout &&
moveX1 >= nextLineLastLayout.x + nextLineLastLayout.width && (moveY2 + moveY1) / 2 > nextLineLastLayout.y
) {
this.move(curLayout.key, nextLineLastLayout.key, vy, curLayout.y !== nextLineLastLayout.y)
Expand All @@ -295,7 +295,7 @@ export default class AnySizeDragSortableView extends React.PureComponent {
if (preLeft !== nextLeft || preTop !== nextTop) {
this.setState({
selectedPosition: {
...selectedPosition,
...selectedPosition,
left: nextLeft,
top: nextTop
}
Expand All @@ -314,7 +314,7 @@ export default class AnySizeDragSortableView extends React.PureComponent {
return
}
if (
this.preMoveKeyObj && this.preMoveKeyObj.fromKey === fromKey && this.preMoveKeyObj.toKey === toKey &&
this.preMoveKeyObj && this.preMoveKeyObj.fromKey === fromKey && this.preMoveKeyObj.toKey === toKey &&
isDiffline && ((toIndex - fromIndex > 0 && vy <= 0.01) || (toIndex - fromIndex < 0 && vy >= -0.01))
) {
this.isUpdating = false
Expand Down Expand Up @@ -395,7 +395,8 @@ export default class AnySizeDragSortableView extends React.PureComponent {

render() {
const {selectedItem, selectedPosition, scrollEnabled} = this.state
const {dataSource, keyExtractor, renderItem, movedWrapStyle} = this.props
const {ghostStyle, dataSource, keyExtractor, renderItem, movedWrapStyle} = this.props
const selectedKey = selectedItem && keyExtractor(selectedItem);
return (
<View style={styles.box}>
{
Expand All @@ -417,7 +418,7 @@ export default class AnySizeDragSortableView extends React.PureComponent {
scrollEnabled = {scrollEnabled}
onScroll={this.onScrollListener}
style={styles.scroll}>
{this.props.renderHeaderView ? this.props.renderHeaderView : null}
{this.props.renderHeaderView ? this.props.renderHeaderView : null}
<View style={styles.container}>
{
dataSource.map((item, index) => {
Expand All @@ -426,6 +427,7 @@ export default class AnySizeDragSortableView extends React.PureComponent {
return (
<View
key={key}
style={selectedKey === key ? ghostStyle : undefined}
{...this._panResponder.panHandlers}
onLayout={event => this._setLayoutData(key, event)}
>
Expand All @@ -440,7 +442,7 @@ export default class AnySizeDragSortableView extends React.PureComponent {
</View>
)
}

}

AnySizeDragSortableView.propTypes = {
Expand All @@ -465,9 +467,10 @@ AnySizeDragSortableView.propTypes = {
onScrollRef: PropTypes.func,
areaOverlapRatio: PropTypes.number,
movedWrapStyle: PropTypes.object,
/**
ghostStyle: PropTypes.object,
/**
* childMarginxx: Must be greater than > 0
* Optimize the calculation of the size of the rectangle where the two components
* Optimize the calculation of the size of the rectangle where the two components
* intersect to prevent repeated switching caused by triggering the critical point .
*/
childMarginTop: PropTypes.number,
Expand All @@ -492,6 +495,9 @@ AnySizeDragSortableView.defaultProps = {
backgroundColor: 'blue',
zIndex: 999,
},
ghostStyle: {
opacity: 0.5
},
childMarginTop: 10,
childMarginBottom: 10,
childMarginLeft: 10,
Expand All @@ -511,4 +517,4 @@ const styles = StyleSheet.create({
flexDirection: 'row',
flexWrap: 'wrap'
}
});
});
1 change: 1 addition & 0 deletions lib/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ interface AnySizeIProps{
onScrollRef?: (ref: any) => void
areaOverlapRatio?: number,
movedWrapStyle: StyleProp<ViewStyle>,
ghostStyle: StyleProp<ViewStyle>,
childMarginTop?: number,
childMarginBottom?: number,
childMarginLeft?: number,
Expand Down