Merge branch 'feature/improved-focus-extension' of github.com:ueberdosis/tiptap-next into feature/improved-focus-extension

# Conflicts: # packages/extension-focus/src/focus.ts
2021-02-05 18:15:49 +01:00
parent 3c7b9f53c7 2959ace822
commit 09d311cd42
1 changed files with 6 additions and 0 deletions
--- a/packages/extension-focus/src/focus.ts
+++ b/packages/extension-focus/src/focus.ts
@@ -4,7 +4,13 @@ import { DecorationSet, Decoration } from 'prosemirror-view'

 export interface FocusOptions {
  className: string,
+<<<<<<< HEAD
  mode: 'all' | 'deepest' | 'shallowest',
+=======
+  start: 'deep' | 'shallow',
+  exact: boolean,
+  // levels: 'all' | number,
+>>>>>>> 2959ace822426d014fe3325f0abef8ca797268f4
 }

 export const FocusClasses = Extension.create({