@mybricks/taro-core 0.1.2 → 0.1.3

package/dist/index.cjs.js

@@ -977,37 +977,29 @@ class ComRefResolver {
         // 4. 创建影子对象
         return this.createShadowProxy(id);
     }
-    /**
-     * 注册真实引用
-     */
+    /** 注册真实引用，并向上渗透 */
     set(id, ref) {
         var _a;
         this.registry[id] = ref;
-        // 向上渗透到父级
         (_a = this.parent) === null || _a === void 0 ? void 0 : _a.set(id, ref);
     }
-    /**
-     * 删除引用
-     */
+    /** 删除引用 */
     delete(id) {
         var _a;
         delete this.registry[id];
         (_a = this.parent) === null || _a === void 0 ? void 0 : _a.delete(id);
     }
-    /**
-     * 查找真实引用（仅用于父级链查找）
-     */
+    /** 在本地查找真实引用（不创建影子） */
     findRealRef(id) {
-        var _a, _b;
-        const local = this.registry[id];
-        if (local && !local.__isShadow) {
-            return local;
+        var _a;
+        if (this.registry[id] && !this.registry[id].__isShadow) {
+            return this.registry[id];
         }
-        return (_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.findRealRef(id)) !== null && _b !== void 0 ? _b : null;
+        return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.findRealRef(id);
     }
     /**
-     * 创建影子对象
-     * 关键：影子对象的方法被调用时，会动态查找真实引用
+     * 创建影子代理对象
+     * 调用时动态检查真实引用，未找到则缓冲到 TodoPool
      */
     createShadowProxy(id) {
         const registry = this.registry;
@@ -1019,7 +1011,6 @@ class ComRefResolver {
                     return true;
                 return (...args) => {
                     // 动态检查是否已有真实引用
-                    // 注意：这里直接检查 registry[id]，因为真实引用注册时会覆盖它
                     const realRef = registry[id];
                     if (realRef && !realRef.__isShadow) {
                         if (typeof realRef[method] === 'function') {
@@ -1139,11 +1130,13 @@ function proxyRefs(target, parentComRefs, todoPool) {
  * 3. 生命周期自动化：卸载时自动注销引用渗透路径
  */
 function useBindInputs(scope, id, initialHandlers) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const handlersRef = react.useRef({ ...initialHandlers });
     const { todoPool } = useAppContext();
     const parentSlot = useParentSlot();
-    const index = (_c = (_b = (_a = parentSlot === null || parentSlot === void 0 ? void 0 : parentSlot.params) === null || _a === void 0 ? void 0 : _a.inputValues) === null || _b === void 0 ? void 0 : _b.index) !== null && _c !== void 0 ? _c : 0;
+    // 优先从 scope（comRefs）获取 $index，与 proxyRefs 的 scopeIndex 保持一致
+    // 避免条件容器 slot 继承了循环列表的 index 导致 push/pop 不匹配
+    const index = (_e = (_b = (_a = scope === null || scope === void 0 ? void 0 : scope.current) === null || _a === void 0 ? void 0 : _a.$index) !== null && _b !== void 0 ? _b : (_d = (_c = parentSlot === null || parentSlot === void 0 ? void 0 : parentSlot.params) === null || _c === void 0 ? void 0 : _c.inputValues) === null || _d === void 0 ? void 0 : _d.index) !== null && _e !== void 0 ? _e : 0;
     react.useEffect(() => {
         return () => {
             if (scope === null || scope === void 0 ? void 0 : scope.current) {
@@ -1185,8 +1178,9 @@ function useBindInputs(scope, id, initialHandlers) {
                 };
             }
         });
-        if (scope === null || scope === void 0 ? void 0 : scope.current)
+        if (scope === null || scope === void 0 ? void 0 : scope.current) {
             scope.current[id] = proxy;
+        }
         if (initialHandlers) {
             Object.keys(initialHandlers).forEach(pin => proxy[pin](initialHandlers[pin]));
         }
@@ -1216,7 +1210,7 @@ function useBuiltinHandlers(opts) {
             Object.assign(handlers, {
                 show: () => setShow(true),
                 hide: () => setShow(false),
-                showOrHide: () => setShow((prev) => !prev),
+                showOrHide: (val) => setShow(!!val),
             });
         }
         return handlers;
@@ -1331,10 +1325,16 @@ class TabbarInstance {
 }
 const tabbarIns = new TabbarInstance();
 
-function useAppCreateContext(id) {
+function useAppCreateContext(id, parentComRefs, moduleId, moduleOutputs) {
     const { request, rootConfig } = getCoreRuntime();
     const todoPool = react.useMemo(() => new TodoPool(), []);
     const comRefs = react.useRef(proxyRefs({ $inputs: {}, $outputs: {} }, undefined, todoPool));
+    // 模块场景：把 $inputs 注册到页面 comRefs 上，使页面调用能找到 handler
+    react.useMemo(() => {
+        if ((parentComRefs === null || parentComRefs === void 0 ? void 0 : parentComRefs.current) && moduleId) {
+            parentComRefs.current[moduleId] = comRefs.current.$inputs;
+        }
+    }, []);
     const $vars = react.useRef({});
     const $fxs = react.useRef({});
     const [popupState, setPopupState] = react.useState({
@@ -1393,12 +1393,14 @@ function useAppCreateContext(id) {
         tabBar: [],
         useTabBar: false,
     }).current;
+    const moduleOutputsRef = react.useRef(moduleOutputs || {});
     return react.useMemo(() => ({
         comRefs,
         $vars,
         $fxs,
         todoPool,
         appContext,
+        moduleOutputs: moduleOutputsRef.current,
         popupState,
         setPopupState
     }), [popupState]);
@@ -1595,7 +1597,8 @@ const WithCom = (props) => {
 };
 const WithWrapper = (id, Component) => {
     return function WrappedComponent(props) {
-        const contextStore = useAppCreateContext(id);
+        const { controller, onEvents, parentComRefs, moduleId, ...restProps } = props;
+        const contextStore = useAppCreateContext(id, parentComRefs, moduleId, onEvents);
         const { setPopupState } = contextStore;
         const isPopup = Component.isPopup;
         // 通过发布订阅模式解耦弹窗状态变化
@@ -1608,7 +1611,7 @@ const WithWrapper = (id, Component) => {
                 return;
             closeActivePopupRouter();
         });
-        return (jsxRuntime.jsx(ComContext.Provider, { value: contextStore, children: jsxRuntime.jsx(Component, { ...props }) }));
+        return (jsxRuntime.jsx(ComContext.Provider, { value: contextStore, children: jsxRuntime.jsx(Component, { ...restProps }) }));
     };
 };