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

Merge branch 'master' into remove-normalize

Browse Source
This commit is contained in:
Ian Storm Taylor
2016-10-14 17:40:20 -07:00
parent 8213bb089f b7eb15dfad
commit 81bb5ea800
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/models/state.js
View File

@@ -5,7 +5,7 @@ import Mark from './mark'
import Selection from './selection' import Selection from './selection'
import Transform from './transform' import Transform from './transform'
import uid from '../utils/uid' import uid from '../utils/uid'
import { Record, Set, Stack } from 'immutable' import { Record, Set, Stack, List } from 'immutable'
/** /**
* History. * History.
@@ -361,7 +361,9 @@ class State extends new Record(DEFAULTS) {
*/ */
get marks() { get marks() {
return this.selection.marks || this.document.getMarksAtRange(this.selection) return this.selection.isUnset
? new Set()
: this.selection.marks || this.document.getMarksAtRange(this.selection)
} }
/** /**
@@ -371,7 +373,9 @@ class State extends new Record(DEFAULTS) {
*/ */
get blocks() { get blocks() {
return this.document.getBlocksAtRange(this.selection) return this.selection.isUnset
? new List()
: this.document.getBlocksAtRange(this.selection)
} }
/** /**
@@ -381,7 +385,9 @@ class State extends new Record(DEFAULTS) {
*/ */
get fragment() { get fragment() {
return this.document.getFragmentAtRange(this.selection) return this.selection.isUnset
? Document.create()
: this.document.getFragmentAtRange(this.selection)
} }
/** /**
@@ -391,7 +397,9 @@ class State extends new Record(DEFAULTS) {
*/ */
get inlines() { get inlines() {
return this.document.getInlinesAtRange(this.selection) return this.selection.isUnset
? new List()
: this.document.getInlinesAtRange(this.selection)
} }
/** /**
@@ -401,7 +409,9 @@ class State extends new Record(DEFAULTS) {
*/ */
get texts() { get texts() {
return this.document.getTextsAtRange(this.selection) return this.selection.isUnset
? new List()
: this.document.getTextsAtRange(this.selection)
} }
/** /**