Merge remote-tracking branch 'origin/upstream'

Author: ikxin

apps/v4/app/(app)/docs/[[...slug]]/page.tsx

@@ -183,7 +183,7 @@ export default async function Page(props: {
       <div className="sticky top-[calc(var(--header-height)+1px)] z-30 ml-auto hidden h-[90svh] w-72 flex-col gap-4 overflow-hidden overscroll-none pb-8 lg:flex">
         <div className="h-(--top-spacing) shrink-0"></div>
         <div className="px-8">
-          <div className="wwads-cn wwads-vertical w-full my-6" data-id="354" />
+          <div className="wwads-cn wwads-vertical my-6" data-id="354" style={{ maxWidth: "200px" }} />
         </div>
         {doc.toc?.length ? (
           <div className="no-scrollbar flex flex-col gap-8 overflow-y-auto px-8">

apps/v4/content/docs/(root)/figma.mdx

@@ -9,8 +9,9 @@ description: Figma 中重新创建的每个组件。支持可自定义属性、
 
 ## 免费
 
-- [Obra shadcn/ui](https://www.figma.com/community/file/1514746685758799870/obra-shadcn-ui) 由 [Obra Studio](https://obra.studio/) 提供 - 精心打造的套件，采用 shadcn 哲学设计，跟踪 v4，MIT 许可
-- [shadcn/ui 设计系统](https://www.figma.com/community/file/1203061493325953101) 由 [Pietro Schirano](https://twitter.com/skirano) 提供 - shadcn/ui 的设计伴侣。每个组件都经过精心制作，完美匹配代码实现。
+- [Obra shadcn/ui](https://www.figma.com/community/file/1514746685758799870/obra-shadcn-ui) 由 [Obra Studio](https://obra.studio/) 提供 - 精心打造的 shadcn/ui 套件，MIT 许可，由设计师团队维护，配有免费的设计转代码插件
+- [shadcn/ui 组件](https://www.figma.com/community/file/1342715840824755935) 由 [Sitsiilia Bergmann](https://x.com/sitsiilia) 提供 - 结构良好的组件库，与 shadcn 组件系统保持一致，定期维护。
+- [shadcn/ui 设计系统](https://www.figma.com/community/file/1203061493325953101) 由 [Pietro Schirano](https://twitter.com/skirano) 提供 - shadcn/ui 的设计伴侣。每个组件都经过精心打造，与代码实现完美匹配。
 
 ## 付费
 

apps/v4/content/docs/components/base/dropdown-menu.mdx

@@ -5,8 +5,8 @@ featured: true
 base: base
 component: true
 links:
-  doc: https://base-ui.com/react/components/dropdown-menu
-  api: https://base-ui.com/react/components/dropdown-menu#api-reference
+  doc: https://base-ui.com/react/components/menu
+  api: https://base-ui.com/react/components/menu#api-reference
 ---
 
 <ComponentPreview
@@ -162,4 +162,4 @@ import {
 
 ## API 参考
 
-完整 API 参考请参阅 [Base UI 文档](https://base-ui.com/react/components/dropdown-menu)。
+完整 API 参考请参阅 [Base UI 文档](https://base-ui.com/react/components/menu)。

apps/v4/content/docs/components/base/navigation-menu.mdx

@@ -37,14 +37,15 @@ npx shadcn@latest add navigation-menu
 <Step>安装以下依赖：</Step>
 
 ```bash
-npm install @base-ui-components/react
+npm install @base-ui/react
 ```
 
 <Step>将以下代码复制并粘贴到您的项目中。</Step>
 
 <ComponentSource
   name="navigation-menu"
   title="components/ui/navigation-menu.tsx"
+  styleName="base-nova"
 />
 
 <Step>更新导入路径以匹配您的项目配置。</Step>

apps/v4/lib/highlight-code.ts

@@ -87,7 +87,7 @@ export async function highlightCode(code: string, language: string = "tsx") {
       {
         pre(node) {
           node.properties["class"] =
-            "no-scrollbar min-w-0 overflow-x-auto overscroll-none px-4 py-3.5 outline-none has-[[data-highlighted-line]]:px-0 has-[[data-line-numbers]]:px-0 has-[[data-slot=tabs]]:p-0 !bg-transparent"
+            "no-scrollbar min-w-0 overflow-x-auto overflow-y-auto overscroll-x-contain overscroll-y-auto px-4 py-3.5 outline-none has-[[data-highlighted-line]]:px-0 has-[[data-line-numbers]]:px-0 has-[[data-slot=tabs]]:p-0 !bg-transparent"
         },
         code(node) {
           node.properties["data-line-numbers"] = ""

apps/v4/mdx-components.tsx

@@ -190,7 +190,7 @@ export const mdxComponents = {
     return (
       <pre
         className={cn(
-          "no-scrollbar min-w-0 overflow-x-auto overscroll-none px-4 py-3.5 outline-none has-[[data-highlighted-line]]:px-0 has-[[data-line-numbers]]:px-0 has-[[data-slot=tabs]]:p-0",
+          "no-scrollbar min-w-0 overflow-x-auto overflow-y-auto overscroll-x-contain overscroll-y-auto px-4 py-3.5 outline-none has-[[data-highlighted-line]]:px-0 has-[[data-line-numbers]]:px-0 has-[[data-slot=tabs]]:p-0",
           className
         )}
         {...props}

apps/v4/public/r/registries.json

@@ -86,7 +86,7 @@
   {
     "name": "@basecn",
     "homepage": "https://basecn.dev",
-    "url": "https://basecn.dev/r/{name}",
+    "url": "https://basecn.dev/r/{name}.json",
     "description": "Beautifully crafted shadcn/ui components powered by Base UI"
   },
   {
@@ -431,6 +431,12 @@
     "url": "https://roiui.com/r/{name}.json",
     "description": "Roi UI is a library that offers UI components and blocks built with Base UI primitives. Some blocks and components use motion (framer). Everything is open-source and will be forever."
   },
+  {
+    "name": "@satoriui",
+    "homepage": "https://satoriui.site",
+    "url": "https://satoriui.site/r/{name}.json",
+    "description": "A comprehensive suite of high-fidelity interaction components. It offers motion-driven components that designed with motion-react and tailwindcss, that blends seamlessly."
+  },
   {
     "name": "@solaceui",
     "homepage": "https://www.solaceui.com",
@@ -688,5 +694,11 @@
     "homepage": "https://typedora-ui.netlify.app",
     "url": "https://typedora-ui.netlify.app/r/{name}.json",
     "description": "Typedora UI is a next-generation extension layer for shadcn/ui, designed to bring full type-safety to your UI components."
+  },
+  {
+    "name": "@shadcn-space",
+    "homepage": "https://shadcnspace.com/",
+    "url": "https://shadcnspace.com/r/{name}.json",
+    "description": "An open-source collection of production-ready Shadcn UI blocks, components, and templates for websites, admin dashboards and modern React web projects, built with Tailwind CSS and ready to copy-paste or install via the Shadcn CLI."
   }
 ]