mxcad 1.0.297 → 1.0.298

package/dist/mxcad.d.ts

@@ -13977,6 +13977,7 @@ export interface LineInfo {
 	};
 	horizontalOffset?: number;
 	bottomSpacing?: number;
+	isEndLine?: boolean;
 }
 declare class MultilineTextConverter {
 	/**
@@ -14164,6 +14165,8 @@ declare class MxCADMTextImp extends PubSub<{
 	getTotalContentHeight(): number;
 	/** 设置实体类型 */
 	setEntityType(type: "custom" | "mtext"): void;
+	/** 获取节点Color颜色 */
+	getColor: (node: MarksStyleText) => McCmColor | undefined;
 }
 declare function convertCadPointToSlatePoint(this: MxCADMText, point: McGePoint3d): {
 	path: number[];

package/dist/mxcad.es.js

@@ -14368,7 +14368,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312Imp(hexstr);
 };
 
-const version$1 = "1.0.297";
+const version$1 = "1.0.298";
 
 var isSharedArrayBuffer = ("SharedArrayBuffer" in window);
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -23542,6 +23542,7 @@ function findTextSequences(textNodes) {
   textNodes.forEach(function (node, nodeIndex) {
     if (isText(node)) {
       if (node.type && MxCADMText.elementTextManager.hasText(node.type)) {
+        currentSequence = null;
         sequences.push(createSequence(SequenceType.TextNode, createFragment(node, nodeIndex, 0, node.text.length)));
         return;
       }
@@ -23573,8 +23574,8 @@ function findTextSequences(textNodes) {
           currentPos = sequenceEnd;
         }
       }
-    }
-    if (isElement(node)) {
+    } else if (isElement(node) && MxCADMText.elementTextManager.has(node.type)) {
+      currentSequence = null;
       sequences.push(createSequence(SequenceType.Element, createFragment(node, nodeIndex, 0, 0)));
     }
   });
