From a98bee1f86e9ac20b4bf06825b2cccf4bfdc45a3 Mon Sep 17 00:00:00 2001 From: Francis Meng Date: Fri, 30 Nov 2018 13:38:17 -0800 Subject: [PATCH 1/6] add shift into delete action --- .../src/components/FloatingPicker/BaseFloatingPicker.tsx | 5 +++-- yarn.lock | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 yarn.lock diff --git a/packages/office-ui-fabric-react/src/components/FloatingPicker/BaseFloatingPicker.tsx b/packages/office-ui-fabric-react/src/components/FloatingPicker/BaseFloatingPicker.tsx index 75f4f8e9bba3a9..4e4677dd1a4d8b 100644 --- a/packages/office-ui-fabric-react/src/components/FloatingPicker/BaseFloatingPicker.tsx +++ b/packages/office-ui-fabric-react/src/components/FloatingPicker/BaseFloatingPicker.tsx @@ -266,14 +266,15 @@ export class BaseFloatingPicker> 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: diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 00000000000000..fb57ccd13afbd0 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + From 01c974cc38d10ed228d42895380f8029bf4c8e66 Mon Sep 17 00:00:00 2001 From: Francis Meng Date: Fri, 30 Nov 2018 13:47:09 -0800 Subject: [PATCH 2/6] add change file --- ...add-shift-into-delete-action_2018-11-30-21-46.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/office-ui-fabric-react/add-shift-into-delete-action_2018-11-30-21-46.json diff --git a/common/changes/office-ui-fabric-react/add-shift-into-delete-action_2018-11-30-21-46.json b/common/changes/office-ui-fabric-react/add-shift-into-delete-action_2018-11-30-21-46.json new file mode 100644 index 00000000000000..09795cef89a00c --- /dev/null +++ b/common/changes/office-ui-fabric-react/add-shift-into-delete-action_2018-11-30-21-46.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "office-ui-fabric-react", + "comment": "Add shift into delete suggestion.", + "type": "minor" + } + ], + "packageName": "office-ui-fabric-react", + "email": "xiameng@microsoft.com" +} \ No newline at end of file From f15e860714c2ce761a825586001a29a043097e88 Mon Sep 17 00:00:00 2001 From: Francis Meng Date: Mon, 3 Dec 2018 08:16:02 -0800 Subject: [PATCH 3/6] Delete yarn.lock --- yarn.lock | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 yarn.lock diff --git a/yarn.lock b/yarn.lock deleted file mode 100644 index fb57ccd13afbd0..00000000000000 --- a/yarn.lock +++ /dev/null @@ -1,4 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - From df22554bd9204bba1c04775449d0010e6e883c81 Mon Sep 17 00:00:00 2001 From: Francis Meng Date: Mon, 3 Dec 2018 08:33:01 -0800 Subject: [PATCH 4/6] modify change file --- .../add-shift-into-delete-action_2018-11-30-21-46.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/changes/office-ui-fabric-react/add-shift-into-delete-action_2018-11-30-21-46.json b/common/changes/office-ui-fabric-react/add-shift-into-delete-action_2018-11-30-21-46.json index 09795cef89a00c..23d4a41c69476f 100644 --- a/common/changes/office-ui-fabric-react/add-shift-into-delete-action_2018-11-30-21-46.json +++ b/common/changes/office-ui-fabric-react/add-shift-into-delete-action_2018-11-30-21-46.json @@ -2,8 +2,8 @@ "changes": [ { "packageName": "office-ui-fabric-react", - "comment": "Add shift into delete suggestion.", - "type": "minor" + "comment": "Picker: Add shift into delete suggestion.", + "type": "patch" } ], "packageName": "office-ui-fabric-react", From cc1fe2dea4562ae3815db694e1d7156727c21003 Mon Sep 17 00:00:00 2001 From: Cliff Koh Date: Mon, 3 Dec 2018 10:28:19 -0800 Subject: [PATCH 5/6] Update add-shift-into-delete-action_2018-11-30-21-46.json --- .../add-shift-into-delete-action_2018-11-30-21-46.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/changes/office-ui-fabric-react/add-shift-into-delete-action_2018-11-30-21-46.json b/common/changes/office-ui-fabric-react/add-shift-into-delete-action_2018-11-30-21-46.json index 23d4a41c69476f..e3de7e445c4b2e 100644 --- a/common/changes/office-ui-fabric-react/add-shift-into-delete-action_2018-11-30-21-46.json +++ b/common/changes/office-ui-fabric-react/add-shift-into-delete-action_2018-11-30-21-46.json @@ -2,10 +2,10 @@ "changes": [ { "packageName": "office-ui-fabric-react", - "comment": "Picker: Add shift into delete suggestion.", + "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": "xiameng@microsoft.com" -} \ No newline at end of file +} From b88de0df1f756134ae50e819e0d34e58a0be4f51 Mon Sep 17 00:00:00 2001 From: Francis Meng Date: Mon, 3 Dec 2018 11:43:25 -0800 Subject: [PATCH 6/6] add checks for setSeleted in suggestionscore --- .../components/FloatingPicker/Suggestions/SuggestionsCore.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/office-ui-fabric-react/src/components/FloatingPicker/Suggestions/SuggestionsCore.tsx b/packages/office-ui-fabric-react/src/components/FloatingPicker/Suggestions/SuggestionsCore.tsx index d6f7df41aff966..55b42efb48ee09 100644 --- a/packages/office-ui-fabric-react/src/components/FloatingPicker/Suggestions/SuggestionsCore.tsx +++ b/packages/office-ui-fabric-react/src/components/FloatingPicker/Suggestions/SuggestionsCore.tsx @@ -103,7 +103,7 @@ export class SuggestionsCore extends BaseComponent, 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;