From 11fd669c26b509231860d909053d88b95bdaf65e Mon Sep 17 00:00:00 2001 From: Zack Date: Tue, 7 Apr 2026 08:38:24 +0200 Subject: [PATCH] Move shared message body views into event-tile layout (#33015) * Move shared message body views into event-tile layout * Move shared message body visual baselines --- .../EventContentBody.stories.tsx/as-span-auto.png | Bin .../EventContentBody.stories.tsx/big-emoji-auto.png | Bin .../code-block-auto.png | Bin .../html-content-auto.png | Bin .../plain-text-auto.png | Bin .../with-highlight-auto.png | Bin .../FileBodyView.stories.tsx/audio-info-auto.png | Bin .../decryption-pending-download-auto.png | Bin .../FileBodyView.stories.tsx/default-auto.png | Bin .../encrypted-iframe-download-auto.png | Bin .../FileBodyView.stories.tsx/export-auto.png | Bin .../FileBodyView.stories.tsx/invalid-auto.png | Bin .../long-filename-download-auto.png | Bin .../long-filename-info-auto.png | Bin .../unencrypted-download-auto.png | Bin .../FileBodyView.stories.tsx/video-info-auto.png | Bin .../RedactedBodyView.stories.tsx/default-auto.png | Bin .../redacted-by-another-user-auto.png | Bin .../self-redaction-auto.png | Bin packages/shared-components/src/index.ts | 6 +++--- .../event-tile/body/EventContentBodyView/.gitkeep | 1 - .../EventContentBody.module.css | 0 .../EventContentBody.stories.tsx | 4 ++-- .../EventContentBodyView}/EventContentBody.test.tsx | 0 .../EventContentBodyView}/EventContentBodyView.tsx | 4 ++-- .../__snapshots__/EventContentBody.test.tsx.snap | 0 .../event-tile/body/EventContentBodyView}/index.tsx | 0 .../timeline/event-tile/body/MFileBodyView/.gitkeep | 1 - .../body/MFileBodyView}/FileBodyView.module.css | 0 .../body/MFileBodyView}/FileBodyView.stories.tsx | 4 ++-- .../body/MFileBodyView}/FileBodyView.test.tsx | 6 +++--- .../event-tile/body/MFileBodyView}/FileBodyView.tsx | 8 ++++---- .../__snapshots__/FileBodyView.test.tsx.snap | 0 .../event-tile/body/MFileBodyView}/index.tsx | 0 .../event-tile/body/RedactedBodyView/.gitkeep | 1 - .../RedactedBodyView/RedactedBodyView.module.css | 0 .../RedactedBodyView/RedactedBodyView.stories.tsx | 4 ++-- .../RedactedBodyView/RedactedBodyView.test.tsx | 2 +- .../body}/RedactedBodyView/RedactedBodyView.tsx | 4 ++-- .../__snapshots__/RedactedBodyView.test.tsx.snap | 0 .../event-tile/body}/RedactedBodyView/index.tsx | 0 41 files changed, 21 insertions(+), 24 deletions(-) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/EventContentBody => room/timeline/event-tile/body/EventContentBodyView}/EventContentBody.stories.tsx/as-span-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/EventContentBody => room/timeline/event-tile/body/EventContentBodyView}/EventContentBody.stories.tsx/big-emoji-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/EventContentBody => room/timeline/event-tile/body/EventContentBodyView}/EventContentBody.stories.tsx/code-block-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/EventContentBody => room/timeline/event-tile/body/EventContentBodyView}/EventContentBody.stories.tsx/html-content-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/EventContentBody => room/timeline/event-tile/body/EventContentBodyView}/EventContentBody.stories.tsx/plain-text-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/EventContentBody => room/timeline/event-tile/body/EventContentBodyView}/EventContentBody.stories.tsx/with-highlight-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.stories.tsx/audio-info-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.stories.tsx/decryption-pending-download-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.stories.tsx/encrypted-iframe-download-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.stories.tsx/export-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.stories.tsx/invalid-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.stories.tsx/long-filename-download-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.stories.tsx/long-filename-info-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.stories.tsx/unencrypted-download-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.stories.tsx/video-info-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/body}/RedactedBodyView/RedactedBodyView.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/body}/RedactedBodyView/RedactedBodyView.stories.tsx/redacted-by-another-user-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/body}/RedactedBodyView/RedactedBodyView.stories.tsx/self-redaction-auto.png (100%) delete mode 100644 packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/.gitkeep rename packages/shared-components/src/{message-body/EventContentBody => room/timeline/event-tile/body/EventContentBodyView}/EventContentBody.module.css (100%) rename packages/shared-components/src/{message-body/EventContentBody => room/timeline/event-tile/body/EventContentBodyView}/EventContentBody.stories.tsx (94%) rename packages/shared-components/src/{message-body/EventContentBody => room/timeline/event-tile/body/EventContentBodyView}/EventContentBody.test.tsx (100%) rename packages/shared-components/src/{message-body/EventContentBody => room/timeline/event-tile/body/EventContentBodyView}/EventContentBodyView.tsx (95%) rename packages/shared-components/src/{message-body/EventContentBody => room/timeline/event-tile/body/EventContentBodyView}/__snapshots__/EventContentBody.test.tsx.snap (100%) rename packages/shared-components/src/{message-body/EventContentBody => room/timeline/event-tile/body/EventContentBodyView}/index.tsx (100%) delete mode 100644 packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/.gitkeep rename packages/shared-components/src/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.module.css (100%) rename packages/shared-components/src/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.stories.tsx (96%) rename packages/shared-components/src/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.test.tsx (98%) rename packages/shared-components/src/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/FileBodyView.tsx (97%) rename packages/shared-components/src/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/__snapshots__/FileBodyView.test.tsx.snap (100%) rename packages/shared-components/src/{message-body/FileBodyView => room/timeline/event-tile/body/MFileBodyView}/index.tsx (100%) delete mode 100644 packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/.gitkeep rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/RedactedBodyView/RedactedBodyView.module.css (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/RedactedBodyView/RedactedBodyView.stories.tsx (92%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/RedactedBodyView/RedactedBodyView.test.tsx (97%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/RedactedBodyView/RedactedBodyView.tsx (92%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/RedactedBodyView/__snapshots__/RedactedBodyView.test.tsx.snap (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/RedactedBodyView/index.tsx (100%) diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/EventContentBody/EventContentBody.stories.tsx/as-span-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx/as-span-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/EventContentBody/EventContentBody.stories.tsx/as-span-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx/as-span-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/EventContentBody/EventContentBody.stories.tsx/big-emoji-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx/big-emoji-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/EventContentBody/EventContentBody.stories.tsx/big-emoji-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx/big-emoji-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/EventContentBody/EventContentBody.stories.tsx/code-block-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx/code-block-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/EventContentBody/EventContentBody.stories.tsx/code-block-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx/code-block-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/EventContentBody/EventContentBody.stories.tsx/html-content-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx/html-content-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/EventContentBody/EventContentBody.stories.tsx/html-content-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx/html-content-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/EventContentBody/EventContentBody.stories.tsx/plain-text-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx/plain-text-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/EventContentBody/EventContentBody.stories.tsx/plain-text-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx/plain-text-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/EventContentBody/EventContentBody.stories.tsx/with-highlight-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx/with-highlight-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/EventContentBody/EventContentBody.stories.tsx/with-highlight-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx/with-highlight-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/audio-info-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/audio-info-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/audio-info-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/audio-info-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/decryption-pending-download-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/decryption-pending-download-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/decryption-pending-download-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/decryption-pending-download-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/encrypted-iframe-download-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/encrypted-iframe-download-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/encrypted-iframe-download-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/encrypted-iframe-download-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/export-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/export-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/export-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/export-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/invalid-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/invalid-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/invalid-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/invalid-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/long-filename-download-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/long-filename-download-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/long-filename-download-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/long-filename-download-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/long-filename-info-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/long-filename-info-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/long-filename-info-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/long-filename-info-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/unencrypted-download-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/unencrypted-download-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/unencrypted-download-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/unencrypted-download-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/video-info-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/video-info-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/FileBodyView/FileBodyView.stories.tsx/video-info-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/video-info-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/RedactedBodyView/RedactedBodyView.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/RedactedBodyView/RedactedBodyView.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/RedactedBodyView/RedactedBodyView.stories.tsx/redacted-by-another-user-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.stories.tsx/redacted-by-another-user-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/RedactedBodyView/RedactedBodyView.stories.tsx/redacted-by-another-user-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.stories.tsx/redacted-by-another-user-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/RedactedBodyView/RedactedBodyView.stories.tsx/self-redaction-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.stories.tsx/self-redaction-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/RedactedBodyView/RedactedBodyView.stories.tsx/self-redaction-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.stories.tsx/self-redaction-auto.png diff --git a/packages/shared-components/src/index.ts b/packages/shared-components/src/index.ts index 913fcc538e..9b824a5a65 100644 --- a/packages/shared-components/src/index.ts +++ b/packages/shared-components/src/index.ts @@ -13,9 +13,9 @@ export * from "./core/avatar/AvatarWithDetails"; export * from "./composer/Banner"; export * from "./crypto/SasEmoji"; export * from "./event-tiles/UrlPreviewGroupView"; -export * from "./message-body/EventContentBody"; -export * from "./message-body/RedactedBodyView"; -export * from "./message-body/FileBodyView"; +export * from "./room/timeline/event-tile/body/EventContentBodyView"; +export * from "./room/timeline/event-tile/body/RedactedBodyView"; +export * from "./room/timeline/event-tile/body/MFileBodyView"; export * from "./room/timeline/event-tile/body/MVideoBodyView"; export * from "./core/pill-input/Pill"; export * from "./core/pill-input/PillInput"; diff --git a/packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/.gitkeep b/packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/.gitkeep deleted file mode 100644 index 8b13789179..0000000000 --- a/packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/packages/shared-components/src/message-body/EventContentBody/EventContentBody.module.css b/packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.module.css similarity index 100% rename from packages/shared-components/src/message-body/EventContentBody/EventContentBody.module.css rename to packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.module.css diff --git a/packages/shared-components/src/message-body/EventContentBody/EventContentBody.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx similarity index 94% rename from packages/shared-components/src/message-body/EventContentBody/EventContentBody.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx index d5db9ebd2c..347b55689d 100644 --- a/packages/shared-components/src/message-body/EventContentBody/EventContentBody.stories.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.stories.tsx @@ -8,10 +8,10 @@ Please see LICENSE files in the repository root for full details. import React, { type JSX } from "react"; import type { Meta, StoryObj } from "@storybook/react-vite"; -import { useMockedViewModel } from "../../core/viewmodel/useMockedViewModel"; +import { useMockedViewModel } from "../../../../../core/viewmodel/useMockedViewModel"; import { EventContentBodyView, type EventContentBodyViewSnapshot } from "./EventContentBodyView"; import styles from "./EventContentBody.module.css"; -import { withViewDocs } from "../../../.storybook/withViewDocs"; +import { withViewDocs } from "../../../../../../.storybook/withViewDocs"; type EventContentBodyStoryProps = EventContentBodyViewSnapshot & { as: "div" | "span"; diff --git a/packages/shared-components/src/message-body/EventContentBody/EventContentBody.test.tsx b/packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.test.tsx similarity index 100% rename from packages/shared-components/src/message-body/EventContentBody/EventContentBody.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/EventContentBody.test.tsx diff --git a/packages/shared-components/src/message-body/EventContentBody/EventContentBodyView.tsx b/packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/EventContentBodyView.tsx similarity index 95% rename from packages/shared-components/src/message-body/EventContentBody/EventContentBodyView.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/EventContentBodyView.tsx index 82460ce8d1..dd84f3d871 100644 --- a/packages/shared-components/src/message-body/EventContentBody/EventContentBodyView.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/EventContentBodyView.tsx @@ -8,8 +8,8 @@ Please see LICENSE files in the repository root for full details. import React, { type JSX, memo, type Ref } from "react"; import parse, { type HTMLReactParserOptions } from "html-react-parser"; -import { type ViewModel, useViewModel } from "../../core/viewmodel"; -import { applyReplacerOnString } from "../../core/utils/applyReplacerOnString"; +import { type ViewModel, useViewModel } from "../../../../../core/viewmodel"; +import { applyReplacerOnString } from "../../../../../core/utils/applyReplacerOnString"; type Replacer = HTMLReactParserOptions["replace"]; type ParseFormattedBody = (formattedBody: string, replacer?: Replacer) => ReturnType; diff --git a/packages/shared-components/src/message-body/EventContentBody/__snapshots__/EventContentBody.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/__snapshots__/EventContentBody.test.tsx.snap similarity index 100% rename from packages/shared-components/src/message-body/EventContentBody/__snapshots__/EventContentBody.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/__snapshots__/EventContentBody.test.tsx.snap diff --git a/packages/shared-components/src/message-body/EventContentBody/index.tsx b/packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/index.tsx similarity index 100% rename from packages/shared-components/src/message-body/EventContentBody/index.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/index.tsx diff --git a/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/.gitkeep b/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/.gitkeep deleted file mode 100644 index 8b13789179..0000000000 --- a/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.module.css b/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.module.css similarity index 100% rename from packages/shared-components/src/message-body/FileBodyView/FileBodyView.module.css rename to packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.module.css diff --git a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx similarity index 96% rename from packages/shared-components/src/message-body/FileBodyView/FileBodyView.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx index 16713caba7..12a5ff5df7 100644 --- a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.stories.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx @@ -16,8 +16,8 @@ import { type FileBodyViewActions, type FileBodyViewSnapshot, } from "./FileBodyView"; -import { useMockedViewModel } from "../../core/viewmodel/useMockedViewModel"; -import { withViewDocs } from "../../../.storybook/withViewDocs"; +import { useMockedViewModel } from "../../../../../core/viewmodel/useMockedViewModel"; +import { withViewDocs } from "../../../../../../.storybook/withViewDocs"; type FileBodyViewProps = FileBodyViewSnapshot & FileBodyViewActions; diff --git a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.test.tsx b/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.test.tsx similarity index 98% rename from packages/shared-components/src/message-body/FileBodyView/FileBodyView.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.test.tsx index 47640b04ff..1fbd2a21c9 100644 --- a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.test.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.test.tsx @@ -11,9 +11,9 @@ import { fireEvent, render, screen } from "@test-utils"; import { describe, it, expect, vi } from "vitest"; import { FileBodyView, FileBodyViewState, type FileBodyViewActions, type FileBodyViewSnapshot } from "./FileBodyView"; -import { MockViewModel } from "../../core/viewmodel/MockViewModel"; -import { I18nApi } from "../../index"; -import { I18nContext } from "../../core/i18n/i18nContext"; +import { MockViewModel } from "../../../../../core/viewmodel/MockViewModel"; +import { I18nApi } from "../../../../../index"; +import { I18nContext } from "../../../../../core/i18n/i18nContext"; import * as stories from "./FileBodyView.stories"; const renderWithI18n = (ui: React.ReactElement): ReturnType => diff --git a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.tsx b/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.tsx similarity index 97% rename from packages/shared-components/src/message-body/FileBodyView/FileBodyView.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.tsx index ca514512ea..e62c976bc0 100644 --- a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.tsx @@ -16,10 +16,10 @@ import { } from "@vector-im/compound-design-tokens/assets/web/icons"; import styles from "./FileBodyView.module.css"; -import { type ViewModel } from "../../core/viewmodel/ViewModel"; -import { useViewModel } from "../../core/viewmodel/useViewModel"; -import { useI18n } from "../../core/i18n/i18nContext"; -import { MediaBody } from "../../room/timeline/event-tile/body/MediaBody"; +import { type ViewModel } from "../../../../../core/viewmodel/ViewModel"; +import { useViewModel } from "../../../../../core/viewmodel/useViewModel"; +import { useI18n } from "../../../../../core/i18n/i18nContext"; +import { MediaBody } from "../MediaBody"; /** * Which visual state to render for the component. diff --git a/packages/shared-components/src/message-body/FileBodyView/__snapshots__/FileBodyView.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/__snapshots__/FileBodyView.test.tsx.snap similarity index 100% rename from packages/shared-components/src/message-body/FileBodyView/__snapshots__/FileBodyView.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/__snapshots__/FileBodyView.test.tsx.snap diff --git a/packages/shared-components/src/message-body/FileBodyView/index.tsx b/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/index.tsx similarity index 100% rename from packages/shared-components/src/message-body/FileBodyView/index.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/index.tsx diff --git a/packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/.gitkeep b/packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/.gitkeep deleted file mode 100644 index 8b13789179..0000000000 --- a/packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.module.css b/packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.module.css similarity index 100% rename from packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.module.css rename to packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.module.css diff --git a/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.stories.tsx similarity index 92% rename from packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.stories.tsx index 04a148fddc..5dda5f50f6 100644 --- a/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.stories.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.stories.tsx @@ -9,8 +9,8 @@ import React, { type JSX } from "react"; import { expect, userEvent, within } from "storybook/test"; import type { Meta, StoryObj } from "@storybook/react-vite"; -import { useMockedViewModel } from "../../core/viewmodel"; -import { withViewDocs } from "../../../.storybook/withViewDocs"; +import { useMockedViewModel } from "../../../../../core/viewmodel"; +import { withViewDocs } from "../../../../../../.storybook/withViewDocs"; import { RedactedBodyView, type RedactedBodyViewSnapshot } from "./RedactedBodyView"; type RedactedBodyProps = RedactedBodyViewSnapshot; diff --git a/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.test.tsx b/packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.test.tsx similarity index 97% rename from packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.test.tsx index 84b08ed1f8..582fb3c235 100644 --- a/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.test.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.test.tsx @@ -11,7 +11,7 @@ import React from "react"; import userEvent from "@testing-library/user-event"; import { describe, expect, it } from "vitest"; -import { MockViewModel } from "../../core/viewmodel"; +import { MockViewModel } from "../../../../../core/viewmodel"; import { RedactedBodyView, type RedactedBodyViewModel, type RedactedBodyViewSnapshot } from "./RedactedBodyView"; import * as stories from "./RedactedBodyView.stories"; diff --git a/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.tsx b/packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.tsx similarity index 92% rename from packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.tsx index d4dae18765..7d4b7b0f64 100644 --- a/packages/shared-components/src/message-body/RedactedBodyView/RedactedBodyView.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/RedactedBodyView.tsx @@ -10,8 +10,8 @@ import classNames from "classnames"; import { DeleteIcon } from "@vector-im/compound-design-tokens/assets/web/icons"; import { Tooltip } from "@vector-im/compound-web"; -import { type ViewModel } from "../../core/viewmodel"; -import { useViewModel } from "../../core/viewmodel/useViewModel"; +import { type ViewModel } from "../../../../../core/viewmodel"; +import { useViewModel } from "../../../../../core/viewmodel/useViewModel"; import styles from "./RedactedBodyView.module.css"; export interface RedactedBodyViewSnapshot { diff --git a/packages/shared-components/src/message-body/RedactedBodyView/__snapshots__/RedactedBodyView.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/__snapshots__/RedactedBodyView.test.tsx.snap similarity index 100% rename from packages/shared-components/src/message-body/RedactedBodyView/__snapshots__/RedactedBodyView.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/__snapshots__/RedactedBodyView.test.tsx.snap diff --git a/packages/shared-components/src/message-body/RedactedBodyView/index.tsx b/packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/index.tsx similarity index 100% rename from packages/shared-components/src/message-body/RedactedBodyView/index.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/index.tsx