fix a few regressions for #335

bootstrapworld · Feb 27, 2021 · 6693e59 · 6693e59
1 parent 9ce902d
commit 6693e59
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/src/ast.ts b/src/ast.ts
@@ -320,8 +320,8 @@ export class AST {
   precedesComment(pos) {
     // TODO: efficiency
     for (const node of this.nodeIdMap.values()) {
-      if (node.options.comment?.from.line == pos.line
-          && pos.ch <= node.options.comment?.from.ch) {
+      if (node.options.comment?.from?.line == pos.line
+          && pos.ch <= node.options.comment?.from?.ch) {
         return true;
       } else if (node.options.comment
                  && node.from.line == pos.line

diff --git a/src/keymap.js b/src/keymap.js
@@ -39,6 +39,7 @@ export const defaultKeyMap = {
   'PageUp'    : 'searchPrevious',
   'PageDown'  : 'searchNext',
   'F3'        : 'activateSearchDialog',
+  'Shift-Tab' : 'prevFocus',
 };
 
 const macKeyMap = {
@@ -73,6 +74,11 @@ Object.assign(defaultKeyMap, mac? macKeyMap : pcKeyMap);
 CodeMirror.normalizeKeyMap(defaultKeyMap);
 
 export const commandMap = {
+  prevFocus : function (_, e) {
+    console.log(this);
+    this.toggleButtonRef.current.focus();
+  },
+
   prevNode : function (_, e) {
     e.preventDefault();
     //console.log('XXX keymap:78 doing prevNode')

diff --git a/src/sound.js b/src/sound.js
@@ -1,5 +1,6 @@
 const beepSound = require('./beep.wav');
 export const BEEP = new Audio(beepSound);
+BEEP.crossorigin = "anonymous";
 export const WRAP = BEEP; // eventually use a different sound for this
 
 export function playSound(sound) {

diff --git a/src/ui/BlockEditor.js b/src/ui/BlockEditor.js
@@ -21,7 +21,7 @@ import {store} from '../store';
 
 // CodeMirror APIs that we need to disallow
 const unsupportedAPIs = ['indentLine', 'toggleOverwrite', 'setExtending',
-  'getExtending', 'findPosH', 'findPosV', 'setOption', 'getOption',
+  'getExtending', 'findPosH', 'findPosV', 'setOption',
   'addOverlay', 'removeOverlay', 'undoSelection', 'redoSelection',
   'charCoords', 'coordsChar', 'cursorCoords', 'startOperation',
   'endOperation', 'operation', 'addKeyMap', 'removeKeyMap', 'on', 'off',
@@ -179,7 +179,6 @@ class BlockEditor extends Component {
 
   static defaultProps = {
     options: {},
-    cmOptions: {},
     keyMap : defaultKeyMap,
     search: {
       search: () => null,
@@ -575,6 +574,8 @@ class BlockEditor extends Component {
   // store showDialog in the environment, and pass the keyMap
   handleKeyDown = (e, env) => {
     env.showDialog = this.props.showDialog;
+    env.toggleButtonRef = this.props.toggleButtonRef;
+    env.toolbarRef = this.props.toolbarRef;
     return keyDown(e, env, this.props.keyMap);
   }
 

diff --git a/src/ui/ToggleEditor.js b/src/ui/ToggleEditor.js
@@ -18,6 +18,7 @@ const UpgradedBlockEditor = attachSearch(BlockEditor, [ByString, ByBlock]);
 const defaultCmOptions = {
   lineNumbers: true,
   viewportMargin: 10,
+  extraKeys: {"Shift-Tab": false},
 };
 
 // This is the complete list of methods exposed by the CodeMirror object
@@ -74,6 +75,9 @@ export default @CMBContext class ToggleEditor extends React.Component {
     this.language = props.language;
     this.parser = this.language.getParser();
 
+    this.toggleButtonRef = React.createRef();
+    this.toolbarRef = React.createRef();
+
     let defaultOptions = {
       parser: this.parser,
       incrementalRendering: true,
@@ -190,12 +194,17 @@ export default @CMBContext class ToggleEditor extends React.Component {
       <>
       { this.state.dialog? this.renderDialog() : ""}
       <div className={classes}>
-        <ToggleButton setBlockMode={this.handleToggle} blockMode={this.state.blockMode} />
+        <ToggleButton 
+          setBlockMode={this.handleToggle} 
+          blockMode={this.state.blockMode} 
+          ref={this.toggleButtonRef} />
         {this.state.blockMode ? <TrashCan/> : null}
         <div className={"col-xs-3 toolbar-pane"} tabIndex="-1" aria-hidden={!this.state.blockMode}>
-          <Toolbar primitives={this.parser.primitives}
-                   languageId={this.language.id}
-                   blockMode={this.state.blockMode} />
+          <Toolbar 
+            primitives={this.parser.primitives}
+            languageId={this.language.id}
+            blockMode={this.state.blockMode} 
+            ref={this.toolbarRef} />
         </div>
         <div className="col-xs-9 codemirror-pane">
         { this.state.blockMode? this.renderBlocks() : this.renderCode() }
@@ -244,6 +253,8 @@ export default @CMBContext class ToggleEditor extends React.Component {
         passedAST={this.ast}
         showDialog={this.showDialog}
         closeDialog={this.closeDialog}
+        toolbarRef={this.toolbarRef}
+        toggleButtonRef={this.toggleButtonRef}
         debugHistory={this.props.debuggingLog.history}
      />
     );