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

Support decorations without path (#2697)

Browse Source 
* Add support with warning for decorations without paths

* Fix linting

* Update text.js

* Update text.js
This commit is contained in:
Sunny Hirai
2019-04-24 17:27:50 -07:00
committed by Ian Storm Taylor
parent feaad7e7cd
commit 662f584d4d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/slate-react/src/components/text.js
View File

@@ -1,11 +1,10 @@
import Debug from 'debug' import Debug from 'debug'
import ImmutableTypes from 'react-immutable-proptypes' import ImmutableTypes from 'react-immutable-proptypes'
import Leaf from './leaf'
import { PathUtils } from 'slate'
import React from 'react' import React from 'react'
import SlateTypes from 'slate-prop-types' import SlateTypes from 'slate-prop-types'
import Types from 'prop-types' import Types from 'prop-types'
import { PathUtils } from 'slate'
import Leaf from './leaf'
/** /**
* Debug. * Debug.
@@ -117,12 +116,15 @@ class Text extends React.Component {
// Otherwise, if the decoration is in a single node, it's not ours. // Otherwise, if the decoration is in a single node, it's not ours.
if (start.key === end.key) return false if (start.key === end.key) return false
// If the node's path is before the start path, ignore it.
const path = document.assertPath(key) const path = document.assertPath(key)
if (PathUtils.compare(path, start.path) === -1) return false const startPath = start.path || document.assertPath(start.key)
const endPath = end.path || document.assertPath(end.key)
// If the node's path is before the start path, ignore it.
if (PathUtils.compare(path, startPath) === -1) return false
// If the node's path is after the end path, ignore it. // If the node's path is after the end path, ignore it.
if (PathUtils.compare(path, end.path) === 1) return false if (PathUtils.compare(path, endPath) === 1) return false
// Otherwise, include it. // Otherwise, include it.
return true return true