@prosekit/solid 0.1.2 → 0.1.4

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

@@ -17,16 +17,13 @@ import { Options } from 'tsup';
 import { ParentProps } from 'solid-js';
 import { PopoverOptions } from '@prosekit/lit/autocomplete-popover';
 import type { PopoverProps as PopoverProps_2 } from '@prosekit/lit/popover';
-import { UserProjectConfigExport } from 'vitest/dist/config.js';
+import { Priority } from '@prosekit/core';
 
 declare const AutocompleteEmpty: Component<AutocompleteEmptyProps>;
 export { AutocompleteEmpty }
 export { AutocompleteEmpty as AutocompleteEmpty_alias_1 }
 
-declare type AutocompleteEmptyProps = {
-    class?: string;
-    children?: JSXElement;
-} & AutocompleteEmptyProps_2;
+declare type AutocompleteEmptyProps = PropsWithChildren<PropsWithClass<AutocompleteEmptyProps_2>>;
 export { AutocompleteEmptyProps }
 export { AutocompleteEmptyProps as AutocompleteEmptyProps_alias_1 }
 
@@ -34,10 +31,7 @@ declare const AutocompleteItem: Component<AutocompleteItemProps>;
 export { AutocompleteItem }
 export { AutocompleteItem as AutocompleteItem_alias_1 }
 
-declare type AutocompleteItemProps = {
-    class?: string;
-    children?: JSXElement;
-} & AutocompleteItemProps_2;
+declare type AutocompleteItemProps = PropsWithChildren<PropsWithClass<AutocompleteItemProps_2>>;
 export { AutocompleteItemProps }
 export { AutocompleteItemProps as AutocompleteItemProps_alias_1 }
 
@@ -45,10 +39,7 @@ declare const AutocompleteList: Component<AutocompleteListProps>;
 export { AutocompleteList }
 export { AutocompleteList as AutocompleteList_alias_1 }
 
-declare type AutocompleteListProps = {
-    class?: string;
-    children?: JSXElement;
-} & AutocompleteListProps_2;
+declare type AutocompleteListProps = PropsWithChildren<PropsWithClass<AutocompleteListProps_2>>;
 export { AutocompleteListProps }
 export { AutocompleteListProps as AutocompleteListProps_alias_1 }
 
@@ -56,10 +47,7 @@ declare const AutocompletePopover: Component<AutocompletePopoverProps>;
 export { AutocompletePopover }
 export { AutocompletePopover as AutocompletePopover_alias_1 }
 
-declare type AutocompletePopoverProps = {
-    class?: string;
-    children?: JSXElement;
-} & AutocompletePopoverProps_2;
+declare type AutocompletePopoverProps = PropsWithChildren<PropsWithClass<AutocompletePopoverProps_2>>;
 export { AutocompletePopoverProps }
 export { AutocompletePopoverProps as AutocompletePopoverProps_alias_1 }
 
@@ -67,33 +55,25 @@ export declare const ComboBox: Component<ComboBoxProps>;
 
 export declare const ComboBoxInput: Component<ComboBoxInputProps>;
 
-export declare type ComboBoxInputProps = {
-    class?: string;
-    children?: JSXElement;
-} & ComboBoxInputProps_2;
+export declare type ComboBoxInputProps = PropsWithChildren<PropsWithClass<ComboBoxInputProps_2>>;
 
 export declare const ComboBoxItem: Component<ComboBoxItemProps>;
 
-export declare type ComboBoxItemProps = {
-    class?: string;
-    children?: JSXElement;
-} & ComboBoxItemProps_2;
+export declare type ComboBoxItemProps = PropsWithChildren<PropsWithClass<ComboBoxItemProps_2>>;
 
 export declare const ComboBoxList: Component<ComboBoxListProps>;
 
-export declare type ComboBoxListProps = {
-    class?: string;
-    children?: JSXElement;
-} & ComboBoxListProps_2;
+export declare type ComboBoxListProps = PropsWithChildren<PropsWithClass<ComboBoxListProps_2>>;
 
-export declare type ComboBoxProps = {
-    class?: string;
-    children?: JSXElement;
-} & ComboBoxProps_2;
+export declare type ComboBoxProps = PropsWithChildren<PropsWithClass<ComboBoxProps_2>>;
 
 export declare const default_alias: Options | Options[] | ((overrideOptions: Options) => Options | Options[] | Promise<Options | Options[]>);
 
