@prosekit/solid 0.4.5 → 0.4.7

package/dist/_tsup-dts-rollup.d.ts

@@ -1,5 +1,4 @@
 import { Accessor } from 'solid-js';
-import type { Attrs } from '@prosekit/pm/model';
 import { AutocompleteEmptyElement } from '@prosekit/web/autocomplete';
 import { AutocompleteEmptyEvents } from '@prosekit/web/autocomplete';
 import { AutocompleteEmptyProps as AutocompleteEmptyProps_2 } from '@prosekit/web/autocomplete';
@@ -12,7 +11,6 @@ import { AutocompleteListProps as AutocompleteListProps_2 } from '@prosekit/web/
 import { AutocompletePopoverElement } from '@prosekit/web/autocomplete';
 import { AutocompletePopoverEvents } from '@prosekit/web/autocomplete';
 import { AutocompletePopoverProps as AutocompletePopoverProps_2 } from '@prosekit/web/autocomplete';
-import { BaseNodeViewOptions } from '@prosekit/core';
 import { BlockHandleAddElement } from '@prosekit/web/block-handle';
 import { BlockHandleAddEvents } from '@prosekit/web/block-handle';
 import { BlockHandleAddProps as BlockHandleAddProps_2 } from '@prosekit/web/block-handle';
@@ -24,12 +22,11 @@ import { BlockHandlePopoverEvents } from '@prosekit/web/block-handle';
 import { BlockHandlePopoverProps as BlockHandlePopoverProps_2 } from '@prosekit/web/block-handle';
 import { Component } from 'solid-js';
 import { ContextProviderComponent } from 'solid-js';
-import type { Decoration } from '@prosekit/pm/view';
-import type { DecorationSource } from '@prosekit/pm/view';
+import type { CoreMarkViewUserOptions } from '@prosemirror-adapter/core';
+import type { CoreNodeViewUserOptions } from '@prosemirror-adapter/core';
 import { config as default_alias_1 } from '@prosekit/dev/config-vitest';
 import { Editor } from '@prosekit/core';
 import type { EditorState } from '@prosekit/pm/state';
-import type { EditorView } from '@prosekit/pm/view';
 import { Extension } from '@prosekit/core';
 import { InlinePopoverElement } from '@prosekit/web/inline-popover';
 import { InlinePopoverEvents } from '@prosekit/web/inline-popover';
@@ -37,6 +34,8 @@ import { InlinePopoverProps as InlinePopoverProps_2 } from '@prosekit/web/inline
 import { JSX } from 'solid-js';
 import type { JSXElement } from 'solid-js';
 import { Keymap } from '@prosekit/core';
+import { MarkViewContextProps } from '@prosemirror-adapter/solid';
+import { NodeViewContextProps } from '@prosemirror-adapter/solid';
 import { Options } from 'tsup';
 import { ParentProps } from 'solid-js';
 import { PopoverContentElement } from '@prosekit/web/popover';
@@ -174,7 +173,12 @@ export { BlockHandlePopoverProps as BlockHandlePopoverProps_alias_1 }
 /**
  * @internal
  */
-export declare function consumeSolidViews(): void;
+export declare function consumeSolidMarkViews(): void;
+
+/**
+ * @internal
+ */
+export declare function consumeSolidNodeViews(): void;
 
 export declare function createComponent<Props extends object, CustomElement extends HTMLElement>(tagName: string, propNames: string[], eventNames: string[]): Component<Partial<Props> & JSX.HTMLAttributes<CustomElement>>;
 
