Skip to content

Commit 4ae783d

Browse files
authored
Merge pull request #140 from dev-five-git/vstack-generic
Fix default generic type of VStack
2 parents b08955f + 703641f commit 4ae783d

File tree

6 files changed

+316
-166
lines changed

6 files changed

+316
-166
lines changed

.changeset/unlucky-clocks-love.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@devup-ui/react": patch
3+
---
4+
5+
Change default generic type of VStack

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
"benchmark": "node benchmark.js"
1313
},
1414
"devDependencies": {
15-
"eslint-plugin-devup": "^2.0.1",
15+
"eslint-plugin-devup": "^2.0.3",
1616
"eslint": "^9.20.1",
1717
"vitest": "^3.0.5",
1818
"@vitest/coverage-v8": "^3.0.5",
19-
"@changesets/cli": "^2.27.12",
20-
"@types/node": "^22.13.1",
19+
"@changesets/cli": "^2.28.0",
20+
"@types/node": "^22.13.4",
2121
"happy-dom": "^17.1.0",
2222
"@testing-library/react": "^16.2.0"
2323
},
2424
"author": "devfive",
25-
"packageManager": "pnpm@10.3.0",
25+
"packageManager": "pnpm@10.4.1",
2626
"resolutions": {
2727
"vite": "^6"
2828
}

packages/react/src/components/ThemeScript.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ export function ThemeScript({ auto = true, theme }: ThemeScriptProps) {
1111
dangerouslySetInnerHTML={{
1212
__html: theme
1313
? `(function (){document.documentElement.setAttribute('data-theme',${theme});}())`
14-
: `(function (){
15-
const o=localStorage.getItem('__DF_THEME_SELECTED__')||(${String(auto)}&&window.matchMedia('(prefers-color-scheme:dark)').matches?'dark':'default');document.documentElement.setAttribute('data-theme',o);})()`,
14+
: `(function (){const o=localStorage.getItem('__DF_THEME_SELECTED__')||(${String(auto)}&&window.matchMedia('(prefers-color-scheme:dark)').matches?'dark':'default');document.documentElement.setAttribute('data-theme',o);})()`,
1615
}}
1716
/>
1817
)

packages/react/src/components/VStack.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { DevupProps } from '../types/props'
22
import type { Merge } from '../types/utils'
33

4-
export function VStack<T extends React.ElementType = 'span'>(
4+
export function VStack<T extends React.ElementType = 'div'>(
55
// eslint-disable-next-line @typescript-eslint/no-unused-vars
66
props: Merge<React.ComponentProps<T>, DevupProps<T>>,
77
): React.ReactElement {

packages/react/src/components/__tests__/__snapshots__/ThemeScript.browser.test.tsx.snap

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
exports[`ThemeScript > should apply ThemeScript 1`] = `
44
<div>
55
<script>
6-
(function (){
7-
const o=localStorage.getItem('__DF_THEME_SELECTED__')||(true&&window.matchMedia('(prefers-color-scheme:dark)').matches?'dark':'default');document.documentElement.setAttribute('data-theme',o);})()
6+
(function (){const o=localStorage.getItem('__DF_THEME_SELECTED__')||(true&&window.matchMedia('(prefers-color-scheme:dark)').matches?'dark':'default');document.documentElement.setAttribute('data-theme',o);})()
87
</script>
98
</div>
109
`;
1110

1211
exports[`ThemeScript > should apply ThemeScript with not auto 1`] = `
1312
<div>
1413
<script>
15-
(function (){
16-
const o=localStorage.getItem('__DF_THEME_SELECTED__')||(false&&window.matchMedia('(prefers-color-scheme:dark)').matches?'dark':'default');document.documentElement.setAttribute('data-theme',o);})()
14+
(function (){const o=localStorage.getItem('__DF_THEME_SELECTED__')||(false&&window.matchMedia('(prefers-color-scheme:dark)').matches?'dark':'default');document.documentElement.setAttribute('data-theme',o);})()
1715
</script>
1816
</div>
1917
`;

0 commit comments

Comments
 (0)