@rytass/wms-map-react-components 0.1.7 → 0.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,9 @@
1
1
  import { FC } from 'react';
2
+ import { ViewMode } from '../../typings';
2
3
  interface BreadcrumbProps {
3
4
  warehouseIds: string[];
5
+ viewMode: ViewMode;
6
+ showBreadcrumbEditButton?: (warehouseIds: string[]) => boolean;
4
7
  onWarehouseClick?: (warehouseId: string, index: number) => void;
5
8
  onNameChange?: (name: string) => Promise<void>;
6
9
  }
@@ -1,9 +1,10 @@
1
1
  import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
2
2
  import React, { useState, useRef, useEffect } from 'react';
3
3
  import BreadcrumbEditModal from './breadcrumb-edit-modal.js';
4
+ import { ViewMode } from '../../typings.js';
4
5
  import styles from './breadcrumb.module.scss.js';
5
6
 
6
- const Breadcrumb = ({ warehouseIds, onWarehouseClick, onNameChange })=>{
7
+ const Breadcrumb = ({ warehouseIds, viewMode, showBreadcrumbEditButton = ()=>true, onWarehouseClick, onNameChange })=>{
7
8
  const [showDropdown, setShowDropdown] = useState(false);
8
9
  const [showEditModal, setShowEditModal] = useState(false);
9
10
  const [editingIndex, setEditingIndex] = useState(-1);
@@ -133,7 +134,7 @@ const Breadcrumb = ({ warehouseIds, onWarehouseClick, onNameChange })=>{
133
134
  className: styles.warehouseIdSection,
134
135
  children: [
135
136
  shouldCollapse ? renderCollapsedBreadcrumb() : renderFullBreadcrumb(),
136
- /*#__PURE__*/ jsx("button", {
137
+ viewMode === ViewMode.EDIT && showBreadcrumbEditButton(warehouseIds) && /*#__PURE__*/ jsx("button", {
137
138
  className: styles.editButton,
138
139
  onClick: handleEditClick,
139
140
  title: "編輯當前區域名稱",
@@ -31,6 +31,7 @@ interface ReactFlowCanvasProps {
31
31
  onNodeMouseEnter?: (event: React.MouseEvent, node: ReactFlowNode) => void;
32
32
  onNodeMouseLeave?: (event: React.MouseEvent, node: ReactFlowNode) => void;
33
33
  onNodeClick?: (event: React.MouseEvent, node: ReactFlowNode) => void;
34
+ onNodeDoubleClick?: (event: React.MouseEvent, node: ReactFlowNode) => void;
34
35
  showBackground?: boolean;
35
36
  }
36
37
  declare const ReactFlowCanvas: FC<ReactFlowCanvasProps>;
@@ -62,7 +62,7 @@ const CustomControls = ()=>{
62
62
  })
63
63
  });
64
64
  };
65
- const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect, editMode, drawingMode, viewMode, selectedColor = '#3b82f6', onCreateRectangle, onCreatePath, onSelectionChange, onTextEditComplete, onPathPointsChange, onPathPointDragStateChange, isEditingPathPoints: _isEditingPathPoints = false, hoveredNodeId, onNodeMouseEnter, onNodeMouseLeave, onNodeClick, showBackground = true })=>{
65
+ const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect, editMode, drawingMode, viewMode, selectedColor = '#3b82f6', onCreateRectangle, onCreatePath, onSelectionChange, onTextEditComplete, onPathPointsChange, onPathPointDragStateChange, isEditingPathPoints: _isEditingPathPoints = false, hoveredNodeId, onNodeMouseEnter, onNodeMouseLeave, onNodeClick, onNodeDoubleClick, showBackground = true })=>{
66
66
  // console.log('🖼️ ReactFlowCanvas 接收到 showBackground:', showBackground);
67
67
  const { containerRef: rectContainerRef, previewRect } = useRectangleDrawing({
68
68
  editMode,
@@ -171,6 +171,7 @@ const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect
171
171
  onNodeMouseEnter: onNodeMouseEnter,
172
172
  onNodeMouseLeave: onNodeMouseLeave,
173
173
  onNodeClick: onNodeClick,
174
+ onNodeDoubleClick: onNodeDoubleClick,
174
175
  nodeTypes: nodeTypes,
175
176
  className: styles.reactFlowCanvas,
176
177
  style: {
@@ -190,7 +191,7 @@ const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect
190
191
  panOnDrag: viewMode === ViewMode.VIEW || viewMode === ViewMode.EDIT && drawingMode === DrawingMode.NONE,
191
192
  panOnScroll: false,
192
193
  zoomOnScroll: true,
193
- zoomOnDoubleClick: viewMode === ViewMode.EDIT && drawingMode !== DrawingMode.PEN,
194
+ zoomOnDoubleClick: false,
194
195
  nodeOrigin: [
195
196
  0,
196
197
  0
@@ -14,7 +14,7 @@ import ReactFlowCanvas from '../canvas/react-flow-canvas.js';
14
14
  import ViewModeToolbar from '../ui/view-mode-toolbar.js';
15
15
  import { TEXT_MAPPINGS } from '../../constants/text-mappings.js';
16
16
 
17
- const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes: propsInitialNodes = [], initialEdges: propsInitialEdges = [], onUpload, getFilenameFQDN, maxFileSizeKB = 30720, warehouseIds = [
17
+ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, showBreadcrumbEditButton, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes: propsInitialNodes = [], initialEdges: propsInitialEdges = [], onUpload, getFilenameFQDN, maxFileSizeKB = 30720, warehouseIds = [
18
18
  ...DEFAULT_WAREHOUSE_IDS
19
19
  ] })=>{
20
20
  const renderCount = useRef(0);
@@ -579,26 +579,75 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
579
579
  }, [
580
580
  viewMode
581
581
  ]);
582
+ const clickTimerRef = useRef(null);
583
+ useEffect(()=>()=>{
584
+ if (clickTimerRef.current) {
585
+ clearTimeout(clickTimerRef.current);
586
+ clickTimerRef.current = null;
587
+ }
588
+ }, []);
582
589
  const handleNodeClick = useCallback((_event, node)=>{
583
590
  const flowNode = node;
584
- debugLog('events', 'Node clicked (React Flow)', {
591
+ const fireClick = ()=>{
592
+ debugLog('events', 'Node clicked (React Flow)', {
593
+ id: flowNode.id.slice(-4),
594
+ type: flowNode.type,
595
+ viewMode,
596
+ editMode
597
+ });
598
+ logNodeData(flowNode);
599
+ if (onNodeClick) {
600
+ const nodeClickInfo = transformNodeToClickInfo(flowNode);
601
+ if (nodeClickInfo) {
602
+ debugLog('events', '將點擊資訊傳遞給父組件:', nodeClickInfo);
603
+ onNodeClick(nodeClickInfo);
604
+ }
605
+ }
606
+ };
607
+ // 沒有訂閱雙擊事件時,單擊直接觸發避免引入無謂的 350ms 延遲
608
+ if (!onNodeDoubleClick) {
609
+ fireClick();
610
+ return;
611
+ }
612
+ // 延遲觸發 click,讓 double click 有機會取消
613
+ if (clickTimerRef.current) {
614
+ clearTimeout(clickTimerRef.current);
615
+ }
616
+ clickTimerRef.current = setTimeout(()=>{
617
+ clickTimerRef.current = null;
618
+ fireClick();
619
+ }, 350);
620
+ }, [
621
+ viewMode,
622
+ editMode,
623
+ onNodeClick,
624
+ onNodeDoubleClick
625
+ ]);
626
+ const handleNodeDoubleClick = useCallback((_event, node)=>{
627
+ // 取消待執行的 click,避免 double click 同時觸發 click
628
+ if (clickTimerRef.current) {
629
+ clearTimeout(clickTimerRef.current);
630
+ clickTimerRef.current = null;
631
+ }
632
+ const flowNode = node;
633
+ debugLog('events', 'Node double clicked (React Flow)', {
585
634
  id: flowNode.id.slice(-4),
586
635
  type: flowNode.type,
587
636
  viewMode,
588
637
  editMode
589
638
  });
590
639
  logNodeData(flowNode);
591
- if (onNodeClick) {
592
- const nodeClickInfo = transformNodeToClickInfo(flowNode);
593
- if (nodeClickInfo) {
594
- debugLog('events', '將點擊資訊傳遞給父組件:', nodeClickInfo);
595
- onNodeClick(nodeClickInfo);
640
+ if (onNodeDoubleClick) {
641
+ const nodeDoubleClickInfo = transformNodeToClickInfo(flowNode);
642
+ if (nodeDoubleClickInfo) {
643
+ debugLog('events', '將雙擊資訊傳遞給父組件:', nodeDoubleClickInfo);
644
+ onNodeDoubleClick(nodeDoubleClickInfo);
596
645
  }
597
646
  }
598
647
  }, [
599
648
  viewMode,
600
649
  editMode,
601
- onNodeClick
650
+ onNodeDoubleClick
602
651
  ]);
603
652
  const handleToggleBackground = useCallback((show)=>{
604
653
  debugLog('ui', '切換底圖顯示:', {
@@ -696,6 +745,8 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
696
745
  children: [
697
746
  /*#__PURE__*/ jsx(Breadcrumb, {
698
747
  warehouseIds: warehouseIds,
748
+ viewMode: viewMode,
749
+ showBreadcrumbEditButton: showBreadcrumbEditButton,
699
750
  onWarehouseClick: onBreadcrumbClick,
700
751
  onNameChange: onNameChange
701
752
  }),
@@ -739,6 +790,7 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
739
790
  onNodeMouseEnter: handleNodeMouseEnter,
740
791
  onNodeMouseLeave: handleNodeMouseLeave,
741
792
  onNodeClick: handleNodeClick,
793
+ onNodeDoubleClick: handleNodeDoubleClick,
742
794
  showBackground: showBackground
743
795
  }),
744
796
  /*#__PURE__*/ jsx(ViewModeToolbar, {
@@ -1,5 +1,5 @@
1
1
  import React, { FC } from 'react';
2
2
  import { WMSMapContentProps, WMSMapModalProps } from '../../types';
3
- export declare const WMSMapModalContent: ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds, }: WMSMapContentProps) => React.JSX.Element;
3
+ export declare const WMSMapModalContent: ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, showBreadcrumbEditButton, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds, }: WMSMapContentProps) => React.JSX.Element;
4
4
  declare const WMSMapModalContainer: FC<WMSMapModalProps>;
5
5
  export default WMSMapModalContainer;
@@ -8,7 +8,7 @@ import WMSMapContent from './wms-map-content.js';
8
8
  import { setDebugMode } from '../../utils/debug-logger.js';
9
9
  import styles from './wms-map-modal-container.module.scss.js';
10
10
 
11
- const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
11
+ const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, showBreadcrumbEditButton, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
12
12
  return /*#__PURE__*/ jsx("div", {
13
13
  className: styles.content,
14
14
  children: /*#__PURE__*/ jsx(ReactFlowProvider, {
@@ -18,11 +18,13 @@ const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, co
18
18
  selectedColor: selectedColor,
19
19
  viewMode: viewMode,
20
20
  colorPalette: colorPalette,
21
+ showBreadcrumbEditButton: showBreadcrumbEditButton,
21
22
  onEditModeChange: onEditModeChange,
22
23
  onToggleRectangleTool: onToggleRectangleTool,
23
24
  onTogglePenTool: onTogglePenTool,
24
25
  onColorChange: onColorChange,
25
26
  onNodeClick: onNodeClick,
27
+ onNodeDoubleClick: onNodeDoubleClick,
26
28
  onSave: onSave,
27
29
  onBreadcrumbClick: onBreadcrumbClick,
28
30
  onNameChange: onNameChange,
@@ -36,7 +38,7 @@ const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, co
36
38
  })
37
39
  });
38
40
  };
39
- const WMSMapModalContainer = ({ open, onClose, viewMode = ViewMode.EDIT, colorPalette, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, debugMode = false, title, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
41
+ const WMSMapModalContainer = ({ open, onClose, viewMode = ViewMode.EDIT, colorPalette, showBreadcrumbEditButton, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, debugMode = false, title, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
40
42
  const [editMode, setEditMode] = useState(EditMode.BACKGROUND);
41
43
  const [drawingMode, setDrawingMode] = useState(DrawingMode.NONE);
42
44
  const [selectedColor, setSelectedColor] = useState(()=>{
@@ -99,11 +101,13 @@ const WMSMapModalContainer = ({ open, onClose, viewMode = ViewMode.EDIT, colorPa
99
101
  selectedColor: selectedColor,
100
102
  viewMode: viewMode,
101
103
  colorPalette: colorPalette,
104
+ showBreadcrumbEditButton: showBreadcrumbEditButton,
102
105
  onEditModeChange: handleEditModeChange,
103
106
  onToggleRectangleTool: handleToggleRectangleTool,
104
107
  onTogglePenTool: handleTogglePenTool,
105
108
  onColorChange: handleColorChange,
106
109
  onNodeClick: onNodeClick,
110
+ onNodeDoubleClick: onNodeDoubleClick,
107
111
  onSave: onSave,
108
112
  onBreadcrumbClick: onBreadcrumbClick,
109
113
  onNameChange: onNameChange,
package/index.cjs.js CHANGED
@@ -282,11 +282,20 @@ const calculateStaggeredPosition = (index, baseX = 100, baseY = 100, viewportX,
282
282
  {
283
283
  // PathNode 轉換為 MapPolygonRange
284
284
  const pathData = node.data;
285
+ const originSourcePointX = Math.min(...pathData.points.map((p)=>p.x));
286
+ const originSourcePointY = Math.min(...pathData.points.map((p)=>p.y));
287
+ const deltaX = node.position.x - originSourcePointX;
288
+ const deltaY = node.position.y - originSourcePointY;
289
+ // 將 node.position 偏移量加到每個 point 上,因為拖曳整個 node 時只更新 position 不更新 data.points
290
+ const absolutePoints = (pathData.points || []).map((p)=>({
291
+ x: p.x + deltaX,
292
+ y: p.y + deltaY
293
+ }));
285
294
  const polygonRange = {
286
295
  id: pathData.label || node.id,
287
296
  type: MapRangeType.POLYGON,
288
297
  color: pathData.color || '#0000FF',
289
- points: pathData.points || []
298
+ points: absolutePoints
290
299
  };
291
300
  ranges.push(polygonRange);
292
301
  break;
@@ -375,27 +384,35 @@ const calculateStaggeredPosition = (index, baseX = 100, baseY = 100, viewportX,
375
384
  case 'pathNode':
376
385
  {
377
386
  const pathData = node.data;
378
- const bounds = pathData.points?.length > 0 ? {
379
- minX: Math.min(...pathData.points.map((p)=>p.x)),
380
- minY: Math.min(...pathData.points.map((p)=>p.y)),
381
- maxX: Math.max(...pathData.points.map((p)=>p.x)),
382
- maxY: Math.max(...pathData.points.map((p)=>p.y))
383
- } : null;
387
+ const originSourcePointX = Math.min(...pathData.points.map((p)=>p.x));
388
+ const originSourcePointY = Math.min(...pathData.points.map((p)=>p.y));
389
+ const deltaX = node.position.x - originSourcePointX;
390
+ const deltaY = node.position.y - originSourcePointY;
391
+ const absolutePoints = (pathData.points || []).map((p)=>({
392
+ x: p.x + deltaX,
393
+ y: p.y + deltaY
394
+ }));
384
395
  const mapPolygonRange = {
385
396
  id: pathData.label || node.id,
386
397
  type: MapRangeType.POLYGON,
387
398
  color: pathData.color || '#0000FF',
388
- points: pathData.points || []
399
+ points: absolutePoints
389
400
  };
401
+ const absoluteBounds = absolutePoints.length > 0 ? {
402
+ minX: Math.min(...absolutePoints.map((p)=>p.x)),
403
+ minY: Math.min(...absolutePoints.map((p)=>p.y)),
404
+ maxX: Math.max(...absolutePoints.map((p)=>p.x)),
405
+ maxY: Math.max(...absolutePoints.map((p)=>p.y))
406
+ } : null;
390
407
  const clickInfo = {
391
408
  ...baseInfo,
392
409
  type: 'pathNode',
393
410
  pathData: {
394
411
  color: pathData.color || '#0000FF',
395
412
  strokeWidth: pathData.strokeWidth || 2,
396
- pointCount: pathData.points?.length || 0,
397
- points: pathData.points || [],
398
- bounds
413
+ pointCount: absolutePoints.length,
414
+ points: absolutePoints,
415
+ bounds: absoluteBounds
399
416
  },
400
417
  mapPolygonRange
401
418
  };
@@ -479,25 +496,33 @@ const calculateStaggeredPosition = (index, baseX = 100, baseY = 100, viewportX,
479
496
  case 'pathNode':
480
497
  {
481
498
  const pathData = node.data;
499
+ const originSourcePointX = Math.min(...pathData.points.map((p)=>p.x));
500
+ const originSourcePointY = Math.min(...pathData.points.map((p)=>p.y));
501
+ const deltaX = node.position.x - originSourcePointX;
502
+ const deltaY = node.position.y - originSourcePointY;
503
+ // 轉換格式(對應儲存時的格式)— 加上 node.position 偏移
504
+ const absoluteLogPoints = (pathData.points || []).map((p)=>({
505
+ x: p.x + deltaX,
506
+ y: p.y + deltaY
507
+ }));
482
508
  console.log('🔗 路徑資訊:', {
483
509
  color: pathData.color,
484
510
  strokeWidth: pathData.strokeWidth,
485
511
  pointCount: pathData.points?.length || 0,
486
512
  points: pathData.points,
487
513
  // 計算路徑邊界
488
- bounds: pathData.points?.length > 0 ? {
489
- minX: Math.min(...pathData.points.map((p)=>p.x)),
490
- minY: Math.min(...pathData.points.map((p)=>p.y)),
491
- maxX: Math.max(...pathData.points.map((p)=>p.x)),
492
- maxY: Math.max(...pathData.points.map((p)=>p.y))
514
+ bounds: absoluteLogPoints?.length > 0 ? {
515
+ minX: Math.min(...absoluteLogPoints.map((p)=>p.x)),
516
+ minY: Math.min(...absoluteLogPoints.map((p)=>p.y)),
517
+ maxX: Math.max(...absoluteLogPoints.map((p)=>p.x)),
518
+ maxY: Math.max(...absoluteLogPoints.map((p)=>p.y))
493
519
  } : null
494
520
  });
495
- // 轉換格式(對應儲存時的格式)
496
521
  const polygonRange = {
497
522
  id: node.id,
498
523
  type: MapRangeType.POLYGON,
499
524
  color: pathData.color || '#0000FF',
500
- points: pathData.points || []
525
+ points: absoluteLogPoints
501
526
  };
502
527
  console.log('💾 儲存格式 (MapPolygonRange):', polygonRange);
503
528
  break;
@@ -1399,7 +1424,7 @@ const BreadcrumbEditModal = ({ open, warehouseId, onClose, onConfirm })=>{
1399
1424
 
1400
1425
  var styles$7 = {"breadcrumbSection":"breadcrumb-module_breadcrumbSection__Qn8A3","warehouseIdSection":"breadcrumb-module_warehouseIdSection__7CzsY","separator":"breadcrumb-module_separator__uLhtn","warehouseIdText":"breadcrumb-module_warehouseIdText__QOxRw","lastItem":"breadcrumb-module_lastItem__OGKzD","clickable":"breadcrumb-module_clickable__YD5aj","ellipsisContainer":"breadcrumb-module_ellipsisContainer__4hIiu","ellipsis":"breadcrumb-module_ellipsis__NYd8X","dropdown":"breadcrumb-module_dropdown__BqvP8","dropdownItem":"breadcrumb-module_dropdownItem__YdggW","editButton":"breadcrumb-module_editButton__Wuk8T"};
1401
1426
 
1402
- const Breadcrumb = ({ warehouseIds, onWarehouseClick, onNameChange })=>{
1427
+ const Breadcrumb = ({ warehouseIds, viewMode, showBreadcrumbEditButton = ()=>true, onWarehouseClick, onNameChange })=>{
1403
1428
  const [showDropdown, setShowDropdown] = React.useState(false);
1404
1429
  const [showEditModal, setShowEditModal] = React.useState(false);
1405
1430
  const [editingIndex, setEditingIndex] = React.useState(-1);
@@ -1529,7 +1554,7 @@ const Breadcrumb = ({ warehouseIds, onWarehouseClick, onNameChange })=>{
1529
1554
  className: styles$7.warehouseIdSection,
1530
1555
  children: [
1531
1556
  shouldCollapse ? renderCollapsedBreadcrumb() : renderFullBreadcrumb(),
1532
- /*#__PURE__*/ jsxRuntime.jsx("button", {
1557
+ viewMode === ViewMode.EDIT && showBreadcrumbEditButton(warehouseIds) && /*#__PURE__*/ jsxRuntime.jsx("button", {
1533
1558
  className: styles$7.editButton,
1534
1559
  onClick: handleEditClick,
1535
1560
  title: "編輯當前區域名稱",
@@ -3680,7 +3705,7 @@ const CustomControls = ()=>{
3680
3705
  })
3681
3706
  });
3682
3707
  };
3683
- const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect, editMode, drawingMode, viewMode, selectedColor = '#3b82f6', onCreateRectangle, onCreatePath, onSelectionChange, onTextEditComplete, onPathPointsChange, onPathPointDragStateChange, isEditingPathPoints: _isEditingPathPoints = false, hoveredNodeId, onNodeMouseEnter, onNodeMouseLeave, onNodeClick, showBackground = true })=>{
3708
+ const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect, editMode, drawingMode, viewMode, selectedColor = '#3b82f6', onCreateRectangle, onCreatePath, onSelectionChange, onTextEditComplete, onPathPointsChange, onPathPointDragStateChange, isEditingPathPoints: _isEditingPathPoints = false, hoveredNodeId, onNodeMouseEnter, onNodeMouseLeave, onNodeClick, onNodeDoubleClick, showBackground = true })=>{
3684
3709
  // console.log('🖼️ ReactFlowCanvas 接收到 showBackground:', showBackground);
3685
3710
  const { containerRef: rectContainerRef, previewRect } = useRectangleDrawing({
3686
3711
  editMode,
@@ -3789,6 +3814,7 @@ const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect
3789
3814
  onNodeMouseEnter: onNodeMouseEnter,
3790
3815
  onNodeMouseLeave: onNodeMouseLeave,
3791
3816
  onNodeClick: onNodeClick,
3817
+ onNodeDoubleClick: onNodeDoubleClick,
3792
3818
  nodeTypes: nodeTypes,
3793
3819
  className: styles$2.reactFlowCanvas,
3794
3820
  style: {
@@ -3808,7 +3834,7 @@ const ReactFlowCanvas = ({ nodes, edges, onNodesChange, onEdgesChange, onConnect
3808
3834
  panOnDrag: viewMode === ViewMode.VIEW || viewMode === ViewMode.EDIT && drawingMode === DrawingMode.NONE,
3809
3835
  panOnScroll: false,
3810
3836
  zoomOnScroll: true,
3811
- zoomOnDoubleClick: viewMode === ViewMode.EDIT && drawingMode !== DrawingMode.PEN,
3837
+ zoomOnDoubleClick: false,
3812
3838
  nodeOrigin: [
3813
3839
  0,
3814
3840
  0
@@ -3968,7 +3994,7 @@ const ViewModeToolbar = ({ viewMode, showBackground, onToggleBackground })=>{
3968
3994
  });
3969
3995
  };
3970
3996
 
3971
- const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes: propsInitialNodes = [], initialEdges: propsInitialEdges = [], onUpload, getFilenameFQDN, maxFileSizeKB = 30720, warehouseIds = [
3997
+ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, showBreadcrumbEditButton, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes: propsInitialNodes = [], initialEdges: propsInitialEdges = [], onUpload, getFilenameFQDN, maxFileSizeKB = 30720, warehouseIds = [
3972
3998
  ...DEFAULT_WAREHOUSE_IDS
3973
3999
  ] })=>{
3974
4000
  const renderCount = React.useRef(0);
@@ -4533,26 +4559,75 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
4533
4559
  }, [
4534
4560
  viewMode
4535
4561
  ]);
4562
+ const clickTimerRef = React.useRef(null);
4563
+ React.useEffect(()=>()=>{
4564
+ if (clickTimerRef.current) {
4565
+ clearTimeout(clickTimerRef.current);
4566
+ clickTimerRef.current = null;
4567
+ }
4568
+ }, []);
4536
4569
  const handleNodeClick = React.useCallback((_event, node)=>{
4537
4570
  const flowNode = node;
4538
- debugLog('events', 'Node clicked (React Flow)', {
4571
+ const fireClick = ()=>{
4572
+ debugLog('events', 'Node clicked (React Flow)', {
4573
+ id: flowNode.id.slice(-4),
4574
+ type: flowNode.type,
4575
+ viewMode,
4576
+ editMode
4577
+ });
4578
+ logNodeData(flowNode);
4579
+ if (onNodeClick) {
4580
+ const nodeClickInfo = transformNodeToClickInfo(flowNode);
4581
+ if (nodeClickInfo) {
4582
+ debugLog('events', '將點擊資訊傳遞給父組件:', nodeClickInfo);
4583
+ onNodeClick(nodeClickInfo);
4584
+ }
4585
+ }
4586
+ };
4587
+ // 沒有訂閱雙擊事件時,單擊直接觸發避免引入無謂的 350ms 延遲
4588
+ if (!onNodeDoubleClick) {
4589
+ fireClick();
4590
+ return;
4591
+ }
4592
+ // 延遲觸發 click,讓 double click 有機會取消
4593
+ if (clickTimerRef.current) {
4594
+ clearTimeout(clickTimerRef.current);
4595
+ }
4596
+ clickTimerRef.current = setTimeout(()=>{
4597
+ clickTimerRef.current = null;
4598
+ fireClick();
4599
+ }, 350);
4600
+ }, [
4601
+ viewMode,
4602
+ editMode,
4603
+ onNodeClick,
4604
+ onNodeDoubleClick
4605
+ ]);
4606
+ const handleNodeDoubleClick = React.useCallback((_event, node)=>{
4607
+ // 取消待執行的 click,避免 double click 同時觸發 click
4608
+ if (clickTimerRef.current) {
4609
+ clearTimeout(clickTimerRef.current);
4610
+ clickTimerRef.current = null;
4611
+ }
4612
+ const flowNode = node;
4613
+ debugLog('events', 'Node double clicked (React Flow)', {
4539
4614
  id: flowNode.id.slice(-4),
4540
4615
  type: flowNode.type,
4541
4616
  viewMode,
4542
4617
  editMode
4543
4618
  });
4544
4619
  logNodeData(flowNode);
4545
- if (onNodeClick) {
4546
- const nodeClickInfo = transformNodeToClickInfo(flowNode);
4547
- if (nodeClickInfo) {
4548
- debugLog('events', '將點擊資訊傳遞給父組件:', nodeClickInfo);
4549
- onNodeClick(nodeClickInfo);
4620
+ if (onNodeDoubleClick) {
4621
+ const nodeDoubleClickInfo = transformNodeToClickInfo(flowNode);
4622
+ if (nodeDoubleClickInfo) {
4623
+ debugLog('events', '將雙擊資訊傳遞給父組件:', nodeDoubleClickInfo);
4624
+ onNodeDoubleClick(nodeDoubleClickInfo);
4550
4625
  }
4551
4626
  }
4552
4627
  }, [
4553
4628
  viewMode,
4554
4629
  editMode,
4555
- onNodeClick
4630
+ onNodeDoubleClick
4556
4631
  ]);
4557
4632
  const handleToggleBackground = React.useCallback((show)=>{
4558
4633
  debugLog('ui', '切換底圖顯示:', {
@@ -4650,6 +4725,8 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
4650
4725
  children: [
4651
4726
  /*#__PURE__*/ jsxRuntime.jsx(Breadcrumb, {
4652
4727
  warehouseIds: warehouseIds,
4728
+ viewMode: viewMode,
4729
+ showBreadcrumbEditButton: showBreadcrumbEditButton,
4653
4730
  onWarehouseClick: onBreadcrumbClick,
4654
4731
  onNameChange: onNameChange
4655
4732
  }),
@@ -4693,6 +4770,7 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
4693
4770
  onNodeMouseEnter: handleNodeMouseEnter,
4694
4771
  onNodeMouseLeave: handleNodeMouseLeave,
4695
4772
  onNodeClick: handleNodeClick,
4773
+ onNodeDoubleClick: handleNodeDoubleClick,
4696
4774
  showBackground: showBackground
4697
4775
  }),
4698
4776
  /*#__PURE__*/ jsxRuntime.jsx(ViewModeToolbar, {
@@ -4706,7 +4784,7 @@ const WMSMapContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPa
4706
4784
 
4707
4785
  var styles = {"modal":"wms-map-modal-container-module_modal__PKmT7","content":"wms-map-modal-container-module_content__9p84R"};
4708
4786
 
4709
- const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
4787
+ const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, colorPalette, showBreadcrumbEditButton, onEditModeChange, onToggleRectangleTool, onTogglePenTool, onColorChange, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
4710
4788
  return /*#__PURE__*/ jsxRuntime.jsx("div", {
4711
4789
  className: styles.content,
4712
4790
  children: /*#__PURE__*/ jsxRuntime.jsx(react$1.ReactFlowProvider, {
@@ -4716,11 +4794,13 @@ const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, co
4716
4794
  selectedColor: selectedColor,
4717
4795
  viewMode: viewMode,
4718
4796
  colorPalette: colorPalette,
4797
+ showBreadcrumbEditButton: showBreadcrumbEditButton,
4719
4798
  onEditModeChange: onEditModeChange,
4720
4799
  onToggleRectangleTool: onToggleRectangleTool,
4721
4800
  onTogglePenTool: onTogglePenTool,
4722
4801
  onColorChange: onColorChange,
4723
4802
  onNodeClick: onNodeClick,
4803
+ onNodeDoubleClick: onNodeDoubleClick,
4724
4804
  onSave: onSave,
4725
4805
  onBreadcrumbClick: onBreadcrumbClick,
4726
4806
  onNameChange: onNameChange,
@@ -4734,7 +4814,7 @@ const WMSMapModalContent = ({ editMode, drawingMode, selectedColor, viewMode, co
4734
4814
  })
4735
4815
  });
4736
4816
  };
4737
- const WMSMapModalContainer = ({ open, onClose, viewMode = ViewMode.EDIT, colorPalette, onNodeClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, debugMode = false, title, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
4817
+ const WMSMapModalContainer = ({ open, onClose, viewMode = ViewMode.EDIT, colorPalette, showBreadcrumbEditButton, onNodeClick, onNodeDoubleClick, onSave, onBreadcrumbClick, onNameChange, initialNodes, initialEdges, debugMode = false, title, onUpload, getFilenameFQDN, maxFileSizeKB, warehouseIds })=>{
4738
4818
  const [editMode, setEditMode] = React.useState(EditMode.BACKGROUND);
4739
4819
  const [drawingMode, setDrawingMode] = React.useState(DrawingMode.NONE);
4740
4820
  const [selectedColor, setSelectedColor] = React.useState(()=>{
@@ -4797,11 +4877,13 @@ const WMSMapModalContainer = ({ open, onClose, viewMode = ViewMode.EDIT, colorPa
4797
4877
  selectedColor: selectedColor,
4798
4878
  viewMode: viewMode,
4799
4879
  colorPalette: colorPalette,
4880
+ showBreadcrumbEditButton: showBreadcrumbEditButton,
4800
4881
  onEditModeChange: handleEditModeChange,
4801
4882
  onToggleRectangleTool: handleToggleRectangleTool,
4802
4883
  onTogglePenTool: handleTogglePenTool,
4803
4884
  onColorChange: handleColorChange,
4804
4885
  onNodeClick: onNodeClick,
4886
+ onNodeDoubleClick: onNodeDoubleClick,
4805
4887
  onSave: onSave,
4806
4888
  onBreadcrumbClick: onBreadcrumbClick,
4807
4889
  onNameChange: onNameChange,
@@ -4866,20 +4948,17 @@ const WMSMapModalContainer = ({ open, onClose, viewMode = ViewMode.EDIT, colorPa
4866
4948
  };
4867
4949
  } else if (range.type === MapRangeType.POLYGON) {
4868
4950
  const polyRange = range;
4869
- // 計算多邊形的中心點作為節點位置
4870
- const centerX = polyRange.points.reduce((sum, point)=>sum + point.x, 0) / polyRange.points.length;
4871
- const centerY = polyRange.points.reduce((sum, point)=>sum + point.y, 0) / polyRange.points.length;
4872
4951
  // 將絕對座標轉換為相對於中心點的座標
4873
4952
  const relativePoints = polyRange.points.map((point)=>({
4874
- x: point.x - centerX,
4875
- y: point.y - centerY
4953
+ x: point.x,
4954
+ y: point.y
4876
4955
  }));
4877
4956
  return {
4878
4957
  id: polyRange.id,
4879
4958
  type: 'pathNode',
4880
4959
  position: {
4881
- x: centerX,
4882
- y: centerY
4960
+ x: Math.min(...polyRange.points.map((p)=>p.x)),
4961
+ y: Math.min(...polyRange.points.map((p)=>p.y))
4883
4962
  },
4884
4963
  data: {
4885
4964
  points: relativePoints,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rytass/wms-map-react-components",
3
- "version": "0.1.7",
3
+ "version": "0.1.9",
4
4
  "description": "Rytass Warehouse Management System Map React Components",
5
5
  "keywords": [
6
6
  "rytass",
@@ -5,7 +5,9 @@ export interface WMSMapModalProps {
5
5
  open: boolean;
6
6
  viewMode?: ViewMode;
7
7
  colorPalette?: string[];
8
+ showBreadcrumbEditButton?: (warehouseIds: string[]) => boolean;
8
9
  onNodeClick?: (nodeInfo: WMSNodeClickInfo) => void;
10
+ onNodeDoubleClick?: (nodeInfo: WMSNodeClickInfo) => void;
9
11
  onSave?: (mapData: Map) => void;
10
12
  onBreadcrumbClick?: (warehouseId: string, index: number) => void;
11
13
  onNameChange?: (name: string) => Promise<void>;
@@ -24,11 +26,13 @@ export interface WMSMapContentProps {
24
26
  selectedColor: string;
25
27
  viewMode: ViewMode;
26
28
  colorPalette?: string[];
29
+ showBreadcrumbEditButton?: (warehouseIds: string[]) => boolean;
27
30
  onEditModeChange: (mode: EditMode) => void;
28
31
  onToggleRectangleTool: () => void;
29
32
  onTogglePenTool: () => void;
30
33
  onColorChange: (color: string) => void;
31
34
  onNodeClick?: (nodeInfo: WMSNodeClickInfo) => void;
35
+ onNodeDoubleClick?: (nodeInfo: WMSNodeClickInfo) => void;
32
36
  onSave?: (mapData: Map) => void;
33
37
  onBreadcrumbClick?: (warehouseId: string, index: number) => void;
34
38
  onNameChange?: (name: string) => Promise<void>;
@@ -51,20 +51,17 @@ import { MapRangeType } from '../typings.js';
51
51
  };
52
52
  } else if (range.type === MapRangeType.POLYGON) {
53
53
  const polyRange = range;
54
- // 計算多邊形的中心點作為節點位置
55
- const centerX = polyRange.points.reduce((sum, point)=>sum + point.x, 0) / polyRange.points.length;
56
- const centerY = polyRange.points.reduce((sum, point)=>sum + point.y, 0) / polyRange.points.length;
57
54
  // 將絕對座標轉換為相對於中心點的座標
58
55
  const relativePoints = polyRange.points.map((point)=>({
59
- x: point.x - centerX,
60
- y: point.y - centerY
56
+ x: point.x,
57
+ y: point.y
61
58
  }));
62
59
  return {
63
60
  id: polyRange.id,
64
61
  type: 'pathNode',
65
62
  position: {
66
- x: centerX,
67
- y: centerY
63
+ x: Math.min(...polyRange.points.map((p)=>p.x)),
64
+ y: Math.min(...polyRange.points.map((p)=>p.y))
68
65
  },
69
66
  data: {
70
67
  points: relativePoints,
@@ -42,11 +42,20 @@ import { MapRangeType } from '../typings.js';
42
42
  {
43
43
  // PathNode 轉換為 MapPolygonRange
44
44
  const pathData = node.data;
45
+ const originSourcePointX = Math.min(...pathData.points.map((p)=>p.x));
46
+ const originSourcePointY = Math.min(...pathData.points.map((p)=>p.y));
47
+ const deltaX = node.position.x - originSourcePointX;
48
+ const deltaY = node.position.y - originSourcePointY;
49
+ // 將 node.position 偏移量加到每個 point 上,因為拖曳整個 node 時只更新 position 不更新 data.points
50
+ const absolutePoints = (pathData.points || []).map((p)=>({
51
+ x: p.x + deltaX,
52
+ y: p.y + deltaY
53
+ }));
45
54
  const polygonRange = {
46
55
  id: pathData.label || node.id,
47
56
  type: MapRangeType.POLYGON,
48
57
  color: pathData.color || '#0000FF',
49
- points: pathData.points || []
58
+ points: absolutePoints
50
59
  };
51
60
  ranges.push(polygonRange);
52
61
  break;
@@ -135,27 +144,35 @@ import { MapRangeType } from '../typings.js';
135
144
  case 'pathNode':
136
145
  {
137
146
  const pathData = node.data;
138
- const bounds = pathData.points?.length > 0 ? {
139
- minX: Math.min(...pathData.points.map((p)=>p.x)),
140
- minY: Math.min(...pathData.points.map((p)=>p.y)),
141
- maxX: Math.max(...pathData.points.map((p)=>p.x)),
142
- maxY: Math.max(...pathData.points.map((p)=>p.y))
143
- } : null;
147
+ const originSourcePointX = Math.min(...pathData.points.map((p)=>p.x));
148
+ const originSourcePointY = Math.min(...pathData.points.map((p)=>p.y));
149
+ const deltaX = node.position.x - originSourcePointX;
150
+ const deltaY = node.position.y - originSourcePointY;
151
+ const absolutePoints = (pathData.points || []).map((p)=>({
152
+ x: p.x + deltaX,
153
+ y: p.y + deltaY
154
+ }));
144
155
  const mapPolygonRange = {
145
156
  id: pathData.label || node.id,
146
157
  type: MapRangeType.POLYGON,
147
158
  color: pathData.color || '#0000FF',
148
- points: pathData.points || []
159
+ points: absolutePoints
149
160
  };
161
+ const absoluteBounds = absolutePoints.length > 0 ? {
162
+ minX: Math.min(...absolutePoints.map((p)=>p.x)),
163
+ minY: Math.min(...absolutePoints.map((p)=>p.y)),
164
+ maxX: Math.max(...absolutePoints.map((p)=>p.x)),
165
+ maxY: Math.max(...absolutePoints.map((p)=>p.y))
166
+ } : null;
150
167
  const clickInfo = {
151
168
  ...baseInfo,
152
169
  type: 'pathNode',
153
170
  pathData: {
154
171
  color: pathData.color || '#0000FF',
155
172
  strokeWidth: pathData.strokeWidth || 2,
156
- pointCount: pathData.points?.length || 0,
157
- points: pathData.points || [],
158
- bounds
173
+ pointCount: absolutePoints.length,
174
+ points: absolutePoints,
175
+ bounds: absoluteBounds
159
176
  },
160
177
  mapPolygonRange
161
178
  };
@@ -239,25 +256,33 @@ import { MapRangeType } from '../typings.js';
239
256
  case 'pathNode':
240
257
  {
241
258
  const pathData = node.data;
259
+ const originSourcePointX = Math.min(...pathData.points.map((p)=>p.x));
260
+ const originSourcePointY = Math.min(...pathData.points.map((p)=>p.y));
261
+ const deltaX = node.position.x - originSourcePointX;
262
+ const deltaY = node.position.y - originSourcePointY;
263
+ // 轉換格式(對應儲存時的格式)— 加上 node.position 偏移
264
+ const absoluteLogPoints = (pathData.points || []).map((p)=>({
265
+ x: p.x + deltaX,
266
+ y: p.y + deltaY
267
+ }));
242
268
  console.log('🔗 路徑資訊:', {
243
269
  color: pathData.color,
244
270
  strokeWidth: pathData.strokeWidth,
245
271
  pointCount: pathData.points?.length || 0,
246
272
  points: pathData.points,
247
273
  // 計算路徑邊界
248
- bounds: pathData.points?.length > 0 ? {
249
- minX: Math.min(...pathData.points.map((p)=>p.x)),
250
- minY: Math.min(...pathData.points.map((p)=>p.y)),
251
- maxX: Math.max(...pathData.points.map((p)=>p.x)),
252
- maxY: Math.max(...pathData.points.map((p)=>p.y))
274
+ bounds: absoluteLogPoints?.length > 0 ? {
275
+ minX: Math.min(...absoluteLogPoints.map((p)=>p.x)),
276
+ minY: Math.min(...absoluteLogPoints.map((p)=>p.y)),
277
+ maxX: Math.max(...absoluteLogPoints.map((p)=>p.x)),
278
+ maxY: Math.max(...absoluteLogPoints.map((p)=>p.y))
253
279
  } : null
254
280
  });
255
- // 轉換格式(對應儲存時的格式)
256
281
  const polygonRange = {
257
282
  id: node.id,
258
283
  type: MapRangeType.POLYGON,
259
284
  color: pathData.color || '#0000FF',
260
- points: pathData.points || []
285
+ points: absoluteLogPoints
261
286
  };
262
287
  console.log('💾 儲存格式 (MapPolygonRange):', polygonRange);
263
288
  break;