update link example

examples/links/index.js

@@ -22,10 +22,9 @@ class App extends React.Component {
    */
 
   hasLinks() {
-    let { state } = this.state
+    const { state } = this.state
-    const { currentInlineNodes } = state
+    const { inlines } = state
-    const hasLinks = currentInlineNodes.some(inline => inline.type == 'link')
+    return inlines.some(inline => inline.type == 'link')
-    return hasLinks
   }
 
   /**
@@ -47,11 +46,11 @@ class App extends React.Component {
         .apply()
     }
 
-    else if (state.isCurrentlyExpanded) {
+    else if (state.isExpanded) {
-      // const href = window.prompt('Enter the URL of the link:')
+      const href = window.prompt('Enter the URL of the link:')
       state = state
         .transform()
-        .wrapInline('link', new Map({ href: 'https://google.com' }))
+        .wrapInline('link', new Map({ href }))
         .apply()
     }
 
@@ -63,6 +62,7 @@ class App extends React.Component {
         .insertText(text)
         .extendBackward(text.length)
         .wrapInline('link', new Map({ href }))
+        .moveToEnd(text.length)
         .apply()
     }
 

lib/models/block.js

@@ -1,4 +1,15 @@
 
+/**
+ * Prevent circuit.
+ */
+
+import './document'
+import './inline'
+
+/**
+ * Dependencies.
+ */
+
 import Data from './data'
 import Inline from './inline'
 import Node from './node'

lib/models/document.js

@@ -1,4 +1,15 @@
 
+/**
+ * Prevent circuit.
+ */
+
+import './block'
+import './inline'
+
+/**
+ * Dependencies.
+ */
+
 import Block from './block'
 import Node from './node'
 import { OrderedMap, Record } from 'immutable'

lib/models/inline.js

@@ -1,4 +1,15 @@
 
+/**
+ * Prevent circuit.
+ */
+
+import './block'
+import './document'
+
+/**
+ * Dependencies.
+ */
+
 import Block from './block'
 import Data from './data'
 import Node from './node'

lib/models/node.js

@@ -2,6 +2,7 @@
 import Block from './block'
 import Character from './character'
 import Data from './data'
+import Inline from './inline'
 import Mark from './mark'
 import Selection from './selection'
 import Text from './text'
@@ -892,7 +893,6 @@ const Node = {
 
   splitInlineAtRange(range, depth = Infinity) {
     range = range.normalize(this)
-    const Inline = require('./inline').default
     let node = this
 
     // If the range is expanded, remove it first.
@@ -1223,8 +1223,6 @@ const Node = {
   wrapInlineAtRange(range, type, data) {
     range = range.normalize(this)
     data = Data.create(data)
-
-    const Inline = require('./inline').default
     let node = this
 
     // If collapsed or unset, there's nothing to wrap.

lib/models/selection.js

@@ -321,18 +321,20 @@ class Selection extends Record(DEFAULTS) {
   }
 
   /**
-   * Move to the entire range of a `node`.
+   * Move to the entire range of `start` and `end` nodes.
    *
+   * @param {Node} start
+   * @param {Node} end (optional)
    * @return {Selection} selection
    */
 
-  moveToRangeOf(node) {
+  moveToRangeOf(start, end = start) {
     return this.merge({
-      anchorKey: node.key,
+      anchorKey: start.key,
       anchorOffset: 0,
-      focusKey: node.key,
+      focusKey: end.key,
-      focusOffset: node.length,
+      focusOffset: end.length,
-      isBackward: false
+      isBackward: null
     })
   }
 

lib/models/state.js

@@ -522,28 +522,30 @@ class State extends Record(DEFAULTS) {
    * Wrap the block nodes in the current selection in new nodes of `type`.
    *
    * @param {String} type
+   * @param {Data} data (optional)
    * @return {State} state
    */
 
-  wrapBlock(type) {
+  wrapBlock(type, data) {
     let state = this
     let { document, selection } = state
-    document = document.wrapBlockAtRange(selection, type)
+    document = document.wrapBlockAtRange(selection, type, data)
     state = state.merge({ document })
     return state
   }
 
   /**
-   * Unwrap the block nodes in the current selection from a parent of `type`.
+   * Unwrap the current selection from a block parent of `type`.
    *
-   * @param {String} type
+   * @param {String} type (optional)
+   * @param {Data} data (optional)
    * @return {State} state
    */
 
-  unwrapBlock(type) {
+  unwrapBlock(type, data) {
     let state = this
     let { document, selection } = state
-    document = document.unwrapBlockAtRange(selection, type)
+    document = document.unwrapBlockAtRange(selection, type, data)
     state = state.merge({ document, selection })
     return state
   }
@@ -552,7 +554,7 @@ class State extends Record(DEFAULTS) {
    * Wrap the current selection in new inline nodes of `type`.
    *
    * @param {String} type
-   * @param {Map} data
+   * @param {Data} data (optional)
    * @return {State} state
    */
 
@@ -560,21 +562,35 @@ class State extends Record(DEFAULTS) {
     let state = this
     let { document, selection } = state
     document = document.wrapInlineAtRange(selection, type, data)
-    state = state.merge({ document })
+
+    // Determine what the selection should be after wrapping.
+    if (selection.isCollapsed) {
+      selection = selection
+    }
+
+    else {
+      const startText = document.getNextText(selection.startKey)
+      const endText = document.getPreviousText(selection.endKey)
+      selection = selection.moveToRangeOf(start, end)
+      selection = selection.normalize(document)
+    }
+
+    state = state.merge({ document, selection })
     return state
   }
 
   /**
-   * Unwrap the current selection from a parent of `type`.
+   * Unwrap the current selection from an inline parent of `type`.
    *
-   * @param {String} type
+   * @param {String} type (optional)
+   * @param {Data} data (optional)
    * @return {State} state
    */
 
-  unwrapInline(type) {
+  unwrapInline(type, data) {
     let state = this
     let { document, selection } = state
-    document = document.unwrapInlineAtRange(selection, type)
+    document = document.unwrapInlineAtRange(selection, type, data)
     state = state.merge({ document, selection })
     return state
   }