Minimize forks of prosemirror-view

.eslintignore

@@ -3,4 +3,4 @@
 .yarnrc.yml
 .pnp.*
 
-src/prosemirror-internal/
+src/prosemirror-view/

.prettierignore

@@ -3,5 +3,5 @@
 .yarnrc.yml
 .pnp.*
 
-src/prosemirror-internal/*
-!src/prosemirror-internal/README.md
+src/prosemirror-view/*
+!src/prosemirror-view/README.md

src/components/DocNodeView.tsx

@@ -9,7 +9,7 @@ import React, {
 import { ChildDescriptorsContext } from "../contexts/ChildDescriptorsContext.js";
 import { useChildNodeViews } from "../hooks/useChildNodeViews.js";
 import { useNodeViewDescriptor } from "../hooks/useNodeViewDescriptor.js";
-import { DecorationSourceInternal } from "../prosemirror-internal/DecorationInternal.js";
+import { DecorationSourceInternal } from "../prosemirror-view/DecorationInternal.js";
 
 type Props = {
   node: Node;

src/components/EditorView.tsx

@@ -1,9 +1,4 @@
 import { Command, EditorState, Transaction } from "prosemirror-state";
-import {
-  DecorationSet,
-  DirectEditorProps,
-  EditorView as EditorViewT,
-} from "prosemirror-view";
 import React, {
   DetailedHTMLProps,
   ForwardRefExoticComponent,
@@ -20,41 +15,16 @@ import { NodeViewContext } from "../contexts/NodeViewContext.js";
 import { useContentEditable } from "../hooks/useContentEditable.js";
 import { useSyncSelection } from "../hooks/useSyncSelection.js";
 import { usePluginViews } from "../hooks/useViewPlugins.js";
-import { DecorationSourceInternal } from "../prosemirror-internal/DecorationInternal.js";
-import { EditorViewInternal } from "../prosemirror-internal/EditorViewInternal.js";
-import { DOMObserver } from "../prosemirror-internal/domobserver.js";
-import { initInput } from "../prosemirror-internal/input.js";
+import { DecorationSourceInternal } from "../prosemirror-view/DecorationInternal.js";
+import {
+  DecorationSet,
+  DirectEditorProps,
+  EditorView as EditorViewClass,
+} from "../prosemirror-view/index.js";
 
 import { DocNodeView } from "./DocNodeView.js";
 import { NodeViewComponentProps } from "./NodeViewComponentProps.js";
 
-class ReactEditorView extends EditorViewT {
-  constructor(place: { mount: HTMLElement }, props: DirectEditorProps) {
-    super(null, props);
-    this.dom = place.mount;
-    this.domObserver.stop();
-    this.domObserver = new DOMObserver(this as unknown as EditorViewInternal);
-    this.domObserver.start();
-    initInput(this);
-  }
-  set docView(_docView) {
-    // We handle this ourselves
-  }
-  get docView() {
-    return this.dom.pmViewDesc;
-  }
-  updateState(state: EditorState) {
-    // eslint-disable-next-line react/no-direct-mutation-state
-    this.state = state;
-  }
-  update(_props: DirectEditorProps) {
-    // React takes care of this
-  }
-  destroy() {
-    // React takes care of this
-  }
-}
-
 type EditorStateProps =
   | {
       state: EditorState;
@@ -77,7 +47,7 @@ export type EditorProps = Omit<
       >;
     };
     decorations?: DecorationSet;
-    dispatchTransaction?: (this: EditorViewT, tr: Transaction) => void;
+    dispatchTransaction?: (this: EditorViewClass, tr: Transaction) => void;
   };
 
 export type Props = EditorProps &
@@ -125,7 +95,7 @@ export function EditorView(props: Props) {
   // This is only safe to use in effects/layout effects or
   // event handlers!
   const [reactEditorView, setReactEditorView] =
-    useState<EditorViewInternal | null>(null);
+    useState<EditorViewClass | null>(null);
   reactEditorView?.updateState(state);
 
   useEffect(() => {
@@ -153,7 +123,7 @@ export function EditorView(props: Props) {
                   return;
                 }
                 if (el && !reactEditorView) {
-                  const newReactEditorView = new ReactEditorView(
+                  const newReactEditorView = new EditorViewClass(
                     { mount: el },
                     {
                       decorations: getDecorations,
@@ -172,7 +142,7 @@ export function EditorView(props: Props) {
                       handleTripleClickOn,
                       editable: () => editable,
                       state: EditorState.create({ schema: state.schema }),
-                      dispatchTransaction(this: EditorViewT, tr) {
+                      dispatchTransaction(this: EditorViewClass, tr) {
                         if (dispatchProp) {
                           dispatchProp.call(this, tr);
                         } else {
@@ -181,7 +151,7 @@ export function EditorView(props: Props) {
                       },
                       plugins,
                     }
-                  ) as unknown as EditorViewInternal;
+                  );
 
                   newReactEditorView.updateState(state);
 

src/components/MarkView.tsx

@@ -9,7 +9,7 @@ import React, {
 } from "react";
 
 import { ChildDescriptorsContext } from "../contexts/ChildDescriptorsContext.js";
-import { MarkViewDesc, ViewDesc } from "../descriptors/ViewDesc.js";
+import { MarkViewDesc, ViewDesc } from "../prosemirror-view/viewdesc.js";
 
 import { OutputSpec } from "./OutputSpec.js";
 

src/components/NodeView.tsx

@@ -12,7 +12,7 @@ import { useChildNodeViews } from "../hooks/useChildNodeViews.js";
 import {
   DecorationInternal,
   DecorationSourceInternal,
-} from "../prosemirror-internal/DecorationInternal.js";
+} from "../prosemirror-view/DecorationInternal.js";
 
 import { NodeViewComponentProps } from "./NodeViewComponentProps.js";
 import { OutputSpec } from "./OutputSpec.js";

src/components/TextNodeView.tsx

@@ -3,8 +3,8 @@ import { DecorationSet } from "prosemirror-view";
 import { Component } from "react";
 import { findDOMNode } from "react-dom";
 
-import { TextViewDesc, ViewDesc } from "../descriptors/ViewDesc.js";
-import { DecorationInternal } from "../prosemirror-internal/DecorationInternal.js";
+import { DecorationInternal } from "../prosemirror-view/DecorationInternal.js";
+import { TextViewDesc, ViewDesc } from "../prosemirror-view/viewdesc.js";
 
 type Props = {
   node: Node;
@@ -26,6 +26,7 @@ export class TextNodeView extends Component<Props> {
 
     const desc = new TextViewDesc(
       undefined,
+      [],
       this.props.node,
       [],
       DecorationSet.empty,
@@ -48,6 +49,7 @@ export class TextNodeView extends Component<Props> {
 
     const desc = new TextViewDesc(
       undefined,
+      [],
       this.props.node,
       [],
       DecorationSet.empty,

src/components/TrailingHackView.tsx

@@ -1,7 +1,7 @@
 import React, { useContext, useLayoutEffect, useRef } from "react";
 
 import { ChildDescriptorsContext } from "../contexts/ChildDescriptorsContext.js";
-import { TrailingHackViewDesc } from "../descriptors/ViewDesc.js";
+import { TrailingHackViewDesc } from "../prosemirror-view/viewdesc.js";
 
 export function TrailingHackView() {
   const siblingDescriptors = useContext(ChildDescriptorsContext);

src/components/WidgetView.tsx

@@ -1,8 +1,8 @@
 import React, { useContext, useLayoutEffect, useRef } from "react";
 
 import { ChildDescriptorsContext } from "../contexts/ChildDescriptorsContext.js";
-import { WidgetViewDesc } from "../descriptors/ViewDesc.js";
-import { ReactWidgetDecoration } from "../prosemirror-internal/DecorationInternal.js";
+import { ReactWidgetDecoration } from "../prosemirror-view/DecorationInternal.js";
+import { WidgetViewDesc } from "../prosemirror-view/viewdesc.js";
 
 type Props = {
   widget: ReactWidgetDecoration;

src/contexts/ChildDescriptorsContext.ts

@@ -1,5 +1,5 @@
 import { createContext } from "react";
 
-import { ViewDesc } from "../descriptors/ViewDesc.js";
+import { ViewDesc } from "../prosemirror-view/viewdesc.js";
 
 export const ChildDescriptorsContext = createContext<ViewDesc[]>([]);

src/contexts/EditorViewContext.tsx

@@ -1,7 +1,5 @@
 import { createContext } from "react";
 
-import { EditorViewInternal } from "../prosemirror-internal/EditorViewInternal.js";
+import { EditorView } from "../prosemirror-view/index.js";
 
-export const EditorViewContext = createContext(
-  null as unknown as EditorViewInternal
-);
+export const EditorViewContext = createContext<EditorView | null>(null);

src/decorations/DecorationType.ts

@@ -1,7 +1,7 @@
 import { Mappable } from "prosemirror-transform";
 import { Decoration } from "prosemirror-view";
 
-import { DOMNode } from "../prosemirror-internal/dom.js";
+import { DOMNode } from "../prosemirror-view/dom.js";
 
 export interface DecorationType {
   spec: unknown;

src/descriptors/ViewDesc.ts

@@ -7,13 +7,13 @@ import {
   DecorationInternal,
   DecorationSourceInternal,
   ReactWidgetDecoration,
-} from "../prosemirror-internal/DecorationInternal.js";
-import * as browser from "../prosemirror-internal/browser.js";
+} from "../prosemirror-view/DecorationInternal.js";
+import * as browser from "../prosemirror-view/browser.js";
 import {
   DOMNode,
   domIndex,
   isEquivalentPosition,
-} from "../prosemirror-internal/dom.js";
+} from "../prosemirror-view/dom.js";
 
 export function sameOuterDeco(
   a: readonly DecorationInternal[],

src/hooks/useChildNodeViews.tsx

@@ -19,7 +19,7 @@ import {
   DecorationSourceInternal,
   NonWidgetType,
   ReactWidgetDecoration,
-} from "../prosemirror-internal/DecorationInternal.js";
+} from "../prosemirror-view/DecorationInternal.js";
 
 import { useNodeViewDescriptor } from "./useNodeViewDescriptor.js";
 

src/hooks/useContentEditable.ts

@@ -1,6 +1,6 @@
 import { useEffect } from "react";
 
-import { EditorViewInternal } from "../prosemirror-internal/EditorViewInternal.js";
+import { EditorViewInternal } from "../prosemirror-view/EditorViewInternal.js";
 
 export function useContentEditable(view: EditorViewInternal | null) {
   useEffect(() => {

src/hooks/useNodeViewDescriptor.ts

@@ -2,11 +2,11 @@ import { Node } from "prosemirror-model";
 import { MutableRefObject, useContext, useLayoutEffect } from "react";
 
 import { ChildDescriptorsContext } from "../contexts/ChildDescriptorsContext.js";
-import { NodeViewDesc, ViewDesc } from "../descriptors/ViewDesc.js";
 import {
   DecorationInternal,
   DecorationSourceInternal,
-} from "../prosemirror-internal/DecorationInternal.js";
+} from "../prosemirror-view/DecorationInternal.js";
+import { NodeViewDesc, ViewDesc } from "../prosemirror-view/viewdesc.js";
 
 export function useNodeViewDescriptor(
   node: Node,

src/hooks/useSyncSelection.ts

@@ -1,7 +1,7 @@
 import { useEffect } from "react";
 
-import { EditorViewInternal } from "../prosemirror-internal/EditorViewInternal.js";
-import { selectionToDOM } from "../prosemirror-internal/selection.js";
+import { EditorViewInternal } from "../prosemirror-view/EditorViewInternal.js";
+import { selectionToDOM } from "../prosemirror-view/selection.js";
 
 export function useSyncSelection(view: EditorViewInternal | null) {
   useEffect(() => {

src/hooks/useView.ts

@@ -5,8 +5,9 @@ import { EditorViewContext } from "../contexts/EditorViewContext.js";
 import { useLayoutGroupEffect } from "../contexts/LayoutGroup.js";
 
 export function useView(effect: (view: EditorViewT) => void) {
-  const viewApi = useContext(EditorViewContext);
+  const view = useContext(EditorViewContext);
   useLayoutGroupEffect(() => {
-    return effect(viewApi);
+    if (!view) return;
+    return effect(view);
   });
 }

src/hooks/useViewPlugins.ts

@@ -1,7 +1,7 @@
 import { Plugin, PluginView } from "prosemirror-state";
 import { useLayoutEffect, useRef } from "react";
 
-import { EditorViewInternal } from "../prosemirror-internal/EditorViewInternal.js";
+import { EditorViewInternal } from "../prosemirror-view/EditorViewInternal.js";
 
 import { usePrevious } from "./usePrev.js";