@rfkit/charts 1.8.0 → 1.8.2

package/components/EventBus/tools.d.ts

@@ -1,10 +1,10 @@
 import type { TopRightBottomLeft } from '../../types';
-import { type CSMCallback } from '../../utils/subscription';
+import { type ConsumableCSMCallback, type CSMCallback } from '../../utils/subscription';
 import { type EventPositionSource } from './position';
 export declare function getEID(id: string): string;
 export declare const createMoveEventManager: (id: string, name?: string, func?: CSMCallback) => (...args: any[]) => void;
 export declare const createMouseDownEventManager: (id: string, name?: string, func?: CSMCallback) => (...args: any[]) => void;
-export declare const createDoubleClickEventManager: (id: string, name?: string, func?: CSMCallback) => (...args: any[]) => void;
+export declare const createDoubleClickEventManager: (id: string, name?: string, func?: ConsumableCSMCallback) => (...args: any[]) => void;
 export declare const createMouseUpEventManager: (id: string, name?: string, func?: CSMCallback) => (...args: any[]) => void;
 export declare const createMouseLeaveEventManager: (id: string, name?: string, func?: CSMCallback) => (...args: any[]) => void;
 export declare const createMouseEnterEventManager: (id: string, name?: string, func?: CSMCallback) => (...args: any[]) => void;

package/index.js

@@ -4235,6 +4235,19 @@ function subscription_createSubscriptionManager(id, name, func, owner) {
         for(const key in funcs)funcs[key](...args);
     };
 }
+function createConsumableSubscriptionManager(id, getPriority, name, func, owner) {
+    if ('function' == typeof func && name) return subscription_createSubscriptionManager(id, name, func, owner);
+    return (...args)=>{
+        const funcs = subscription_subscriptions[id];
+        if (!funcs) return false;
+        const subscriberNames = Object.keys(funcs).sort((left, right)=>getPriority(right) - getPriority(left));
+        for (const subscriberName of subscriberNames){
+            const handled = funcs[subscriberName](...args);
+            if (true === handled) return true;
+        }
+        return false;
+    };
+}
 const getPublishSubscriptionKey = (globalID)=>`PUB_SUB-${globalID}`;
 const getModuleSubscriptionKey = (globalID, moduleName)=>`passThrough-${globalID}-${moduleName}`;
 const getDatabaseStorageKey = (globalID)=>`withDatabase-${globalID}`;
@@ -21101,7 +21114,7 @@ function generateRecursiveId(id, func) {
 }
 const createMoveEventManager = (id, name, func)=>subscription_createSubscriptionManager(`${generateRecursiveId(id, func)}-createMoveEventManager`, name, func, id);
 const createMouseDownEventManager = (id, name, func)=>subscription_createSubscriptionManager(`${generateRecursiveId(id, func)}-createMouseDownEventManager`, name, func, id);
-const createDoubleClickEventManager = (id, name, func)=>subscription_createSubscriptionManager(`${generateRecursiveId(id, func)}-createDoubleClickEventManager`, name, func, id);
+const createDoubleClickEventManager = (id, name, func)=>createConsumableSubscriptionManager(`${generateRecursiveId(id, func)}-createDoubleClickEventManager`, getEventPriority, name, func, id);
 const createMouseUpEventManager = (id, name, func)=>subscription_createSubscriptionManager(`${generateRecursiveId(id, func)}-mouse-up`, name, func, id);
 const createMouseLeaveEventManager = (id, name, func)=>subscription_createSubscriptionManager(`${generateRecursiveId(id, func)}-mouse-leave`, name, func, id);
 const createMouseEnterEventManager = (id, name, func)=>subscription_createSubscriptionManager(`${generateRecursiveId(id, func)}-mouse-enter`, name, func, id);
@@ -21122,6 +21135,7 @@ const EVENT_PRIORITY_LEVELS = {
     [constants_ToolType.Stripe]: 4,
     [constants_ToolType.FrequencyTagLine]: 5
 };
