Skip to content

Column reorder using Drag and drop - target index bug fix #5432

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
dzearing merged 3 commits into from
Jul 4, 2018
Merged

Column reorder using Drag and drop - target index bug fix #5432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8d6e08
Target index bug fix for column reorder
laxmikankanala Jul 3, 2018
48478ea
mend
laxmikankanala Jul 3, 2018
d763d19
Adding change file
laxmikankanala Jul 3, 2018
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
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/laxmika-columnReorderBugFix_2018-07-03-09-40.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Fixed target index issue, when the dragged column is before the drophint",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "laxmika@microsoft.com"
}
13 changes: 7 additions & 6 deletions packages/office-ui-fabric-react/src/components/DetailsList/DetailsHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export class DetailsHeader extends BaseComponent<IDetailsHeaderProps, IDetailsHe
if (this.props !== prevProps && this._onDropIndexInfo.sourceIndex >= 0 && this._onDropIndexInfo.targetIndex >= 0) {
if (
prevProps.columns[this._onDropIndexInfo.sourceIndex].key ===
this.props.columns[this._onDropIndexInfo.targetIndex - 1].key
this.props.columns[this._onDropIndexInfo.targetIndex].key
) {
this._onDropIndexInfo = {
sourceIndex: Number.MIN_SAFE_INTEGER,
Expand Down Expand Up @@ -330,7 +330,7 @@ export class DetailsHeader extends BaseComponent<IDetailsHeaderProps, IDetailsHe
dragDropHelper={this._dragDropHelper}
onColumnClick={onColumnClick}
onColumnContextMenu={onColumnContextMenu}
isDropped={this._onDropIndexInfo.targetIndex === columnIndex + 1}
isDropped={this._onDropIndexInfo.targetIndex === columnIndex}
/>,
column.isResizable && this._renderColumnSizer(columnIndex)
];
Expand Down Expand Up @@ -390,21 +390,22 @@ export class DetailsHeader extends BaseComponent<IDetailsHeaderProps, IDetailsHe

private _onDrop(item?: any, event?: DragEvent): void {
const draggedColumnIndex = this._draggedColumnIndex;
const dropIndex = this._currentDropHintIndex!;
// Target index will not get changed if draggeditem is after target item.
const targetIndex =
draggedColumnIndex > this._currentDropHintIndex! ? this._currentDropHintIndex! : this._currentDropHintIndex! - 1;
let isValidDrop = false;
if (this._draggedColumnIndex >= 0 && event! instanceof DragEvent) {
event!.stopPropagation();
if (this._isValidCurrentDropHintIndex()) {
isValidDrop = true;
this._onDropIndexInfo.sourceIndex = draggedColumnIndex;
// Target index will not get changed if draggeditem is before target item.
this._onDropIndexInfo.targetIndex = dropIndex + (draggedColumnIndex > dropIndex! ? 1 : 0);
this._onDropIndexInfo.targetIndex = targetIndex;
}
this._resetDropHints();
this._dropHintDetails = {};
this._draggedColumnIndex = -1;
if (isValidDrop) {
this.props.columnReorderOptions!.handleColumnReorder(draggedColumnIndex, dropIndex);
this.props.columnReorderOptions!.handleColumnReorder(draggedColumnIndex, targetIndex);
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions ...fice-ui-fabric-react/src/components/DetailsList/examples/DetailsList.DragDrop.Example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,6 @@ export class DetailsListDragDropExample extends React.Component<

// insert before the dropped item
newColumns.splice(draggedIndex, 1);
if (draggedIndex < targetIndex) {
targetIndex--;
}
newColumns.splice(targetIndex, 0, draggedItems);
this.setState({ columns: newColumns });
};
Expand Down