Merge remote-tracking branch 'origin/main' into test/chore-sync

# Conflicts:
#	packages/@dcl/inspector/src/lib/babylon/decentraland/gizmo-manager.ts

Author: pravusjif

.github/workflows/sync-main-to-experimental.yml

@@ -23,29 +23,25 @@ jobs:
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config pull.rebase false  # Always merge, never rebase
 
       - name: Sync main into experimental branch
         run: |
-          # Always use the same rolling branch
           BRANCH_NAME="chore/sync"
           git checkout -B $BRANCH_NAME origin/experimental
 
-          # Pull main changes into experimental branch
-          git pull origin main
-
-          git checkout --theirs .
-          git add -A .
+          # Merge main changes into experimental, preferring main changes on conflicts
+          git fetch origin main
+          git merge -X theirs origin/main || echo "Merge completed (conflicts auto-resolved in favor of main)"
 
           # Run required update steps
           make update-protocol 'experimental'
           make install
           make build
           make update-snapshots
 
-          # Add updated files
-          git add -A .
-
           # Commit if there are changes
+          git add -A .
           git commit --no-edit || echo "No changes to commit"
 
           # Push (force to keep PR updated)

packages/@dcl/inspector/src/hooks/editor/useGizmoAlignment.spec.ts

@@ -3,11 +3,11 @@ import { CoreComponents } from '../../lib/sdk/components'
 import { useGizmoAlignment } from './useGizmoAlignment'
 
 // gizmoManager mock
-import { createGizmoManager } from '../../lib/babylon/decentraland/gizmo-manager'
+import { createGizmoManager } from '../../lib/babylon/decentraland/GizmoManager'
 import mitt from 'mitt'
 import { renderHook } from '@testing-library/react'
 import { act } from 'react-dom/test-utils'
-jest.mock('../../lib/babylon/decentraland/gizmo-manager')
+jest.mock('../../lib/babylon/decentraland/GizmoManager')
 const createGizmoManagerMock = createGizmoManager as jest.MockedFn<typeof createGizmoManager>
 const gizmoManagerEvents = mitt()
 const mockEntity = 0 as Entity

packages/@dcl/inspector/src/lib/babylon/decentraland/GizmoManager.ts

@@ -266,7 +266,7 @@ export function createGizmoManager(context: SceneContext) {
       }
     },
     getGizmoTypes() {
-      return [GizmoType.POSITION, GizmoType.ROTATION, GizmoType.SCALE, GizmoType.FREE] as const
+      return [GizmoType.FREE, GizmoType.POSITION, GizmoType.ROTATION, GizmoType.SCALE] as const
     },
     setGizmoType(type: GizmoType) {
       // Then disable all Babylon gizmos
@@ -385,6 +385,14 @@ export function createGizmoManager(context: SceneContext) {
           currentTransformer.setup()
           currentTransformer.setEntities(selectedEntities)
 
+          // Pass GizmoManager reference to FreeGizmo for centroid calculation
+          if ('setGizmoManager' in currentTransformer) {
+            ;(currentTransformer as any).setGizmoManager({
+              calculateCentroid,
+              updateGizmoPosition
+            })
+          }
+
           // Set up callbacks for ECS updates
           if ('setUpdateCallbacks' in currentTransformer) {
             currentTransformer.setUpdateCallbacks(updateEntityPosition, () => {