bugfix: removes default prevention verification on selection (#28365)

microsoft · Jun 29, 2023 · 7d519bd · 7d519bd
1 parent 104c81e
commit 7d519bd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 25 deletions.
diff --git a/change/@fluentui-react-utilities-881a428e-b3dc-4761-8ecf-c874364e95c5.json b/change/@fluentui-react-utilities-881a428e-b3dc-4761-8ecf-c874364e95c5.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "bugfix: removes default prevention verification on selection",
+  "packageName": "@fluentui/react-utilities",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/react-components/react-table/src/testing/mockSyntheticEvent.ts b/packages/react-components/react-table/src/testing/mockSyntheticEvent.ts
@@ -1,6 +1,5 @@
 import * as React from 'react';
 
-const isDefaultPrevented = () => false;
 export function mockSyntheticEvent() {
-  return { isDefaultPrevented } as unknown as React.SyntheticEvent;
+  return {} as unknown as React.SyntheticEvent;
 }
diff --git a/packages/react-components/react-utilities/src/selection/useSelection.ts b/packages/react-components/react-utilities/src/selection/useSelection.ts
@@ -3,7 +3,7 @@ import { SelectionHookParams, SelectionItemId, SelectionMethods } from './types'
 import { useControllableState } from '../hooks/useControllableState';
 import { createSetFromIterable } from '../utils/createSetFromIterable';
 
-function useSingleSelection(params: Omit<SelectionHookParams, 'selectionMode'>) {
+function useSelectionState(params: Omit<SelectionHookParams, 'selectionMode'>) {
   const [selected, setSelected] = useControllableState<Set<SelectionItemId>>({
     initialState: new Set(),
     defaultState: React.useMemo(
@@ -17,10 +17,13 @@ function useSingleSelection(params: Omit<SelectionHookParams, 'selectionMode'>)
   });
   const changeSelection = (event: React.SyntheticEvent, nextSelectedItems: Set<SelectionItemId>) => {
     params.onSelectionChange?.(event, { selectedItems: nextSelectedItems });
-    if (!event.isDefaultPrevented()) {
-      setSelected(nextSelectedItems);
-    }
+    setSelected(nextSelectedItems);
   };
+  return [selected, changeSelection] as const;
+}
+
+function useSingleSelection(params: Omit<SelectionHookParams, 'selectionMode'>) {
+  const [selected, changeSelection] = useSelectionState(params);
   const methods: SelectionMethods = {
     deselectItem: event => changeSelection(event, new Set()),
     selectItem: (event, itemId) => changeSelection(event, new Set([itemId])),
@@ -37,23 +40,7 @@ function useSingleSelection(params: Omit<SelectionHookParams, 'selectionMode'>)
 }
 
 function useMultipleSelection(params: Omit<SelectionHookParams, 'selectionMode'>) {
-  const [selected, setSelected] = useControllableState<Set<SelectionItemId>>({
-    initialState: new Set(),
-    defaultState: React.useMemo(
-      () => params.defaultSelectedItems && createSetFromIterable(params.defaultSelectedItems),
-      [params.defaultSelectedItems],
-    ),
-    state: React.useMemo(
-      () => params.selectedItems && createSetFromIterable(params.selectedItems),
-      [params.selectedItems],
-    ),
-  });
-  const changeSelection = (event: React.SyntheticEvent, nextSelectedItems: Set<SelectionItemId>) => {
-    params.onSelectionChange?.(event, { selectedItems: nextSelectedItems });
-    if (!event.isDefaultPrevented()) {
-      setSelected(nextSelectedItems);
-    }
-  };
+  const [selected, changeSelection] = useSelectionState(params);
   const methods: SelectionMethods = {
     toggleItem: (event, itemId) => {
       const nextSelectedItems = new Set(selected);

diff --git a/packages/react-components/react-utilities/src/testing/mockSyntheticEvent.ts b/packages/react-components/react-utilities/src/testing/mockSyntheticEvent.ts
@@ -1,6 +1,5 @@
 import * as React from 'react';
 
-const isDefaultPrevented = () => false;
 export function mockSyntheticEvent() {
-  return { isDefaultPrevented } as unknown as React.SyntheticEvent;
+  return {} as unknown as React.SyntheticEvent;
 }