Fix indentation in aggregate editor popover

Co-authored-by: Fülöp <fulopkovacs@users.noreply.github.com>

theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/BasicKeyframedTrack/KeyframeEditor/DeterminePropEditorForSingleKeyframe.tsx

@@ -25,15 +25,16 @@ const SingleKeyframePropLabel = styled.div`
   font-size: 11px;
   line-height: 13px;
   letter-spacing: 0.01em;
-  margin-right: 12px;
+  padding: 6px 6px 6px 0;
-  padding: 8px;
+
+  width: 40%;
 
   color: #919191;
+
+  overflow: hidden;
 `
 
-const Indent = styled.div`
+const INDENT_PX = 10
-  margin-left: 24px;
-`
 
 /**
  * Given a propConfig, this function gives the corresponding prop editor for
@@ -46,54 +47,64 @@ const Indent = styled.div`
  * @param p - propConfig object for any type of prop.
  */
 export function DeterminePropEditorForKeyframeTree(
-  p: EditingOptionsTree & {autoFocusInput?: boolean},
+  p: EditingOptionsTree & {autoFocusInput?: boolean; indent: number},
 ) {
   if (p.type === 'sheetObject') {
     return (
       <>
-        <SingleKeyframePropLabel>
+        <SingleKeyframePropLabel
+          style={{paddingLeft: `${p.indent * INDENT_PX}px`}}
+        >
           {p.sheetObject.address.objectKey}
         </SingleKeyframePropLabel>
-        <Indent>
         {p.children.map((c, i) => (
           <DeterminePropEditorForKeyframeTree
             key={i}
             {...c}
             autoFocusInput={p.autoFocusInput && i === 0}
+            indent={p.indent + 1}
           />
         ))}
-        </Indent>
       </>
     )
   } else if (p.type === 'propWithChildren') {
     const label = p.propConfig.label ?? last(p.pathToProp)
     return (
       <>
-        <SingleKeyframePropLabel>{label}</SingleKeyframePropLabel>
+        <SingleKeyframePropLabel
-        <Indent>
+          style={{paddingLeft: `${p.indent * INDENT_PX}px`}}
+        >
+          {label}
+        </SingleKeyframePropLabel>
         {p.children.map((c, i) => (
           <DeterminePropEditorForKeyframeTree
             key={i}
             {...c}
             autoFocusInput={p.autoFocusInput && i === 0}
+            indent={p.indent + 1}
           />
         ))}
-        </Indent>
       </>
     )
   } else {
-    return <PrimitivePropEditor {...p} autoFocusInput={p.autoFocusInput} />
+    return (
+      <PrimitivePropEditor
+        {...p}
+        autoFocusInput={p.autoFocusInput}
+        indent={p.indent}
+      />
+    )
   }
 }
 
 const SingleKeyframeSimplePropEditorContainer = styled.div`
-  padding: 0 6px;
   display: flex;
   align-items: center;
+  width: 60%;
 `
 
 function PrimitivePropEditor(
-  p: PrimitivePropEditingOptions & {autoFocusInput?: boolean},
+  p: PrimitivePropEditingOptions & {autoFocusInput?: boolean; indent: number},
 ) {
   const label = p.propConfig.label ?? last(p.pathToProp)
   const editingTools = useEditingToolsForKeyframeEditorPopover(p)
@@ -107,7 +118,11 @@ function PrimitivePropEditor(
     ] as React.VFC<ISimplePropEditorReactProps<PropTypeConfig_AllSimples>>
     return (
       <SingleKeyframePropEditorContainer>
-        <SingleKeyframePropLabel>{label}</SingleKeyframePropLabel>
+        <SingleKeyframePropLabel>
+          <span style={{paddingLeft: `${p.indent * INDENT_PX}px`}}>
+            {label}
+          </span>
+        </SingleKeyframePropLabel>
         <SingleKeyframeSimplePropEditorContainer>
           <PropEditor
             editingTools={editingTools}

theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/BasicKeyframedTrack/KeyframeEditor/useSingleKeyframeInlineEditorPopover.tsx

@@ -19,6 +19,7 @@ export function useKeyframeInlineEditorPopover(
 ) {
   return usePopover({debugName: 'useKeyframeInlineEditorPopover'}, () => (
     <BasicPopover showPopoverEdgeTriangle>
+      <div style={{margin: '1px 2px 1px 10px'}}>
         {!Array.isArray(props)
           ? undefined
           : props.map((prop, i) => (
@@ -26,8 +27,10 @@ export function useKeyframeInlineEditorPopover(
                 key={i}
                 {...prop}
                 autoFocusInput={i === 0}
+                indent={0}
               />
             ))}
+      </div>
     </BasicPopover>
   ))
 }