@ray-js/runtime 1.6.29 → 1.6.30-alpha.0

package/lib/withPageLifecycle/index.jsx

@@ -0,0 +1,63 @@
+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';
+// eslint-disable-next-line @typescript-eslint/ban-types
+export function withPageLifecycle(Component) {
+    const displayName = `WithPageLifecycle(${Component.displayName || Component.name})`;
+    class WithPageLifeCycle extends React.Component {
+        constructor() {
+            super(...arguments);
+            this.refHandle = (ref) => {
+                const 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;
+                    }
+                }
+            };
+        }
+        render() {
+            const _a = this.props, { forwardedRef } = _a, rest = __rest(_a, ["forwardedRef"]);
+            return (<PageInstanceContext.Consumer>
+          {(context) => {
+                    const { $instance } = context;
+                    // 挂载页面事件
+                    this.additionToLifecycle = function additionToLifecycle(ins) {
+                        Object.keys(pageLifecycles).forEach((event) => {
+                            if (typeof ins[event] === 'function') {
+                                $instance.registerLifecycle(event, ins, ins[event]);
+                            }
+                        });
+                    };
+                    return (<Component 
+                    // fixed: 坑货，不能直接一个匿名函数，因为每次渲染匿名函数都是个新的，导致每次渲染都会调用一次
+                    // 进而导致生命周期函数重复添加
+                    ref={this.refHandle} {...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.6.29",
+  "version": "1.6.30-alpha.0",
   "description": "Ray cross runtime",
   "keywords": [
     "ray"
@@ -27,8 +27,9 @@
     "@ray-core/runtime": "^0.4.8"
   },
   "devDependencies": {
-    "@ray-js/cli": "1.6.29",
-    "@ray-js/types": "1.6.29"
+    "@ray-js/cli": "1.6.30-alpha.0",
+    "@ray-js/types": "1.6.30-alpha.0",
+    "typescript": "^5.8.2"
   },
   "publishConfig": {
     "access": "public",