Skip to content

Commit

Permalink
allow general native handling of backspace
Browse files Browse the repository at this point in the history 
fixes #473 #548 #565
  • Loading branch information
@jhchen
jhchen committed May 12, 2016
1 parent 90eecda commit 0c6e6a8
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 51 deletions.
4 changes: 4 additions & 0 deletions blots/scroll.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ class Scroll extends Parchment.Scroll {
super.insertBefore(blot, ref);
}

leaf(index) {
return this.path(index).pop();
}

line(index) {
return this.descendant(isLine, index);
}
Expand Down
17 changes: 4 additions & 13 deletions core/selection.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ class Selection {
}

getBounds(index, length = 0) {
let bounds, node, [leaf, offset] = findLeaf(this.scroll, index);
let bounds, node, [leaf, offset] = this.scroll.leaf(index);
if (leaf == null) return null;
[node, offset] = leaf.position(offset, true);
let range = document.createRange();
if (length > 0) {
range.setStart(node, offset);
[leaf, offset] = findLeaf(this.scroll, index + length);
[leaf, offset] = this.scroll.leaf(index + length);
if (leaf == null) return null;
[node, offset] = leaf.position(offset, true);
range.setEnd(node, offset);
Expand Down Expand Up @@ -229,7 +229,7 @@ class Selection {
let indexes = range.collapsed ? [range.index] : [range.index, range.index + range.length];
let args = [];
indexes.forEach((index, i) => {
let node, [leaf, offset] = findLeaf(this.scroll, index);
let node, [leaf, offset] = this.scroll.leaf(index);
[node, offset] = leaf.position(offset, i !== 0);
args.push(node, offset);
});
Expand Down Expand Up @@ -272,14 +272,5 @@ function contains(parent, descendant) {
return parent.contains(descendant);
}

function findLeaf(blot, index) {
let path = blot.path(index);
if (path.length > 0) {
return path.pop();
} else {
return [null, -1]
}
}


export { findLeaf, Range, Selection as default };
export { Range, Selection as default };
68 changes: 30 additions & 38 deletions modules/keyboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,18 @@ class Keyboard extends Module {
});
this.addBinding({ key: Keyboard.keys.ENTER, shiftKey: null }, handleEnter);
this.addBinding({ key: Keyboard.keys.ENTER, metaKey: null, altKey: null }, function() {});
this.addBinding({ key: Keyboard.keys.BACKSPACE }, makeDeleteHanlder(true));
this.addBinding({ key: Keyboard.keys.DELETE }, makeDeleteHanlder(false));
this.addBinding({ key: Keyboard.keys.BACKSPACE }, { collapsed: true, prefix: /^$/ }, function(range) {
if (range.index === 0) return;
this.quill.deleteText(range.index - 1, 1, Quill.sources.USER);
this.quill.setSelection(range.index - 1, Quill.sources.SILENT);
});
this.addBinding({ key: Keyboard.keys.DELETE }, { collapsed: true, suffix: /^$/ }, function(range) {
if (range.index >= this.quill.getLength() - 1) return;
this.quill.deleteText(range.index, 1, Quill.sources.USER);
this.quill.setSelection(range.index, Quill.sources.SILENT);
});
this.addBinding({ key: Keyboard.keys.BACKSPACE }, { collapsed: false }, handleDelete);
this.addBinding({ key: Keyboard.keys.DELETE }, { collapsed: false }, handleDelete);
this.listen();
}

Expand All @@ -60,17 +70,16 @@ class Keyboard extends Module {
if (bindings.length === 0) return;
let range = this.quill.getSelection();
if (range == null) return; // implies we do not have focus
let [lineStart, offsetStart] = this.quill.scroll.line(range.index);
let [lineEnd, offsetEnd] = range.length === 0 ? [lineStart, lineEnd] : this.quill.scroll.line(range.index + range.length);
let [leafStart, leafOffsetStart] = lineStart.descendant(Parchment.Leaf, offsetStart);
let [leafEnd, leafOffsetEnd] = range.length === 0 ? [leafStart, leafOffsetStart] : lineEnd.descendant(Parchment.Leaf, offsetEnd);
let prefixText = leafStart instanceof Parchment.Text ? leafStart.value().slice(0, leafOffsetStart) : '';
let suffixText = leafEnd instanceof Parchment.Text ? leafEnd.value().slice(leafOffsetEnd) : '';
let [line, offset] = this.quill.scroll.line(range.index);
let [leafStart, offsetStart] = this.quill.scroll.leaf(range.index);
let [leafEnd, offsetEnd] = range.length === 0 ? [leafStart, offsetStart] : this.scroll.leaf(range.index + range.length);
let prefixText = leafStart instanceof Parchment.Text ? leafStart.value().slice(0, offsetStart) : '';
let suffixText = leafEnd instanceof Parchment.Text ? leafEnd.value().slice(offsetEnd) : '';
let curContext = {
collapsed: range.length === 0,
empty: range.length === 0 && lineStart.length() === 0,
empty: range.length === 0 && line.length() === 0,
format: this.quill.getFormat(range),
offset: offsetStart,
offset: offset,
prefix: prefixText,
suffix: suffixText
};
Expand All @@ -96,6 +105,8 @@ class Keyboard extends Module {
return false;
}
}
if (context.prefix != null && !context.prefix.test(curContext.prefix)) return false;
if (context.suffix != null && !context.suffix.test(curContext.suffix)) return false;
return handler.call(this, range, curContext) !== true;
});
if (prevented) {
Expand Down Expand Up @@ -131,7 +142,7 @@ Keyboard.DEFAULTS = {
{ format: ['blockquote', 'indent', 'list'] },
function(range, context) {
if (context.collapsed && context.offset !== 0) return true;
this.quill.format('indent', '+1');
this.quill.format('indent', '+1', Quill.sources.USER);
}
],
'outdent' : [
Expand All @@ -140,19 +151,19 @@ Keyboard.DEFAULTS = {
// highlight tab or tab at beginning of list, indent or blockquote
function(range, context) {
if (context.collapsed && context.offset !== 0) return true;
this.quill.format('indent', '-1');
this.quill.format('indent', '-1', Quill.sources.USER);
}
],
'outdent backspace': [
{ key: Keyboard.keys.BACKSPACE },
{ collapsed: true, format: ['blockquote', 'indent', 'list'], offset: 0 },
function(range, context) {
if (context.format.indent != null) {
this.quill.format('indent', '-1');
this.quill.format('indent', '-1', Quill.sources.USER);
} else if (context.format.blockquote != null) {
this.quill.format('blockquote', false);
this.quill.format('blockquote', false, Quill.sources.USER);
} else if (context.format.list != null) {
this.quill.format('list', false);
this.quill.format('list', false, Quill.sources.USER);
}
}
],
Expand Down Expand Up @@ -186,35 +197,16 @@ function handleEnter(range) {
this.quill.setSelection(range.index + added, Quill.sources.SILENT);
Object.keys(formats).forEach((name) => {
if (lineFormats[name] == null) {
this.quill.format(name, formats[name]);
this.quill.format(name, formats[name], Quill.sources.USER);
}
});
this.quill.selection.scrollIntoView();
return false;
}

function makeDeleteHanlder(isBackspace) {
return function(range) {
if (range.length > 0) {
this.quill.deleteText(range, Quill.sources.USER);
} else if (!isBackspace) {
this.quill.deleteText(range.index, 1, Quill.sources.USER);
} else {
let [line, offset] = this.quill.scroll.descendant(Block, range.index);
let formats = this.quill.getFormat(range);
if (line != null && offset === 0 && (formats['indent'] || formats['list'])) {
if (formats['indent'] != null) {
line.format('indent', parseInt(formats['indent']) - 1, Quill.sources.USER);
} else {
line.format('list', false);
}
} else {
this.quill.deleteText(range.index - 1, 1, Quill.sources.USER);
range = new Range(Math.max(0, range.index - 1));
}
}
this.quill.setSelection(range.index, Quill.sources.SILENT);
}
function handleDelete(range) {
this.quill.deleteText(range, Quill.sources.USER);
this.quill.setSelection(range.index, Quill.sources.SILENT);
}

function makeFormatHandler(format, value) {
Expand Down

0 comments on commit 0c6e6a8

Please sign in to comment.