devexpress-richedit 24.1.7-build-24274-0102 → 24.1.7-build-24281-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.
@@ -1,3 +1,4 @@
1
+ import { Section } from '../model/section/section';
1
2
  import { SectionPropertyDescriptor } from '../model/section/section-property-descriptor';
2
3
  import { InputPositionBase } from './input-position-base';
3
4
  import { SearchUtils } from '@devexpress/utils/lib/utils/search';
@@ -18,13 +19,23 @@ export class InputPosition extends InputPositionBase {
18
19
  }
19
20
  getMergedSectionPropertiesRaw() {
20
21
  if (!this.mergedSectionPropertiesRaw) {
21
- var interval = this.intervalsInfo.interval;
22
- var intervalStartPosition = interval.start;
23
- var intervalEndPosition = interval.end;
24
- var sections = this.model.sections;
25
- var sectionIndex = SearchUtils.normedInterpolationIndexOf(sections, (s) => s.startLogPosition.value, intervalStartPosition);
22
+ let sectionIndex;
23
+ let intervalEndPosition;
24
+ const sections = this.model.sections;
25
+ const pageIndex = this.selection.pageIndex;
26
+ if (pageIndex < 0) {
27
+ const interval = this.intervalsInfo.interval;
28
+ const intervalStartPosition = interval.start;
29
+ intervalEndPosition = interval.end;
30
+ sectionIndex = SearchUtils.normedInterpolationIndexOf(sections, (s) => s.startLogPosition.value, intervalStartPosition);
31
+ }
32
+ else {
33
+ const layoutPage = this.selection.layout.pages[pageIndex];
34
+ sectionIndex = Section.getPageSectionIndex(layoutPage, sections);
35
+ intervalEndPosition = layoutPage.getEndPosition();
36
+ }
26
37
  this.mergedSectionPropertiesRaw = sections[sectionIndex++].sectionProperties.clone();
27
- for (var section; (section = sections[sectionIndex]) && (section.startLogPosition.value < intervalEndPosition); sectionIndex++)
38
+ for (let section; (section = sections[sectionIndex]) && (section.startLogPosition.value < intervalEndPosition); sectionIndex++)
28
39
  InputPositionBase.mergePropertiesRaw(this.mergedSectionPropertiesRaw, section.sectionProperties, SectionPropertyDescriptor.ALL_FIELDS);
29
40
  }
30
41
  return this.mergedSectionPropertiesRaw;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "devexpress-richedit",
3
- "version": "24.1.7-build-24274-0102",
3
+ "version": "24.1.7-build-24281-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.7-build-24272-1937",
18
- "devextreme-dist": "24.1.7-build-24272-1937"
17
+ "devextreme": "24.1.7-build-24279-1936",
18
+ "devextreme-dist": "24.1.7-build-24279-1936"
19
19
  },
20
20
  "dependencies": {
21
21
  "jszip": "~3.10.1",