diff --git a/locales/en/mod_management.json b/locales/en/mod_management.json index 8f59303b00..13a00fed21 100644 --- a/locales/en/mod_management.json +++ b/locales/en/mod_management.json @@ -212,8 +212,8 @@ "label": "Properties", "general": "General", "advanced": "Advanced", - "close": "Close properties", "toggle": "Properties", + "manageCategories": "Manage categories", "open": "Properties", "noSelection": "Select a mod to see its properties", "count": "{{count}} mod selected", @@ -221,7 +221,6 @@ "byAuthor": "by {{author}}", "adult": "Adult", "showDescription": "Show description", - "hideDescription": "Hide description", "copy": "Copy {{label}}", "copied": "Copied to clipboard", "copyFailed": "Couldn't copy to the clipboard", diff --git a/src/renderer/src/extensions/category_management/index.ts b/src/renderer/src/extensions/category_management/index.ts index 3b297412b2..c8b2114794 100644 --- a/src/renderer/src/extensions/category_management/index.ts +++ b/src/renderer/src/extensions/category_management/index.ts @@ -76,9 +76,16 @@ function init(context: IExtensionContext): boolean { context.registerReducer(["persistent", "categories"], categoryReducer); context.registerDialog("categories", CategoryDialog); - context.registerAction("mod-icons", 80, "categories", { pinned: true }, "Categories", () => { - context.api.store.dispatch(setDialogVisible("categories")); - }); + context.registerAction( + "mod-icons", + 80, + "categories", + { pinned: true }, + "Manage categories", + () => { + context.api.store.dispatch(setDialogVisible("categories")); + }, + ); context.registerTableAttribute("mods", { id: "category", diff --git a/src/renderer/src/extensions/mod_management/components/mod_properties_card/ModPropertiesCard.test.tsx b/src/renderer/src/extensions/mod_management/components/mod_properties_card/ModPropertiesCard.test.tsx index ae45faa70b..8b169d7694 100644 --- a/src/renderer/src/extensions/mod_management/components/mod_properties_card/ModPropertiesCard.test.tsx +++ b/src/renderer/src/extensions/mod_management/components/mod_properties_card/ModPropertiesCard.test.tsx @@ -41,18 +41,51 @@ describe("ModPropertiesCard", () => { expect(screen.getByTestId("mod-properties-card-footer")).toBeInTheDocument(); }); - it("shows its whole description a click away", async () => { + it("shows its whole description in a modal a click away", async () => { renderCard({ name: "SkyUI", isAdult: false, description: "[b]An interface[/b]" }); - expect(screen.queryByTestId("mod-properties-description")).toBeNull(); + expect(screen.queryByRole("dialog")).toBeNull(); await userEvent.click(screen.getByTestId("mod-properties-description-toggle")); - expect(screen.getByTestId("mod-properties-description")).toBeInTheDocument(); + const dialog = screen.getByRole("dialog"); + expect(dialog).toContainElement(screen.getByTestId("mod-properties-description")); expect( screen.getByTestId("mod-properties-description").querySelector("b, strong"), ).not.toBeNull(); }); + it("closes the description's modal", async () => { + renderCard({ name: "SkyUI", isAdult: false, description: "An interface" }); + await userEvent.click(screen.getByTestId("mod-properties-description-toggle")); + + await userEvent.keyboard("{Escape}"); + + expect(screen.queryByRole("dialog")).toBeNull(); + }); + + it("stands in for images from outside Nexus Mods where the mod has a page", async () => { + renderCard({ + name: "SkyUI", + isAdult: false, + description: "[img]https://i.imgur.com/a.png[/img]", + pageUrl: "https://www.nexusmods.com/skyrimspecialedition/mods/12604", + }); + await userEvent.click(screen.getByTestId("mod-properties-description-toggle")); + + expect(screen.getByTestId("external-image-placeholder")).toBeInTheDocument(); + }); + + it("leaves out images from outside Nexus Mods where the mod has no page", async () => { + renderCard({ + name: "SkyUI", + isAdult: false, + description: "[img]https://i.imgur.com/a.png[/img]", + }); + await userEvent.click(screen.getByTestId("mod-properties-description-toggle")); + + expect(screen.queryByTestId("external-image-placeholder")).toBeNull(); + }); + it("offers no description where it has none", () => { renderCard({ name: "SkyUI", isAdult: false }); diff --git a/src/renderer/src/extensions/mod_management/components/mod_properties_card/ModPropertiesCard.tsx b/src/renderer/src/extensions/mod_management/components/mod_properties_card/ModPropertiesCard.tsx index b178fe2ba0..27afd72c59 100644 --- a/src/renderer/src/extensions/mod_management/components/mod_properties_card/ModPropertiesCard.tsx +++ b/src/renderer/src/extensions/mod_management/components/mod_properties_card/ModPropertiesCard.tsx @@ -3,6 +3,7 @@ import { useTranslation } from "react-i18next"; import { Button } from "@/ui/components/button/Button"; import { AdultAwareImage } from "@/ui/components/image/AdultAwareImage"; +import { Modal } from "@/ui/components/modal/Modal"; import { BBCode } from "@/ui/components/prose/bbcode/BBCode"; import { Typography } from "@/ui/components/typography/Typography"; @@ -15,10 +16,10 @@ interface IModPropertiesCardProps { /** * The mod as Browse's mod card shows one, heading the Properties panel: its picture with its - * status tag, its name and summary, its whole description a click away, as the legacy pane has - * it, then its author and whether it's adult. Its picture blurs as the user has asked, if it's - * adult; a mod without one shows the broken picture icon, as its row's thumbnail does. The - * description shows no images from outside Nexus Mods, as there's no room to stand in for them. + * status tag, its name and summary, its whole description a click away in a modal, then its + * author and whether it's adult. Its picture blurs as the user has asked, if it's adult; a mod + * without one shows the broken picture icon, as its row's thumbnail does. The description's images + * from outside Nexus Mods show as placeholders opening its page, or not at all without one. */ export const ModPropertiesCard = ({ card }: IModPropertiesCardProps) => { const { t } = useTranslation("mod_management"); @@ -52,25 +53,39 @@ export const ModPropertiesCard = ({ card }: IModPropertiesCardProps) => { {!!card.description && ( -
+ <> - {showDescription && ( -
- + setShowDescription(false)} + > +
+
- )} -
+ + )} {(!!card.author || card.isAdult) && ( diff --git a/src/renderer/src/extensions/mod_management/components/mod_properties_panel/ModPropertiesPanel.test.tsx b/src/renderer/src/extensions/mod_management/components/mod_properties_panel/ModPropertiesPanel.test.tsx index a2bdbeca1d..cd9bed8a1f 100644 --- a/src/renderer/src/extensions/mod_management/components/mod_properties_panel/ModPropertiesPanel.test.tsx +++ b/src/renderer/src/extensions/mod_management/components/mod_properties_panel/ModPropertiesPanel.test.tsx @@ -29,7 +29,7 @@ const ONE_MOD: IModProperties = { summary: "A friendlier menu.", author: "schlangster", isAdult: false, - status: "downloaded", + status: "update", }, sections: [ { @@ -73,16 +73,11 @@ const REGISTERED = { values: {} as unknown as RegisteredValues, }; -const renderPanel = (properties: IModProperties, onClose = vi.fn(), registered = REGISTERED) => { +const renderPanel = (properties: IModProperties, registered = REGISTERED) => { vi.mocked(useModProperties).mockReturnValue(properties); return render( - + , ); }; @@ -137,7 +132,7 @@ const renderRegistered = ( }, ], }; - const open = () => renderPanel(properties, vi.fn(), registered); + const open = () => renderPanel(properties, registered); return { view: open(), open, attribute, extension, externalData, values: registered.values }; }; @@ -158,7 +153,7 @@ describe("ModPropertiesPanel", () => { const general = screen.getByRole("tabpanel"); expect(within(general).getByTestId("mod-properties-card")).toBeInTheDocument(); - expect(within(general).getByTestId("mod-status-downloaded")).toBeInTheDocument(); + expect(within(general).getByTestId("mod-status-update")).toBeInTheDocument(); expect(within(general).getByTestId("mod-property-version")).toHaveTextContent("5.2"); expect(within(general).queryByTestId("mod-property-archiveName")).not.toBeInTheDocument(); }); @@ -175,6 +170,35 @@ describe("ModPropertiesPanel", () => { expect(screen.queryByTestId("mod-properties-card")).not.toBeInTheDocument(); }); + it("starts a tab it switches to at its top", async () => { + renderPanel(ONE_MOD); + const scrollArea = screen.getByTestId("mod-properties-scroll-area"); + scrollArea.scrollTop = 400; + + await userEvent.click(screen.getAllByRole("tab")[1]); + + expect(scrollArea.scrollTop).toBe(0); + }); + + it("keeps its tabs out of what scrolls", () => { + renderPanel(ONE_MOD); + + const scrollArea = screen.getByTestId("mod-properties-scroll-area"); + expect(scrollArea).not.toContainElement(screen.getByRole("tablist")); + expect(scrollArea).toContainElement(screen.getByTestId("mod-properties-card")); + }); + + it("keeps several mods' count out of what scrolls", () => { + renderPanel({ + count: 3, + sections: [{ id: "organise", tab: "general", layout: "list", properties: [CATEGORY] }], + }); + + const scrollArea = screen.getByTestId("mod-properties-scroll-area"); + expect(scrollArea).not.toContainElement(screen.getByTestId("mod-properties-count")); + expect(scrollArea).toContainElement(screen.getByRole("button", { name: /^Category/ })); + }); + it("has no Advanced tab with nothing on it", () => { renderPanel({ ...ONE_MOD, sections: ONE_MOD.sections.filter(({ tab }) => tab === "general") }); @@ -306,13 +330,4 @@ describe("ModPropertiesPanel", () => { expect(externalData).not.toHaveBeenCalled(); expect(tableHears).not.toHaveBeenCalled(); }); - - it("closes", async () => { - const onClose = vi.fn(); - renderPanel(ONE_MOD, onClose); - - await userEvent.click(screen.getByTestId("mod-properties-close")); - - expect(onClose).toHaveBeenCalledTimes(1); - }); }); diff --git a/src/renderer/src/extensions/mod_management/components/mod_properties_panel/ModPropertiesPanel.tsx b/src/renderer/src/extensions/mod_management/components/mod_properties_panel/ModPropertiesPanel.tsx index b86d95fd6e..07c098fda3 100644 --- a/src/renderer/src/extensions/mod_management/components/mod_properties_panel/ModPropertiesPanel.tsx +++ b/src/renderer/src/extensions/mod_management/components/mod_properties_panel/ModPropertiesPanel.tsx @@ -1,7 +1,6 @@ -import React, { useState } from "react"; +import React, { useRef, useState } from "react"; import { useTranslation } from "react-i18next"; -import { Button } from "@/ui/components/button/Button"; import { NoResults } from "@/ui/components/no_results/NoResults"; import { TabBar } from "@/ui/components/tabs/TabBar"; import { TabButton } from "@/ui/components/tabs/TabButton"; @@ -32,13 +31,20 @@ interface IModPropertiesPanelProps { memberships: { [modId: string]: IMod[] }; /** The fields extensions registered for the legacy details pane. */ registered: IRegisteredDetails; - onClose: () => void; /** Classes for its frame, which the page sizes and places. */ className?: string; } const TABS: ModPropertiesTab[] = ["general", "advanced"]; +/** Its fixed header, its gutter lined up with its scroll area's, with room for focus rings. */ +const HEADER_CLASSES = + "-mt-1 mr-1.5 flex shrink-0 scrollbar-gutter-stable overflow-hidden pt-1 pr-1.5 pb-4 pl-5"; + +/** Where its contents scroll and fade out at the foot, as Browse's mod details do. */ +const SCROLL_CLASSES = + "mr-1.5 min-h-0 flex-1 scrollbar-gutter-stable overflow-y-auto scroll-fade pr-1.5 pb-9 pl-5 scroll-fade-9"; + /** The sections on a tab, ruled off from each other. */ const sectionsOn = (properties: IModProperties, tab: ModPropertiesTab) => properties.sections @@ -49,13 +55,13 @@ const sectionsOn = (properties: IModProperties, tab: ModPropertiesTab) => * The selected mods' properties, beside the new Mods table, some of them to change. One mod's are * on two tabs: General, headed by its card, and Advanced, left out while it has nothing. Several * mods show their count and what they can all change, and none an empty state. The tab the user - * picked stays as the selection changes, falling back to General where it's gone. + * picked stays as the selection changes, falling back to General where it's gone; switching tabs + * starts the new one at its top. */ export const ModPropertiesPanel = ({ mods, memberships, registered, - onClose, className, }: IModPropertiesPanelProps) => { const { t } = useTranslation("mod_management"); @@ -72,6 +78,7 @@ export const ModPropertiesPanel = ({ // show them. It's only ever beside the new table. const versions = useExternalDataVersions(detailsOnly, true, values, true); const [picked, setPicked] = useState("general"); + const tabScrollRef = useRef(null); // Each written out, so the strings can be found. const tabLabels: Record = { @@ -86,28 +93,11 @@ export const ModPropertiesPanel = ({ ); const tab = tabs.includes(picked) ? picked : "general"; - const closeButton = ( -
{!!property.hint && (
diff --git a/src/renderer/src/extensions/mod_management/components/mod_property_time/ModPropertyTime.test.tsx b/src/renderer/src/extensions/mod_management/components/mod_property_time/ModPropertyTime.test.tsx index eb31d7787a..7e814269ac 100644 --- a/src/renderer/src/extensions/mod_management/components/mod_property_time/ModPropertyTime.test.tsx +++ b/src/renderer/src/extensions/mod_management/components/mod_property_time/ModPropertyTime.test.tsx @@ -1,4 +1,5 @@ import { act, render, screen } from "@testing-library/react"; +import userEvent from "@testing-library/user-event"; import React from "react"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; @@ -9,15 +10,10 @@ vi.mock("react-redux", () => ({ selector({ settings: { interface: { language: "en" } } }), })); -const renderTime = () => +const renderTime = (timestamp = Date.now() - 10_000) => render( , ); @@ -37,6 +33,21 @@ describe("ModPropertyTime", () => { expect(screen.getByTestId("mod-property-installTime")).toHaveTextContent("seconds ago"); }); + it("shows its full date and time on hover, not as a title", async () => { + // The tooltip places itself on animation frames, which fake timers hold back. + vi.useRealTimers(); + const timestamp = Date.now() - 10_000; + renderTime(timestamp); + const shown = screen.getByTestId("mod-property-installTime").querySelector(".truncate")!; + + expect(shown).not.toHaveAttribute("title"); + await userEvent.hover(shown); + + expect(await screen.findByRole("tooltip")).toHaveTextContent( + new Intl.DateTimeFormat("en", { dateStyle: "medium", timeStyle: "short" }).format(timestamp), + ); + }); + it("ages the time shown", () => { renderTime(); diff --git a/src/renderer/src/extensions/mod_management/components/mod_property_time/ModPropertyTime.tsx b/src/renderer/src/extensions/mod_management/components/mod_property_time/ModPropertyTime.tsx index 39e16ecfc4..f909d8a906 100644 --- a/src/renderer/src/extensions/mod_management/components/mod_property_time/ModPropertyTime.tsx +++ b/src/renderer/src/extensions/mod_management/components/mod_property_time/ModPropertyTime.tsx @@ -1,6 +1,9 @@ import React from "react"; import { useTranslation } from "react-i18next"; +import { useSelector } from "react-redux"; +import type { IState } from "@/types/IState"; +import { Tooltip } from "@/ui/components/tooltip/Tooltip"; import { Typography } from "@/ui/components/typography/Typography"; import { useRelativeTime } from "@/util/useRelativeTime"; @@ -13,23 +16,31 @@ interface IModPropertyTimeProps { /** * A time under its label, as the table's columns show one, relative to now, and ageing as it - * stays on screen. + * stays on screen; its full date and time on hover, as Browse's mod card shows one. */ export const ModPropertyTime = ({ property }: IModPropertyTimeProps) => { const { t } = useTranslation("common"); const text = useRelativeTime(property.timestamp, t); + const language = useSelector((state: IState) => state.settings.interface.language); + const stamp = new Intl.DateTimeFormat(language, { + dateStyle: "medium", + timeStyle: "short", + }).format(property.timestamp); return ( - - {text} - + + + + {text} + + + ); }; diff --git a/src/renderer/src/extensions/mod_management/components/mod_property_url/ModPropertyUrl.test.tsx b/src/renderer/src/extensions/mod_management/components/mod_property_url/ModPropertyUrl.test.tsx index c2b9597ae5..8f6e9cadf2 100644 --- a/src/renderer/src/extensions/mod_management/components/mod_property_url/ModPropertyUrl.test.tsx +++ b/src/renderer/src/extensions/mod_management/components/mod_property_url/ModPropertyUrl.test.tsx @@ -53,6 +53,15 @@ describe("ModPropertyUrl", () => { expect(onSave).not.toHaveBeenCalled(); }); + it("names its open button in a tooltip, not a title", async () => { + render(website(vi.fn(), "https://example.com")); + const open = screen.getByTestId("mod-property-open-website"); + + expect(open).not.toHaveAttribute("title"); + await userEvent.hover(open); + expect(await screen.findByRole("tooltip")).toBeInTheDocument(); + }); + it("opens a valid address in the browser, and nothing else", async () => { const openUrl = vi.fn(); vi.stubGlobal("api", { ...window.api, shell: { openUrl } }); diff --git a/src/renderer/src/extensions/mod_management/components/mod_property_url/ModPropertyUrl.tsx b/src/renderer/src/extensions/mod_management/components/mod_property_url/ModPropertyUrl.tsx index 043b033980..243548aaf2 100644 --- a/src/renderer/src/extensions/mod_management/components/mod_property_url/ModPropertyUrl.tsx +++ b/src/renderer/src/extensions/mod_management/components/mod_property_url/ModPropertyUrl.tsx @@ -3,6 +3,7 @@ import { useTranslation } from "react-i18next"; import { Button } from "@/ui/components/button/Button"; import { TextField } from "@/ui/components/form/text_field/TextField"; +import { Tooltip } from "@/ui/components/tooltip/Tooltip"; import type { ModProperty } from "../../hooks/use_mod_properties/useModProperties.hook"; import { useUnsavedDraft } from "../../hooks/use_unsaved_draft/useUnsavedDraft.hook"; @@ -44,17 +45,19 @@ export const ModPropertyUrl = ({ property }: IModPropertyUrlProps) => { onChange={(event) => change(event.target.value)} /> -
); }; diff --git a/src/renderer/src/extensions/mod_management/components/mod_property_value/ModPropertyValue.test.tsx b/src/renderer/src/extensions/mod_management/components/mod_property_value/ModPropertyValue.test.tsx index ef1238391e..16f74465ce 100644 --- a/src/renderer/src/extensions/mod_management/components/mod_property_value/ModPropertyValue.test.tsx +++ b/src/renderer/src/extensions/mod_management/components/mod_property_value/ModPropertyValue.test.tsx @@ -28,6 +28,15 @@ describe("ModPropertyValue", () => { expect(screen.getByTestId("mod-property-nexusModId")).toHaveTextContent("1234"); }); + it("names its copy button in a tooltip, not a title", async () => { + renderValue(); + const copy = screen.getByTestId("mod-property-copy-nexusModId"); + + expect(copy).not.toHaveAttribute("title"); + await userEvent.hover(copy); + expect(await screen.findByRole("tooltip")).toBeInTheDocument(); + }); + it("offers no copy where it isn't copyable", () => { renderValue(false); diff --git a/src/renderer/src/extensions/mod_management/components/mod_property_value/ModPropertyValue.tsx b/src/renderer/src/extensions/mod_management/components/mod_property_value/ModPropertyValue.tsx index fdb250d952..2b4ec91505 100644 --- a/src/renderer/src/extensions/mod_management/components/mod_property_value/ModPropertyValue.tsx +++ b/src/renderer/src/extensions/mod_management/components/mod_property_value/ModPropertyValue.tsx @@ -3,6 +3,7 @@ import { toast } from "react-hot-toast"; import { useTranslation } from "react-i18next"; import { Button } from "@/ui/components/button/Button"; +import { Tooltip } from "@/ui/components/tooltip/Tooltip"; import { Typography } from "@/ui/components/typography/Typography"; import type { ModProperty } from "../../hooks/use_mod_properties/useModProperties.hook"; @@ -12,7 +13,10 @@ interface IModPropertyValueProps { property: Extract; } -/** A value under its label, in body/SM medium, with a button to copy it where it offers one. */ +/** + * A value under its label, in body/SM medium, wrapping to show it whole, with a button to copy it + * where it offers one. + */ export const ModPropertyValue = ({ property }: IModPropertyValueProps) => { const { t } = useTranslation("mod_management"); @@ -27,23 +31,24 @@ export const ModPropertyValue = ({ property }: IModPropertyValueProps) => { {property.value} {property.copyable && ( -