@difizen/libro-core 0.3.49 → 0.3.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"libro-context-key.d.ts","sourceRoot":"","sources":["../src/libro-context-key.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAItD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,qBACa,eAAe;IAC1B,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAC9C,SAAS,CAAC,wBAAwB,CAAC,EAAE,UAAU,CAAC;IAChD,kBAAkB,UAAQ;IAC1B,SAAS,CAAC,aAAa,UAAS;IAChC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7B,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;gBAGL,iBAAiB,EAAE,iBAAiB,EACzC,YAAY,EAAE,YAAY;IASlD,kBAAkB,aAGhB;IAEF,iBAAiB,aAGf;IAEF,SAAS,CAAC,WAAW;IAarB,SAAS,CAAC,UAAU;
|
|
1
|
+
{"version":3,"file":"libro-context-key.d.ts","sourceRoot":"","sources":["../src/libro-context-key.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAItD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,qBACa,eAAe;IAC1B,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAC9C,SAAS,CAAC,wBAAwB,CAAC,EAAE,UAAU,CAAC;IAChD,kBAAkB,UAAQ;IAC1B,SAAS,CAAC,aAAa,UAAS;IAChC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7B,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;gBAGL,iBAAiB,EAAE,iBAAiB,EACzC,YAAY,EAAE,YAAY;IASlD,kBAAkB,aAGhB;IAEF,iBAAiB,aAGf;IAEF,SAAS,CAAC,WAAW;IAarB,SAAS,CAAC,UAAU;IAapB,SAAS,CAAC,gBAAgB;IAO1B,SAAS,CAAC,cAAc,aActB;CACH;AACD;;GAEG;AACH,eAAO,MAAM,eAAe,wBAAkB,CAAC"}
|
package/es/libro-context-key.js
CHANGED
|
@@ -27,14 +27,16 @@ export var LibroContextKey = (_dec = singleton(), _dec(_class = /*#__PURE__*/fun
|
|
|
27
27
|
};
|
|
28
28
|
this.enableCommandMode = function () {
|
|
29
29
|
_this.commandModeEnabled = true;
|
|
30
|
-
_this.commandMode.set(_this.isCommandMode);
|
|
30
|
+
_this.commandMode.set(_this.isCommandMode && !!_this.libroService.focus);
|
|
31
31
|
};
|
|
32
32
|
this.listenToActive = function () {
|
|
33
33
|
var active = _this.libroService.active;
|
|
34
34
|
if (active) {
|
|
35
|
+
_this.isCommandMode = !!active.model.commandMode;
|
|
36
|
+
_this.commandMode.set(_this.isCommandMode && _this.commandModeEnabled && !!_this.libroService.focus);
|
|
35
37
|
_this.toDisposeOnActiveChanged = active.model.onCommandModeChanged(function () {
|
|
36
38
|
_this.isCommandMode = !!active.model.commandMode;
|
|
37
|
-
_this.commandMode.set(_this.isCommandMode && _this.commandModeEnabled);
|
|
39
|
+
_this.commandMode.set(_this.isCommandMode && _this.commandModeEnabled && !!_this.libroService.focus);
|
|
38
40
|
});
|
|
39
41
|
}
|
|
40
42
|
};
|
|
@@ -65,6 +67,7 @@ export var LibroContextKey = (_dec = singleton(), _dec(_class = /*#__PURE__*/fun
|
|
|
65
67
|
var _this3 = this;
|
|
66
68
|
this.libroService.onFocusChanged(function () {
|
|
67
69
|
_this3.focus.set(!!_this3.libroService.focus);
|
|
70
|
+
_this3.commandMode.set(_this3.isCommandMode && _this3.commandModeEnabled && !!_this3.libroService.focus);
|
|
68
71
|
});
|
|
69
72
|
this.focus = this.contextKeyService.createKey(LibroContextKeys.focus, !!this.libroService.focus);
|
|
70
73
|
}
|
|
@@ -72,7 +75,7 @@ export var LibroContextKey = (_dec = singleton(), _dec(_class = /*#__PURE__*/fun
|
|
|
72
75
|
key: "setupCommandMode",
|
|
73
76
|
value: function setupCommandMode() {
|
|
74
77
|
var _this$libroService$ac;
|
|
75
|
-
this.commandMode = this.contextKeyService.createKey(LibroContextKeys.commandMode, !!((_this$libroService$ac = this.libroService.active) !== null && _this$libroService$ac !== void 0 && _this$libroService$ac.model.commandMode));
|
|
78
|
+
this.commandMode = this.contextKeyService.createKey(LibroContextKeys.commandMode, !!((_this$libroService$ac = this.libroService.active) !== null && _this$libroService$ac !== void 0 && _this$libroService$ac.model.commandMode) && !!this.libroService.focus);
|
|
76
79
|
this.listenToActive();
|
|
77
80
|
}
|
|
78
81
|
}]);
|
package/es/libro-view.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"libro-view.d.ts","sourceRoot":"","sources":["../src/libro-view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAM7D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAKL,QAAQ,EAIR,WAAW,EAEX,QAAQ,EAER,oBAAoB,EACpB,OAAO,EAIP,oBAAoB,EAErB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,KAAK,EAAE,EAAE,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAI1E,OAAO,EACL,WAAW,EAIZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAyB,MAAM,qBAAqB,CAAC;AAC7E,OAAO,KAAK,EACV,WAAW,EACX,QAAQ,EACR,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,cAAc,EACd,qBAAqB,EACtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAiB,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,cAAc,CAAC;AAEtB,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IACvB,KAAK,EAAE,SAAS,EAAE,CAAC;CACpB;AAED,eAAO,MAAM,qBAAqB,8CAoJhC,CAAC;AAEH,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"libro-view.d.ts","sourceRoot":"","sources":["../src/libro-view.tsx"],"names":[],"mappings":"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"}
|
package/es/libro-view.js
CHANGED
|
@@ -195,15 +195,12 @@ export var LibroRender = /*#__PURE__*/forwardRef(function LibroRender(props, ref
|
|
|
195
195
|
if (typeof ref === 'function') {
|
|
196
196
|
return;
|
|
197
197
|
}
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
}
|
|
202
|
-
// focus编辑器外部区域
|
|
203
|
-
if (ref !== null && ref !== void 0 && (_ref$current = ref.current) !== null && _ref$current !== void 0 && _ref$current.contains(e.relatedTarget)) {
|
|
198
|
+
var target = e.relatedTarget;
|
|
199
|
+
var inside = target ? ref === null || ref === void 0 || (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.contains(target) : false;
|
|
200
|
+
if (inside) {
|
|
204
201
|
var _ref$current2;
|
|
205
202
|
var dndDom = ref === null || ref === void 0 || (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.getElementsByClassName('libro-dnd-cells-container')[0];
|
|
206
|
-
if (!(dndDom !== null && dndDom !== void 0 && dndDom.contains(
|
|
203
|
+
if (!(dndDom !== null && dndDom !== void 0 && dndDom.contains(target)) && (!instance.model.inputEditable || !instance.model.outputEditable || !instance.model.cellsEditable) && !instance.model.runnable) {
|
|
207
204
|
instance.selectCell(undefined);
|
|
208
205
|
}
|
|
209
206
|
} else {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@difizen/libro-core",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.51",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"libro",
|
|
@@ -34,10 +34,10 @@
|
|
|
34
34
|
],
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@ant-design/icons": "^5.1.0",
|
|
37
|
-
"@difizen/libro-code-editor": "^0.3.
|
|
38
|
-
"@difizen/libro-common": "^0.3.
|
|
39
|
-
"@difizen/libro-shared-model": "^0.3.
|
|
40
|
-
"@difizen/libro-virtualized": "^0.3.
|
|
37
|
+
"@difizen/libro-code-editor": "^0.3.51",
|
|
38
|
+
"@difizen/libro-common": "^0.3.51",
|
|
39
|
+
"@difizen/libro-shared-model": "^0.3.51",
|
|
40
|
+
"@difizen/libro-virtualized": "^0.3.51",
|
|
41
41
|
"@difizen/mana-app": "latest",
|
|
42
42
|
"@difizen/mana-l10n": "latest",
|
|
43
43
|
"@difizen/mana-react": "latest",
|
package/src/libro-context-key.ts
CHANGED
|
@@ -35,7 +35,7 @@ export class LibroContextKey {
|
|
|
35
35
|
|
|
36
36
|
enableCommandMode = () => {
|
|
37
37
|
this.commandModeEnabled = true;
|
|
38
|
-
this.commandMode.set(this.isCommandMode);
|
|
38
|
+
this.commandMode.set(this.isCommandMode && !!this.libroService.focus);
|
|
39
39
|
};
|
|
40
40
|
|
|
41
41
|
protected setupActive() {
|
|
@@ -54,6 +54,9 @@ export class LibroContextKey {
|
|
|
54
54
|
protected setupFocus() {
|
|
55
55
|
this.libroService.onFocusChanged(() => {
|
|
56
56
|
this.focus.set(!!this.libroService.focus);
|
|
57
|
+
this.commandMode.set(
|
|
58
|
+
this.isCommandMode && this.commandModeEnabled && !!this.libroService.focus,
|
|
59
|
+
);
|
|
57
60
|
});
|
|
58
61
|
this.focus = this.contextKeyService.createKey<boolean>(
|
|
59
62
|
LibroContextKeys.focus,
|
|
@@ -64,16 +67,22 @@ export class LibroContextKey {
|
|
|
64
67
|
protected setupCommandMode() {
|
|
65
68
|
this.commandMode = this.contextKeyService.createKey<boolean>(
|
|
66
69
|
LibroContextKeys.commandMode,
|
|
67
|
-
!!this.libroService.active?.model.commandMode,
|
|
70
|
+
!!this.libroService.active?.model.commandMode && !!this.libroService.focus,
|
|
68
71
|
);
|
|
69
72
|
this.listenToActive();
|
|
70
73
|
}
|
|
71
74
|
protected listenToActive = () => {
|
|
72
75
|
const active = this.libroService.active;
|
|
73
76
|
if (active) {
|
|
77
|
+
this.isCommandMode = !!active.model.commandMode;
|
|
78
|
+
this.commandMode.set(
|
|
79
|
+
this.isCommandMode && this.commandModeEnabled && !!this.libroService.focus,
|
|
80
|
+
);
|
|
74
81
|
this.toDisposeOnActiveChanged = active.model.onCommandModeChanged(() => {
|
|
75
82
|
this.isCommandMode = !!active.model.commandMode;
|
|
76
|
-
this.commandMode.set(
|
|
83
|
+
this.commandMode.set(
|
|
84
|
+
this.isCommandMode && this.commandModeEnabled && !!this.libroService.focus,
|
|
85
|
+
);
|
|
77
86
|
});
|
|
78
87
|
}
|
|
79
88
|
};
|
package/src/libro-view.tsx
CHANGED
|
@@ -262,18 +262,16 @@ export const LibroRender = forwardRef<HTMLDivElement>(function LibroRender(props
|
|
|
262
262
|
if (typeof ref === 'function') {
|
|
263
263
|
return;
|
|
264
264
|
}
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
// focus编辑器外部区域
|
|
270
|
-
if (ref?.current?.contains(e.relatedTarget)) {
|
|
265
|
+
const target = e.relatedTarget as Node | null;
|
|
266
|
+
const inside = target ? ref?.current?.contains(target) : false;
|
|
267
|
+
|
|
268
|
+
if (inside) {
|
|
271
269
|
const dndDom = ref?.current?.getElementsByClassName(
|
|
272
270
|
'libro-dnd-cells-container',
|
|
273
271
|
)[0];
|
|
274
272
|
|
|
275
273
|
if (
|
|
276
|
-
!dndDom?.contains(
|
|
274
|
+
!dndDom?.contains(target as Node) &&
|
|
277
275
|
(!instance.model.inputEditable ||
|
|
278
276
|
!instance.model.outputEditable ||
|
|
279
277
|
!instance.model.cellsEditable) &&
|