github/marktext
5
0
Fork 0
mirror of https://github.com/marktext/marktext.git synced 2025-05-20 02:40:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: #2330 enable shift+tab for table navigation (#2331)

Browse Source
This commit is contained in:
evan-cohen 2020-11-27 08:00:43 -05:00 committed by GitHub
parent de30d1e3fc
commit 5fb130d96f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/muya/lib/contentState/tabCtrl.js
View File

@ -64,6 +64,30 @@ const tabCtrl = ContentState => {
return false
}
ContentState.prototype.findPreviousCell = function (block) {
if (block.functionType !== 'cellContent') {
throw new Error('only th and td can have previous cell')
}
const cellBlock = this.getParent(block)
const previousSibling = this.getBlock(cellBlock.preSibling)
const rowBlock = this.getBlock(cellBlock.parent)
const tbOrTh = this.getBlock(rowBlock.parent)
if (previousSibling) {
return this.firstInDescendant(previousSibling)
} else {
if (rowBlock.preSibling) {
const previousRow = this.getBlock(rowBlock.preSibling)
return this.lastInDescendant(previousRow)
} else if (tbOrTh.type === 'tbody') {
const tHead = this.getBlock(tbOrTh.preSibling)
if (tHead && tHead.children.length) {
return this.lastInDescendant(tHead)
}
}
}
return block
}
ContentState.prototype.isUnindentableListItem = function (block) {
const parent = this.getParent(block)
const listItem = this.getParent(parent)
@ -285,7 +309,7 @@ const tabCtrl = ContentState => {
const startBlock = this.getBlock(start.key)
const endBlock = this.getBlock(end.key)
if (event.shiftKey) {
if (event.shiftKey && !startBlock.functionType === 'cellContent') {
const unindentType = this.isUnindentableListItem(startBlock)
if (unindentType) {
this.unindentListItem(startBlock, unindentType)
@ -376,7 +400,9 @@ const tabCtrl = ContentState => {
// Handle `tab` key in table cell.
let nextCell
if (start.key === end.key && startBlock.functionType === 'cellContent') {
nextCell = this.findNextCell(startBlock)
nextCell = event.shiftKey
? this.findPreviousCell(startBlock)
: this.findNextCell(startBlock)
} else if (endBlock.functionType === 'cellContent') {
nextCell = endBlock
}