-export declare const default_alias_1: UserProjectConfigExport;
+export declare const default_alias_1: {
+    test: {
+        environment: "jsdom";
+    };
+};
 
 declare interface EditorContext {
     editor: Editor;
@@ -105,19 +85,31 @@ export declare function forceProps<T extends Record<string, any>>(props: T): T;
 
 export declare const InlinePopover: Component<InlinePopoverProps>;
 
-export declare type InlinePopoverProps = {
-    class?: string;
-    children?: JSXElement;
-} & InlinePopoverProps_2;
+export declare type InlinePopoverProps = PropsWithChildren<PropsWithClass<InlinePopoverProps_2>>;
 
 export declare const Popover: Component<PopoverProps>;
 
 export { PopoverOptions }
 
-export declare type PopoverProps = {
-    class?: string;
-    children?: JSXElement;
-} & PopoverProps_2;
+export declare type PopoverProps = PropsWithChildren<PropsWithClass<PopoverProps_2>>;
+
+/**
+ * @internal
+ */
+declare type PropsWithChildren<P = unknown> = P & {
+    children?: JSXElement | undefined;
+};
+export { PropsWithChildren }
+export { PropsWithChildren as PropsWithChildren_alias_1 }
+
+/**
+ * @internal
+ */
+declare type PropsWithClass<P = unknown> = P & {
+    class?: string | undefined;
+};
+export { PropsWithClass }
+export { PropsWithClass as PropsWithClass_alias_1 }
 
 declare const ProseKit: Component<ProseKitProps>;
 export { ProseKit }
@@ -129,26 +121,29 @@ declare type ProseKitProps = ParentProps<{
 export { ProseKitProps }
 export { ProseKitProps as ProseKitProps_alias_1 }
 
-declare function useEditor<E extends Extension = any>(options?: UseEditorOptions): () => Editor<E>;
+declare function useEditor<E extends Extension = any>(options?: {
+    update?: boolean;
+}): () => Editor<E>;
 export { useEditor }
 export { useEditor as useEditor_alias_1 }
 
-export declare interface UseEditorOptions {
-    update?: boolean;
-}
-
 /**
  * Add an extension to the editor.
  *
- * It accepts an optional extension. If the extension is changed, the previous
- * extension will be removed and the new one (if not null) will be added.
+ * It accepts an accessor to an optional extension. If the extension is changed,
+ * the previous extension will be removed and the new one (if not null) will be
+ * added.
  */
-declare function useExtension<T extends Extension = Extension>(extension: T | null): void;
+declare function useExtension<T extends Extension = Extension>(extension: (T | null) | (() => T | null)): void;
 export { useExtension }
 export { useExtension as useExtension_alias_1 }
 
-declare function useKeymap(keymap: Keymap): void;
+declare function useKeymap(keymap: Keymap | (() => Keymap), options?: {
+    priority?: Priority;
+}): void;
 export { useKeymap }
 export { useKeymap as useKeymap_alias_1 }
 
+export declare function usePriorityExtension<T extends Extension = Extension>(extension: () => T | null, priority?: Priority | null): void;
+
 export { }

package/dist/prosekit-solid.d.ts

@@ -3,3 +3,5 @@ export { ProseKitProps } from './_tsup-dts-rollup';
 export { useEditor } from './_tsup-dts-rollup';
 export { useExtension } from './_tsup-dts-rollup';
 export { useKeymap } from './_tsup-dts-rollup';
+export { PropsWithChildren } from './_tsup-dts-rollup';
+export { PropsWithClass } from './_tsup-dts-rollup';

package/dist/prosekit-solid.js

@@ -54,19 +54,44 @@ function useForceUpdate() {
 import "@prosekit/core";
 import { createEffect as createEffect2, onCleanup } from "solid-js";
 function useExtension(extension) {
+  if (typeof extension !== "function") {
+    console.warn(
+      "useExtension should accept a function that returns an extension or null"
+    );
+    return useExtension(() => extension);
+  }
+  const extensionAccessor = extension;
   const editor = useEditor();
   createEffect2(() => {
-    if (extension) {
-      onCleanup(editor().use(extension));
+    const extension2 = extensionAccessor();
+    if (extension2) {
+      onCleanup(editor().use(extension2));
     }
   });
 }
 
 // src/hooks/use-keymap.ts
 import { defineKeymap } from "@prosekit/core";
-function useKeymap(keymap) {
-  const extension = defineKeymap(keymap);
-  useExtension(extension);
+
+// src/hooks/use-priority-extension.ts
+import { withPriority } from "@prosekit/core";
+function usePriorityExtension(extension, priority) {
+  const extensionWithPriority = () => {
+    const ext = extension();
+    return ext && priority ? withPriority(ext, priority) : ext;
+  };
+  return useExtension(extensionWithPriority);
+}
+
+// src/hooks/use-keymap.ts
+function useKeymap(keymap, options) {
+  if (typeof keymap !== "function") {
+    console.warn(
+      "useKeymap should accept a function that returns a keymap object"
+    );
+    return useKeymap(() => keymap);
+  }
+  return usePriorityExtension(() => defineKeymap(keymap()), options == null ? void 0 : options.priority);
 }
 export {
   ProseKit,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@prosekit/solid",
   "type": "module",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "private": false,
   "author": {
     "name": "ocavue",
@@ -85,8 +85,8 @@
     "dist"
   ],
   "dependencies": {
-    "@prosekit/core": "^0.1.0",
-    "@prosekit/lit": "^0.1.0"
+    "@prosekit/core": "^0.2.0",
+    "@prosekit/lit": "^0.1.5"
   },
   "peerDependencies": {
     "solid-js": ">= 1.7.0"
@@ -98,10 +98,10 @@
   },
   "devDependencies": {
     "@prosekit/dev": "*",
-    "solid-js": "^1.8.5",
+    "solid-js": "^1.8.7",
     "tsup": "^8.0.1",
-    "typescript": "^5.3.2",
-    "vitest": "^0.34.6"
+    "typescript": "^5.3.3",
+    "vitest": "^1.1.0"
   },
   "scripts": {
     "build:tsup": "tsup",

package/src/index.ts

@@ -2,3 +2,4 @@ export { ProseKit, type ProseKitProps } from './components/prosekit'
 export { useEditor } from './hooks/use-editor'
 export { useExtension } from './hooks/use-extension'
 export { useKeymap } from './hooks/use-keymap'
+export type { PropsWithChildren, PropsWithClass } from './types'