@ray-js/runtime 1.3.0-beta.2-beta-2 → 1.3.0-beta.3

package/lib/index.d.ts

@@ -10,3 +10,5 @@ export declare const useNativeEffect: typeof runtime['useNativeEffect'];
 export declare const useQuery: typeof runtime['useQuery'];
 export declare const usePageInstance: typeof runtime['usePageInstance'];
 export declare const useComponentInstance: typeof runtime['useComponentInstance'];
+export declare const createPortal: typeof runtime.createPortal;
+export declare const useModal: typeof runtime['useModal'];

package/lib/index.js

@@ -1,3 +1,4 @@
+import * as runtime from '@ray-core/runtime';
 export { lifecycle } from './lifecycle';
 export { PageInstance } from './PageInstance';
 export { PageInstanceContext } from './PageInstanceContext';
@@ -18,4 +19,9 @@ export var usePageInstance = function () {
 };
 export var useComponentInstance = function () {
   return console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'useComponentInstance'");
+};
+export var createPortal = runtime.createPortal;
+export var useModal = function () {
+  console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u94A9\u5B50 'useModal'");
+  return undefined;
 };

package/lib/withPageLifecycle/index.js

@@ -1,12 +1,14 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _excluded = ["forwardedRef"];
+import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/web.dom-collections.for-each.js";
 import "core-js/modules/es.object.keys.js";
@@ -22,14 +24,40 @@ export function withPageLifecycle(Component) {
     var _super = _createSuper(WithPageLifeCycle);
 
     function WithPageLifeCycle() {
+      var _this;
+
       _classCallCheck(this, WithPageLifeCycle);
 
-      return _super.apply(this, arguments);
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+
+      _this = _super.call.apply(_super, [this].concat(args));
+
+      _defineProperty(_assertThisInitialized(_this), "refHandle", function (ref) {
+        var forwardedRef = _this.props.forwardedRef;
+
+        if (ref) {
+          _this.additionToLifecycle(ref);
+        }
+
+        if (forwardedRef) {
+          if (typeof forwardedRef === 'function') {
+            forwardedRef(ref);
+          } else if (_typeof(forwardedRef) === 'object') {
+            forwardedRef.current = ref;
+          }
+        }
+      });
+
+      return _this;
     }
 
     _createClass(WithPageLifeCycle, [{
       key: "render",
       value: function render() {
+        var _this2 = this;
+
         var _this$props = this.props,
             forwardedRef = _this$props.forwardedRef,
             rest = _objectWithoutProperties(_this$props, _excluded);
@@ -37,28 +65,18 @@ export function withPageLifecycle(Component) {
         return /*#__PURE__*/React.createElement(PageInstanceContext.Consumer, null, function (context) {
           var $instance = context.$instance; // 挂载页面事件
 
-          function additionToLifecycle(ins) {
+          _this2.additionToLifecycle = function (ins) {
             Object.keys(pageLifecycles).forEach(function (event) {
               if (typeof ins[event] === 'function') {
                 $instance.registerLifecycle(event, ins, ins[event]);
               }
             });
-          }
+          };
 
-          return /*#__PURE__*/React.createElement(Component, _extends({
-            ref: function ref(_ref) {
-              if (_ref) {
-                additionToLifecycle(_ref);
-              }
-
-              if (forwardedRef) {
-                if (typeof forwardedRef === 'function') {
-                  forwardedRef(_ref);
-                } else if (_typeof(forwardedRef) === 'object') {
-                  forwardedRef.current = _ref;
-                }
-              }
-            }
+          return /*#__PURE__*/React.createElement(Component // fixed: 坑货，不能直接一个匿名函数，因为每次渲染匿名函数都是个新的，导致每次渲染都会调用一次
+          // 进而导致生命周期函数重复添加
+          , _extends({
+            ref: _this2.refHandle
           }, rest));
         });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/runtime",
-  "version": "1.3.0-beta.2-beta-2",
+  "version": "1.3.0-beta.3",
   "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.2.6"
+    "@ray-core/runtime": "^0.3.0-beta.4"
   },
   "devDependencies": {
-    "@ray-js/cli": "^1.3.0-beta.2-beta-2",
-    "@ray-js/types": "^1.3.0-beta.2-beta-2"
+    "@ray-js/cli": "^1.3.0-beta.3",
+    "@ray-js/types": "^1.3.0-beta.3"
   },
   "maintainers": [
     {
@@ -33,6 +33,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "067ce2e382196cd995ebc4774fc5e977ac21115c",
+  "gitHead": "be72a5dad6214ebf9c6653df02956374c735c98e",
   "repository": {}
 }