Merge branch 'dev' into ir-3547

EtherealEngine · Aug 12, 2024 · f612960 · f612960
2 parents f594a25 + a2df55f
commit f612960
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/packages/ui/src/components/editor/panels/Hierarchy/container/index.tsx b/packages/ui/src/components/editor/panels/Hierarchy/container/index.tsx
@@ -23,7 +23,12 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20
 Ethereal Engine. All Rights Reserved.
 */
 
-import { getComponent, getMutableComponent, useOptionalComponent } from '@etherealengine/ecs/src/ComponentFunctions'
+import {
+  getComponent,
+  getMutableComponent,
+  getOptionalComponent,
+  useOptionalComponent
+} from '@etherealengine/ecs/src/ComponentFunctions'
 import { AllFileTypes } from '@etherealengine/engine/src/assets/constants/fileTypes'
 import { getMutableState, getState, none, useHookstate, useMutableState } from '@etherealengine/hyperflux'
 import { NameComponent } from '@etherealengine/spatial/src/common/NameComponent'
@@ -276,9 +281,11 @@ function HierarchyPanelContents(props: { sceneURL: string; rootEntity: Entity; i
         }
         setPrevClickedNode(entity)
       } else if (e.detail === 2) {
-        const editorCameraState = getMutableComponent(Engine.instance.cameraEntity, CameraOrbitComponent)
-        editorCameraState.focusedEntities.set([entity])
-        editorCameraState.refocus.set(true)
+        if (entity && getOptionalComponent(entity, CameraOrbitComponent)) {
+          const editorCameraState = getMutableComponent(Engine.instance.cameraEntity, CameraOrbitComponent)
+          editorCameraState.focusedEntities.set([entity])
+          editorCameraState.refocus.set(true)
+        }
       }
     },
     [prevClickedNode, entityHierarchy]

diff --git a/packages/ui/src/primitives/tailwind/Tooltip/index.tsx b/packages/ui/src/primitives/tailwind/Tooltip/index.tsx
@@ -44,6 +44,10 @@ const Tooltip = ({ title, titleClassName, content, children, className, ...rest
       keepTooltipInside
       repositionOnResize
       arrow={false}
+      contentStyle={{
+        animation: 'expandFromCenter 0.3s cubic-bezier(0.38, 0.1, 0.36, 0.9) forwards',
+        transformOrigin: 'center'
+      }}
       {...rest}
     >
       <div className="-mt-1 grid text-wrap shadow-lg transition-all">

diff --git a/packages/ui/src/primitives/tailwind/Tooltip/tooltip.css b/packages/ui/src/primitives/tailwind/Tooltip/tooltip.css
@@ -12,9 +12,3 @@
     opacity: 1;
   }
 }
-
-.popup-content {
-  animation: expandFromCenter 0.3s cubic-bezier(0.38, 0.1, 0.36, 0.9) forwards;
-  -webkit-animation: expandFromCenter 0.3s cubic-bezier(0.38, 0.1, 0.36, 0.9) forwards;
-  transform-origin: center;
-}