@rfkit/charts 1.1.26 → 1.1.28

package/components/Markers/hooks/useMarkerEvents.d.ts

@@ -3,6 +3,7 @@ interface UseMarkerEventsProps {
     id: string;
     markers: MarkerType[];
     display: boolean;
+    fixed: boolean;
     onCreateMarker: (e: {
         left: number;
     }) => void;

package/index.js

@@ -2234,37 +2234,11 @@ var __webpack_modules__ = {
   white-space: nowrap;
   margin-left: 10px;
   font-size: 12px;
-  transition: transform .2s ease-out, margin-left .2s ease-out;
   position: absolute;
   top: 10px;
   left: -200px;
 }
 
-.marker-sg8OSM .del-fQ9nWT {
-  width: 20px;
-  height: 20px;
-  color: var(--theme-bg-second);
-  background: var(--theme-color-error);
-  cursor: pointer;
-  z-index: 10;
-  opacity: .9;
-  border-radius: 50%;
-  justify-content: center;
-  align-items: center;
-  margin-top: -10px;
-  margin-left: -10px;
-  font-size: 14px;
-  font-weight: bold;
-  transition: opacity .2s;
-  display: flex;
-  position: absolute;
-}
-
-.marker-sg8OSM .del-fQ9nWT:hover {
-  opacity: 1;
-  transform: scale(1.1);
-}
-
 .marker-sg8OSM .dot-PNo0HJ {
   z-index: 2;
   position: absolute;
@@ -2289,16 +2263,20 @@ var __webpack_modules__ = {
   margin-left: -8px;
   transform: rotateZ(45deg)skew(15deg, 15deg);
 }
+
+.marker-sg8OSM.fixed-_Z4itt .dot-PNo0HJ:hover {
+  cursor: not-allowed;
+}
 `,
             ""
         ]);
         ___CSS_LOADER_EXPORT___.locals = {
             marker: "marker-sg8OSM",
             value: "value-iuBrAy",
-            del: "del-fQ9nWT",
             dot: "dot-PNo0HJ",
             item: "item-WySDZW",
-            sign: "sign-PXb1ef"
+            sign: "sign-PXb1ef",
+            fixed: "fixed-_Z4itt"
         };
         const __WEBPACK_DEFAULT_EXPORT__ = ___CSS_LOADER_EXPORT___;
     },
@@ -3977,6 +3955,7 @@ function defaultState_createParams() {
         segments: [],
         points: [],
         marker: {
+            fixed: false,
             enabled: true,
             visible: false,
             mode: store_MarkerMode.Normal,
@@ -9925,9 +9904,10 @@ function splitZoomLeft({ left, globalID }) {
     const { zoom, segments } = getGlobalStoreState(globalID);
     const { start, end } = zoom.interval;
     const { totalPoints } = segments;
-    const safeLeft = Math.max(0, Math.min(100, left));
+    const safeLeft = left;
     const intervalWidth = end - start + 1;
-    const insideLeft = Math.max(0, Math.min(100, (safeLeft * totalPoints / 100 - start) * 100 / intervalWidth));
+    const rawInsideLeft = (safeLeft * totalPoints / 100 - start) * 100 / intervalWidth;
+    const insideLeft = rawInsideLeft;
     const outsideLeft = 100 * start / totalPoints;
     const multiple = totalPoints / intervalWidth;
     return {
@@ -12297,7 +12277,7 @@ const Limit = ({ id })=>{
 const components_Limit = Limit;
 const useMarkerEvents_COMPONENT_KEY = constants_ToolType.Markers;
 const useMarkerEvents = (props)=>{
-    const { id, markers, display, onCreateMarker, onDeleteMarker, onUpdateMarker, onHover, onResetHover } = props;
+    const { id, markers, display, fixed, onCreateMarker, onDeleteMarker, onUpdateMarker, onHover, onResetHover } = props;
     const stateRef = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)({
         isDown: null,
         dragStart: null,
@@ -12363,7 +12343,7 @@ const useMarkerEvents = (props)=>{
         });
         createDragEventManager(id, useMarkerEvents_COMPONENT_KEY, (_, e)=>{
             const { isDown } = stateRef.current;
-            if (isShow && isDown && compareEventPriority(id, useMarkerEvents_COMPONENT_KEY)) onUpdateMarker(isDown.id, {
+            if (isShow && isDown && compareEventPriority(id, useMarkerEvents_COMPONENT_KEY) && !fixed) onUpdateMarker(isDown.id, {
                 left: e.left,
                 top: e.top
             });
@@ -12371,7 +12351,7 @@ const useMarkerEvents = (props)=>{
         createMouseDownEventManager(id, useMarkerEvents_COMPONENT_KEY, (e)=>{
             if (!isShow) return;
             const marker = findMarkerByPosition(e) || ('object' == typeof stateRef.current.isHover ? stateRef.current.isHover : null);
-            if (marker) stateRef.current.isDown = marker;
+            if (marker && !fixed) stateRef.current.isDown = marker;
         });
         createMouseUpEventManager(id, useMarkerEvents_COMPONENT_KEY, ()=>{
             if (!isShow) return;
@@ -12401,6 +12381,7 @@ const useMarkerEvents = (props)=>{
         id,
         display,
         markers,
+        fixed,
         onCreateMarker,
         onDeleteMarker,
         onUpdateMarker,
@@ -12792,7 +12773,7 @@ MarkerItem_styles_module_options.insertStyleElement = insertStyleElement_default
 injectStylesIntoStyleTag_default()(MarkerItem_styles_module.Z, MarkerItem_styles_module_options);
 const Markers_MarkerItem_styles_module = MarkerItem_styles_module.Z && MarkerItem_styles_module.Z.locals ? MarkerItem_styles_module.Z.locals : void 0;
 const MarkerItem = ({ marker })=>{
-    const { state: { axisX, axisY } } = useStore_useStore();
+    const { state: { axisX, axisY, marker: { fixed } } } = useStore_useStore();
     const containerRef = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)(null);
     const valueRef = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)(null);
     const [containerWidth, setContainerWidth] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)(0);
@@ -12820,7 +12801,8 @@ const MarkerItem = ({ marker })=>{
             Markers_MarkerItem_styles_module.marker,
             marker.hover ? Markers_MarkerItem_styles_module.hover : '',
             marker.select ? Markers_MarkerItem_styles_module.selected : '',
-            marker.peak ? Markers_MarkerItem_styles_module.peak : ''
+            marker.peak ? Markers_MarkerItem_styles_module.peak : '',
+            fixed ? Markers_MarkerItem_styles_module.fixed : ''
         ].filter(Boolean).join(' ');
         const markerPixelPosition = marker.left / 100 * containerWidth;
         const EDGE_MARGIN = 20;
@@ -12829,7 +12811,8 @@ const MarkerItem = ({ marker })=>{
         const valueStyleObj = {
             left: `${marker.left}%`,
             color: marker.color,
-            opacity: marker.hover ? 1 : 0.8,
+            opacity: marker.hover ? 1 : 0.68,
+            fontWeight: marker.hover ? 500 : 'normal',
             transform: isNearRightBoundary ? 'translateX(-100%)' : 'translateX(0)',
             marginLeft: isNearRightBoundary ? '-10px' : '10px'
         };
@@ -12844,6 +12827,7 @@ const MarkerItem = ({ marker })=>{
         marker.select,
         marker.peak,
         marker.color,
+        fixed,
         containerWidth,
         valueWidth
     ]);
@@ -12901,7 +12885,7 @@ injectStylesIntoStyleTag_default()(Markers_styles_module.Z, Markers_styles_modul
 const components_Markers_styles_module = Markers_styles_module.Z && Markers_styles_module.Z.locals ? Markers_styles_module.Z.locals : void 0;
 const Markers = ({ id })=>{
     const { state: { marker, globalID } } = useStore_useStore();
-    const { enabled: markerShow, visible: display, maxCount, onChange } = marker;
+    const { enabled: markerShow, visible: display, fixed, maxCount, onChange } = marker;
     const managerOnChange = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((operationType, e)=>{
         onChange?.(operationType, e);
         MARKER_COUNT_CHANGE(globalID)({
@@ -12954,6 +12938,7 @@ const Markers = ({ id })=>{
         id,
         markers,
         display: show,
+        fixed,
         onCreateMarker: createMarker,
         onDeleteMarker: handleDeleteMarker,
         onUpdateMarker: handleUpdateMarker,

package/package.json

@@ -5,6 +5,6 @@
   "types": "index.d.ts",
   "author": "Hxgh",
   "license": "MIT",
-  "version": "1.1.26",
+  "version": "1.1.28",
   "private": false
 }

package/types/store.d.ts

@@ -80,6 +80,7 @@ export interface MarkerType {
 export interface MarkerProps {
     enabled: boolean;
     visible: boolean;
+    fixed?: boolean;
     mode: MarkerMode;
     maxCount: number;
     onChange: (event: MarkerEventType, markers?: MarkerType[]) => void;