@@ -194,6 +198,15 @@ export declare const default_alias: Options | Options[] | ((overrideOptions: Opt
 
 export { default_alias_1 }
 
+/**
+ * Defines a mark view using a Solid component.
+ *
+ * @public
+ */
+declare function defineSolidMarkView(options: SolidMarkViewOptions): Extension;
+export { defineSolidMarkView }
+export { defineSolidMarkView as defineSolidMarkView_alias_1 }
+
 /**
  * Defines a node view using a Solid component.
  *
@@ -336,6 +349,35 @@ declare interface ResizableRootProps extends Partial<CreateProps<ResizableRootPr
 export { ResizableRootProps }
 export { ResizableRootProps as ResizableRootProps_alias_1 }
 
+/**
+ * @public
+ */
+declare type SolidMarkViewComponent = Component<SolidMarkViewProps>;
+export { SolidMarkViewComponent }
+export { SolidMarkViewComponent as SolidMarkViewComponent_alias_1 }
+
+/**
+ * Options for {@link defineSolidMarkView}.
+ *
+ * @public
+ */
+declare interface SolidMarkViewOptions extends CoreMarkViewUserOptions<SolidMarkViewComponent> {
+    /**
+     * The name of the mark type.
+     */
+    name: string;
+}
+export { SolidMarkViewOptions }
+export { SolidMarkViewOptions as SolidMarkViewOptions_alias_1 }
+
+/**
+ * @public
+ */
+declare interface SolidMarkViewProps extends MarkViewContextProps {
+}
+export { SolidMarkViewProps }
+export { SolidMarkViewProps as SolidMarkViewProps_alias_1 }
+
 /**
  * @public
  */
@@ -348,15 +390,11 @@ export { SolidNodeViewComponent as SolidNodeViewComponent_alias_1 }
  *
  * @public
  */
-declare interface SolidNodeViewOptions extends BaseNodeViewOptions {
+declare interface SolidNodeViewOptions extends CoreNodeViewUserOptions<SolidNodeViewComponent> {
     /**
      * The name of the node type.
      */
     name: string;
-    /**
-     * The Solid component to render the node.
-     */
-    component: SolidNodeViewComponent;
 }
 export { SolidNodeViewOptions }
 export { SolidNodeViewOptions as SolidNodeViewOptions_alias_1 }
@@ -364,15 +402,7 @@ export { SolidNodeViewOptions as SolidNodeViewOptions_alias_1 }
 /**
  * @public
  */
-declare interface SolidNodeViewProps {
-    contentRef: (node: HTMLElement | null) => void;
-    view: EditorView;
-    getPos: () => number | undefined;
-    setAttrs: (attrs: Attrs) => void;
-    node: ProseMirrorNode;
-    selected: boolean;
-    decorations: readonly Decoration[];
-    innerDecorations: DecorationSource;
+declare interface SolidNodeViewProps extends NodeViewContextProps {
 }
 export { SolidNodeViewProps }
 export { SolidNodeViewProps as SolidNodeViewProps_alias_1 }

package/dist/{chunk-SGL36LNK.js → chunk-BZVX5KNK.js}

@@ -1,6 +1,6 @@
 import {
   useEditorContext
-} from "./chunk-XXXIBXNC.js";
+} from "./chunk-XDDJIQ4M.js";
 
 // src/components/create-component.ts
 import h from "solid-js/h";

package/dist/{chunk-XXXIBXNC.js → chunk-XDDJIQ4M.js}

@@ -1,5 +1,8 @@
 // src/contexts/editor-context.ts
-import { createContext, useContext } from "solid-js";
+import {
+  createContext,
+  useContext
+} from "solid-js";
 var editorContext = createContext(null);
 function useEditorContext() {
   return useContext(editorContext);

package/dist/prosekit-solid-autocomplete.js

@@ -1,7 +1,7 @@
 import {
   createComponent
-} from "./chunk-SGL36LNK.js";
-import "./chunk-XXXIBXNC.js";
+} from "./chunk-BZVX5KNK.js";
+import "./chunk-XDDJIQ4M.js";
 
 // src/components/autocomplete/autocomplete-empty.gen.ts
 import {

package/dist/prosekit-solid-block-handle.js

@@ -1,7 +1,7 @@
 import {
   createComponent
-} from "./chunk-SGL36LNK.js";
-import "./chunk-XXXIBXNC.js";
+} from "./chunk-BZVX5KNK.js";
+import "./chunk-XDDJIQ4M.js";
 
 // src/components/block-handle/block-handle-add.gen.ts
 import {

package/dist/prosekit-solid-inline-popover.js

@@ -1,7 +1,7 @@
 import {
   createComponent
-} from "./chunk-SGL36LNK.js";
-import "./chunk-XXXIBXNC.js";
+} from "./chunk-BZVX5KNK.js";
+import "./chunk-XDDJIQ4M.js";
 
 // src/components/inline-popover/inline-popover.gen.ts
 import {

package/dist/prosekit-solid-popover.js

@@ -1,7 +1,7 @@
 import {
   createComponent
-} from "./chunk-SGL36LNK.js";
-import "./chunk-XXXIBXNC.js";
+} from "./chunk-BZVX5KNK.js";
+import "./chunk-XDDJIQ4M.js";
 
 // src/components/popover/popover-content.gen.ts
 import {

package/dist/prosekit-solid-resizable.js

@@ -1,7 +1,7 @@
 import {
   createComponent
-} from "./chunk-SGL36LNK.js";
-import "./chunk-XXXIBXNC.js";
+} from "./chunk-BZVX5KNK.js";
+import "./chunk-XDDJIQ4M.js";
 
 // src/components/resizable/resizable-handle.gen.ts
 import {

package/dist/prosekit-solid-table-handle.js

@@ -1,7 +1,7 @@
 import {
   createComponent
-} from "./chunk-SGL36LNK.js";
-import "./chunk-XXXIBXNC.js";
+} from "./chunk-BZVX5KNK.js";
+import "./chunk-XDDJIQ4M.js";
 
 // src/components/table-handle/table-handle-column-root.gen.ts
 import {

package/dist/prosekit-solid-tooltip.js

@@ -1,7 +1,7 @@
 import {
   createComponent
-} from "./chunk-SGL36LNK.js";
-import "./chunk-XXXIBXNC.js";
+} from "./chunk-BZVX5KNK.js";
+import "./chunk-XDDJIQ4M.js";
 
 // src/components/tooltip/tooltip-content.gen.ts
 import {

package/dist/prosekit-solid.d.ts

@@ -1,15 +1,19 @@
 export { ProseKit } from './_tsup-dts-rollup.js';
 export { ProseKitProps } from './_tsup-dts-rollup.js';
+export { defineSolidMarkView } from './_tsup-dts-rollup.js';
+export { SolidMarkViewComponent } from './_tsup-dts-rollup.js';
+export { SolidMarkViewOptions } from './_tsup-dts-rollup.js';
+export { SolidMarkViewProps } from './_tsup-dts-rollup.js';
+export { defineSolidNodeView } from './_tsup-dts-rollup.js';
+export { SolidNodeViewComponent } from './_tsup-dts-rollup.js';
+export { SolidNodeViewOptions } from './_tsup-dts-rollup.js';
+export { SolidNodeViewProps } from './_tsup-dts-rollup.js';
+export { useDocChange } from './_tsup-dts-rollup.js';
 export { useEditor } from './_tsup-dts-rollup.js';
 export { useExtension } from './_tsup-dts-rollup.js';
 export { UseExtensionOptions } from './_tsup-dts-rollup.js';
 export { useKeymap } from './_tsup-dts-rollup.js';
 export { useStateUpdate } from './_tsup-dts-rollup.js';
-export { useDocChange } from './_tsup-dts-rollup.js';
 export { MaybeAccessor } from './_tsup-dts-rollup.js';
 export { PropsWithChildren } from './_tsup-dts-rollup.js';
 export { PropsWithClass } from './_tsup-dts-rollup.js';
-export { defineSolidNodeView } from './_tsup-dts-rollup.js';
-export { SolidNodeViewComponent } from './_tsup-dts-rollup.js';
-export { SolidNodeViewOptions } from './_tsup-dts-rollup.js';
-export { SolidNodeViewProps } from './_tsup-dts-rollup.js';

package/dist/prosekit-solid.js

@@ -1,20 +1,22 @@
 import {
   EditorContextProvider,
   useEditorContext
-} from "./chunk-XXXIBXNC.js";
+} from "./chunk-XDDJIQ4M.js";
 
 // src/components/prosekit.ts
 import { ProsemirrorAdapterProvider } from "@prosemirror-adapter/solid";
-import { createComponent as createComponent2 } from "solid-js";
+import {
+  createComponent as createComponent3
+} from "solid-js";
 
-// src/extensions/solid-node-view.ts
+// src/extensions/solid-mark-view.ts
 import {
-  defineNodeViewComponent,
-  defineNodeViewFactory
+  defineMarkViewComponent,
+  defineMarkViewFactory
 } from "@prosekit/core";
 import {
-  useNodeViewContext,
-  useNodeViewFactory
+  useMarkViewContext,
+  useMarkViewFactory
 } from "@prosemirror-adapter/solid";
 import {
   createComponent,
@@ -25,7 +27,10 @@ import {
 import {
   EditorNotFoundError
 } from "@prosekit/core";
-import { createEffect, onCleanup } from "solid-js";
+import {
+  createEffect,
+  onCleanup
+} from "solid-js";
 
 // src/utils/to-value.ts
 function toValue(v) {
@@ -48,7 +53,9 @@ function useEditorExtension(editorAccessor, extensionAccessor) {
 }
 
 // src/hooks/use-priority-extension.ts
-import { withPriority } from "@prosekit/core";
+import {
+  withPriority
+} from "@prosekit/core";
 function usePriorityExtension(extension, priority) {
   return () => {
     const ext = extension();
@@ -64,16 +71,62 @@ function useExtension(extension, options) {
   );
 }
 
+// src/extensions/solid-mark-view.ts
+function withMarkViewProps(component) {
+  return function MarkViewPropsWrapper() {
+    const props = useMarkViewContext();
+    return createComponent(component, props());
+  };
+}
+function consumeSolidMarkViews() {
+  const markViewFactory = useMarkViewFactory();
+  const extension = createMemo(
+    () => defineSolidMarkViewFactory(markViewFactory),
+    [markViewFactory]
+  );
+  useExtension(extension);
+}
+function defineSolidMarkView(options) {
+  const { name, component, ...userOptions } = options;
+  const args = {
+    ...userOptions,
+    component: withMarkViewProps(component)
+  };
+  return defineMarkViewComponent({
+    group: "solid",
+    name,
+    args
+  });
+}
+function defineSolidMarkViewFactory(factory) {
+  return defineMarkViewFactory({
+    group: "solid",
+    factory
+  });
+}
+
 // src/extensions/solid-node-view.ts
+import {
+  defineNodeViewComponent,
+  defineNodeViewFactory
+} from "@prosekit/core";
+import {
+  useNodeViewContext,
+  useNodeViewFactory
+} from "@prosemirror-adapter/solid";
+import {
+  createComponent as createComponent2,
+  createMemo as createMemo2
+} from "solid-js";
 function withNodeViewProps(component) {
   return function NodeViewPropsWrapper() {
     const props = useNodeViewContext();
-    return createComponent(component, props());
+    return createComponent2(component, props());
   };
 }
-function consumeSolidViews() {
+function consumeSolidNodeViews() {
   const nodeViewFactory = useNodeViewFactory();
-  const extension = createMemo(
+  const extension = createMemo2(
     () => defineSolidNodeViewFactory(nodeViewFactory),
     [nodeViewFactory]
   );
@@ -100,14 +153,15 @@ function defineSolidNodeViewFactory(factory) {
 
 // src/components/prosekit.ts
 var ProseKit = (props) => {
-  return createComponent2(ProsemirrorAdapterProvider, {
+  return createComponent3(ProsemirrorAdapterProvider, {
     get children() {
-      return createComponent2(EditorContextProvider, {
+      return createComponent3(EditorContextProvider, {
         get value() {
           return props.editor;
         },
         get children() {
-          consumeSolidViews();
+          consumeSolidNodeViews();
+          consumeSolidMarkViews();
           return props.children;
         }
       });
@@ -115,14 +169,24 @@ var ProseKit = (props) => {
   });
 };
 
+// src/hooks/use-doc-change.ts
+import { defineDocChangeHandler } from "@prosekit/core";
+function useDocChange(handler, options) {
+  const extension = defineDocChangeHandler((view) => handler(view.state.doc));
+  return useExtension(() => extension, options);
+}
+
 // src/hooks/use-editor.ts
 import {
-  ProseKitError,
   defineMountHandler,
   defineUpdateHandler,
+  ProseKitError,
   union
 } from "@prosekit/core";
-import { createEffect as createEffect2, createSignal } from "solid-js";
+import {
+  createEffect as createEffect2,
+  createSignal
+} from "solid-js";
 function useEditor(options) {
   var _a;
   const update = (_a = options == null ? void 0 : options.update) != null ? _a : false;
@@ -152,7 +216,9 @@ function useForceUpdate() {
 }
 
 // src/hooks/use-keymap.ts
-import { defineKeymap } from "@prosekit/core";
+import {
+  defineKeymap
+} from "@prosekit/core";
 function useKeymap(keymap, options) {
   const extension = () => defineKeymap(keymap());
   return useExtension(extension, options);
@@ -164,15 +230,9 @@ function useStateUpdate(handler, options) {
   const extension = defineUpdateHandler2((view) => handler(view.state));
   return useExtension(() => extension, options);
 }
-
-// src/hooks/use-doc-change.ts
-import { defineDocChangeHandler } from "@prosekit/core";
-function useDocChange(handler, options) {
-  const extension = defineDocChangeHandler((view) => handler(view.state.doc));
-  return useExtension(() => extension, options);
-}
 export {
   ProseKit,
+  defineSolidMarkView,
   defineSolidNodeView,
   useDocChange,
   useEditor,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@prosekit/solid",
   "type": "module",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "private": false,
   "author": {
     "name": "ocavue",
@@ -70,10 +70,11 @@
     "dist"
   ],
   "dependencies": {
-    "@prosemirror-adapter/solid": "^0.2.6",
-    "@prosekit/core": "^0.7.13",
-    "@prosekit/web": "^0.5.1",
-    "@prosekit/pm": "^0.1.9"
+    "@prosemirror-adapter/core": "^0.4.0",
+    "@prosemirror-adapter/solid": "^0.4.0",
+    "@prosekit/core": "^0.7.14",
+    "@prosekit/pm": "^0.1.9",
+    "@prosekit/web": "^0.5.2"
   },
   "peerDependencies": {
     "solid-js": ">= 1.7.0"
@@ -86,8 +87,8 @@
   "devDependencies": {
     "solid-js": "^1.9.3",
     "tsup": "^8.3.5",
-    "typescript": "^5.6.3",
-    "vitest": "^2.1.6",
+    "typescript": "~5.6.3",
+    "vitest": "^2.1.8",
     "@prosekit/dev": "0.0.0"
   },
   "scripts": {