Merge pull request #1010 from 5sControl/fix/902-zones-sort

fix: zones names sort
5sControl · Jan 22, 2025 · 6520672 · 6520672
2 parents 72ea239 + 4a27aad
commit 6520672
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/pages/camera/modal/zones/zoneList/zoneList.jsx b/src/pages/camera/modal/zones/zoneList/zoneList.jsx
@@ -46,11 +46,10 @@ export const ZoneList = ({
       <div className={styles.list}>
         {[...cameraZones]
           .sort((a, b) => {
-            const hasNumberA = /\d+/.test(a.name);
-            const hasNumberB = /\d+/.test(b.name);
+            const isNumberA = /^\d+/.test(a.name);
+            const isNumberB = /^\d+/.test(b.name);
 
-            if (hasNumberA && !hasNumberB) return 1;
-            if (!hasNumberA && hasNumberB) return -1;
+            if (isNumberA && isNumberB) return Number(a.name) - Number(b.name);
 
             return a.name.localeCompare(b.name);
           })