Skip to content

Commit d08063b

Browse files
author
pipeline
committed
v28.2.3 is released
1 parent caf1904 commit d08063b

File tree

472 files changed

+22321
-713
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

472 files changed

+22321
-713
lines changed

‎controls/barcodegenerator/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 28.1.41 (2025-01-21)
5+
## 28.2.3 (2025-01-29)
66

77
### Barcode
88

‎controls/buttons/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 28.1.41 (2025-01-21)
5+
## 28.2.3 (2025-01-29)
66

77
### Switch
88

‎controls/calendars/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 28.1.41 (2025-01-21)
5+
## 28.2.3 (2025-01-29)
66

77
### DatePicker
88

‎controls/charts/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## [Unreleased]
44

5+
## 28.2.3 (2025-01-29)
6+
7+
### Chart
8+
9+
#### Bug Fixes
10+
11+
- `#I679703` - The arguments in the `axisMultiLabelRender` event can now be modified correctly.
12+
513
## 28.1.41 (2025-01-21)
614

715
### Chart

‎controls/charts/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-charts",
3-
"version": "28.1.39",
3+
"version": "28.1.41",
44
"description": "Feature-rich chart control with built-in support for over 25 chart types, technical indictors, trendline, zooming, tooltip, selection, crosshair and trackball.",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

‎controls/charts/src/accumulation-chart/renderer/funnel-series.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import { AccPoints, AccumulationSeries } from '../model/acc-base';
66
import { Size, PathOption } from '@syncfusion/ej2-svg-base';
7-
import { ChartLocation, appendChildElement, removeElement } from '../../common/utils/helper';
7+
import { ChartLocation, ColorValue, appendChildElement, removeElement } from '../../common/utils/helper';
88
import { AccumulationChart } from '../accumulation';
99
import { TriangularBase } from './triangular-base';
1010

@@ -141,7 +141,6 @@ export class FunnelSeries extends TriangularBase {
141141
}
142142
}
143143

