@univerjs/engine-render 0.21.0 → 0.21.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/index.js +12 -7
- package/lib/es/index.js +11 -6
- package/lib/types/components/sheets/sheet.render-skeleton.d.ts +1 -0
- package/lib/types/render-manager/render-manager.service.d.ts +4 -4
- package/lib/types/render-manager/render-unit.d.ts +4 -2
- package/lib/umd/index.js +1 -1
- package/package.json +3 -3
package/lib/cjs/index.js
CHANGED
|
@@ -31,7 +31,7 @@ let _univerjs_core = require("@univerjs/core");
|
|
|
31
31
|
let cjk_regex = require("cjk-regex");
|
|
32
32
|
cjk_regex = __toESM(cjk_regex);
|
|
33
33
|
let rxjs = require("rxjs");
|
|
34
|
-
let
|
|
34
|
+
let opentype_js_dist_opentype_module_js = require("opentype.js/dist/opentype.module.js");
|
|
35
35
|
let franc_min = require("franc-min");
|
|
36
36
|
let _floating_ui_dom = require("@floating-ui/dom");
|
|
37
37
|
let _floating_ui_utils = require("@floating-ui/utils");
|
|
@@ -15780,7 +15780,7 @@ function shapeChunk(content, charPosition, used, families, style) {
|
|
|
15780
15780
|
});
|
|
15781
15781
|
let font = fontCache.get(fontInfo.fullName);
|
|
15782
15782
|
if (!font) {
|
|
15783
|
-
font = (0,
|
|
15783
|
+
font = (0, opentype_js_dist_opentype_module_js.parse)(fontBuffer);
|
|
15784
15784
|
fontCache.set(fontInfo.fullName, font);
|
|
15785
15785
|
}
|
|
15786
15786
|
const results = [];
|
|
@@ -17341,6 +17341,8 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends _univerjs_core.Sheet
|
|
|
17341
17341
|
this._resetCache();
|
|
17342
17342
|
this.makeDirty(true);
|
|
17343
17343
|
}));
|
|
17344
|
+
}
|
|
17345
|
+
registerGetCellHeight() {
|
|
17344
17346
|
this.disposeWithMe(this.worksheet.__registerGetCellHeight((row, col) => {
|
|
17345
17347
|
var _this$calculateAutoHe;
|
|
17346
17348
|
return (_this$calculateAutoHe = this.calculateAutoHeightForCell(row, col)) !== null && _this$calculateAutoHe !== void 0 ? _this$calculateAutoHe : 0;
|
|
@@ -24636,7 +24638,7 @@ Engine = __decorate([__decorateParam(2, ICanvasColorService)], Engine);
|
|
|
24636
24638
|
//#endregion
|
|
24637
24639
|
//#region package.json
|
|
24638
24640
|
var name = "@univerjs/engine-render";
|
|
24639
|
-
var version = "0.21.
|
|
24641
|
+
var version = "0.21.1";
|
|
24640
24642
|
|
|
24641
24643
|
//#endregion
|
|
24642
24644
|
//#region src/config/config.ts
|
|
@@ -27364,6 +27366,7 @@ let RenderUnit = class RenderUnit extends _univerjs_core.Disposable {
|
|
|
27364
27366
|
return this._renderContext.components;
|
|
27365
27367
|
}
|
|
27366
27368
|
constructor(init, parentInjector) {
|
|
27369
|
+
var _init$createUnitOptio;
|
|
27367
27370
|
super();
|
|
27368
27371
|
_defineProperty(this, "isRenderUnit", true);
|
|
27369
27372
|
_defineProperty(this, "_activated$", new rxjs.BehaviorSubject(true));
|
|
@@ -27384,6 +27387,7 @@ let RenderUnit = class RenderUnit extends _univerjs_core.Disposable {
|
|
|
27384
27387
|
activate: () => this._activated$.next(true),
|
|
27385
27388
|
deactivate: () => this._activated$.next(false)
|
|
27386
27389
|
};
|
|
27390
|
+
if (((_init$createUnitOptio = init.createUnitOptions) === null || _init$createUnitOptio === void 0 ? void 0 : _init$createUnitOptio.makeCurrent) === false) this.deactivate();
|
|
27387
27391
|
}
|
|
27388
27392
|
dispose() {
|
|
27389
27393
|
this._injector.dispose();
|
|
@@ -27515,8 +27519,8 @@ let RenderManagerService = class RenderManagerService extends _univerjs_core.Dis
|
|
|
27515
27519
|
* @param unitId
|
|
27516
27520
|
* @returns renderUnit:IRender
|
|
27517
27521
|
*/
|
|
27518
|
-
createRender(unitId) {
|
|
27519
|
-
const renderer = this._createRender(unitId, this._injector.createInstance(Engine, unitId, void 0));
|
|
27522
|
+
createRender(unitId, createUnitOptions) {
|
|
27523
|
+
const renderer = this._createRender(unitId, this._injector.createInstance(Engine, unitId, void 0), true, createUnitOptions);
|
|
27520
27524
|
this._renderCreated$.next(renderer);
|
|
27521
27525
|
return renderer;
|
|
27522
27526
|
}
|
|
@@ -27540,7 +27544,7 @@ let RenderManagerService = class RenderManagerService extends _univerjs_core.Dis
|
|
|
27540
27544
|
* @param isMainScene
|
|
27541
27545
|
* @returns renderUnit:IRender
|
|
27542
27546
|
*/
|
|
27543
|
-
_createRender(unitId, engine, isMainScene = true) {
|
|
27547
|
+
_createRender(unitId, engine, isMainScene = true, createUnitOptions) {
|
|
27544
27548
|
const existItem = this.getRenderById(unitId);
|
|
27545
27549
|
let shouldDestroyEngine = true;
|
|
27546
27550
|
if (existItem != null) {
|
|
@@ -27561,7 +27565,8 @@ let RenderManagerService = class RenderManagerService extends _univerjs_core.Dis
|
|
|
27561
27565
|
unit,
|
|
27562
27566
|
engine,
|
|
27563
27567
|
scene,
|
|
27564
|
-
isMainScene
|
|
27568
|
+
isMainScene,
|
|
27569
|
+
createUnitOptions
|
|
27565
27570
|
});
|
|
27566
27571
|
this._addRenderUnit(unitId, renderUnit);
|
|
27567
27572
|
this._tryAddRenderDependencies(renderUnit, ctorOfDeps);
|
package/lib/es/index.js
CHANGED
|
@@ -2,7 +2,7 @@ import { t as EnUs } from "./en-us-ClVoWMyT.js";
|
|
|
2
2
|
import { AlignTypeH, AlignTypeV, BaselineOffset, BooleanNumber, BorderStyleTypes, BulletAlignment, COLORS, CellValueType, ColorKit, ColumnSeparatorType, CustomDecorationType, CustomRangeType, DEFAULT_EMPTY_DOCUMENT_VALUE, DEFAULT_STYLES, DataStreamTreeNodeType, DataStreamTreeTokenType, Disposable, DisposableCollection, DocumentDataModel, DocumentFlavor, EventSubject, FontStyleType, GridType, HorizontalAlign, IConfigService, IContextService, IUniverInstanceService, Inject, Injector, ListGlyphType, LocaleService, MOVE_BUFFER_VALUE, NAMED_STYLE_MAP, NAMED_STYLE_SPACE_MAP, NumberUnitType, ObjectMatrix, ObjectRelativeFromH, ObjectRelativeFromV, PRESET_LIST_TYPE, PageOrientType, Plugin, PositionedObjectLayoutType, Range, Rectangle, Registry, SectionType, SheetSkeleton, Skeleton, SpacingRule, TableAlignmentType, TableRowHeightRule, TableTextWrapType, TextDecoration, ThemeService, Tools, UniverInstanceType, VerticalAlign, VerticalAlignmentType, WrapStrategy, WrapTextType, addLinkToDocumentModel, checkParagraphHasIndentByStyle, createIdentifier, deleteContent, extractPureTextFromCell, getCellInfoInMergeData, getColorStyle, horizontalLineSegmentsSubtraction, insertTextToContent, invertColorByMatrix, isClassDependencyItem, isNullCell, isWhiteColor, merge, mergeWith, numberToABC, numberToListABC, registerDependencies, remove, requestImmediateMacroTask, searchArray, sortRules, sortRulesByDesc, toDisposable } from "@univerjs/core";
|
|
3
3
|
import * as cjk from "cjk-regex";
|
|
4
4
|
import { BehaviorSubject, Observable, Subject, Subscription, debounceTime, distinctUntilChanged, shareReplay, startWith } from "rxjs";
|
|
5
|
-
import { parse } from "opentype.js/dist/opentype.module";
|
|
5
|
+
import { parse } from "opentype.js/dist/opentype.module.js";
|
|
6
6
|
import { franc } from "franc-min";
|
|
7
7
|
import { getOverflowAncestors } from "@floating-ui/dom";
|
|
8
8
|
import { floor, max, min } from "@floating-ui/utils";
|
|
@@ -17312,6 +17312,8 @@ let SpreadsheetSkeleton = class SpreadsheetSkeleton extends SheetSkeleton {
|
|
|
17312
17312
|
this._resetCache();
|
|
17313
17313
|
this.makeDirty(true);
|
|
17314
17314
|
}));
|
|
17315
|
+
}
|
|
17316
|
+
registerGetCellHeight() {
|
|
17315
17317
|
this.disposeWithMe(this.worksheet.__registerGetCellHeight((row, col) => {
|
|
17316
17318
|
var _this$calculateAutoHe;
|
|
17317
17319
|
return (_this$calculateAutoHe = this.calculateAutoHeightForCell(row, col)) !== null && _this$calculateAutoHe !== void 0 ? _this$calculateAutoHe : 0;
|
|
@@ -24607,7 +24609,7 @@ Engine = __decorate([__decorateParam(2, ICanvasColorService)], Engine);
|
|
|
24607
24609
|
//#endregion
|
|
24608
24610
|
//#region package.json
|
|
24609
24611
|
var name = "@univerjs/engine-render";
|
|
24610
|
-
var version = "0.21.
|
|
24612
|
+
var version = "0.21.1";
|
|
24611
24613
|
|
|
24612
24614
|
//#endregion
|
|
24613
24615
|
//#region src/config/config.ts
|
|
@@ -27335,6 +27337,7 @@ let RenderUnit = class RenderUnit extends Disposable {
|
|
|
27335
27337
|
return this._renderContext.components;
|
|
27336
27338
|
}
|
|
27337
27339
|
constructor(init, parentInjector) {
|
|
27340
|
+
var _init$createUnitOptio;
|
|
27338
27341
|
super();
|
|
27339
27342
|
_defineProperty(this, "isRenderUnit", true);
|
|
27340
27343
|
_defineProperty(this, "_activated$", new BehaviorSubject(true));
|
|
@@ -27355,6 +27358,7 @@ let RenderUnit = class RenderUnit extends Disposable {
|
|
|
27355
27358
|
activate: () => this._activated$.next(true),
|
|
27356
27359
|
deactivate: () => this._activated$.next(false)
|
|
27357
27360
|
};
|
|
27361
|
+
if (((_init$createUnitOptio = init.createUnitOptions) === null || _init$createUnitOptio === void 0 ? void 0 : _init$createUnitOptio.makeCurrent) === false) this.deactivate();
|
|
27358
27362
|
}
|
|
27359
27363
|
dispose() {
|
|
27360
27364
|
this._injector.dispose();
|
|
@@ -27486,8 +27490,8 @@ let RenderManagerService = class RenderManagerService extends Disposable {
|
|
|
27486
27490
|
* @param unitId
|
|
27487
27491
|
* @returns renderUnit:IRender
|
|
27488
27492
|
*/
|
|
27489
|
-
createRender(unitId) {
|
|
27490
|
-
const renderer = this._createRender(unitId, this._injector.createInstance(Engine, unitId, void 0));
|
|
27493
|
+
createRender(unitId, createUnitOptions) {
|
|
27494
|
+
const renderer = this._createRender(unitId, this._injector.createInstance(Engine, unitId, void 0), true, createUnitOptions);
|
|
27491
27495
|
this._renderCreated$.next(renderer);
|
|
27492
27496
|
return renderer;
|
|
27493
27497
|
}
|
|
@@ -27511,7 +27515,7 @@ let RenderManagerService = class RenderManagerService extends Disposable {
|
|
|
27511
27515
|
* @param isMainScene
|
|
27512
27516
|
* @returns renderUnit:IRender
|
|
27513
27517
|
*/
|
|
27514
|
-
_createRender(unitId, engine, isMainScene = true) {
|
|
27518
|
+
_createRender(unitId, engine, isMainScene = true, createUnitOptions) {
|
|
27515
27519
|
const existItem = this.getRenderById(unitId);
|
|
27516
27520
|
let shouldDestroyEngine = true;
|
|
27517
27521
|
if (existItem != null) {
|
|
@@ -27532,7 +27536,8 @@ let RenderManagerService = class RenderManagerService extends Disposable {
|
|
|
27532
27536
|
unit,
|
|
27533
27537
|
engine,
|
|
27534
27538
|
scene,
|
|
27535
|
-
isMainScene
|
|
27539
|
+
isMainScene,
|
|
27540
|
+
createUnitOptions
|
|
27536
27541
|
});
|
|
27537
27542
|
this._addRenderUnit(unitId, renderUnit);
|
|
27538
27543
|
this._tryAddRenderDependencies(renderUnit, ctorOfDeps);
|
|
@@ -69,6 +69,7 @@ export declare class SpreadsheetSkeleton extends SheetSkeleton {
|
|
|
69
69
|
private _gridlinesColor;
|
|
70
70
|
private _scene;
|
|
71
71
|
constructor(worksheet: Worksheet, _styles: Styles, _localeService: LocaleService, _contextService: IContextService, _configService: IConfigService, _injector: Injector);
|
|
72
|
+
registerGetCellHeight(): void;
|
|
72
73
|
setScene(scene: Scene): void;
|
|
73
74
|
_updateLayout(): void;
|
|
74
75
|
/**
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import type { Dependency, DependencyIdentifier, IDisposable, Nullable, UnitModel } from '@univerjs/core';
|
|
16
|
+
import type { Dependency, DependencyIdentifier, ICreateUnitOptions, IDisposable, Nullable, UnitModel } from '@univerjs/core';
|
|
17
17
|
import type { Observable } from 'rxjs';
|
|
18
18
|
import type { BaseObject } from '../base-object';
|
|
19
19
|
import type { DocComponent } from '../components/docs/doc-component';
|
|
@@ -31,7 +31,7 @@ export interface IRenderManagerService extends IDisposable {
|
|
|
31
31
|
* @param unitId
|
|
32
32
|
* @returns renderUnit:IRender
|
|
33
33
|
*/
|
|
34
|
-
createRender(unitId: string): IRender;
|
|
34
|
+
createRender(unitId: string, createUnitOptions?: ICreateUnitOptions): IRender;
|
|
35
35
|
removeRender(unitId: string): void;
|
|
36
36
|
/**
|
|
37
37
|
* Get RenderUnit By Id, RenderUnit implements IRender
|
|
@@ -97,7 +97,7 @@ export declare class RenderManagerService extends Disposable implements IRenderM
|
|
|
97
97
|
* @param unitId
|
|
98
98
|
* @returns renderUnit:IRender
|
|
99
99
|
*/
|
|
100
|
-
createRender(unitId: string): IRender;
|
|
100
|
+
createRender(unitId: string, createUnitOptions?: ICreateUnitOptions): IRender;
|
|
101
101
|
getAllRenderersOfType(type: UniverInstanceType): RenderUnit[];
|
|
102
102
|
/**
|
|
103
103
|
* init deps by injector.get(dep), and injector derives from renderer.
|
|
@@ -112,7 +112,7 @@ export declare class RenderManagerService extends Disposable implements IRenderM
|
|
|
112
112
|
* @param isMainScene
|
|
113
113
|
* @returns renderUnit:IRender
|
|
114
114
|
*/
|
|
115
|
-
protected _createRender(unitId: string, engine: Engine, isMainScene?: boolean): IRender;
|
|
115
|
+
protected _createRender(unitId: string, engine: Engine, isMainScene?: boolean, createUnitOptions?: ICreateUnitOptions): IRender;
|
|
116
116
|
addRender(unitId: string, renderUnit: IRender): void;
|
|
117
117
|
private _addRenderUnit;
|
|
118
118
|
removeRender(unitId: string): void;
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import type { Dependency, DependencyIdentifier, IDisposable, Nullable, UnitModel, UniverInstanceType } from '@univerjs/core';
|
|
16
|
+
import type { Dependency, DependencyIdentifier, ICreateUnitOptions, IDisposable, Nullable, UnitModel, UniverInstanceType } from '@univerjs/core';
|
|
17
17
|
import type { Observable } from 'rxjs';
|
|
18
18
|
import type { Engine } from '../engine';
|
|
19
19
|
import type { Scene } from '../scene';
|
|
@@ -85,7 +85,9 @@ export declare class RenderUnit extends Disposable implements IRender {
|
|
|
85
85
|
set scene(scene: Scene);
|
|
86
86
|
get scene(): Scene;
|
|
87
87
|
get components(): Map<string, RenderComponentType>;
|
|
88
|
-
constructor(init: Pick<IRenderContext, 'engine' | 'scene' | 'isMainScene' | 'unit'
|
|
88
|
+
constructor(init: Pick<IRenderContext, 'engine' | 'scene' | 'isMainScene' | 'unit'> & {
|
|
89
|
+
createUnitOptions?: ICreateUnitOptions;
|
|
90
|
+
}, parentInjector: Injector);
|
|
89
91
|
dispose(): void;
|
|
90
92
|
/**
|
|
91
93
|
* Get a dependency from the RenderUnit's injector.
|