@prosekit/extensions 0.13.0 → 0.14.0

package/src/table/index.ts

@@ -1,40 +1,13 @@
-export {
-  defineTable,
-  type TableExtension,
-} from './table'
-export {
-  defineTableCommands,
-  type TableCommandsExtension,
-} from './table-commands'
+export { defineTable, type TableExtension } from './table'
+export { defineTableCommands, type TableCommandsExtension } from './table-commands'
 export { exitTable } from './table-commands/exit-table'
-export {
-  insertTable,
-  type InsertTableOptions,
-} from './table-commands/insert-table'
-export {
-  moveTableColumn,
-  type MoveTableColumnOptions,
-} from './table-commands/move-table-column'
-export {
-  moveTableRow,
-  type MoveTableRowOptions,
-} from './table-commands/move-table-row'
-export {
-  selectTable,
-  type SelectTableOptions,
-} from './table-commands/select-table'
-export {
-  selectTableCell,
-  type SelectTableCellOptions,
-} from './table-commands/select-table-cell'
-export {
-  selectTableColumn,
-  type SelectTableColumnOptions,
-} from './table-commands/select-table-column'
-export {
-  selectTableRow,
-  type SelectTableRowOptions,
-} from './table-commands/select-table-row'
+export { insertTable, type InsertTableOptions } from './table-commands/insert-table'
+export { moveTableColumn, type MoveTableColumnOptions } from './table-commands/move-table-column'
+export { moveTableRow, type MoveTableRowOptions } from './table-commands/move-table-row'
+export { selectTable, type SelectTableOptions } from './table-commands/select-table'
+export { selectTableCell, type SelectTableCellOptions } from './table-commands/select-table-cell'
+export { selectTableColumn, type SelectTableColumnOptions } from './table-commands/select-table-column'
+export { selectTableRow, type SelectTableRowOptions } from './table-commands/select-table-row'
 export { defineTableDropIndicator } from './table-drop-indicator'
 export { defineTablePlugins } from './table-plugins'
 export {
@@ -47,7 +20,4 @@ export {
   type TableRowSpecExtension,
   type TableSpecExtension,
 } from './table-spec'
-export {
-  findTable,
-  isCellSelection,
-} from './table-utils'
+export { findTable, isCellSelection } from './table-utils'

package/src/table/table-commands/delete-cell-selection.spec.ts

@@ -1,8 +1,4 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { setupTest } from '../../testing'
 import { isCellSelection } from '../table-utils'

package/src/table/table-commands/exit-table.spec.ts

@@ -1,8 +1,4 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { setupTest } from '../../testing'
 import { inputText } from '../../testing/keyboard'

package/src/table/table-commands/insert-table.spec.ts

@@ -1,8 +1,4 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { setupTest } from '../../testing'
 

package/src/table/table-commands/insert-table.ts

@@ -1,7 +1,4 @@
-import {
-  getNodeType,
-  insertNode,
-} from '@prosekit/core'
+import { getNodeType, insertNode } from '@prosekit/core'
 import type { Schema } from '@prosekit/pm/model'
 import type { Command } from '@prosekit/pm/state'
 

package/src/table/table-commands/move-table-column.spec.ts

@@ -1,10 +1,6 @@
 import type { Command } from '@prosekit/pm/state'
 import { CellSelection } from 'prosemirror-tables'
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { setupTest } from '../../testing'
 

package/src/table/table-commands/move-table-column.ts

@@ -1,4 +1 @@
-export {
-  moveTableColumn,
-  type MoveTableColumnOptions,
-} from 'prosemirror-tables'
+export { moveTableColumn, type MoveTableColumnOptions } from 'prosemirror-tables'

package/src/table/table-commands/move-table-row.spec.ts

@@ -1,10 +1,6 @@
 import type { Command } from '@prosekit/pm/state'
 import { CellSelection } from 'prosemirror-tables'
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { setupTest } from '../../testing'
 

package/src/table/table-commands/move-table-row.ts

@@ -1,4 +1 @@
-export {
-  moveTableRow,
-  type MoveTableRowOptions,
-} from 'prosemirror-tables'
+export { moveTableRow, type MoveTableRowOptions } from 'prosemirror-tables'

package/src/table/table-commands/select-table-cell.spec.ts

@@ -1,8 +1,4 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { setupTest } from '../../testing'
 import { isCellSelection } from '../table-utils'

package/src/table/table-commands/select-table-column.spec.ts

@@ -1,8 +1,4 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { setupTest } from '../../testing'
 import { inspectSelectedCells } from '../test-utils'

package/src/table/table-commands/select-table-row.spec.ts

@@ -1,8 +1,4 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { setupTest } from '../../testing'
 import { inspectSelectedCells } from '../test-utils'

package/src/table/table-commands/select-table.spec.ts

@@ -1,8 +1,4 @@
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { setupTest } from '../../testing'
 import { inspectSelectedCells } from '../test-utils'

package/src/table/table-commands/select-table.ts

@@ -1,8 +1,5 @@
 import type { Command } from '@prosekit/pm/state'
-import {
-  CellSelection,
-  TableMap,
-} from 'prosemirror-tables'
+import { CellSelection, TableMap } from 'prosemirror-tables'
 
 import { findTable } from '../table-utils'
 

package/src/table/table-commands.ts

@@ -1,7 +1,4 @@
-import {
-  defineCommands,
-  type Extension,
-} from '@prosekit/core'
+import { defineCommands, type Extension } from '@prosekit/core'
 import {
   addColumnAfter,
   addColumnBefore,
@@ -16,34 +13,13 @@ import {
 
 import { deleteCellSelection } from './table-commands/delete-cell-selection'
 import { exitTable } from './table-commands/exit-table'
-import {
-  insertTable,
-  type InsertTableOptions,
-} from './table-commands/insert-table'
-import {
-  moveTableColumn,
-  type MoveTableColumnOptions,
-} from './table-commands/move-table-column'
-import {
-  moveTableRow,
-  type MoveTableRowOptions,
-} from './table-commands/move-table-row'
-import {
-  selectTable,
-  type SelectTableOptions,
-} from './table-commands/select-table'
-import {
-  selectTableCell,
-  type SelectTableCellOptions,
-} from './table-commands/select-table-cell'
-import {
-  selectTableColumn,
-  type SelectTableColumnOptions,
-} from './table-commands/select-table-column'
-import {
-  selectTableRow,
-  type SelectTableRowOptions,
-} from './table-commands/select-table-row'
+import { insertTable, type InsertTableOptions } from './table-commands/insert-table'
+import { moveTableColumn, type MoveTableColumnOptions } from './table-commands/move-table-column'
+import { moveTableRow, type MoveTableRowOptions } from './table-commands/move-table-row'
+import { selectTable, type SelectTableOptions } from './table-commands/select-table'
+import { selectTableCell, type SelectTableCellOptions } from './table-commands/select-table-cell'
+import { selectTableColumn, type SelectTableColumnOptions } from './table-commands/select-table-column'
+import { selectTableRow, type SelectTableRowOptions } from './table-commands/select-table-row'
 
 /**
  * @internal

package/src/table/table-plugins.ts

@@ -1,11 +1,5 @@
-import {
-  definePlugin,
-  type PlainExtension,
-} from '@prosekit/core'
-import {
-  columnResizing,
-  tableEditing,
-} from 'prosemirror-tables'
+import { definePlugin, type PlainExtension } from '@prosekit/core'
+import { columnResizing, tableEditing } from 'prosemirror-tables'
 
 /**
  * @public

package/src/table/table-spec.spec.ts

@@ -1,21 +1,12 @@
 import { union } from '@prosekit/core'
 import pick from 'just-pick'
-import {
-  describe,
-  expect,
-  it,
-} from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { defineDoc } from '../doc'
 import { defineParagraph } from '../paragraph'
 import { defineText } from '../text'
 
-import {
-  defineTableCellSpec,
-  defineTableHeaderCellSpec,
-  defineTableRowSpec,
-  defineTableSpec,
-} from './table-spec'
+import { defineTableCellSpec, defineTableHeaderCellSpec, defineTableRowSpec, defineTableSpec } from './table-spec'
 
 describe('table spec', () => {
   it('should be defined', () => {

package/src/table/table-spec.ts

@@ -1,11 +1,5 @@
-import {
-  defineNodeSpec,
-  type Extension,
-} from '@prosekit/core'
-import type {
-  AttributeSpec,
-  Attrs,
-} from '@prosekit/pm/model'
+import { defineNodeSpec, type Extension } from '@prosekit/core'
+import type { AttributeSpec, Attrs } from '@prosekit/pm/model'
 import { tableNodes } from 'prosemirror-tables'
 
 const cellContent = 'block+'

package/src/table/table-utils.ts

@@ -1,10 +1,6 @@
-import { CellSelection } from 'prosemirror-tables'
+import { CellSelection, findCellPos, findCellRange, findTable } from 'prosemirror-tables'
 
-export {
-  findCellPos,
-  findCellRange,
-  findTable,
-} from 'prosemirror-tables'
+export { findCellPos, findCellRange, findTable }
 
 /**
  * Checks if the given object is a `CellSelection` instance.

package/src/table/table.ts

@@ -1,12 +1,6 @@
-import {
-  union,
-  type Union,
-} from '@prosekit/core'
+import { union, type Union } from '@prosekit/core'
 
-import {
-  defineTableCommands,
-  type TableCommandsExtension,
-} from './table-commands'
+import { defineTableCommands, type TableCommandsExtension } from './table-commands'
 import { defineTableDropIndicator } from './table-drop-indicator'
 import { defineTablePlugins } from './table-plugins'
 import {

package/src/table/test-utils.ts

@@ -1,7 +1,4 @@
-import type {
-  Command,
-  Selection,
-} from '@prosekit/pm/state'
+import type { Command, Selection } from '@prosekit/pm/state'
 import { CellSelection } from 'prosemirror-tables'
 
 import { isCellSelection } from './table-utils'

package/src/testing/clipboard.ts

@@ -1,6 +1,5 @@
 import type { EditorView } from '@prosekit/pm/view'
-
-import { formatHTML } from './format-html'
+import { formatHTML } from 'diffable-html-snapshot'
 
 async function readBlobFromClipboard(mimeType: string): Promise<Blob | undefined> {
   const clipboardItems = await navigator.clipboard.read()

package/src/testing/index.ts

@@ -10,12 +10,10 @@ import {
   type ExtractNodeActions,
   type NodeChild,
 } from '@prosekit/core'
-import {
-  createTestEditor,
-  type TestEditor,
-} from '@prosekit/core/test'
+import { createTestEditor, type TestEditor } from '@prosekit/core/test'
 import { keyboard } from 'vitest-browser-commands/playwright'
 
+import { defineBackgroundColor } from '../background-color'
 import { defineBlockquote } from '../blockquote'
 import { defineBold } from '../bold'
 import { defineCode } from '../code'
@@ -27,21 +25,16 @@ import { defineHorizontalRule } from '../horizontal-rule'
 import { defineImage } from '../image'
 import { defineItalic } from '../italic'
 import { defineLink } from '../link'
-import {
-  defineList,
-  type ListAttrs,
-} from '../list'
+import { defineList, type ListAttrs } from '../list'
 import { defineParagraph } from '../paragraph'
 import { defineStrike } from '../strike'
 import { defineTable } from '../table'
 import type { CellAttrs } from '../table/table-spec'
 import { defineText } from '../text'
+import { defineTextColor } from '../text-color'
 import { defineUnderline } from '../underline'
 
-import {
-  readHtmlTextFromClipboard,
-  readPlainTextFromClipboard,
-} from './clipboard'
+import { readHtmlTextFromClipboard, readPlainTextFromClipboard } from './clipboard'
 
 /**
  * @internal
@@ -61,6 +54,8 @@ export function defineTestExtension() {
     defineUnderline(),
     defineStrike(),
     defineCode(),
+    defineTextColor(),
+    defineBackgroundColor(),
     defineLink(),
     defineImage(),
     defineParagraph(),

package/src/text/index.ts

@@ -1,7 +1,4 @@
-import {
-  defineNodeSpec,
-  type Extension,
-} from '@prosekit/core'
+import { defineNodeSpec, type Extension } from '@prosekit/core'
 import type { Attrs } from '@prosekit/pm/model'
 
 /**

package/src/text-align/index.ts

@@ -2,7 +2,7 @@ import {
   defineCommands,
   defineKeymap,
   defineNodeAttr,
-  setNodeAttrs,
+  setNodeAttrsBetween,
   union,
   type Extension,
   type PlainExtension,
@@ -74,7 +74,7 @@ export function setTextAlign({
   types: string[]
   value: string | null
 }): Command {
-  return setNodeAttrs({ type: types, attrs: { textAlign: value } })
+  return setNodeAttrsBetween({ type: types, attrs: { textAlign: value } })
 }
 
 /**

package/src/text-color/index.ts

@@ -0,0 +1,3 @@
+export { defineTextColor, type TextColorExtension } from './text-color'
+export { addTextColor, defineTextColorCommands, removeTextColor, type TextColorCommandsExtension } from './text-color-commands'
+export { defineTextColorSpec, type TextColorAttrs, type TextColorSpecExtension } from './text-color-spec'

package/src/text-color/text-color-commands.spec.ts

@@ -0,0 +1,71 @@
+import { describe, expect, it } from 'vitest'
+
+import { setupTest } from '../testing'
+
+describe('addTextColor', () => {
+  it('can add color to text', () => {
+    const { editor, n, m } = setupTest()
+
+    const doc1 = n.doc(
+      n.p('Hello <a>world<b>'),
+    )
+    const doc2 = n.doc(
+      n.p('Hello ', m.textColor({ color: 'red' }, 'world')),
+    )
+
+    editor.set(doc1)
+    editor.commands.addTextColor({ color: 'red' })
+    expect(editor.getDocJSON()).toEqual(doc2.toJSON())
+  })
+
+  it('can override existing color', () => {
+    const { editor, n, m } = setupTest()
+
+    const doc1 = n.doc(
+      n.p(
+        'A',
+        m.textColor({ color: 'red' }, 'B<a>C'),
+        m.textColor({ color: 'red' }, 'DE'),
+        'F<b>G',
+      ),
+    )
+    const doc2 = n.doc(
+      n.p(
+        'A',
+        m.textColor({ color: 'red' }, 'B'),
+        m.textColor({ color: 'blue' }, 'CDEF'),
+        'G',
+      ),
+    )
+
+    editor.set(doc1)
+    editor.commands.addTextColor({ color: 'blue' })
+    expect(editor.getDocJSON()).toEqual(doc2.toJSON())
+  })
+})
+
+describe('removeColor', () => {
+  it('can remove color from text', () => {
+    const { editor, n, m } = setupTest()
+
+    const doc1 = n.doc(
+      n.p(
+        'A',
+        m.textColor({ color: 'red' }, 'B<a>C'),
+        m.textColor({ color: 'blue' }, 'DE'),
+        'F<b>G',
+      ),
+    )
+    const doc2 = n.doc(
+      n.p(
+        'A',
+        m.textColor({ color: 'red' }, 'B'),
+        'CDEFG',
+      ),
+    )
+
+    editor.set(doc1)
+    editor.commands.removeTextColor()
+    expect(editor.getDocJSON()).toEqual(doc2.toJSON())
+  })
+})

package/src/text-color/text-color-commands.ts

@@ -0,0 +1,35 @@
+import { addMark, defineCommands, removeMark, type Extension } from '@prosekit/core'
+import type { Command } from '@prosekit/pm/state'
+
+import type { TextColorAttrs } from './text-color-spec'
+
+/**
+ * @internal
+ */
+export function addTextColor(attrs: TextColorAttrs): Command {
+  return addMark({ type: 'textColor', attrs })
+}
+
+/**
+ * @internal
+ */
+export function removeTextColor(): Command {
+  return removeMark({ type: 'textColor' })
+}
+
+/**
+ * @internal
+ */
+export type TextColorCommandsExtension = Extension<{
+  Commands: {
+    addTextColor: [attrs: TextColorAttrs]
+    removeTextColor: []
+  }
+}>
+
+/**
+ * @internal
+ */
+export function defineTextColorCommands(): TextColorCommandsExtension {
+  return defineCommands({ addTextColor, removeTextColor })
+}