Feat/loro

packages/blocky-core/src/block/textBlock.ts

@@ -251,7 +251,7 @@ export class TextBlock extends ContentBlock {
     }
 
     if (textType === TextType.Normal) {
-      return { x: 0, y: 2 };
+      return { x: 0, y: -2 };
     }
 
     return { x: 0, y: 0 };

packages/blocky-core/src/block/titleBlock.ts

@@ -36,7 +36,7 @@ export class TitleBlock extends Block {
       changeset.forceUpdate = true;
     }
 
-    this.editor.textInput.next(
+    this.editor.textInput$.next(
       new TextInputEvent(beforeDelta, diff, blockElement)
     );
   }

packages/blocky-core/src/data/change.spec.ts

@@ -175,7 +175,7 @@ describe("merge", () => {
     });
     const state = new State("User-1", document);
     const change = new Changeset(state);
-    change.deleteChildrenAt(document, 0, 1);
+    change.deleteChildrenAt(document.body, 0, 1);
     change.textEdit(textBlock2, "textContent", () => new Delta().insert("a"));
     const finalizedChangeset = change.finalize();
     expect(finalizedChangeset.operations.length).toBe(2);

packages/blocky-core/src/data/tree.ts

@@ -10,7 +10,8 @@ import type { ElementChangedEvent } from "./events";
 
 export interface DeltaChangedEvent {
   oldDelta: Delta;
-  newDelta: Delta;
+  newDelta?: Delta;
+  apply: Delta;
 }
 
 export interface AttributesObject {
@@ -52,6 +53,7 @@ export class BlockyTextModel {
   #delta = new Delta();
   #cachedString: string | undefined;
   #cachedLength: number | undefined;
+  changed$ = new Subject<DeltaChangedEvent>();
 
   constructor(delta?: Delta) {
     this.#delta = delta ?? new Delta();
@@ -100,6 +102,12 @@ export class BlockyTextModel {
     this.#delta = newDelta;
     this.#cachedString = undefined;
     this.#cachedLength = undefined;
+
+    this.changed$.next({
+      oldDelta,
+      newDelta,
+      apply: v,
+    });
   }
 
   toString(): string {
@@ -208,6 +216,11 @@ export class DataBaseElement implements DataBaseNode {
     const oldValue = this.#attributes[name];
     this.#attributes[name] = value;
 
+    if (value instanceof DataBaseElement) {
+      value.parent = this;
+      this.doc?.reportBlockyNodeInserted(value);
+    }
+
     if (typeof value === "object" && typeof value.t === "string") {
       this.__backMap.set(value, name);
     }
@@ -686,6 +699,7 @@ export class BlockyDocument extends DataElement {
   readonly blockElementRemoved = new Subject<BlockDataElement>();
 
   constructor(props?: Partial<DocumentInitProps>) {
+    super("document", undefined, []);
     let title: BlockDataElement | undefined;
     if (!isUndefined(props?.title)) {
       if (props?.title instanceof BlockDataElement) {
@@ -701,16 +715,13 @@ export class BlockyDocument extends DataElement {
     const body =
       props?.body ??
       new DataElement("body", undefined, props?.bodyChildren ?? []);
-    super("document", undefined, []);
 
     this.__setAttribute("title", title);
     this.__setAttribute("body", body);
 
     if (this.title) {
-      this.__symInsertAfter(this.title);
       this.reportBlockyNodeInserted(this.title);
     }
-    this.__symInsertAfter(this.body);
     this.reportBlockyNodeInserted(this.body);
   }
 
@@ -762,6 +773,11 @@ export function traverseNode(
   fun(node);
 
   if (node instanceof DataElement) {
+    for (const value of Object.values(node.getAttributes())) {
+      if (value instanceof DataBaseElement) {
+        traverseNode(value, fun);
+      }
+    }
     let ptr = node.firstChild;
     while (ptr) {
       traverseNode(ptr, fun);

packages/blocky-core/src/model/searchContext.ts

@@ -1,7 +1,7 @@
 import { IDisposable } from "blocky-common/es";
 import { Subject } from "rxjs";
 import { elem, removeNode, ContainerWithCoord } from "blocky-common/es/dom";
-import { BlockDataElement, DataBaseNode } from "@pkg/data";
+import { BlockDataElement, DataBaseElement, DataBaseNode } from "@pkg/data";
 import { isString, isObject } from "lodash-es";
 import { Editor } from "@pkg/view/editor";
 
@@ -210,6 +210,13 @@ export class SearchContext implements IDisposable {
   }
 
   #iterateNode(node: DataBaseNode) {
+    if (node instanceof DataBaseElement) {
+      for (const value of Object.values(node.getAttributes())) {
+        if (value instanceof DataBaseElement) {
+          this.#iterateNode(value);
+        }
+      }
+    }
     if (node instanceof BlockDataElement) {
       this.#searchBlockElement(node);
     }

packages/blocky-core/src/view/renderer.ts

@@ -12,6 +12,7 @@ import {
 } from "@pkg/data";
 import type { Editor } from "@pkg/view/editor";
 import { TextBlock } from "@pkg/block/textBlock";
+import { TitleBlock } from "@pkg/block/titleBlock";
 
 function ensureChild<K extends keyof HTMLElementTagNameMap>(
   dom: HTMLElement,
@@ -133,20 +134,24 @@ export class DocRenderer {
     const state = this.editor.state;
     const blockElement = state.getBlockElementById(operation.id);
     if (!blockElement) {
-      // has been deleted?
+      console.warn("blockElement not found", operation.id);
       return;
     }
-    if (blockElement.t !== TextBlock.Name) {
-      return;
-    }
-    const block = state.blocks.get(operation.id);
-    const dom = state.domMap.get(operation.id);
-    if (block && dom) {
-      block.render?.(dom as HTMLElement, {
-        changeset,
-        operation,
-        flags: RenderFlag.Incremental,
-      });
+    if (blockElement.t === TextBlock.Name) {
+      const block = state.blocks.get(operation.id);
+      const dom = state.domMap.get(operation.id);
+      if (block && dom) {
+        block.render?.(dom as HTMLElement, {
+          changeset,
+          operation,
+          flags: RenderFlag.Incremental,
+        });
+      }
+    } else if (blockElement.t === TitleBlock.Name) {
+      const dom = state.domMap.get(operation.id);
+      if (dom) {
+        this.renderTitle(dom as HTMLElement, blockElement);
+      }
     }
   }
 

packages/blocky-example/app/app.scss

@@ -21,7 +21,7 @@
   max-width: 260px;
   border-right-style: solid;
   border-right-width: 1px;
-  border-right-color: grey;
+  border-right-color: var(--border-color);
   flex-shrink: 0;
   padding-top: 1rem;
 
@@ -36,7 +36,6 @@
   }
 }
 
-
 .blocky-example-container {
   height: 100%;
   overflow-x: hidden;
@@ -60,12 +59,16 @@ body {
 
 :root {
   --bg-color: white;
+  --border-color: #e0e0e0;
+  --hover-color: rgba(0, 0, 0, 0.1);
   --primary-text-color: black;
   --danger-color: rgb(201, 56, 56);
 }
 
 [data-theme="dark"] {
   --bg-color: #161625;
+  --border-color: #1d1d2b;
+  --hover-color: rgba(255, 255, 255, 0.1);
   --primary-text-color: #c3c3bf;
 }
 
@@ -104,19 +107,6 @@ body {
   }
 }
 
-/*Simple css to style it like a toggle switch*/
-.theme-switch-wrapper {
-  display: flex;
-  align-items: center;
-
-  p {
-    margin-left: 10px;
-    font-size: 13px;
-    font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-    color: var(--primary-text-color);
-  }
-}
-
 .theme-switch {
   display: inline-block;
   height: 20px;

packages/blocky-example/app/loro/loroExample.module.scss

@@ -0,0 +1,13 @@
+
+.editorContainer {
+  width: 100%;
+  display: flex;
+
+  :global(.blocky-editor-container) {
+    flex: 1;
+  }
+
+  :global(.blocky-documents) {
+    width: 580px;
+  }
+}