devexpress-richedit 24.1.12 → 24.1.13-build-25142-0103

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 (56) 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 +858 -803
  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/client/formats/docx/export/exporters/base/sections.d.ts +0 -1
  15. package/lib/client/formats/docx/export/exporters/base/sections.js +2 -10
  16. package/lib/client/model-api/formats/exporter.js +1 -1
  17. package/lib/client/model-api/sub-document.js +1 -1
  18. package/lib/client/utils/focus-helper.js +22 -5
  19. package/lib/common/commands/layout/apply-style-command.d.ts +2 -2
  20. package/lib/common/commands/layout/apply-style-command.js +3 -4
  21. package/lib/common/commands/toc/set-paragraph-level-command.js +1 -1
  22. package/lib/common/formats/rtf/export/exporter.d.ts +2 -3
  23. package/lib/common/formats/rtf/export/exporter.js +3 -3
  24. package/lib/common/formats/rtf/export/exporters/rtf-content-exporter.d.ts +4 -2
  25. package/lib/common/formats/rtf/export/exporters/rtf-content-exporter.js +13 -9
  26. package/lib/common/formats/rtf/export/exporters/table/rtf-table-exporter.d.ts +3 -2
  27. package/lib/common/formats/rtf/export/exporters/table/rtf-table-exporter.js +4 -4
  28. package/lib/common/formats/rtf/export/exporters/table/states/rtf-nested-table-exporter-state.d.ts +2 -1
  29. package/lib/common/formats/rtf/export/exporters/table/states/rtf-nested-table-exporter-state.js +2 -2
  30. package/lib/common/formats/rtf/export/exporters/table/states/rtf-table-exporter-state-base.d.ts +4 -2
  31. package/lib/common/formats/rtf/export/exporters/table/states/rtf-table-exporter-state-base.js +16 -9
  32. package/lib/common/formats/rtf/export/exporters/table/states/rtf-table-exporter-state.d.ts +2 -1
  33. package/lib/common/formats/rtf/export/exporters/table/states/rtf-table-exporter-state.js +2 -2
  34. package/lib/common/formats/rtf/importer-in-subdocument.d.ts +1 -2
  35. package/lib/common/formats/rtf/importer-in-subdocument.js +4 -3
  36. package/lib/common/layout/main-structures/layout-row.js +1 -2
  37. package/lib/common/layout-formatter/row/size-engine/row-formatting-info.d.ts +4 -1
  38. package/lib/common/layout-formatter/row/size-engine/row-formatting-info.js +36 -2
  39. package/lib/common/layout-formatter/row/tab-info.js +5 -4
  40. package/lib/common/layout-formatter/table/info/table-info.d.ts +0 -1
  41. package/lib/common/layout-formatter/table/info/table-info.js +2 -18
  42. package/lib/common/layout-formatter/table/size-compressor.js +9 -2
  43. package/lib/common/layout-formatter/table/table-alignment-applier.js +0 -2
  44. package/lib/common/model/borders/border-info.js +1 -1
  45. package/lib/common/model/character/character-properties.d.ts +1 -1
  46. package/lib/common/model/character/character-properties.js +14 -2
  47. package/lib/common/model/history/items/character-properties-history-items.d.ts +2 -1
  48. package/lib/common/model/history/items/character-properties-history-items.js +3 -2
  49. package/lib/common/model/manipulators/character-properties-manipulator.js +2 -2
  50. package/lib/common/model/manipulators/i-properties-manipulator.d.ts +1 -1
  51. package/lib/common/model/paragraph/paragraph-style.d.ts +2 -1
  52. package/lib/common/model/paragraph/paragraph-style.js +5 -3
  53. package/lib/common/model/tables/secondary-structures/table-base-structures.d.ts +2 -1
  54. package/lib/common/model/tables/secondary-structures/table-base-structures.js +1 -0
  55. package/lib/common/ui/ruler/controls/ruler.js +3 -7
  56. package/package.json +3 -3
@@ -1,6 +1,6 @@
1
1
  /**
2
2
  * DevExpress WebRichEdit (dx.richedit.js)
3
- * Version: 24.1.12
3
+ * Version: 24.1.13
4
4
  * Copyright (c) 2012 - 2025 Developer Express Inc. ALL RIGHTS RESERVED
5
5
  * License: https://www.devexpress.com/Support/EULAs
6
6
  */
@@ -9438,6 +9438,219 @@ class ShadingInfo {
9438
9438
  }
9439
9439
  }
9440
9440
 
9441
+ // EXTERNAL MODULE: ./node_modules/@devexpress/utils/lib/utils/comparers.js
9442
+ var comparers = __webpack_require__(4170);
9443
+ ;// CONCATENATED MODULE: ./src/common/model/history/base/history-item.ts
9444
+
9445
+ class history_item_HistoryItem {
9446
+ constructor(modelManipulator) {
9447
+ this.uniqueId = -1;
9448
+ this.modelManipulator = modelManipulator;
9449
+ }
9450
+ canBeMerged() {
9451
+ return false;
9452
+ }
9453
+ changeModified() {
9454
+ return true;
9455
+ }
9456
+ }
9457
+ class CompositionHistoryItem extends history_item_HistoryItem {
9458
+ constructor() {
9459
+ super(null);
9460
+ this.historyItems = [];
9461
+ }
9462
+ canBeMerged() {
9463
+ return true;
9464
+ }
9465
+ changeModified() {
9466
+ var item;
9467
+ for (var i = 0; item = this.historyItems[i]; i++) {
9468
+ if (item.changeModified())
9469
+ return true;
9470
+ }
9471
+ return false;
9472
+ }
9473
+ redo() {
9474
+ var item;
9475
+ for (var i = 0; item = this.historyItems[i]; i++)
9476
+ item.redo();
9477
+ }
9478
+ undo() {
9479
+ var item;
9480
+ for (var i = this.historyItems.length - 1; item = this.historyItems[i]; i--)
9481
+ item.undo();
9482
+ }
9483
+ add(historyItem) {
9484
+ if (historyItem == null)
9485
+ throw new Error(errors/* Errors */.D.ValueCannotBeNull);
9486
+ this.historyItems.push(historyItem);
9487
+ }
9488
+ }
9489
+
9490
+ ;// CONCATENATED MODULE: ./src/common/model/history/base/interval-based-history-item.ts
9491
+
9492
+ class interval_based_history_item_IntervalBasedHistoryItem extends history_item_HistoryItem {
9493
+ constructor(modelManipulator, subDocInterval) {
9494
+ super(modelManipulator);
9495
+ this.subDocInterval = subDocInterval;
9496
+ }
9497
+ get boundSubDocument() { return this.subDocInterval.subDocument; }
9498
+ get interval() { return this.subDocInterval.interval; }
9499
+ }
9500
+
9501
+ ;// CONCATENATED MODULE: ./src/common/model/history/items/character-properties-history-items.ts
9502
+
9503
+
9504
+ class FontUseValueHistoryItem extends interval_based_history_item_IntervalBasedHistoryItem {
9505
+ constructor(modelManipulator, subDocInterval, newValue, keepCustomFormatting = false) {
9506
+ super(modelManipulator, subDocInterval);
9507
+ this.newValue = newValue;
9508
+ this.keepCustomFormatting = keepCustomFormatting;
9509
+ }
9510
+ redo() {
9511
+ this.oldState = this.modelManipulator.characterProperties.useValue.setValue(this.boundSubDocument, this.interval, this.newValue, this.keepCustomFormatting);
9512
+ }
9513
+ undo() {
9514
+ this.modelManipulator.characterProperties.useValue.restoreValue(this.boundSubDocument, this.oldState);
9515
+ }
9516
+ }
9517
+ class CharacterPropertiesHistoryItem extends interval_based_history_item_IntervalBasedHistoryItem {
9518
+ constructor(modelManipulator, subDocInterval, newValue) {
9519
+ super(modelManipulator, subDocInterval);
9520
+ this.newValue = newValue;
9521
+ }
9522
+ redo() {
9523
+ this.oldState = this.modelManipulator.characterProperties.setValue(this.boundSubDocument, this.interval, this.newValue);
9524
+ }
9525
+ undo() {
9526
+ this.modelManipulator.characterProperties.restoreValue(this.boundSubDocument, this.oldState);
9527
+ }
9528
+ }
9529
+ class CharacterPropertiesHistoryItemBase extends interval_based_history_item_IntervalBasedHistoryItem {
9530
+ constructor(modelManipulator, subDocInterval, newValue, newUse) {
9531
+ super(modelManipulator, subDocInterval);
9532
+ this.newValue = newValue;
9533
+ this.newUse = newUse;
9534
+ }
9535
+ redo() {
9536
+ this.oldState = this.getPropertiesManipulator().setValue(this.boundSubDocument, this.interval, this.newValue, this.newUse);
9537
+ }
9538
+ undo() {
9539
+ this.getPropertiesManipulator().restoreValue(this.boundSubDocument, this.oldState);
9540
+ }
9541
+ getPropertiesManipulator() {
9542
+ throw new Error(errors/* Errors */.D.NotImplemented);
9543
+ }
9544
+ }
9545
+ class FontBoldHistoryItem extends CharacterPropertiesHistoryItemBase {
9546
+ getPropertiesManipulator() {
9547
+ return this.modelManipulator.characterProperties.fontBold;
9548
+ }
9549
+ }
9550
+ class FontCapsHistoryItem extends CharacterPropertiesHistoryItemBase {
9551
+ getPropertiesManipulator() {
9552
+ return this.modelManipulator.characterProperties.fontCaps;
9553
+ }
9554
+ }
9555
+ class FontSmallCapsHistoryItem extends CharacterPropertiesHistoryItemBase {
9556
+ getPropertiesManipulator() {
9557
+ return this.modelManipulator.characterProperties.fontSmallCaps;
9558
+ }
9559
+ }
9560
+ class FontUnderlineTypeHistoryItem extends CharacterPropertiesHistoryItemBase {
9561
+ getPropertiesManipulator() {
9562
+ return this.modelManipulator.characterProperties.fontUnderlineType;
9563
+ }
9564
+ }
9565
+ class FontTextColorHistoryItem extends CharacterPropertiesHistoryItemBase {
9566
+ getPropertiesManipulator() {
9567
+ return this.modelManipulator.characterProperties.textColor;
9568
+ }
9569
+ }
9570
+ class FontShadingInfoHistoryItem extends CharacterPropertiesHistoryItemBase {
9571
+ getPropertiesManipulator() {
9572
+ return this.modelManipulator.characterProperties.shadingInfo;
9573
+ }
9574
+ }
9575
+ class FontHiddenHistoryItem extends CharacterPropertiesHistoryItemBase {
9576
+ getPropertiesManipulator() {
9577
+ return this.modelManipulator.characterProperties.fontHidden;
9578
+ }
9579
+ }
9580
+ class FontItalicHistoryItem extends CharacterPropertiesHistoryItemBase {
9581
+ getPropertiesManipulator() {
9582
+ return this.modelManipulator.characterProperties.fontItalic;
9583
+ }
9584
+ }
9585
+ class FontNameHistoryItem extends CharacterPropertiesHistoryItemBase {
9586
+ getPropertiesManipulator() {
9587
+ return this.modelManipulator.characterProperties.fontName;
9588
+ }
9589
+ }
9590
+ class FontScriptHistoryItem extends CharacterPropertiesHistoryItemBase {
9591
+ getPropertiesManipulator() {
9592
+ return this.modelManipulator.characterProperties.script;
9593
+ }
9594
+ }
9595
+ class FontSizeHistoryItem extends CharacterPropertiesHistoryItemBase {
9596
+ getPropertiesManipulator() {
9597
+ return this.modelManipulator.characterProperties.fontSize;
9598
+ }
9599
+ }
9600
+ class FontStrikeoutTypeHistoryItem extends CharacterPropertiesHistoryItemBase {
9601
+ getPropertiesManipulator() {
9602
+ return this.modelManipulator.characterProperties.fontStrikeoutType;
9603
+ }
9604
+ }
9605
+ class FontStrikeoutWordsOnlyHistoryItem extends CharacterPropertiesHistoryItemBase {
9606
+ getPropertiesManipulator() {
9607
+ return this.modelManipulator.characterProperties.fontStrikeoutWordsOnly;
9608
+ }
9609
+ }
9610
+ class FontStrikeoutColorHistoryItem extends CharacterPropertiesHistoryItemBase {
9611
+ getPropertiesManipulator() {
9612
+ return this.modelManipulator.characterProperties.fontStrikeoutColor;
9613
+ }
9614
+ }
9615
+ class FontUnderlineColorHistoryItem extends CharacterPropertiesHistoryItemBase {
9616
+ getPropertiesManipulator() {
9617
+ return this.modelManipulator.characterProperties.fontUnderlineColor;
9618
+ }
9619
+ }
9620
+ class FontHighlightColorHistoryItem extends CharacterPropertiesHistoryItemBase {
9621
+ getPropertiesManipulator() {
9622
+ return this.modelManipulator.characterProperties.fontHighlightColor;
9623
+ }
9624
+ }
9625
+ class FontUnderlineWordsOnlyHistoryItem extends CharacterPropertiesHistoryItemBase {
9626
+ getPropertiesManipulator() {
9627
+ return this.modelManipulator.characterProperties.fontUnderlineWordsOnly;
9628
+ }
9629
+ }
9630
+ class FontNoProofHistoryItem extends CharacterPropertiesHistoryItemBase {
9631
+ getPropertiesManipulator() {
9632
+ return this.modelManipulator.characterProperties.fontNoProof;
9633
+ }
9634
+ }
9635
+ class FontLangInfoHistoryItem extends CharacterPropertiesHistoryItemBase {
9636
+ getPropertiesManipulator() {
9637
+ return this.modelManipulator.characterProperties.langInfo;
9638
+ }
9639
+ }
9640
+ class FontCompositeFontInfoHistoryItem extends CharacterPropertiesHistoryItemBase {
9641
+ getPropertiesManipulator() {
9642
+ return this.modelManipulator.characterProperties.compositeFontInfo;
9643
+ }
9644
+ }
9645
+ class ResetCharacterPropertiesUseValuesHistoryItem extends (/* unused pure expression or super */ null && (IntervalBasedHistoryItem)) {
9646
+ redo() {
9647
+ this.state = this.modelManipulator.characterProperties.useValue.setValue(this.boundSubDocument, this.interval, 0);
9648
+ }
9649
+ undo() {
9650
+ this.modelManipulator.characterProperties.useValue.restoreValue(this.boundSubDocument, this.state);
9651
+ }
9652
+ }
9653
+
9441
9654
  ;// CONCATENATED MODULE: ./src/common/model/character/enums.ts
