fix(core): Fix name + componentName themes not searching upwards

tamagui · Dec 5, 2022 · 3eee04b · 3eee04b · vercel · Dec 5, 2022
1 parent 09269e3
commit 3eee04b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/apps/site/components/HeroExampleCode.tsx b/apps/site/components/HeroExampleCode.tsx
@@ -151,9 +151,9 @@ const CodeExamples = memo(({ examples }: any) => {
       <XStack maxWidth="100%" f={1}>
         <YStack f={1} maxWidth="100%" opacity={0.9} hoverStyle={{ opacity: 1 }}>
           <CodeDemoPreParsed
-            height={300}
+            height={325}
             theme="Card"
-            maxHeight={300}
+            maxHeight={325}
             f={1}
             language={example.language}
             source={example.code}

diff --git a/packages/core/src/helpers/ThemeManager.test.tsx b/packages/core/src/helpers/ThemeManager.test.tsx
@@ -477,4 +477,21 @@ describe('ThemeManager', () => {
     )
     expect(child.state.name).toBe('dark_yellow_Button')
   })
+
+  test(`Component name + name finds one up when component name missing`, () => {
+    const parent = new ThemeManager(
+      {
+        name: 'dark_red_alt1',
+      },
+      'root'
+    )
+    const child = new ThemeManager(
+      {
+        name: 'alt2',
+        componentName: 'Missing',
+      },
+      parent
+    )
+    expect(child.state.name).toBe('dark_red_alt2')
+  })
 })
diff --git a/packages/core/src/helpers/ThemeManager.tsx b/packages/core/src/helpers/ThemeManager.tsx
@@ -176,9 +176,10 @@ function getState(
     ? base.slice(0, base.length).join(THEME_NAME_SEPARATOR)
     : parentName
   const max = base.length
-  const min = componentName
-    ? max // component themes don't search upwards
-    : 0
+  const min =
+    componentName && !nextName
+      ? max // component name only don't search upwards
+      : 0
 
   // prettier-ignore
   // eslint-disable-next-line no-console