@windoc/core 0.3.1 → 0.3.2

package/dist/index.js

@@ -6517,34 +6517,25 @@ var Cursor = class {
     const nextElement = elementList[curIndex + 1];
     const isNearImage = curElement && curElement.type === "image" /* IMAGE */ || nextElement && nextElement.type === "image" /* IMAGE */;
     const isNearSeparator = curElement?.type === "separator" /* SEPARATOR */;
-    if (isNearImage || isNearSeparator) {
+    const isNearTab = curElement?.type === "tab" /* TAB */;
+    if (isNearImage || isNearSeparator || isNearTab) {
       const { defaultSize, defaultFont } = this.options;
       const ctx = this.draw.getCtx();
       ctx.save();
       ctx.font = `${defaultSize * (96 / 72) * scale}px ${defaultFont}`;
       const textMetrics = ctx.measureText("M");
       ctx.restore();
-      if (isNearSeparator) {
-        const textHeight = textMetrics.fontBoundingBoxAscent + textMetrics.fontBoundingBoxDescent;
-        effectiveMetrics = {
-          width: metrics.width,
-          height: textHeight,
-          boundingBoxAscent: textMetrics.fontBoundingBoxAscent,
-          boundingBoxDescent: textMetrics.fontBoundingBoxDescent
-        };
-      } else {
-        const textHeight = textMetrics.actualBoundingBoxAscent + textMetrics.actualBoundingBoxDescent;
-        effectiveMetrics = {
-          width: metrics.width,
-          height: textHeight,
-          boundingBoxAscent: textMetrics.actualBoundingBoxAscent,
-          boundingBoxDescent: textMetrics.actualBoundingBoxDescent
-        };
-      }
+      const textHeight = textMetrics.fontBoundingBoxAscent + textMetrics.fontBoundingBoxDescent;
+      effectiveMetrics = {
+        width: metrics.width,
+        height: textHeight,
+        boundingBoxAscent: textMetrics.fontBoundingBoxAscent,
+        boundingBoxDescent: textMetrics.fontBoundingBoxDescent
+      };
     }
     const cursorPadding = 2 * scale;
     const cursorHeight = effectiveMetrics.boundingBoxAscent + effectiveMetrics.boundingBoxDescent + cursorPadding;
-    const cursorTop = isNearImage ? leftTop[1] + cursorPosition.lineHeight - effectiveMetrics.boundingBoxDescent - cursorPadding / 2 + preY : isNearSeparator ? leftTop[1] + ascent - (effectiveMetrics.boundingBoxAscent + effectiveMetrics.boundingBoxDescent + cursorPadding) / 2 + preY : leftTop[1] + ascent - effectiveMetrics.boundingBoxAscent - cursorPadding / 2 + preY;
+    const cursorTop = isNearImage ? leftTop[1] + cursorPosition.lineHeight - cursorHeight + preY : isNearSeparator ? leftTop[1] + ascent - (effectiveMetrics.boundingBoxAscent + effectiveMetrics.boundingBoxDescent + cursorPadding) / 2 + preY : leftTop[1] + ascent - effectiveMetrics.boundingBoxAscent - cursorPadding / 2 + preY;
     const cursorLeft = hitLineStartIndex ? leftTop[0] : rightTop[0];
     agentCursorDom.style.left = `${cursorLeft}px`;
     agentCursorDom.style.top = `${cursorTop}px`;
@@ -7811,6 +7802,12 @@ function left(evt, host) {
       }
     }
   }
+  if (!isCollapsed && !evt.shiftKey) {
+    rangeManager.setRange(startIndex, startIndex);
+    draw.render({ curIndex: startIndex, isSetCursor: true, isSubmitHistory: false, isCompute: false });
+    evt.preventDefault();
+    return;
+  }
   const curIndex = startIndex - moveCount;
   let anchorStartIndex = curIndex;
   let anchorEndIndex = curIndex;
@@ -7947,6 +7944,12 @@ function right(evt, host) {
       }
     }
   }
+  if (!isCollapsed && !evt.shiftKey) {
+    rangeManager.setRange(endIndex, endIndex);
+    draw.render({ curIndex: endIndex, isSetCursor: true, isSubmitHistory: false, isCompute: false });
+    evt.preventDefault();
+    return;
+  }
   const curIndex = endIndex + moveCount;
   let anchorStartIndex = curIndex;
   let anchorEndIndex = curIndex;