more #335 work: shift-tab should move focus from block editor to tool…

…bar input
bootstrapworld · Mar 2, 2021 · 3679b67 · 3679b67
1 parent 6cc7f62
commit 3679b67
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/keymap.js b/src/keymap.js
@@ -74,8 +74,8 @@ CodeMirror.normalizeKeyMap(defaultKeyMap);
 
 export const commandMap = {
   prevFocus : function (_, e) {
-    console.log(this);
-    this.toggleButtonRef.current.focus();
+    this.toolbarRef.current.primitiveSearch.focus();
+    e.preventDefault();
   },
 
   prevNode : function (_, e) {

diff --git a/src/ui/BlockEditor.js b/src/ui/BlockEditor.js
@@ -541,7 +541,7 @@ class BlockEditor extends Component {
   handleTopLevelFocus = (ed, _) => {
     const {dispatch} = this.props;
     dispatch((_, getState) => {
-      const {cur} = getState();
+      const {cur, focusId} = getState();
       if (!this.mouseUsed && (cur === null)) {
         // NOTE(Oak): use setTimeout so that the CM cursor will not blink
         setTimeout(() => this.props.activateByNid(null, {allowMove: true}), 0);

diff --git a/src/ui/ToggleEditor.js b/src/ui/ToggleEditor.js
@@ -196,8 +196,7 @@ export default @CMBContext class ToggleEditor extends React.Component {
       <div className={classes}>
         <ToggleButton 
           setBlockMode={this.handleToggle} 
-          blockMode={this.state.blockMode} 
-          ref={this.toggleButtonRef} />
+          blockMode={this.state.blockMode} />
         {this.state.blockMode ? <TrashCan/> : null}
         <div className={"col-xs-3 toolbar-pane"} tabIndex="-1" aria-hidden={!this.state.blockMode}>
           <Toolbar 

diff --git a/src/ui/Toolbar.js b/src/ui/Toolbar.js
@@ -119,6 +119,7 @@ export default class Toolbar extends Component {
             className="form-control"
             value={this.state.search}
             onKeyDown={this.handleKeyDown}
+            ref={(elt) => { this.primitiveSearch = elt; }} 
             onChange={this.changeSearch} />
           {this.state.search ?
             <button