fix(web): ensure new layer reorders correctly. (#1346)

reearth · Jan 14, 2025 · c8910cc · c8910cc
1 parent 52f66e4
commit c8910cc
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/web/src/beta/features/Editor/hooks/useLayers.ts b/web/src/beta/features/Editor/hooks/useLayers.ts
@@ -86,16 +86,23 @@ export default function ({
 
   const [sortedLayerIds, setSortedLayerIds] = useState<string[]>([]);
 
-  useEffect(() => {
-    if (!originNlsLayers) return;
-    setSortedLayerIds((prev) =>
-      prev.length > 0
-        ? prev
-        : [...originNlsLayers]
-            .sort((a, b) => (a.index ?? 0) - (b.index ?? 0))
-            .map((l) => l.id)
-    );
-  }, [originNlsLayers]);
+useEffect(() => {
+  if (!originNlsLayers) return;
+
+  setSortedLayerIds((prev) => {
+    const originIds = originNlsLayers.map((l) => l.id);
+    if (
+      prev.length === originIds.length &&
+      prev.every((id, idx) => id === originIds[idx])
+    ) {
+      return prev;
+    }
+    return [...originNlsLayers]
+      .sort((a, b) => (a.index ?? 0) - (b.index ?? 0))
+      .map((l) => l.id);
+  });
+}, [originNlsLayers]);
+
 
   const nlsLayers: NLSLayer[] = useMemo(
     () =>