@miot-rn/common-component 1.0.2 → 1.0.4

package/dist/service/track/useTrackScrollProvider.d.ts

@@ -0,0 +1,24 @@
+import React from 'react';
+import type { NativeScrollEvent, NativeSyntheticEvent } from 'react-native';
+import { TrackScrollContextValue } from './TrackScrollContext';
+interface ForwardedHandlers {
+    onScroll?: (e: NativeSyntheticEvent<NativeScrollEvent>) => void;
+    onLayout?: () => void;
+    onMomentumScrollEnd?: (e: NativeSyntheticEvent<NativeScrollEvent>) => void;
+}
+interface ScrollProps {
+    ref: React.MutableRefObject<any>;
+    onScroll: (e: NativeSyntheticEvent<NativeScrollEvent>) => void;
+    onLayout: () => void;
+    onMomentumScrollEnd: (e: NativeSyntheticEvent<NativeScrollEvent>) => void;
+    scrollEventThrottle: number;
+}
+interface ProviderHandle {
+    scrollProps: ScrollProps;
+    ctxValue: TrackScrollContextValue;
+    Provider: React.FC<{
+        children: React.ReactNode;
+    }>;
+}
+export declare function useTrackScrollProvider(forwarded?: ForwardedHandlers): ProviderHandle;
+export {};

package/dist/service/track/useTrackScrollProvider.js

@@ -0,0 +1,81 @@
+import React, { useCallback, useMemo, useRef } from 'react';
+import { TrackScrollContext } from "./TrackScrollContext";
+/**
+ * 用法：
+ *   const tracker = useTrackScrollProvider({ onScroll: myOnScroll });
+ *   return (
+ *     <tracker.Provider>
+ *       <SubpageLayout
+ *         scrollRef={tracker.scrollProps.ref}
+ *         onScroll={tracker.scrollProps.onScroll}
+ *       >...</SubpageLayout>
+ *     </tracker.Provider>
+ *   );
+ *
+ * RAF 合并通知：scroll 16ms × N listeners × 2 次 measureInWindow 容易形成 native bridge 风暴。
+ * RAF 合并到每帧最多一次广播；listener 命中即 unsubscribe，稳态后只剩未曝光的卡片。
+ * onMomentumScrollEnd 兜底：RAF 节流可能丢最后一帧，滚动停止时再补一次。
+ */
+export function useTrackScrollProvider(forwarded = {}) {
+  const containerRef = useRef(null);
+  const listeners = useRef(new Set());
+  const rafScheduled = useRef(false);
+  const forwardedRef = useRef(forwarded);
+  forwardedRef.current = forwarded;
+  const notify = useCallback(() => {
+    if (rafScheduled.current) return;
+    rafScheduled.current = true;
+    requestAnimationFrame(() => {
+      rafScheduled.current = false;
+      Array.from(listeners.current).forEach(cb => {
+        try {
+          cb();
+        } catch (e) {
+          // listener 自身异常不能阻断其它卡片曝光
+          // eslint-disable-next-line no-console
+          console.warn('[TrackScroll] listener error', e);
+        }
+      });
+    });
+  }, []);
+  const subscribe = useCallback(cb => {
+    listeners.current.add(cb);
+    return () => {
+      listeners.current.delete(cb);
+    };
+  }, []);
+  const onScroll = useCallback(e => {
+    notify();
+    forwardedRef.current.onScroll?.(e);
+  }, [notify]);
+  const onLayout = useCallback(() => {
+    notify();
+    forwardedRef.current.onLayout?.();
+  }, [notify]);
+  const onMomentumScrollEnd = useCallback(e => {
+    notify();
+    forwardedRef.current.onMomentumScrollEnd?.(e);
+  }, [notify]);
+  const ctxValue = useMemo(() => ({
+    containerRef,
+    subscribe
+  }), [subscribe]);
+  const Provider = useMemo(() => function TrackScrollProviderImpl({
+    children
+  }) {
+    return /*#__PURE__*/React.createElement(TrackScrollContext.Provider, {
+      value: ctxValue
+    }, children);
+  }, [ctxValue]);
+  return {
+    scrollProps: {
+      ref: containerRef,
+      onScroll,
+      onLayout,
+      onMomentumScrollEnd,
+      scrollEventThrottle: 16
+    },
+    ctxValue,
+    Provider
+  };
+}

