ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into v1.0

Browse Source 
# Conflicts:
#	examples/Components/Routes/Basic/index.vue
#	examples/Components/Routes/Export/index.vue
#	examples/Components/Routes/MarkdownShortcuts/index.vue
#	examples/Components/Routes/Suggestions/index.vue
This commit is contained in:
Philipp Kühn
2018-11-08 21:41:33 +01:00
parent 583c890624 107d628ba8
commit e8fcc8916a
12 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -103,14 +103,14 @@ import { Editor } from 'tiptap'
import {
// Nodes
BlockquoteNode,
BulletListNode,
CodeBlockNode,
CodeBlockHighlightNode,
HardBreakNode,
HeadingNode,
ImageNode,
ListItemNode,
OrderedListNode,
BulletListNode,
ListItemNode,
TodoItemNode,
TodoListNode,

4
examples/Components/Routes/Basic/index.vue
View File

@@ -133,12 +133,12 @@ import Icon from 'Components/Icon'
import { Editor, EditorContent, MenuBar } from 'tiptap'
import {
Blockquote,
BulletList,
CodeBlock,
HardBreak,
Heading,
ListItem,
OrderedList,
BulletList,
ListItem,
TodoItem,
TodoList,
Bold,

4
examples/Components/Routes/Export/index.vue
View File

@@ -115,12 +115,12 @@ import Icon from 'Components/Icon'
import { Editor, EditorContent, MenuBar } from 'tiptap'
import {
Blockquote,
BulletList,
CodeBlock,
HardBreak,
Heading,
ListItem,
OrderedList,
BulletList,
ListItem,
TodoItem,
TodoList,
Bold,

4
examples/Components/Routes/MarkdownShortcuts/index.vue
View File

@@ -9,12 +9,12 @@ import Icon from 'Components/Icon'
import { Editor, EditorContent } from 'tiptap'
import {
Blockquote,
BulletList,
CodeBlock,
HardBreak,
Heading,
ListItem,
OrderedList,
BulletList,
ListItem,
TodoItem,
TodoList,
Bold,

10
examples/Components/Routes/Suggestions/index.vue
View File

@@ -52,14 +52,16 @@ export default {
new Heading({ levels: [1, 2, 3] }),
new Mention({
// a list of all suggested items
items: [
items: () => [
{ id: 1, name: 'Philipp Kühn' },
{ id: 2, name: 'Hans Pagel' },
{ id: 3, name: 'Kris Siepert' },
{ id: 4, name: 'Justin Schueler' },
],
// is called when a suggestion starts
onEnter: ({ items, query, range, command, virtualNode }) => {
onEnter: ({
items, query, range, command, virtualNode,
}) => {
this.query = query
this.filteredUsers = items
this.suggestionRange = range
@@ -70,7 +72,9 @@ export default {
this.insertMention = command
},
// is called when a suggestion has changed
onChange: ({ items, query, range, virtualNode }) => {
onChange: ({
items, query, range, virtualNode,
}) => {
this.query = query
this.filteredUsers = items
this.suggestionRange = range

6
packages/_legacy-tiptap/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "tiptap",
"version": "0.20.0",
"version": "0.20.1",
"description": "A rich-text editor for Vue.js",
"homepage": "https://tiptap.scrumpy.io",
"license": "MIT",
@@ -27,8 +27,8 @@
"prosemirror-model": "^1.6.2",
"prosemirror-state": "^1.2.1",
"prosemirror-view": "^1.6.1",
"tiptap-commands": "^0.7.0",
"tiptap-utils": "^0.4.0"
"tiptap-commands": "^0.7.1",
"tiptap-utils": "^0.4.1"
},
"peerDependencies": {
"vue": "^2.5.17",

4
packages/tiptap-commands/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "tiptap-commands",
"version": "0.7.0",
"version": "0.7.1",
"description": "Commands for tiptap",
"homepage": "https://tiptap.scrumpy.io",
"license": "MIT",
@@ -23,6 +23,6 @@
"prosemirror-commands": "^1.0.7",
"prosemirror-inputrules": "^1.0.1",
"prosemirror-schema-list": "^1.0.1",
"tiptap-utils": "^0.4.0"
"tiptap-utils": "^0.4.1"
}
}

6
packages/tiptap-extensions/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "tiptap-extensions",
"version": "0.22.0",
"version": "0.23.0",
"description": "Extensions for tiptap",
"homepage": "https://tiptap.scrumpy.io",
"license": "MIT",
@@ -25,8 +25,8 @@
"prosemirror-history": "^1.0.2",
"prosemirror-state": "^1.2.2",
"prosemirror-view": "^1.6.1",
"tiptap": "^0.20.0",
"tiptap-commands": "^0.7.0"
"tiptap": "^0.20.1",
"tiptap-commands": "^0.7.1"
},
"peerDependencies": {
"vue": "^2.5.17",

1
packages/tiptap-extensions/src/nodes/ListItem.js
View File

@@ -10,7 +10,6 @@ export default class ListItem extends Node {
get schema() {
return {
content: 'paragraph block*',
group: 'block',
defining: true,
draggable: false,
parseDOM: [

59
packages/tiptap-extensions/src/plugins/Suggestions.js
View File

@@ -22,39 +22,42 @@ function triggerCharacter({
const textTo = $position.end()
const text = $position.doc.textBetween(textFrom, textTo, '\0', '\0')
let match = regexp.exec(text)
let position
let match = regexp.exec(text)
let position
while (match !== null) {
// JavaScript doesn't have lookbehinds; this hacks a check that first character is " "
// or the line beginning
// JavaScript doesn't have lookbehinds; this hacks a check that first character is " "
// or the line beginning
const matchPrefix = match.input.slice(Math.max(0, match.index - 1), match.index)
if (/^[\s\0]?$/.test(matchPrefix)) {
// The absolute position of the match in the document
const from = match.index + $position.start()
let to = from + match[0].length
// The absolute position of the match in the document
const from = match.index + $position.start()
let to = from + match[0].length
// Edge case handling; if spaces are allowed and we're directly in between
// two triggers
if (allowSpaces && suffix.test(text.slice(to - 1, to + 1))) {
match[0] += ' '
to += 1
}
// Edge case handling; if spaces are allowed and we're directly in between
// two triggers
if (allowSpaces && suffix.test(text.slice(to - 1, to + 1))) {
match[0] += ' '
to += 1
}
// If the $position is located within the matched substring, return that range
if (from < $position.pos && to >= $position.pos) {
position = {
range: {
from,
to,
},
query: match[0].slice(char.length),
text: match[0],
}
}
// If the $position is located within the matched substring, return that range
if (from < $position.pos && to >= $position.pos) {
position = {
range: {
from,
to,
},
query: match[0].slice(char.length),
text: match[0],
}
}
}
match = regexp.exec(text)
}
return position
match = regexp.exec(text)
}
return position
}
}
@@ -124,7 +127,7 @@ export default function SuggestionsPlugin({
text: state.text,
decorationNode,
virtualNode,
items: onFilter(items, state.query),
items: onFilter(Array.isArray(items) ? items : items(), state.query),
command: ({ range, attrs }) => {
command({
range,

2
packages/tiptap-utils/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "tiptap-utils",
"version": "0.4.0",
"version": "0.4.1",
"description": "Utility functions for tiptap",
"homepage": "https://tiptap.scrumpy.io",
"license": "MIT",

4
packages/tiptap-utils/src/utils/nodeIsActive.js
View File

@@ -1,10 +1,10 @@
import { findParentNode } from 'prosemirror-utils'
export default function (state, type, attrs) {
export default function (state, type, attrs = {}) {
const predicate = node => node.type === type
const parent = findParentNode(predicate)(state.selection)
if (attrs === {} || !parent) {
if (!Object.keys(attrs).length || !parent) {
return !!parent
}