Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/extensions/base/BaseSchema/BaseSchemaSpecs/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import type {NodeSpec} from 'prosemirror-model';

import {isEmptyString} from 'src/utils';

import type {ExtensionAuto} from '../../../../core';
import {nodeTypeFactory} from '../../../../utils/schema';
import type {ExtensionAuto} from '#core';
import type {NodeSpec} from '#pm/model';
import {isEmptyString} from 'src/utils/nodes';
import {nodeTypeFactory} from 'src/utils/schema';

export enum BaseNode {
Doc = 'doc',
Expand Down
18 changes: 14 additions & 4 deletions src/utils/inputrules.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import {InputRule} from 'prosemirror-inputrules';
import {Fragment, type Mark, type MarkType, type Node} from 'prosemirror-model';
import {type EditorState, TextSelection} from 'prosemirror-state';

import {codeType} from '../extensions/markdown/specs';
import {isFunction} from '../lodash';
import {isMarkActive} from '../utils/marks';
// TODO: remove explicit import from code extension
// TODO: remove explicit import from base and code extensions
import {pType} from 'src/extensions/base/specs';
import {codeType} from 'src/extensions/markdown/specs';
import {isFunction} from 'src/lodash';
import {isMarkActive} from 'src/utils/marks';

export function hasCodeMark(
state: EditorState,
Expand All @@ -20,6 +21,15 @@ export function hasCodeMark(
return false;
}

export function inDefaultTextblock(
state: EditorState,
_match: RegExpMatchArray,
start: number,
_end: number,
): boolean {
return state.doc.resolve(start).parent.type === pType(state.schema);
}

export {textblockTypeInputRule, wrappingInputRule} from './rulebuilders';

function getMarksBetween(start: number, end: number, state: EditorState) {
Expand Down
3 changes: 2 additions & 1 deletion src/utils/rulebuilders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {InputRule} from 'prosemirror-inputrules';
import type {Attrs, Node, NodeType} from 'prosemirror-model';
import {canJoin, findWrapping} from 'prosemirror-transform';

import {hasCodeMark} from './inputrules';
import {hasCodeMark, inDefaultTextblock} from './inputrules';

/// Build an input rule for automatically wrapping a textblock when a
/// given string is typed. The `regexp` argument is
Expand All @@ -32,6 +32,7 @@ export function wrappingInputRule(
) {
return new InputRule(regexp, (state, match, start, end) => {
if (hasCodeMark(state, match, start, end)) return null;
if (!inDefaultTextblock(state, match, start, end)) return null;

const attrs = getAttrs instanceof Function ? getAttrs(match) : getAttrs;
const tr = state.tr.delete(start, end);
Expand Down
Loading