@lvce-editor/ports-view 0.6.3 → 0.7.0

package/dist/portsViewWorkerMain.js

@@ -2033,26 +2033,25 @@ const handleBlur = state => {
   };
 };
 
-const handleClickAt = (state, clientY, name) => {
+const getIndexAt = (state, clientY) => {
   const {
     deltaY,
     headerHeight,
     itemHeight,
+    listHeight,
     minLineY,
     ports,
     y
   } = state;
-  if (name.startsWith('port-address-') || name.startsWith('port-status-')) {
-    const port = Number(name.slice(name.lastIndexOf('-') + 1));
-    const index = ports.findIndex(item => item.port === port);
-    return index === -1 ? state : focusIndex(state, index);
-  }
   const relativeY = clientY - y - headerHeight;
+  if (itemHeight <= 0 || relativeY < 0 || relativeY >= listHeight) {
+    return -1;
+  }
   const index = minLineY + Math.floor((relativeY + deltaY % itemHeight) / itemHeight);
-  if (relativeY < 0 || index < 0 || index >= ports.length) {
-    return state;
+  if (index < 0 || index >= ports.length) {
+    return -1;
   }
-  return focusIndex(state, index);
+  return index;
 };
 
 const SchemeRegex = /^[a-z][a-z\d+.-]*:\/\//i;
@@ -2090,26 +2089,23 @@ const togglePortActive = (state, portNumber) => {
   };
 };
 
-const parsePort = name => {
-  return Number(name.slice(name.lastIndexOf('-') + 1));
-};
 const handleClick = async (state, clientY, name) => {
   const {
     ports
   } = state;
+  const index = getIndexAt(state, clientY);
+  if (index === -1) {
+    return state;
+  }
+  const port = ports[index];
+  const focused = focusIndex(state, index);
   if (name.startsWith('port-address-')) {
-    const portNumber = parsePort(name);
-    const index = ports.findIndex(item => item.port === portNumber);
-    const focused = index === -1 ? state : focusIndex(state, index);
-    return openAddress(focused, portNumber);
+    return openAddress(focused, port.port);
   }
   if (name.startsWith('port-status-')) {
-    const portNumber = parsePort(name);
-    const index = ports.findIndex(item => item.port === portNumber);
-    const focused = index === -1 ? state : focusIndex(state, index);
-    return togglePortActive(focused, portNumber);
+    return togglePortActive(focused, port.port);
   }
-  return handleClickAt(state, clientY, name);
+  return focused;
 };
 
 const handleFocus = state => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/ports-view",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "description": "Ports View Worker",
   "repository": {
     "type": "git",