From 2b366e82c5855176906925b30b3068cb44133bb8 Mon Sep 17 00:00:00 2001 From: R Midhun Suresh Date: Thu, 31 Jul 2025 15:26:24 +0530 Subject: [PATCH] Rename `TextualEvent` to `TextualEventView` --- ...Event.stories.tsx => TextualEventView.stories.tsx} | 4 ++-- ...extualEvent.test.tsx => TextualEventView.test.tsx} | 4 ++-- .../{TextualEvent.tsx => TextualEventView.tsx} | 11 ++++++----- ...t.test.tsx.snap => TextualEventView.test.tsx.snap} | 0 .../event-tiles/TextualEvent/index.ts | 2 +- src/viewmodels/event-tiles/TextualEventViewModel.ts | 8 ++++---- 6 files changed, 15 insertions(+), 14 deletions(-) rename src/shared-components/event-tiles/TextualEvent/{TextualEvent.stories.tsx => TextualEventView.stories.tsx} (80%) rename src/shared-components/event-tiles/TextualEvent/{TextualEvent.test.tsx => TextualEventView.test.tsx} (84%) rename src/shared-components/event-tiles/TextualEvent/{TextualEvent.tsx => TextualEventView.tsx} (63%) rename src/shared-components/event-tiles/TextualEvent/__snapshots__/{TextualEvent.test.tsx.snap => TextualEventView.test.tsx.snap} (100%) diff --git a/src/shared-components/event-tiles/TextualEvent/TextualEvent.stories.tsx b/src/shared-components/event-tiles/TextualEvent/TextualEventView.stories.tsx similarity index 80% rename from src/shared-components/event-tiles/TextualEvent/TextualEvent.stories.tsx rename to src/shared-components/event-tiles/TextualEvent/TextualEventView.stories.tsx index 1746bc14b2..836641a84c 100644 --- a/src/shared-components/event-tiles/TextualEvent/TextualEvent.stories.tsx +++ b/src/shared-components/event-tiles/TextualEvent/TextualEventView.stories.tsx @@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details. import React from "react"; import { type Meta, type StoryFn } from "@storybook/react-vite"; -import { TextualEvent as TextualEventComponent } from "./TextualEvent"; +import { TextualEventView as TextualEventComponent } from "./TextualEventView"; import { MockViewModel } from "../../MockViewModel"; export default { @@ -16,7 +16,7 @@ export default { component: TextualEventComponent, tags: ["autodocs"], args: { - vm: new MockViewModel("Dummy textual event text"), + vm: new MockViewModel({ content: "Dummy textual event text" }), }, } as Meta; diff --git a/src/shared-components/event-tiles/TextualEvent/TextualEvent.test.tsx b/src/shared-components/event-tiles/TextualEvent/TextualEventView.test.tsx similarity index 84% rename from src/shared-components/event-tiles/TextualEvent/TextualEvent.test.tsx rename to src/shared-components/event-tiles/TextualEvent/TextualEventView.test.tsx index b1ef5e8f52..5d2dd912ef 100644 --- a/src/shared-components/event-tiles/TextualEvent/TextualEvent.test.tsx +++ b/src/shared-components/event-tiles/TextualEvent/TextualEventView.test.tsx @@ -9,11 +9,11 @@ import { composeStories } from "@storybook/react-vite"; import { render } from "jest-matrix-react"; import React from "react"; -import * as stories from "./TextualEvent.stories.tsx"; +import * as stories from "./TextualEventView.stories.tsx"; const { Default } = composeStories(stories); -describe("TextualEvent", () => { +describe("TextualEventView", () => { it("renders a textual event", () => { const { container } = render(); expect(container).toMatchSnapshot(); diff --git a/src/shared-components/event-tiles/TextualEvent/TextualEvent.tsx b/src/shared-components/event-tiles/TextualEvent/TextualEventView.tsx similarity index 63% rename from src/shared-components/event-tiles/TextualEvent/TextualEvent.tsx rename to src/shared-components/event-tiles/TextualEvent/TextualEventView.tsx index 1dec80905e..fa18a4c599 100644 --- a/src/shared-components/event-tiles/TextualEvent/TextualEvent.tsx +++ b/src/shared-components/event-tiles/TextualEvent/TextualEventView.tsx @@ -10,14 +10,15 @@ import React, { type ReactNode, type JSX } from "react"; import { type ViewModel } from "../../ViewModel"; import { useViewModel } from "../../useViewModel"; -export type TextualEventViewSnapshot = string | ReactNode; +export type TextualEventViewSnapshot = { + content: string | ReactNode; +}; export interface Props { vm: ViewModel; } -export function TextualEvent({ vm }: Props): JSX.Element { - const contents = useViewModel(vm); - - return
{contents}
; +export function TextualEventView({ vm }: Props): JSX.Element { + const snapshot = useViewModel(vm); + return
{snapshot.content}
; } diff --git a/src/shared-components/event-tiles/TextualEvent/__snapshots__/TextualEvent.test.tsx.snap b/src/shared-components/event-tiles/TextualEvent/__snapshots__/TextualEventView.test.tsx.snap similarity index 100% rename from src/shared-components/event-tiles/TextualEvent/__snapshots__/TextualEvent.test.tsx.snap rename to src/shared-components/event-tiles/TextualEvent/__snapshots__/TextualEventView.test.tsx.snap diff --git a/src/shared-components/event-tiles/TextualEvent/index.ts b/src/shared-components/event-tiles/TextualEvent/index.ts index 96f257fbfa..58796a3dd7 100644 --- a/src/shared-components/event-tiles/TextualEvent/index.ts +++ b/src/shared-components/event-tiles/TextualEvent/index.ts @@ -5,4 +5,4 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -export { TextualEvent } from "./TextualEvent"; +export { TextualEventView } from "./TextualEventView"; diff --git a/src/viewmodels/event-tiles/TextualEventViewModel.ts b/src/viewmodels/event-tiles/TextualEventViewModel.ts index a9fd64c60d..e3f6184f7e 100644 --- a/src/viewmodels/event-tiles/TextualEventViewModel.ts +++ b/src/viewmodels/event-tiles/TextualEventViewModel.ts @@ -10,18 +10,18 @@ import { MatrixEventEvent } from "matrix-js-sdk/src/matrix"; import { type EventTileTypeProps } from "../../events/EventTileFactory"; import { MatrixClientPeg } from "../../MatrixClientPeg"; import { textForEvent } from "../../TextForEvent"; -import { type TextualEventViewSnapshot } from "../../shared-components/event-tiles/TextualEvent/TextualEvent"; +import { type TextualEventViewSnapshot } from "../../shared-components/event-tiles/TextualEvent/TextualEventView"; import { BaseViewModel } from "../base/BaseViewModel"; export class TextualEventViewModel extends BaseViewModel { public constructor(props: EventTileTypeProps) { - super(props, ""); + super(props, { content: "" }); this.setTextFromEvent(); } private setTextFromEvent = (): void => { - const text = textForEvent(this.props.mxEvent, MatrixClientPeg.safeGet(), true, this.props.showHiddenEvents); - this.snapshot.set(text); + const content = textForEvent(this.props.mxEvent, MatrixClientPeg.safeGet(), true, this.props.showHiddenEvents); + this.snapshot.set({ content }); }; protected addDownstreamSubscription = (): void => {