@rfkit/charts 1.9.0 → 1.10.0

package/README.md

@@ -96,6 +96,8 @@ export function GaugeDemo() {
 
 `PublishSpectrum` 支持推送内置频谱数据线，包括 `data`、`maxData`、`minData`、`avgData`、`thresholdData`、`templateData`、`backgroundNoiseData` 和 `extraData`。`thresholdData` 不传 `segmentOffset` / `offset` 时按整条门限替换；传入 `segmentOffset` 或 `offset` 时按局部门限写入。
 
+`extraData` 默认保持完整数组设置语义；设置 `segmentedExtraData: true` 后，同一次推送中的每条额外频谱线会独立使用 `segmentOffset + offset` 拼接，并随主实时值同步缩放。
+
 独立 `Heatmap` 可以显式开启 X/Y 同步缩放：
 
 ```tsx

package/components/PluginBox/index.d.ts

@@ -1,6 +1,7 @@
-import React, { type ReactNode } from 'react';
+import React, { type ReactNode, type WheelEventHandler } from 'react';
 interface Props {
     children: ReactNode;
+    onWheelCapture?: WheelEventHandler<HTMLDivElement>;
 }
 declare const _default: React.NamedExoticComponent<Props>;
 export default _default;

package/index.js

@@ -19567,20 +19567,52 @@ class SpectrumAnalyzer {
         });
         this.setPendingFlag("occupancy", false);
     }
-    setExtraData(data, mode = types_ExtraDataMode.MERGE) {
-        if (mode === types_ExtraDataMode.CLEAR || mode === types_ExtraDataMode.REPLACE) {
+    setExtraData(data, mode = types_ExtraDataMode.MERGE, options) {
+        if (mode === types_ExtraDataMode.CLEAR) {
             this.extraData = {};
             this.extraOutputData = {};
             this.setPendingFlag("extra", false);
+            return;
         }
-        if (mode === types_ExtraDataMode.CLEAR) return;
-        if (!data) return;
-        for (const [key, value1] of Object.entries(data)){
-            if (!value1 || 0 === value1.length) {
+        if (!data) {
+            if (mode === types_ExtraDataMode.REPLACE) {
+                this.extraData = {};
+                this.extraOutputData = {};
+                this.setPendingFlag("extra", false);
+            }
+            return;
+        }
+        const entries = Object.entries(data).map(([key, value1])=>[
+                key,
+                value1?.length ? new Float32Array(value1) : null
+            ]);
+        const index = options ? this.resolveGlobalIndex(options.segmentOffset ?? 0, options.offset ?? 0) : 0;
+        if (options) {
+            for (const [, value1] of entries)if (value1) this.validateInput(value1, index);
+        }
+        if (mode === types_ExtraDataMode.REPLACE) {
+            this.extraData = {};
+            this.extraOutputData = {};
+            this.setPendingFlag("extra", false);
+        }
+        for (const [key, value1] of entries){
+            if (!value1) {
                 delete this.extraData[key];
                 continue;
             }
-            this.extraData[key] = new Float32Array(value1);
+            if (!options) {
+                this.extraData[key] = value1;
+                continue;
+            }
+            let target = this.extraData[key];
+            if (target?.length !== this.config.maxPoints) {
+                const next = new Float32Array(this.config.maxPoints);
+                next.fill(SPECTRUM.INITIAL_VALUE);
+                if (target?.length) next.set(target.subarray(0, this.config.maxPoints));
+                target = next;
+                this.extraData[key] = target;
+            }
+            target.set(value1, index);
         }
         if (!this.hasProcessedData || this.isProcessing) return void this.setPendingFlag("extra", true);
         this.extraOutputData = resampleExtraData(this.extraData, this.antennaFactorData, this.antennaFactorSwitch, this.srcIndexCache, this.getOutputData.bind(this));
@@ -23502,13 +23534,14 @@ const Boundary_Boundary = ()=>{
 };
 const Boundary = Boundary_Boundary;
 const PluginBox_PluginBox = (props)=>{
-    const { children } = props;
+    const { children, onWheelCapture } = props;
     const { pluginBoxWidth } = useAxisYWidth_useAxisYWidth();
     return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("div", {
         className: "absolute right-0 top-0 m-0 h-full overflow-hidden p-0",
         style: {
             width: pluginBoxWidth
         },
+        onWheelCapture: onWheelCapture,
         children: children
     });
 };
@@ -25408,6 +25441,20 @@ const Heatmap_Heatmap = (props)=>{
             globalID
         }
     });
+    const dispatchXYWheel = (0, __WEBPACK_EXTERNAL_MODULE_react__.useMemo)(()=>{
+        const eventBusID = getEID(id);
+        return throttle((wheel, coord)=>{
+            createWheelEventManager(eventBusID)(wheel, coord);
+        });
+    }, [
+        id
+    ]);
+    const handleXYWheelCapture = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((event)=>{
+        event.stopPropagation();
+        dispatchXYWheel(-1 * event.deltaY, calculateEventRelativePosition(event));
+    }, [
+        dispatchXYWheel
+    ]);
     useWaterfallZoomEvent(id, xyZoom);
     useModuleSubscription({
         moduleType: constants_ModuleType.Heatmap,
@@ -25440,6 +25487,7 @@ const Heatmap_Heatmap = (props)=>{
                 chart: chart
             }),
             /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsxs)(PluginBox, {
+                onWheelCapture: xyZoom ? handleXYWheelCapture : void 0,
                 children: [
                     /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)(Boundary, {}),
                     /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)(Chart, {}),
@@ -33001,7 +33049,10 @@ function useSpectrumAnalyzer(props) {
                 if (e.avgData) analyzer.current.setAvgData(e.avgData);
                 if (e.templateData) analyzer.current.setTemplateData(e.templateData, e.templateTolerance);
                 if (e.backgroundNoiseData) analyzer.current.setBackgroundNoiseData(e.backgroundNoiseData);
-                if (e.extraData) analyzer.current?.setExtraData(e.extraData);
+                if (e.extraData) analyzer.current.setExtraData(e.extraData, types_ExtraDataMode.MERGE, e.segmentedExtraData ? {
+                    segmentOffset: e.segmentOffset,
+                    offset: e.offset
+                } : void 0);
                 break;
             case constants_PSType.Fluorescence:
                 if (e.data && analyzer.current) analyzer.current.setFluorescenceData(e.data.fluorescenceData, e.data.fluorescenceMaxCount);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rfkit/charts",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "type": "module",
   "description": "Chart components for wireless monitoring web applications",
   "exports": {

package/types/publish.d.ts

@@ -58,6 +58,7 @@ export interface PublishSpectrum {
     templateData?: Float32Array;
     templateTolerance?: number;
     extraData?: SpectrumExtraData;
+    segmentedExtraData?: boolean;
     timestamp?: string;
     offset?: number;
     segmentOffset?: number;