@ray-js/runtime 1.2.0-beta.0 → 1.2.0-beta.1

package/lib/PageInstance.js

@@ -1,78 +1,48 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import "core-js/modules/es.array.splice.js";
-import "core-js/modules/es.array.index-of.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/web.dom-collections.for-each.js";
-
 /**
  * 管理 web 页面生命周期的调用
  * 小程序端
  * TODO: 支持 RN
  */
-var UniqueId = 0;
-export var generateUniqueId = function () {
-  return UniqueId += 1;
+let UniqueId = 0;
+export const generateUniqueId = () => {
+    return (UniqueId += 1);
 };
-export var generatePageKey = function (uniqueId) {
-  return 'Page-' + uniqueId;
+export const generatePageKey = (uniqueId) => {
+    return 'Page-' + uniqueId;
 };
-export var PageInstance = /*#__PURE__*/function () {
-  function PageInstance(uniqueId) {
-    _classCallCheck(this, PageInstance);
-
-    this.uniqueId = uniqueId !== null && uniqueId !== void 0 ? uniqueId : generateUniqueId();
-    this.lifecycleCallback = {};
-  }
-  /**
-   * 注册生命周期事件, 页面运行底层实例
-   * @param lifecycleName - 事件名
-   * @param context - fn 上下文
-   * @param fn - 回调函数
-   */
-
-
-  _createClass(PageInstance, [{
-    key: "registerLifecycle",
-    value: function registerLifecycle(lifecycleName, context, fn) {
-      var _this = this;
-
-      this.lifecycleCallback[lifecycleName] = this.lifecycleCallback[lifecycleName] || [];
-      var fnObj = {
-        context: context,
-        fn: fn
-      }; // 先注册的函数先调用
-
-      this.lifecycleCallback[lifecycleName].push(fnObj);
-      return function () {
-        _this.lifecycleCallback[lifecycleName].splice(_this.lifecycleCallback[lifecycleName].indexOf(fnObj), 1);
-      };
+export class PageInstance {
+    constructor(uniqueId) {
+        this.uniqueId = uniqueId !== null && uniqueId !== void 0 ? uniqueId : generateUniqueId();
+        this.lifecycleCallback = {};
+    }
+    /**
+     * 注册生命周期事件, 页面运行底层实例
+     * @param lifecycleName - 事件名
+     * @param context - fn 上下文
+     * @param fn - 回调函数
+     */
+    registerLifecycle(lifecycleName, context, fn) {
+        this.lifecycleCallback[lifecycleName] = this.lifecycleCallback[lifecycleName] || [];
+        const fnObj = { context, fn };
+        // 先注册的函数先调用
+        this.lifecycleCallback[lifecycleName].push(fnObj);
+        return () => {
+            this.lifecycleCallback[lifecycleName].splice(this.lifecycleCallback[lifecycleName].indexOf(fnObj), 1);
+        };
     }
     /**
      * 触发生命周期函数
      * @param lifecycleName
      * @param args
      */
-
-  }, {
-    key: "callLifecycle",
-    value: function callLifecycle(params) {
-      var callbacks = this.lifecycleCallback[params.name] || [];
-      var result;
-
-      _toConsumableArray(callbacks).forEach(function (_ref) {
-        var _ref$context = _ref.context,
-            context = _ref$context === void 0 ? null : _ref$context,
-            fn = _ref.fn;
-        result = fn.apply(context, Array.isArray(params.args) ? params.args : [params.args]);
-      });
-
-      if (result) {
-        return result;
-      }
+    callLifecycle(params) {
+        const callbacks = this.lifecycleCallback[params.name] || [];
+        let result;
+        [...callbacks].forEach(({ context = null, fn }) => {
+            result = fn.apply(context, Array.isArray(params.args) ? params.args : [params.args]);
+        });
+        if (result) {
+            return result;
+        }
     }
-  }]);
-
-  return PageInstance;
-}();
+}

package/lib/PageInstanceContext.js

@@ -1,4 +1,4 @@
 import React from 'react';
-var PageInstanceContext = /*#__PURE__*/React.createContext(null);
+const PageInstanceContext = React.createContext(null);
 PageInstanceContext.displayName = 'PageInstanceContext';
-export { PageInstanceContext };
+export { PageInstanceContext };

package/lib/current.js

@@ -1,8 +1,8 @@
-export var current = {
-  app: null,
-  page: null,
-  renderOptions: {}
+export const current = {
+    app: null,
+    page: null,
+    renderOptions: {},
 };
 export function getCurrent() {
-  return current;
-}
+    return current;
+}

package/lib/index.js

@@ -1,21 +1,15 @@
 export { lifecycle } from './lifecycle';
 export { PageInstance } from './PageInstance';
 export { PageInstanceContext } from './PageInstanceContext';
-export { useAppEvent } from './useAppEvent'; // 页面事件
-
+export { useAppEvent } from './useAppEvent';
+// 页面事件
 export { usePageEvent } from './usePageEvent';
 export { withPageLifecycle } from './withPageLifecycle';
 export { getCurrent } from './current';
-export var useNativeEffect = function () {
-  return console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'useNativeEffect'");
+export const useNativeEffect = () => console.warn(`// TODO 暂未实现钩子 'useNativeEffect'`);
+export const useQuery = () => {
+    console.warn(`// TODO 暂未实现钩子 'useQuery'`);
+    return null;
 };
-export var useQuery = function () {
-  console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'useQuery'");
-  return null;
-};
-export var usePageInstance = function () {
-  return console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'usePageInstance'");
-};
-export var useComponentInstance = function () {
-  return console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'useComponentInstance'");
-};
+export const usePageInstance = () => console.warn(`// TODO 暂未实现钩子 'usePageInstance'`);
+export const useComponentInstance = () => console.warn(`// TODO 暂未实现钩子 'useComponentInstance'`);

package/lib/index.mini.js

@@ -2,4 +2,4 @@ export * from '@ray-core/runtime';
 export { withPageLifecycle } from './withPageLifecycle';
 export { lifecycle } from './lifecycle';
 export { PageInstance } from './PageInstance';
-export { PageInstanceContext } from './PageInstanceContext';
+export { PageInstanceContext } from './PageInstanceContext';

package/lib/instance.js

@@ -1 +1 @@
-export {};
+export {};

package/lib/lifecycle.js

@@ -1,31 +1,17 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import "core-js/modules/es.array.iterator.js";
-import "core-js/modules/es.map.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.string.iterator.js";
-import "core-js/modules/web.dom-collections.iterator.js";
 import { generatePageKey } from './PageInstance';
-
-var Lifecycle = /*#__PURE__*/function () {
-  function Lifecycle() {
-    _classCallCheck(this, Lifecycle);
-
-    this.instanceMap = new Map();
-  }
-  /**
-   * 增加一个 PageWrapper 实例
-   *
-   * @param uniqueId - 页面的 ID
-   * @param ins - 示例对象
-   */
-
-
-  _createClass(Lifecycle, [{
-    key: "addInstance",
-    value: function addInstance(ins) {
-      var key = generatePageKey(ins.uniqueId);
-      this.instanceMap.set(key, ins);
+class Lifecycle {
+    constructor() {
+        this.instanceMap = new Map();
+    }
+    /**
+     * 增加一个 PageWrapper 实例
+     *
+     * @param uniqueId - 页面的 ID
+     * @param ins - 示例对象
+     */
+    addInstance(ins) {
+        const key = generatePageKey(ins.uniqueId);
+        this.instanceMap.set(key, ins);
     }
     /**
      * 删除一个 PageWrapper 实例
@@ -33,26 +19,16 @@ var Lifecycle = /*#__PURE__*/function () {
      * @param uniqueId - 页面的 ID
      * @param ins - 示例对象
      */
-
-  }, {
-    key: "removeInstance",
-    value: function removeInstance(ins) {
-      var key = generatePageKey(ins.uniqueId);
-      this.instanceMap.delete(key);
+    removeInstance(ins) {
+        const key = generatePageKey(ins.uniqueId);
+        this.instanceMap.delete(key);
     }
-  }, {
-    key: "emit",
-    value: function emit(params) {
-      var key = generatePageKey(params.uniqueId);
-      var $instance = this.instanceMap.get(key);
-
-      if ($instance) {
-        $instance.callLifecycle(params);
-      }
+    emit(params) {
+        const key = generatePageKey(params.uniqueId);
+        const $instance = this.instanceMap.get(key);
+        if ($instance) {
+            $instance.callLifecycle(params);
+        }
     }
-  }]);
-
-  return Lifecycle;
-}();
-
-export var lifecycle = new Lifecycle();
+}
+export const lifecycle = new Lifecycle();

package/lib/useAppEvent/index.js

@@ -1,2 +1,3 @@
-export function useAppEvent() {// TODO: App 事件
-}
+export function useAppEvent(event, fn) {
+    // TODO: App 事件
+}

package/lib/usePageEvent/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { PageInstanceContext } from '../PageInstanceContext';
 export function usePageEvent(event, fn) {
-  var $instance = React.useContext(PageInstanceContext).$instance;
-  $instance.registerLifecycle(event, null, fn);
-}
+    const $instance = React.useContext(PageInstanceContext).$instance;
+    $instance.registerLifecycle(event, null, fn);
+}

package/lib/withPageLifecycle/index.jsx

@@ -0,0 +1,55 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import React from 'react';
+import { pageLifecycles } from '@ray-js/types';
+import { PageInstanceContext } from '../PageInstanceContext';
+export function withPageLifecycle(Component) {
+    const displayName = `WithPageLifecycle(${Component.displayName || Component.name})`;
+    class WithPageLifeCycle extends React.Component {
+        render() {
+            const _a = this.props, { forwardedRef } = _a, rest = __rest(_a, ["forwardedRef"]);
+            return (<PageInstanceContext.Consumer>
+          {(context) => {
+                    const { $instance } = context;
+                    // 挂载页面事件
+                    function additionToLifecycle(ins) {
+                        Object.keys(pageLifecycles).forEach((event) => {
+                            if (typeof ins[event] === 'function') {
+                                ;
+                                $instance.registerLifecycle(event, ins, ins[event]);
+                            }
+                        });
+                    }
+                    return (<Component ref={(ref) => {
+                            if (ref) {
+                                additionToLifecycle(ref);
+                            }
+                            if (forwardedRef) {
+                                if (typeof forwardedRef === 'function') {
+                                    forwardedRef(ref);
+                                }
+                                else if (typeof forwardedRef === 'object') {
+                                    forwardedRef.current = ref;
+                                }
+                            }
+                        }} {...rest}/>);
+                }}
+        </PageInstanceContext.Consumer>);
+        }
+    }
+    WithPageLifeCycle.displayName = displayName;
+    const forwardRef = React.forwardRef((props, ref) => {
+        return <WithPageLifeCycle {...props} forwardedRef={ref}/>;
+    });
+    forwardRef.displayName = displayName;
+    return forwardRef;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/runtime",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.1",
   "description": "Ray cross runtime",
   "keywords": [
     "ray"
@@ -21,11 +21,11 @@
     "watch": "tsc -p ./tsconfig.build.json --module esnext --outDir lib --watch"
   },
   "dependencies": {
-    "@ray-core/runtime": "^0.3.0-beta.1"
+    "@ray-core/runtime": "^0.3.0-beta.2"
   },
   "devDependencies": {
-    "@ray-js/cli": "^1.2.0-beta.0",
-    "@ray-js/types": "^1.2.0-beta.0"
+    "@ray-js/cli": "^1.2.0-beta.1",
+    "@ray-js/types": "^1.2.0-beta.1"
   },
   "maintainers": [
     {
@@ -33,6 +33,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "7e74c61f91edf7d331396664808b5223f8a73950",
+  "gitHead": "2b34058549219b57afaa6b6f80c1b896e1602d53",
   "repository": {}
 }