@hailin-zheng/editor-core 2.0.33 → 2.0.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/index.js CHANGED
@@ -11131,14 +11131,19 @@ class ElementUtil {
11131
11131
  static getContinueVMergeRenderRows(render, rowIndex, colIndex) {
11132
11132
  const rows = [];
11133
11133
  for (let i = rowIndex + 1; i < render.length; i++) {
11134
- const rowRender = render.getChild(i);
11135
- const rowEle = rowRender.element;
11136
- const ele = rowEle.getChild(colIndex);
11137
- const { vMerge } = ele.props;
11138
- if (vMerge !== 'continue') {
11139
- break;
11134
+ try {
11135
+ const rowRender = render.getChild(i);
11136
+ const rowEle = rowRender.element;
11137
+ const ele = rowEle.getChild(colIndex);
11138
+ const { vMerge } = ele.props;
11139
+ if (vMerge !== 'continue') {
11140
+ break;
11141
+ }
11142
+ rows.push(rowRender);
11143
+ }
11144
+ catch (e) {
11145
+ throw e;
11140
11146
  }
11141
- rows.push(rowRender);
11142
11147
  }
11143
11148
  return rows;
11144
11149
  }
@@ -27238,10 +27243,10 @@ class DocEditor {
27238
27243
  }
27239
27244
  getCursorRect() {
27240
27245
  try {
27241
- if (!this.documentEvent.startHitInfo) {
27246
+ const { startControl, startOffset } = this.selectionState;
27247
+ if (!this.documentEvent.startHitInfo || !startControl || (startControl && !startControl.parent)) {
27242
27248
  return { x: 0, y: 0, width: 0, height: 0 };
27243
27249
  }
27244
- const { startControl, startOffset } = this.selectionState;
27245
27250
  const { startRegion, hitDocIndex } = this.documentEvent.startHitInfo;
27246
27251
  const cursorPos = DocumentCursor.getElementCursorPos(startControl, startOffset, startRegion, hitDocIndex);
27247
27252
  return cursorPos.rect;
@@ -28272,7 +28277,7 @@ class DocEditor {
28272
28277
  rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
28273
28278
  }
28274
28279
  version() {
28275
- return "2.0.33";
28280
+ return "2.0.35";
28276
28281
  }
28277
28282
  }
28278
28283