package/dist/specs/instance-parser.js

@@ -132,7 +132,7 @@ function getIidsGetter() {
     }
 
     // 获取目标模块
-    const targetModule = findModuleByKeyAndDescription(normalizedMKey, normalizedMDescription);
+    const targetModule = findModule(normalizedMKey, normalizedMDescription);
     // console.log('targetModule---', targetModule);
 
     if (!targetModule && mkey) {
@@ -226,8 +226,10 @@ function getIidsGetter() {
         // 添加模块信息
         if (mkey && targetModule) {
           spec.miid = targetModule?.iid;
-          spec.mkey = mkey || parseSpecType(targetModule?.type).key;
-          spec.mDescription = normalizedMDescription;
+          spec.mkey = parseSpecType(targetModule?.type).key || mkey;
+          if (normalizedMDescription) {
+            spec.mDescription = normalizedMDescription;
+          }
         }
 
         // 将最新版本的结果添加到数组开头
@@ -557,25 +559,25 @@ function getTargetModule(miid) {
 }
 
 /**
- * 根据mkey和mDescription查找模块
+ * 查找匹配的模块。
+ * - mkey 通过 module.type 解析（与 service/property 保持一致口径）
+ * - mDescription 仅在提供时用于二次消歧（同 name 存在多个 module 的场景）
  * @param {string} mkey - 模块键
  * @param {string} mDescription - 模块描述（可选）
  * @returns {Object|null} - 返回目标模块对象或null
  */
-function findModuleByKeyAndDescription(mkey, mDescription) {
+function findModule(mkey, mDescription) {
   const normalizedMKey = safeTrim(mkey);
   const normalizedMDescription = safeTrim(mDescription);
   // 如果是版本3
   if (CachedSpecVersion === 3) {
     return (CachedInstance.modules || []).find(module => {
-      const moduleDescription = safeTrim(module?.description);
-      const moduleName = safeTrim(module?.name);
-      // 如果提供了mDescription，同时匹配mkey和mDescription
+      if (parseSpecType(module?.type).key !== normalizedMKey) return false;
+      // 提供了 mDescription 时同时匹配 module.description
       if (normalizedMDescription) {
-        return moduleName === normalizedMKey && moduleDescription === normalizedMDescription;
+        return safeTrim(module?.description) === normalizedMDescription;
       }
-      // 只匹配mkey
-      return moduleName === normalizedMKey;
+      return true;
     });
   }
   // 如果是版本2，返回整个实例

package/dist/store/useGlobalSpecManager.d.ts

@@ -4,11 +4,14 @@ export { toKey };
 declare const useGlobalSpecManager: import("zustand").UseBoundStore<import("zustand").StoreApi<{
     specsMetaInfo: {};
     specsState: {};
+    pendingKeys: Set<unknown>;
     eventListeners: {};
     subscribedSpecs: Set<unknown>;
     specUpdateListeners: never[];
     addSpecUpdateListener: (listener: any) => () => void;
-    fetchSpecs: (specs: any, fromSource?: boolean, batchUpdate?: boolean) => Promise<({
+    _deferRemovePendingKey: (key: string) => void;
+    _rollbackOptimisticSpec: (key: string, failedValue: any) => boolean;
+    fetchSpecs: (specs: any, datasource?: number, batchUpdate?: boolean) => Promise<({
         code: number;
         message: string;
         spec: any;
@@ -167,7 +170,7 @@ export declare const useSpecMetaInfo: (spec: any) => any;
 export declare const useSpecUpdateListener: (listener: any) => void;
 export declare const useEventListener: (eventSpec: any, listener: any) => () => void;
 export declare const addSpecUpdateListener: (listener: any) => () => void;
-export declare const fetchSpecs: (specs: any, fromSource?: boolean, batchUpdate?: boolean) => Promise<({
+export declare const fetchSpecs: (specs: any, datasource?: number, batchUpdate?: boolean) => Promise<({
     code: number;
     message: string;
     spec: any;