Skip to content

Commit eda1453

Browse files
authored
Merge branch 'TanStack:main' into newSearchBox
2 parents 65b37dd + c7bab7f commit eda1453

6 files changed

+35
-27
lines changed

app/components/BytesForm.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default function BytesForm() {
1616
<img height={38} width={38} src={bytesImage} alt="Bytes" />
1717
</figure>
1818
<input
19-
className="text-xs md:text-base border border-black/50 dark:border-white/50 rounded p-2 mb-1 md:mb-2 w-full bg-transparent"
19+
className="text-xs border border-black/50 dark:border-white/50 rounded p-2 mb-1 md:mb-2 w-full bg-transparent"
2020
name="email_address"
2121
placeholder="Your email address"
2222
type="email"
@@ -25,7 +25,7 @@ export default function BytesForm() {
2525
</div>
2626
<button
2727
type="submit"
28-
className="text-xs md:text-base mb-4 border rounded bg-rose-600 border-none text-white p-2"
28+
className="text-xs mb-4 border rounded bg-rose-600 border-none text-white p-2"
2929
>
3030
{state !== 'loading' ? (
3131
<span>Subscribe</span>

app/components/Markdown.tsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ const CustomHeading = ({
2323
}) => {
2424
if (id) {
2525
return (
26-
<a href={`#${id}`} className={`anchor-heading`}>
26+
<a
27+
href={`#${id}`}
28+
className={`anchor-heading [&>*]:scroll-my-[5rem] [&>*]:lg:scroll-my-4`}
29+
>
2730
<Comp id={id} {...props} />
2831
</a>
2932
)

app/libraries/virtual.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export const virtualProject: Library = {
66
cardStyles: `shadow-xl shadow-purple-700/20 dark:shadow-lg dark:shadow-purple-500/30 text-purple-500 border-2 border-transparent hover:border-current`,
77
to: '/virtual',
88
tagline: `Headless UI for Virtualizing Large Element Lists`,
9-
description: `Virtualize only the visible content for massive scrollable DOM nodes at 60FPS in TS/JS, React, Vue, Solid, Svelte & Lit while retaining 100% control over markup and styles.`,
9+
description: `Virtualize only the visible content for massive scrollable DOM nodes at 60FPS in TS/JS, React, Vue, Solid, Svelte, Lit & Angular while retaining 100% control over markup and styles.`,
1010
ogImage: 'https://github.com/tanstack/query/raw/main/media/header.png',
1111
bgStyle: 'bg-purple-500',
1212
textStyle: 'text-purple-500',
@@ -17,7 +17,7 @@ export const virtualProject: Library = {
1717
colorFrom: 'from-purple-500',
1818
colorTo: 'to-violet-600',
1919
textColor: 'text-purple-600',
20-
frameworks: ['react', 'solid', 'vue', 'svelte', 'lit'],
20+
frameworks: ['react', 'solid', 'vue', 'svelte', 'lit', 'angular'],
2121
defaultDocs: 'framework/react/overview',
2222
scarfId: '32372eb1-91e0-48e7-8df1-4808a7be6b94',
2323
}

app/routes/_libraries.start.$version.index.tsx

+23-19
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { CgCornerUpLeft, CgSpinner } from 'react-icons/cg'
44
import { PiTreeStructureBold, PiRocketLaunchDuotone } from 'react-icons/pi'
55
import { TbServerBolt } from 'react-icons/tb'
66
import {
7+
FaBook,
78
FaDiscord,
89
FaGithub,
910
FaTshirt,
@@ -20,6 +21,7 @@ import { createFileRoute } from '@tanstack/react-router'
2021
import { Framework, getBranch } from '~/libraries'
2122
import { seo } from '~/utils/seo'
2223
import { partners } from '~/utils/partners'
24+
import { VscPreview } from 'react-icons/vsc'
2325

2426
const menu = [
2527
{
@@ -30,22 +32,22 @@ const menu = [
3032
),
3133
to: '/',
3234
},
33-
// {
34-
// label: (
35-
// <div className="flex items-center gap-1">
36-
// <VscPreview className="text-lg" /> Examples
37-
// </div>
38-
// ),
39-
// to: './docs/react/examples/basic',
40-
// },
41-
// {
42-
// label: (
43-
// <div className="flex items-center gap-1">
44-
// <FaBook className="text-lg" /> Docs
45-
// </div>
46-
// ),
47-
// to: './docs/',
48-
// },
35+
{
36+
label: (
37+
<div className="flex items-center gap-1">
38+
<VscPreview className="text-lg" /> Examples
39+
</div>
40+
),
41+
to: '../../router/latest/docs/framework/react/examples/start-basic',
42+
},
43+
{
44+
label: (
45+
<div className="flex items-center gap-1">
46+
<FaBook className="text-lg" /> Docs
47+
</div>
48+
),
49+
to: '../../router/latest/docs/framework/react/start/overview',
50+
},
4951
// {
5052
// label: (
5153
// <div className="flex items-center gap-1">
@@ -190,9 +192,9 @@ export default function VersionIndex() {
190192
fully type-safe and powerfully-unmatched routing system
191193
</span>{' '}
192194
that is designed to handle the beefiest of full-stack routing
193-
requirements with ease. Start builds on top of Router's type- to
194-
also provide type-safe full-stack APIs that keep you in the fast
195-
lane.
195+
requirements with ease. Start builds on top of Router's fully
196+
inferred type safety to also provide type-safe full-stack APIs
197+
that keep you in the fast lane.
196198
</p>
197199
</div>
198200
</div>
@@ -323,6 +325,7 @@ Check it out at https://tanstack.com/start/`
323325
)}`}
324326
target="_blank"
325327
className={`flex items-center gap-2 py-2 px-4 bg-cyan-500 rounded text-white uppercase font-extrabold`}
328+
rel="noreferrer"
326329
>
327330
<FaTwitter /> Tweet about it!
328331
</a>{' '}
@@ -497,6 +500,7 @@ Check it out at https://tanstack.com/start/`
497500
href={partner.href}
498501
target="_blank"
499502
className="bg-white shadow-xl shadow-gray-500/20 rounded-lg dark:border border-gray-500/20 dark:bg-gray-800 dark:shadow-none group overflow-hidden grid"
503+
rel="noreferrer"
500504
>
501505
<div className="z-0 row-start-1 col-start-1 bg-white flex items-center justify-center group-hover:blur-sm transition-all duration-200">
502506
{partner.homepageImg}

app/routes/_libraries.virtual.$version.index.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ export default function RouteComp() {
162162
lg:text-xl lg:max-w-2xl"
163163
>
164164
Virtualize only the visible DOM nodes within massive scrollable
165-
elements at 60FPS in TS/JS, React, Vue, Solid, Svelte & Lit while
166-
retaining 100% control over markup and styles.
165+
elements at 60FPS in TS/JS, React, Vue, Solid, Svelte, Lit & Angular
166+
while retaining 100% control over markup and styles.
167167
</p>
168168
<Link
169169
to="./docs/introduction"
@@ -401,6 +401,7 @@ export default function RouteComp() {
401401
{ label: 'Lit', value: 'lit' },
402402
{ label: 'Svelte', value: 'svelte' },
403403
{ label: 'Vue', value: 'vue' },
404+
{ label: 'Angular', value: 'angular' },
404405
] as const
405406
).map((item) => (
406407
<button

app/utils/partners.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ export const partners: Partner[] = [
217217
libraries: ['start', 'router'],
218218
sidebarImgLight: sentryWordMarkDarkSvg,
219219
sidebarImgDark: sentryWordMarkLightSvg,
220-
sidebarImgClass: 'py-6 scale-[1.1]',
220+
sidebarImgClass: 'py-4 scale-[1.1]',
221221
href,
222222
homepageImg: (
223223
<div className="dark:bg-black w-full h-full flex items-center justify-center px-4 py-6">

0 commit comments

Comments
 (0)