From 4beaad6e42578ccd6945e5b229de4b9e99dff638 Mon Sep 17 00:00:00 2001 From: boojack Date: Tue, 17 Nov 2026 19:35:15 +0800 Subject: [PATCH] chore: bump ui lib --- web/package.json | 2 +- web/pnpm-lock.yaml | 10 +++++----- web/tests/editor-commit-button.test.tsx | 18 ++++++++---------- web/tests/password-sign-in-form.test.tsx | 10 +++++----- web/tests/sso-auth-pages.test.tsx | 6 +++--- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/web/package.json b/web/package.json index c8b73ff5e..f35c4d8db 100644 --- a/web/package.json +++ b/web/package.json @@ -29,7 +29,7 @@ "@tanstack/react-query-devtools": "^5.100.9", "@usememos/canvas": "26.11.3", "@usememos/editor": "26.11.5", - "@usememos/ui": "26.11.22", + "@usememos/ui": "26.11.23", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", "copy-to-clipboard": "^4.0.2", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 8152f5d97..aeff90035 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -45,8 +45,8 @@ importers: specifier: 26.11.5 version: 26.11.5(react-dom@19.2.6(react@19.2.6))(react@19.2.6) '@usememos/ui': - specifier: 26.11.22 - version: 26.11.22(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6) + specifier: 26.11.23 + version: 26.11.23(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6) class-variance-authority: specifier: ^0.7.1 version: 0.7.1 @@ -981,8 +981,8 @@ packages: react-dom: optional: true - '@usememos/ui@26.11.22': - resolution: {integrity: sha512-DumtNXp1zePyBNdL+ecxgN1sGX8eWtMcRMx4aHXxLSuQFBKdwVgcFP7/DTH/2XLN8xapWw0WWhjJaWKZyGt2Pg==} + '@usememos/ui@26.11.23': + resolution: {integrity: sha512-fC3dyMDAASe407AcTHZ5kXM1U35Y+WvrXWHryQveSyMupaMeun3qUjE5HGPV56fGnYhydqYGApeQ/WvTrAQQVA==} peerDependencies: '@base-ui/react': 1.9.0 lucide-react: '>=1.0.0' @@ -2414,7 +2414,7 @@ snapshots: react: 19.2.6 react-dom: 19.2.6(react@19.2.6) - '@usememos/ui@26.11.22(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)': + '@usememos/ui@26.11.23(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)': dependencies: '@base-ui/react': 1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6) lucide-react: 1.34.0(react@19.2.6) diff --git a/web/tests/editor-commit-button.test.tsx b/web/tests/editor-commit-button.test.tsx index b4ddfca0b..867fd7277 100644 --- a/web/tests/editor-commit-button.test.tsx +++ b/web/tests/editor-commit-button.test.tsx @@ -61,12 +61,11 @@ describe("EditorToolbar commit button", () => { expect(tooltip.querySelector(".mu-tooltip-shortcut")).toHaveTextContent("Enter"); }); - it("keeps the same button, label and spinner slot while saving", async () => { + it("keeps the same button and label while saving, with the spinner before the label", async () => { renderToolbar("A thought"); const button = screen.getByRole("button", { name: "editor.save" }); const label = button.querySelector(".mu-button-label"); - const slot = button.querySelector(".mu-button-loading-slot"); - expect(slot).not.toBeNull(); + expect(button.firstElementChild).toBe(label); act(() => dispatchSaving?.(true)); @@ -74,24 +73,23 @@ describe("EditorToolbar commit button", () => { expect(button).toHaveAttribute("aria-busy", "true"); expect(button).toHaveAttribute("aria-disabled", "true"); expect(button).toHaveAccessibleDescription("editor.saving"); - await waitFor(() => expect(button.querySelector(".mu-spinner")).toBe(slot)); + await waitFor(() => expect(button.firstElementChild).toHaveClass("mu-spinner")); expect(button.querySelector(".mu-button-label")).toBe(label); expect(label).toHaveTextContent("editor.save"); act(() => dispatchSaving?.(false)); expect(screen.getByRole("button", { name: "editor.save" })).toBe(button); - expect(button.querySelector(".mu-button-loading-slot")).toBe(slot); + expect(button.firstElementChild).toBe(label); expect(button.querySelector(".mu-spinner")).toBeNull(); expect(button).not.toHaveAttribute("aria-busy"); }); - it("keeps the button, label, slot and keyboard focus when validation changes", () => { + it("keeps the button, label and keyboard focus when validation changes", () => { renderToolbar(""); const button = screen.getByRole("button", { name: "editor.save" }); const label = button.querySelector(".mu-button-label"); - const slot = button.querySelector(".mu-button-loading-slot"); - expect(slot).not.toBeNull(); + expect(button.firstElementChild).toBe(label); expect(button).toHaveAttribute("aria-disabled", "true"); expect(button).toHaveAccessibleDescription("editor.validation.content-required"); act(() => button.focus()); @@ -102,7 +100,7 @@ describe("EditorToolbar commit button", () => { expect(screen.getByRole("button", { name: "editor.save" })).toBe(button); expect(button).not.toHaveAttribute("aria-disabled", "true"); expect(button.querySelector(".mu-button-label")).toBe(label); - expect(button.querySelector(".mu-button-loading-slot")).toBe(slot); + expect(button.firstElementChild).toBe(label); expect(button).toHaveFocus(); fireEvent.click(button); expect(onSave).toHaveBeenCalledOnce(); @@ -110,7 +108,7 @@ describe("EditorToolbar commit button", () => { act(() => dispatchContent?.("")); expect(screen.getByRole("button", { name: "editor.save" })).toBe(button); expect(button).toHaveAttribute("aria-disabled", "true"); - expect(button.querySelector(".mu-button-loading-slot")).toBe(slot); + expect(button.firstElementChild).toBe(label); expect(button).toHaveFocus(); }); diff --git a/web/tests/password-sign-in-form.test.tsx b/web/tests/password-sign-in-form.test.tsx index 94bf4e708..dce6a7240 100644 --- a/web/tests/password-sign-in-form.test.tsx +++ b/web/tests/password-sign-in-form.test.tsx @@ -92,8 +92,8 @@ describe("", () => { initialize.mockReturnValue(new Promise((resolve) => (finishInitialize = resolve))); render(); const button = screen.getByRole("button", { name: "common.sign-in" }); - const slot = button.querySelector(".mu-button-loading-slot"); - expect(slot).not.toBeNull(); + const label = button.querySelector(".mu-button-label"); + expect(button.firstElementChild).toBe(label); act(() => button.focus()); fill(); @@ -105,7 +105,7 @@ describe("", () => { expect(button).toHaveAttribute("aria-disabled", "true"); expect(screen.getByLabelText("common.username")).toHaveAttribute("readonly"); expect(screen.getByLabelText("common.password")).toHaveAttribute("readonly"); - await waitFor(() => expect(button.querySelector(".mu-spinner")).toBe(slot)); + await waitFor(() => expect(button.firstElementChild).toHaveClass("mu-spinner")); expect(button).toHaveTextContent("common.sign-in"); expect(button).toHaveFocus(); @@ -122,7 +122,7 @@ describe("", () => { signIn.mockRejectedValueOnce(new ConnectError("offline", Code.Unavailable)); render(); const button = screen.getByRole("button", { name: "common.sign-in" }); - const slot = button.querySelector(".mu-button-loading-slot"); + const label = button.querySelector(".mu-button-label"); fill(); @@ -130,7 +130,7 @@ describe("", () => { expect(screen.getByRole("button", { name: "common.sign-in" })).toBe(button); expect(button).not.toHaveAttribute("aria-busy"); expect(button).not.toHaveAttribute("aria-description"); - expect(button.querySelector(".mu-button-loading-slot")).toBe(slot); + expect(button.firstElementChild).toBe(label); expect(screen.getByLabelText("common.password")).not.toHaveAttribute("readonly"); signIn.mockResolvedValueOnce({}); diff --git a/web/tests/sso-auth-pages.test.tsx b/web/tests/sso-auth-pages.test.tsx index 23c8fdac1..8b318b92a 100644 --- a/web/tests/sso-auth-pages.test.tsx +++ b/web/tests/sso-auth-pages.test.tsx @@ -183,8 +183,8 @@ describe("automatic SSO auth pages", () => { renderPage("/auth", ); const button = screen.getByRole("button", { name: "auth.continue-with: Company SSO" }); const otherButton = screen.getByRole("button", { name: "auth.continue-with: Other SSO" }); - const slot = button.querySelector(".mu-button-loading-slot"); - expect(slot).not.toBeNull(); + const label = button.querySelector(".mu-button-label"); + expect(button.firstElementChild).toBe(label); act(() => button.focus()); fireEvent.click(button); fireEvent.click(button); @@ -196,7 +196,7 @@ describe("automatic SSO auth pages", () => { expect(otherButton).toBeDisabled(); fireEvent.click(otherButton); expect(signInWithSSO).toHaveBeenCalledOnce(); - await waitFor(() => expect(button.querySelector(".mu-spinner")).toBe(slot)); + await waitFor(() => expect(button.firstElementChild).toHaveClass("mu-spinner")); expect(button).toHaveTextContent("auth.continue-with: Company SSO"); expect(button).toHaveFocus(); });