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

Merge remote-tracking branch 'origin/schema-normalize-selection-ops' into schema-normalize-selection-ops

Browse Source
This commit is contained in:
Samy Pessé
2016-10-26 14:57:15 +02:00
parent 29afc577b0 b3e1b3ad08
commit 6c43cd57e1
18 changed files with 206 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/models/node.js
View File

@@ -975,38 +975,37 @@ const Node = {
},
/**
* Join a node by `key` with another `withKey`.
* It brings Node<key> after Node<WithKey>
* Join a children node `first` with another children node `second`.
* `first` and `second` will be concatenated in that order.
* `first` and `second` must be two Nodes or two Text.
*
* @param {String} key
* @param {String} withKey
* @param {Node} first
* @param {Node} second
* @return {Node}
*/
joinNode(key, withKey) {
joinNode(first, second) {
let node = this
let target = node.assertPath(key)
let withTarget = node.assertPath(withKey)
let parent = node.getParent(target)
let parent = node.getParent(second)
const isParent = node == parent
const index = parent.nodes.indexOf(target)
const index = parent.nodes.indexOf(second)
if (target.kind == 'text') {
let { characters } = withTarget
characters = characters.concat(target.characters)
withTarget = withTarget.merge({ characters })
if (second.kind == 'text') {
let { characters } = first
characters = characters.concat(second.characters)
first = first.merge({ characters })
}
else {
const size = withTarget.nodes.size
target.nodes.forEach((child, i) => {
withTarget = withTarget.insertNode(size + i, child)
const size = first.nodes.size
second.nodes.forEach((child, i) => {
first = first.insertNode(size + i, child)
})
}
parent = parent.removeNode(index)
node = isParent ? parent : node.updateDescendant(parent)
node = node.updateDescendant(withTarget)
node = node.updateDescendant(first)
return node
},

29
src/transforms/apply-operation.js
View File

@@ -136,9 +136,32 @@ function insertText(state, operation) {
function joinNode(state, operation) {
const { path, withPath } = operation
let { document } = state
document = document.joinNode(path, withPath)
state = state.merge({ document })
let { document, selection } = state
const first = document.assertPath(withPath)
const second = document.assertPath(path)
// Update doc
document = document.joinNode(first, second)
// Update selection
// When merging two texts together
if (second.kind == 'text') {
// The final key is the `first` key
if (selection.anchorKey == second.key) {
selection = selection.merge({
anchorKey: first.key,
anchorOffset: selection.anchorOffset + first.characters.size
})
}
if (selection.focusKey == second.key) {
selection = selection.merge({
focusKey: first.key,
focusOffset: selection.focusOffset + first.characters.size
})
}
}
state = state.merge({ document, selection })
return state
}

24
test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/index.js
View File

@@ -2,14 +2,11 @@
import assert from 'assert'
export default function (state) {
const { document, selection } = state
const texts = document.getTexts()
let first = texts.first()
const second = texts.last()
const { selection } = state
const range = selection.merge({
anchorKey: first.key,
anchorOffset: 2,
focusKey: second.key,
anchorKey: 'anchor',
anchorOffset: 1,
focusKey: 'focus',
focusOffset: 2
})
@@ -19,15 +16,18 @@ export default function (state) {
.unwrapInline('hashtag')
.apply()
// Selection is reset, in theory it should me on the image
first = next.document.getTexts().first()
// Test selection
const { document } = next
const first = document.getTexts().first()
const last = document.getTexts().last()
assert.deepEqual(
next.selection.toJS(),
range.merge({
anchorKey: first.key,
anchorOffset: 0,
focusKey: first.key,
focusOffset: 0
anchorOffset: 1,
focusKey: last.key,
focusOffset: 4
}).toJS()
)

2
test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/input.yaml
View File

@@ -4,6 +4,7 @@ nodes:
type: paragraph
nodes:
- kind: text
key: 'anchor' # w[o
text: wo
- kind: inline
type: hashtag
@@ -19,4 +20,5 @@ nodes:
- kind: text
text: an
- kind: text
key: 'focus' # ot]her
text: other

2
test/transforms/fixtures/at-current-range/unwrap-inline/across-blocks/output.yaml
View File

@@ -10,3 +10,5 @@ nodes:
nodes:
- kind: text
text: another
# Selection
# w[ordanot]her

14
test/transforms/fixtures/at-current-range/unwrap-inline/nested-block/index.js
View File

@@ -2,14 +2,11 @@
import assert from 'assert'
export default function (state) {
const { document, selection } = state
const texts = document.getTexts()
const first = texts.first()
const last = texts.get(1)
const { selection } = state
const range = selection.merge({
anchorKey: first.key,
anchorKey: 'anchor',
anchorOffset: 1,
focusKey: last.key,
focusKey: 'focus',
focusOffset: 2
})
@@ -21,7 +18,10 @@ export default function (state) {
assert.deepEqual(
next.selection.toJS(),
range.collapseToStartOf(next.document).toJS()
range.merge({
focusKey: 'anchor',
focusOffset: 3
}).toJS()
)
return next

4
test/transforms/fixtures/at-current-range/unwrap-inline/nested-block/input.yaml
View File

@@ -7,11 +7,15 @@ nodes:
type: paragraph
nodes:
- kind: text
key: 'anchor'
text: w
- kind: inline
type: hashtag
nodes:
- kind: text
key: 'focus'
text: or
- kind: text
text: d
# Selection
# w[or]d

14
test/transforms/fixtures/at-current-range/unwrap-inline/only-one/index.js
View File

@@ -2,14 +2,11 @@
import assert from 'assert'
export default function (state) {
const { document, selection } = state
const texts = document.getTexts()
const first = texts.get(2)
const last = texts.get(3)
const { selection } = state
const range = selection.merge({
anchorKey: first.key,
anchorKey: 'anchor',
anchorOffset: 2,
focusKey: last.key,
focusKey: 'focus',
focusOffset: 2
})
@@ -21,7 +18,10 @@ export default function (state) {
assert.deepEqual(
next.selection.toJS(),
range.collapseToStartOf(next.document).toJS()
range.merge({
focusKey: 'anchor',
focusOffset: 5
}).toJS()
)
return next

5
test/transforms/fixtures/at-current-range/unwrap-inline/only-one/input.yaml
View File

@@ -11,11 +11,16 @@ nodes:
- kind: text
text: ll
- kind: text
key: 'anchor'
text: "o w"
- kind: inline
type: hashtag
nodes:
- kind: text
key: 'focus'
text: or
- kind: text
text: d
# Selection
# hello [wor]d

2
test/transforms/fixtures/at-current-range/unwrap-inline/only-one/output.yaml
View File

@@ -12,3 +12,5 @@ nodes:
text: ll
- kind: text
text: "o word"
# Selection
# hello [wor]d

14
test/transforms/fixtures/at-current-range/unwrap-inline/single-block/index.js
View File

@@ -2,14 +2,11 @@
import assert from 'assert'
export default function (state) {
const { document, selection } = state
const texts = document.getTexts()
const first = texts.first()
const last = texts.get(1)
const { selection } = state
const range = selection.merge({
anchorKey: first.key,
anchorKey: 'anchor',
anchorOffset: 1,
focusKey: last.key,
focusKey: 'focus',
focusOffset: 2
})
@@ -21,7 +18,10 @@ export default function (state) {
assert.deepEqual(
next.selection.toJS(),
range.collapseToStartOf(next.document).toJS()
range.merge({
focusKey: 'anchor',
focusOffset: 3
}).toJS()
)
return next

5
test/transforms/fixtures/at-current-range/unwrap-inline/single-block/input.yaml
View File

@@ -4,11 +4,16 @@ nodes:
type: paragraph
nodes:
- kind: text
key: 'anchor'
text: w
- kind: inline
type: hashtag
nodes:
- kind: text
key: 'focus'
text: or
- kind: text
text: d
# selection:
# w[or]d

29
test/transforms/fixtures/by-key/join-node-by-key/block/index.js Normal file
View File

@@ -0,0 +1,29 @@
import assert from 'assert'
export default function (state) {
const { selection } = state
const range = selection.merge({
anchorKey: 'anchor',
anchorOffset: 1,
focusKey: 'focus',
focusOffset: 2
})
const next = state
.transform()
.moveTo(range)
.joinNodeByKey('key2', 'key1')
.apply()
assert.deepEqual(
next.selection.toJS(),
range.merge({
focusKey: 'anchor',
focusOffset: 5
}).toJS()
)
return next
}

16
test/transforms/fixtures/by-key/join-node-by-key/block/input.yaml Normal file
View File

@@ -0,0 +1,16 @@
nodes:
- kind: block
key: 'key1'
type: paragraph
nodes:
- kind: text
key: 'anchor'
text: The
- kind: block
key: 'key2'
type: paragraph
nodes:
- kind: text
key: 'focus'
text: text

8
test/transforms/fixtures/by-key/join-node-by-key/block/output.yaml Normal file
View File

@@ -0,0 +1,8 @@
nodes:
- kind: block
key: key1
type: paragraph
nodes:
- kind: text
text: Thetext

29
test/transforms/fixtures/by-key/join-node-by-key/text/index.js Normal file
View File

@@ -0,0 +1,29 @@
import assert from 'assert'
export default function (state) {
const { selection } = state
const range = selection.merge({
anchorKey: 'anchor',
anchorOffset: 1,
focusKey: 'focus',
focusOffset: 2
})
const next = state
.transform()
.moveTo(range)
.joinNodeByKey('focus', 'anchor')
.apply()
assert.deepEqual(
next.selection.toJS(),
range.merge({
focusKey: 'anchor',
focusOffset: 5
}).toJS()
)
return next
}

16
test/transforms/fixtures/by-key/join-node-by-key/text/input.yaml Normal file
View File

@@ -0,0 +1,16 @@
nodes:
- kind: block
type: paragraph
nodes:
- kind: text
key: 'anchor'
text: one
- kind: inline
type: link
nodes:
- kind: text
text: two
- kind: text
key: 'focus'
text: three

13
test/transforms/fixtures/by-key/join-node-by-key/text/output.yaml Normal file
View File

@@ -0,0 +1,13 @@
nodes:
- kind: block
type: paragraph
nodes:
- kind: text
key: 'anchor'
text: onethree
- kind: inline
type: link
nodes:
- kind: text
text: two