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

use fragment instead of node transfer type on drag (#2090)

Browse Source 
* use fragment instead of node transfer type on drag

* remove the range.isCollapsed check in Changes.deleteAtRange so that it will also remove the selection when only a void node is selected

* fix selection before starting the drag

* fix linting errors

* review fixes

* align with new way of handling void nodes via schema
This commit is contained in:
Bryan Haakman 2018-08-22 21:15:55 +02:00 committed by Ian Storm Taylor
parent e9c3c39d69
commit b379a19ac3
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/slate-react/src/plugins/after.js
View File

@ -4,7 +4,7 @@ import Plain from 'slate-plain-serializer'
import { IS_IOS } from 'slate-dev-environment'
import React from 'react'
import getWindow from 'get-window'
import { Block, Inline, Text } from 'slate'
import { Text } from 'slate'
import Hotkeys from 'slate-hotkeys'
import Content from '../components/content'
@ -271,15 +271,18 @@ function AfterPlugin() {
const ancestors = document.getAncestors(node.key)
const isVoid =
node && (schema.isVoid(node) || ancestors.some(a => schema.isVoid(a)))
const selectionIncludesNode = value.blocks.some(
block => block.key === node.key
)
if (isVoid) {
const encoded = Base64.serializeNode(node, { preserveKeys: true })
setEventTransfer(event, 'node', encoded)
} else {
const { fragment } = value
const encoded = Base64.serializeNode(fragment)
setEventTransfer(event, 'fragment', encoded)
// If a void block is dragged and is not selected, select it (necessary for local drags).
if (isVoid && !selectionIncludesNode) {
change.moveToRangeOfNode(node)
}
const fragment = change.value.fragment
const encoded = Base64.serializeNode(fragment)
setEventTransfer(event, 'fragment', encoded)
}
/**
@ -300,7 +303,7 @@ function AfterPlugin() {
if (!target) return
const transfer = getEventTransfer(event)
const { type, fragment, node, text } = transfer
const { type, fragment, text } = transfer
change.focus()
@ -352,14 +355,6 @@ function AfterPlugin() {
change.insertFragment(fragment)
}
if (type == 'node' && Block.isBlock(node)) {
change.insertBlock(node.regenerateKey()).removeNodeByKey(node.key)
}
if (type == 'node' && Inline.isInline(node)) {
change.insertInline(node.regenerateKey()).removeNodeByKey(node.key)
}
// COMPAT: React's onSelect event breaks after an onDrop event
// has fired in a node: https://github.com/facebook/react/issues/11379.
// Until this is fixed in React, we dispatch a mouseup event on that

2
packages/slate/src/changes/at-range.js
View File

@ -70,8 +70,6 @@ Changes.addMarksAtRange = (change, range, marks, options = {}) => {
*/
Changes.deleteAtRange = (change, range, options = {}) => {
if (range.isCollapsed) return
// Snapshot the selection, which creates an extra undo save point, so that
// when you undo a delete, the expanded selection will be retained.
change.snapshotSelection()