devexpress-richedit 24.1.3 → 24.1.4-build-24183-0102

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.
Files changed (18) hide show
  1. package/bin/gulpfile.js +1 -1
  2. package/bin/index-custom.js +1 -1
  3. package/bin/localization-builder.js +1 -1
  4. package/bin/nspell-index.js +1 -1
  5. package/bin/nspell.webpack.config.js +1 -1
  6. package/bin/webpack-externals.js +1 -1
  7. package/bin/webpack.config.js +1 -1
  8. package/dist/dx.richedit.css +1 -1
  9. package/dist/dx.richedit.d.ts +1 -1
  10. package/dist/dx.richedit.js +19 -11
  11. package/dist/dx.richedit.min.js +2 -2
  12. package/index.d.ts +1 -1
  13. package/index.js +1 -1
  14. package/lib/common/layout-formatter/floating/position-calculators/base-calculator.d.ts +1 -0
  15. package/lib/common/layout-formatter/floating/position-calculators/base-calculator.js +1 -0
  16. package/lib/common/layout-formatter/floating/position-calculators/vertical.js +6 -4
  17. package/lib/common/model/fonts/loader.js +11 -6
  18. package/package.json +3 -3
package/index.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  /**
2
2
  * DevExpress WebRichEdit (index.d.ts)
3
- * Version: 24.1.3
3
+ * Version: 24.1.4
4
4
  * Copyright (c) 2012 - 2024 Developer Express Inc. ALL RIGHTS RESERVED
5
5
  * License: https://www.devexpress.com/Support/EULAs
6
6
  */
package/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  /**
2
2
  * DevExpress WebRichEdit (index.js)
3
- * Version: 24.1.3
3
+ * Version: 24.1.4
4
4
  * Copyright (c) 2012 - 2024 Developer Express Inc. ALL RIGHTS RESERVED
5
5
  * License: https://www.devexpress.com/Support/EULAs
6
6
  */
package/lib/common/layout-formatter/floating/position-calculators/base-calculator.d.ts CHANGED
@@ -7,6 +7,7 @@ export declare class AnchorObjectPositionCalculatorBase {
7
7
  protected obj: LayoutAnchoredObjectBox;
8
8
  protected lp: LayoutPosition;
9
9
  protected isRelativeCell: boolean;
10
+ protected isSimpleView: boolean;
10
11
  constructor(manager: FormatterManager);
11
12
  protected get anchorInfo(): AnchorInfo;
12
13
  protected init(obj: LayoutAnchoredObjectBox): void;
package/lib/common/layout-formatter/floating/position-calculators/base-calculator.js CHANGED
@@ -10,5 +10,6 @@ export class AnchorObjectPositionCalculatorBase {
10
10
  this.obj = obj;
11
11
  this.isRelativeCell = !!this.manager.activeFormatter.tableFormatter &&
12
12
  (obj.anchorInfo.layoutTableCell || this.manager.model.compatibilitySettings.layoutInTableCell);
13
+ this.isSimpleView = this.manager.innerClientProperties.viewsSettings.isSimpleView;
13
14
  }
14
15
  }
package/lib/common/layout-formatter/floating/position-calculators/vertical.js CHANGED
@@ -47,13 +47,15 @@ export class AnchorObjectVerticalPositionCalculator extends AnchorObjectPosition
47
47
  switch (this.anchorInfo.verticalPositionType) {
48
48
  case AnchorObjectVerticalPositionType.Page:
49
49
  return this.isRelativeCell ? this.relativeColumnPos() + this.lp.row.tableCellInfo.y + this.topCellMargin : 0;
50
- case AnchorObjectVerticalPositionType.Paragraph:
51
- return this.relativeColumnPos() + this.getRowWhatStartParagraphY();
52
50
  case AnchorObjectVerticalPositionType.Line:
53
51
  return this.relativeColumnPos() + this.lp.row.y;
54
52
  case AnchorObjectVerticalPositionType.Margin:
55
- return this.isRelativeCell ? this.relativeColumnPos() + this.lp.row.tableCellInfo.y + this.topCellMargin :
56
- this.manager.boundsCalculator.marginTop;
53
+ if (!this.isSimpleView) {
54
+ return this.isRelativeCell ? this.relativeColumnPos() + this.lp.row.tableCellInfo.y + this.topCellMargin :
55
+ this.manager.boundsCalculator.marginTop;
56
+ }
57
+ case AnchorObjectVerticalPositionType.Paragraph:
58
+ return this.relativeColumnPos() + this.getRowWhatStartParagraphY();
57
59
  case AnchorObjectVerticalPositionType.TopMargin:
58
60
  case AnchorObjectVerticalPositionType.InsideMargin:
59
61
  return this.isRelativeCell ? this.relativeColumnPos() + this.lp.row.tableCellInfo.y + this.topCellMargin : 0;
package/lib/common/model/fonts/loader.js CHANGED
@@ -45,15 +45,20 @@ export class ControlFontsLoader {
45
45
  };
46
46
  const xhr = new XMLHttpRequest();
47
47
  xhr.onload = (_e) => {
48
- const fontSource = xhr.response;
49
- if (xhr.status >= 400 || !fontSource) {
50
- if (fontInfo.next())
51
- this.makeRequest(fontInfo, afterLoading);
48
+ const contentType = xhr.getResponseHeader("Content-Type");
49
+ if (contentType != null && contentType.startsWith('font')) {
50
+ const fontSource = xhr.response;
51
+ if (xhr.status >= 400 || !fontSource) {
52
+ if (fontInfo.next())
53
+ this.makeRequest(fontInfo, afterLoading);
54
+ else
55
+ notLoaded();
56
+ }
52
57
  else
53
- notLoaded();
58
+ afterLoading(fontSource);
54
59
  }
55
60
  else
56
- afterLoading(fontSource);
61
+ notLoaded();
57
62
  };
58
63
  xhr.onerror = () => notLoaded();
59
64
  xhr.open("GET", fontInfo.currentPath, true);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "devexpress-richedit",
3
- "version": "24.1.3",
3
+ "version": "24.1.4-build-24183-0102",
4
4
  "homepage": "https://www.devexpress.com/",
5
5
  "bugs": "https://www.devexpress.com/support/",
6
6
  "author": "Developer Express Inc.",
@@ -14,8 +14,8 @@
14
14
  "build-nspell": "webpack --mode production --config=bin/nspell.webpack.config.js"
15
15
  },
16
16
  "peerDependencies": {
17
- "devextreme": "24.1.3",
18
- "devextreme-dist": "24.1.3"
17
+ "devextreme": "24.1.4-build-24181-1937",
18
+ "devextreme-dist": "24.1.4-build-24181-1937"
19
19
  },
20
20
  "dependencies": {
21
21
  "jszip": "~3.10.1",