+const getEventPriority = (name)=>EVENT_PRIORITY_LEVELS[name] ?? 0;
 const CURSOR_STYLE_MAP = {
     [constants_ToolType.Markers]: 'all-scroll',
     [constants_ToolType.Stripe]: 'col-resize',
@@ -22409,10 +22423,11 @@ function useEventBusCallback(id) {
     const { state: { segments, axisX: { frequencyFormat }, eventBus: { onDoubleClick } } } = useStore_useStore();
     (0, __WEBPACK_EXTERNAL_MODULE_react__.useEffect)(()=>{
         const cleanupDoubleClick = createDoubleClickEventManager(id, useEventBusCallback_COMPONENT_KEY, (_, e)=>{
-            if (!compareEventPriority(id, useEventBusCallback_COMPONENT_KEY)) return;
+            if (!compareEventPriority(id, useEventBusCallback_COMPONENT_KEY)) return false;
             const { left } = e;
             const frequency = frequencyFormat?.(left) ?? '';
             onDoubleClick(frequency, e);
+            return true;
         });
         const cleanupMouseUp = createMouseUpEventManager(id, useEventBusCallback_COMPONENT_KEY, ()=>{
             resetEventLevel(id, useEventBusCallback_COMPONENT_KEY);
@@ -26254,7 +26269,7 @@ const AXIS_LINE_WIDTH = LINE_WIDTH_BASE;
 function useCanvasAxisY(options) {
     const { ranging } = options;
     const axisY = useStore_useSelector((state)=>state.axisY);
-    const { range: axisYRange, disabled, placement } = axisY;
+    const { range: axisYRange, disabled, placement, show } = axisY;
     const inside = 'inside' === placement;
     const canvasRef = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)(null);
     const containerRef = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)(null);
@@ -26300,7 +26315,9 @@ function useCanvasAxisY(options) {
         });
         resizeObserver.observe(container);
         return ()=>resizeObserver.disconnect();
-    }, []);
+    }, [
+        show
+    ]);
     const formatTickLabel = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((value1, formatStrategy)=>{
         if (formatStrategy.useScientific) return value1.toExponential(1);
         if (formatStrategy.useKFormat) {
@@ -26450,9 +26467,10 @@ function useCanvasAxisY(options) {
         clampTickPosition
     ]);
     (0, __WEBPACK_EXTERNAL_MODULE_react__.useEffect)(()=>{
-        drawAxis();
+        if (false !== show) drawAxis();
     }, [
-        drawAxis
+        drawAxis,
+        show
     ]);
     (0, __WEBPACK_EXTERNAL_MODULE_react__.useEffect)(()=>subscribeChartsThemeChange(()=>{
             drawAxis();
@@ -28353,16 +28371,16 @@ const useMarkerEvents = (props)=>{
             if (marker?.id) onToggleSelect(marker.id);
         });
         const cleanupDoubleClick = createDoubleClickEventManager(id, useMarkerEvents_COMPONENT_KEY, (_, e)=>{
-            if (!isShow || !compareEventPriority(id, useMarkerEvents_COMPONENT_KEY)) return;
-            if (void 0 !== e.left) {
-                const nearbyMarker = checkHover({
-                    left: e.left
-                });
-                if (nearbyMarker && 'object' == typeof nearbyMarker && nearbyMarker.id) onDeleteMarker(nearbyMarker.id);
-                else onCreateMarker({
-                    left: e.left
-                });
-            }
+            if (!isShow || !compareEventPriority(id, useMarkerEvents_COMPONENT_KEY)) return false;
+            if (void 0 === e.left) return false;
+            const nearbyMarker = checkHover({
+                left: e.left
+            });
+            if (nearbyMarker && 'object' == typeof nearbyMarker && nearbyMarker.id) onDeleteMarker(nearbyMarker.id);
+            else onCreateMarker({
+                left: e.left
+            });
+            return true;
         });
         return ()=>{
             cleanupMove?.();

package/package.json

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

package/utils/subscription.d.ts

@@ -23,7 +23,7 @@ export declare function openData<T = unknown>(key: string, data: T | undefined,
  * Note: Using any[] for callback args since this is a generic pub/sub system
  * that can be called with various argument types across the codebase.
  */
-export type CSMCallback = (...args: any[]) => void;
+export type CSMCallback<Return = void> = (...args: any[]) => Return;
 interface Subscription {
     [key: string]: CSMCallback;
 }
@@ -31,6 +31,8 @@ interface ChartSubscriptions {
     [id: string]: Subscription;
 }
 export declare function createSubscriptionManager(id: string, name?: string, func?: CSMCallback, owner?: string): (...args: any[]) => void;
+export type ConsumableCSMCallback = CSMCallback<boolean | undefined>;
+export declare function createConsumableSubscriptionManager(id: string, getPriority: (name: string) => number, name?: string, func?: ConsumableCSMCallback, owner?: string): (...args: any[]) => void;
 export declare const getPublishSubscriptionKey: (globalID: string) => string;
 export declare const getModuleSubscriptionKey: (globalID: string, moduleName: string) => string;
 export declare const getDatabaseStorageKey: (globalID: string) => string;