144-
145144
/**
146145
* To get the module name of the funnel series.
147146
*

‎controls/charts/src/chart/axis/multi-level-labels.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import { Chart } from '../chart';
55
import { Axis } from '../axis/axis';
66
import { FontModel } from '../../common/model/base-model';
7-
import { isNullOrUndefined } from '@syncfusion/ej2-base';
7+
import { extend, getValue, isNullOrUndefined } from '@syncfusion/ej2-base';
88
import { textWrap, appendClipElement, appendChildElement } from '../../common/utils/helper';
99
import { valueToCoefficient, textTrim, textElement, withInBounds } from '../../common/utils/helper';
1010
import { Size, measureText, TextOption, PathOption, Rect, SvgRenderer } from '@syncfusion/ej2-svg-base';
@@ -148,8 +148,9 @@ export class MultiLevelLabel {
148148
pathRect = '';
149149
start = typeof categoryLabel.start === 'string' ? Number(new Date(categoryLabel.start)) : categoryLabel.start;
150150
end = typeof categoryLabel.end === 'string' ? Number(new Date(categoryLabel.end)) : categoryLabel.end;
151+
const labelFontStyle: FontModel = <FontModel>(extend({}, getValue('properties', multiLevel.textStyle), null, true));
151152
argsData = this.triggerMultiLabelRender(
152-
axis, categoryLabel.text, axis.multiLevelLabels[level as number].textStyle,
153+
axis, categoryLabel.text, labelFontStyle,
153154
axis.multiLevelLabels[level as number].alignment, categoryLabel.customAttributes);
154155
if (!argsData.cancel) {
155156
startX = valueToCoefficient(<number>start, axis) * axisRect.width;
@@ -385,8 +386,9 @@ export class MultiLevelLabel {
385386
startY = valueToCoefficient(<number>(start), axis) * (rect.height);
386387
endY = valueToCoefficient(<number>(end), axis) * (rect.height);
387388
endY = isInversed ? [startY, startY = endY][0] : endY;
389+
const labelFontStyle: FontModel = <FontModel>(extend({}, getValue('properties', multiLevel.textStyle), null, true));
388390
argsData = this.triggerMultiLabelRender(
389-
axis, categoryLabel.text, multiLevel.textStyle, multiLevel.alignment, categoryLabel.customAttributes);
391+
axis, categoryLabel.text, labelFontStyle, multiLevel.alignment, categoryLabel.customAttributes);
390392
if (!argsData.cancel) {
391393
const maximumWidth: number = ((categoryLabel.maximumTextWidth === null ?
392394
(this.yAxisMultiLabelHeight[level as number] / 2) : categoryLabel.maximumTextWidth / 2));

‎controls/data/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 28.1.41 (2025-01-21)
5+
## 28.2.3 (2025-01-29)
66

77
### DataManager
88

‎controls/diagrams/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 28.1.41 (2025-01-21)
5+
## 28.2.3 (2025-01-29)
66

77
### Diagram
88

‎controls/documenteditor/spec/implementation/editor_4.spec.ts

+50
Original file line numberDiff line numberDiff line change
@@ -903,3 +903,53 @@ describe('Select and delete multiple paragraph', () => {
903903
expect(((editor.documentHelper.pages[0].bodyWidgets[0].childWidgets[0] as ParagraphWidget).childWidgets[0] as LineWidget).children[3] instanceof BookmarkElementBox).toBe(true);
904904
});
905905
});
906+
907+
describe('Insert text after and before the block content control', () => {
908+
let editor: DocumentEditor;
909+
beforeAll((): void => {
910+
let ele: HTMLElement = createElement('div', { id: 'container' });
911+
document.body.appendChild(ele);
912+
editor = new DocumentEditor({ enableEditor: true, isReadOnly: false });
913+
DocumentEditor.Inject(Editor, Selection, EditorHistory); editor.enableEditorHistory = true;
914+
(editor.documentHelper as any).containerCanvasIn = TestHelper.containerCanvas;
915+
(editor.documentHelper as any).selectionCanvasIn = TestHelper.selectionCanvas;
916+
(editor.documentHelper.render as any).pageCanvasIn = TestHelper.pageCanvas;
917+
(editor.documentHelper.render as any).selectionCanvasIn = TestHelper.pageSelectionCanvas;
918+
editor.appendTo('#container');
919+
});
920+
afterAll((done): void => {
921+
editor.destroy();
922+
document.body.removeChild(document.getElementById('container'));
923+
editor = undefined;
924+
setTimeout(function () {
925+
document.body.innerHTML = '';
926+
done();
927+
}, 1000);
928+
});
929+
it('Insert text before the block content control', () => {
930+
console.log('Insert text before the block content control');
931+
editor.editor.insertText('Text before the content control1');
932+
editor.editor.onEnter();
933+
editor.editor.insertText('Text before the content control2');
934+
editor.selectionModule.selectAll();
935+
editor.editor.insertContentControl('RichText');
936+
editor.selectionModule.select('0;0;0', '0;0;0');
937+
editor.editor.insertText('Syncfusion');
938+
expect(editor.documentHelper.pages[0].bodyWidgets[0].childWidgets.length).toBe(3);
939+
editor.editorHistoryModule.undo();
940+
expect(editor.documentHelper.pages[0].bodyWidgets[0].childWidgets.length).toBe(2);
941+
editor.editorHistoryModule.redo();
942+
expect(editor.documentHelper.pages[0].bodyWidgets[0].childWidgets.length).toBe(3);
943+
editor.editorHistoryModule.undo();
944+
});
945+
it('Insert text after the block content control', () => {
946+
console.log('Insert text after the block content control');
947+
editor.selectionModule.select('0;1;33', '0;1;33');
948+
editor.editor.insertText('Syncfusion');
949+
expect(editor.documentHelper.pages[0].bodyWidgets[0].childWidgets.length).toBe(3);
950+
editor.editorHistoryModule.undo();
951+
expect(editor.documentHelper.pages[0].bodyWidgets[0].childWidgets.length).toBe(2);
952+
editor.editorHistoryModule.redo();
953+
expect(editor.documentHelper.pages[0].bodyWidgets[0].childWidgets.length).toBe(3);
954+
});
955+
});

‎controls/documenteditor/src/document-editor/implementation/editor-history/history-info.ts

+6
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ export class HistoryInfo extends BaseHistoryInfo {
4646
const action: Action = this.action;
4747
let operations: Operation[] = [];
4848
switch (action) {
49+
case 'Insert':
50+
for (let i: number = 0; i < this.modifiedActions.length; i++) {
51+
const currentHistory: BaseHistoryInfo = this.modifiedActions[parseInt(i.toString(), 10)];
52+
operations.push(currentHistory.getInsertOperation(currentHistory.action));
53+
}
54+
break;
4955
case 'InsertContentControl':
5056
for (let i: number = 0; i < this.modifiedActions.length; i++) {
5157
const currentHistory: BaseHistoryInfo = this.modifiedActions[parseInt(i.toString(), 10)];

‎controls/documenteditor/src/document-editor/implementation/editor/editor.ts

+37-12
Original file line numberDiff line numberDiff line change
@@ -3590,6 +3590,27 @@ export class Editor {
35903590
if (this.documentHelper.isBookmarkInserted && selection.bookmarks.length > 0) {
35913591
this.extendSelectionToBookmarkStart();
35923592
}
3593+
let initComplexHistory: boolean = false;
3594+
if (selection.isEmpty) {
3595+
const isAtParagraphStart = selection.start.isAtParagraphStart;
3596+
const isAtParagraphEnd = selection.end.isAtParagraphEnd;
3597+
if (isAtParagraphStart || isAtParagraphEnd) {
3598+
const inlineObj: ElementInfo = selection.start.currentWidget.getInline(selection.start.offset, 0);
3599+
const element: ElementBox = inlineObj.element;
3600+
if (element && element instanceof ContentControl && element.contentControlWidgetType === 'Block' && element.reference &&
3601+
element.paragraph !== element.reference.paragraph) {
3602+
this.initComplexHistory('Insert');
3603+
initComplexHistory = true;
3604+
this.onEnter();
3605+
if (isAtParagraphStart) {
3606+
const previousParagraph: Widget = element.paragraph.previousWidget;
3607+
if (previousParagraph instanceof ParagraphWidget && previousParagraph.isEmpty()) {
3608+
selection.moveToPreviousParagraph();
3609+
}
3610+
}
3611+
}
3612+
}
3613+
}
35933614
if (isNullOrUndefined(revisionType) || revisionType === 'Insertion') {
35943615
this.initHistory('Insert');
35953616
if (!isNullOrUndefined(this.editorHistory) && !isNullOrUndefined(this.editorHistory.currentBaseHistoryInfo)) {
@@ -3863,6 +3884,9 @@ export class Editor {
38633884
if ((isNullOrUndefined(revisionType) || revisionType === 'Insertion') && !this.isFieldOperation) {
38643885
this.reLayout(selection);
38653886
}
3887+
if (initComplexHistory && this.editorHistory) {
3888+
this.editorHistory.updateComplexHistory();
3889+
}
38663890
this.documentHelper.isTextInput = false;
38673891
}
38683892
this.updateXmlMappedContentControl();
@@ -11550,10 +11574,8 @@ export class Editor {
1155011574
private applyCharFormat(paragraph: ParagraphWidget, selection: Selection, start: TextPosition, end: TextPosition, property: string, value: Object, update: boolean): BlockWidget {
1155111575
let previousSplittedWidget: ParagraphWidget = paragraph.previousSplitWidget as ParagraphWidget;
1155211576
let isPageBreak: boolean = false;
11553-
if (!isNullOrUndefined(previousSplittedWidget) && previousSplittedWidget instanceof ParagraphWidget) {
11554-
if (previousSplittedWidget.isEndsWithPageBreak) {
11555-
isPageBreak = true;
11556-
}
11577+
if (!isNullOrUndefined(previousSplittedWidget) && previousSplittedWidget instanceof ParagraphWidget && previousSplittedWidget.isEndsWithPageBreak) {
11578+
isPageBreak = true;
1155711579
}
1155811580
paragraph = paragraph.combineWidget(this.owner.viewer) as ParagraphWidget;
1155911581
let startOffset: number = 0;
@@ -20608,14 +20630,14 @@ export class Editor {
2060820630
let context = draw.getContext('2d');
2060920631
context.scale(displayPixelRatio, displayPixelRatio);
2061020632
context.drawImage(drawImage, 0, 0, width, height);
20611-
imageElementBox.imageString = draw.toDataURL('image/png', 1);
2061220633
if (this.owner.enableCollaborativeEditing) {
2061320634
this.documentHelper.addBase64StringInCollection(imageElementBox);
2061420635
imageElementBox.element.src = this.documentHelper.getImageString(imageElementBox);
2061520636
this.insertPictureInternal(imageElementBox, isUiInteracted, this.isRemoteAction);
2061620637
this.isImageInsert = false;
2061720638
this.isRemoteAction = false;
2061820639
}
20640+
this.viewer.documentHelper.images.get(parseInt(imageElementBox.imageString))[1] = draw.toDataURL('image/png', 1);
2061920641
};
2062020642
drawImage.src = base64String;
2062120643
if (this.isRemoteAction) {
@@ -20900,13 +20922,16 @@ export class Editor {
2090020922
* @returns {void}
2090120923
*/
2090220924
public updateListItemsTillEnd(blockAdv: BlockWidget, updateNextBlockList: boolean): void {
20903-
let block: BlockWidget = updateNextBlockList ? this.documentHelper.selection.getNextRenderedBlock(blockAdv) : blockAdv;
20904-
while (!isNullOrUndefined(block) && !this.documentHelper.isTextInput) {
20905-
//Updates the list value of the rendered paragraph.
20906-
this.updateRenderedListItems(block);
20907-
block = block.getSplitWidgets().pop().nextRenderedWidget as BlockWidget;
20908-
}
20909-
20925+
let splittedWidget: BlockWidget[] = blockAdv.getSplitWidgets() as BlockWidget[];
20926+
let nextBlock: BlockWidget = splittedWidget[splittedWidget.length - 1].nextRenderedWidget as BlockWidget;
20927+
if (!isNullOrUndefined(nextBlock)) {
20928+
let block: BlockWidget = updateNextBlockList ? this.documentHelper.selection.getNextRenderedBlock(blockAdv) : blockAdv;
20929+
while (!isNullOrUndefined(block) && !this.documentHelper.isTextInput) {
20930+
//Updates the list value of the rendered paragraph.
20931+
this.updateRenderedListItems(block);
20932+
block = block.getSplitWidgets().pop().nextRenderedWidget as BlockWidget;
20933+
}
20934+
}
2091020935
}
2091120936
/**
2091220937
* @param block

‎controls/documenteditor/src/document-editor/implementation/editor/table-resizer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ export class TableResizer {
683683
this.owner.editorModule.isSkipOperationsBuild = false;
684684
if (dragValue) {
685685
this.startingPoint.x += HelperMethods.convertPointToPixel(dragValue);
686-
this.resizerPosition = this.getCellReSizerPosition(this.startingPoint);
686+
// this.resizerPosition = this.getCellReSizerPosition(this.startingPoint);
687687
}
688688
}
689689
private getColumnCells(table: TableWidget, columnIndex: number, isLeftSideCollection: boolean): TableCellWidget[] {

‎controls/documenteditor/src/document-editor/implementation/search/text-search.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export class TextSearch {
130130
&& (inlineElement.textFrame as TextFrame).childWidgets.length > 0) {
131131
this.findInlineText(inlineElement.textFrame, pattern, findOption, isFirstMatch, results, selectionEnd);
132132
}
133-
if (!(inlineElement instanceof TextElementBox)) {
133+
if (!(inlineElement instanceof TextElementBox) && !(inlineElement instanceof ListTextElementBox)) {
134134
previousElementCount += inlineElement.length;
135135
}
136136
if (!isNullOrUndefined(inlineElement) && isNullOrUndefined(inlineElement.nextNode)) {

‎controls/documenteditor/src/document-editor/implementation/selection/selection.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -3959,16 +3959,17 @@ export class Selection {
39593959
* @private
39603960
* @returns {boolean}
39613961
*/
3962-
public isParagraphMarkSelected (): boolean {
3963-
let line: LineWidget = this.end.currentWidget;
3962+
public isParagraphMarkSelected(): boolean {
3963+
let end: TextPosition = this.isForward ? this.end : this.start;
3964+
let line: LineWidget = end.currentWidget;
39643965
let paraElement: ParagraphWidget;
3965-
if(line instanceof LineWidget){
3966+
if (line instanceof LineWidget) {
39663967
paraElement = line.paragraph;
39673968
}
39683969
let paraLength: number = this.getParagraphLength(paraElement);
3969-
let endIndices: any = this.endOffset.split(';');
3970+
let endIndices: any = this.getHierarchicalIndexByPosition(end).split(';');
39703971
let endIndex: number = parseInt(endIndices[endIndices.length - 1]);
3971-
if(endIndex > paraLength){
3972+
if (endIndex > paraLength) {
39723973
return true;
39733974
}
39743975
return false;

‎controls/documenteditor/src/document-editor/implementation/viewer/layout.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -2176,6 +2176,7 @@ export class Layout {
21762176
&& (element.reference.paragraph.lastChild as LineWidget).children[(element.reference.paragraph.lastChild as LineWidget).children.length - 1] !== element.reference) {
21772177
element.contentControlWidgetType = 'Inline';
21782178
element.reference.contentControlWidgetType = 'Inline';
2179+
element.contentControlProperties.contentControlWidgetType = 'Inline';
21792180
let block: BlockWidget = element.paragraph;
21802181
if (block === element.reference.paragraph && element.reference.paragraph.contentControlProperties) {
21812182
element.reference.paragraph.contentControlProperties = undefined;
@@ -6415,7 +6416,7 @@ export class Layout {
64156416
// Calculates tabwidth based on pageleftmargin and defaulttabwidth property
64166417
let defaultTabWidth: number = HelperMethods.convertPointToPixel(this.documentHelper.defaultTabWidth);
64176418
if (tabs.length === 0 && (position > 0 && defaultTabWidth > Math.round(position) && isList ||
6418-
defaultTabWidth === this.defaultTabWidthPixel && defaultTabWidth > Math.round(position))) {
6419+
defaultTabWidth === this.defaultTabWidthPixel && defaultTabWidth > Math.round(position) && position > 0)) {
64196420
return defaultTabWidth - position;
64206421
} else {
64216422
let breaked: boolean = false;
@@ -6448,6 +6449,9 @@ export class Layout {
64486449
}
64496450
if (!isCustomTab) {
64506451
let diff: number = parseFloat(((position * 100) % (defaultTabWidth * 100) / 100).toFixed(2));
6452+
if (diff < 0 && isList) {
6453+
diff += defaultTabWidth;
6454+
}
64516455
let cnt: number = (position - diff) / defaultTabWidth;
64526456
fPosition = (cnt + 1) * defaultTabWidth;
64536457
}
@@ -7335,7 +7339,7 @@ export class Layout {
73357339
let cellWidget: TableCellWidget = tableRowWidget.childWidgets[i] as TableCellWidget;
73367340
if (i === 0 && cellWidget.childWidgets.length > 0 && cellWidget.columnIndex === 0
73377341
&& cellWidget.cellFormat.rowSpan === 1 && this.documentHelper.compatibilityMode === 'Word2013'
7338-
&& !this.isVerticalMergedCellContinue(tableRowWidget) && this.documentHelper.splittedCellWidgets.length === 0) {
7342+
&& this.documentHelper.splittedCellWidgets.length === 0) {
73397343
const firstBlock: ParagraphWidget = this.documentHelper.getFirstParagraphInCell(cellWidget as TableCellWidget);
73407344
if (!isNullOrUndefined(firstBlock) && firstBlock.paragraphFormat.keepWithNext && !isNullOrUndefined(this.getPreviousBlock(tableRowWidget))) {
73417345
return tableRowWidget;

0 commit comments

Comments
 (0)