Skip to content

Commit d441e07

Browse files
authored
Merge pull request #106 from reactjs/sync-e9a7cb1b
Sync with react.dev @ e9a7cb1
2 parents 198b4c8 + 7c9df7a commit d441e07

File tree

3 files changed

+919
-655
lines changed

3 files changed

+919
-655
lines changed

src/components/Layout/HomeContent.js

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -755,9 +755,7 @@ function CommunityGallery() {
755755
}, []);
756756

757757
return (
758-
<div
759-
ref={ref}
760-
className="relative flex overflow-x-hidden overflow-y-visible w-auto">
758+
<div ref={ref} className="relative flex overflow-x-clip w-auto">
761759
<div
762760
className="w-full py-12 lg:py-20 whitespace-nowrap flex flex-row animate-marquee lg:animate-large-marquee"
763761
style={{
@@ -784,21 +782,26 @@ const CommunityImages = memo(function CommunityImages({isLazy}) {
784782
<div
785783
key={i}
786784
className={cn(
787-
`group flex justify-center px-5 min-w-[50%] lg:min-w-[25%] rounded-2xl relative`
785+
`group flex justify-center px-5 min-w-[50%] lg:min-w-[25%] rounded-2xl`
788786
)}>
789787
<div
790788
className={cn(
791-
'h-auto relative rounded-2xl overflow-hidden before:-skew-x-12 before:absolute before:inset-0 before:-translate-x-full group-hover:before:animate-[shimmer_1s_forwards] before:bg-gradient-to-r before:from-transparent before:via-white/10 before:to-transparent transition-all ease-in-out duration-300',
789+
'h-auto rounded-2xl before:rounded-2xl before:absolute before:pointer-events-none before:inset-0 before:transition-opacity before:-z-1 before:shadow-lg lg:before:shadow-2xl before:opacity-0 before:group-hover:opacity-100 transition-transform ease-in-out duration-300',
792790
i % 2 === 0
793-
? 'rotate-2 group-hover:rotate-[-1deg] group-hover:scale-110 group-hover:shadow-lg lg:group-hover:shadow-2xl'
794-
: 'group-hover:rotate-1 group-hover:scale-110 group-hover:shadow-lg lg:group-hover:shadow-2xl rotate-[-2deg]'
791+
? 'rotate-2 group-hover:rotate-[-1deg] group-hover:scale-110'
792+
: 'group-hover:rotate-1 group-hover:scale-110 rotate-[-2deg]'
795793
)}>
796-
<img
797-
loading={isLazy ? 'lazy' : 'eager'}
798-
src={src}
799-
alt={alt}
800-
className="aspect-[4/3] h-full w-full flex object-cover rounded-2xl bg-gray-10 dark:bg-gray-80"
801-
/>
794+
<div
795+
className={cn(
796+
'overflow-clip relative before:absolute before:inset-0 before:pointer-events-none before:-translate-x-full group-hover:before:animate-[shimmer_1s_forwards] before:bg-gradient-to-r before:from-transparent before:via-white/10 before:to-transparent transition-transform ease-in-out duration-300'
797+
)}>
798+
<img
799+
loading={isLazy ? 'lazy' : 'eager'}
800+
src={src}
801+
alt={alt}
802+
className="aspect-[4/3] h-full w-full flex object-cover rounded-2xl bg-gray-10 dark:bg-gray-80"
803+
/>
804+
</div>
802805
</div>
803806
</div>
804807
))}

src/content/learn/tutorial-tic-tac-toe.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2247,7 +2247,11 @@ body {
22472247
22482248
</Sandpack>
22492249
2250+
<<<<<<< HEAD
22502251
Unapozunguka kupitia orodha ya `history` ndani ya function unayopitisha kwa `map`, hoja ya `squares` inapitia kila kipengele cha `history`, na hoja ya `move` inapitia kila kiashiria cha orodha: `0`, `1`, `2`, …. (Katika hali nyingi, ungehitaji vipengele halisi vya orodha, lakini ili kuonyesha orodha ya harakati utahitaji tu viashiria.)
2252+
=======
2253+
As you iterate through the `history` array inside the function you passed to `map`, the `squares` argument goes through each element of `history`, and the `move` argument goes through each array index: `0`, `1`, `2`, …. (In most cases, you'd need the actual array elements, but to render a list of moves you will only need indexes.)
2254+
>>>>>>> e9a7cb1b6ca1659b42d81555ecef0cd554b7a983
22512255
22522256
Kwa kila harakati katika historia ya mchezo wa tic-tac-toe, unaunda kipengele cha orodha `<li>` kinachojumuisha kitufe `<button>`. Kitufe kinakuwa na kihariri cha `onClick` kinachoitwa function inayoitwa `jumpTo` (ambayo huja kuwa umeitekeleza bado).
22532257

0 commit comments

Comments
 (0)