fix(emotion): propagate resolved component theme override to wrapped component

Merge the SettingsProvider component overrides with the resolved
themeOverride prop and pass the result down as `themeOverride`, so nested
components receive the effective overrides. Default missing overrides to
an empty object to avoid merging undefined.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: HerrTopi

packages/emotion/src/withStyleNew.tsx

@@ -190,7 +190,7 @@ const withStyleNew = decorator(
       const semanticsOverrides = themeOverride?.semantics
       const sharedTokensOverrides = themeOverride?.sharedTokens
       const componentOverridesFromSettingsProvider =
-        themeOverride?.components?.[rawComponentId]
+        themeOverride?.components?.[rawComponentId] ?? {}
       const componentOverridesFromThemeOverrideProp = (
         componentProps as ThemeOverrideProp
       ).themeOverride
@@ -225,15 +225,23 @@ const withStyleNew = decorator(
         componentOverridesFromSettingsProvider as Record<string, unknown>
       )
 
-      const componentTheme = mergeDeep(
-        componentThemeFromSettingsProvider,
-        // @ts-ignore TODO-theme-types: fix typing
-        typeof componentOverridesFromThemeOverrideProp === 'function'
+      const resolvedComponentOverrideFromThemeOverrideProp =
+        (typeof componentOverridesFromThemeOverrideProp === 'function'
           ? componentOverridesFromThemeOverrideProp(
               componentThemeFromSettingsProvider,
               themeInContext
             )
-          : componentOverridesFromThemeOverrideProp
+          : componentOverridesFromThemeOverrideProp) ?? {}
+
+      const componentTheme = mergeDeep(
+        componentThemeFromSettingsProvider,
+        // @ts-ignore TODO-theme-types: fix typing
+        resolvedComponentOverrideFromThemeOverrideProp
+      )
+
+      const derivedComponentOverride = mergeDeep(
+        componentOverridesFromSettingsProvider,
+        resolvedComponentOverrideFromThemeOverrideProp
       )
 
       // TODO do not call here generateStyle, it does not receive the extraArgs
@@ -263,6 +271,7 @@ const withStyleNew = decorator(
           {...props}
           makeStyles={makeStyleHandler}
           styles={styles}
+          themeOverride={derivedComponentOverride}
         />
       )
     })

packages/ui-tree-browser/src/TreeBrowser/v2/TreeNode/index.tsx

@@ -54,7 +54,7 @@ in the TreeBrowser.
 class TreeNode extends Component<TreeBrowserNodeProps, { isHovered: boolean }> {
   static displayName = 'TreeNode'
   static readonly componentId = 'TreeBrowser.Node'
-  static readonly themeId = 'TreeBrowserTreeButton'
+  static readonly themeId = 'TreeBrowserTreeNode'
 
   static allowedProps = allowedProps