@ray-js/runtime 1.2.0-beta.1 → 1.3.0-beta.0
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/PageInstance.js +64 -34
- package/lib/PageInstanceContext.js +2 -2
- package/lib/current.js +6 -6
- package/lib/index.js +14 -8
- package/lib/index.mini.js +1 -1
- package/lib/instance.js +1 -1
- package/lib/lifecycle.js +48 -24
- package/lib/useAppEvent/index.js +2 -3
- package/lib/usePageEvent/index.js +3 -3
- package/package.json +4 -4
- package/lib/withPageLifecycle/index.jsx +0 -55
package/lib/PageInstance.js
CHANGED
|
@@ -1,48 +1,78 @@
|
|
|
1
|
+
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
|
2
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
3
|
+
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
4
|
+
import "core-js/modules/es.array.splice.js";
|
|
5
|
+
import "core-js/modules/es.array.index-of.js";
|
|
6
|
+
import "core-js/modules/es.object.to-string.js";
|
|
7
|
+
import "core-js/modules/web.dom-collections.for-each.js";
|
|
8
|
+
|
|
1
9
|
/**
|
|
2
10
|
* 管理 web 页面生命周期的调用
|
|
3
11
|
* 小程序端
|
|
4
12
|
* TODO: 支持 RN
|
|
5
13
|
*/
|
|
6
|
-
|
|
7
|
-
export
|
|
8
|
-
|
|
14
|
+
var UniqueId = 0;
|
|
15
|
+
export var generateUniqueId = function () {
|
|
16
|
+
return UniqueId += 1;
|
|
9
17
|
};
|
|
10
|
-
export
|
|
11
|
-
|
|
18
|
+
export var generatePageKey = function (uniqueId) {
|
|
19
|
+
return 'Page-' + uniqueId;
|
|
12
20
|
};
|
|
13
|
-
export
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
21
|
+
export var PageInstance = /*#__PURE__*/function () {
|
|
22
|
+
function PageInstance(uniqueId) {
|
|
23
|
+
_classCallCheck(this, PageInstance);
|
|
24
|
+
|
|
25
|
+
this.uniqueId = uniqueId !== null && uniqueId !== void 0 ? uniqueId : generateUniqueId();
|
|
26
|
+
this.lifecycleCallback = {};
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* 注册生命周期事件, 页面运行底层实例
|
|
30
|
+
* @param lifecycleName - 事件名
|
|
31
|
+
* @param context - fn 上下文
|
|
32
|
+
* @param fn - 回调函数
|
|
33
|
+
*/
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
_createClass(PageInstance, [{
|
|
37
|
+
key: "registerLifecycle",
|
|
38
|
+
value: function registerLifecycle(lifecycleName, context, fn) {
|
|
39
|
+
var _this = this;
|
|
40
|
+
|
|
41
|
+
this.lifecycleCallback[lifecycleName] = this.lifecycleCallback[lifecycleName] || [];
|
|
42
|
+
var fnObj = {
|
|
43
|
+
context: context,
|
|
44
|
+
fn: fn
|
|
45
|
+
}; // 先注册的函数先调用
|
|
46
|
+
|
|
47
|
+
this.lifecycleCallback[lifecycleName].push(fnObj);
|
|
48
|
+
return function () {
|
|
49
|
+
_this.lifecycleCallback[lifecycleName].splice(_this.lifecycleCallback[lifecycleName].indexOf(fnObj), 1);
|
|
50
|
+
};
|
|
32
51
|
}
|
|
33
52
|
/**
|
|
34
53
|
* 触发生命周期函数
|
|
35
54
|
* @param lifecycleName
|
|
36
55
|
* @param args
|
|
37
56
|
*/
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
57
|
+
|
|
58
|
+
}, {
|
|
59
|
+
key: "callLifecycle",
|
|
60
|
+
value: function callLifecycle(params) {
|
|
61
|
+
var callbacks = this.lifecycleCallback[params.name] || [];
|
|
62
|
+
var result;
|
|
63
|
+
|
|
64
|
+
_toConsumableArray(callbacks).forEach(function (_ref) {
|
|
65
|
+
var _ref$context = _ref.context,
|
|
66
|
+
context = _ref$context === void 0 ? null : _ref$context,
|
|
67
|
+
fn = _ref.fn;
|
|
68
|
+
result = fn.apply(context, Array.isArray(params.args) ? params.args : [params.args]);
|
|
69
|
+
});
|
|
70
|
+
|
|
71
|
+
if (result) {
|
|
72
|
+
return result;
|
|
73
|
+
}
|
|
47
74
|
}
|
|
48
|
-
}
|
|
75
|
+
}]);
|
|
76
|
+
|
|
77
|
+
return PageInstance;
|
|
78
|
+
}();
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
|
|
2
|
+
var PageInstanceContext = /*#__PURE__*/React.createContext(null);
|
|
3
3
|
PageInstanceContext.displayName = 'PageInstanceContext';
|
|
4
|
-
export { PageInstanceContext };
|
|
4
|
+
export { PageInstanceContext };
|
package/lib/current.js
CHANGED
package/lib/index.js
CHANGED
|
@@ -1,15 +1,21 @@
|
|
|
1
1
|
export { lifecycle } from './lifecycle';
|
|
2
2
|
export { PageInstance } from './PageInstance';
|
|
3
3
|
export { PageInstanceContext } from './PageInstanceContext';
|
|
4
|
-
export { useAppEvent } from './useAppEvent';
|
|
5
|
-
|
|
4
|
+
export { useAppEvent } from './useAppEvent'; // 页面事件
|
|
5
|
+
|
|
6
6
|
export { usePageEvent } from './usePageEvent';
|
|
7
7
|
export { withPageLifecycle } from './withPageLifecycle';
|
|
8
8
|
export { getCurrent } from './current';
|
|
9
|
-
export
|
|
10
|
-
|
|
11
|
-
console.warn(`// TODO 暂未实现钩子 'useQuery'`);
|
|
12
|
-
return null;
|
|
9
|
+
export var useNativeEffect = function () {
|
|
10
|
+
return console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'useNativeEffect'");
|
|
13
11
|
};
|
|
14
|
-
export
|
|
15
|
-
|
|
12
|
+
export var useQuery = function () {
|
|
13
|
+
console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'useQuery'");
|
|
14
|
+
return null;
|
|
15
|
+
};
|
|
16
|
+
export var usePageInstance = function () {
|
|
17
|
+
return console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'usePageInstance'");
|
|
18
|
+
};
|
|
19
|
+
export var useComponentInstance = function () {
|
|
20
|
+
return console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'useComponentInstance'");
|
|
21
|
+
};
|
package/lib/index.mini.js
CHANGED
|
@@ -2,4 +2,4 @@ export * from '@ray-core/runtime';
|
|
|
2
2
|
export { withPageLifecycle } from './withPageLifecycle';
|
|
3
3
|
export { lifecycle } from './lifecycle';
|
|
4
4
|
export { PageInstance } from './PageInstance';
|
|
5
|
-
export { PageInstanceContext } from './PageInstanceContext';
|
|
5
|
+
export { PageInstanceContext } from './PageInstanceContext';
|
package/lib/instance.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export {};
|
|
1
|
+
export {};
|
package/lib/lifecycle.js
CHANGED
|
@@ -1,17 +1,31 @@
|
|
|
1
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
2
|
+
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
3
|
+
import "core-js/modules/es.array.iterator.js";
|
|
4
|
+
import "core-js/modules/es.map.js";
|
|
5
|
+
import "core-js/modules/es.object.to-string.js";
|
|
6
|
+
import "core-js/modules/es.string.iterator.js";
|
|
7
|
+
import "core-js/modules/web.dom-collections.iterator.js";
|
|
1
8
|
import { generatePageKey } from './PageInstance';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
9
|
+
|
|
10
|
+
var Lifecycle = /*#__PURE__*/function () {
|
|
11
|
+
function Lifecycle() {
|
|
12
|
+
_classCallCheck(this, Lifecycle);
|
|
13
|
+
|
|
14
|
+
this.instanceMap = new Map();
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* 增加一个 PageWrapper 实例
|
|
18
|
+
*
|
|
19
|
+
* @param uniqueId - 页面的 ID
|
|
20
|
+
* @param ins - 示例对象
|
|
21
|
+
*/
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
_createClass(Lifecycle, [{
|
|
25
|
+
key: "addInstance",
|
|
26
|
+
value: function addInstance(ins) {
|
|
27
|
+
var key = generatePageKey(ins.uniqueId);
|
|
28
|
+
this.instanceMap.set(key, ins);
|
|
15
29
|
}
|
|
16
30
|
/**
|
|
17
31
|
* 删除一个 PageWrapper 实例
|
|
@@ -19,16 +33,26 @@ class Lifecycle {
|
|
|
19
33
|
* @param uniqueId - 页面的 ID
|
|
20
34
|
* @param ins - 示例对象
|
|
21
35
|
*/
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
36
|
+
|
|
37
|
+
}, {
|
|
38
|
+
key: "removeInstance",
|
|
39
|
+
value: function removeInstance(ins) {
|
|
40
|
+
var key = generatePageKey(ins.uniqueId);
|
|
41
|
+
this.instanceMap.delete(key);
|
|
25
42
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
43
|
+
}, {
|
|
44
|
+
key: "emit",
|
|
45
|
+
value: function emit(params) {
|
|
46
|
+
var key = generatePageKey(params.uniqueId);
|
|
47
|
+
var $instance = this.instanceMap.get(key);
|
|
48
|
+
|
|
49
|
+
if ($instance) {
|
|
50
|
+
$instance.callLifecycle(params);
|
|
51
|
+
}
|
|
32
52
|
}
|
|
33
|
-
}
|
|
34
|
-
|
|
53
|
+
}]);
|
|
54
|
+
|
|
55
|
+
return Lifecycle;
|
|
56
|
+
}();
|
|
57
|
+
|
|
58
|
+
export var lifecycle = new Lifecycle();
|
package/lib/useAppEvent/index.js
CHANGED
|
@@ -1,3 +1,2 @@
|
|
|
1
|
-
export function useAppEvent(
|
|
2
|
-
|
|
3
|
-
}
|
|
1
|
+
export function useAppEvent() {// TODO: App 事件
|
|
2
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { PageInstanceContext } from '../PageInstanceContext';
|
|
3
3
|
export function usePageEvent(event, fn) {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
}
|
|
4
|
+
var $instance = React.useContext(PageInstanceContext).$instance;
|
|
5
|
+
$instance.registerLifecycle(event, null, fn);
|
|
6
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ray-js/runtime",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.0-beta.0",
|
|
4
4
|
"description": "Ray cross runtime",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"ray"
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"@ray-core/runtime": "^0.3.0-beta.2"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@ray-js/cli": "^1.
|
|
28
|
-
"@ray-js/types": "^1.
|
|
27
|
+
"@ray-js/cli": "^1.3.0-beta.0",
|
|
28
|
+
"@ray-js/types": "^1.3.0-beta.0"
|
|
29
29
|
},
|
|
30
30
|
"maintainers": [
|
|
31
31
|
{
|
|
@@ -33,6 +33,6 @@
|
|
|
33
33
|
"email": "tuyafe@tuya.com"
|
|
34
34
|
}
|
|
35
35
|
],
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "d55c47fc54e6fdc34758e73d5e1dd76b3dd7a8c9",
|
|
37
37
|
"repository": {}
|
|
38
38
|
}
|
|
@@ -1,55 +0,0 @@
|
|
|
1
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
2
|
-
var t = {};
|
|
3
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
4
|
-
t[p] = s[p];
|
|
5
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
6
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
7
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
8
|
-
t[p[i]] = s[p[i]];
|
|
9
|
-
}
|
|
10
|
-
return t;
|
|
11
|
-
};
|
|
12
|
-
import React from 'react';
|
|
13
|
-
import { pageLifecycles } from '@ray-js/types';
|
|
14
|
-
import { PageInstanceContext } from '../PageInstanceContext';
|
|
15
|
-
export function withPageLifecycle(Component) {
|
|
16
|
-
const displayName = `WithPageLifecycle(${Component.displayName || Component.name})`;
|
|
17
|
-
class WithPageLifeCycle extends React.Component {
|
|
18
|
-
render() {
|
|
19
|
-
const _a = this.props, { forwardedRef } = _a, rest = __rest(_a, ["forwardedRef"]);
|
|
20
|
-
return (<PageInstanceContext.Consumer>
|
|
21
|
-
{(context) => {
|
|
22
|
-
const { $instance } = context;
|
|
23
|
-
// 挂载页面事件
|
|
24
|
-
function additionToLifecycle(ins) {
|
|
25
|
-
Object.keys(pageLifecycles).forEach((event) => {
|
|
26
|
-
if (typeof ins[event] === 'function') {
|
|
27
|
-
;
|
|
28
|
-
$instance.registerLifecycle(event, ins, ins[event]);
|
|
29
|
-
}
|
|
30
|
-
});
|
|
31
|
-
}
|
|
32
|
-
return (<Component ref={(ref) => {
|
|
33
|
-
if (ref) {
|
|
34
|
-
additionToLifecycle(ref);
|
|
35
|
-
}
|
|
36
|
-
if (forwardedRef) {
|
|
37
|
-
if (typeof forwardedRef === 'function') {
|
|
38
|
-
forwardedRef(ref);
|
|
39
|
-
}
|
|
40
|
-
else if (typeof forwardedRef === 'object') {
|
|
41
|
-
forwardedRef.current = ref;
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
}} {...rest}/>);
|
|
45
|
-
}}
|
|
46
|
-
</PageInstanceContext.Consumer>);
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
WithPageLifeCycle.displayName = displayName;
|
|
50
|
-
const forwardRef = React.forwardRef((props, ref) => {
|
|
51
|
-
return <WithPageLifeCycle {...props} forwardedRef={ref}/>;
|
|
52
|
-
});
|
|
53
|
-
forwardRef.displayName = displayName;
|
|
54
|
-
return forwardRef;
|
|
55
|
-
}
|