Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into fix/rn-expo-compat
  • Loading branch information
yusufyildirim committed Apr 8, 2025
commit cf9ec1b29a288bb2fbd7622d678c37d5a2f69a06
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ For powershell, replace in the above listings echo with the following
@"
export const World = () => <p>Hey</p>;
"@ | out-file -encoding ASCII src/hello.stories.tsx
```
```
6 changes: 3 additions & 3 deletions packages/example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"@react-native/assets-registry": "0.77.1",
"expo": "^52.0.37",
"metro-runtime": "^0.81.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-native": "^0.77.2",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-native": "^0.74.5",
"react-native-svg": "^15.5.0",
"react-native-svg-transformer": "^1.5.0",
"react-native-web": "^0.19.13"
Expand Down
6 changes: 2 additions & 4 deletions packages/ladle/lib/app/ladle.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,8 @@ body {
grid-template-columns: minmax(64px, 1fr) auto minmax(64px, 1fr);
overflow: auto;
background-color: var(--ladle-blueprint);
background-image: linear-gradient(
rgba(255, 255, 255, 0.1) 2px,
transparent 2px
),
background-image:
linear-gradient(rgba(255, 255, 255, 0.1) 2px, transparent 2px),
linear-gradient(90deg, rgba(255, 255, 255, 0.1) 2px, transparent 2px),
linear-gradient(rgba(255, 255, 255, 0.1) 1px, transparent 1px),
linear-gradient(90deg, rgba(255, 255, 255, 0.1) 1px, transparent 1px);
Expand Down
10 changes: 5 additions & 5 deletions packages/website/docs/nextjs.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default UnoptimizedLink;
```

```tsx title=".ladle/UnoptimizedImage.tsx"
import React from 'react';
import React from "react";

interface UnoptimizedImageProps
extends React.ImgHTMLAttributes<HTMLImageElement> {
Expand All @@ -48,10 +48,10 @@ const UnoptimizedImage: React.FC<UnoptimizedImageProps> = ({
}) => {
const style: React.CSSProperties = fill
? {
position: 'absolute',
inset: '0',
width: '100%',
height: '100%',
position: "absolute",
inset: "0",
width: "100%",
height: "100%",
}
: {};

Expand Down
Loading
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.