@@ -23791,8 +23792,8 @@ function calculateLineBreaks(ent, textNodes, paragraphIndex, options) {
         sequence.fragments.forEach(function (fragment) {
           updateSequence(sequence, fragment);
         });
-        updateLineBreakInfo(currentLine, true, sequence.type === SequenceType.Continuous ? BreakType.Word : sequence.isAutoBreak ? BreakType.Word : BreakType.Forced);
         applyCharLevelSpacing();
+        updateLineBreakInfo(currentLine, true, sequence.type === SequenceType.Continuous ? BreakType.Word : sequence.isAutoBreak ? BreakType.Word : BreakType.Forced);
         lines.push(currentLine);
         currentLine = createNewLine(baseHeight, lineHeightRatio);
         currentWidth = 0;
@@ -23821,6 +23822,7 @@ function calculateLineBreaks(ent, textNodes, paragraphIndex, options) {
   if (currentLine.nodes.length > 0) {
     updateLineBreakInfo(currentLine, true, BreakType.Forced);
     applyCharLevelSpacing();
+    currentLine.isEndLine = true;
     lines.push(currentLine);
   }
   return lines;
@@ -23896,8 +23898,8 @@ var combinationMTextContents = function combinationMTextContents(node, text) {
     font = node.font,
     tiltAngle = node.tiltAngle,
     tracking = node.tracking,
-    widthFactor = node.widthFactor,
-    textPosition = node.textPosition;
+    widthFactor = node.widthFactor;
+    node.textPosition;
   var contents = text;
   var str = "";
   if (font !== void 0 || bold === true || italic === true) {
@@ -23912,11 +23914,6 @@ var combinationMTextContents = function combinationMTextContents(node, text) {
   if (typeof widthFactor === "number") {
     str += "\\W".concat(widthFactor, ";");
   }
-  if (textPosition === "superscript") {
-    contents = "\\S".concat(contents, "^;");
-  } else if (textPosition === "subscript") {
-    contents = "\\S^".concat(contents, ";");
-  }
   return "{" + str + contents + "}";
 };
 var setFont = function setFont(node, mcText, style) {
@@ -23956,8 +23953,8 @@ var getTextHeight = function getTextHeight(node, baseHeight, ent) {
     var _ref = getTextCalculateData(ent, node) || {
         width: 0
       },
-      width = _ref.width;
-    return width;
+      height = _ref.height;
+    return height;
   }
   return baseHeight * ((node === null || node === void 0 ? void 0 : node.fontSize) || 1);
 };
@@ -24130,8 +24127,10 @@ function generateNodeFingerprint(node, baseHeight, style) {
     _node$tracking = node.tracking,
     tracking = _node$tracking === void 0 ? 0 : _node$tracking,
     _node$widthFactor = node.widthFactor,
-    widthFactor = _node$widthFactor === void 0 ? 0 : _node$widthFactor;
-  return "".concat(type, "_").concat(style, "_").concat(font, "_").concat(fontSize, "_").concat(Number(bold), "_").concat(Number(italic), "_").concat(Number(underline), "_").concat(Number(strike), "_").concat(Number(overline), "_").concat(tiltAngle, "_").concat(tracking, "_").concat(widthFactor, "_").concat(baseHeight);
+    widthFactor = _node$widthFactor === void 0 ? 0 : _node$widthFactor,
+    _node$textPosition = node.textPosition,
+    textPosition = _node$textPosition === void 0 ? "" : _node$textPosition;
+  return "".concat(type, "_").concat(textPosition, "_").concat(style, "_").concat(font, "_").concat(fontSize, "_").concat(Number(bold), "_").concat(Number(italic), "_").concat(Number(underline), "_").concat(Number(strike), "_").concat(Number(overline), "_").concat(tiltAngle, "_").concat(tracking, "_").concat(widthFactor, "_").concat(baseHeight);
 }
 function getCachedCharacterWidth(char, fingerprint, node, baseHeight, style, ent) {
   var cache = globalCharacterCache.get(fingerprint);
@@ -24161,7 +24160,11 @@ function getBasicTextWidth(text, node, baseHeight, style, ent, offset) {
       ent: ent
     }),
     width = _getTextNodeBoxInfo.width;
-  return width * ((node === null || node === void 0 ? void 0 : node.tracking) || 1) + (offset || 0);
+  var tracking = (node === null || node === void 0 ? void 0 : node.tracking) || 1;
+  if (node.textPosition === "superscript" || node.textPosition === "subscript") {
+    tracking = 0.5;
+  }
+  return width * tracking + (offset || 0);
 }
 function calculateTextWidth(text, node, baseHeight, style, ent, offset) {
   if (text.length === 0) return 0;
@@ -24198,7 +24201,8 @@ function getTextWidth(text, node, baseHeight, style, ent) {
       width = _ref.width;
     return width;
   }
-  return calculateTextWidth(text, node, baseHeight, style, ent);
+  var normalWidth = calculateTextWidth(text, node, baseHeight, style, ent);
+  return normalWidth;
 }
 
 function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -24712,6 +24716,7 @@ var renderParagraph = function renderParagraph(ent, draw, props) {
         positionInfo.horizontalOffset += nodeInfo.extraCharSpacing || 0;
       }
       if (isText(nodeInfo.node)) {
+        var isTextPosition = nodeInfo.node.textPosition === "superscript" || nodeInfo.node.textPosition === "subscript";
         if (nodeInfo.node.type && MxCADMText.elementTextManager.hasText(nodeInfo.node.type)) {
           var currentTextWidth = renderMText();
           lineOffset += currentTextWidth;
@@ -24744,89 +24749,200 @@ var renderParagraph = function renderParagraph(ent, draw, props) {
           });
           ents.push.apply(ents, _toConsumableArray(entitys));
           lineOffset += width2 + (nodeInfo.extraCharSpacing || 0);
-        } else if (nodeInfo.hasCharLevelSpacing || nodeInfo.node.tracking) {
+        } else if (isTextPosition) {
           var _currentTextWidth = renderMText();
           lineOffset += _currentTextWidth;
           if (!isOneCharacter) positionInfo.horizontalOffset = lineOffset;
           var textContent = nodeInfo.node.text.substring(nodeInfo.startOffset, nodeInfo.endOffset);
-          var textHeight = getTextHeight(nodeInfo.node, height, ent);
-          positionInfo.verticalOffset -= textHeight;
-          for (var i = 0; i < textContent.length; i++) {
-            var char = textContent[i];
-            var charEntity = createTextEntity({
+          var shouldApplyCharLevelSpacing = (ent.getMTextImp().entityType === "mtext" && !ent.getMTextImp().isEditState ? nodeInfo.hasCharLevelSpacing && line.isEndLine : nodeInfo.hasCharLevelSpacing) || nodeInfo.node.tracking;
+          var newPositionInfo = {
+            basePosition: positionInfo.basePosition.clone(),
+            horizontalOffset: positionInfo.horizontalOffset,
+            verticalOffset: positionInfo.verticalOffset - line.height
+          };
+          var textHeight = getTextHeight(nodeInfo.node, height / 2, ent);
+          if (nodeInfo.node.textPosition === "superscript") {
+            if (line.height > nodeInfo.height) {
+              newPositionInfo.verticalOffset -= line.height - nodeInfo.height;
+            }
+          } else {
+            newPositionInfo.verticalOffset += line.height - textHeight;
+          }
+          if (shouldApplyCharLevelSpacing) {
+            for (var i = 0; i < textContent.length; i++) {
+              var char = textContent[i];
+              var charEntity = createTextEntity({
+                node: nodeInfo.node,
+                text: char,
+                height: height / 2,
+                position: newPositionInfo,
+                style: ent.textStyle,
+                ent: ent
+              });
+              if (!mTextImp.isEditState) {
+                charEntity.transformBy(transformsMatrix);
+              }
+              var baseCharWidth = nodeInfo.width / textContent.length;
+              var extraSpacing = 0;
+              if (nodeInfo.hasCharLevelSpacing) {
+                var isLastNode = line.nodes.indexOf(nodeInfo) === line.nodes.length - 1;
+                var isLastChar = i === textContent.length - 1;
+                if (!(isLastNode && isLastChar)) {
+                  extraSpacing = nodeInfo.extraCharSpacing || 0;
+                }
+              }
+              if (nodeInfo.node.tracking) {
+                extraSpacing += nodeInfo.node.tracking * (height / 2);
+              }
+              var charWidth = baseCharWidth + extraSpacing;
+              var charMinPt = charEntity.location.clone();
+              var charMaxPt = charMinPt.clone().addvec(McGeVector3d.kXAxis.clone().mult(charWidth)).addvec(McGeVector3d.kYAxis.clone().negate().mult(textHeight));
+              if (nodeInfo.node.color) {
+                var mcColor = getColor(nodeInfo.node);
+                if (mcColor) {
+                  draw.trueColor = mcColor;
+                }
+              }
+              if (nodeInfo.node.underline) {
+                var underline = drawLine$1(draw, new McGePoint3d(charMinPt.x, charMaxPt.y, charMinPt.z), new McGePoint3d(charMaxPt.x, charMaxPt.y, charMinPt.z), !mTextImp.isEditState ? transformsMatrix : void 0);
+                ents.push(underline);
+              }
+              if (nodeInfo.node.strike) {
+                var strikeY = charMinPt.y - textHeight * 0.5;
+                var strike = drawLine$1(draw, new McGePoint3d(charMinPt.x, strikeY, charMinPt.z), new McGePoint3d(charMaxPt.x, strikeY, charMinPt.z), !mTextImp.isEditState ? transformsMatrix : void 0);
+                ents.push(strike);
+              }
+              if (nodeInfo.node.overline) {
+                var overline = drawLine$1(draw, new McGePoint3d(charMinPt.x, charMinPt.y, charMinPt.z), new McGePoint3d(charMaxPt.x, charMinPt.y, charMinPt.z), !mTextImp.isEditState ? transformsMatrix : void 0);
+                ents.push(overline);
+              }
+              draw.drawEntity(charEntity);
+              ents.push(charEntity);
+              draw.trueColor = ent.trueColor;
+              newPositionInfo.horizontalOffset += charWidth;
+              lineOffset += charWidth;
+            }
+          } else {
+            var textEntity = createTextEntity({
               node: nodeInfo.node,
-              text: char,
+              text: textContent,
+              height: height / 2,
+              position: newPositionInfo,
+              style: ent.textStyle,
+              ent: ent
+            });
+            if (!mTextImp.isEditState) {
+              textEntity.transformBy(transformsMatrix);
+            }
+            if (nodeInfo.node.color) {
+              var _mcColor = getColor(nodeInfo.node);
+              if (_mcColor) {
+                draw.trueColor = _mcColor;
+              }
+            }
+            draw.drawEntity(textEntity);
+            ents.push(textEntity);
+            var textMinPt = textEntity.location.clone();
+            var textMaxPt = textMinPt.clone().addvec(McGeVector3d.kXAxis.clone().mult(nodeInfo.width)).addvec(McGeVector3d.kYAxis.clone().negate().mult(textHeight));
+            if (nodeInfo.node.underline) {
+              var _underline = drawLine$1(draw, new McGePoint3d(textMinPt.x, textMaxPt.y, textMinPt.z), new McGePoint3d(textMaxPt.x, textMaxPt.y, textMinPt.z), !mTextImp.isEditState ? transformsMatrix : void 0);
+              ents.push(_underline);
+            }
+            if (nodeInfo.node.strike) {
+              var _strikeY = textMinPt.y - textHeight * 0.5;
+              var _strike = drawLine$1(draw, new McGePoint3d(textMinPt.x, _strikeY, textMinPt.z), new McGePoint3d(textMaxPt.x, _strikeY, textMinPt.z), !mTextImp.isEditState ? transformsMatrix : void 0);
+              ents.push(_strike);
+            }
+            if (nodeInfo.node.overline) {
+              var _overline = drawLine$1(draw, new McGePoint3d(textMinPt.x, textMinPt.y, textMinPt.z), new McGePoint3d(textMaxPt.x, textMinPt.y, textMinPt.z), !mTextImp.isEditState ? transformsMatrix : void 0);
+              ents.push(_overline);
+            }
+            draw.trueColor = ent.trueColor;
+            lineOffset += nodeInfo.width + (nodeInfo.extraCharSpacing || 0);
+          }
+        } else if ((ent.getMTextImp().entityType === "mtext" && !ent.getMTextImp().isEditState ? nodeInfo.hasCharLevelSpacing && line.isEndLine : nodeInfo.hasCharLevelSpacing) || nodeInfo.node.tracking) {
+          var _currentTextWidth2 = renderMText();
+          lineOffset += _currentTextWidth2;
+          if (!isOneCharacter) positionInfo.horizontalOffset = lineOffset;
+          var _textContent = nodeInfo.node.text.substring(nodeInfo.startOffset, nodeInfo.endOffset);
+          var _textHeight = getTextHeight(nodeInfo.node, height, ent);
+          positionInfo.verticalOffset -= _textHeight;
+          for (var _i = 0; _i < _textContent.length; _i++) {
+            var _char = _textContent[_i];
+            var _charEntity = createTextEntity({
+              node: nodeInfo.node,
+              text: _char,
               height: height,
               position: positionInfo,
               style: ent.textStyle,
               ent: ent
             });
             if (!mTextImp.isEditState) {
-              charEntity.transformBy(transformsMatrix);
+              _charEntity.transformBy(transformsMatrix);
             }
-            var baseCharWidth = getTextWidth(char, nodeInfo.node, height, ent.textStyle, ent);
-            var extraSpacing = 0;
+            var _baseCharWidth = getTextWidth(_char, nodeInfo.node, height, ent.textStyle, ent);
+            var _extraSpacing = 0;
             if (nodeInfo.hasCharLevelSpacing) {
               if (totalChars === 1) {
-                extraSpacing = 0;
+                _extraSpacing = 0;
               } else {
-                var isLastNode = line.nodes.indexOf(nodeInfo) === line.nodes.length - 1;
-                var isLastChar = i === textContent.length - 1;
-                if (!(isLastNode && isLastChar)) {
-                  extraSpacing = nodeInfo.extraCharSpacing || 0;
+                var _isLastNode = line.nodes.indexOf(nodeInfo) === line.nodes.length - 1;
+                var _isLastChar = _i === _textContent.length - 1;
+                if (!(_isLastNode && _isLastChar)) {
+                  _extraSpacing = nodeInfo.extraCharSpacing || 0;
                 }
               }
             }
-            var charWidth = baseCharWidth + extraSpacing;
-            positionInfo.horizontalOffset += charWidth;
-            var charMinPt = charEntity.location.clone();
-            var charMaxPt = charMinPt.clone().addvec(McGeVector3d.kXAxis.clone().mult(charWidth)).addvec(McGeVector3d.kYAxis.clone().negate().mult(textHeight));
+            var _charWidth = _baseCharWidth + _extraSpacing;
+            positionInfo.horizontalOffset += _charWidth;
+            var _charMinPt = _charEntity.location.clone();
+            var _charMaxPt = _charMinPt.clone().addvec(McGeVector3d.kXAxis.clone().mult(_charWidth)).addvec(McGeVector3d.kYAxis.clone().negate().mult(_textHeight));
             if (nodeInfo.node.color) {
-              var mcColor = getColor(nodeInfo.node);
-              if (mcColor) {
-                draw.trueColor = mcColor;
+              var _mcColor2 = getColor(nodeInfo.node);
+              if (_mcColor2) {
+                draw.trueColor = _mcColor2;
               }
             }
             if (nodeInfo.node.underline) {
-              var underline = drawLine$1(draw, new McGePoint3d(charMinPt.x, charMaxPt.y, charMinPt.z), new McGePoint3d(charMaxPt.x, charMaxPt.y, charMinPt.z), !mTextImp.isEditState ? transformsMatrix : void 0);
-              ents.push(underline);
+              var _underline2 = drawLine$1(draw, new McGePoint3d(_charMinPt.x, _charMaxPt.y, _charMinPt.z), new McGePoint3d(_charMaxPt.x, _charMaxPt.y, _charMinPt.z), !mTextImp.isEditState ? transformsMatrix : void 0);
+              ents.push(_underline2);
             }
             if (nodeInfo.node.strike) {
-              var strikeY = charMinPt.y - textHeight * 0.5;
-              var strike = drawLine$1(draw, new McGePoint3d(charMinPt.x, strikeY, charMinPt.z), new McGePoint3d(charMaxPt.x, strikeY, charMinPt.z), !mTextImp.isEditState ? transformsMatrix : void 0);
-              ents.push(strike);
+              var _strikeY2 = _charMinPt.y - _textHeight * 0.5;
+              var _strike2 = drawLine$1(draw, new McGePoint3d(_charMinPt.x, _strikeY2, _charMinPt.z), new McGePoint3d(_charMaxPt.x, _strikeY2, _charMinPt.z), !mTextImp.isEditState ? transformsMatrix : void 0);
+              ents.push(_strike2);
             }
             if (nodeInfo.node.overline) {
-              var overline = drawLine$1(draw, new McGePoint3d(charMinPt.x, charMinPt.y, charMinPt.z), new McGePoint3d(charMaxPt.x, charMinPt.y, charMinPt.z), !mTextImp.isEditState ? transformsMatrix : void 0);
-              ents.push(overline);
+              var _overline2 = drawLine$1(draw, new McGePoint3d(_charMinPt.x, _charMinPt.y, _charMinPt.z), new McGePoint3d(_charMaxPt.x, _charMinPt.y, _charMinPt.z), !mTextImp.isEditState ? transformsMatrix : void 0);
+              ents.push(_overline2);
             }
-            draw.drawEntity(charEntity);
-            ents.push(charEntity);
+            draw.drawEntity(_charEntity);
+            ents.push(_charEntity);
             draw.trueColor = ent.trueColor;
-            lineOffset += charWidth;
+            lineOffset += _charWidth;
           }
         } else {
           nodeSet.add(nodeInfo.node);
-          var _textContent = nodeInfo.node.text.substring(nodeInfo.startOffset, nodeInfo.endOffset);
+          var _textContent2 = nodeInfo.node.text.substring(nodeInfo.startOffset, nodeInfo.endOffset);
           if (!nodeMap.has(nodeInfo.node)) {
             positionInfo.verticalOffset -= line.height;
             nodeMap.set(nodeInfo.node, {
               positionInfo: positionInfo,
-              text: _textContent,
+              text: _textContent2,
               width: nodeInfo.width,
               lineHeight: line.height
             });
           } else {
             var info = nodeMap.get(nodeInfo.node);
             if (info) {
-              info.text += _textContent;
+              info.text += _textContent2;
               info.width += nodeInfo.width;
             }
           }
         }
       } else if (isElement(nodeInfo.node)) {
-        var _currentTextWidth2 = renderMText();
-        lineOffset += _currentTextWidth2;
+        var _currentTextWidth3 = renderMText();
+        lineOffset += _currentTextWidth3;
         if (!isOneCharacter) positionInfo.horizontalOffset = lineOffset;
         var element = MxCADMText.elementTextManager.get(nodeInfo.node.type);
         var _calculateData = getCalculateData(ent, nodeInfo.node);
@@ -25223,22 +25339,45 @@ var MxCADMTextImp = /*#__PURE__*/function (_PubSub) {
     _defineProperty(_assertThisInitialized$1(_this), "getActualRenderStartPosition", getActualRenderStartPosition);
     _defineProperty(_assertThisInitialized$1(_this), "getLinePosition", getLinePosition);
     _defineProperty(_assertThisInitialized$1(_this), "getTextHeight", getTextHeight);
+    _defineProperty(_assertThisInitialized$1(_this), "getColor", getColor);
     return _this;
   }
   _createClass$1(MxCADMTextImp, [{
     key: "isCustomTextOrElement",
     get: function get() {
+      var _this2 = this;
       if (!this.data || this.data.length === 0) {
         return false;
       }
       var isSome = function isSome(node) {
-        if (isText(node) && node.type && MxCADMText.elementTextManager.hasText(node.type)) {
-          return true;
-        }
-        if (isElement(node) && node.type !== "paragraph" && MxCADMText.elementTextManager.has(node.type)) {
-          return true;
+        if (isText(node)) {
+          if (node.type && MxCADMText.elementTextManager.hasText(node.type)) return true;
+          if ("tracking" in node && node.tracking !== 1) {
+            return true;
+          }
+          if ("textPosition" in node && (node.textPosition === "superscript" || node.textPosition === "subscript")) {
+            return true;
+          }
+          if ("underline" in node && node.underline) {
+            return true;
+          }
+          if ("strike" in node && node.strike) {
+            return true;
+          }
+          if ("overline" in node && node.overline) {
+            return true;
+          }
         }
         if (isElement(node)) {
+          var isParagraph = function isParagraph(node2) {
+            return node2.type === "paragraph";
+          };
+          if (isParagraph(node)) {
+            if (node.alignment === "distribute") return true;
+            if (typeof node.lineHeightRatio === "number" && node.lineHeightRatio !== _this2.lineHeightRatio) return true;
+          } else if (MxCADMText.elementTextManager.has(node.type)) {
+            return true;
+          }
           return node.children.some(isSome);
         }
         return false;
@@ -26265,16 +26404,16 @@ function convertCadPointToSlatePoint(point) {
                               } else {
                                 _nodeChars = info.endOffset - info.startOffset;
                               }
-                              var _isLastNode2 = index === line.nodes.length - 1;
-                              var _charsWithSpacing = _isLastNode2 ? Math.max(0, _nodeChars - 1) : _nodeChars;
+                              var isLastChar = index === line.nodes.length - 1 && info.endOffset === nodeInfo.endOffset;
+                              var _charsWithSpacing = isLastChar ? Math.max(0, _nodeChars - 1) : _nodeChars;
                               extraSpacingOffset += info.extraCharSpacing * _charsWithSpacing;
                             }
                           }
                           if (nodeInfo.extraCharSpacing) {
                             var _charsBeforeMid = mid - nodeInfo.startOffset;
-                            var _isLastNode3 = _i3 === line.nodes.length - 1;
+                            var _isLastNode2 = _i3 === line.nodes.length - 1;
                             var isLastPosition = mid === nodeInfo.endOffset;
-                            if (_isLastNode3 && isLastPosition) {
+                            if (_isLastNode2 && isLastPosition) {
                               if (_charsBeforeMid > 0) {
                                 extraSpacingOffset += nodeInfo.extraCharSpacing * (_charsBeforeMid - 1);
                               }
@@ -26290,11 +26429,15 @@ function convertCadPointToSlatePoint(point) {
                         if (nextChar) {
                           var nextCharWidth = getTextWidth(nextChar, nodeInfo.node, mTextImp.textBaseHeight, _this.textStyle, _this);
                           var extraCharSpacing = 0;
-                          if (isExtraSpacing && nodeInfo.extraCharSpacing && !(_i3 === line.nodes.length - 1 && mid === nodeInfo.endOffset - 1)) {
-                            extraCharSpacing = nodeInfo.extraCharSpacing;
+                          if (isExtraSpacing && nodeInfo.extraCharSpacing) {
+                            var _isLastChar = _i3 === line.nodes.length - 1 && mid === nodeInfo.endOffset - 1;
+                            if (!_isLastChar) {
+                              extraCharSpacing = nodeInfo.extraCharSpacing;
+                            }
                           }
                           var completeCharWidth = nextCharWidth + extraCharSpacing;
-                          var charCenter = adjustedMeasuredX + completeCharWidth / 2;
+                          var charStartX = adjustedMeasuredX;
+                          var charCenter = charStartX + completeCharWidth / 2;
                           if (x >= charCenter) {
                             var diff2 = Math.abs(charCenter - x);
                             if (diff2 < minDiff) {
@@ -26303,6 +26446,14 @@ function convertCadPointToSlatePoint(point) {
                             }
                             left = mid + 1;
                             continue;
+                          } else {
+                            var _diff = Math.abs(charCenter - x);
+                            if (_diff < minDiff) {
+                              minDiff = _diff;
+                              bestOffset = mid;
+                            }
+                            right = mid - 1;
+                            continue;
                           }
                         }
                       }