@fieldnotes/core 0.49.0 → 0.50.1

package/dist/index.cjs

@@ -367,7 +367,7 @@ function migrateElement(obj) {
   if (obj["type"] === "note" && typeof obj["textColor"] !== "string") {
     obj["textColor"] = "#000000";
   }
-  if (obj["type"] === "note" && typeof obj["text"] === "string") {
+  if ((obj["type"] === "note" || obj["type"] === "text") && typeof obj["text"] === "string") {
     obj["text"] = sanitizeNoteHtml(obj["text"]);
   }
 }
@@ -2580,6 +2580,11 @@ function transferStrokeRenderData(prev, next) {
 }
 
 // src/elements/element-store.ts
+function sanitizeRichText(element) {
+  if (element.type !== "note" && element.type !== "text") return element;
+  const text = sanitizeNoteHtml(element.text);
+  return text === element.text ? element : { ...element, text };
+}
 var ElementStore = class {
   elements = /* @__PURE__ */ new Map();
   bus = new EventBus();
@@ -2624,6 +2629,7 @@ var ElementStore = class {
     return angle === 0 ? bounds : rotatedAABB(bounds, angle);
   }
   add(element, meta) {
+    element = sanitizeRichText(element);
     this.sortedCache = null;
     this._versions.set(element.id, 0);
     this.elements.set(element.id, element);
@@ -2650,7 +2656,7 @@ var ElementStore = class {
       const arrow = updated;
       arrow.cachedControlPoint = getArrowControlPoint(arrow.from, arrow.to, arrow.bend);
     }
-    if (updated.type === "note" && "text" in partial) {
+    if ((updated.type === "note" || updated.type === "text") && "text" in partial) {
       updated.text = sanitizeNoteHtml(updated.text);
     }
     this.elements.set(id, updated);
@@ -2680,11 +2686,12 @@ var ElementStore = class {
     return this.getAll().map((el) => ({ ...el }));
   }
   loadSnapshot(elements, meta) {
+    const sanitizedElements = elements.map(sanitizeRichText);
     this.sortedCache = null;
     this._versions.clear();
     this.elements.clear();
     this.spatialIndex.clear();
-    for (const el of elements) {
+    for (const el of sanitizedElements) {
       this.elements.set(el.id, el);
       this._versions.set(el.id, 0);
       const bounds = this.indexBounds(el);
@@ -2697,7 +2704,7 @@ var ElementStore = class {
       }
     }
     this.bus.emit("clear", null, meta);
-    for (const el of elements) {
+    for (const el of sanitizedElements) {
       this.bus.emit("add", el, meta);
     }
   }
@@ -4112,7 +4119,7 @@ function createText(input) {
     locked: input.locked ?? false,
     layerId: input.layerId ?? "",
     size: input.size ?? { w: 200, h: 28 },
-    text: input.text ?? "",
+    text: sanitizeNoteHtml(input.text ?? ""),
     fontSize: input.fontSize ?? 16,
     color: input.color ?? "#1a1a1a",
     textAlign: input.textAlign ?? "left"
@@ -8965,7 +8972,7 @@ function anchorOffset(handle, w, h) {
       return { x: 0, y: 0 };
   }
 }
-function computeResize(el, handle, world, lastWorld, aspectRatio, shiftKey) {
+function computeResize(el, handle, world, lastWorld, aspectRatio, lockAspect) {
   const dx = world.x - lastWorld.x;
   const dy = world.y - lastWorld.y;
   let { x, y, w, h } = { x: el.position.x, y: el.position.y, w: el.size.w, h: el.size.h };
@@ -8991,7 +8998,7 @@ function computeResize(el, handle, world, lastWorld, aspectRatio, shiftKey) {
       h -= dy;
       break;
   }
-  if (shiftKey && aspectRatio > 0) {
+  if (lockAspect && aspectRatio > 0) {
     const absDw = Math.abs(w - el.size.w);
     const absDh = Math.abs(h - el.size.h);
     if (absDw >= absDh) {
@@ -9016,7 +9023,7 @@ function computeResize(el, handle, world, lastWorld, aspectRatio, shiftKey) {
   }
   return { position: { x, y }, size: { w, h } };
 }
-function computeRotatedResize(el, handle, angle, world, lastWorld, aspectRatio, shiftKey) {
+function computeRotatedResize(el, handle, angle, world, lastWorld, aspectRatio, lockAspect) {
   const wdx = world.x - lastWorld.x;
   const wdy = world.y - lastWorld.y;
   const cosN = Math.cos(-angle);
@@ -9043,7 +9050,7 @@ function computeRotatedResize(el, handle, angle, world, lastWorld, aspectRatio,
       h -= ldy;
       break;
   }
-  if (shiftKey && aspectRatio > 0) {
+  if (lockAspect && aspectRatio > 0) {
     const absDw = Math.abs(w - el.size.w);
     const absDh = Math.abs(h - el.size.h);
     if (absDw >= absDh) h = w / aspectRatio;
@@ -9573,6 +9580,7 @@ var SelectTool = class {
     if (this.mode.type !== "resizing") return;
     const el = ctx.store.getById(this.mode.elementId);
     if (!el || !("size" in el) || el.locked) return;
+    const lockAspect = shiftKey !== (el.type === "image");
     const angle = el.rotation ?? 0;
     const patch = angle !== 0 ? computeRotatedResize(
       el,
@@ -9581,14 +9589,14 @@ var SelectTool = class {
       world,
       this.lastWorld,
       this.resizeAspectRatio,
-      shiftKey
+      lockAspect
     ) : computeResize(
       el,
       this.mode.handle,
       world,
       this.lastWorld,
       this.resizeAspectRatio,
-      shiftKey
+      lockAspect
     );
     this.lastWorld = world;
     ctx.store.update(this.mode.elementId, patch);
@@ -10613,7 +10621,7 @@ var LaserTool = class {
 };
 
 // src/index.ts
-var VERSION = "0.49.0";
+var VERSION = "0.50.1";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ArrowTool,