Skip to content
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

Jump to bottom

Stepper: improves hotkeys #1817

Merged
merged 3 commits into from
Jun 21, 2021
Merged

Stepper: improves hotkeys #1817

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6d6ceb
improves hotkeys for stepper; fixes #1751
martin-henz Jun 21, 2021
46b9480
improves hotkeys for stepper; fixes #1751
martin-henz Jun 21, 2021
6e165b1
Merge branch 'master' into hotkeys
martin-henz Jun 21, 2021
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
33 changes: 21 additions & 12 deletions src/commons/sideContent/SideContentSubstVisualizer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* eslint-disable simple-import-sort/imports */
import { Card, Classes, Divider, Pre, Slider, Button, ButtonGroup } from '@blueprintjs/core';
import { IconNames } from '@blueprintjs/icons';
import * as React from 'react';
import AceEditor from 'react-ace';
import { HotKeys } from 'react-hotkeys';
Expand All @@ -9,8 +8,6 @@ import { HighlightRulesSelector, ModeSelector } from 'js-slang/dist/editors/ace/
import 'js-slang/dist/editors/ace/theme/source';
import { IStepperPropContents } from 'js-slang/dist/stepper/stepper';

import controlButton from '../ControlButton';

const SubstDefaultText = () => {
return (
<div>
Expand All @@ -32,24 +29,27 @@ const SubstDefaultText = () => {
Some useful keyboard shortcuts:
<br />
<br />
{controlButton('(Comma)', IconNames.LESS_THAN)}: Move to the first step
a: Move to the first step
<br />
{controlButton('(Period)', IconNames.GREATER_THAN)}: Move to the last step
e: Move to the last step
<br />
f: Move to the next step
<br />
Note that the first and last step shortcuts are only active when the browser focus is on
this panel (click on the slider or the text!).
b: Move to the previous step
<br />
<br />
When the focus is on the slider, the arrow keys may also be used to move a single step.
Note that these shortcuts are only active when the browser focus is on this tab (click on or
above the explanation text).
</div>
</div>
);
};

const substKeyMap = {
FIRST_STEP: ',',
LAST_STEP: '.'
FIRST_STEP: 'a',
NEXT_STEP: 'f',
PREVIOUS_STEP: 'b',
LAST_STEP: 'e'
};

const SubstCodeDisplay = (props: { content: string }) => {
Expand Down Expand Up @@ -89,10 +89,14 @@ class SideContentSubstVisualizer extends React.Component<SubstVisualizerProps, S
const substHandlers = hasRunCode
? {
FIRST_STEP: this.stepFirst,
NEXT_STEP: this.stepNext,
PREVIOUS_STEP: this.stepPrevious,
LAST_STEP: this.stepLast(lastStepValue)
}
: {
FIRST_STEP: () => {},
NEXT_STEP: () => {},
PREVIOUS_STEP: () => {},
LAST_STEP: () => {}
};
// console.log(this.props.content);
Expand Down Expand Up @@ -246,11 +250,16 @@ class SideContentSubstVisualizer extends React.Component<SubstVisualizerProps, S
};

private stepPrevious = () => {
this.sliderShift(this.state.value - 1);
if (this.state.value !== 1) {
this.sliderShift(this.state.value - 1);
}
};

private stepNext = () => {
this.sliderShift(this.state.value + 1);
const lastStepValue = this.props.content.length;
if (this.state.value !== lastStepValue) {
this.sliderShift(this.state.value + 1);
}
};

private stepPreviousFunctionCall = (value: number) => () => {
Expand Down