@windoc/core 0.2.10 → 0.3.0

package/dist/index.js

@@ -4498,8 +4498,8 @@ function mergeOption(options = {}) {
     pageGap: 20,
     underlineColor: "#000000",
     strikeoutColor: "#FF0000",
-    rangeAlpha: 0.6,
-    rangeColor: "#AECBFA",
+    rangeAlpha: 0.8,
+    rangeColor: "#A8C7FA",
     rangeMinWidth: 5,
     searchMatchAlpha: 0.6,
     searchMatchColor: "#FFFF00",
@@ -6516,7 +6516,7 @@ var Cursor = class {
     const curElement = elementList[curIndex];
     const nextElement = elementList[curIndex + 1];
     const isNearImage = curElement && curElement.type === "image" /* IMAGE */ || nextElement && nextElement.type === "image" /* IMAGE */;
-    const isNearSeparator = curElement && curElement.type === "separator" /* SEPARATOR */ || nextElement && nextElement.type === "separator" /* SEPARATOR */;
+    const isNearSeparator = curElement?.type === "separator" /* SEPARATOR */;
     if (isNearImage || isNearSeparator) {
       const { defaultSize, defaultFont } = this.options;
       const ctx = this.draw.getCtx();
@@ -6524,17 +6524,27 @@ var Cursor = class {
       ctx.font = `${defaultSize * (96 / 72) * scale}px ${defaultFont}`;
       const textMetrics = ctx.measureText("M");
       ctx.restore();
-      const textHeight = textMetrics.actualBoundingBoxAscent + textMetrics.actualBoundingBoxDescent;
-      effectiveMetrics = {
-        width: metrics.width,
-        height: textHeight,
-        boundingBoxAscent: textMetrics.actualBoundingBoxAscent,
-        boundingBoxDescent: textMetrics.actualBoundingBoxDescent
-      };
+      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 cursorPadding = 2 * scale;
     const cursorHeight = effectiveMetrics.boundingBoxAscent + effectiveMetrics.boundingBoxDescent + cursorPadding;
-    const cursorTop = isNearImage ? leftTop[1] + cursorPosition.lineHeight - effectiveMetrics.boundingBoxDescent - cursorPadding / 2 + preY : leftTop[1] + ascent - effectiveMetrics.boundingBoxAscent - cursorPadding / 2 + preY;
+    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 cursorLeft = hitLineStartIndex ? leftTop[0] : rightTop[0];
     agentCursorDom.style.left = `${cursorLeft}px`;
     agentCursorDom.style.top = `${cursorTop}px`;
@@ -12700,11 +12710,12 @@ var SeparatorParticle = class {
     if (element.dashArray?.length) {
       ctx.setLineDash(element.dashArray);
     }
+    const sideGap = 4 * scale;
     const offsetY = Math.round(y);
     ctx.translate(0, ctx.lineWidth / 2);
     ctx.beginPath();
-    ctx.moveTo(x, offsetY);
-    ctx.lineTo(x + element.width * scale, offsetY);
+    ctx.moveTo(x + sideGap, offsetY);
+    ctx.lineTo(x + element.width * scale - sideGap, offsetY);
     ctx.stroke();
     ctx.restore();
   }
@@ -18552,7 +18563,7 @@ var ListParticle = class {
       }
       if (!text) return;
       ctx.save();
-      ctx.font = `${defaultSize * scale}px ${defaultFont}`;
+      ctx.font = `${defaultSize * (96 / 72) * scale}px ${defaultFont}`;
       ctx.fillText(text, x, y);
       ctx.restore();
     }
@@ -21546,9 +21557,10 @@ var Draw = class {
         const lineWidth = element.lineWidth || defaultLineWidth;
         element.width = availableWidth / scale;
         metrics.width = availableWidth;
-        metrics.height = lineWidth * scale;
-        metrics.boundingBoxAscent = -rowMargin;
-        metrics.boundingBoxDescent = -rowMargin + metrics.height;
+        const separatorHeight = defaultSize * scale;
+        metrics.height = separatorHeight;
+        metrics.boundingBoxAscent = separatorHeight / 2;
+        metrics.boundingBoxDescent = separatorHeight / 2 + lineWidth * scale;
       } else if (element.type === "pageBreak" /* PAGE_BREAK */) {
         element.width = availableWidth / scale;
         metrics.width = availableWidth;
@@ -21612,8 +21624,8 @@ var Draw = class {
           ctx,
           element.font
         );
-        metrics.boundingBoxAscent = basisMetrics.actualBoundingBoxAscent * scale;
-        metrics.boundingBoxDescent = basisMetrics.actualBoundingBoxDescent * scale;
+        metrics.boundingBoxAscent = basisMetrics.fontBoundingBoxAscent * scale;
+        metrics.boundingBoxDescent = basisMetrics.fontBoundingBoxDescent * scale;
         if (element.type === "superscript" /* SUPERSCRIPT */) {
           metrics.boundingBoxAscent += metrics.height / 2;
         } else if (element.type === "subscript" /* SUBSCRIPT */) {
@@ -21833,6 +21845,13 @@ var Draw = class {
           row.spaceBelow = space.below * PT_TO_PX * scale;
         }
       }
+      const separatorEl = row.elementList.find(
+        (el) => el.type === "separator" /* SEPARATOR */
+      );
+      if (separatorEl) {
+        row.spaceAbove = 4 * PT_TO_PX * scale;
+        row.spaceBelow = 1 * PT_TO_PX * scale;
+      }
     }
   }
   _computePageList() {
@@ -22018,7 +22037,7 @@ var Draw = class {
           this.textParticle.complete();
           this.subscriptParticle.render(ctx, element, x, y + offsetY);
         } else if (element.type === "separator" /* SEPARATOR */) {
-          this.separatorParticle.render(ctx, element, x, y);
+          this.separatorParticle.render(ctx, element, x, y + offsetY);
         } else if (element.type === "pageBreak" /* PAGE_BREAK */) {
         } else if (element.type === "columnBreak" /* COLUMN_BREAK */) {
         } else if (element.type === "checkbox" /* CHECKBOX */ || element.controlComponent === "checkbox" /* CHECKBOX */) {
@@ -22131,8 +22150,8 @@ var Draw = class {
               const nextElement = elementList[startIndex2 + 1];
               if (nextElement && nextElement.value === ZERO) {
                 rangeRecord.x = x + metrics.width;
-                rangeRecord.y = y;
-                rangeRecord.height = curRow.height;
+                rangeRecord.y = y - (curRow.spaceAbove || 0);
+                rangeRecord.height = curRow.height + (curRow.spaceAbove || 0) + (curRow.spaceBelow || 0);
                 rangeRecord.width += this.options.rangeMinWidth;
               }
             } else {
@@ -22142,8 +22161,8 @@ var Draw = class {
               }
               if (!rangeRecord.width) {
                 rangeRecord.x = x;
-                rangeRecord.y = y;
-                rangeRecord.height = curRow.height;
+                rangeRecord.y = y - (curRow.spaceAbove || 0);
+                rangeRecord.height = curRow.height + (curRow.spaceAbove || 0) + (curRow.spaceBelow || 0);
               }
               rangeRecord.width += rangeWidth;
             }
@@ -23751,7 +23770,7 @@ var CommandAdapt = class {
           { value: ZERO }
         ]);
       }
-      curIndex = afterSepIndex - 1;
+      curIndex = afterSepIndex;
     }
     this.range.setRange(curIndex, curIndex);
     this.draw.render({ curIndex });