9442
9655
  var CharacterPropertiesMask;
9443
9656
  (function (CharacterPropertiesMask) {
@@ -9595,6 +9808,498 @@ class LangInfo {
9595
9808
  }
9596
9809
  }
9597
9810
 
9811
+ ;// CONCATENATED MODULE: ./src/common/model/character/character-property-descriptor.ts
9812
+
9813
+
9814
+
9815
+
9816
+
9817
+
9818
+
9819
+
9820
+ class CharacterPropertiesAllCapsDescriptor {
9821
+ constructor() {
9822
+ this.binaryEquals = comparers.Equals.simpleType;
9823
+ this.defaultValue = false;
9824
+ }
9825
+ setProp(props, newValue) {
9826
+ props.allCaps = newValue;
9827
+ }
9828
+ getProp(props) {
9829
+ return props.allCaps;
9830
+ }
9831
+ maskValue() {
9832
+ return CharacterPropertiesMask.UseAllCaps;
9833
+ }
9834
+ getHistoryItemConstructor() {
9835
+ return FontCapsHistoryItem;
9836
+ }
9837
+ getJSONProperty() {
9838
+ return JSONCharacterFormattingProperty.AllCaps;
9839
+ }
9840
+ }
9841
+ class CharacterPropertiesSmallCapsDescriptor {
9842
+ constructor() {
9843
+ this.binaryEquals = comparers.Equals.simpleType;
9844
+ this.defaultValue = false;
9845
+ }
9846
+ setProp(props, newValue) {
9847
+ props.smallCaps = newValue;
9848
+ }
9849
+ getProp(props) {
9850
+ return props.smallCaps;
9851
+ }
9852
+ maskValue() {
9853
+ return CharacterPropertiesMask.UseSmallCaps;
9854
+ }
9855
+ getHistoryItemConstructor() {
9856
+ return FontSmallCapsHistoryItem;
9857
+ }
9858
+ getJSONProperty() {
9859
+ return JSONCharacterFormattingProperty.SmallCaps;
9860
+ }
9861
+ }
9862
+ class CharacterPropertiesFontSizeDescriptor {
9863
+ constructor() {
9864
+ this.binaryEquals = comparers.Equals.simpleType;
9865
+ this.defaultValue = 11;
9866
+ }
9867
+ setProp(props, newValue) {
9868
+ props.fontSize = newValue;
9869
+ }
9870
+ getProp(props) {
9871
+ return props.fontSize;
9872
+ }
9873
+ maskValue() {
9874
+ return CharacterPropertiesMask.UseDoubleFontSize;
9875
+ }
9876
+ getHistoryItemConstructor() {
9877
+ return FontSizeHistoryItem;
9878
+ }
9879
+ getJSONProperty() {
9880
+ return JSONCharacterFormattingProperty.Size;
9881
+ }
9882
+ }
9883
+ class CharacterPropertiesFontBoldDescriptor {
9884
+ constructor() {
9885
+ this.binaryEquals = comparers.Equals.simpleType;
9886
+ this.defaultValue = false;
9887
+ }
9888
+ setProp(props, newValue) {
9889
+ props.fontBold = newValue;
9890
+ }
9891
+ getProp(props) {
9892
+ return props.fontBold;
9893
+ }
9894
+ maskValue() {
9895
+ return CharacterPropertiesMask.UseFontBold;
9896
+ }
9897
+ getHistoryItemConstructor() {
9898
+ return FontBoldHistoryItem;
9899
+ }
9900
+ getJSONProperty() {
9901
+ return JSONCharacterFormattingProperty.Bold;
9902
+ }
9903
+ }
9904
+ class CharacterPropertiesFontItalicDescriptor {
9905
+ constructor() {
9906
+ this.binaryEquals = comparers.Equals.simpleType;
9907
+ this.defaultValue = false;
9908
+ }
9909
+ setProp(props, newValue) {
9910
+ props.fontItalic = newValue;
9911
+ }
9912
+ getProp(props) {
9913
+ return props.fontItalic;
9914
+ }
9915
+ maskValue() {
9916
+ return CharacterPropertiesMask.UseFontItalic;
9917
+ }
9918
+ getHistoryItemConstructor() {
9919
+ return FontItalicHistoryItem;
9920
+ }
9921
+ getJSONProperty() {
9922
+ return JSONCharacterFormattingProperty.Italic;
9923
+ }
9924
+ }
9925
+ class CharacterPropertiesFontInfoDescriptor {
9926
+ constructor() {
9927
+ this.binaryEquals = comparers.Equals.object;
9928
+ this.defaultValue = undefined;
9929
+ }
9930
+ setProp(props, newValue) {
9931
+ props.fontInfo = newValue;
9932
+ }
9933
+ getProp(props) {
9934
+ return props.fontInfo;
9935
+ }
9936
+ maskValue() {
9937
+ return CharacterPropertiesMask.UseFontName;
9938
+ }
9939
+ getHistoryItemConstructor() {
9940
+ return FontNameHistoryItem;
9941
+ }
9942
+ getJSONProperty() {
9943
+ return JSONCharacterFormattingProperty.FontName;
9944
+ }
9945
+ }
9946
+ class CharacterPropertiesScriptDescriptor {
9947
+ constructor() {
9948
+ this.binaryEquals = comparers.Equals.simpleType;
9949
+ this.defaultValue = CharacterFormattingScript.Normal;
9950
+ }
9951
+ setProp(props, newValue) {
9952
+ props.script = newValue;
9953
+ }
9954
+ getProp(props) {
9955
+ return props.script;
9956
+ }
9957
+ maskValue() {
9958
+ return CharacterPropertiesMask.UseScript;
9959
+ }
9960
+ getHistoryItemConstructor() {
9961
+ return FontScriptHistoryItem;
9962
+ }
9963
+ getJSONProperty() {
9964
+ return JSONCharacterFormattingProperty.Script;
9965
+ }
9966
+ }
9967
+ class CharacterPropertiesStrikeoutTypeDescriptor {
9968
+ constructor() {
9969
+ this.binaryEquals = comparers.Equals.simpleType;
9970
+ this.defaultValue = StrikeoutType.None;
9971
+ }
9972
+ setProp(props, newValue) {
9973
+ props.fontStrikeoutType = newValue;
9974
+ }
9975
+ getProp(props) {
9976
+ return props.fontStrikeoutType;
9977
+ }
9978
+ maskValue() {
9979
+ return CharacterPropertiesMask.UseFontStrikeoutType;
9980
+ }
9981
+ getHistoryItemConstructor() {
9982
+ return FontStrikeoutTypeHistoryItem;
9983
+ }
9984
+ getJSONProperty() {
9985
+ return JSONCharacterFormattingProperty.StrikeoutType;
9986
+ }
9987
+ }
9988
+ class CharacterPropertiesUnderlineTypeDescriptor {
9989
+ constructor() {
9990
+ this.binaryEquals = comparers.Equals.simpleType;
9991
+ this.defaultValue = UnderlineType.None;
9992
+ }
9993
+ setProp(props, newValue) {
9994
+ props.fontUnderlineType = newValue;
9995
+ }
9996
+ getProp(props) {
9997
+ return props.fontUnderlineType;
9998
+ }
9999
+ maskValue() {
10000
+ return CharacterPropertiesMask.UseFontUnderlineType;
10001
+ }
10002
+ getHistoryItemConstructor() {
10003
+ return FontUnderlineTypeHistoryItem;
10004
+ }
10005
+ getJSONProperty() {
10006
+ return JSONCharacterFormattingProperty.UnderlineType;
10007
+ }
10008
+ }
10009
+ class CharacterPropertiesUnderlineWordsOnlyDescriptor {
10010
+ constructor() {
10011
+ this.binaryEquals = comparers.Equals.simpleType;
10012
+ this.defaultValue = false;
10013
+ }
10014
+ setProp(props, newValue) {
10015
+ props.underlineWordsOnly = newValue;
10016
+ }
10017
+ getProp(props) {
10018
+ return props.underlineWordsOnly;
10019
+ }
10020
+ maskValue() {
10021
+ return CharacterPropertiesMask.UseUnderlineWordsOnly;
10022
+ }
10023
+ getHistoryItemConstructor() {
10024
+ return FontUnderlineWordsOnlyHistoryItem;
10025
+ }
10026
+ getJSONProperty() {
10027
+ return JSONCharacterFormattingProperty.UnderlineWordsOnly;
10028
+ }
10029
+ }
10030
+ class CharacterPropertiesStrikeoutWordsOnlyDescriptor {
10031
+ constructor() {
10032
+ this.binaryEquals = comparers.Equals.simpleType;
10033
+ this.defaultValue = false;
10034
+ }
10035
+ setProp(props, newValue) {
10036
+ props.strikeoutWordsOnly = newValue;
10037
+ }
10038
+ getProp(props) {
10039
+ return props.strikeoutWordsOnly;
10040
+ }
10041
+ maskValue() {
10042
+ return CharacterPropertiesMask.UseStrikeoutWordsOnly;
10043
+ }
10044
+ getHistoryItemConstructor() {
10045
+ return FontStrikeoutWordsOnlyHistoryItem;
10046
+ }
10047
+ getJSONProperty() {
10048
+ return JSONCharacterFormattingProperty.StrikeoutWordsOnly;
10049
+ }
10050
+ }
10051
+ class CharacterPropertiesNoProofDescriptor {
10052
+ constructor() {
10053
+ this.binaryEquals = comparers.Equals.simpleType;
10054
+ this.defaultValue = false;
10055
+ }
10056
+ setProp(props, newValue) {
10057
+ props.noProof = newValue;
10058
+ }
10059
+ getProp(props) {
10060
+ return props.noProof;
10061
+ }
10062
+ maskValue() {
10063
+ return CharacterPropertiesMask.UseNoProof;
10064
+ }
10065
+ getHistoryItemConstructor() {
10066
+ return FontNoProofHistoryItem;
10067
+ }
10068
+ getJSONProperty() {
10069
+ return JSONCharacterFormattingProperty.NoProof;
10070
+ }
10071
+ }
10072
+ class CharacterPropertiesHiddenDescriptor {
10073
+ constructor() {
10074
+ this.binaryEquals = comparers.Equals.simpleType;
10075
+ this.defaultValue = false;
10076
+ }
10077
+ setProp(props, newValue) {
10078
+ props.hidden = newValue;
10079
+ }
10080
+ getProp(props) {
10081
+ return props.hidden;
10082
+ }
10083
+ maskValue() {
10084
+ return CharacterPropertiesMask.UseHidden;
10085
+ }
10086
+ getHistoryItemConstructor() {
10087
+ return FontHiddenHistoryItem;
10088
+ }
10089
+ getJSONProperty() {
10090
+ return JSONCharacterFormattingProperty.Hidden;
10091
+ }
10092
+ }
10093
+ class CharacterPropertiesTextColorDescriptor {
10094
+ constructor() {
10095
+ this.binaryEquals = comparers.Equals.object;
10096
+ this.defaultValue = color_model_info_ColorModelInfo.autoColor;
10097
+ }
10098
+ setProp(props, newValue) {
10099
+ props.textColor = newValue;
10100
+ }
10101
+ getProp(props) {
10102
+ return props.textColor;
10103
+ }
10104
+ maskValue() {
10105
+ return CharacterPropertiesMask.UseForeColorIndex;
10106
+ }
10107
+ getHistoryItemConstructor() {
10108
+ return FontTextColorHistoryItem;
10109
+ }
10110
+ getJSONProperty() {
10111
+ return JSONCharacterFormattingProperty.TextColor;
10112
+ }
10113
+ }
10114
+ class CharacterPropertiesShadingInfoColorDescriptor {
10115
+ constructor() {
10116
+ this.binaryEquals = comparers.Equals.object;
10117
+ this.defaultValue = ShadingInfo.noColor;
10118
+ }
10119
+ setProp(props, newValue) {
10120
+ props.shadingInfo = newValue;
10121
+ }
10122
+ getProp(props) {
10123
+ return props.shadingInfo;
10124
+ }
10125
+ maskValue() {
10126
+ return CharacterPropertiesMask.UseShadingInfoIndex;
10127
+ }
10128
+ getHistoryItemConstructor() {
10129
+ return FontShadingInfoHistoryItem;
10130
+ }
10131
+ getJSONProperty() {
10132
+ return JSONCharacterFormattingProperty.ShadingInfo;
10133
+ }
10134
+ }
10135
+ class CharacterPropertiesStrikeoutColorDescriptor {
10136
+ constructor() {
10137
+ this.binaryEquals = comparers.Equals.object;
10138
+ this.defaultValue = color_model_info_ColorModelInfo.noColor;
10139
+ }
10140
+ setProp(props, newValue) {
10141
+ props.strikeoutColor = newValue;
10142
+ }
10143
+ getProp(props) {
10144
+ return props.strikeoutColor;
10145
+ }
10146
+ maskValue() {
10147
+ return CharacterPropertiesMask.UseStrikeoutColorIndex;
10148
+ }
10149
+ getHistoryItemConstructor() {
10150
+ return FontStrikeoutColorHistoryItem;
10151
+ }
10152
+ getJSONProperty() {
10153
+ return JSONCharacterFormattingProperty.StrikeoutColor;
10154
+ }
10155
+ }
10156
+ class CharacterPropertiesUnderlineColorDescriptor {
10157
+ constructor() {
10158
+ this.binaryEquals = comparers.Equals.object;
10159
+ this.defaultValue = color_model_info_ColorModelInfo.noColor;
10160
+ }
10161
+ setProp(props, newValue) {
10162
+ props.underlineColor = newValue;
10163
+ }
10164
+ getProp(props) {
10165
+ return props.underlineColor;
10166
+ }
10167
+ maskValue() {
10168
+ return CharacterPropertiesMask.UseUnderlineColorIndex;
10169
+ }
10170
+ getHistoryItemConstructor() {
10171
+ return FontUnderlineColorHistoryItem;
10172
+ }
10173
+ getJSONProperty() {
10174
+ return JSONCharacterFormattingProperty.UnderlineColor;
10175
+ }
10176
+ }
10177
+ class CharacterPropertiesHighlightColorDescriptor {
10178
+ constructor() {
10179
+ this.binaryEquals = comparers.Equals.object;
10180
+ this.defaultValue = color_model_info_ColorModelInfo.noColor;
10181
+ }
10182
+ setProp(props, newValue) {
10183
+ props.highlightColor = newValue;
10184
+ }
10185
+ getProp(props) {
10186
+ return props.highlightColor;
10187
+ }
10188
+ maskValue() {
10189
+ return CharacterPropertiesMask.UseHighlightColorIndex;
10190
+ }
10191
+ getHistoryItemConstructor() {
10192
+ return FontHighlightColorHistoryItem;
10193
+ }
10194
+ getJSONProperty() {
10195
+ return JSONCharacterFormattingProperty.HighlightColor;
10196
+ }
10197
+ }
10198
+ class CharacterPropertiesLangInfoDescriptor {
10199
+ constructor() {
10200
+ this.binaryEquals = comparers.Equals.object;
10201
+ this.defaultValue = new LangInfo();
10202
+ }
10203
+ setProp(props, newValue) {
10204
+ props.langInfo = newValue;
10205
+ }
10206
+ getProp(props) {
10207
+ return props.langInfo;
10208
+ }
10209
+ maskValue() {
10210
+ return CharacterPropertiesMask.UseLangInfo;
10211
+ }
10212
+ getHistoryItemConstructor() {
10213
+ return FontLangInfoHistoryItem;
10214
+ }
10215
+ getJSONProperty() {
10216
+ return JSONCharacterFormattingProperty.LangInfo;
10217
+ }
10218
+ }
10219
+ class CharacterPropertiesCompositeFontInfoDescriptor {
10220
+ constructor() {
10221
+ this.binaryEquals = comparers.Equals.object;
10222
+ this.defaultValue = new CompositeFontInfo();
10223
+ }
10224
+ setProp(props, newValue) {
10225
+ props.compositeFontInfo = newValue;
10226
+ }
10227
+ getProp(props) {
10228
+ return props.compositeFontInfo;
10229
+ }
10230
+ maskValue() {
10231
+ return CharacterPropertiesMask.UseCompositeFontInfo;
10232
+ }
10233
+ getHistoryItemConstructor() {
10234
+ return FontCompositeFontInfoHistoryItem;
10235
+ }
10236
+ getJSONProperty() {
10237
+ return JSONCharacterFormattingProperty.CompositeFontInfo;
10238
+ }
10239
+ }
10240
+ class character_property_descriptor_CharacterPropertyDescriptor {
10241
+ }
10242
+ character_property_descriptor_CharacterPropertyDescriptor.allCaps = new CharacterPropertiesAllCapsDescriptor();
10243
+ character_property_descriptor_CharacterPropertyDescriptor.size = new CharacterPropertiesFontSizeDescriptor();
10244
+ character_property_descriptor_CharacterPropertyDescriptor.bold = new CharacterPropertiesFontBoldDescriptor();
10245
+ character_property_descriptor_CharacterPropertyDescriptor.italic = new CharacterPropertiesFontItalicDescriptor();
10246
+ character_property_descriptor_CharacterPropertyDescriptor.fontInfo = new CharacterPropertiesFontInfoDescriptor();
10247
+ character_property_descriptor_CharacterPropertyDescriptor.script = new CharacterPropertiesScriptDescriptor();
10248
+ character_property_descriptor_CharacterPropertyDescriptor.strikeoutType = new CharacterPropertiesStrikeoutTypeDescriptor();
10249
+ character_property_descriptor_CharacterPropertyDescriptor.underlineType = new CharacterPropertiesUnderlineTypeDescriptor();
10250
+ character_property_descriptor_CharacterPropertyDescriptor.underlineWordsOnly = new CharacterPropertiesUnderlineWordsOnlyDescriptor();
10251
+ character_property_descriptor_CharacterPropertyDescriptor.strikeoutWordsOnly = new CharacterPropertiesStrikeoutWordsOnlyDescriptor();
10252
+ character_property_descriptor_CharacterPropertyDescriptor.noProof = new CharacterPropertiesNoProofDescriptor();
10253
+ character_property_descriptor_CharacterPropertyDescriptor.hidden = new CharacterPropertiesHiddenDescriptor();
10254
+ character_property_descriptor_CharacterPropertyDescriptor.langInfo = new CharacterPropertiesLangInfoDescriptor();
10255
+ character_property_descriptor_CharacterPropertyDescriptor.compositeFontInfo = new CharacterPropertiesCompositeFontInfoDescriptor();
10256
+ character_property_descriptor_CharacterPropertyDescriptor.textColor = new CharacterPropertiesTextColorDescriptor();
10257
+ character_property_descriptor_CharacterPropertyDescriptor.shadingInfo = new CharacterPropertiesShadingInfoColorDescriptor();
10258
+ character_property_descriptor_CharacterPropertyDescriptor.highlightColor = new CharacterPropertiesHighlightColorDescriptor();
10259
+ character_property_descriptor_CharacterPropertyDescriptor.strikeoutColor = new CharacterPropertiesStrikeoutColorDescriptor();
10260
+ character_property_descriptor_CharacterPropertyDescriptor.underlineColor = new CharacterPropertiesUnderlineColorDescriptor();
10261
+ character_property_descriptor_CharacterPropertyDescriptor.smallCaps = new CharacterPropertiesSmallCapsDescriptor();
10262
+ character_property_descriptor_CharacterPropertyDescriptor.ALL_FIELDS = [
10263
+ character_property_descriptor_CharacterPropertyDescriptor.allCaps,
10264
+ character_property_descriptor_CharacterPropertyDescriptor.size,
10265
+ character_property_descriptor_CharacterPropertyDescriptor.bold,
10266
+ character_property_descriptor_CharacterPropertyDescriptor.italic,
10267
+ character_property_descriptor_CharacterPropertyDescriptor.fontInfo,
10268
+ character_property_descriptor_CharacterPropertyDescriptor.script,
10269
+ character_property_descriptor_CharacterPropertyDescriptor.strikeoutType,
10270
+ character_property_descriptor_CharacterPropertyDescriptor.underlineType,
10271
+ character_property_descriptor_CharacterPropertyDescriptor.underlineWordsOnly,
10272
+ character_property_descriptor_CharacterPropertyDescriptor.strikeoutWordsOnly,
10273
+ character_property_descriptor_CharacterPropertyDescriptor.noProof,
10274
+ character_property_descriptor_CharacterPropertyDescriptor.hidden,
10275
+ character_property_descriptor_CharacterPropertyDescriptor.langInfo,
10276
+ character_property_descriptor_CharacterPropertyDescriptor.compositeFontInfo,
10277
+ character_property_descriptor_CharacterPropertyDescriptor.textColor,
10278
+ character_property_descriptor_CharacterPropertyDescriptor.shadingInfo,
10279
+ character_property_descriptor_CharacterPropertyDescriptor.highlightColor,
10280
+ character_property_descriptor_CharacterPropertyDescriptor.strikeoutColor,
10281
+ character_property_descriptor_CharacterPropertyDescriptor.underlineColor,
10282
+ character_property_descriptor_CharacterPropertyDescriptor.smallCaps
10283
+ ];
10284
+ character_property_descriptor_CharacterPropertyDescriptor.whatNeedSetWhenCreateHyperlinkField = [
10285
+ character_property_descriptor_CharacterPropertyDescriptor.size,
10286
+ character_property_descriptor_CharacterPropertyDescriptor.bold,
10287
+ character_property_descriptor_CharacterPropertyDescriptor.italic,
10288
+ character_property_descriptor_CharacterPropertyDescriptor.fontInfo,
10289
+ character_property_descriptor_CharacterPropertyDescriptor.script,
10290
+ character_property_descriptor_CharacterPropertyDescriptor.strikeoutType,
10291
+ character_property_descriptor_CharacterPropertyDescriptor.allCaps,
10292
+ character_property_descriptor_CharacterPropertyDescriptor.underlineWordsOnly,
10293
+ character_property_descriptor_CharacterPropertyDescriptor.strikeoutWordsOnly,
10294
+ character_property_descriptor_CharacterPropertyDescriptor.noProof,
10295
+ character_property_descriptor_CharacterPropertyDescriptor.hidden,
10296
+ character_property_descriptor_CharacterPropertyDescriptor.shadingInfo,
10297
+ character_property_descriptor_CharacterPropertyDescriptor.strikeoutColor,
10298
+ character_property_descriptor_CharacterPropertyDescriptor.underlineColor,
10299
+ character_property_descriptor_CharacterPropertyDescriptor.langInfo,
10300
+ character_property_descriptor_CharacterPropertyDescriptor.smallCaps
10301
+ ];
10302
+
9598
10303
  ;// CONCATENATED MODULE: ./src/common/model/character/layout-character-properties-color-info.ts
9599
10304
  class LayoutCharacterPropertiesColorInfo {
9600
10305
  constructor(textColor, foregroundColor, strikeoutColor, underlineColor) {
@@ -9627,6 +10332,7 @@ class LayoutCharacterPropertiesColorInfo {
9627
10332
 
9628
10333
 
9629
10334
 
10335
+
9630
10336
  class CharacterProperties {
9631
10337
  constructor() {
9632
10338
  this.measurerSizes = Object.create(null);
@@ -9761,8 +10467,19 @@ class MaskedCharacterProperties extends CharacterProperties {
9761
10467
  this.useValueExt &= ~this.getHighPartUseValue(mask);
9762
10468
  }
9763
10469
  }
9764
- setUseValueFull(value) {
9765
- this.useValue = this.getLowPartUseValue(value);
10470
+ setUseValueFull(value, onlyForDefault = false) {
10471
+ const lowPartUseValue = this.getLowPartUseValue(value);
10472
+ if (onlyForDefault) {
10473
+ character_property_descriptor_CharacterPropertyDescriptor.ALL_FIELDS.forEach((desc) => {
10474
+ const prop = desc.getProp(this);
10475
+ const mask = desc.maskValue();
10476
+ if (desc.binaryEquals(prop, desc.defaultValue))
10477
+ this.setUseValue(mask, !!(mask & lowPartUseValue));
10478
+ });
10479
+ }
10480
+ else {
10481
+ this.useValue = lowPartUseValue;
10482
+ }
9766
10483
  this.useValueExt = this.getHighPartUseValue(value);
9767
10484
  }
9768
10485
  getLowPartUseValue(value) {
@@ -10176,7 +10893,7 @@ class LayoutBorder extends BorderBase {
10176
10893
 
10177
10894
  class BorderInfo {
10178
10895
  constructor() {
10179
- this.style = BorderLineStyle.None;
10896
+ this.style = BorderLineStyle.Nil;
10180
10897
  this.color = ColorModelInfoCache.defaultItem;
10181
10898
  this.width = 0;
10182
10899
  this.offset = 0;
@@ -10226,66 +10943,6 @@ class BorderInfo {
10226
10943
  }
10227
10944
  }
10228
10945
 
10229
- // EXTERNAL MODULE: ./node_modules/@devexpress/utils/lib/utils/comparers.js
10230
- var comparers = __webpack_require__(4170);
10231
- ;// CONCATENATED MODULE: ./src/common/model/history/base/history-item.ts
10232
-
10233
- class history_item_HistoryItem {
10234
- constructor(modelManipulator) {
10235
- this.uniqueId = -1;
10236
- this.modelManipulator = modelManipulator;
10237
- }
10238
- canBeMerged() {
10239
- return false;
10240
- }
10241
- changeModified() {
10242
- return true;
10243
- }
10244
- }
10245
- class CompositionHistoryItem extends history_item_HistoryItem {
10246
- constructor() {
10247
- super(null);
10248
- this.historyItems = [];
10249
- }
10250
- canBeMerged() {
10251
- return true;
10252
- }
10253
- changeModified() {
10254
- var item;
10255
- for (var i = 0; item = this.historyItems[i]; i++) {
10256
- if (item.changeModified())
10257
- return true;
10258
- }
10259
- return false;
10260
- }
10261
- redo() {
10262
- var item;
10263
- for (var i = 0; item = this.historyItems[i]; i++)
10264
- item.redo();
10265
- }
10266
- undo() {
10267
- var item;
10268
- for (var i = this.historyItems.length - 1; item = this.historyItems[i]; i--)
10269
- item.undo();
10270
- }
10271
- add(historyItem) {
10272
- if (historyItem == null)
10273
- throw new Error(errors/* Errors */.D.ValueCannotBeNull);
10274
- this.historyItems.push(historyItem);
10275
- }
10276
- }
10277
-
10278
- ;// CONCATENATED MODULE: ./src/common/model/history/base/interval-based-history-item.ts
10279
-
10280
- class interval_based_history_item_IntervalBasedHistoryItem extends history_item_HistoryItem {
10281
- constructor(modelManipulator, subDocInterval) {
10282
- super(modelManipulator);
10283
- this.subDocInterval = subDocInterval;
10284
- }
10285
- get boundSubDocument() { return this.subDocInterval.subDocument; }
10286
- get interval() { return this.subDocInterval.interval; }
10287
- }
10288
-
10289
10946
  ;// CONCATENATED MODULE: ./src/common/model/history/items/paragraph-properties-history-items.ts
10290
10947
 
10291
10948
 
@@ -11455,650 +12112,6 @@ class LineSpacingUnit {
11455
12112
  }
11456
12113
  }
11457
12114
 
11458
- ;// CONCATENATED MODULE: ./src/common/model/history/items/character-properties-history-items.ts
11459
-
11460
-
11461
- class FontUseValueHistoryItem extends interval_based_history_item_IntervalBasedHistoryItem {
11462
- constructor(modelManipulator, subDocInterval, newValue) {
11463
- super(modelManipulator, subDocInterval);
11464
- this.newValue = newValue;
11465
- }
11466
- redo() {
11467
- this.oldState = this.modelManipulator.characterProperties.useValue.setValue(this.boundSubDocument, this.interval, this.newValue);
11468
- }
11469
- undo() {
11470
- this.modelManipulator.characterProperties.useValue.restoreValue(this.boundSubDocument, this.oldState);
11471
- }
11472
- }
11473
- class CharacterPropertiesHistoryItem extends interval_based_history_item_IntervalBasedHistoryItem {
11474
- constructor(modelManipulator, subDocInterval, newValue) {
11475
- super(modelManipulator, subDocInterval);
11476
- this.newValue = newValue;
11477
- }
11478
- redo() {
11479
- this.oldState = this.modelManipulator.characterProperties.setValue(this.boundSubDocument, this.interval, this.newValue);
11480
- }
11481
- undo() {
11482
- this.modelManipulator.characterProperties.restoreValue(this.boundSubDocument, this.oldState);
11483
- }
11484
- }
11485
- class CharacterPropertiesHistoryItemBase extends interval_based_history_item_IntervalBasedHistoryItem {
11486
- constructor(modelManipulator, subDocInterval, newValue, newUse) {
11487
- super(modelManipulator, subDocInterval);
11488
- this.newValue = newValue;
11489
- this.newUse = newUse;
11490
- }
11491
- redo() {
11492
- this.oldState = this.getPropertiesManipulator().setValue(this.boundSubDocument, this.interval, this.newValue, this.newUse);
11493
- }
11494
- undo() {
11495
- this.getPropertiesManipulator().restoreValue(this.boundSubDocument, this.oldState);
11496
- }
11497
- getPropertiesManipulator() {
11498
- throw new Error(errors/* Errors */.D.NotImplemented);
11499
- }
11500
- }
11501
- class FontBoldHistoryItem extends CharacterPropertiesHistoryItemBase {
11502
- getPropertiesManipulator() {
11503
- return this.modelManipulator.characterProperties.fontBold;
11504
- }
11505
- }
11506
- class FontCapsHistoryItem extends CharacterPropertiesHistoryItemBase {
11507
- getPropertiesManipulator() {
11508
- return this.modelManipulator.characterProperties.fontCaps;
11509
- }
11510
- }
11511
- class FontSmallCapsHistoryItem extends CharacterPropertiesHistoryItemBase {
11512
- getPropertiesManipulator() {
11513
- return this.modelManipulator.characterProperties.fontSmallCaps;
11514
- }
11515
- }
11516
- class FontUnderlineTypeHistoryItem extends CharacterPropertiesHistoryItemBase {
11517
- getPropertiesManipulator() {
11518
- return this.modelManipulator.characterProperties.fontUnderlineType;
11519
- }
11520
- }
11521
- class FontTextColorHistoryItem extends CharacterPropertiesHistoryItemBase {
11522
- getPropertiesManipulator() {
11523
- return this.modelManipulator.characterProperties.textColor;
11524
- }
11525
- }
11526
- class FontShadingInfoHistoryItem extends CharacterPropertiesHistoryItemBase {
11527
- getPropertiesManipulator() {
11528
- return this.modelManipulator.characterProperties.shadingInfo;
11529
- }
11530
- }
11531
- class FontHiddenHistoryItem extends CharacterPropertiesHistoryItemBase {
11532
- getPropertiesManipulator() {
11533
- return this.modelManipulator.characterProperties.fontHidden;
11534
- }
11535
- }
11536
- class FontItalicHistoryItem extends CharacterPropertiesHistoryItemBase {
11537
- getPropertiesManipulator() {
11538
- return this.modelManipulator.characterProperties.fontItalic;
11539
- }
11540
- }
11541
- class FontNameHistoryItem extends CharacterPropertiesHistoryItemBase {
11542
- getPropertiesManipulator() {
11543
- return this.modelManipulator.characterProperties.fontName;
11544
- }
11545
- }
11546
- class FontScriptHistoryItem extends CharacterPropertiesHistoryItemBase {
11547
- getPropertiesManipulator() {
11548
- return this.modelManipulator.characterProperties.script;
11549
- }
11550
- }
11551
- class FontSizeHistoryItem extends CharacterPropertiesHistoryItemBase {
11552
- getPropertiesManipulator() {
11553
- return this.modelManipulator.characterProperties.fontSize;
11554
- }
11555
- }
11556
- class FontStrikeoutTypeHistoryItem extends CharacterPropertiesHistoryItemBase {
11557
- getPropertiesManipulator() {
11558
- return this.modelManipulator.characterProperties.fontStrikeoutType;
11559
- }
11560
- }
11561
- class FontStrikeoutWordsOnlyHistoryItem extends CharacterPropertiesHistoryItemBase {
11562
- getPropertiesManipulator() {
11563
- return this.modelManipulator.characterProperties.fontStrikeoutWordsOnly;
11564
- }
11565
- }
11566
- class FontStrikeoutColorHistoryItem extends CharacterPropertiesHistoryItemBase {
11567
- getPropertiesManipulator() {
11568
- return this.modelManipulator.characterProperties.fontStrikeoutColor;
11569
- }
11570
- }
11571
- class FontUnderlineColorHistoryItem extends CharacterPropertiesHistoryItemBase {
11572
- getPropertiesManipulator() {
11573
- return this.modelManipulator.characterProperties.fontUnderlineColor;
11574
- }
11575
- }
11576
- class FontHighlightColorHistoryItem extends CharacterPropertiesHistoryItemBase {
11577
- getPropertiesManipulator() {
11578
- return this.modelManipulator.characterProperties.fontHighlightColor;
11579
- }
11580
- }
11581
- class FontUnderlineWordsOnlyHistoryItem extends CharacterPropertiesHistoryItemBase {
11582
- getPropertiesManipulator() {
11583
- return this.modelManipulator.characterProperties.fontUnderlineWordsOnly;
11584
- }
11585
- }
11586
- class FontNoProofHistoryItem extends CharacterPropertiesHistoryItemBase {
11587
- getPropertiesManipulator() {
11588
- return this.modelManipulator.characterProperties.fontNoProof;
11589
- }
11590
- }
11591
- class FontLangInfoHistoryItem extends CharacterPropertiesHistoryItemBase {
11592
- getPropertiesManipulator() {
11593
- return this.modelManipulator.characterProperties.langInfo;
11594
- }
11595
- }
11596
- class FontCompositeFontInfoHistoryItem extends CharacterPropertiesHistoryItemBase {
11597
- getPropertiesManipulator() {
11598
- return this.modelManipulator.characterProperties.compositeFontInfo;
11599
- }
11600
- }
11601
- class ResetCharacterPropertiesUseValuesHistoryItem extends (/* unused pure expression or super */ null && (IntervalBasedHistoryItem)) {
11602
- redo() {
11603
- this.state = this.modelManipulator.characterProperties.useValue.setValue(this.boundSubDocument, this.interval, 0);
11604
- }
11605
- undo() {
11606
- this.modelManipulator.characterProperties.useValue.restoreValue(this.boundSubDocument, this.state);
11607
- }
11608
- }
11609
-
11610
- ;// CONCATENATED MODULE: ./src/common/model/character/character-property-descriptor.ts
11611
-
11612
-
11613
-
11614
-
11615
-
11616
-
11617
-
11618
-
11619
- class CharacterPropertiesAllCapsDescriptor {
11620
- constructor() {
11621
- this.binaryEquals = comparers.Equals.simpleType;
11622
- this.defaultValue = false;
11623
- }
11624
- setProp(props, newValue) {
11625
- props.allCaps = newValue;
11626
- }
11627
- getProp(props) {
11628
- return props.allCaps;
11629
- }
11630
- maskValue() {
11631
- return CharacterPropertiesMask.UseAllCaps;
11632
- }
11633
- getHistoryItemConstructor() {
11634
- return FontCapsHistoryItem;
11635
- }
11636
- getJSONProperty() {
11637
- return JSONCharacterFormattingProperty.AllCaps;
11638
- }
11639
- }
11640
- class CharacterPropertiesSmallCapsDescriptor {
11641
- constructor() {
11642
- this.binaryEquals = comparers.Equals.simpleType;
11643
- this.defaultValue = false;
11644
- }
11645
- setProp(props, newValue) {
11646
- props.smallCaps = newValue;
11647
- }
11648
- getProp(props) {
11649
- return props.smallCaps;
11650
- }
11651
- maskValue() {
11652
- return CharacterPropertiesMask.UseSmallCaps;
11653
- }
11654
- getHistoryItemConstructor() {
11655
- return FontSmallCapsHistoryItem;
11656
- }
11657
- getJSONProperty() {
11658
- return JSONCharacterFormattingProperty.SmallCaps;
11659
- }
11660
- }
11661
- class CharacterPropertiesFontSizeDescriptor {
11662
- constructor() {
11663
- this.binaryEquals = comparers.Equals.simpleType;
11664
- this.defaultValue = 11;
11665
- }
11666
- setProp(props, newValue) {
11667
- props.fontSize = newValue;
11668
- }
11669
- getProp(props) {
11670
- return props.fontSize;
11671
- }
11672
- maskValue() {
11673
- return CharacterPropertiesMask.UseDoubleFontSize;
11674
- }
11675
- getHistoryItemConstructor() {
11676
- return FontSizeHistoryItem;
11677
- }
11678
- getJSONProperty() {
11679
- return JSONCharacterFormattingProperty.Size;
11680
- }
11681
- }
11682
- class CharacterPropertiesFontBoldDescriptor {
11683
- constructor() {
11684
- this.binaryEquals = comparers.Equals.simpleType;
11685
- this.defaultValue = false;
11686
- }
11687
- setProp(props, newValue) {
11688
- props.fontBold = newValue;
11689
- }
11690
- getProp(props) {
11691
- return props.fontBold;
11692
- }
11693
- maskValue() {
11694
- return CharacterPropertiesMask.UseFontBold;
11695
- }
11696
- getHistoryItemConstructor() {
11697
- return FontBoldHistoryItem;
11698
- }
11699
- getJSONProperty() {
11700
- return JSONCharacterFormattingProperty.Bold;
11701
- }
11702
- }
11703
- class CharacterPropertiesFontItalicDescriptor {
11704
- constructor() {
11705
- this.binaryEquals = comparers.Equals.simpleType;
11706
- this.defaultValue = false;
11707
- }
11708
- setProp(props, newValue) {
11709
- props.fontItalic = newValue;
11710
- }
11711
- getProp(props) {
11712
- return props.fontItalic;
11713
- }
11714
- maskValue() {
11715
- return CharacterPropertiesMask.UseFontItalic;
11716
- }
11717
- getHistoryItemConstructor() {
11718
- return FontItalicHistoryItem;
11719
- }
11720
- getJSONProperty() {
11721
- return JSONCharacterFormattingProperty.Italic;
11722
- }
11723
- }
11724
- class CharacterPropertiesFontInfoDescriptor {
11725
- constructor() {
11726
- this.binaryEquals = comparers.Equals.object;
11727
- this.defaultValue = undefined;
11728
- }
11729
- setProp(props, newValue) {
11730
- props.fontInfo = newValue;
11731
- }
11732
- getProp(props) {
11733
- return props.fontInfo;
11734
- }
11735
- maskValue() {
11736
- return CharacterPropertiesMask.UseFontName;
11737
- }
11738
- getHistoryItemConstructor() {
11739
- return FontNameHistoryItem;
11740
- }
11741
- getJSONProperty() {
11742
- return JSONCharacterFormattingProperty.FontName;
11743
- }
11744
- }
11745
- class CharacterPropertiesScriptDescriptor {
11746
- constructor() {
11747
- this.binaryEquals = comparers.Equals.simpleType;
11748
- this.defaultValue = CharacterFormattingScript.Normal;
11749
- }
11750
- setProp(props, newValue) {
11751
- props.script = newValue;
11752
- }
11753
- getProp(props) {
11754
- return props.script;
11755
- }
11756
- maskValue() {
11757
- return CharacterPropertiesMask.UseScript;
11758
- }
11759
- getHistoryItemConstructor() {
11760
- return FontScriptHistoryItem;
11761
- }
11762
- getJSONProperty() {
11763
- return JSONCharacterFormattingProperty.Script;
11764
- }
11765
- }
11766
- class CharacterPropertiesStrikeoutTypeDescriptor {
11767
- constructor() {
11768
- this.binaryEquals = comparers.Equals.simpleType;
11769
- this.defaultValue = StrikeoutType.None;
11770
- }
11771
- setProp(props, newValue) {
11772
- props.fontStrikeoutType = newValue;
11773
- }
11774
- getProp(props) {
11775
- return props.fontStrikeoutType;
11776
- }
11777
- maskValue() {
11778
- return CharacterPropertiesMask.UseFontStrikeoutType;
11779
- }
11780
- getHistoryItemConstructor() {
11781
- return FontStrikeoutTypeHistoryItem;
11782
- }
11783
- getJSONProperty() {
11784
- return JSONCharacterFormattingProperty.StrikeoutType;
11785
- }
11786
- }
11787
- class CharacterPropertiesUnderlineTypeDescriptor {
11788
- constructor() {
11789
- this.binaryEquals = comparers.Equals.simpleType;
11790
- this.defaultValue = UnderlineType.None;
11791
- }
11792
- setProp(props, newValue) {
11793
- props.fontUnderlineType = newValue;
11794
- }
11795
- getProp(props) {
11796
- return props.fontUnderlineType;
11797
- }
11798
- maskValue() {
11799
- return CharacterPropertiesMask.UseFontUnderlineType;
11800
- }
11801
- getHistoryItemConstructor() {
11802
- return FontUnderlineTypeHistoryItem;
11803
- }
11804
- getJSONProperty() {
11805
- return JSONCharacterFormattingProperty.UnderlineType;
11806
- }
11807
- }
11808
- class CharacterPropertiesUnderlineWordsOnlyDescriptor {
11809
- constructor() {
11810
- this.binaryEquals = comparers.Equals.simpleType;
11811
- this.defaultValue = false;
11812
- }
11813
- setProp(props, newValue) {
11814
- props.underlineWordsOnly = newValue;
11815
- }
11816
- getProp(props) {
11817
- return props.underlineWordsOnly;
11818
- }
11819
- maskValue() {
11820
- return CharacterPropertiesMask.UseUnderlineWordsOnly;
11821
- }
11822
- getHistoryItemConstructor() {
11823
- return FontUnderlineWordsOnlyHistoryItem;
11824
- }
11825
- getJSONProperty() {
11826
- return JSONCharacterFormattingProperty.UnderlineWordsOnly;
11827
- }
11828
- }
11829
- class CharacterPropertiesStrikeoutWordsOnlyDescriptor {
11830
- constructor() {
11831
- this.binaryEquals = comparers.Equals.simpleType;
11832
- this.defaultValue = false;
11833
- }
11834
- setProp(props, newValue) {
11835
- props.strikeoutWordsOnly = newValue;
11836
- }
11837
- getProp(props) {
11838
- return props.strikeoutWordsOnly;
11839
- }
11840
- maskValue() {
11841
- return CharacterPropertiesMask.UseStrikeoutWordsOnly;
11842
- }
11843
- getHistoryItemConstructor() {
11844
- return FontStrikeoutWordsOnlyHistoryItem;
11845
- }
11846
- getJSONProperty() {
11847
- return JSONCharacterFormattingProperty.StrikeoutWordsOnly;
11848
- }
11849
- }
11850
- class CharacterPropertiesNoProofDescriptor {
11851
- constructor() {
11852
- this.binaryEquals = comparers.Equals.simpleType;
11853
- this.defaultValue = false;
11854
- }
11855
- setProp(props, newValue) {
11856
- props.noProof = newValue;
11857
- }
11858
- getProp(props) {
11859
- return props.noProof;
11860
- }
11861
- maskValue() {
11862
- return CharacterPropertiesMask.UseNoProof;
11863
- }
11864
- getHistoryItemConstructor() {
11865
- return FontNoProofHistoryItem;
11866
- }
11867
- getJSONProperty() {
11868
- return JSONCharacterFormattingProperty.NoProof;
11869
- }
11870
- }
11871
- class CharacterPropertiesHiddenDescriptor {
11872
- constructor() {
11873
- this.binaryEquals = comparers.Equals.simpleType;
11874
- this.defaultValue = false;
11875
- }
11876
- setProp(props, newValue) {
11877
- props.hidden = newValue;
11878
- }
11879
- getProp(props) {
11880
- return props.hidden;
11881
- }
11882
- maskValue() {
11883
- return CharacterPropertiesMask.UseHidden;
11884
- }
11885
- getHistoryItemConstructor() {
11886
- return FontHiddenHistoryItem;
11887
- }
11888
- getJSONProperty() {
11889
- return JSONCharacterFormattingProperty.Hidden;
11890
- }
11891
- }
11892
- class CharacterPropertiesTextColorDescriptor {
11893
- constructor() {
11894
- this.binaryEquals = comparers.Equals.object;
11895
- this.defaultValue = color_model_info_ColorModelInfo.autoColor;
11896
- }
11897
- setProp(props, newValue) {
11898
- props.textColor = newValue;
11899
- }
11900
- getProp(props) {
11901
- return props.textColor;
11902
- }
11903
- maskValue() {
11904
- return CharacterPropertiesMask.UseForeColorIndex;
11905
- }
11906
- getHistoryItemConstructor() {
11907
- return FontTextColorHistoryItem;
11908
- }
11909
- getJSONProperty() {
11910
- return JSONCharacterFormattingProperty.TextColor;
11911
- }
11912
- }
11913
- class CharacterPropertiesShadingInfoColorDescriptor {
11914
- constructor() {
11915
- this.binaryEquals = comparers.Equals.object;
11916
- this.defaultValue = ShadingInfo.noColor;
11917
- }
11918
- setProp(props, newValue) {
11919
- props.shadingInfo = newValue;
11920
- }
11921
- getProp(props) {
11922
- return props.shadingInfo;
11923
- }
11924
- maskValue() {
11925
- return CharacterPropertiesMask.UseShadingInfoIndex;
11926
- }
11927
- getHistoryItemConstructor() {
11928
- return FontShadingInfoHistoryItem;
11929
- }
11930
- getJSONProperty() {
11931
- return JSONCharacterFormattingProperty.ShadingInfo;
11932
- }
11933
- }
11934
- class CharacterPropertiesStrikeoutColorDescriptor {
11935
- constructor() {
11936
- this.binaryEquals = comparers.Equals.object;
11937
- this.defaultValue = color_model_info_ColorModelInfo.noColor;
11938
- }
11939
- setProp(props, newValue) {
11940
- props.strikeoutColor = newValue;
11941
- }
11942
- getProp(props) {
11943
- return props.strikeoutColor;
11944
- }
11945
- maskValue() {
11946
- return CharacterPropertiesMask.UseStrikeoutColorIndex;
11947
- }
11948
- getHistoryItemConstructor() {
11949
- return FontStrikeoutColorHistoryItem;
11950
- }
11951
- getJSONProperty() {
11952
- return JSONCharacterFormattingProperty.StrikeoutColor;
11953
- }
11954
- }
11955
- class CharacterPropertiesUnderlineColorDescriptor {
11956
- constructor() {
11957
- this.binaryEquals = comparers.Equals.object;
11958
- this.defaultValue = color_model_info_ColorModelInfo.noColor;
11959
- }
11960
- setProp(props, newValue) {
11961
- props.underlineColor = newValue;
11962
- }
11963
- getProp(props) {
11964
- return props.underlineColor;
11965
- }
11966
- maskValue() {
11967
- return CharacterPropertiesMask.UseUnderlineColorIndex;
11968
- }
11969
- getHistoryItemConstructor() {
11970
- return FontUnderlineColorHistoryItem;
11971
- }
11972
- getJSONProperty() {
11973
- return JSONCharacterFormattingProperty.UnderlineColor;
11974
- }
11975
- }
11976
- class CharacterPropertiesHighlightColorDescriptor {
11977
- constructor() {
11978
- this.binaryEquals = comparers.Equals.object;
11979
- this.defaultValue = color_model_info_ColorModelInfo.noColor;
11980
- }
11981
- setProp(props, newValue) {
11982
- props.highlightColor = newValue;
11983
- }
11984
- getProp(props) {
11985
- return props.highlightColor;
11986
- }
11987
- maskValue() {
11988
- return CharacterPropertiesMask.UseHighlightColorIndex;
11989
- }
11990
- getHistoryItemConstructor() {
11991
- return FontHighlightColorHistoryItem;
11992
- }
11993
- getJSONProperty() {
11994
- return JSONCharacterFormattingProperty.HighlightColor;
11995
- }
11996
- }
11997
- class CharacterPropertiesLangInfoDescriptor {
11998
- constructor() {
11999
- this.binaryEquals = comparers.Equals.object;
12000
- this.defaultValue = new LangInfo();
12001
- }
12002
- setProp(props, newValue) {
12003
- props.langInfo = newValue;
12004
- }
12005
- getProp(props) {
12006
- return props.langInfo;
12007
- }
12008
- maskValue() {
12009
- return CharacterPropertiesMask.UseLangInfo;
12010
- }
12011
- getHistoryItemConstructor() {
12012
- return FontLangInfoHistoryItem;
12013
- }
12014
- getJSONProperty() {
12015
- return JSONCharacterFormattingProperty.LangInfo;
12016
- }
12017
- }
12018
- class CharacterPropertiesCompositeFontInfoDescriptor {
12019
- constructor() {
12020
- this.binaryEquals = comparers.Equals.object;
12021
- this.defaultValue = new CompositeFontInfo();
12022
- }
12023
- setProp(props, newValue) {
12024
- props.compositeFontInfo = newValue;
12025
- }
12026
- getProp(props) {
12027
- return props.compositeFontInfo;
12028
- }
12029
- maskValue() {
12030
- return CharacterPropertiesMask.UseCompositeFontInfo;
12031
- }
12032
- getHistoryItemConstructor() {
12033
- return FontCompositeFontInfoHistoryItem;
12034
- }
12035
- getJSONProperty() {
12036
- return JSONCharacterFormattingProperty.CompositeFontInfo;
12037
- }
12038
- }
12039
- class character_property_descriptor_CharacterPropertyDescriptor {
12040
- }
12041
- character_property_descriptor_CharacterPropertyDescriptor.allCaps = new CharacterPropertiesAllCapsDescriptor();
12042
- character_property_descriptor_CharacterPropertyDescriptor.size = new CharacterPropertiesFontSizeDescriptor();
12043
- character_property_descriptor_CharacterPropertyDescriptor.bold = new CharacterPropertiesFontBoldDescriptor();
12044
- character_property_descriptor_CharacterPropertyDescriptor.italic = new CharacterPropertiesFontItalicDescriptor();
12045
- character_property_descriptor_CharacterPropertyDescriptor.fontInfo = new CharacterPropertiesFontInfoDescriptor();
12046
- character_property_descriptor_CharacterPropertyDescriptor.script = new CharacterPropertiesScriptDescriptor();
12047
- character_property_descriptor_CharacterPropertyDescriptor.strikeoutType = new CharacterPropertiesStrikeoutTypeDescriptor();
12048
- character_property_descriptor_CharacterPropertyDescriptor.underlineType = new CharacterPropertiesUnderlineTypeDescriptor();
12049
- character_property_descriptor_CharacterPropertyDescriptor.underlineWordsOnly = new CharacterPropertiesUnderlineWordsOnlyDescriptor();
12050
- character_property_descriptor_CharacterPropertyDescriptor.strikeoutWordsOnly = new CharacterPropertiesStrikeoutWordsOnlyDescriptor();
12051
- character_property_descriptor_CharacterPropertyDescriptor.noProof = new CharacterPropertiesNoProofDescriptor();
12052
- character_property_descriptor_CharacterPropertyDescriptor.hidden = new CharacterPropertiesHiddenDescriptor();
12053
- character_property_descriptor_CharacterPropertyDescriptor.langInfo = new CharacterPropertiesLangInfoDescriptor();
12054
- character_property_descriptor_CharacterPropertyDescriptor.compositeFontInfo = new CharacterPropertiesCompositeFontInfoDescriptor();
12055
- character_property_descriptor_CharacterPropertyDescriptor.textColor = new CharacterPropertiesTextColorDescriptor();
12056
- character_property_descriptor_CharacterPropertyDescriptor.shadingInfo = new CharacterPropertiesShadingInfoColorDescriptor();
12057
- character_property_descriptor_CharacterPropertyDescriptor.highlightColor = new CharacterPropertiesHighlightColorDescriptor();
12058
- character_property_descriptor_CharacterPropertyDescriptor.strikeoutColor = new CharacterPropertiesStrikeoutColorDescriptor();
12059
- character_property_descriptor_CharacterPropertyDescriptor.underlineColor = new CharacterPropertiesUnderlineColorDescriptor();
12060
- character_property_descriptor_CharacterPropertyDescriptor.smallCaps = new CharacterPropertiesSmallCapsDescriptor();
12061
- character_property_descriptor_CharacterPropertyDescriptor.ALL_FIELDS = [
12062
- character_property_descriptor_CharacterPropertyDescriptor.allCaps,
12063
- character_property_descriptor_CharacterPropertyDescriptor.size,
12064
- character_property_descriptor_CharacterPropertyDescriptor.bold,
12065
- character_property_descriptor_CharacterPropertyDescriptor.italic,
12066
- character_property_descriptor_CharacterPropertyDescriptor.fontInfo,
12067
- character_property_descriptor_CharacterPropertyDescriptor.script,
12068
- character_property_descriptor_CharacterPropertyDescriptor.strikeoutType,
12069
- character_property_descriptor_CharacterPropertyDescriptor.underlineType,
12070
- character_property_descriptor_CharacterPropertyDescriptor.underlineWordsOnly,
12071
- character_property_descriptor_CharacterPropertyDescriptor.strikeoutWordsOnly,
12072
- character_property_descriptor_CharacterPropertyDescriptor.noProof,
12073
- character_property_descriptor_CharacterPropertyDescriptor.hidden,
12074
- character_property_descriptor_CharacterPropertyDescriptor.langInfo,
12075
- character_property_descriptor_CharacterPropertyDescriptor.compositeFontInfo,
12076
- character_property_descriptor_CharacterPropertyDescriptor.textColor,
12077
- character_property_descriptor_CharacterPropertyDescriptor.shadingInfo,
12078
- character_property_descriptor_CharacterPropertyDescriptor.highlightColor,
12079
- character_property_descriptor_CharacterPropertyDescriptor.strikeoutColor,
12080
- character_property_descriptor_CharacterPropertyDescriptor.underlineColor,
12081
- character_property_descriptor_CharacterPropertyDescriptor.smallCaps
12082
- ];
12083
- character_property_descriptor_CharacterPropertyDescriptor.whatNeedSetWhenCreateHyperlinkField = [
12084
- character_property_descriptor_CharacterPropertyDescriptor.size,
12085
- character_property_descriptor_CharacterPropertyDescriptor.bold,
12086
- character_property_descriptor_CharacterPropertyDescriptor.italic,
12087
- character_property_descriptor_CharacterPropertyDescriptor.fontInfo,
12088
- character_property_descriptor_CharacterPropertyDescriptor.script,
12089
- character_property_descriptor_CharacterPropertyDescriptor.strikeoutType,
12090
- character_property_descriptor_CharacterPropertyDescriptor.allCaps,
12091
- character_property_descriptor_CharacterPropertyDescriptor.underlineWordsOnly,
12092
- character_property_descriptor_CharacterPropertyDescriptor.strikeoutWordsOnly,
12093
- character_property_descriptor_CharacterPropertyDescriptor.noProof,
12094
- character_property_descriptor_CharacterPropertyDescriptor.hidden,
12095
- character_property_descriptor_CharacterPropertyDescriptor.shadingInfo,
12096
- character_property_descriptor_CharacterPropertyDescriptor.strikeoutColor,
12097
- character_property_descriptor_CharacterPropertyDescriptor.underlineColor,
12098
- character_property_descriptor_CharacterPropertyDescriptor.langInfo,
12099
- character_property_descriptor_CharacterPropertyDescriptor.smallCaps
12100
- ];
12101
-
12102
12115
  ;// CONCATENATED MODULE: ./src/common/model/borders/table-border-base.ts
12103
12116
 
12104
12117
  class TableBordersBase {
@@ -12281,6 +12294,7 @@ var ConditionalTableStyleFormatting;
12281
12294
  ConditionalTableStyleFormatting[ConditionalTableStyleFormatting["TopLeftCell"] = 4] = "TopLeftCell";
12282
12295
  ConditionalTableStyleFormatting[ConditionalTableStyleFormatting["BottomRightCell"] = 2] = "BottomRightCell";
12283
12296
  ConditionalTableStyleFormatting[ConditionalTableStyleFormatting["BottomLeftCell"] = 1] = "BottomLeftCell";
12297
+ ConditionalTableStyleFormatting[ConditionalTableStyleFormatting["None"] = 0] = "None";
12284
12298
  })(ConditionalTableStyleFormatting || (ConditionalTableStyleFormatting = {}));
12285
12299
 
12286
12300
  ;// CONCATENATED MODULE: ./src/common/model/tables/secondary-structures/table-units.ts
@@ -19160,8 +19174,6 @@ class TableAlignmentApplier {
19160
19174
  offset = 0;
19161
19175
  break;
19162
19176
  }
19163
- if (offset <= 0)
19164
- return;
19165
19177
  TableAlignmentApplier.moveAllTable(currTableColumnInfo, (rect) => rect.x += offset);
19166
19178
  }
19167
19179
  static applyCellsVerticalAlignment(defaultTableCellProps, grid, currTableColumnInfo, rowInfo) {
@@ -19655,15 +19667,16 @@ class TabProperties {
19655
19667
  }
19656
19668
  }
19657
19669
  class TabInfo {
19658
- constructor(position, alignment, leader, deleted, isDefault) {
19670
+ constructor(position, alignment, leader, deleted, isDefault, isParagraphIndent = false) {
19659
19671
  this.position = position;
19660
19672
  this.alignment = alignment;
19661
19673
  this.leader = leader;
19662
19674
  this.isDefault = isDefault;
19663
19675
  this.deleted = deleted;
19676
+ this.isParagraphIndent = isParagraphIndent;
19664
19677
  }
19665
19678
  clone() {
19666
- return new TabInfo(this.position, this.alignment, this.leader, this.deleted, this.isDefault);
19679
+ return new TabInfo(this.position, this.alignment, this.leader, this.deleted, this.isDefault, this.isParagraphIndent);
19667
19680
  }
19668
19681
  equals(obj) {
19669
19682
  if (!obj)
@@ -19672,7 +19685,8 @@ class TabInfo {
19672
19685
  this.leader == obj.leader &&
19673
19686
  this.position == obj.position &&
19674
19687
  this.deleted == obj.deleted &&
19675
- this.isDefault == obj.isDefault;
19688
+ this.isDefault == obj.isDefault &&
19689
+ this.isParagraphIndent == obj.isParagraphIndent;
19676
19690
  }
19677
19691
  }
19678
19692
 
@@ -40308,7 +40322,7 @@ class CharacterPropertiesUseValueManipulator {
40308
40322
  constructor(manipulator) {
40309
40323
  this.manipulator = manipulator;
40310
40324
  }
40311
- setValue(subDocument, interval, newValue) {
40325
+ setValue(subDocument, interval, newValue, keepCustomFormatting = false) {
40312
40326
  var oldState = new HistoryItemIntervalState();
40313
40327
  if (!ControlOptions.isEnabled(subDocument.documentModel.options.characterFormatting))
40314
40328
  return oldState;
@@ -40318,7 +40332,7 @@ class CharacterPropertiesUseValueManipulator {
40318
40332
  var run = iterator.currentRun;
40319
40333
  oldState.register(new HistoryItemIntervalStateObject(iterator.currentInterval(), run.maskedCharacterProperties.getUseValueFull()));
40320
40334
  var properties = run.maskedCharacterProperties.clone();
40321
- properties.setUseValueFull(newValue);
40335
+ properties.setUseValueFull(newValue, keepCustomFormatting);
40322
40336
  run.setCharacterProperties(properties);
40323
40337
  run.onCharacterPropertiesChanged();
40324
40338
  }
@@ -49847,11 +49861,13 @@ class RtfStyleExporter {
49847
49861
 
49848
49862
 
49849
49863
 
49864
+
49850
49865
  class RtfTableExporterStateBase {
49851
- constructor(rtfExporter, table, nestingLevel) {
49866
+ constructor(rtfExporter, table, grid, nestingLevel) {
49852
49867
  this.rtfExporter = rtfExporter;
49853
49868
  this._nestingLevel = nestingLevel;
49854
49869
  this.table = table;
49870
+ this.grid = grid;
49855
49871
  this.tableRowPropertiesExporter = new RtfTableRowPropertiesExporter(rtfExporter.documentModel, rtfExporter.rtfExportHelper, rtfExporter.rtfBuilder);
49856
49872
  this.tableCellPropertiesExporter = new RtfTableCellPropertiesExporter(rtfExporter.documentModel, rtfExporter.rtfExportHelper, rtfExporter.rtfBuilder);
49857
49873
  this.tablePropertiesExporter = new RtfTablePropertiesExporter(rtfExporter.documentModel, rtfExporter.rtfExportHelper, rtfExporter.rtfBuilder);
@@ -49926,7 +49942,7 @@ class RtfTableExporterStateBase {
49926
49942
  while (parentCell !== nestedTable.parentCell) {
49927
49943
  nestedTable = nestedTable.parentCell.parentRow.parentTable;
49928
49944
  }
49929
- return RtfTableExporter.exportNestedTable(this.rtfExporter, nestedTable, this.nestingLevel + 1);
49945
+ return RtfTableExporter.exportNestedTable(this.rtfExporter, nestedTable, this.grid, this.nestingLevel + 1);
49930
49946
  }
49931
49947
  exportRowProperties(row, rowIndex) {
49932
49948
  const rowLeft = this.calculateRowLeft(row, row.parentTable.getActualTableIndent(this.documentModel.defaultTableProperties));
@@ -49934,20 +49950,25 @@ class RtfTableExporterStateBase {
49934
49950
  let cellRightVirtualColInd = row.gridBefore;
49935
49951
  for (const cell of row.cells) {
49936
49952
  cellRightVirtualColInd += cell.columnSpan;
49937
- const cellRight = rowLeft + this.getCellWidth(cellRightVirtualColInd);
49953
+ const cellWidth = this.getCellWidth(row.gridBefore, cellRightVirtualColInd);
49954
+ const cellRight = unit_converter/* UnitConverter */.u.pixelsToTwips(rowLeft + cellWidth);
49938
49955
  this.exportCellProperties(cell, cellRight);
49939
49956
  }
49940
49957
  }
49941
- getCellWidth(virtualColumnIndex) {
49942
- if (virtualColumnIndex < 0)
49958
+ getCellWidth(leftSideIndex, columnSpan) {
49959
+ if (leftSideIndex < 0 || columnSpan < 0)
49943
49960
  throw new Error(errors/* Errors */.D.InternalException);
49944
- const minVirtualColumnWidth = 10;
49945
- return virtualColumnIndex * minVirtualColumnWidth;
49961
+ let result = 0;
49962
+ for (let i = 0; i < columnSpan; i++)
49963
+ result += Math.max(this.grid.columns.width[i + leftSideIndex], 1);
49964
+ return result;
49946
49965
  }
49947
49966
  calculateRowLeft(row, indent) {
49948
- const widthBefore = row.gridBefore > 0 ? this.getCellWidth(row.gridBefore) : 0;
49967
+ var _a;
49968
+ const widthBefore = row.gridBefore > 0 ? this.getCellWidth(0, row.gridBefore) : 0;
49949
49969
  const offset = this.getActualWidth(indent) + widthBefore;
49950
- return offset - (this.rowLeftOffset != null ? this.rowLeftOffset : this.calculateRowLeftOffset(row));
49970
+ const rowLeftOffset = (_a = this.rowLeftOffset) !== null && _a !== void 0 ? _a : this.calculateRowLeftOffset(row);
49971
+ return offset - rowLeftOffset;
49951
49972
  }
49952
49973
  calculateRowLeftOffset(row) {
49953
49974
  const borderWidth = row.cells[0].properties.borders.left.width;
@@ -50057,8 +50078,8 @@ class RtfTableExporterStateBase {
50057
50078
 
50058
50079
 
50059
50080
  class RtfNestedTableExporterState extends RtfTableExporterStateBase {
50060
- constructor(rtfExporter, table, nestingLevel) {
50061
- super(rtfExporter, table, nestingLevel);
50081
+ constructor(rtfExporter, table, grid, nestingLevel) {
50082
+ super(rtfExporter, table, grid, nestingLevel);
50062
50083
  }
50063
50084
  export() {
50064
50085
  super.exportBase();
@@ -50087,8 +50108,8 @@ class RtfNestedTableExporterState extends RtfTableExporterStateBase {
50087
50108
 
50088
50109
 
50089
50110
  class RtfTableExporterState extends RtfTableExporterStateBase {
50090
- constructor(rtfExporter, table) {
50091
- super(rtfExporter, table, 1);
50111
+ constructor(rtfExporter, table, grid) {
50112
+ super(rtfExporter, table, grid, 1);
50092
50113
  }
50093
50114
  export() {
50094
50115
  super.exportBase();
@@ -50107,13 +50128,13 @@ class RtfTableExporterState extends RtfTableExporterStateBase {
50107
50128
 
50108
50129
 
50109
50130
  class RtfTableExporter {
50110
- static exportTable(rtfContentExporter, table) {
50111
- new RtfTableExporterState(rtfContentExporter, table).export();
50131
+ static exportTable(rtfContentExporter, table, grid) {
50132
+ new RtfTableExporterState(rtfContentExporter, table, grid).export();
50112
50133
  rtfContentExporter.tableIterator.update(table.getEndPosition());
50113
50134
  return rtfContentExporter.subDocument.getParagraphIndexByPosition(table.getEndPosition() - 1);
50114
50135
  }
50115
- static exportNestedTable(rtfContentExporter, table, nestingLevel) {
50116
- new RtfNestedTableExporterState(rtfContentExporter, table, nestingLevel).export();
50136
+ static exportNestedTable(rtfContentExporter, table, grid, nestingLevel) {
50137
+ new RtfNestedTableExporterState(rtfContentExporter, table, grid, nestingLevel).export();
50117
50138
  rtfContentExporter.tableIterator.update(table.getEndPosition());
50118
50139
  return rtfContentExporter.subDocument.getParagraphIndexByPosition(table.getEndPosition() - 1);
50119
50140
  }
@@ -50157,17 +50178,17 @@ class RtfTableExporter {
50157
50178
 
50158
50179
 
50159
50180
  class RtfContentExporter {
50160
- constructor(documentModel, options, rtfExportHelper) {
50181
+ constructor(exportModelOptions, options, rtfExportHelper) {
50161
50182
  this.shouldFourceUpdateIterators = false;
50162
- this.documentModel = documentModel;
50183
+ this.exportModelOptions = exportModelOptions;
50163
50184
  this.subDocument = this.documentModel.mainSubDocument;
50164
50185
  this.pieceTableNumberingListCounters = new PieceTableNumberingListCountersManager();
50165
50186
  this.rtfExportHelper = rtfExportHelper;
50166
50187
  this.options = options;
50167
50188
  this.rtfBuilder = this.createRtfBuilder();
50168
- this.paragraphPropertiesExporter = new RtfParagraphPropertiesExporter(documentModel, rtfExportHelper, this.rtfBuilder);
50169
- this.characterPropertiesExporter = new RtfCharacterPropertiesExporter(documentModel, rtfExportHelper, this.rtfBuilder, options);
50170
- this.sectionPropertiesExporter = new RtfSectionPropertiesExporter(documentModel, rtfExportHelper, this.rtfBuilder);
50189
+ this.paragraphPropertiesExporter = new RtfParagraphPropertiesExporter(this.documentModel, rtfExportHelper, this.rtfBuilder);
50190
+ this.characterPropertiesExporter = new RtfCharacterPropertiesExporter(this.documentModel, rtfExportHelper, this.rtfBuilder, options);
50191
+ this.sectionPropertiesExporter = new RtfSectionPropertiesExporter(this.documentModel, rtfExportHelper, this.rtfBuilder);
50171
50192
  this.runHandlerMap = new MapCreator()
50172
50193
  .add(RunType.TextRun, this.exportTextRun)
50173
50194
  .add(RunType.FieldCodeStartRun, this.fieldCodeStartRunHandler)
@@ -50181,6 +50202,7 @@ class RtfContentExporter {
50181
50202
  }
50182
50203
  get shouldExportHiddenText() { return true; }
50183
50204
  ;
50205
+ get documentModel() { return this.exportModelOptions.modelManager.modelManipulator.model; }
50184
50206
  createRtfBuilder() {
50185
50207
  return new RtfBuilder();
50186
50208
  }
@@ -50379,7 +50401,7 @@ class RtfContentExporter {
50379
50401
  value = "00000000";
50380
50402
  }
50381
50403
  else {
50382
- const view = new DataView(hash, 0);
50404
+ const view = new DataView(hash.buffer, 0);
50383
50405
  const hashValue = view.getInt32(0);
50384
50406
  value = this.documentModel.simpleFormattersManager.formatString("{0:x8}", hashValue);
50385
50407
  }
@@ -50555,11 +50577,14 @@ class RtfContentExporter {
50555
50577
  this.exportSingleParagraph(paragraph);
50556
50578
  return paragraphIndex;
50557
50579
  }
50558
- else
50559
- return RtfTableExporter.exportTable(this, tablesInfo[0].table.getTopLevelParent()) - this.startSectionParagraphIndex;
50580
+ else {
50581
+ const table = tablesInfo[0].table.getTopLevelParent();
50582
+ const grid = this.exportModelOptions.grids.get(table);
50583
+ return RtfTableExporter.exportTable(this, table, grid) - this.startSectionParagraphIndex;
50584
+ }
50560
50585
  }
50561
50586
  exportSingleParagraph(paragraph) {
50562
- this.exportParagraphCore(paragraph, 0, 0, -1);
50587
+ this.exportParagraphCore(paragraph, 0, ConditionalTableStyleFormatting.None, -1);
50563
50588
  this.finishParagraph(paragraph);
50564
50589
  }
50565
50590
  finishParagraph(paragraph) {
@@ -51088,11 +51113,11 @@ class RtfExportHelper {
51088
51113
 
51089
51114
 
51090
51115
  class RtfExporter {
51091
- constructor(modelManipulator, options) {
51092
- this.modelManipulator = modelManipulator;
51116
+ constructor(exportModelOptions, options) {
51117
+ this.modelManipulator = exportModelOptions.modelManager.modelManipulator;
51093
51118
  this.options = options;
51094
51119
  this.rtfExportHelper = new RtfExportHelper();
51095
- this.contentExporter = new RtfContentExporter(this.documentModel, options, this.rtfExportHelper);
51120
+ this.contentExporter = new RtfContentExporter(exportModelOptions, options, this.rtfExportHelper);
51096
51121
  this.rtfBuilder = this.contentExporter.createRtfBuilder();
51097
51122
  }
51098
51123
  get documentModel() { return this.modelManipulator.model; }
@@ -65212,10 +65237,11 @@ function getAfterInsertReject(callback) {
65212
65237
 
65213
65238
 
65214
65239
 
65215
- function getRtfFromSubDocumentPublic(richOptions, subDocument, coreInterval) {
65240
+ function getRtfFromSubDocumentPublic(processor, subDocument, coreInterval) {
65216
65241
  const rangeCopy = RangeCopy.create(new SubDocumentIntervals(subDocument, [coreInterval]));
65217
- const newModelManager = new ClientModelManager(rangeCopy.model, richOptions, new batch_updatable/* EmptyBatchUpdatableObject */.m1());
65218
- return new RtfExporter(newModelManager.modelManipulator, new RtfDocumentExporterOptions()).exportAsString();
65242
+ const newModelManager = new ClientModelManager(rangeCopy.model, processor.modelManager.richOptions, new batch_updatable/* EmptyBatchUpdatableObject */.m1());
65243
+ const exportModelOptions = processor.getExportModelOptions({ modelManager: newModelManager });
65244
+ return new RtfExporter(exportModelOptions, new RtfDocumentExporterOptions()).exportAsString();
65219
65245
  }
65220
65246
  function insertRtfInSubDocumentPublic(processor, subDocument, position, rtf, callback) {
65221
65247
  const options = new RtfImporterOptions(() => { });
@@ -85087,7 +85113,7 @@ class SubDocumentApi {
85087
85113
  }
85088
85114
  getRtf(interval) {
85089
85115
  const coreInterval = this._checkInterval(interval);
85090
- return getRtfFromSubDocumentPublic(this._processor.modelManager.richOptions, this._subDocument, coreInterval);
85116
+ return getRtfFromSubDocumentPublic(this._processor, this._subDocument, coreInterval);
85091
85117
  }
85092
85118
  insertContent(position, content, documentFormat, callback) {
85093
85119
  position = ApiParametersChecker.check(position, 1, false, [
@@ -88514,21 +88540,13 @@ class SectionExporter extends BaseExporter {
88514
88540
  this.exportSectionGeneralSettings(props);
88515
88541
  }
88516
88542
  exportSectionPage(props) {
88517
- if (!this.shouldExportSectionPage(props))
88518
- return;
88519
88543
  this.writer.writeWpStartElement('pgSz');
88520
- if (props.pageSize.width != SectionExporter.defaultProps.pageSize.width)
88521
- this.writer.writeWpIntAttr('w', props.pageSize.width);
88522
- if (props.pageSize.height != SectionExporter.defaultProps.pageSize.height)
88523
- this.writer.writeWpIntAttr('h', props.pageSize.height);
88544
+ this.writer.writeWpIntAttr('w', props.pageSize.width);
88545
+ this.writer.writeWpIntAttr('h', props.pageSize.height);
88524
88546
  if (props.landscape)
88525
88547
  this.writer.writeWpStringAttr('orient', props.landscape ? 'landscape' : 'portrait');
88526
88548
  this.writer.endElement();
88527
88549
  }
88528
- shouldExportSectionPage(props) {
88529
- return !props.pageSize.equals(SectionExporter.defaultProps.pageSize) ||
88530
- props.landscape != SectionExporter.defaultProps.landscape;
88531
- }
88532
88550
  exportSectionMargins(props) {
88533
88551
  this.writer.writeWpStartElement('pgMar');
88534
88552
  this.writer.writeWpIntAttr('left', props.marginLeft);
@@ -91757,7 +91775,7 @@ function getExporter(exportModelOptions) {
91757
91775
  const { modelManipulator } = exportModelOptions.modelManager;
91758
91776
  switch (exportModelOptions.documentFormat) {
91759
91777
  case DocumentFormat.OpenXml: return new DocxExporter(exportModelOptions, new DocxExportOptions());
91760
- case DocumentFormat.Rtf: return new RtfExporter(modelManipulator, new RtfDocumentExporterOptions());
91778
+ case DocumentFormat.Rtf: return new RtfExporter(exportModelOptions, new RtfDocumentExporterOptions());
91761
91779
  case DocumentFormat.PlainText: return new TxtExporter(modelManipulator, new DocumentExporterOptions());
91762
91780
  case DocumentFormat.Html: return new HtmlDocumentExporter(exportModelOptions, new DocumentExporterOptions());
91763
91781
  default:
@@ -92604,7 +92622,6 @@ class LayoutPageArea extends rectangle.Rectangle {
92604
92622
 
92605
92623
 
92606
92624
 
92607
-
92608
92625
  var LayoutRowStateFlags;
92609
92626
  (function (LayoutRowStateFlags) {
92610
92627
  LayoutRowStateFlags[LayoutRowStateFlags["NormallyEnd"] = 0] = "NormallyEnd";
@@ -92731,7 +92748,7 @@ class layout_row_LayoutRow extends rectangle.Rectangle {
92731
92748
  return lastBoxIndexWhatCanStrikeoutAndUnderline;
92732
92749
  }
92733
92750
  containsSpacesOnly() {
92734
- return this.boxes.length > 0 && utils_list.ListUtils.allOf(this.boxes, val => val.isWhitespace() || val.getType() === LayoutBoxType.ParagraphMark);
92751
+ return this.boxes.length > 0 && utils_list.ListUtils.allOf(this.boxes, val => val.isWhitespace());
92735
92752
  }
92736
92753
  }
92737
92754
  class LayoutRowWithIndex extends (/* unused pure expression or super */ null && (layout_row_LayoutRow)) {
@@ -94826,10 +94843,10 @@ class RowFormattingInfo {
94826
94843
  const ind = utils_list.ListUtils.indexBy(this.intervals, (curr) => curr.start > pos || pos < curr.end, this.currIndex + 1);
94827
94844
  return ind < 0 ? this.intervals.length - 1 : ind;
94828
94845
  }
94829
- calculate() {
94846
+ calculate(outerHorizontalRowContentBounds) {
94830
94847
  this.setIntersectObjects();
94831
94848
  this.busyIntervals = algorithms.IntervalAlgorithms.getMergedIntervals(utils_list.ListUtils.map(this.intersectsObjects, (objBnds) => new fixed.FixedInterval(objBnds.x, objBnds.width)), true);
94832
- const freeIntervals = algorithms.IntervalAlgorithms.reflectIntervals(this.busyIntervals, this.outerHorizontalRowContentBounds);
94849
+ const freeIntervals = this.calculateFreeIntervals(this.busyIntervals, outerHorizontalRowContentBounds !== null && outerHorizontalRowContentBounds !== void 0 ? outerHorizontalRowContentBounds : this.outerHorizontalRowContentBounds);
94833
94850
  if (freeIntervals.length) {
94834
94851
  this.intervals = utils_list.ListUtils.map(freeIntervals, (curr) => new RowIntervalInfo(curr.start, curr.length));
94835
94852
  return;
@@ -94837,6 +94854,40 @@ class RowFormattingInfo {
94837
94854
  this.resetMinY(utils_list.ListUtils.min);
94838
94855
  Log.print(LogSource.RowFormatter, "RowFormattingInfo.calculate ", `minY:${this.minY}, height:${this.height}, currIndex: ${this.currIndex} intervals:\n${Log.join("\n", utils_list.ListUtils.map(this.intervals, (curr) => LogObjToStr.fixedInterval(curr)))}`);
94839
94856
  }
94857
+ calculateFreeIntervals(busyIntervals, outerHorizontalRowContentBounds) {
94858
+ const intervals = utils_list.ListUtils.reducedMap(busyIntervals, val => algorithms.IntervalAlgorithms.getIntersectionNonNullLength(val, outerHorizontalRowContentBounds));
94859
+ if (!intervals.length)
94860
+ return [outerHorizontalRowContentBounds.clone()];
94861
+ const lastIntervalEnd = utils_list.ListUtils.last(intervals).end;
94862
+ const result = utils_list.ListUtils.reducedMap(intervals, (curr, i) => fixed.FixedInterval.fromPositions(busyIntervals[i - 1].end, curr.start), 1);
94863
+ if (outerHorizontalRowContentBounds.start < busyIntervals[0].start)
94864
+ result.unshift(fixed.FixedInterval.fromPositions(outerHorizontalRowContentBounds.start, busyIntervals[0].start));
94865
+ if (outerHorizontalRowContentBounds.end > lastIntervalEnd)
94866
+ result.push(fixed.FixedInterval.fromPositions(lastIntervalEnd, outerHorizontalRowContentBounds.end));
94867
+ return result;
94868
+ }
94869
+ recalculate(outerHorizontalRowContentBounds) {
94870
+ const currInterval = this.currInterval;
94871
+ this.calculate(outerHorizontalRowContentBounds);
94872
+ const pos = currInterval.start + currInterval.busyWidth;
94873
+ const index = this.findIntervalIndexByPosition(pos);
94874
+ const interval = this.intervals[index];
94875
+ if (interval && interval.start < pos) {
94876
+ const avaliableWidth = interval.length - (pos - interval.start);
94877
+ interval.avaliableWidth = avaliableWidth;
94878
+ }
94879
+ this.currIndex = index;
94880
+ }
94881
+ findIntervalIndexByPosition(position) {
94882
+ let index = 0;
94883
+ while (index < this.intervals.length) {
94884
+ const interval = this.intervals[index];
94885
+ if (interval.start <= position && position < interval.end || position < interval.start)
94886
+ break;
94887
+ index++;
94888
+ }
94889
+ return index;
94890
+ }
94840
94891
  canIncrementHeightTo(newHeight) {
94841
94892
  const contentBounds = utils_list.ListUtils.map(this.intervals, (c) => new rectangle.Rectangle(c.start, this.minY, c.busyWidth, newHeight));
94842
94893
  const intersectedObjects = this.calcIntersectObjects(newHeight);
@@ -95550,7 +95601,7 @@ class RowTabInfo {
95550
95601
  const tab = this.tabPositions[ind];
95551
95602
  const oldTabPos = tab ? tab.position : Number.MAX_VALUE;
95552
95603
  if (oldTabPos != pos)
95553
- this.tabPositions.splice(pos > oldTabPos ? ind + 1 : ind, 0, new TabInfo(pos, TabAlign.Left, TabLeaderType.None, false, false));
95604
+ this.tabPositions.splice(pos > oldTabPos ? ind + 1 : ind, 0, new TabInfo(pos, TabAlign.Left, TabLeaderType.None, false, false, true));
95554
95605
  }
95555
95606
  for (let pos of this.tabPositions)
95556
95607
  pos.position += this.paragraphHorizontalBoundsStart;
@@ -95604,9 +95655,10 @@ class RowTabInfo {
95604
95655
  const lastInterval = utils_list.ListUtils.last(this.rowFormatter.rowSizesManager.rowFormattingInfo.intervals);
95605
95656
  if (tabXPosRelativePage > lastInterval.end) {
95606
95657
  if (lastInterval.end < this.rowFormatter.paragraphHorizontalBounds.end) {
95607
- if (this.rowFormatter.manager.model.compatibilitySettings.compatibilityMode < CompatibilityMode.Word2013 && tabPosition !== null) {
95608
- this.currInterval.avaliableWidth = Number.MAX_SAFE_INTEGER - this.currInterval.busyWidth;
95609
- this.currInterval.length = Number.MAX_SAFE_INTEGER;
95658
+ if (this.rowFormatter.manager.model.compatibilitySettings.compatibilityMode < CompatibilityMode.Word2013 && tabPosition && !tabPosition.isParagraphIndent) {
95659
+ const interval = this.rowFormatter.rowSizesManager.rowFormattingInfo.outerHorizontalRowContentBounds;
95660
+ interval.length = Number.MAX_SAFE_INTEGER - interval.start;
95661
+ this.rowFormatter.rowSizesManager.rowFormattingInfo.recalculate(interval);
95610
95662
  this.row.width = Number.MAX_SAFE_INTEGER;
95611
95663
  this.row.flags.set(LayoutRowStateFlags.InfinityWidth, true);
95612
95664
  return this.addTabBox();
@@ -97968,25 +98020,9 @@ class table_info_TableInfo {
97968
98020
  tableIndent.value = 0;
97969
98021
  }
97970
98022
  const tableIndentInPixels = tableIndent.asNumberNoPercentType(unit_converter/* UnitConverter */.u.twipsToPixels);
97971
- this.xPositionStart = xPosition + tableIndentInPixels + (diff.xDiff ? diff.xDiff : -firstCellLeftMargin) +
97972
- this.getShiftHorizontalPosition(xPosition);
98023
+ this.xPositionStart = xPosition + tableIndentInPixels + (diff.xDiff ? diff.xDiff : -firstCellLeftMargin);
97973
98024
  this.yPositionStart = yOffset + diff.yDiff;
97974
98025
  }
97975
- getShiftHorizontalPosition(xPosition) {
97976
- const freeSpaceFromTable = this.columnWidth - this.grid.commonWidth;
97977
- if (freeSpaceFromTable >= 0)
97978
- return 0;
97979
- const tableAlignment = this.table.getActualTableAlignment();
97980
- if (tableAlignment == TableRowAlignment.Center) {
97981
- let result = freeSpaceFromTable / 2 - xPosition;
97982
- if (result < 0 && this.isSimpleView)
97983
- result = 0;
97984
- return result;
97985
- }
97986
- else if (tableAlignment == TableRowAlignment.Right)
97987
- return freeSpaceFromTable - xPosition;
97988
- return 0;
97989
- }
97990
98026
  static getEstimatedTableWidth(table, maxWidth) {
97991
98027
  const preferredWidth = table.preferredWidth;
97992
98028
  const minWidth = 3 * table.rows[0].getTotalCellsInRowConsiderGrid();
@@ -98069,6 +98105,12 @@ class LayoutTableSizeCompressor {
98069
98105
  LayoutTableSizeCompressor.cellCompress(cell, cell.createRectangle());
98070
98106
  }
98071
98107
  static tableCompress(tableInfo, boundsRelativeColumn) {
98108
+ const intersection = rectangle.Rectangle.getIntersection(tableInfo, boundsRelativeColumn);
98109
+ const headOffset = intersection.x - tableInfo.x;
98110
+ if (headOffset > 0) {
98111
+ tableInfo.verticalBorders.forEach(b => b.xPos -= headOffset);
98112
+ tableInfo.verticalCursorBorders.forEach(b => b.xPos -= headOffset);
98113
+ }
98072
98114
  LayoutTableSizeCompressor.compress(tableInfo, boundsRelativeColumn, true, false);
98073
98115
  const boundsRelativeTable = tableInfo.clone().moveRectangle(-tableInfo.x, -tableInfo.y);
98074
98116
  for (let row of tableInfo.tableRows)
@@ -98137,8 +98179,9 @@ class LayoutTableSizeCompressor {
98137
98179
  }
98138
98180
  border.length = Math.min(border.yPos + border.length, bounds.bottom) - border.yPos;
98139
98181
  if (border.xPos < bounds.x)
98140
- return true;
98141
- border.xPos = bounds.right;
98182
+ border.xPos = bounds.x;
98183
+ else
98184
+ border.xPos = bounds.right;
98142
98185
  border.borderInfo.width = 0;
98143
98186
  return false;
98144
98187
  }
@@ -113310,13 +113353,9 @@ class RulerControl extends RulerBase {
113310
113353
  }
113311
113354
  adjust() {
113312
113355
  const viewWidth = this.controls.canvas.clientWidth;
113313
- if (viewWidth > this.controls.ruler.pageWidth)
113314
- this.initialMarginLeftElement = (viewWidth - this.pageWidth - RULLER_NUMBER_CORRECTION * 2) / 2;
113315
- else {
113316
- const paddingLeft = dom.DomUtils.pxToInt(dom.DomUtils.getCurrentStyle(this.controls.canvas).paddingLeft);
113317
- const pageAreaBorderWidth = (this.controls.canvas.scrollWidth - paddingLeft - this.pageWidth) / 2;
113318
- this.initialMarginLeftElement = paddingLeft + pageAreaBorderWidth - RULLER_NUMBER_CORRECTION;
113319
- }
113356
+ const paddingLeft = dom.DomUtils.pxToInt(dom.DomUtils.getCurrentStyle(this.controls.canvas).paddingLeft);
113357
+ const minValue = paddingLeft - RULLER_NUMBER_CORRECTION;
113358
+ this.initialMarginLeftElement = Math.max((viewWidth - this.pageWidth - RULLER_NUMBER_CORRECTION * 2) / 2, minValue);
113320
113359
  this.rootElement.style.left = this.calculateLeftOffset();
113321
113360
  this.setPaddings();
113322
113361
  this.canHandleScroll = this.controls.canvas.scrollWidth > this.controls.canvas.offsetWidth;
@@ -122329,6 +122368,7 @@ function createInnerItems(items) {
122329
122368
  }
122330
122369
 
122331
122370
  ;// CONCATENATED MODULE: ./src/client/utils/focus-helper.ts
122371
+ var focus_helper_a;
122332
122372
  class FocusHelper {
122333
122373
  static preventFocusOnClick(element) {
122334
122374
  return new FocusBlocker(element);
@@ -122341,23 +122381,24 @@ class FocusBlocker {
122341
122381
  this.addEventListeners(target);
122342
122382
  }
122343
122383
  addEventListeners(element) {
122344
- element.addEventListener("pointerdown", this.onPointerDownBinded);
122384
+ element.addEventListener("mousedown", this.onPointerDownBinded);
122345
122385
  }
122346
122386
  removeEventListeners(element) {
122347
- element.removeEventListener("pointerdown", this.onPointerDownBinded);
122387
+ element.removeEventListener("mousedown", this.onPointerDownBinded);
122348
122388
  }
122349
122389
  onPointerDown(event) {
122350
122390
  for (const element of event.composedPath()) {
122351
- if (!(element instanceof HTMLElement))
122352
- continue;
122353
122391
  if (element === this.target) {
122354
122392
  event.preventDefault();
122355
122393
  break;
122356
122394
  }
122357
- if (!this.target.contains(element) || element.tabIndex > -1)
122395
+ if (element instanceof Element && this.isFocusableElement(element))
122358
122396
  break;
122359
122397
  }
122360
122398
  }
122399
+ isFocusableElement(element) {
122400
+ return element.matches(FocusBlocker.focusableSelector);
122401
+ }
122361
122402
  dispose() {
122362
122403
  if (this.target) {
122363
122404
  this.removeEventListeners(this.target);
@@ -122365,6 +122406,21 @@ class FocusBlocker {
122365
122406
  }
122366
122407
  }
122367
122408
  }
122409
+ focus_helper_a = FocusBlocker;
122410
+ FocusBlocker.focusableSelectors = [
122411
+ 'a[href]',
122412
+ 'area[href]',
122413
+ 'input',
122414
+ 'select',
122415
+ 'textarea',
122416
+ 'button',
122417
+ 'iframe',
122418
+ 'object',
122419
+ 'embed',
122420
+ '[tabindex]:not([tabindex="-1"])',
122421
+ '[contenteditable]:not([contenteditable="false"])'
122422
+ ];
122423
+ FocusBlocker.focusableSelector = focus_helper_a.focusableSelectors.join(',');
122368
122424
 
122369
122425
  ;// CONCATENATED MODULE: ./src/client/bars/ribbon.ts
122370
122426
 
@@ -129422,7 +129478,7 @@ class ApplyStyleCommand extends CommandBase {
129422
129478
  paragraphStyle = StylesManager.getPresetParagraphStyleByName(styleName).clone();
129423
129479
  isPresetStyle = true;
129424
129480
  }
129425
- this.applyParagraphStyle(subDocumentInterval, paragraphStyle, isPresetStyle, parameter.keepDirectFormatting);
129481
+ this.applyParagraphStyle(subDocumentInterval, paragraphStyle, isPresetStyle, parameter.keepCustomFormatting);
129426
129482
  }
129427
129483
  else if (!StylesManager.isParagraphStyle(parameter.styleName) && state.characterStyleChangeEnabled) {
129428
129484
  const styleName = StylesManager.getStyleNameWithoutPrefix(parameter.styleName);
@@ -129457,7 +129513,7 @@ class ApplyStyleCommand extends CommandBase {
129457
129513
  this.modelManipulator.style.applyCharacterStyle(subDocumentInterval, characterStyle, false);
129458
129514
  }
129459
129515
  }
129460
- applyParagraphStyle(subDocumentInterval, style, isPresetStyle, keepDirectFormatting = false) {
129516
+ applyParagraphStyle(subDocumentInterval, style, isPresetStyle, keepCustomFormatting = false) {
129461
129517
  const count = this.calculateAffectedParagraphCount(subDocumentInterval);
129462
129518
  if (count > 0 && ControlOptions.isEnabled(this.control.modelManager.richOptions.control.paragraphStyle)) {
129463
129519
  const { interval, subDocument } = subDocumentInterval;
@@ -129470,8 +129526,7 @@ class ApplyStyleCommand extends CommandBase {
129470
129526
  style = isPresetStyle ? modelManipulator.model.stylesManager.addParagraphStyle(style) : style;
129471
129527
  this.history.addAndRedo(new ApplyParagraphStyleHistoryItem(modelManipulator, paragraphSubDocumentInterval, style));
129472
129528
  this.history.addAndRedo(new ParagraphUseValueHistoryItem(modelManipulator, paragraphSubDocumentInterval, 0));
129473
- if (!keepDirectFormatting)
129474
- this.history.addAndRedo(new FontUseValueHistoryItem(modelManipulator, paragraphSubDocumentInterval, 0));
129529
+ this.history.addAndRedo(new FontUseValueHistoryItem(modelManipulator, paragraphSubDocumentInterval, 0, keepCustomFormatting));
129475
129530
  this.history.addAndRedo(new AddParagraphToListHistoryItem(modelManipulator, subDocument, paragraphIndex, NumberingList.NumberingListNotSettedIndex, -1));
129476
129531
  }
129477
129532
  }
@@ -136006,7 +136061,7 @@ class SetParagraphLevelCommandBase extends CommandBase {
136006
136061
  if (!paragraphStyle)
136007
136062
  paragraphStyle = StylesManager.getPresetParagraphStyleByName(styleName);
136008
136063
  if (paragraphStyle) {
136009
- const commandOptions = new CommandSimpleOptions(this.control, { styleName: StylesManager.paragraphPrefix + styleName, keepDirectFormatting: true });
136064
+ const commandOptions = new CommandSimpleOptions(this.control, { styleName: StylesManager.paragraphPrefix + styleName, keepCustomFormatting: true });
136010
136065
  this.commandManager.getCommand(RichEditClientCommand.ChangeStyle).execute(this.commandManager.isPublicApiCall, commandOptions);
136011
136066
  }
136012
136067
  else {