slate-vue3 0.3.1 → 0.3.2

package/dist/slate-yjs/hooks/useRemoteCursorStateStore.d.ts

@@ -1,6 +1,5 @@
 import { JsonObject } from '@liveblocks/client';
 import { Store } from './utils';
-import { CursorEditor, CursorState } from '../plugins/withCursors';
+import { CursorState } from '../plugins/withCursors';
 export type CursorStore<TCursorData extends JsonObject = JsonObject> = Store<Record<string, CursorState<TCursorData>>>;
-export declare function createRemoteCursorStateStore<TCursorData extends JsonObject>(editor: CursorEditor<TCursorData>): CursorStore<TCursorData>;
 export declare function useRemoteCursorStateStore<TCursorData extends JsonObject = JsonObject>(): CursorStore<TCursorData>;

package/dist/slate-yjs/hooks/utils.d.ts

@@ -4,10 +4,7 @@ import { DOMEditor } from '../../slate-dom/index.ts';
 import { JsonObject } from '@liveblocks/client';
 import { CursorEditor, CursorState } from '../plugins/withCursors';
 export declare function useOnResize<T extends HTMLElement>(_ref: Ref<T>, onResize: () => void): void;
-export type Store<T> = readonly [
-    (onStoreChange: () => void) => () => void,
-    () => T
-];
+export type Store<T> = readonly [() => () => void, Ref<T>];
 export declare function getCursorRange<TCursorData extends JsonObject = JsonObject>(editor: CursorEditor<TCursorData>, cursorState: CursorState<TCursorData>): Range | null;
 export type SelectionRect = {
     width: number;

package/dist/slate-yjs/utils/clone.d.ts

@@ -1,4 +1,4 @@
+import { XmlText } from 'yjs';
 import { InsertDelta } from '../model/types';
-import * as Y from 'yjs';
 export declare function cloneInsertDeltaDeep(delta: InsertDelta): InsertDelta;
-export declare function cloneDeep(yText: Y.XmlText): Y.XmlText;
+export declare function cloneDeep(yText: XmlText): XmlText;

package/dist/slate-yjs/utils/convert.d.ts

@@ -1,7 +1,7 @@
 import { Element, Node } from '../../slate/index.ts';
 import { DeltaInsert, InsertDelta } from '../model/types';
-import * as Y from 'yjs';
-export declare function yTextToSlateElement(yText: Y.XmlText): Element;
+import { XmlText } from 'yjs';
+export declare function yTextToSlateElement(yText: XmlText): Element;
 export declare function deltaInsertToSlateNode(insert: DeltaInsert): Node;
 export declare function slateNodesToInsertDelta(nodes: Node[]): InsertDelta;
-export declare function slateElementToYText({ children, ...attributes }: Element): Y.XmlText;
+export declare function slateElementToYText({ children, ...attributes }: Element): XmlText;

package/dist/slate-yjs/utils/delta.d.ts

@@ -1,7 +1,7 @@
+import { XmlText } from 'yjs';
 import { DeltaInsert, InsertDelta } from '../model/types';
-import * as Y from 'yjs';
 export declare function normalizeInsertDelta(delta: InsertDelta): InsertDelta;
-export declare function yTextToInsertDelta(yText: Y.XmlText): InsertDelta;
+export declare function yTextToInsertDelta(yText: XmlText): InsertDelta;
 export declare function getInsertLength({ insert }: DeltaInsert): number;
 export declare function getInsertDeltaLength(delta: InsertDelta): number;
 export declare function sliceInsertDelta(delta: InsertDelta, start: number, length: number): InsertDelta;

package/dist/slate-yjs/utils/location.d.ts

@@ -1,11 +1,11 @@
 import { Element, Node, Path } from '../../slate/index.ts';
 import { YTarget } from '../model/types';
-import * as Y from 'yjs';
+import { XmlText } from 'yjs';
 export declare function getSlateNodeYLength(node: Node | undefined): number;
 export declare function slatePathOffsetToYOffset(element: Element, pathOffset: number): number;
-export declare function getYTarget(yRoot: Y.XmlText, slateRoot: Node, path: Path): YTarget;
+export declare function getYTarget(yRoot: XmlText, slateRoot: Node, path: Path): YTarget;
 export declare function yOffsetToSlateOffsets(parent: Element, yOffset: number, opts?: {
     assoc?: number;
     insert?: boolean;
 }): [number, number];
-export declare function getSlatePath(sharedRoot: Y.XmlText, slateRoot: Node, yText: Y.XmlText): Path;
+export declare function getSlatePath(sharedRoot: XmlText, slateRoot: Node, yText: XmlText): Path;

package/dist/slate-yjs/utils/position.d.ts

@@ -1,19 +1,19 @@
 import { BasePoint, BaseRange, Node } from '../../slate/index.ts';
+import { AbsolutePosition, RelativePosition, XmlText } from 'yjs';
 import { InsertDelta, RelativeRange } from '../model/types';
-import * as Y from 'yjs';
 export declare const STORED_POSITION_PREFIX = "__slateYjsStoredPosition_";
-export declare function slatePointToRelativePosition(sharedRoot: Y.XmlText, slateRoot: Node, point: BasePoint): Y.RelativePosition;
-export declare function absolutePositionToSlatePoint(sharedRoot: Y.XmlText, slateRoot: Node, { type, index, assoc }: Y.AbsolutePosition): BasePoint | null;
-export declare function relativePositionToSlatePoint(sharedRoot: Y.XmlText, slateRoot: Node, pos: Y.RelativePosition): BasePoint | null;
-export declare function getStoredPosition(sharedRoot: Y.XmlText, key: string): Y.RelativePosition | null;
-export declare function getStoredPositions(sharedRoot: Y.XmlText): Record<string, Y.RelativePosition>;
-export declare function removeStoredPosition(sharedRoot: Y.XmlText, key: string): void;
-export declare function setStoredPosition(sharedRoot: Y.XmlText, key: string, position: Y.RelativePosition): void;
-export declare function getStoredPositionsInDeltaAbsolute(sharedRoot: Y.XmlText, yText: Y.XmlText, delta: InsertDelta, deltaOffset?: number): {
+export declare function slatePointToRelativePosition(sharedRoot: XmlText, slateRoot: Node, point: BasePoint): RelativePosition;
+export declare function absolutePositionToSlatePoint(sharedRoot: XmlText, slateRoot: Node, { type, index, assoc }: AbsolutePosition): BasePoint | null;
+export declare function relativePositionToSlatePoint(sharedRoot: XmlText, slateRoot: Node, pos: RelativePosition): BasePoint | null;
+export declare function getStoredPosition(sharedRoot: XmlText, key: string): RelativePosition | null;
+export declare function getStoredPositions(sharedRoot: XmlText): Record<string, RelativePosition>;
+export declare function removeStoredPosition(sharedRoot: XmlText, key: string): void;
+export declare function setStoredPosition(sharedRoot: XmlText, key: string, position: RelativePosition): void;
+export declare function getStoredPositionsInDeltaAbsolute(sharedRoot: XmlText, yText: XmlText, delta: InsertDelta, deltaOffset?: number): {
     '': {
-        [k: string]: Y.AbsolutePosition;
+        [k: string]: AbsolutePosition;
     };
 };
-export declare function restoreStoredPositionsWithDeltaAbsolute(sharedRoot: Y.XmlText, yText: Y.XmlText, absolutePositions: Record<string, Record<string, Y.AbsolutePosition>>, delta: InsertDelta, newDeltaOffset?: number, previousDeltaOffset?: number, path?: string): void;
-export declare function slateRangeToRelativeRange(sharedRoot: Y.XmlText, slateRoot: Node, range: BaseRange): RelativeRange;
-export declare function relativeRangeToSlateRange(sharedRoot: Y.XmlText, slateRoot: Node, range: RelativeRange): BaseRange | null;
+export declare function restoreStoredPositionsWithDeltaAbsolute(sharedRoot: XmlText, yText: XmlText, absolutePositions: Record<string, Record<string, AbsolutePosition>>, delta: InsertDelta, newDeltaOffset?: number, previousDeltaOffset?: number, path?: string): void;
+export declare function slateRangeToRelativeRange(sharedRoot: XmlText, slateRoot: Node, range: BaseRange): RelativeRange;
+export declare function relativeRangeToSlateRange(sharedRoot: XmlText, slateRoot: Node, range: RelativeRange): BaseRange | null;

package/dist/slate-yjs/utils/yjs.d.ts

@@ -1,4 +1,4 @@
-import * as Y from 'yjs';
-export declare function assertDocumentAttachment<T extends Y.AbstractType<any>>(sharedType: T): asserts sharedType is T & {
+import { AbstractType } from 'yjs';
+export declare function assertDocumentAttachment<T extends AbstractType<any>>(sharedType: T): asserts sharedType is T & {
     doc: NonNullable<T['doc']>;
 };

package/dist/yjs.js

@@ -1,7 +1,6 @@
 import { d as isPlainObject, T as Text, N as Node, P as Path, E as Editor, t as toRawWeakMap, c as Transforms, R as Range } from "./batch-dirty-paths-DdGxRyrT.js";
 import { toRaw, ref, onMounted, onUnmounted, watch, onUpdated, computed } from "vue";
-import * as Y from "yjs";
-import { XmlText, YTextEvent, UndoManager, compareRelativePositions } from "yjs";
+import { XmlText, YTextEvent, createRelativePositionFromTypeIndex, createAbsolutePositionFromRelativePosition, createRelativePositionFromJSON, decodeRelativePosition, encodeRelativePosition, UndoManager, compareRelativePositions } from "yjs";
 import { L as Location } from "./location-BQJIMGOU.js";
 import { g as useEditor, e as useFocused } from "./use-focused-C0jEAq2w.js";
 import { D as DOMEditor } from "./hotkeys-CmyQAN4Q.js";
@@ -142,7 +141,7 @@ function slateElementToYText({
   children,
   ...attributes
 }) {
-  const yElement = new Y.XmlText();
+  const yElement = new XmlText();
   Object.entries(attributes).forEach(([key, value]) => {
     yElement.setAttribute(key, value);
   });
@@ -177,7 +176,7 @@ function getYTarget(yRoot, slateRoot, path) {
   }
   const yTarget = (_a = targetDelta[0]) == null ? void 0 : _a.insert;
   if (childPath.length > 0) {
-    if (!(yTarget instanceof Y.XmlText)) {
+    if (!(yTarget instanceof XmlText)) {
       throw new Error(
         "Path doesn't match yText, cannot descent into non-yText"
       );
@@ -187,7 +186,7 @@ function getYTarget(yRoot, slateRoot, path) {
   return {
     yParent: yRoot,
     textRange: { start: yOffset, end: yOffset + targetLength },
-    yTarget: yTarget instanceof Y.XmlText ? yTarget : void 0,
+    yTarget: yTarget instanceof XmlText ? yTarget : void 0,
     slateParent: slateRoot,
     slateTarget: targetNode,
     targetDelta
@@ -226,7 +225,7 @@ function getSlatePath(sharedRoot, slateRoot, yText) {
     if (!yParent) {
       throw new Error("yText isn't a descendant of root element");
     }
-    if (!(yParent instanceof Y.XmlText)) {
+    if (!(yParent instanceof XmlText)) {
       throw new Error("Unexpected y parent type");
     }
     yNodePath.unshift(yParent);
@@ -478,7 +477,7 @@ function cloneInsertDeltaDeep(delta) {
   });
 }
 function cloneDeep(yText) {
-  const clone = new Y.XmlText();
+  const clone = new XmlText();
   const attributes = yText.getAttributes();
   Object.entries(attributes).forEach(([key, value]) => {
     clone.setAttribute(key, value);
@@ -506,14 +505,14 @@ function slatePointToRelativePosition(sharedRoot, slateRoot, point) {
     );
   }
   const index = textRange.start + point.offset;
-  return Y.createRelativePositionFromTypeIndex(
+  return createRelativePositionFromTypeIndex(
     yParent,
     index,
     index === textRange.end ? -1 : 0
   );
 }
 function absolutePositionToSlatePoint(sharedRoot, slateRoot, { type, index, assoc }) {
-  if (!(type instanceof Y.XmlText)) {
+  if (!(type instanceof XmlText)) {
     throw new Error("Absolute position points to a non-XMLText");
   }
   const parentPath = getSlatePath(sharedRoot, slateRoot, type);
@@ -536,7 +535,7 @@ function relativePositionToSlatePoint(sharedRoot, slateRoot, pos) {
   if (!sharedRoot.doc) {
     throw new Error("sharedRoot isn't attach to a yDoc");
   }
-  const absPos = Y.createAbsolutePositionFromRelativePosition(
+  const absPos = createAbsolutePositionFromRelativePosition(
     pos,
     sharedRoot.doc
   );
@@ -547,13 +546,13 @@ function getStoredPosition(sharedRoot, key) {
   if (!rawPosition) {
     return null;
   }
-  return Y.decodeRelativePosition(rawPosition);
+  return decodeRelativePosition(rawPosition);
 }
 function getStoredPositions(sharedRoot) {
   return Object.fromEntries(
     Object.entries(sharedRoot.getAttributes()).filter(([key]) => key.startsWith(STORED_POSITION_PREFIX)).map(([key, position]) => [
       key.slice(STORED_POSITION_PREFIX.length),
-      Y.createRelativePositionFromJSON(position)
+      createRelativePositionFromJSON(position)
     ])
   );
 }
@@ -563,8 +562,8 @@ function getStoredPositionsAbsolute(sharedRoot) {
     Object.entries(sharedRoot.getAttributes()).filter(([key]) => key.startsWith(STORED_POSITION_PREFIX)).map(
       ([key, position]) => [
         key.slice(STORED_POSITION_PREFIX.length),
-        Y.createAbsolutePositionFromRelativePosition(
-          Y.decodeRelativePosition(position),
+        createAbsolutePositionFromRelativePosition(
+          decodeRelativePosition(position),
           sharedRoot.doc
         )
       ]
@@ -577,7 +576,7 @@ function removeStoredPosition(sharedRoot, key) {
 function setStoredPosition(sharedRoot, key, position) {
   sharedRoot.setAttribute(
     STORED_POSITION_PREFIX + key,
-    Y.encodeRelativePosition(position)
+    encodeRelativePosition(position)
   );
 }
 function getAbsolutePositionsInTextRange(absolutePositions, yTarget, textRange) {
@@ -599,7 +598,7 @@ function getAbsolutePositionsInYText(absolutePositions, yText, parentPath = "")
   };
   const insertDelta = yTextToInsertDelta(yText);
   insertDelta.forEach(({ insert }, i) => {
-    if (insert instanceof Y.XmlText) {
+    if (insert instanceof XmlText) {
       Object.assign(
         positions,
         getAbsolutePositionsInYText(
@@ -621,7 +620,7 @@ function getStoredPositionsInDeltaAbsolute(sharedRoot, yText, delta, deltaOffset
     })
   };
   delta.forEach(({ insert }, i) => {
-    if (insert instanceof Y.XmlText) {
+    if (insert instanceof XmlText) {
       Object.assign(
         positions,
         getAbsolutePositionsInYText(absolutePositions, insert, i.toString())
@@ -637,7 +636,7 @@ function restoreStoredPositionsWithDeltaAbsolute(sharedRoot, yText, absolutePosi
       setStoredPosition(
         sharedRoot,
         key,
-        Y.createRelativePositionFromTypeIndex(
+        createRelativePositionFromTypeIndex(
           yText,
           position.index - previousDeltaOffset + newDeltaOffset,
           position.assoc
@@ -646,7 +645,7 @@ function restoreStoredPositionsWithDeltaAbsolute(sharedRoot, yText, absolutePosi
     });
   }
   delta.forEach(({ insert }, i) => {
-    if (insert instanceof Y.XmlText) {
+    if (insert instanceof XmlText) {
       restoreStoredPositionsWithDeltaAbsolute(
         sharedRoot,
         insert,
@@ -1292,72 +1291,46 @@ function withCursors(editor, awareness, {
   return e;
 }
 const EDITOR_TO_CURSOR_STORE = new toRawWeakMap();
-function createRemoteCursorStateStore(editor) {
-  let cursors = {};
-  const changed = /* @__PURE__ */ new Set();
-  const addChanged = changed.add.bind(changed);
-  const onStoreChangeListeners = /* @__PURE__ */ new Set();
-  let changeHandler = null;
-  const subscribe = (onStoreChange) => {
-    onStoreChangeListeners.add(onStoreChange);
-    if (!changeHandler) {
-      changeHandler = (event) => {
-        event.added.forEach(addChanged);
-        event.removed.forEach(addChanged);
-        event.updated.forEach(addChanged);
-        onStoreChangeListeners.forEach((listener) => listener());
-      };
-      CursorEditor.on(editor, "change", changeHandler);
-    }
-    return () => {
-      onStoreChangeListeners.delete(onStoreChange);
-      if (changeHandler && onStoreChangeListeners.size === 0) {
-        CursorEditor.off(editor, "change", changeHandler);
-        changeHandler = null;
-      }
-    };
-  };
-  const getSnapshot = () => {
-    if (changed.size === 0) {
+function useRemoteCursorStateStore() {
+  const editor = useEditor();
+  const cursors = ref({});
+  const changed = ref(/* @__PURE__ */ new Set());
+  const addChanged = changed.value.add.bind(changed.value);
+  const changeHandler = (event) => {
+    event.added.forEach(addChanged);
+    event.removed.forEach(addChanged);
+    event.updated.forEach(addChanged);
+    if (changed.value.size === 0) {
       return cursors;
     }
-    changed.forEach((clientId) => {
+    changed.value.forEach((clientId) => {
       const state = CursorEditor.cursorState(editor, clientId);
       if (state === null) {
-        delete cursors[clientId.toString()];
+        delete cursors.value[clientId.toString()];
         return;
       }
-      cursors[clientId] = state;
+      cursors.value[clientId] = state;
     });
-    changed.clear();
-    cursors = { ...cursors };
-    return cursors;
+    changed.value.clear();
   };
-  return [subscribe, getSnapshot];
-}
-function useRemoteCursorStateStore() {
-  const editor = useEditor();
-  const existing = EDITOR_TO_CURSOR_STORE.get(editor);
-  if (existing) {
-    return existing;
-  }
-  const store = createRemoteCursorStateStore(editor);
+  const subscribe = () => {
+    CursorEditor.on(editor, "change", changeHandler);
+    return () => CursorEditor.off(editor, "change", changeHandler);
+  };
+  const store = [subscribe, cursors];
   EDITOR_TO_CURSOR_STORE.set(editor, store);
   return store;
 }
 function useRemoteCursorStates() {
-  const [subscribe, getSnapshot] = useRemoteCursorStateStore();
-  const snapshot = ref(getSnapshot());
-  const handleStoreChange = () => snapshot.value = getSnapshot();
+  const [subscribe, cursors] = useRemoteCursorStateStore();
   let unsubscribe;
   onMounted(() => {
-    unsubscribe = subscribe(handleStoreChange);
-    handleStoreChange();
+    unsubscribe = subscribe();
   });
   onUnmounted(() => {
     unsubscribe == null ? void 0 : unsubscribe();
   });
-  return snapshot;
+  return cursors;
 }
 function useUnsetCursorPositionOnBlur() {
   const editor = useEditor();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slate-vue3",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",