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.

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

fix selection after mousedown if contenteditable div contains only one new line char (#2365) #2426

Merged
merged 2 commits into from
May 28, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
55 changes: 43 additions & 12 deletions src/client/core/utils/content-editable.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,24 +110,24 @@ function isNodeAfterNodeBlockWithBreakLine (parent, node) {
return false;
}

export function getFirstVisibleTextNode (el) {
function getFirstTextNode (el, onlyVisible) {
var children = el.childNodes;
var childrenLength = domUtils.getChildNodesLength(children);
var curNode = null;
var child = null;
var isNotContentEditableElement = null;

if (!childrenLength && isVisibleTextNode(el))
if (!childrenLength && checkTextNodeVisibility(el, onlyVisible))
return el;

for (var i = 0; i < childrenLength; i++) {
curNode = children[i];
isNotContentEditableElement = domUtils.isElementNode(curNode) && !domUtils.isContentEditableElement(curNode);

if (isVisibleTextNode(curNode))
if (checkTextNodeVisibility(curNode, onlyVisible))
return curNode;
else if (domUtils.isRenderedNode(curNode) && hasVisibleChildren(curNode) && !isNotContentEditableElement) {
child = getFirstVisibleTextNode(curNode);
child = getFirstTextNode(curNode, onlyVisible);

if (child)
return child;
Expand All @@ -137,6 +137,10 @@ export function getFirstVisibleTextNode (el) {
return child;
}

export function getFirstVisibleTextNode (el) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we don't need this function anymore

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function is used in several places.
I think it's more convenient to write getFirstVisibleTextNode() instead of getFirstTextNode(true)

return getFirstTextNode(el, true);
}

export function getLastTextNode (el, onlyVisible) {
var children = el.childNodes;
var childrenLength = domUtils.getChildNodesLength(children);
Expand Down Expand Up @@ -210,8 +214,15 @@ export function isInvisibleTextNode (node) {
return firstVisibleIndex === nodeValue.length && lastVisibleIndex === 0;
}

function checkTextNodeVisibility (node, onlyVisible) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For me it seems little awkward that method named checkTextNodeVisibility can do not check visibility if we pass onlyVisible === false .
@AndreyBelym

if (!domUtils.isTextNode(node))
return false;

return !onlyVisible || !isInvisibleTextNode(node);
}

function isVisibleTextNode (node) {
return domUtils.isTextNode(node) && !isInvisibleTextNode(node);
return checkTextNodeVisibility(node, true);
}

function isSkippableNode (node) {
Expand Down Expand Up @@ -532,17 +543,37 @@ export function getFirstVisiblePosition (el) {
}

export function getLastVisiblePosition (el) {
var lastVisibleTextChild = domUtils.isTextNode(el) ? el : getLastTextNode(el, true);
var curDocument = domUtils.findDocument(el);
var range = curDocument.createRange();
var lastVisibleTextChild = domUtils.isTextNode(el) ? el : getLastTextNode(el, true);

if (lastVisibleTextChild) {
range.selectNodeContents(lastVisibleTextChild);
if (!lastVisibleTextChild || isResetAnchorOffsetRequired(lastVisibleTextChild, el))
return 0;

return calculatePositionByNodeAndOffset(el, { node: lastVisibleTextChild, offset: range.endOffset });
var curDocument = domUtils.findDocument(el);
var range = curDocument.createRange();

range.selectNodeContents(lastVisibleTextChild);

return calculatePositionByNodeAndOffset(el, { node: lastVisibleTextChild, offset: range.endOffset });
}

function isResetAnchorOffsetRequired (lastVisibleTextChild, el) {
const firstVisibleTextChild = domUtils.isTextNode(el) ? el : getFirstTextNode(el, false);
const isSingleTextNode = lastVisibleTextChild === firstVisibleTextChild;
const isNewLineChar = lastVisibleTextChild.nodeValue === String.fromCharCode(10);

return isSingleTextNode && isNewLineChar && hasWhiteSpacePreStyle(lastVisibleTextChild, el);
}

function hasWhiteSpacePreStyle (el, container) {
const whiteSpacePreStyles = ['pre', 'pre-wrap', 'pre-line'];

while (el !== container) {
el = el.parentNode;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add a blank line

if (arrayUtils.indexOf(whiteSpacePreStyles, styleUtils.get(el, 'white-space')) > -1)
return true;
}

return 0;
return false;
}

function getContentEditableNodes (target) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var hammerhead = window.getTestCafeModule('hammerhead');
var browserUtils = hammerhead.utils.browser;

var testCafeCore = window.getTestCafeModule('testCafeCore');
var domUtils = testCafeCore.get('./utils/dom');
var testCafeCore = window.getTestCafeModule('testCafeCore');
var domUtils = testCafeCore.get('./utils/dom');

var testCafeAutomation = window.getTestCafeModule('testCafeAutomation');
var TypeOptions = testCafeAutomation.get('../../test-run/commands/options').TypeOptions;
Expand Down Expand Up @@ -142,4 +142,48 @@ $(document).ready(function () {
});
});
}

asyncTest('selection after mousedown should ignore single new line character', function () {

function testWithWhiteSpaceStyle (whiteSpace) {
var editor = document.createElement('div');
var span = document.createElement('span');
var type = new TypeAutomation(editor, 'Hello World', {});

editor.className = TEST_ELEMENT_CLASS;
editor.style.whiteSpace = whiteSpace;
editor.contentEditable = true;
span.innerHTML = String.fromCharCode(10);

editor.appendChild(span);
document.body.appendChild(editor);

var onSelectionChange = function () {
equal(document.getSelection().anchorOffset, 0);
document.removeEventListener('selectionchange', onSelectionChange, true);
};

document.addEventListener('selectionchange', onSelectionChange, true);

return type
.run()
.then(function () {
equal(editor.textContent, 'Hello' + String.fromCharCode(160) + 'World\n', 'white-space: ' + whiteSpace);
removeTestElements();
document.getSelection().removeAllRanges();
return;
});
}

testWithWhiteSpaceStyle('pre')
.then(function () {
return testWithWhiteSpaceStyle('pre-wrap');
})
.then(function () {
return testWithWhiteSpaceStyle('pre-line');
})
.then(function () {
startNext();
});
});
});