From 928c3eb776a3d733d9b771f7dea27a6a79242ced Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Sat, 5 Sep 2026 14:10:47 +0800 Subject: [PATCH 1/9] website: Refine App Stories layout and browsing (#2960) ## Description App Stories cards inherited prose list markers and spacing, making the catalog tall and difficult to scan. Scope the page styles and use the GPUI Kit website's typography, neutral theme tokens, compact controls, and consistent card spacing. Screenshot previews fill a shared 16:9 area, with author, platform/date, and icon-only links organized into aligned rows. Featured now displays six apps per page in editorial order. All apps displays nine entries per page from the complete catalog, defaults to newest publication first, and owns its search, category filters, and star sorting. Search, category, and sort changes reset All apps to page one. Empty results keep the controls available. Star counts use compact notation, accessible names, and an optical alignment correction; Commercial precedes the count, and the separate Read story row is removed. Replace the native sort menu with a theme-aware keyboard-operable listbox and use 32px search/sort controls. Normalize navigation action label sizing and centered line boxes. Update the website design rules and test both pagination sizes and boundaries. Implementation and tests were AI-assisted, with iterative visual feedback and independent code review. Use `bunx` to invoke Astro binaries directly in the package scripts. The previous `bun --bun astro` invocation resolved the identically named package script recursively in CI and failed with E2BIG. Verified the standard `bun run build` command after this fix. Align Test Docs with the release workflow by checking out the approved Showcase catalog, installing its locked dependencies with Bun 1.4.0, and passing `SHOWCASES_DIR`. Run catalog and SEO tests in the website check. ## Visual verification Checked English and Chinese, light and dark themes, and widths from 360 to 1440 pixels in Chromium. Verified aligned card metadata and icon rows, edge-to-edge previews, keyboard focus, selection, empty-state recovery, reduced motion, and Featured's 6/6/4 pagination and All apps' 9/9/9/9/3 pagination, with no duplicate entries. The App Stories content also fits at 200% root font size. The existing shared site navigation overflows in that text-only scaling case; this pre-existing text-scaling overflow remains outside the toolbar alignment fix. ## How to Test From `website/`: ```sh bun run test:showcases bun run build bun run test:seo ``` Open `/apps` and `/zh-CN/apps`. Change Featured pages, search and clear an unmatched query, combine search with a category, and switch between publication and star sorting. Featured selection and order should remain independent of All apps filters. ## Checklist - [x] Read and followed the contributing guidelines. - [x] Reviewed the changes and ran the website tests and build. - [ ] Maintainer review of AI-assisted changes. Rust Story and platform performance tests are not applicable to this website-only change. --- .github/workflows/test-docs.yml | 16 +- website/DESIGN.md | 29 +- website/package.json | 8 +- website/src/components/AppSortSelect.vue | 142 +++++++++ website/src/components/AppsApp.vue | 371 ++++++++++++++--------- website/src/components/Nav.astro | 17 +- website/src/lib/showcase-browser.ts | 23 +- website/tests/showcase-browser.test.ts | 33 +- 8 files changed, 477 insertions(+), 162 deletions(-) create mode 100644 website/src/components/AppSortSelect.vue diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml index e3469d514b..a958d18a5b 100644 --- a/.github/workflows/test-docs.yml +++ b/.github/workflows/test-docs.yml @@ -3,6 +3,7 @@ on: pull_request: paths: - "website/**" + - ".github/workflows/test-docs.yml" - "crates/base/**" - "crates/story-web/**" @@ -12,9 +13,19 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + - name: Checkout latest approved showcases + uses: actions/checkout@v4 + with: + repository: longbridge/gpui-kit-showcases + ref: main + path: .showcases + persist-credentials: false - uses: oven-sh/setup-bun@v1 with: - bun-version: 1.3.6 + bun-version: 1.4.0 + - name: Install Showcase validation and rendering dependencies + working-directory: .showcases + run: bun install --frozen-lockfile - name: Install working-directory: website run: bun install @@ -22,5 +33,8 @@ jobs: working-directory: website env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SHOWCASES_DIR: ${{ github.workspace }}/.showcases run: | + bun run test:showcases bun run build + bun run test:seo diff --git a/website/DESIGN.md b/website/DESIGN.md index 3a9f6d1abc..dd634dd1af 100644 --- a/website/DESIGN.md +++ b/website/DESIGN.md @@ -241,16 +241,32 @@ apps through PRs in [longbridge/gpui-kit-showcases](https://github.com/longbridg to the Vue app; no duplicated hard-coded app list. - **Screenshots show the complete window.** Authors must preserve all four corners and edges in a clear, tidy capture. Images are archived unchanged and referenced - using raw GitHub URLs pinned to the checked-out commit. Cards use a shared 16:10 - area with `object-fit: contain`, retaining the whole image. Do not wrap them in + using raw GitHub URLs pinned to the checked-out commit. Cards use a shared 16:9 + area with `object-fit: cover` and top-center positioning, filling the card edge + to edge. The archived image remains unchanged; previews may crop the bottom + or sides. Do not wrap them in `.mac-window` or add a second title bar. - **Featured is editorial.** Maintainers list app IDs in the catalog's root `featured.json` using project history, implementation, completeness, and quality. The array defines both selection and display order; app manifests have no - `featured` field. Featured apps appear first. Other apps - appear in a separate group sortable by first inclusion time or GitHub Stars. - Search and category filters apply to both groups. Failed or unavailable star + `featured` field. Featured apps appear first, six per page, and keep their editorial order. + The heading shows the total selection count; pagination remains independent + of All apps filters. + All apps includes the entire catalog, including Featured, with nine apps per page. + Search, category, and sort changes return to page one. Its search, category + filters, and sorting controls live below the All apps heading and only affect + that section. Use the site’s neutral tokens and control radii for a compact, + thin-bordered search/filter panel, with counts at the trailing section edge. + The section and controls remain visible when no apps match. Failed or unavailable star counts remain unknown and sort after known counts, never as invented zeroes. +- **Card hierarchy.** Use image, name and author, description, platform/date row, + then a shared footer. Development status belongs beside the identity. Platform + text is unboxed on the left; dates use `YYYY/MM/DD` on the right. In the footer, + Commercial precedes the Lucide Star and compact count on the left. Globe and + GitHub icon links sit on the right with accessible names and tooltips. Do not + add an Open source label, Stars suffix, or Read story row; the image opens + available story details. Keep footer centers and colors aligned, and absorb + unequal description length before metadata so cards align within each row. - **Metadata freshness.** `publishedAt` records first inclusion in App Stories, not the application's original release date, and remains unchanged for updates. GitHub Stars are refreshed in the Showcase repository after merges and weekly, @@ -261,7 +277,8 @@ apps through PRs in [longbridge/gpui-kit-showcases](https://github.com/longbridg route. The catalog’s shared Bun validator and renderer enforce the 10 KB limit, official-link allowlist, local media and product-only content rules. The catalog checkout’s locked dependencies must be installed before building. -- **Review before publication.** Explain before the list that every merged app PR is listed, Featured is not +- **Review before publication.** Keep a labeled selection-policy disclosure before + the list explaining that every merged app PR is listed, Featured is not guaranteed, and maintainers adjust Featured as apps evolve. The submission CTA links to the repository's PR instructions. - **Automatic publishing.** On approved changes merged to Showcase `main`, its diff --git a/website/package.json b/website/package.json index e72e4790cc..17789be51e 100644 --- a/website/package.json +++ b/website/package.json @@ -3,12 +3,12 @@ "type": "module", "private": true, "scripts": { - "dev": "bun --bun astro dev", - "build": "bun --bun astro build && bunx pagefind --site dist", + "dev": "bunx --bun astro dev", + "build": "bunx --bun astro build && bunx pagefind --site dist", "test:showcases": "bun test tests/showcases.test.ts tests/showcase-browser.test.ts", "test:seo": "bun test tests/seo.test.ts", - "preview": "bun --bun astro preview", - "astro": "bun --bun astro" + "preview": "bunx --bun astro preview", + "astro": "bunx --bun astro" }, "dependencies": { "@astrojs/markdown-remark": "^7.3.0", diff --git a/website/src/components/AppSortSelect.vue b/website/src/components/AppSortSelect.vue new file mode 100644 index 0000000000..5f136c09fd --- /dev/null +++ b/website/src/components/AppSortSelect.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/website/src/components/AppsApp.vue b/website/src/components/AppsApp.vue index 3f47700c6b..ba14969ed0 100644 --- a/website/src/components/AppsApp.vue +++ b/website/src/components/AppsApp.vue @@ -4,8 +4,11 @@ {{ copy.kicker }}

{{ copy.title }}

{{ copy.lead }}

-

{{ copy.selectionPolicy }}

-

{{ copy.rankingPolicy }}

+
+ {{ copy.selectionLabel }} +

{{ copy.selectionPolicy }}

+

{{ copy.rankingPolicy }}

+
-
- - -
- -
- -
- -

{{ copy.results(groups.featured.length + groups.community.length) }}

-

{{ section.title }} {{ section.apps.length }}

+

{{ section.title }} {{ section.total }}

{{ section.description }}

+
+
+ + +
+
+ + +
+

{{ copy.results(filteredApps.length) }}

+
-
- - - -
-

{{ app.name }}

-

{{ app.author }}

-

{{ app.description }}

-
    -
  • {{ app.platforms.join(" / ") }}
    • -
  • {{ app.source ? copy.openSource : copy.commercial }}
    • -
  • ★ {{ app.stars.toLocaleString() }} GitHub Stars
    • -
    • -
  • {{ copy.building }}
    • -
-
- {{ copy.details }} - - {{ copy.visit }} - - - {{ copy.sourceLink }} - +
+ + + +
+
+
+

{{ app.name }}

+

{{ app.author }}

+
+ {{ copy.building }} +
+

{{ app.description }}

+
+
    +
  • {{ app.platforms.join(" / ") }}
    • +
+ +
+
+
+ {{ copy.commercial }} + +
+
+ + + + +
+
-
-
+ +
+ +
+
-
-

{{ copy.empty }}

- -

{{ copy.ctaTitle }}

@@ -101,9 +125,10 @@ - diff --git a/website/src/components/Nav.astro b/website/src/components/Nav.astro index 33f27e9df3..2dd109bc78 100644 --- a/website/src/components/Nav.astro +++ b/website/src/components/Nav.astro @@ -134,7 +134,7 @@ const resourcesLabel = isZh ? '资源' : 'Resources'; - {langLabel} + {langLabel} @@ -257,15 +257,26 @@ const resourcesLabel = isZh ? '资源' : 'Resources'; display: inline-flex; align-items: center; gap: 0.4rem; - font-size: 0.76rem; + font-size: 0.8125rem; font-variant-numeric: tabular-nums; } .site-nav__lang-btn { - font-size: 0.78rem; + font-size: 0.8125rem; font-weight: 560; } +/* Give toolbar labels the same centered line box as their icons. */ +.site-nav__actions .site-nav__link { height: 2rem; padding-block: 0; } +.github-star-btn__label, +.site-nav__lang-btn > span { + display: inline-flex; + align-items: center; + height: 1rem; + line-height: 1rem; +} +.site-nav__actions svg { display: block; flex-shrink: 0; } + .site-nav__burger { display: none; align-items: center; diff --git a/website/src/lib/showcase-browser.ts b/website/src/lib/showcase-browser.ts index 9214a1a115..bf78712639 100644 --- a/website/src/lib/showcase-browser.ts +++ b/website/src/lib/showcase-browser.ts @@ -7,9 +7,26 @@ export function selectShowcases(apps, { query = '', category = 'all', sort = 'ne }); const featured = matches.filter(app => app.featured); const community = matches.filter(app => !app.featured); - community.sort((a, b) => { + const compare = (a, b) => { if (sort === 'stars' && a.stars !== b.stars) return (b.stars ?? -1) - (a.stars ?? -1); return (Date.parse(b.publishedAt) || 0) - (Date.parse(a.publishedAt) || 0) || a.name.localeCompare(b.name); - }); - return { featured, community }; + }; + community.sort(compare); + return { featured, community, all: [...matches].sort(compare) }; +} + +/** Six editorial selections per page; browsing never changes catalog order. */ +export function paginateFeatured(apps: T[], requestedPage = 1) { + return paginate(apps.filter(app => app.featured), requestedPage, 6); +} + +/** Nine filtered and sorted catalog entries per page. */ +export function paginateAll(apps: T[], requestedPage = 1) { + return paginate(apps, requestedPage, 9); +} + +function paginate(apps: T[], requestedPage: number, pageSize: number) { + const totalPages = Math.ceil(apps.length / pageSize); + const page = Math.max(1, Math.min(requestedPage, totalPages)); + return { apps: apps.slice((page - 1) * pageSize, page * pageSize), page, totalPages, total: apps.length }; } diff --git a/website/tests/showcase-browser.test.ts b/website/tests/showcase-browser.test.ts index bd7361b04d..97516a03d9 100644 --- a/website/tests/showcase-browser.test.ts +++ b/website/tests/showcase-browser.test.ts @@ -1,6 +1,6 @@ import assert from 'node:assert/strict'; import test from 'node:test'; -import { selectShowcases } from '../src/lib/showcase-browser.ts'; +import { selectShowcases, paginateFeatured } from '../src/lib/showcase-browser.ts'; const apps = [ { id: 'picked', name: 'Picked', featured: true, category: 'dev', description: 'A database', author: 'Database Team', platforms: ['Linux'], stars: 1, publishedAt: '2026-01-01' }, { id: 'older', name: 'Older', featured: false, category: 'dev', description: 'A terminal', platforms: ['Linux'], stars: 100, publishedAt: '2026-01-01' }, @@ -21,3 +21,34 @@ test('search matches descriptions and authors and combines with categories', () assert.equal(selectShowcases(apps, { query: ' TERMINAL ', category: 'dev' }).community[0].id, 'older'); assert.equal(selectShowcases(apps, { query: 'notes', category: 'dev' }).community.length, 0); }); +test('all apps includes Featured in the requested order without changing editorial data', () => { + const before = structuredClone(apps); + assert.deepEqual(selectShowcases(apps, { sort: 'stars' }).all.map(a => a.id), ['older', 'picked', 'newer']); + assert.deepEqual(selectShowcases(apps).all.map(a => a.id), ['newer', 'older', 'picked']); + assert.deepEqual(selectShowcases(apps, { query: 'Database Team', category: 'dev' }).all.map(a => a.id), ['picked']); + assert.deepEqual(apps, before); +}); +test('Featured pagination shows six apps per page in editorial order', () => { + const featuredApps = Array.from({ length: 16 }, (_, id) => ({ id, featured: true })); + const catalog = [...featuredApps, { id: 99, featured: false }]; + assert.deepEqual(paginateFeatured(catalog, 1), { apps: featuredApps.slice(0, 6), page: 1, totalPages: 3, total: 16 }); + assert.deepEqual(paginateFeatured(catalog, 2).apps.map(a => a.id), [6, 7, 8, 9, 10, 11]); + assert.deepEqual(paginateFeatured(catalog, 3).apps.map(a => a.id), [12, 13, 14, 15]); + assert.equal(paginateFeatured(catalog, 9).page, 3); + assert.equal(paginateFeatured(catalog, 0).page, 1); + assert.deepEqual(paginateFeatured([], 1), { apps: [], page: 1, totalPages: 0, total: 0 }); + assert.equal(catalog.length, 17); +}); + + +test('All apps pagination keeps sorted results in pages of nine and clamps boundaries', async () => { + const { paginateAll } = await import('../src/lib/showcase-browser.ts'); + const apps = Array.from({ length: 23 }, (_, id) => ({ id })); + const pages = [1, 2, 3].map(page => paginateAll(apps, page)); + assert.deepEqual(pages.map(page => page.apps.length), [9, 9, 5]); + assert.deepEqual(pages.flatMap(page => page.apps), apps); + assert.equal(paginateAll(apps, 99).page, 3); + assert.equal(paginateAll(apps, 0).page, 1); + assert.deepEqual(paginateAll([], 3), { apps: [], page: 1, totalPages: 0, total: 0 }); + assert.equal(paginateAll(apps.slice(0, 2), 3).page, 1); +}); From b65c35512fdf69f64a1b4c15b3200d6517462c05 Mon Sep 17 00:00:00 2001 From: "Sergei G." Date: Sat, 5 Sep 2026 10:31:52 +0400 Subject: [PATCH 2/9] list: support accessible names on row containers --- crates/component/src/list/delegate.rs | 12 ++++- crates/component/src/list/list.rs | 61 ++++++++++++++++++++++++++ crates/story/src/stories/list_story.rs | 11 +++++ website/docs/components/list.md | 7 +++ 4 files changed, 90 insertions(+), 1 deletion(-) diff --git a/crates/component/src/list/delegate.rs b/crates/component/src/list/delegate.rs index 81e3d49aa9..5bf22ab697 100644 --- a/crates/component/src/list/delegate.rs +++ b/crates/component/src/list/delegate.rs @@ -1,4 +1,7 @@ -use gpui::{AnyElement, App, Context, IntoElement, ParentElement as _, Styled as _, Task, Window}; +use gpui::{ + AnyElement, App, Context, IntoElement, ParentElement as _, SharedString, Styled as _, Task, + Window, +}; use crate::{ ActiveTheme as _, Icon, IconName, IndexPath, Selectable, h_flex, @@ -21,6 +24,13 @@ pub trait ListDelegate: Sized + 'static { Task::ready(()) } + /// Return the accessible name of a row, independently of its rendered children. + /// + /// The default leaves the row unnamed so its children retain their existing semantics. + fn item_aria_label(&self, _: IndexPath, _: &App) -> Option { + None + } + /// Return the number of sections in the list, default is 1. /// /// Min value is 1. diff --git a/crates/component/src/list/list.rs b/crates/component/src/list/list.rs index 732b8da91e..e3173ffd67 100644 --- a/crates/component/src/list/list.rs +++ b/crates/component/src/list/list.rs @@ -471,10 +471,12 @@ where let id = SharedString::from(format!("list-item-{}", ix)); let total_items = self.rows_cache.items_count(); + let aria_label = self.delegate.item_aria_label(ix, cx); div() .id(id) .role(Role::ListItem) + .when_some(aria_label, |this, label| this.aria_label(label)) .aria_position_in_set(ix.row + 1) .aria_size_of_set(total_items) .aria_selected(selected) @@ -778,3 +780,62 @@ where .child(self.state.clone()) } } + +#[cfg(test)] +mod tests { + use super::*; + use crate::list::ListItem; + use gpui::{Element as _, TestAppContext, accesskit}; + + struct LabelDelegate; + + impl ListDelegate for LabelDelegate { + type Item = ListItem; + + fn items_count(&self, _: usize, _: &App) -> usize { + 2 + } + + fn item_aria_label(&self, index: IndexPath, _: &App) -> Option { + (index.row == 0).then(|| "Acme, up 2 percent".into()) + } + + fn set_selected_index( + &mut self, + _: Option, + _: &mut Window, + _: &mut Context>, + ) { + } + + fn render_item( + &mut self, + index: IndexPath, + _: &mut Window, + _: &mut Context>, + ) -> Option { + Some(ListItem::new(index.row).child("Acme")) + } + } + + #[gpui::test] + fn accessible_names_belong_to_the_row_container(cx: &mut TestAppContext) { + cx.update(crate::init); + let window = cx.add_empty_window(); + window.update(|window, cx| { + let list = cx.new(|cx| ListState::new(LabelDelegate, window, cx)); + for (row, label) in [(0, Some("Acme, up 2 percent")), (1, None)] { + let node = list.update(cx, |list, cx| { + let element = list + .render_list_item(IndexPath::new(row), window, cx) + .into_element(); + let mut node = accesskit::Node::new(element.a11y_role().unwrap()); + element.write_a11y_info(&mut node); + node + }); + assert_eq!(node.role(), Role::ListItem); + assert_eq!(node.label(), label); + } + }); + } +} diff --git a/crates/story/src/stories/list_story.rs b/crates/story/src/stories/list_story.rs index de7c411b47..0dc35873ba 100644 --- a/crates/story/src/stories/list_story.rs +++ b/crates/story/src/stories/list_story.rs @@ -336,6 +336,17 @@ impl CompanyListDelegate { } impl ListDelegate for CompanyListDelegate { + fn item_aria_label(&self, index: IndexPath, _: &App) -> Option { + let company = self.matched_companies.get(index.section)?.get(index.row)?; + Some( + format!( + "{}, {}, {}", + company.name, company.last_done_str, company.change_percent_str + ) + .into(), + ) + } + type Item = CompanyListItem; fn sections_count(&self, _: &App) -> usize { diff --git a/website/docs/components/list.md b/website/docs/components/list.md index c5b8c5d0f1..75914bde9a 100644 --- a/website/docs/components/list.md +++ b/website/docs/components/list.md @@ -491,3 +491,10 @@ impl ListDelegate for ContactListDelegate { } } ``` + +## Accessible row names + +For composite rows, implement `ListDelegate::item_aria_label` to provide a concise +name on the list-item container. Return `None` to leave the existing child +semantics unchanged. The hook receives the current `IndexPath` and `App`; it does +not change the row's visible content or selection behavior. From 0b14b6bae13c4e4b6371fc38d38a7242cdba4f9b Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Sat, 5 Sep 2026 20:22:24 +0800 Subject: [PATCH 3/9] website: Remove two Vue components orphaned by the Astro migration (#2965) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description `website/src/components/GitHubStar.vue` and `website/src/components/SidebarFilter.vue` have had no references since the VitePress to Astro migration in #2926. `Nav.astro` renders the GitHub star link with inline markup, and no page or component mounts a sidebar filter, so both files were dead source. The other seven `.vue` files under `website/src/components/` are each mounted by a page and are left untouched. Astro supports Vue islands through the official `@astrojs/vue` integration, which the migration adopted deliberately, so their presence is not a leftover. Removing `SidebarFilter.vue` records the current state rather than changing it: the sidebar filter was already absent from the rendered site, and documentation search is served by Pagefind through `DocSearch.astro`. Restoring a sidebar filter would be a separate feature change. Identified and removed with AI assistance. ## How to Test From `website/`: ```sh grep -rn "GitHubStar\|SidebarFilter" src tests astro.config.mjs package.json bun run build ``` The grep should return nothing. The build should complete with 305 pages. The site's appearance and behavior are unchanged, since neither file was reachable. ## Checklist - [x] Read and followed the contributing guidelines. - [x] Verified no references remain and ran the website build. - [ ] Maintainer review of AI-assisted changes. No documentation, locale, or public API changes. Rust tests are not applicable to this website-only change. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_01RwSD6p7jLbJEF8hYtrhth4 Co-authored-by: Claude Opus 5 (1M context) --- website/src/components/GitHubStar.vue | 47 ------ website/src/components/SidebarFilter.vue | 197 ----------------------- 2 files changed, 244 deletions(-) delete mode 100644 website/src/components/GitHubStar.vue delete mode 100644 website/src/components/SidebarFilter.vue diff --git a/website/src/components/GitHubStar.vue b/website/src/components/GitHubStar.vue deleted file mode 100644 index 5aec6e2682..0000000000 --- a/website/src/components/GitHubStar.vue +++ /dev/null @@ -1,47 +0,0 @@ - - - - - diff --git a/website/src/components/SidebarFilter.vue b/website/src/components/SidebarFilter.vue deleted file mode 100644 index 3a057a7a09..0000000000 --- a/website/src/components/SidebarFilter.vue +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - From e9a313dfea01ee01cb8721fad3abdf920785ce85 Mon Sep 17 00:00:00 2001 From: Alex Shi Date: Sat, 5 Sep 2026 20:30:25 +0800 Subject: [PATCH 4/9] editor: Reveal search match after manual scroll (#2955) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description Fix Next/Previous advancing the search counter without revealing the match after manual scrolling. Search navigation now scrolls in either direction while preserving configured surrounding-line padding; cursor navigation keeps its existing direction restrictions. ## Screenshot Before https://github.com/user-attachments/assets/d71cc59a-5b62-4dd7-a837-5380b2ee2395 After https://github.com/user-attachments/assets/2f43770a-edf7-4dbd-9188-e68b3a32efe9 ## Validation - Added regression tests for Next scrolling upward and Previous scrolling downward, including surrounding-line padding. - `cargo test -p gpui-base input:: --lib --offline` — 152 tests passed locally. AI assistance: Codex generated the implementation and regression tests. ## Checklist - [x] I have read the [CONTRIBUTING](../CONTRIBUTING.md) document and followed the guidelines. - [ ] Reviewed the changes in this PR and confirmed AI generated code (If any) is accurate. - [ ] Passed `cargo run` for story tests related to the changes. - [x] Tested macOS, Windows and Linux platforms performance (if the change is platform-specific) — Not applicable; the search navigation fix is platform-independent. --- crates/base/src/input/base/state.rs | 129 +++++++++++++++++++++++-- crates/base/src/input/editor/search.rs | 18 ++-- 2 files changed, 128 insertions(+), 19 deletions(-) diff --git a/crates/base/src/input/base/state.rs b/crates/base/src/input/base/state.rs index ab80f1585e..0d5030b0d3 100644 --- a/crates/base/src/input/base/state.rs +++ b/crates/base/src/input/base/state.rs @@ -38,6 +38,12 @@ use crate::input::{ }; use crate::{AutoScroll, StepAction}; +/// Vertical clearance to retain when revealing a text position. +pub(crate) enum ScrollPadding { + Minimal, + SurroundingLines, +} + #[derive(Action, Clone, PartialEq, Eq, Deserialize)] #[action(namespace = input, no_json)] pub struct Enter { @@ -1873,6 +1879,23 @@ impl InputBaseState { offset: usize, direction: Option, cx: &mut Context, + ) { + let padding = if direction.is_some() { + ScrollPadding::SurroundingLines + } else { + ScrollPadding::Minimal + }; + self.scroll_to_with_padding(offset, direction, padding, cx); + } + + /// Reveal an offset with independently chosen direction restriction and padding. + /// Search uses surrounding lines without restricting movement to match order. + pub(crate) fn scroll_to_with_padding( + &mut self, + offset: usize, + direction: Option, + padding: ScrollPadding, + cx: &mut Context, ) { let Some(last_layout) = self.last_layout.as_ref() else { return; @@ -1921,16 +1944,17 @@ impl InputBaseState { // `TextElement::layout_cursor` so both scroll-into-view paths agree // (a mismatch flickered on `Down` at end-of-buffer with a small // `cursor_surrounding_lines` override). - let edge_height = if direction.is_some() && self.is_code_editor() { - super::element::cursor_surrounding_padding( - self.mode.is_auto_grow(), - self.cursor_surrounding_lines, - last_layout.visible_range.len(), - line_height, - ) - } else { - line_height - }; + let edge_height = + if matches!(padding, ScrollPadding::SurroundingLines) && self.is_code_editor() { + super::element::cursor_surrounding_padding( + self.mode.is_auto_grow(), + self.cursor_surrounding_lines, + last_layout.visible_range.len(), + line_height, + ) + } else { + line_height + }; if row_offset_y - edge_height + line_height < -scroll_offset.y { // Scroll up scroll_offset.y = -row_offset_y + edge_height - line_height; @@ -3454,6 +3478,91 @@ mod tests { }); } + #[gpui::test] + fn test_next_search_match_reveals_with_padding_after_manual_scroll(cx: &mut TestAppContext) { + assert_search_reveals_with_padding_after_manual_scroll(false, cx); + } + + #[gpui::test] + fn test_previous_search_match_reveals_with_padding_after_manual_scroll( + cx: &mut TestAppContext, + ) { + assert_search_reveals_with_padding_after_manual_scroll(true, cx); + } + + fn assert_search_reveals_with_padding_after_manual_scroll( + previous: bool, + cx: &mut TestAppContext, + ) { + let input_view = InputView::new(cx); + let mut cx = VisualTestContext::from_window(input_view.window_handle.into(), cx); + let input = input_view.input; + let text = (0..160) + .map(|row| { + if matches!(row, 20 | 60 | 100) { + format!("match on row {row}") + } else { + format!("line {row}") + } + }) + .collect::>() + .join("\n"); + let start = text.match_indices("match").nth(1).unwrap().0; + let expected_match = start..start + "match".len(); + cx.update(|window, cx| { + input.update(cx, |state, cx| { + state.set_cursor_surrounding_lines(Some(3), window, cx); + state.set_value(text, window, cx); + state.set_search_query("match", true, cx); + if previous { + state.search_session.matcher.next(); + state.search_session.matcher.next(); + } + }); + }); + cx.run_until_parked(); + cx.update(|_, cx| { + input.update(cx, |state, cx| { + let line_height = state.last_layout.as_ref().unwrap().line_height; + let y = if previous { px(0.) } else { -line_height * 80. }; + state.set_scroll_offset(point(px(0.), y), cx); + }); + }); + cx.run_until_parked(); + input.read_with(&cx, |state, _| { + let visible = state.visible_row_range().unwrap(); + if previous { + assert!(visible.end <= 60, "target must be below the viewport"); + } else { + assert!(visible.start > 60, "target must be above the viewport"); + } + }); + cx.update(|_, cx| { + input.update(cx, |state, cx| { + let range = if previous { + state.previous_search_match(cx) + } else { + state.next_search_match(cx) + }; + assert_eq!(range, Some(expected_match)); + assert_eq!(state.search_session.matcher.label(), "2/3"); + }); + }); + cx.run_until_parked(); + input.read_with(&cx, |state, _| { + assert!(state.visible_row_range().unwrap().contains(&60)); + let line_height = state.last_layout.as_ref().unwrap().line_height; + let target_y = line_height * 60. + state.scroll_handle.offset().y; + // Three lines of edge clearance include the matched line itself. + assert!(target_y >= line_height * 2. - px(0.1)); + assert!( + target_y + line_height * 3. + <= state.last_bounds.as_ref().unwrap().size.height + px(0.1), + "search must preserve the configured surrounding-line padding" + ); + }); + } + #[gpui::test] fn test_number_step(cx: &mut TestAppContext) { let input = InputView::build(cx, |state| state).input; diff --git a/crates/base/src/input/editor/search.rs b/crates/base/src/input/editor/search.rs index f5c5742cbc..a7939aed5a 100644 --- a/crates/base/src/input/editor/search.rs +++ b/crates/base/src/input/editor/search.rs @@ -4,7 +4,9 @@ use gpui::{Context, Window}; use ropey::Rope; use std::{ops::Range, rc::Rc}; -use super::{InputBaseState, Replace, RopeExt as _, Search, movement::MoveDirection}; +use super::{ + InputBaseState, Replace, RopeExt as _, Search, movement::MoveDirection, state::ScrollPadding, +}; /// Stateful, presentation-independent search engine used by text inputs. #[derive(Debug, Clone)] @@ -139,20 +141,18 @@ impl InputBaseState { } pub fn next_search_match(&mut self, cx: &mut Context) -> Option> { - let previous = self.search_session.matcher.current_match_index(); let range = self.search_session.matcher.next()?; - let direction = (self.search_session.matcher.current_match_index() > previous) - .then_some(MoveDirection::Down); - self.scroll_to(range.end, direction, cx); + // Match order does not describe viewport direction after a manual + // scroll. Always allow search navigation to reveal the active match. + self.scroll_to_with_padding(range.end, None, ScrollPadding::SurroundingLines, cx); Some(range) } pub fn previous_search_match(&mut self, cx: &mut Context) -> Option> { - let previous = self.search_session.matcher.current_match_index(); let range = self.search_session.matcher.next_back()?; - let direction = (self.search_session.matcher.current_match_index() < previous) - .then_some(MoveDirection::Up); - self.scroll_to(range.start, direction, cx); + // Match order does not describe viewport direction after a manual + // scroll. Always allow search navigation to reveal the active match. + self.scroll_to_with_padding(range.start, None, ScrollPadding::SurroundingLines, cx); Some(range) } From ecb10948c55ed977b774eef6f2b7bb084d7710a6 Mon Sep 17 00:00:00 2001 From: "Sergei G." Date: Sat, 5 Sep 2026 16:34:47 +0400 Subject: [PATCH 5/9] chore: Forward platform test support and profiling (#2966) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I use GPUI Kit in NearWord (app based on gpui-kit now). These changes come from my fork, that I made during testing/ `test-support` enables GPUI's test harness but leaves out the native platform implementation. On macOS, screenshot capture can fail with `render_to_image not implemented for this platform`. This patch also enables `gpui_platform/test-support`. It adds `profiler = ["gpui/profiler"]` so applications can enable profiling through `gpui-kit`, without adding a direct GPUI dependency. Profiling stays opt-in. The patch includes feature documentation and a compile-time `WindowProfiler` export check. Default features, dependency versions, and the lockfile are unchanged. ## How to Test Passed on macOS: - Build checks with default features, no default features, and `test-support` and `profiler` separately and together. - Kit tests, doctests, formatting, and Clippy with warnings denied. - Isolated consumer checks for platform test support and opt-in profiling. - Native Metal capture, with the center pixel matching `[51, 102, 153, 255]`.
Build and test commands Run from the repository root. All commands should pass. The export check runs at compile time. ```sh cargo check -p gpui-kit --locked cargo check -p gpui-kit --no-default-features --locked cargo check -p gpui-kit --features test-support --locked cargo check -p gpui-kit --features profiler --locked cargo check -p gpui-kit --features test-support,profiler --locked cargo test -p gpui-kit --features test-support,profiler --locked cargo clippy -p gpui-kit --all-targets --features test-support,profiler --locked -- -D warnings ```
Reproduce native screenshot capture on macOS On macOS with Metal, save this as `crates/kit/examples/native_render.rs`; create the directory if needed. This temporary probe is not part of the committed tests. ```rust use gpui_kit::{AppContext as _, Context, IntoElement, Render, Styled, VisualTestAppContext, div, px, size}; struct Swatch; impl Render for Swatch { fn render(&mut self, _: &mut gpui_kit::Window, _: &mut Context) -> impl IntoElement { div().size_full().bg(gpui_kit::rgb(0x336699)) } } fn main() { let mut cx = VisualTestAppContext::new(gpui_kit::platform::current_platform(false)); let window = cx.open_offscreen_window(size(px(64.), px(48.)), |_, cx| cx.new(|_| Swatch)) .expect("open native offscreen window"); cx.run_until_parked(); let image = cx.capture_screenshot(window.into()).expect("native render_to_image"); let pixel = image.get_pixel(image.width()/2, image.height()/2); assert_eq!(pixel.0, [0x33, 0x66, 0x99, 0xff]); println!("native rendering passed: {}x{}, center={:?}", image.width(), image.height(), pixel.0); } ``` From the repository root, run: ```sh cargo run -p gpui-kit --example native_render --features test-support --locked ``` Capture and the pixel assertion should succeed. Observed output: ```text native rendering passed: 128x96, center=[51, 102, 153, 255] ``` Image dimensions depend on the display scale; the center pixel must match. Remove the temporary example after testing: ```sh rm crates/kit/examples/native_render.rs ```
Story was not used for this feature-flag change; the native probe checks screenshot capture directly. Windows and Linux runtime checks were not run. ## Checklist - [x] Read [CONTRIBUTING.md](https://github.com/longbridge/gpui-kit/blob/main/CONTRIBUTING.md). - [x] Reviewed the patch, including AI-assisted changes. - [x] Manually tested the patch. - [ ] Windows and Linux runtime validation. ## AI assistance OpenAI’s `gpt-6-astra` extracted these changes from my GPUI Kit fork used in NearWord and prepared this PR. I reviewed the patch and made edits before submitting it. --------- Co-authored-by: Jason Lee --- crates/kit/Cargo.toml | 6 ++++-- crates/kit/README.md | 6 ++++-- crates/kit/tests/exports.rs | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/crates/kit/Cargo.toml b/crates/kit/Cargo.toml index 74e6fddc50..df7c2b2a2d 100644 --- a/crates/kit/Cargo.toml +++ b/crates/kit/Cargo.toml @@ -21,8 +21,10 @@ default = ["component", "assets"] component = ["dep:gpui-component"] # The default icon set for `gpui-component`, `gpui_kit::assets`. assets = ["dep:gpui-kit-assets"] -# GPUI's test harness: `#[gpui_kit::test]`, `TestAppContext`, `VisualTestContext`. -test-support = ["gpui/test-support"] +# GPUI's test harness and native-platform rendering support. +test-support = ["gpui/test-support", "gpui_platform/test-support"] +# Frame-event instrumentation remains opt-in for performance builds. +profiler = ["gpui/profiler"] inspector = ["gpui/inspector", "gpui-base/inspector", "gpui-component?/inspector"] decimal = ["component", "gpui-component/decimal"] tree-sitter = ["component", "gpui-component/tree-sitter"] diff --git a/crates/kit/README.md b/crates/kit/README.md index 6fa5a6f8cb..167802c77e 100644 --- a/crates/kit/README.md +++ b/crates/kit/README.md @@ -53,5 +53,7 @@ fn main() { The `gpui-component` features (`inspector`, `decimal`, `tree-sitter`, `tree-sitter-languages`, and each `tree-sitter-`) are available on `gpui-kit` under the same names. `test-support` turns on GPUI's test harness -for `#[gpui_kit::test]`, `TestAppContext` and `VisualTestContext`; enable it -under `[dev-dependencies]`. See for the guides. +for `#[gpui_kit::test]`, `TestAppContext`, `VisualTestContext`, and native-platform +rendering support; enable it under `[dev-dependencies]`. The independent `profiler` +feature enables GPUI frame-event instrumentation and is off by default. +See for the guides. diff --git a/crates/kit/tests/exports.rs b/crates/kit/tests/exports.rs index c7fb4d9320..a8dccf9db1 100644 --- a/crates/kit/tests/exports.rs +++ b/crates/kit/tests/exports.rs @@ -102,3 +102,7 @@ mod component { mod assets { type Assets = gpui_kit::assets::Assets; } + +/// The opt-in facade feature enables GPUI's feature-gated profiler API. +#[cfg(feature = "profiler")] +use gpui_kit::profiler::WindowProfiler; From 9d9bd9bfa9b4c3af25475078458b3e3c7abd2981 Mon Sep 17 00:00:00 2001 From: Tryanks Date: Sat, 5 Sep 2026 20:35:16 +0800 Subject: [PATCH 6/9] base: move the native examples into their own package (#2963) `gpui-base` declares `gpui_platform` for every non-wasm target, but only the examples use it. For targets that supply their own backend through `Application::with_platform` (iOS, Android), the build fails inside `gpui_platform`. Following what `examples/wasm` already does, this moves the native showcase and motion examples into their own package, `gpui-base-examples`, which includes the same shared code with `#[path]`; the `gpui-base` manifest no longer mentions `gpui_platform`. `src/bin/components.rs` and `examples/components.rs` were two entry points to the same showcase and become the package's `components` bin; the README commands are updated accordingly. Verified: - `cargo check -p gpui-base-examples --bins` - `cargo check -p gpui-base --examples --tests --benches` - `cargo check -p gpui-base --target aarch64-apple-ios-sim` and `--target wasm32-unknown-unknown` - `cargo check --workspace` - `cargo fmt --all --check` Closes #2962 --------- Co-authored-by: Jason Lee --- Cargo.lock | 13 ++++++++++-- Cargo.toml | 1 + crates/base/Cargo.toml | 8 +++---- crates/base/README.md | 2 +- crates/base/examples/README.md | 10 ++++----- crates/base/examples/native/Cargo.toml | 21 +++++++++++++++++++ .../{ => native/src/bin}/components.rs | 1 + .../examples/{ => native/src/bin}/motion.rs | 2 +- crates/base/src/bin/components.rs | 10 --------- website/base/getting-started.md | 2 +- website/base/motion.md | 2 +- website/base/primitives/accordion.md | 4 ++-- website/base/primitives/alert-dialog.md | 4 ++-- website/base/primitives/avatar.md | 4 ++-- website/base/primitives/button.md | 4 ++-- website/base/primitives/calendar.md | 4 ++-- website/base/primitives/checkbox.md | 4 ++-- website/base/primitives/collapsible.md | 4 ++-- website/base/primitives/color-picker.md | 4 ++-- website/base/primitives/combobox.md | 4 ++-- website/base/primitives/date-picker.md | 4 ++-- website/base/primitives/dialog.md | 4 ++-- website/base/primitives/editor.md | 2 +- website/base/primitives/hover-card.md | 4 ++-- website/base/primitives/input.md | 2 +- website/base/primitives/link.md | 4 ++-- website/base/primitives/nav-stack.md | 4 ++-- website/base/primitives/number-input.md | 4 ++-- website/base/primitives/otp-input.md | 4 ++-- website/base/primitives/pagination.md | 4 ++-- website/base/primitives/popover.md | 4 ++-- website/base/primitives/popup.md | 4 ++-- website/base/primitives/progress.md | 4 ++-- website/base/primitives/radio-group.md | 4 ++-- website/base/primitives/radio.md | 4 ++-- website/base/primitives/resizable.md | 4 ++-- website/base/primitives/scrollbar.md | 2 +- website/base/primitives/select.md | 4 ++-- website/base/primitives/sheet.md | 4 ++-- website/base/primitives/slider.md | 4 ++-- website/base/primitives/switch.md | 4 ++-- website/base/primitives/table.md | 4 ++-- website/base/primitives/tabs.md | 4 ++-- website/base/primitives/textarea.md | 2 +- website/base/primitives/toast.md | 4 ++-- website/base/primitives/toggle-group.md | 4 ++-- website/base/primitives/toggle.md | 4 ++-- website/base/primitives/tooltip.md | 4 ++-- website/base/primitives/tree.md | 4 ++-- website/base/text-selection.md | 2 +- website/base/text-view.md | 2 +- website/base/virtual-list.md | 2 +- website/zh-CN/base/dock.md | 2 +- website/zh-CN/base/getting-started.md | 2 +- website/zh-CN/base/motion.md | 2 +- website/zh-CN/base/primitives/accordion.md | 2 +- website/zh-CN/base/primitives/alert-dialog.md | 2 +- website/zh-CN/base/primitives/avatar.md | 2 +- website/zh-CN/base/primitives/button.md | 2 +- website/zh-CN/base/primitives/calendar.md | 2 +- website/zh-CN/base/primitives/checkbox.md | 2 +- website/zh-CN/base/primitives/collapsible.md | 2 +- website/zh-CN/base/primitives/color-picker.md | 2 +- website/zh-CN/base/primitives/combobox.md | 2 +- website/zh-CN/base/primitives/date-picker.md | 2 +- website/zh-CN/base/primitives/dialog.md | 2 +- website/zh-CN/base/primitives/editor.md | 2 +- website/zh-CN/base/primitives/hover-card.md | 2 +- website/zh-CN/base/primitives/input.md | 2 +- website/zh-CN/base/primitives/link.md | 2 +- website/zh-CN/base/primitives/nav-stack.md | 2 +- website/zh-CN/base/primitives/number-input.md | 2 +- website/zh-CN/base/primitives/otp-input.md | 2 +- website/zh-CN/base/primitives/pagination.md | 2 +- website/zh-CN/base/primitives/popover.md | 2 +- website/zh-CN/base/primitives/popup.md | 2 +- website/zh-CN/base/primitives/progress.md | 2 +- website/zh-CN/base/primitives/radio-group.md | 2 +- website/zh-CN/base/primitives/radio.md | 2 +- website/zh-CN/base/primitives/resizable.md | 2 +- website/zh-CN/base/primitives/scrollbar.md | 2 +- website/zh-CN/base/primitives/select.md | 2 +- website/zh-CN/base/primitives/sheet.md | 2 +- website/zh-CN/base/primitives/slider.md | 2 +- website/zh-CN/base/primitives/switch.md | 2 +- website/zh-CN/base/primitives/table.md | 2 +- website/zh-CN/base/primitives/tabs.md | 2 +- website/zh-CN/base/primitives/textarea.md | 2 +- website/zh-CN/base/primitives/toast.md | 2 +- website/zh-CN/base/primitives/toggle-group.md | 2 +- website/zh-CN/base/primitives/toggle.md | 2 +- website/zh-CN/base/primitives/tooltip.md | 2 +- website/zh-CN/base/primitives/tree.md | 2 +- website/zh-CN/base/text-selection.md | 2 +- website/zh-CN/base/text-view.md | 2 +- website/zh-CN/base/virtual-list.md | 2 +- 96 files changed, 165 insertions(+), 145 deletions(-) create mode 100644 crates/base/examples/native/Cargo.toml rename crates/base/examples/{ => native/src/bin}/components.rs (90%) rename crates/base/examples/{ => native/src/bin}/motion.rs (53%) delete mode 100644 crates/base/src/bin/components.rs diff --git a/Cargo.lock b/Cargo.lock index 4747afa677..cfdd7766a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3385,7 +3385,6 @@ dependencies = [ "futures", "gpui-pre", "gpui-pre-macros", - "gpui-pre-platform", "gpui-pre-reqwest-client", "gpui-pre-sum-tree", "html5ever 0.27.0", @@ -3405,12 +3404,22 @@ dependencies = [ "serde_json", "smallvec", "smol", - "syntect", "tracing", "unicode-segmentation", "web-time", ] +[[package]] +name = "gpui-base-examples" +version = "0.6.0" +dependencies = [ + "gpui-base", + "gpui-pre", + "gpui-pre-platform", + "gpui-pre-reqwest-client", + "syntect", +] + [[package]] name = "gpui-base-examples-wasm" version = "0.6.0" diff --git a/Cargo.toml b/Cargo.toml index b4f64291a0..d7ceb1fc49 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,7 @@ members = [ "crates/kit", "crates/base", "crates/base/examples/wasm", + "crates/base/examples/native", "crates/component-macros", "crates/story", "crates/story-web", diff --git a/crates/base/Cargo.toml b/crates/base/Cargo.toml index 0bdcb731d3..2010a37aa6 100644 --- a/crates/base/Cargo.toml +++ b/crates/base/Cargo.toml @@ -3,9 +3,9 @@ description = "Behavior, interaction, and infrastructure foundations for GPUI ap keywords = ["desktop", "gpui", "ui", "foundation"] license = "Apache-2.0" name = "gpui-base" -# The showcase binary and examples are development tools that read fixtures -# from `crates/story`; they stay out of the published package. -exclude = ["src/bin/", "examples/"] +# The examples are development tools that read fixtures from `crates/story`; +# they stay out of the published package. +exclude = ["examples/"] repository = "https://github.com/longbridge/gpui-kit" homepage = "https://gpui-kit.com" documentation = "https://docs.rs/gpui-base" @@ -45,11 +45,9 @@ sum-tree.workspace = true tracing.workspace = true unicode-segmentation = "1.12.0" web-time = "1" -syntect.workspace = true [target.'cfg(not(target_family = "wasm"))'.dependencies] smol.workspace = true -gpui_platform.workspace = true [target.'cfg(target_family = "wasm")'.dependencies] async-channel = "2.3.1" diff --git a/crates/base/README.md b/crates/base/README.md index e661f64758..ac9910f1f2 100644 --- a/crates/base/README.md +++ b/crates/base/README.md @@ -239,7 +239,7 @@ Foundation controls do not install animation automatically. Applications choose See the [Motion guide](../../website/base/motion.md) and run its five focused interactive demonstrations with: ```bash -cargo run -p gpui-base --example motion +cargo run -p gpui-base-examples --bin motion ``` ### Themes and Styles diff --git a/crates/base/examples/README.md b/crates/base/examples/README.md index 2414939ff3..a721cf5ee3 100644 --- a/crates/base/examples/README.md +++ b/crates/base/examples/README.md @@ -7,21 +7,21 @@ WebAssembly previews exercise the same Rust code without producing one binary pe Run an individual component natively: ```bash -cargo run -p gpui-base --example components -- button -cargo run -p gpui-base --example components -- alert-dialog -cargo run -p gpui-base --example components -- virtual-list +cargo run -p gpui-base-examples -- button +cargo run -p gpui-base-examples -- alert-dialog +cargo run -p gpui-base-examples -- virtual-list ``` Run without a component slug to show the overview: ```bash -cargo run -p gpui-base --example components +cargo run -p gpui-base-examples ``` Motion has a separate example because it demonstrates continuous behavior rather than a component catalog entry. It contains focused pages for transitions, springs, keyframes, presence, and stagger: ```bash -cargo run -p gpui-base --example motion +cargo run -p gpui-base-examples --bin motion ``` The website builds `examples/wasm`, which imports the same `showcase/mod.rs` and selects the diff --git a/crates/base/examples/native/Cargo.toml b/crates/base/examples/native/Cargo.toml new file mode 100644 index 0000000000..1430254f4f --- /dev/null +++ b/crates/base/examples/native/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "gpui-base-examples" +default-run = "components" +version = "0.6.0" +publish = false +edition.workspace = true + +[dependencies] +gpui.workspace = true +gpui-base = { path = "../.." } +gpui_platform.workspace = true +reqwest_client.workspace = true +syntect.workspace = true + +[lints] +workspace = true + +# The shared showcase is included with `#[path]`, which cargo-machete cannot +# follow when detecting its `gpui`, `gpui_base`, and `syntect` imports. +[package.metadata.cargo-machete] +ignored = ["gpui", "gpui-base", "syntect"] diff --git a/crates/base/examples/components.rs b/crates/base/examples/native/src/bin/components.rs similarity index 90% rename from crates/base/examples/components.rs rename to crates/base/examples/native/src/bin/components.rs index ca3884c898..7d56203c59 100644 --- a/crates/base/examples/components.rs +++ b/crates/base/examples/native/src/bin/components.rs @@ -1,3 +1,4 @@ +#[path = "../../../showcase/mod.rs"] mod showcase; use std::sync::Arc; diff --git a/crates/base/examples/motion.rs b/crates/base/examples/native/src/bin/motion.rs similarity index 53% rename from crates/base/examples/motion.rs rename to crates/base/examples/native/src/bin/motion.rs index c1553eef0a..d0aca6d4ff 100644 --- a/crates/base/examples/motion.rs +++ b/crates/base/examples/native/src/bin/motion.rs @@ -1,4 +1,4 @@ -#[path = "motion/mod.rs"] +#[path = "../../../motion/mod.rs"] mod app; fn main() { diff --git a/crates/base/src/bin/components.rs b/crates/base/src/bin/components.rs deleted file mode 100644 index 8950a60a02..0000000000 --- a/crates/base/src/bin/components.rs +++ /dev/null @@ -1,10 +0,0 @@ -#[path = "../../examples/showcase/mod.rs"] -mod showcase; - -fn main() { - let component = std::env::args() - .nth(1) - .unwrap_or_else(|| "overview".to_string()); - - showcase::run_native(&component); -} diff --git a/website/base/getting-started.md b/website/base/getting-started.md index e561aef436..09ce3f7051 100644 --- a/website/base/getting-started.md +++ b/website/base/getting-started.md @@ -94,7 +94,7 @@ install the matching palette when their appearance mode changes. The examples used by this website also run as a native GPUI application: ```sh -cargo run -p gpui-base --example components -- button +cargo run -p gpui-base-examples -- button ``` Replace `button` with a primitive slug from the [primitive catalog](./primitives/index.md). The website compiles the same showcase for `wasm32-unknown-unknown` and loads it on each primitive page. diff --git a/website/base/motion.md b/website/base/motion.md index 1e915c6fba..9520ca9d50 100644 --- a/website/base/motion.md +++ b/website/base/motion.md @@ -13,7 +13,7 @@ exampleKind: base Run the interactive companion for this guide: ```bash -cargo run -p gpui-base --example motion +cargo run -p gpui-base-examples --bin motion ``` The example contains five separate demos. Use the tabs at the top to inspect one capability at a time. diff --git a/website/base/primitives/accordion.md b/website/base/primitives/accordion.md index 8212af68e1..abc1f86cf0 100644 --- a/website/base/primitives/accordion.md +++ b/website/base/primitives/accordion.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Accordion supplies behavior and semantic struc ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- accordion +cargo run -p gpui-base-examples -- accordion ``` ## Import diff --git a/website/base/primitives/alert-dialog.md b/website/base/primitives/alert-dialog.md index 0fb36ebad6..02b19522a8 100644 --- a/website/base/primitives/alert-dialog.md +++ b/website/base/primitives/alert-dialog.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Alert Dialog supplies behavior and semantic st ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- alert-dialog +cargo run -p gpui-base-examples -- alert-dialog ``` ## Import diff --git a/website/base/primitives/avatar.md b/website/base/primitives/avatar.md index 5409914809..d35b239904 100644 --- a/website/base/primitives/avatar.md +++ b/website/base/primitives/avatar.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Avatar supplies behavior and semantic structur ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- avatar +cargo run -p gpui-base-examples -- avatar ``` ## Import diff --git a/website/base/primitives/button.md b/website/base/primitives/button.md index ddf449d3bf..0b5f0ff8e9 100644 --- a/website/base/primitives/button.md +++ b/website/base/primitives/button.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Button supplies behavior and semantic structur ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- button +cargo run -p gpui-base-examples -- button ``` ## Import diff --git a/website/base/primitives/calendar.md b/website/base/primitives/calendar.md index dc89bd03fc..e413bb41a9 100644 --- a/website/base/primitives/calendar.md +++ b/website/base/primitives/calendar.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Calendar supplies behavior and semantic struct ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- calendar +cargo run -p gpui-base-examples -- calendar ``` ## Import diff --git a/website/base/primitives/checkbox.md b/website/base/primitives/checkbox.md index 5e67f464a8..a6ea27471f 100644 --- a/website/base/primitives/checkbox.md +++ b/website/base/primitives/checkbox.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Checkbox supplies behavior and semantic struct ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- checkbox +cargo run -p gpui-base-examples -- checkbox ``` ## Import diff --git a/website/base/primitives/collapsible.md b/website/base/primitives/collapsible.md index 75673c11ce..acac0d1a76 100644 --- a/website/base/primitives/collapsible.md +++ b/website/base/primitives/collapsible.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Collapsible supplies behavior and semantic str ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- collapsible +cargo run -p gpui-base-examples -- collapsible ``` ## Import diff --git a/website/base/primitives/color-picker.md b/website/base/primitives/color-picker.md index 4db7266b46..ff1b390d69 100644 --- a/website/base/primitives/color-picker.md +++ b/website/base/primitives/color-picker.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Color Picker supplies behavior and semantic st ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- color-picker +cargo run -p gpui-base-examples -- color-picker ``` ## Import diff --git a/website/base/primitives/combobox.md b/website/base/primitives/combobox.md index 65a2954c85..0e5a0c3c43 100644 --- a/website/base/primitives/combobox.md +++ b/website/base/primitives/combobox.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Combobox supplies behavior and semantic struct ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- combobox +cargo run -p gpui-base-examples -- combobox ``` ## Import diff --git a/website/base/primitives/date-picker.md b/website/base/primitives/date-picker.md index 83080112cd..17cb07f3e9 100644 --- a/website/base/primitives/date-picker.md +++ b/website/base/primitives/date-picker.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Date Picker supplies behavior and semantic str ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- date-picker +cargo run -p gpui-base-examples -- date-picker ``` ## Import diff --git a/website/base/primitives/dialog.md b/website/base/primitives/dialog.md index ecb37801b5..2402177dfe 100644 --- a/website/base/primitives/dialog.md +++ b/website/base/primitives/dialog.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Dialog supplies behavior and semantic structur ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- dialog +cargo run -p gpui-base-examples -- dialog ``` ## Import diff --git a/website/base/primitives/editor.md b/website/base/primitives/editor.md index 6283d6ef69..af2f1a52c9 100644 --- a/website/base/primitives/editor.md +++ b/website/base/primitives/editor.md @@ -100,5 +100,5 @@ the [`gpui-component` Editor](../../docs/components/editor.md). ## Runnable example ```bash -cargo run -p gpui-base --example components -- editor +cargo run -p gpui-base-examples -- editor ``` diff --git a/website/base/primitives/hover-card.md b/website/base/primitives/hover-card.md index d25da80071..b6f00f6ae5 100644 --- a/website/base/primitives/hover-card.md +++ b/website/base/primitives/hover-card.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Hover Card supplies behavior and semantic stru ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- hover-card +cargo run -p gpui-base-examples -- hover-card ``` ## Import diff --git a/website/base/primitives/input.md b/website/base/primitives/input.md index ba1a7bd703..a12bf5ff01 100644 --- a/website/base/primitives/input.md +++ b/website/base/primitives/input.md @@ -81,7 +81,7 @@ theme, sizing, borders, prefix/suffix slots, and clear button, use the styled ## Runnable example ```bash -cargo run -p gpui-base --example components -- input +cargo run -p gpui-base-examples -- input ``` The implementation is in diff --git a/website/base/primitives/link.md b/website/base/primitives/link.md index f2950475a3..593a714db6 100644 --- a/website/base/primitives/link.md +++ b/website/base/primitives/link.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Link supplies behavior and semantic structure ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- link +cargo run -p gpui-base-examples -- link ``` ## Import diff --git a/website/base/primitives/nav-stack.md b/website/base/primitives/nav-stack.md index e4ce2f848e..dc7eb644eb 100644 --- a/website/base/primitives/nav-stack.md +++ b/website/base/primitives/nav-stack.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Nav Stack supplies behavior and semantic struc ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- nav-stack +cargo run -p gpui-base-examples -- nav-stack ``` ## Import diff --git a/website/base/primitives/number-input.md b/website/base/primitives/number-input.md index e83cfd3ab0..dca8f6036e 100644 --- a/website/base/primitives/number-input.md +++ b/website/base/primitives/number-input.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Number Input supplies behavior and semantic st ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- number-input +cargo run -p gpui-base-examples -- number-input ``` ## Import diff --git a/website/base/primitives/otp-input.md b/website/base/primitives/otp-input.md index ea3fd5811e..c948f2f67e 100644 --- a/website/base/primitives/otp-input.md +++ b/website/base/primitives/otp-input.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, OTP Input supplies behavior and semantic struc ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- otp-input +cargo run -p gpui-base-examples -- otp-input ``` ## Import diff --git a/website/base/primitives/pagination.md b/website/base/primitives/pagination.md index 1f7c300f9b..66c9d4b850 100644 --- a/website/base/primitives/pagination.md +++ b/website/base/primitives/pagination.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Pagination supplies behavior and semantic stru ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- pagination +cargo run -p gpui-base-examples -- pagination ``` ## Import diff --git a/website/base/primitives/popover.md b/website/base/primitives/popover.md index 35ee60b9f9..7131f7a5aa 100644 --- a/website/base/primitives/popover.md +++ b/website/base/primitives/popover.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Popover supplies behavior and semantic structu ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- popover +cargo run -p gpui-base-examples -- popover ``` ## Import diff --git a/website/base/primitives/popup.md b/website/base/primitives/popup.md index c2c8e0e49a..d21c61a1b3 100644 --- a/website/base/primitives/popup.md +++ b/website/base/primitives/popup.md @@ -10,10 +10,10 @@ order: 22 ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- popup +cargo run -p gpui-base-examples -- popup ``` ## Import diff --git a/website/base/primitives/progress.md b/website/base/primitives/progress.md index c76f6ad8f2..5e178cfcd6 100644 --- a/website/base/primitives/progress.md +++ b/website/base/primitives/progress.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Progress supplies behavior and semantic struct ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- progress +cargo run -p gpui-base-examples -- progress ``` ## Import diff --git a/website/base/primitives/radio-group.md b/website/base/primitives/radio-group.md index 8a45fb8471..e5bac41d86 100644 --- a/website/base/primitives/radio-group.md +++ b/website/base/primitives/radio-group.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Radio Group supplies behavior and semantic str ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- radio-group +cargo run -p gpui-base-examples -- radio-group ``` ## Import diff --git a/website/base/primitives/radio.md b/website/base/primitives/radio.md index 5463962f6c..781450dc49 100644 --- a/website/base/primitives/radio.md +++ b/website/base/primitives/radio.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Radio supplies behavior and semantic structure ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- radio +cargo run -p gpui-base-examples -- radio ``` ## Import diff --git a/website/base/primitives/resizable.md b/website/base/primitives/resizable.md index 3d6f7a82e5..19ff1b7658 100644 --- a/website/base/primitives/resizable.md +++ b/website/base/primitives/resizable.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Resizable supplies behavior and semantic struc ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- resizable +cargo run -p gpui-base-examples -- resizable ``` ## Import diff --git a/website/base/primitives/scrollbar.md b/website/base/primitives/scrollbar.md index 02c2a88cad..655b6cdadc 100644 --- a/website/base/primitives/scrollbar.md +++ b/website/base/primitives/scrollbar.md @@ -19,7 +19,7 @@ design-system layer owns colors, geometry, timing, and entrance choreography. The native showcase and WASM preview use the same implementation: ```bash -cargo run -p gpui-base --example components -- scrollbar +cargo run -p gpui-base-examples -- scrollbar ``` The source is available in diff --git a/website/base/primitives/select.md b/website/base/primitives/select.md index 027e7eec23..5e42f8e779 100644 --- a/website/base/primitives/select.md +++ b/website/base/primitives/select.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Select supplies behavior and semantic structur ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- select +cargo run -p gpui-base-examples -- select ``` ## Import diff --git a/website/base/primitives/sheet.md b/website/base/primitives/sheet.md index a6493ab7a0..9952b5dca8 100644 --- a/website/base/primitives/sheet.md +++ b/website/base/primitives/sheet.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Sheet supplies behavior and semantic structure ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- sheet +cargo run -p gpui-base-examples -- sheet ``` ## Import diff --git a/website/base/primitives/slider.md b/website/base/primitives/slider.md index c246b582fd..273fa36a00 100644 --- a/website/base/primitives/slider.md +++ b/website/base/primitives/slider.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Slider supplies behavior and semantic structur ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- slider +cargo run -p gpui-base-examples -- slider ``` ## Import diff --git a/website/base/primitives/switch.md b/website/base/primitives/switch.md index 0677d08a47..74bf24d644 100644 --- a/website/base/primitives/switch.md +++ b/website/base/primitives/switch.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Switch supplies behavior and semantic structur ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- switch +cargo run -p gpui-base-examples -- switch ``` ## Import diff --git a/website/base/primitives/table.md b/website/base/primitives/table.md index 992fac7e44..613544639a 100644 --- a/website/base/primitives/table.md +++ b/website/base/primitives/table.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Table supplies behavior and semantic structure ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- table +cargo run -p gpui-base-examples -- table ``` ## Import diff --git a/website/base/primitives/tabs.md b/website/base/primitives/tabs.md index c14c4abcba..90843399d5 100644 --- a/website/base/primitives/tabs.md +++ b/website/base/primitives/tabs.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Tabs supplies behavior and semantic structure ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- tabs +cargo run -p gpui-base-examples -- tabs ``` ## Import diff --git a/website/base/primitives/textarea.md b/website/base/primitives/textarea.md index b47a064cea..8eb154d31e 100644 --- a/website/base/primitives/textarea.md +++ b/website/base/primitives/textarea.md @@ -69,5 +69,5 @@ padding, and `InputEditorStyle`. For a styled control, see the ## Runnable example ```bash -cargo run -p gpui-base --example components -- textarea +cargo run -p gpui-base-examples -- textarea ``` diff --git a/website/base/primitives/toast.md b/website/base/primitives/toast.md index cf20eacbab..b89c7c0103 100644 --- a/website/base/primitives/toast.md +++ b/website/base/primitives/toast.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Toast supplies behavior and semantic structure ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- toast +cargo run -p gpui-base-examples -- toast ``` ## Import diff --git a/website/base/primitives/toggle-group.md b/website/base/primitives/toggle-group.md index 94539f5de4..3aa464ac33 100644 --- a/website/base/primitives/toggle-group.md +++ b/website/base/primitives/toggle-group.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Toggle Group supplies behavior and semantic st ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- toggle-group +cargo run -p gpui-base-examples -- toggle-group ``` ## Import diff --git a/website/base/primitives/toggle.md b/website/base/primitives/toggle.md index 674f3c077c..4d5a47e825 100644 --- a/website/base/primitives/toggle.md +++ b/website/base/primitives/toggle.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Toggle supplies behavior and semantic structur ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- toggle +cargo run -p gpui-base-examples -- toggle ``` ## Import diff --git a/website/base/primitives/tooltip.md b/website/base/primitives/tooltip.md index 64c535390a..4b617083d8 100644 --- a/website/base/primitives/tooltip.md +++ b/website/base/primitives/tooltip.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Tooltip supplies behavior and semantic structu ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- tooltip +cargo run -p gpui-base-examples -- tooltip ``` ## Import diff --git a/website/base/primitives/tree.md b/website/base/primitives/tree.md index e3c1b33028..66422ae73a 100644 --- a/website/base/primitives/tree.md +++ b/website/base/primitives/tree.md @@ -12,10 +12,10 @@ Like every `gpui-base` primitive, Tree supplies behavior and semantic structure ## Example -The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. +The [single native Cargo entrypoint](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/native/src/bin/components.rs) selects this primitive from the [shared showcase implementation](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/mod.rs). The same showcase is compiled once for the WASM preview above. ```bash -cargo run -p gpui-base --example components -- tree +cargo run -p gpui-base-examples -- tree ``` ## Import diff --git a/website/base/text-selection.md b/website/base/text-selection.md index df78b2265c..2189ecb50f 100644 --- a/website/base/text-selection.md +++ b/website/base/text-selection.md @@ -176,7 +176,7 @@ For multiple runs, give each run a stable `document_order`. Input order is prese The [shared Text Selection showcase](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/components/text_selection.rs) is the complete runnable example used by both the native command and the live Rust/WASM preview above: ```bash -cargo run -p gpui-base --example components -- text-selection +cargo run -p gpui-base-examples -- text-selection ``` ## Complete Rust example diff --git a/website/base/text-view.md b/website/base/text-view.md index 90a3312ea5..8f2e0f72e0 100644 --- a/website/base/text-view.md +++ b/website/base/text-view.md @@ -128,5 +128,5 @@ The live preview and native command use the same Base-only source: <<< ../../crates/base/examples/showcase/components/text_view.rs{rust} ```bash -cargo run -p gpui-base --example components -- text-view +cargo run -p gpui-base-examples -- text-view ``` diff --git a/website/base/virtual-list.md b/website/base/virtual-list.md index 1a7e6af479..61a9542990 100644 --- a/website/base/virtual-list.md +++ b/website/base/virtual-list.md @@ -133,7 +133,7 @@ The tradeoff is that the size table must exist before the first frame. For a mil ## Complete Rust example ```bash -cargo run -p gpui-base --example components -- virtual-list +cargo run -p gpui-base-examples -- virtual-list ``` <<< ../../crates/base/examples/showcase/components/virtual_list.rs{rust} diff --git a/website/zh-CN/base/dock.md b/website/zh-CN/base/dock.md index 7a4d49a1db..0bd25beb4f 100644 --- a/website/zh-CN/base/dock.md +++ b/website/zh-CN/base/dock.md @@ -55,7 +55,7 @@ Dock 的数据模型比单一分栏组件更重，但换来可查询、可移动 ## 可运行示例 ```bash -cargo run -p gpui-base --example dock +cargo run -p gpui-base-examples -- dock ``` <<< ../../../crates/base/examples/showcase/components/dock.rs{rust} diff --git a/website/zh-CN/base/getting-started.md b/website/zh-CN/base/getting-started.md index 2098792534..afe3c0ad80 100644 --- a/website/zh-CN/base/getting-started.md +++ b/website/zh-CN/base/getting-started.md @@ -77,7 +77,7 @@ Theme::global_mut(cx).tokens = SemanticThemeTokens { ## 运行共享示例 ```sh -cargo run -p gpui-base --example components -- button +cargo run -p gpui-base-examples -- button ``` 将 `button` 替换为[原语目录](./primitives/index.md)中的 slug。网站会把同一份展示代码编译为 `wasm32-unknown-unknown` 并加载到各原语页面。 diff --git a/website/zh-CN/base/motion.md b/website/zh-CN/base/motion.md index cc0bb5a3a5..60f13efd8f 100644 --- a/website/zh-CN/base/motion.md +++ b/website/zh-CN/base/motion.md @@ -13,7 +13,7 @@ exampleKind: base 运行本文配套的交互示例： ```bash -cargo run -p gpui-base --example motion +cargo run -p gpui-base-examples --bin motion ``` 示例包含五个相互独立的页面，可通过顶部标签逐个查看。 diff --git a/website/zh-CN/base/primitives/accordion.md b/website/zh-CN/base/primitives/accordion.md index 1f8d61b4ff..88d7393682 100644 --- a/website/zh-CN/base/primitives/accordion.md +++ b/website/zh-CN/base/primitives/accordion.md @@ -15,7 +15,7 @@ order: 1 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- accordion +cargo run -p gpui-base-examples -- accordion ``` ## 导入 diff --git a/website/zh-CN/base/primitives/alert-dialog.md b/website/zh-CN/base/primitives/alert-dialog.md index fdb1dc73ba..9a46fa9175 100644 --- a/website/zh-CN/base/primitives/alert-dialog.md +++ b/website/zh-CN/base/primitives/alert-dialog.md @@ -15,7 +15,7 @@ order: 2 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- alert-dialog +cargo run -p gpui-base-examples -- alert-dialog ``` ## 导入 diff --git a/website/zh-CN/base/primitives/avatar.md b/website/zh-CN/base/primitives/avatar.md index 3bf2df6e8b..308b59da4b 100644 --- a/website/zh-CN/base/primitives/avatar.md +++ b/website/zh-CN/base/primitives/avatar.md @@ -15,7 +15,7 @@ order: 3 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- avatar +cargo run -p gpui-base-examples -- avatar ``` ## 导入 diff --git a/website/zh-CN/base/primitives/button.md b/website/zh-CN/base/primitives/button.md index df1dfd179c..5121b08773 100644 --- a/website/zh-CN/base/primitives/button.md +++ b/website/zh-CN/base/primitives/button.md @@ -13,7 +13,7 @@ order: 4 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- button +cargo run -p gpui-base-examples -- button ``` ## 导入 diff --git a/website/zh-CN/base/primitives/calendar.md b/website/zh-CN/base/primitives/calendar.md index 393cc5a0a1..1d97415fa2 100644 --- a/website/zh-CN/base/primitives/calendar.md +++ b/website/zh-CN/base/primitives/calendar.md @@ -15,7 +15,7 @@ order: 5 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- calendar +cargo run -p gpui-base-examples -- calendar ``` ## 导入 diff --git a/website/zh-CN/base/primitives/checkbox.md b/website/zh-CN/base/primitives/checkbox.md index 9f631c3936..78da6a57cf 100644 --- a/website/zh-CN/base/primitives/checkbox.md +++ b/website/zh-CN/base/primitives/checkbox.md @@ -15,7 +15,7 @@ order: 6 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- checkbox +cargo run -p gpui-base-examples -- checkbox ``` ## 导入 diff --git a/website/zh-CN/base/primitives/collapsible.md b/website/zh-CN/base/primitives/collapsible.md index 00a35f5c4b..69fbaba06b 100644 --- a/website/zh-CN/base/primitives/collapsible.md +++ b/website/zh-CN/base/primitives/collapsible.md @@ -15,7 +15,7 @@ order: 7 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- collapsible +cargo run -p gpui-base-examples -- collapsible ``` ## 导入 diff --git a/website/zh-CN/base/primitives/color-picker.md b/website/zh-CN/base/primitives/color-picker.md index 87375cd228..dfa45ed160 100644 --- a/website/zh-CN/base/primitives/color-picker.md +++ b/website/zh-CN/base/primitives/color-picker.md @@ -15,7 +15,7 @@ order: 8 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- color-picker +cargo run -p gpui-base-examples -- color-picker ``` ## 导入 diff --git a/website/zh-CN/base/primitives/combobox.md b/website/zh-CN/base/primitives/combobox.md index 02ffc498cd..cf2e1198a7 100644 --- a/website/zh-CN/base/primitives/combobox.md +++ b/website/zh-CN/base/primitives/combobox.md @@ -15,7 +15,7 @@ order: 9 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- combobox +cargo run -p gpui-base-examples -- combobox ``` ## 导入 diff --git a/website/zh-CN/base/primitives/date-picker.md b/website/zh-CN/base/primitives/date-picker.md index b01f1ed3ca..5e07e864af 100644 --- a/website/zh-CN/base/primitives/date-picker.md +++ b/website/zh-CN/base/primitives/date-picker.md @@ -15,7 +15,7 @@ order: 10 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- date-picker +cargo run -p gpui-base-examples -- date-picker ``` ## 导入 diff --git a/website/zh-CN/base/primitives/dialog.md b/website/zh-CN/base/primitives/dialog.md index 1b0570588a..bb07abc4c0 100644 --- a/website/zh-CN/base/primitives/dialog.md +++ b/website/zh-CN/base/primitives/dialog.md @@ -15,7 +15,7 @@ order: 11 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- dialog +cargo run -p gpui-base-examples -- dialog ``` ## 导入 diff --git a/website/zh-CN/base/primitives/editor.md b/website/zh-CN/base/primitives/editor.md index e97a7636e3..8c7c443588 100644 --- a/website/zh-CN/base/primitives/editor.md +++ b/website/zh-CN/base/primitives/editor.md @@ -45,5 +45,5 @@ Editor 没有独立字体设置，而是使用环境文本样式。可在外层 ## 可运行示例 ```bash -cargo run -p gpui-base --example components -- editor +cargo run -p gpui-base-examples -- editor ``` diff --git a/website/zh-CN/base/primitives/hover-card.md b/website/zh-CN/base/primitives/hover-card.md index 473551ffe0..bda21e1df0 100644 --- a/website/zh-CN/base/primitives/hover-card.md +++ b/website/zh-CN/base/primitives/hover-card.md @@ -15,7 +15,7 @@ order: 13 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- hover-card +cargo run -p gpui-base-examples -- hover-card ``` ## 导入 diff --git a/website/zh-CN/base/primitives/input.md b/website/zh-CN/base/primitives/input.md index cac6bb8ddd..d2fdbecfc9 100644 --- a/website/zh-CN/base/primitives/input.md +++ b/website/zh-CN/base/primitives/input.md @@ -59,7 +59,7 @@ let password = cx.new(|cx| { ## 可运行示例 ```bash -cargo run -p gpui-base --example components -- input +cargo run -p gpui-base-examples -- input ``` 实现位于 [`input.rs`](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/components/input.rs)。 diff --git a/website/zh-CN/base/primitives/link.md b/website/zh-CN/base/primitives/link.md index 5ab2000459..94e2815f51 100644 --- a/website/zh-CN/base/primitives/link.md +++ b/website/zh-CN/base/primitives/link.md @@ -15,7 +15,7 @@ order: 15 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- link +cargo run -p gpui-base-examples -- link ``` ## 导入 diff --git a/website/zh-CN/base/primitives/nav-stack.md b/website/zh-CN/base/primitives/nav-stack.md index 736b60fba0..c6dd2fb609 100644 --- a/website/zh-CN/base/primitives/nav-stack.md +++ b/website/zh-CN/base/primitives/nav-stack.md @@ -15,7 +15,7 @@ order: 16 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- nav-stack +cargo run -p gpui-base-examples -- nav-stack ``` ## 导入 diff --git a/website/zh-CN/base/primitives/number-input.md b/website/zh-CN/base/primitives/number-input.md index 8eaa4f79c2..2644a1096e 100644 --- a/website/zh-CN/base/primitives/number-input.md +++ b/website/zh-CN/base/primitives/number-input.md @@ -15,7 +15,7 @@ order: 16 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- number-input +cargo run -p gpui-base-examples -- number-input ``` ## 导入 diff --git a/website/zh-CN/base/primitives/otp-input.md b/website/zh-CN/base/primitives/otp-input.md index d22a9434b3..de3ec4ce85 100644 --- a/website/zh-CN/base/primitives/otp-input.md +++ b/website/zh-CN/base/primitives/otp-input.md @@ -15,7 +15,7 @@ order: 17 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- otp-input +cargo run -p gpui-base-examples -- otp-input ``` ## 导入 diff --git a/website/zh-CN/base/primitives/pagination.md b/website/zh-CN/base/primitives/pagination.md index 4855c12c7f..3521998415 100644 --- a/website/zh-CN/base/primitives/pagination.md +++ b/website/zh-CN/base/primitives/pagination.md @@ -15,7 +15,7 @@ order: 18 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- pagination +cargo run -p gpui-base-examples -- pagination ``` ## 导入 diff --git a/website/zh-CN/base/primitives/popover.md b/website/zh-CN/base/primitives/popover.md index 053124c373..b516dd11a7 100644 --- a/website/zh-CN/base/primitives/popover.md +++ b/website/zh-CN/base/primitives/popover.md @@ -15,7 +15,7 @@ order: 19 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- popover +cargo run -p gpui-base-examples -- popover ``` ## 导入 diff --git a/website/zh-CN/base/primitives/popup.md b/website/zh-CN/base/primitives/popup.md index 068acdaf07..ec96ca679c 100644 --- a/website/zh-CN/base/primitives/popup.md +++ b/website/zh-CN/base/primitives/popup.md @@ -15,7 +15,7 @@ order: 22 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- popup +cargo run -p gpui-base-examples -- popup ``` ## 导入 diff --git a/website/zh-CN/base/primitives/progress.md b/website/zh-CN/base/primitives/progress.md index 36a1443c62..d7ddaadf88 100644 --- a/website/zh-CN/base/primitives/progress.md +++ b/website/zh-CN/base/primitives/progress.md @@ -15,7 +15,7 @@ order: 20 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- progress +cargo run -p gpui-base-examples -- progress ``` ## 导入 diff --git a/website/zh-CN/base/primitives/radio-group.md b/website/zh-CN/base/primitives/radio-group.md index 9ac5fac8b1..b3a4060799 100644 --- a/website/zh-CN/base/primitives/radio-group.md +++ b/website/zh-CN/base/primitives/radio-group.md @@ -15,7 +15,7 @@ order: 22 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- radio-group +cargo run -p gpui-base-examples -- radio-group ``` ## 导入 diff --git a/website/zh-CN/base/primitives/radio.md b/website/zh-CN/base/primitives/radio.md index 4b8f3f0e24..20f492c499 100644 --- a/website/zh-CN/base/primitives/radio.md +++ b/website/zh-CN/base/primitives/radio.md @@ -15,7 +15,7 @@ order: 21 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- radio +cargo run -p gpui-base-examples -- radio ``` ## 导入 diff --git a/website/zh-CN/base/primitives/resizable.md b/website/zh-CN/base/primitives/resizable.md index 93d4963940..b4d5fc2283 100644 --- a/website/zh-CN/base/primitives/resizable.md +++ b/website/zh-CN/base/primitives/resizable.md @@ -15,7 +15,7 @@ order: 23 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- resizable +cargo run -p gpui-base-examples -- resizable ``` ## 导入 diff --git a/website/zh-CN/base/primitives/scrollbar.md b/website/zh-CN/base/primitives/scrollbar.md index 0d9e112c2c..56e0a9bb6d 100644 --- a/website/zh-CN/base/primitives/scrollbar.md +++ b/website/zh-CN/base/primitives/scrollbar.md @@ -11,7 +11,7 @@ order: 24 ## 运行示例 ```bash -cargo run -p gpui-base --example components -- scrollbar +cargo run -p gpui-base-examples -- scrollbar ``` 原生与 WASM 共用 [`scrollbar.rs`](https://github.com/longbridge/gpui-kit/blob/main/crates/base/examples/showcase/components/scrollbar.rs)。 diff --git a/website/zh-CN/base/primitives/select.md b/website/zh-CN/base/primitives/select.md index ddd6a51275..3caa26cfb2 100644 --- a/website/zh-CN/base/primitives/select.md +++ b/website/zh-CN/base/primitives/select.md @@ -15,7 +15,7 @@ order: 25 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- select +cargo run -p gpui-base-examples -- select ``` ## 导入 diff --git a/website/zh-CN/base/primitives/sheet.md b/website/zh-CN/base/primitives/sheet.md index e4deedf3e8..607ecc07f7 100644 --- a/website/zh-CN/base/primitives/sheet.md +++ b/website/zh-CN/base/primitives/sheet.md @@ -15,7 +15,7 @@ order: 26 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- sheet +cargo run -p gpui-base-examples -- sheet ``` ## 导入 diff --git a/website/zh-CN/base/primitives/slider.md b/website/zh-CN/base/primitives/slider.md index f5e68c84e5..45a052d0fa 100644 --- a/website/zh-CN/base/primitives/slider.md +++ b/website/zh-CN/base/primitives/slider.md @@ -15,7 +15,7 @@ order: 27 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- slider +cargo run -p gpui-base-examples -- slider ``` ## 导入 diff --git a/website/zh-CN/base/primitives/switch.md b/website/zh-CN/base/primitives/switch.md index 23e50e663a..560896e5ac 100644 --- a/website/zh-CN/base/primitives/switch.md +++ b/website/zh-CN/base/primitives/switch.md @@ -15,7 +15,7 @@ order: 28 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- switch +cargo run -p gpui-base-examples -- switch ``` ## 导入 diff --git a/website/zh-CN/base/primitives/table.md b/website/zh-CN/base/primitives/table.md index 7df8ebb984..16f2c97ff0 100644 --- a/website/zh-CN/base/primitives/table.md +++ b/website/zh-CN/base/primitives/table.md @@ -15,7 +15,7 @@ order: 29 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- table +cargo run -p gpui-base-examples -- table ``` ## 导入 diff --git a/website/zh-CN/base/primitives/tabs.md b/website/zh-CN/base/primitives/tabs.md index 514c1722c2..d6e30afec4 100644 --- a/website/zh-CN/base/primitives/tabs.md +++ b/website/zh-CN/base/primitives/tabs.md @@ -15,7 +15,7 @@ order: 30 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- tabs +cargo run -p gpui-base-examples -- tabs ``` ## 导入 diff --git a/website/zh-CN/base/primitives/textarea.md b/website/zh-CN/base/primitives/textarea.md index db5b33afba..04b11fdbaa 100644 --- a/website/zh-CN/base/primitives/textarea.md +++ b/website/zh-CN/base/primitives/textarea.md @@ -56,5 +56,5 @@ let value = notes.read(cx).value(); ## 可运行示例 ```bash -cargo run -p gpui-base --example components -- textarea +cargo run -p gpui-base-examples -- textarea ``` diff --git a/website/zh-CN/base/primitives/toast.md b/website/zh-CN/base/primitives/toast.md index 063c3161ca..33f54a1d96 100644 --- a/website/zh-CN/base/primitives/toast.md +++ b/website/zh-CN/base/primitives/toast.md @@ -15,7 +15,7 @@ order: 31 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- toast +cargo run -p gpui-base-examples -- toast ``` ## 导入 diff --git a/website/zh-CN/base/primitives/toggle-group.md b/website/zh-CN/base/primitives/toggle-group.md index b3f419fa29..49125842b0 100644 --- a/website/zh-CN/base/primitives/toggle-group.md +++ b/website/zh-CN/base/primitives/toggle-group.md @@ -15,7 +15,7 @@ order: 33 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- toggle-group +cargo run -p gpui-base-examples -- toggle-group ``` ## 导入 diff --git a/website/zh-CN/base/primitives/toggle.md b/website/zh-CN/base/primitives/toggle.md index 3ef9d17d29..c4ab4132ff 100644 --- a/website/zh-CN/base/primitives/toggle.md +++ b/website/zh-CN/base/primitives/toggle.md @@ -15,7 +15,7 @@ order: 32 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- toggle +cargo run -p gpui-base-examples -- toggle ``` ## 导入 diff --git a/website/zh-CN/base/primitives/tooltip.md b/website/zh-CN/base/primitives/tooltip.md index b254a5d9c3..158a501b57 100644 --- a/website/zh-CN/base/primitives/tooltip.md +++ b/website/zh-CN/base/primitives/tooltip.md @@ -15,7 +15,7 @@ order: 34 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- tooltip +cargo run -p gpui-base-examples -- tooltip ``` ## 导入 diff --git a/website/zh-CN/base/primitives/tree.md b/website/zh-CN/base/primitives/tree.md index 0f8a7ffcb2..5b4da1dcb1 100644 --- a/website/zh-CN/base/primitives/tree.md +++ b/website/zh-CN/base/primitives/tree.md @@ -15,7 +15,7 @@ order: 35 原生示例和页面上方的 WASM 预览共用同一份实现： ```bash -cargo run -p gpui-base --example components -- tree +cargo run -p gpui-base-examples -- tree ``` ## 导入 diff --git a/website/zh-CN/base/text-selection.md b/website/zh-CN/base/text-selection.md index dca259c8c7..43931446d2 100644 --- a/website/zh-CN/base/text-selection.md +++ b/website/zh-CN/base/text-selection.md @@ -35,7 +35,7 @@ order: 3 ## 完整 Rust 示例 ```bash -cargo run -p gpui-base --example text-selection +cargo run -p gpui-base-examples -- text-selection ``` <<< ../../../crates/base/examples/showcase/components/text_selection.rs{rust} diff --git a/website/zh-CN/base/text-view.md b/website/zh-CN/base/text-view.md index 40ec40ae03..eb3865c88c 100644 --- a/website/zh-CN/base/text-view.md +++ b/website/zh-CN/base/text-view.md @@ -126,5 +126,5 @@ document.update(cx, |state, cx| state.set_text(updated_source, cx)); <<< ../../../crates/base/examples/showcase/components/text_view.rs{rust} ```bash -cargo run -p gpui-base --example components -- text-view +cargo run -p gpui-base-examples -- text-view ``` diff --git a/website/zh-CN/base/virtual-list.md b/website/zh-CN/base/virtual-list.md index 8b8a860634..feac2ca1b8 100644 --- a/website/zh-CN/base/virtual-list.md +++ b/website/zh-CN/base/virtual-list.md @@ -52,7 +52,7 @@ v_virtual_list(cx.entity(), "customers", sizes, |_this, range, _window, _cx| { ## 完整 Rust 示例 ```bash -cargo run -p gpui-base --example components -- virtual-list +cargo run -p gpui-base-examples -- virtual-list ``` <<< ../../../crates/base/examples/showcase/components/virtual_list.rs{rust} From d59d1a16bfb1de85b0a52dbd472e90509478d064 Mon Sep 17 00:00:00 2001 From: Alex Shi Date: Sat, 5 Sep 2026 20:39:24 +0800 Subject: [PATCH 7/9] editor: Preserve active search match on panel open (#2953) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description Preserve the active editor search occurrence when Find is closed and reopened with the same query. An unchanged query now keeps the matcher’s current index and is not re-anchored to the viewport. New queries and case-sensitivity changes still rebuild and anchor the search normally. This also prevents the styled search panel’s initial query synchronization from resetting the occurrence. ## Screenshot Before https://github.com/user-attachments/assets/4f334ada-27f8-4a17-8ad3-5b768aff058b After https://github.com/user-attachments/assets/3ef1f5ae-1c56-4829-9f49-87513ef5a039 ## How to test 1. Search for a term with at least three matches. 2. Navigate to the second match and close Find. 3. Reopen Find without changing the query. 4. Confirm the counter remains at `2/3` and Next advances to `3/3`. ```sh cargo test -p gpui-base input::search::tests cargo test -p gpui-component input::overlay::tests ``` AI assistance: Codex generated the implementation and regression tests; I reviewed changes. ## Checklist - [x] I have read the [CONTRIBUTING](../CONTRIBUTING.md) document and followed the guidelines. - [ ] Reviewed the changes in this PR and confirmed AI-generated code (if any) is accurate. - [ ] Passed `cargo run` for story tests related to the changes. - [x] Platform-specific performance testing is not applicable; this is platform-independent search state synchronization. --- crates/base/src/input/editor/search.rs | 54 +++++++++++++++++++------- crates/component/src/input/overlay.rs | 39 +++++++++++++++++++ 2 files changed, 80 insertions(+), 13 deletions(-) diff --git a/crates/base/src/input/editor/search.rs b/crates/base/src/input/editor/search.rs index a7939aed5a..16c1ebb1f6 100644 --- a/crates/base/src/input/editor/search.rs +++ b/crates/base/src/input/editor/search.rs @@ -54,7 +54,12 @@ impl SearchSession { } pub(crate) fn update_query(&mut self, query: impl Into, case_insensitive: bool) { - self.query = query.into(); + let query = query.into(); + if self.query == query && self.case_insensitive == case_insensitive { + return; + } + + self.query = query; self.case_insensitive = case_insensitive; self.matcher.update_query(&self.query, case_insensitive); } @@ -78,19 +83,25 @@ impl InputBaseState { self.search_session .open(replace_mode, self.is_replaceable()); let selected = self.selected_text().to_string(); - if !selected.is_empty() { - self.search_session.query = selected; - } - self.search_session.anchor_offset = self - .last_layout - .as_ref() - .map(|layout| layout.visible_range_offset.start); - self.search_session.matcher.update_query( - &self.search_session.query, - self.search_session.case_insensitive, - ); + let query = if selected.is_empty() { + self.search_session.query.clone() + } else { + selected + }; + let query_changed = query != self.search_session.query; + // A retained query resumes its previous occurrence. Only a new query + // is anchored to the current viewport. + self.search_session.anchor_offset = if query_changed { + self.last_layout + .as_ref() + .map(|layout| layout.visible_range_offset.start) + } else { + None + }; + let case_insensitive = self.search_session.case_insensitive; + self.search_session.update_query(query, case_insensitive); self.search_session.matcher.update(&self.text); - if let Some(anchor) = self.search_session.anchor_offset { + if query_changed && let Some(anchor) = self.search_session.anchor_offset { self.search_session.matcher.update_cursor_by_offset(anchor); } cx.notify(); @@ -404,6 +415,23 @@ mod tests { assert_eq!(matcher.next(), Some(5..10)); } + #[test] + fn identical_query_keeps_the_current_match() { + let mut session = SearchSession::default(); + session.update_query("foo", true); + session.matcher.update(&Rope::from("foo bar foo baz foo")); + session.matcher.update_cursor_by_offset(12); + assert_eq!(session.matcher.current_match_index(), 2); + + // Reopening Find and the styled search panel's initial query echo both + // update the session with the same query. Neither should reset the + // previously active occurrence. + session.update_query("foo", true); + + assert_eq!(session.matcher.current_match_index(), 2); + assert_eq!(session.matcher.label(), "3/3"); + } + #[test] fn replacement_keeps_current_match_index_on_next_match() { let mut matcher = SearchMatcher::new(); diff --git a/crates/component/src/input/overlay.rs b/crates/component/src/input/overlay.rs index d1a45fef27..4ce4ab2781 100644 --- a/crates/component/src/input/overlay.rs +++ b/crates/component/src/input/overlay.rs @@ -504,6 +504,45 @@ mod tests { }); } + /// Reopening search must preserve navigation already owned by Base. + /// + /// Closing and reopening Find keeps the previous occurrence in browsers. + /// Neither Base reopening the session nor the styled panel echoing its + /// retained query may reset the current match to zero. + #[gpui::test] + fn reopening_search_panel_preserves_the_previous_match(cx: &mut gpui::TestAppContext) { + cx.update(crate::init); + let (probe, cx) = cx.add_window_view(|window, cx| OverlayProbe { + state: cx.new(|cx| crate::input::EditorState::new(window, cx).searchable(true)), + }); + let state = probe.read_with(cx, |probe, _| probe.state.clone()); + + cx.update(|window, cx| { + state.update(cx, |state, cx| { + state.set_value("foo bar foo baz foo", window, cx); + state.open_search(false, cx); + state.set_search_query("foo", true, cx); + assert_eq!(state.next_search_match(cx), Some(8..11)); + assert_eq!(state.search_session().matcher.current_match_index(), 1); + state.close_search(cx); + state.open_search(false, cx); + assert_eq!(state.search_session().matcher.current_match_index(), 1); + }); + + let mut host = InputOverlayHost::new(state.clone(), window, cx); + host.sync(&state, window, cx); + + state.read_with(cx, |state, _| { + assert_eq!(state.search_session().matcher.current_match_index(), 1); + assert_eq!(state.search_session().matcher.label(), "2/3"); + }); + + state.update(cx, |state, cx| { + assert_eq!(state.next_search_match(cx), Some(16..19)); + }); + }); + } + /// A frame that changed nothing must not rebuild the popovers. /// /// Sync runs every frame, so the change check has to be cheap and stable. From 4cd6371a7de3811e30ba7180e3545b08e0cd3cc9 Mon Sep 17 00:00:00 2001 From: "Sergei G." Date: Sat, 5 Sep 2026 16:47:08 +0400 Subject: [PATCH 8/9] test(list): name row label checks explicitly --- crates/component/src/list/list.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/component/src/list/list.rs b/crates/component/src/list/list.rs index e3173ffd67..54c03ae88a 100644 --- a/crates/component/src/list/list.rs +++ b/crates/component/src/list/list.rs @@ -782,7 +782,7 @@ where } #[cfg(test)] -mod tests { +mod row_label_tests { use super::*; use crate::list::ListItem; use gpui::{Element as _, TestAppContext, accesskit}; From 75ec0f5ba3e45feaa67df286c5c89727288fae1c Mon Sep 17 00:00:00 2001 From: "Sergei G." Date: Sat, 5 Sep 2026 16:57:33 +0400 Subject: [PATCH 9/9] list: use accessibility terminology for row labels --- crates/component/src/list/delegate.rs | 2 +- crates/component/src/list/list.rs | 4 ++-- crates/story/src/stories/list_story.rs | 2 +- website/docs/components/list.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/component/src/list/delegate.rs b/crates/component/src/list/delegate.rs index 5bf22ab697..e4f8997659 100644 --- a/crates/component/src/list/delegate.rs +++ b/crates/component/src/list/delegate.rs @@ -27,7 +27,7 @@ pub trait ListDelegate: Sized + 'static { /// Return the accessible name of a row, independently of its rendered children. /// /// The default leaves the row unnamed so its children retain their existing semantics. - fn item_aria_label(&self, _: IndexPath, _: &App) -> Option { + fn item_accessibility_label(&self, _: IndexPath, _: &App) -> Option { None } diff --git a/crates/component/src/list/list.rs b/crates/component/src/list/list.rs index 54c03ae88a..dfd944621b 100644 --- a/crates/component/src/list/list.rs +++ b/crates/component/src/list/list.rs @@ -471,7 +471,7 @@ where let id = SharedString::from(format!("list-item-{}", ix)); let total_items = self.rows_cache.items_count(); - let aria_label = self.delegate.item_aria_label(ix, cx); + let aria_label = self.delegate.item_accessibility_label(ix, cx); div() .id(id) @@ -796,7 +796,7 @@ mod row_label_tests { 2 } - fn item_aria_label(&self, index: IndexPath, _: &App) -> Option { + fn item_accessibility_label(&self, index: IndexPath, _: &App) -> Option { (index.row == 0).then(|| "Acme, up 2 percent".into()) } diff --git a/crates/story/src/stories/list_story.rs b/crates/story/src/stories/list_story.rs index 0dc35873ba..2ddc737ae0 100644 --- a/crates/story/src/stories/list_story.rs +++ b/crates/story/src/stories/list_story.rs @@ -336,7 +336,7 @@ impl CompanyListDelegate { } impl ListDelegate for CompanyListDelegate { - fn item_aria_label(&self, index: IndexPath, _: &App) -> Option { + fn item_accessibility_label(&self, index: IndexPath, _: &App) -> Option { let company = self.matched_companies.get(index.section)?.get(index.row)?; Some( format!( diff --git a/website/docs/components/list.md b/website/docs/components/list.md index 75914bde9a..4467195596 100644 --- a/website/docs/components/list.md +++ b/website/docs/components/list.md @@ -494,7 +494,7 @@ impl ListDelegate for ContactListDelegate { ## Accessible row names -For composite rows, implement `ListDelegate::item_aria_label` to provide a concise +For composite rows, implement `ListDelegate::item_accessibility_label` to provide a concise name on the list-item container. Return `None` to leave the existing child semantics unchanged. The hook receives the current `IndexPath` and `App`; it does not change the row's visible content or selection behavior.