mirror/slate
1
0
Fork 0
mirror of https://github.com/ianstormtaylor/slate.git synced 2025-08-18 05:01:17 +02:00
Code Issues Releases Wiki Activity

[Fix] Copy with empty Block as first-child (#1748)

Browse Source 
* [Fix] Copy with empty Block as first-child
+ Added Opera support for only-Mark copy

* [Fix] Fixed one missing remove from merge
This commit is contained in:
Jérémie van der Sande
2018-05-02 02:44:49 +02:00
committed by Ian Storm Taylor
parent c4c1d764d6
commit 3f2e924f69
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/slate-dev-environment/src/index.js
View File

@@ -85,6 +85,7 @@ if (browser) {
*/ */
export const IS_CHROME = BROWSER === 'chrome' export const IS_CHROME = BROWSER === 'chrome'
export const IS_OPERA = BROWSER === 'opera'
export const IS_FIREFOX = BROWSER === 'firefox' export const IS_FIREFOX = BROWSER === 'firefox'
export const IS_SAFARI = BROWSER === 'safari' export const IS_SAFARI = BROWSER === 'safari'
export const IS_IE = BROWSER === 'ie' export const IS_IE = BROWSER === 'ie'

13
packages/slate-react/src/utils/clone-fragment.js
View File

@@ -1,5 +1,5 @@
import Base64 from 'slate-base64-serializer' import Base64 from 'slate-base64-serializer'
import { IS_CHROME, IS_SAFARI } from 'slate-dev-environment' import { IS_CHROME, IS_SAFARI, IS_OPERA } from 'slate-dev-environment'
import getWindow from 'get-window' import getWindow from 'get-window'
import findDOMNode from './find-dom-node' import findDOMNode from './find-dom-node'
@@ -30,6 +30,13 @@ function cloneFragment(event, value, fragment = value.fragment) {
let contents = range.cloneContents() let contents = range.cloneContents()
let attach = contents.childNodes[0] let attach = contents.childNodes[0]
// Make sure attach is a non-empty node, since empty nodes will not get copied
contents.childNodes.forEach(node => {
if (node.innerText.trim() !== '') {
attach = node
}
})
// COMPAT: If the end node is a void node, we need to move the end of the // COMPAT: If the end node is a void node, we need to move the end of the
// range from the void node's spacer span, to the end of the void node's // range from the void node's spacer span, to the end of the void node's
// content, since the spacer is before void's content in the DOM. // content, since the spacer is before void's content in the DOM.
@@ -52,7 +59,7 @@ function cloneFragment(event, value, fragment = value.fragment) {
// not preserved when copying. If the attatched is not void, and the start key // not preserved when copying. If the attatched is not void, and the start key
// and endKey is the same, check if there is marks involved. If so, set the // and endKey is the same, check if there is marks involved. If so, set the
// range start just before the start text node. // range start just before the start text node.
if ((IS_CHROME || IS_SAFARI) && !endVoid && startKey === endKey) { if ((IS_CHROME || IS_SAFARI || IS_OPERA) && !endVoid && startKey === endKey) {
const hasMarks = const hasMarks =
startText.characters startText.characters
.slice(value.selection.anchorOffset, value.selection.focusOffset) .slice(value.selection.anchorOffset, value.selection.focusOffset)
@@ -76,7 +83,7 @@ function cloneFragment(event, value, fragment = value.fragment) {
// COMPAT: In Chrome and Safari, if the last element in the selection to // COMPAT: In Chrome and Safari, if the last element in the selection to
// copy has `contenteditable="false"` the copy will fail, and nothing will // copy has `contenteditable="false"` the copy will fail, and nothing will
// be put in the clipboard. So we remove them all. (2017/05/04) // be put in the clipboard. So we remove them all. (2017/05/04)
if (IS_CHROME || IS_SAFARI) { if (IS_CHROME || IS_SAFARI || IS_OPERA) {
const els = [].slice.call( const els = [].slice.call(
contents.querySelectorAll('[contenteditable="false"]') contents.querySelectorAll('[contenteditable="false"]')
) )