Skip to content

add shift into delete action #7274

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
joschect merged 8 commits into from
Dec 3, 2018
Merged

add shift into delete action #7274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a98bee1
add shift into delete action
Nov 30, 2018
01c974c
add change file
Nov 30, 2018
f15e860
Delete yarn.lock
FrancisMengx Dec 3, 2018
df22554
modify change file
Dec 3, 2018
c417c30
Merge branch 'add-shift-into-delete-action' of github.com:FrancisMeng…
Dec 3, 2018
cc1fe2d
Update add-shift-into-delete-action_2018-11-30-21-46.json
cliffkoh Dec 3, 2018
b88de0d
add checks for setSeleted in suggestionscore
Dec 3, 2018
f27b06b
Merge branch 'add-shift-into-delete-action' of github.com:FrancisMeng…
Dec 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/add-shift-into-delete-action_2018-11-30-21-46.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": "Picker: The shift key is now required (in addition to the del key) in order to delete a suggestion.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
5 changes: 3 additions & 2 deletions packages/office-ui-fabric-react/src/components/FloatingPicker/BaseFloatingPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,14 +266,15 @@ export class BaseFloatingPicker<T, P extends IBaseFloatingPickerProps<T>> extend
this.props.onRemoveSuggestion &&
this.suggestionsControl &&
this.suggestionsControl.hasSuggestionSelected &&
this.suggestionsControl.currentSuggestion
this.suggestionsControl.currentSuggestion &&
ev.shiftKey
) {
(this.props.onRemoveSuggestion as ((item: T) => void))(this.suggestionsControl.currentSuggestion!.item);

this.suggestionsControl.removeSuggestion();
this.forceUpdate();
ev.stopPropagation();
}
ev.stopPropagation();
break;

case KeyCodes.up:
Expand Down
2 changes: 1 addition & 1 deletion ...ages/office-ui-fabric-react/src/components/FloatingPicker/Suggestions/SuggestionsCore.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export class SuggestionsCore<T> extends BaseComponent<ISuggestionsCoreProps<T>,
this.currentSuggestion = suggestions[0];
this.currentSuggestion.selected = true;
} else {
if (this.currentIndex > -1) {
if (this.currentIndex > -1 && suggestions[this.currentIndex]) {
suggestions[this.currentIndex].selected = false;
}
suggestions[index].selected = true;
Expand Down