imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make use of the KeyBindingsManager in the ScrollPanel

Browse source 
Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
This commit is contained in:
Clemens Zeidler 2021-03-28 22:26:05 +13:00
parent 57cd8afbc4
commit be00320def
2 changed files with 12 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/structures/LoggedInView.tsx
View file

@ -444,6 +444,7 @@ class LoggedInView extends React.Component<IProps, IState> {
case RoomAction.RoomScrollDown: case RoomAction.RoomScrollDown:
case RoomAction.JumpToFirstMessage: case RoomAction.JumpToFirstMessage:
case RoomAction.JumpToLatestMessage: case RoomAction.JumpToLatestMessage:
// pass the event down to the scroll panel
this._onScrollKeyPressed(ev); this._onScrollKeyPressed(ev);
handled = true; handled = true;
break; break;

32
src/components/structures/ScrollPanel.js
View file

@ -16,10 +16,10 @@ limitations under the License.
import React, {createRef} from "react"; import React, {createRef} from "react";
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Key } from '../../Keyboard';
import Timer from '../../utils/Timer'; import Timer from '../../utils/Timer';
import AutoHideScrollbar from "./AutoHideScrollbar"; import AutoHideScrollbar from "./AutoHideScrollbar";
import {replaceableComponent} from "../../utils/replaceableComponent"; import {replaceableComponent} from "../../utils/replaceableComponent";
import {getKeyBindingsManager, RoomAction} from "../../KeyBindingsManager";
const DEBUG_SCROLL = false; const DEBUG_SCROLL = false;
@ -535,29 +535,19 @@ export default class ScrollPanel extends React.Component {
* @param {object} ev the keyboard event * @param {object} ev the keyboard event
*/ */
handleScrollKey = ev => { handleScrollKey = ev => {
switch (ev.key) { const roomAction = getKeyBindingsManager().getRoomAction(ev);
case Key.PAGE_UP: switch (roomAction) {
if (!ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) { case RoomAction.ScrollUp:
this.scrollRelative(-1); this.scrollRelative(-1);
}
break; break;
case RoomAction.RoomScrollDown:
case Key.PAGE_DOWN: this.scrollRelative(1);
if (!ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) {
this.scrollRelative(1);
}
break; break;
case RoomAction.JumpToFirstMessage:
case Key.HOME: this.scrollToTop();
if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) {
this.scrollToTop();
}
break; break;
case RoomAction.JumpToLatestMessage:
case Key.END: this.scrollToBottom();
if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) {
this.scrollToBottom();
}
break; break;
} }
}; };