Merge remote-tracking branch 'origin/bugfix/infinite-scroll-issues' into bugfix/infinite-scroll-issues
This commit is contained in:
commit
c8a18e5508
@ -36,6 +36,7 @@ interface AccountsHotkeysProps {
|
|||||||
selectBottom: () => void;
|
selectBottom: () => void;
|
||||||
selectUpper: () => void;
|
selectUpper: () => void;
|
||||||
activateHotkeys: (e: KeyboardEvent) => void;
|
activateHotkeys: (e: KeyboardEvent) => void;
|
||||||
|
setSelected: (value: string) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
const useAccountsHotkeys = ({
|
const useAccountsHotkeys = ({
|
||||||
@ -44,6 +45,7 @@ const useAccountsHotkeys = ({
|
|||||||
selectBottom,
|
selectBottom,
|
||||||
selectUpper,
|
selectUpper,
|
||||||
activateHotkeys,
|
activateHotkeys,
|
||||||
|
setSelected,
|
||||||
}: AccountsHotkeysProps) => {
|
}: AccountsHotkeysProps) => {
|
||||||
const [isEnabled, setIsEnabled] = useState(true);
|
const [isEnabled, setIsEnabled] = useState(true);
|
||||||
|
|
||||||
@ -104,6 +106,9 @@ const useAccountsHotkeys = ({
|
|||||||
},
|
},
|
||||||
hotkeysFilter,
|
hotkeysFilter,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Deselect all accounts
|
||||||
|
useHotkeys("shift+n, ESC", () => setSelected("none"), hotkeysFilter);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default useAccountsHotkeys;
|
export default useAccountsHotkeys;
|
||||||
|
@ -55,6 +55,7 @@ const SectionBodyContent = (props) => {
|
|||||||
activateHotkeys,
|
activateHotkeys,
|
||||||
setHotkeyCaretStart,
|
setHotkeyCaretStart,
|
||||||
setHotkeyCaret,
|
setHotkeyCaret,
|
||||||
|
setSelected,
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
@ -66,6 +67,7 @@ const SectionBodyContent = (props) => {
|
|||||||
selectBottom,
|
selectBottom,
|
||||||
selectUpper,
|
selectUpper,
|
||||||
activateHotkeys,
|
activateHotkeys,
|
||||||
|
setSelected,
|
||||||
});
|
});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@ -140,6 +142,7 @@ export default inject(({ peopleStore }) => {
|
|||||||
setSelection: setPeopleSelection,
|
setSelection: setPeopleSelection,
|
||||||
setBufferSelection: setPeopleBufferSelection,
|
setBufferSelection: setPeopleBufferSelection,
|
||||||
selectUser,
|
selectUser,
|
||||||
|
setSelected,
|
||||||
} = peopleStore.selectionStore;
|
} = peopleStore.selectionStore;
|
||||||
|
|
||||||
const {
|
const {
|
||||||
@ -176,6 +179,7 @@ export default inject(({ peopleStore }) => {
|
|||||||
setEnabledHotkeys,
|
setEnabledHotkeys,
|
||||||
setHotkeyCaretStart,
|
setHotkeyCaretStart,
|
||||||
setHotkeyCaret,
|
setHotkeyCaret,
|
||||||
|
setSelected,
|
||||||
};
|
};
|
||||||
})(
|
})(
|
||||||
withTranslation(["People", "Common", "PeopleTranslations"])(
|
withTranslation(["People", "Common", "PeopleTranslations"])(
|
||||||
|
Loading…
Reference in New Issue
Block a user