From dda9ec061b2610c580c3670b079f6c021f925279 Mon Sep 17 00:00:00 2001 From: Zack Date: Mon, 30 Mar 2026 17:15:21 +0200 Subject: [PATCH] Shared Components Restructure, Cherry Picked | Room Timeline (#32916) * refactor(shared-components): move room timeline tree * refactor(web): move room timeline viewmodels * Prettier FIx * fix(refactor): align newer imports with room timeline paths * test(shared-components): add room timeline visual baselines * test(shared-components): drop stale timeline baseline paths --- .../components/structures/MessagePanel.tsx | 2 +- .../src/components/structures/RoomView.tsx | 2 +- .../structures/grouper/CreationGrouper.tsx | 2 +- .../structures/grouper/MainGrouper.tsx | 2 +- .../dialogs/MessageEditHistoryDialog.tsx | 2 +- .../components/views/elements/ImageView.tsx | 2 +- .../components/views/messages/MAudioBody.tsx | 2 +- .../views/messages/MBodyFactory.tsx | 2 +- .../views/messages/SenderProfile.tsx | 2 +- .../src/components/views/rooms/EventTile.tsx | 9 ++++-- .../MemberList/tiles/RoomMemberTileView.tsx | 2 +- .../views/rooms/SearchResultTile.tsx | 2 +- apps/web/src/events/EventTileFactory.tsx | 4 +-- apps/web/src/utils/exportUtils/HtmlExport.tsx | 2 +- .../timeline/DateSeparatorViewModel.tsx | 26 ++++++++-------- .../DisambiguatedProfileViewModel.ts | 6 ++-- .../event-tile}/EncryptionEventViewModel.ts | 10 +++---- .../event-tile}/TextualEventViewModel.ts | 6 ++-- .../event-tile/body}/AudioPlayerViewModel.ts | 8 ++--- .../body}/DecryptionFailureBodyViewModel.ts | 0 .../ReactionsRowButtonTooltipViewModel.ts | 6 ++-- .../reactions}/ReactionsRowButtonViewModel.ts | 8 ++--- .../reactions}/ReactionsRowViewModel.ts | 2 +- .../reactions}/reactionShortcode.ts | 0 .../timestamp}/MessageTimestampViewModel.ts | 4 +-- .../audio/AudioPlayerViewModel-test.tsx | 2 +- .../EncryptionEventViewModel-test.ts | 2 +- .../event-tiles/TextualEventViewModel-test.ts | 2 +- .../DecryptionFailureBodyViewModel-test.tsx | 2 +- .../MessageTimestampViewModel-test.tsx | 2 +- ...eactionsRowButtonTooltipViewModel-test.tsx | 2 +- .../ReactionsRowButtonViewModel-test.tsx | 4 +-- .../ReactionsRowViewModel-test.tsx | 2 +- .../DisambiguatedProfileViewModel-test.tsx | 2 +- .../timeline/DateSeparatorViewModel-test.tsx | 2 +- .../default-auto.png | Bin .../has-extra-class-names-auto.png | Bin .../long-localized-label-auto.png | Bin .../with-jump-to-date-picker-auto.png | Bin .../with-jump-to-tooltip-auto.png | Bin .../default-auto.png | Bin .../with-date-event-auto.png | Bin .../with-html-child-auto.png | Bin .../with-late-event-auto.png | Bin .../without-children-auto.png | Bin .../default-auto.png | Bin .../emphasized-auto.png | Bin .../full-example-auto.png | Bin .../with-color-class-auto.png | Bin .../with-mxid-auto.png | Bin .../with-tooltip-auto.png | Bin .../default-auto.png | Bin .../disable-attempt-auto.png | Bin .../enabled-direct-message-auto.png | Bin .../enabled-local-room-auto.png | Bin .../parameters-changed-auto.png | Bin .../state-encryption-enabled-auto.png | Bin .../unsupported-auto.png | Bin .../with-timestamp-auto.png | Bin .../default-auto.png | Bin .../has-children-auto.png | Bin .../has-lock-solid-icon-auto.png | Bin .../is-crypto-event-bubble-auto.png | Bin .../default-auto.png | Bin .../default-auto.png | Bin .../default-auto.png | Bin .../has-error-auto.png | Bin .../no-media-name-auto.png | Bin .../no-size-auto.png | Bin .../default-auto.png | Bin ...-backup-configured-verified-false-auto.png | Bin ...s-backup-configured-verified-true-auto.png | Bin .../has-error-block-icon-auto.png | Bin .../has-error-class-name-auto.png | Bin .../MediaBody.stories.tsx/default-auto.png | Bin .../add-reaction-button-active-auto.png | Bin ...eaction-button-hidden-until-hover-auto.png | Bin .../ReactionsRow.stories.tsx/default-auto.png | Bin .../ReactionsRow.stories.tsx/hidden-auto.png | Bin .../with-show-all-button-auto.png | Bin .../default-auto.png | Bin .../selected-auto.png | Bin .../with-tooltip-auto.png | Bin .../default-auto.png | Bin .../many-senders-auto.png | Bin .../no-tooltip-auto.png | Bin .../without-caption-auto.png | Bin .../default-auto.png | Bin .../has-actions-auto.png | Bin .../has-href-auto.png | Bin .../has-inhibit-tooltip-auto.png | Bin .../has-ts-received-at-auto.png | Bin packages/shared-components/src/index.ts | 28 +++++++++--------- .../FileBodyView/FileBodyView.tsx | 2 +- .../DateSeparatorView/DateSeparatorButton.tsx | 4 +-- .../DateSeparatorContextMenuView.module.css | 0 .../DateSeparatorContextMenuView.test.tsx | 0 .../DateSeparatorContextMenuView.tsx | 4 +-- .../DateSeparatorDatePickerView.module.css | 0 .../DateSeparatorDatePickerView.tsx | 6 ++-- .../DateSeparatorView.module.css | 0 .../DateSeparatorView.stories.tsx | 4 +-- .../DateSeparatorView.test.tsx | 2 +- .../DateSeparatorView/DateSeparatorView.tsx | 8 ++--- .../DateSeparatorView.test.tsx.snap | 0 .../timeline/DateSeparatorView/index.ts | 0 .../src/room/timeline/ReadMarkerView/.gitkeep | 1 + .../TimelineSeparator.module.css | 0 .../TimelineSeparator.stories.tsx | 0 .../TimelineSeparator.test.tsx | 0 .../TimelineSeparator/TimelineSeparator.tsx | 2 +- .../TimelineSeparator.test.tsx.snap | 0 .../timeline}/TimelineSeparator/index.ts | 0 .../src/room/timeline/TimelineView/.gitkeep | 1 + .../DisambiguatedProfile.module.css | 0 .../DisambiguatedProfile.stories.tsx | 4 +-- .../DisambiguatedProfile.test.tsx | 2 +- .../DisambiguatedProfileView.tsx | 2 +- .../DisambiguatedProfile.test.tsx.snap | 0 .../DisambiguatedProfile/index.tsx | 0 .../EncryptionEventView.module.css | 0 .../EncryptionEventView.stories.tsx | 4 +-- .../EncryptionEventView.test.tsx | 2 +- .../EncryptionEventView.tsx | 4 +-- .../EncryptionEventView.test.tsx.snap | 0 .../EncryptionEventView/index.ts | 0 .../EventTileBubble.module.css | 0 .../EventTileBubble.stories.tsx | 0 .../EventTileBubble/EventTileBubble.test.tsx | 0 .../EventTileBubble/EventTileBubble.tsx | 0 .../EventTileBubble.test.tsx.snap | 0 .../EventTileView}/EventTileBubble/index.ts | 0 .../PinnedMessageBadge.module.css | 0 .../PinnedMessageBadge.stories.tsx | 0 .../PinnedMessageBadge.test.tsx | 0 .../PinnedMessageBadge/PinnedMessageBadge.tsx | 2 +- .../PinnedMessageBadge.test.tsx.snap | 0 .../PinnedMessageBadge/index.tsx | 0 .../EventTileView/SenderProfileView/.gitkeep | 1 + .../TextualEventView.stories.tsx | 2 +- .../TextualEventView.test.tsx | 0 .../TextualEventView/TextualEventView.tsx | 2 +- .../TextualEventView.test.tsx.snap | 0 .../EventTileView}/TextualEventView/index.ts | 0 .../EventTileView/TileErrorBoundary/.gitkeep | 1 + .../AudioPlayerView.module.css | 0 .../AudioPlayerView.stories.tsx | 4 +-- .../AudioPlayerView/AudioPlayerView.test.tsx | 6 ++-- .../body}/AudioPlayerView/AudioPlayerView.tsx | 18 +++++------ .../AudioPlayerView.test.tsx.snap | 0 .../event-tile/body}/AudioPlayerView/index.ts | 0 .../DecryptionFailureBodyView.module.css | 0 .../DecryptionFailureBodyView.stories.tsx | 4 +-- .../DecryptionFailureBodyView.test.tsx | 2 +- .../DecryptionFailureBodyView.tsx | 6 ++-- .../DecryptionFailureBodyView.test.tsx.snap | 0 .../body}/DecryptionFailureBodyView/index.tsx | 0 .../body/EventContentBodyView/.gitkeep | 1 + .../event-tile/body/MFileBodyView/.gitkeep | 1 + .../event-tile/body/MImageBodyView/.gitkeep | 1 + .../event-tile/body/MVideoBodyView/.gitkeep | 1 + .../body}/MediaBody/MediaBody.module.css | 0 .../body}/MediaBody/MediaBody.stories.tsx | 0 .../body}/MediaBody/MediaBody.test.tsx | 0 .../event-tile/body}/MediaBody/MediaBody.tsx | 0 .../__snapshots__/MediaBody.test.tsx.snap | 0 .../event-tile/body}/MediaBody/index.tsx | 0 .../event-tile/body/RedactedBodyView/.gitkeep | 1 + .../event-tile/body/TextualBodyView/.gitkeep | 1 + .../ReactionsRow/ReactionsRow.module.css | 0 .../ReactionsRow/ReactionsRow.stories.tsx | 2 +- .../ReactionsRow/ReactionsRow.test.tsx | 2 +- .../ReactionsRow/ReactionsRowView.tsx | 2 +- .../__snapshots__/ReactionsRow.test.tsx.snap | 0 .../reactions}/ReactionsRow/index.tsx | 0 .../ReactionsRowButton.module.css | 0 .../ReactionsRowButton.stories.tsx | 2 +- .../ReactionsRowButton.test.tsx | 0 .../ReactionsRowButtonView.tsx | 2 +- .../ReactionsRowButton.test.tsx.snap | 0 .../reactions}/ReactionsRowButton/index.tsx | 0 .../ReactionsRowButtonTooltip.stories.tsx | 4 +-- .../ReactionsRowButtonTooltip.test.tsx | 0 .../ReactionsRowButtonTooltipView.tsx | 2 +- .../ReactionsRowButtonTooltip.test.tsx.snap | 0 .../ReactionsRowButtonTooltip/index.tsx | 0 .../MessageTimestampView.module.css | 0 .../MessageTimestampView.stories.tsx | 4 +-- .../MessageTimestampView.test.tsx | 6 ++-- .../MessageTimestampView.tsx | 6 ++-- .../MessageTimestampView.test.tsx.snap | 0 .../timestamp}/MessageTimestampView/index.tsx | 0 192 files changed, 157 insertions(+), 144 deletions(-) rename apps/web/src/viewmodels/{ => room}/timeline/DateSeparatorViewModel.tsx (93%) rename apps/web/src/viewmodels/{profile => room/timeline/event-tile}/DisambiguatedProfileViewModel.ts (95%) rename apps/web/src/viewmodels/{event-tiles => room/timeline/event-tile}/EncryptionEventViewModel.ts (93%) rename apps/web/src/viewmodels/{event-tiles => room/timeline/event-tile}/TextualEventViewModel.ts (82%) rename apps/web/src/viewmodels/{audio => room/timeline/event-tile/body}/AudioPlayerViewModel.ts (94%) rename apps/web/src/viewmodels/{message-body => room/timeline/event-tile/body}/DecryptionFailureBodyViewModel.ts (100%) rename apps/web/src/viewmodels/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButtonTooltipViewModel.ts (95%) rename apps/web/src/viewmodels/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButtonViewModel.ts (96%) rename apps/web/src/viewmodels/{message-body => room/timeline/event-tile/reactions}/ReactionsRowViewModel.ts (98%) rename apps/web/src/viewmodels/{message-body => room/timeline/event-tile/reactions}/reactionShortcode.ts (100%) rename apps/web/src/viewmodels/{message-body => room/timeline/event-tile/timestamp}/MessageTimestampViewModel.ts (98%) rename packages/shared-components/__vis__/linux/__baselines__/{ => room}/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{ => room}/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/has-extra-class-names-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{ => room}/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/long-localized-label-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{ => room}/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/with-jump-to-date-picker-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{ => room}/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/with-jump-to-tooltip-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline}/TimelineSeparator/TimelineSeparator.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline}/TimelineSeparator/TimelineSeparator.stories.tsx/with-date-event-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline}/TimelineSeparator/TimelineSeparator.stories.tsx/with-html-child-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline}/TimelineSeparator/TimelineSeparator.stories.tsx/with-late-event-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline}/TimelineSeparator/TimelineSeparator.stories.tsx/without-children-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{profile => room/timeline/event-tile/EventTileView}/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{profile => room/timeline/event-tile/EventTileView}/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/emphasized-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{profile => room/timeline/event-tile/EventTileView}/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/full-example-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{profile => room/timeline/event-tile/EventTileView}/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-color-class-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{profile => room/timeline/event-tile/EventTileView}/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-mxid-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{profile => room/timeline/event-tile/EventTileView}/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-tooltip-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/EncryptionEventView.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/EncryptionEventView.stories.tsx/disable-attempt-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/EncryptionEventView.stories.tsx/enabled-direct-message-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/EncryptionEventView.stories.tsx/enabled-local-room-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/EncryptionEventView.stories.tsx/parameters-changed-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/EncryptionEventView.stories.tsx/state-encryption-enabled-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/EncryptionEventView.stories.tsx/unsupported-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/EncryptionEventView.stories.tsx/with-timestamp-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{event-tiles => room/timeline/event-tile/EventTileView}/EventTileBubble/EventTileBubble.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{event-tiles => room/timeline/event-tile/EventTileView}/EventTileBubble/EventTileBubble.stories.tsx/has-children-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{event-tiles => room/timeline/event-tile/EventTileView}/EventTileBubble/EventTileBubble.stories.tsx/has-lock-solid-icon-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{event-tiles => room/timeline/event-tile/EventTileView}/EventTileBubble/EventTileBubble.stories.tsx/is-crypto-event-bubble-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/EventTileView}/PinnedMessageBadge/PinnedMessageBadge.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{event-tiles => room/timeline/event-tile/EventTileView}/TextualEventView/TextualEventView.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{audio => room/timeline/event-tile/body}/AudioPlayerView/AudioPlayerView.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{audio => room/timeline/event-tile/body}/AudioPlayerView/AudioPlayerView.stories.tsx/has-error-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{audio => room/timeline/event-tile/body}/AudioPlayerView/AudioPlayerView.stories.tsx/no-media-name-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{audio => room/timeline/event-tile/body}/AudioPlayerView/AudioPlayerView.stories.tsx/no-size-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/body}/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/body}/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-backup-configured-verified-false-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/body}/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-backup-configured-verified-true-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/body}/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-error-block-icon-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/body}/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-error-class-name-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/body}/MediaBody/MediaBody.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/reactions}/ReactionsRow/ReactionsRow.stories.tsx/add-reaction-button-active-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/reactions}/ReactionsRow/ReactionsRow.stories.tsx/add-reaction-button-hidden-until-hover-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/reactions}/ReactionsRow/ReactionsRow.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/reactions}/ReactionsRow/ReactionsRow.stories.tsx/hidden-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/reactions}/ReactionsRow/ReactionsRow.stories.tsx/with-show-all-button-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButton/ReactionsRowButton.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButton/ReactionsRowButton.stories.tsx/selected-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButton/ReactionsRowButton.stories.tsx/with-tooltip-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/many-senders-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/no-tooltip-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/without-caption-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/timestamp}/MessageTimestampView/MessageTimestampView.stories.tsx/default-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/timestamp}/MessageTimestampView/MessageTimestampView.stories.tsx/has-actions-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/timestamp}/MessageTimestampView/MessageTimestampView.stories.tsx/has-href-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/timestamp}/MessageTimestampView/MessageTimestampView.stories.tsx/has-inhibit-tooltip-auto.png (100%) rename packages/shared-components/__vis__/linux/__baselines__/{message-body => room/timeline/event-tile/timestamp}/MessageTimestampView/MessageTimestampView.stories.tsx/has-ts-received-at-auto.png (100%) rename packages/shared-components/src/{ => room}/timeline/DateSeparatorView/DateSeparatorButton.tsx (95%) rename packages/shared-components/src/{ => room}/timeline/DateSeparatorView/DateSeparatorContextMenuView.module.css (100%) rename packages/shared-components/src/{ => room}/timeline/DateSeparatorView/DateSeparatorContextMenuView.test.tsx (100%) rename packages/shared-components/src/{ => room}/timeline/DateSeparatorView/DateSeparatorContextMenuView.tsx (96%) rename packages/shared-components/src/{ => room}/timeline/DateSeparatorView/DateSeparatorDatePickerView.module.css (100%) rename packages/shared-components/src/{ => room}/timeline/DateSeparatorView/DateSeparatorDatePickerView.tsx (96%) rename packages/shared-components/src/{ => room}/timeline/DateSeparatorView/DateSeparatorView.module.css (100%) rename packages/shared-components/src/{ => room}/timeline/DateSeparatorView/DateSeparatorView.stories.tsx (95%) rename packages/shared-components/src/{ => room}/timeline/DateSeparatorView/DateSeparatorView.test.tsx (97%) rename packages/shared-components/src/{ => room}/timeline/DateSeparatorView/DateSeparatorView.tsx (93%) rename packages/shared-components/src/{ => room}/timeline/DateSeparatorView/__snapshots__/DateSeparatorView.test.tsx.snap (100%) rename packages/shared-components/src/{ => room}/timeline/DateSeparatorView/index.ts (100%) create mode 100644 packages/shared-components/src/room/timeline/ReadMarkerView/.gitkeep rename packages/shared-components/src/{message-body => room/timeline}/TimelineSeparator/TimelineSeparator.module.css (100%) rename packages/shared-components/src/{message-body => room/timeline}/TimelineSeparator/TimelineSeparator.stories.tsx (100%) rename packages/shared-components/src/{message-body => room/timeline}/TimelineSeparator/TimelineSeparator.test.tsx (100%) rename packages/shared-components/src/{message-body => room/timeline}/TimelineSeparator/TimelineSeparator.tsx (97%) rename packages/shared-components/src/{message-body => room/timeline}/TimelineSeparator/__snapshots__/TimelineSeparator.test.tsx.snap (100%) rename packages/shared-components/src/{message-body => room/timeline}/TimelineSeparator/index.ts (100%) create mode 100644 packages/shared-components/src/room/timeline/TimelineView/.gitkeep rename packages/shared-components/src/{profile => room/timeline/event-tile/EventTileView}/DisambiguatedProfile/DisambiguatedProfile.module.css (100%) rename packages/shared-components/src/{profile => room/timeline/event-tile/EventTileView}/DisambiguatedProfile/DisambiguatedProfile.stories.tsx (94%) rename packages/shared-components/src/{profile => room/timeline/event-tile/EventTileView}/DisambiguatedProfile/DisambiguatedProfile.test.tsx (99%) rename packages/shared-components/src/{profile => room/timeline/event-tile/EventTileView}/DisambiguatedProfile/DisambiguatedProfileView.tsx (98%) rename packages/shared-components/src/{profile => room/timeline/event-tile/EventTileView}/DisambiguatedProfile/__snapshots__/DisambiguatedProfile.test.tsx.snap (100%) rename packages/shared-components/src/{profile => room/timeline/event-tile/EventTileView}/DisambiguatedProfile/index.tsx (100%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/EncryptionEventView.module.css (100%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/EncryptionEventView.stories.tsx (93%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/EncryptionEventView.test.tsx (98%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/EncryptionEventView.tsx (96%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/__snapshots__/EncryptionEventView.test.tsx.snap (100%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/EncryptionEventView/index.ts (100%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/EventTileBubble/EventTileBubble.module.css (100%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/EventTileBubble/EventTileBubble.stories.tsx (100%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/EventTileBubble/EventTileBubble.test.tsx (100%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/EventTileBubble/EventTileBubble.tsx (100%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/EventTileBubble/__snapshots__/EventTileBubble.test.tsx.snap (100%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/EventTileBubble/index.ts (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/EventTileView}/PinnedMessageBadge/PinnedMessageBadge.module.css (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/EventTileView}/PinnedMessageBadge/PinnedMessageBadge.stories.tsx (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/EventTileView}/PinnedMessageBadge/PinnedMessageBadge.test.tsx (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/EventTileView}/PinnedMessageBadge/PinnedMessageBadge.tsx (94%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/EventTileView}/PinnedMessageBadge/__snapshots__/PinnedMessageBadge.test.tsx.snap (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/EventTileView}/PinnedMessageBadge/index.tsx (100%) create mode 100644 packages/shared-components/src/room/timeline/event-tile/EventTileView/SenderProfileView/.gitkeep rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/TextualEventView/TextualEventView.stories.tsx (89%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/TextualEventView/TextualEventView.test.tsx (100%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/TextualEventView/TextualEventView.tsx (88%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/TextualEventView/__snapshots__/TextualEventView.test.tsx.snap (100%) rename packages/shared-components/src/{event-tiles => room/timeline/event-tile/EventTileView}/TextualEventView/index.ts (100%) create mode 100644 packages/shared-components/src/room/timeline/event-tile/EventTileView/TileErrorBoundary/.gitkeep rename packages/shared-components/src/{audio => room/timeline/event-tile/body}/AudioPlayerView/AudioPlayerView.module.css (100%) rename packages/shared-components/src/{audio => room/timeline/event-tile/body}/AudioPlayerView/AudioPlayerView.stories.tsx (93%) rename packages/shared-components/src/{audio => room/timeline/event-tile/body}/AudioPlayerView/AudioPlayerView.test.tsx (93%) rename packages/shared-components/src/{audio => room/timeline/event-tile/body}/AudioPlayerView/AudioPlayerView.tsx (88%) rename packages/shared-components/src/{audio => room/timeline/event-tile/body}/AudioPlayerView/__snapshots__/AudioPlayerView.test.tsx.snap (100%) rename packages/shared-components/src/{audio => room/timeline/event-tile/body}/AudioPlayerView/index.ts (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/DecryptionFailureBodyView/DecryptionFailureBodyView.module.css (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx (93%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/DecryptionFailureBodyView/DecryptionFailureBodyView.test.tsx (98%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/DecryptionFailureBodyView/DecryptionFailureBodyView.tsx (97%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/DecryptionFailureBodyView/__snapshots__/DecryptionFailureBodyView.test.tsx.snap (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/DecryptionFailureBodyView/index.tsx (100%) create mode 100644 packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/.gitkeep create mode 100644 packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/.gitkeep create mode 100644 packages/shared-components/src/room/timeline/event-tile/body/MImageBodyView/.gitkeep create mode 100644 packages/shared-components/src/room/timeline/event-tile/body/MVideoBodyView/.gitkeep rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/MediaBody/MediaBody.module.css (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/MediaBody/MediaBody.stories.tsx (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/MediaBody/MediaBody.test.tsx (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/MediaBody/MediaBody.tsx (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/MediaBody/__snapshots__/MediaBody.test.tsx.snap (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/body}/MediaBody/index.tsx (100%) create mode 100644 packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/.gitkeep create mode 100644 packages/shared-components/src/room/timeline/event-tile/body/TextualBodyView/.gitkeep rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRow/ReactionsRow.module.css (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRow/ReactionsRow.stories.tsx (98%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRow/ReactionsRow.test.tsx (98%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRow/ReactionsRowView.tsx (98%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRow/__snapshots__/ReactionsRow.test.tsx.snap (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRow/index.tsx (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButton/ReactionsRowButton.module.css (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButton/ReactionsRowButton.stories.tsx (97%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButton/ReactionsRowButton.test.tsx (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButton/ReactionsRowButtonView.tsx (97%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButton/__snapshots__/ReactionsRowButton.test.tsx.snap (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButton/index.tsx (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx (93%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.test.tsx (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButtonTooltip/ReactionsRowButtonTooltipView.tsx (95%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButtonTooltip/__snapshots__/ReactionsRowButtonTooltip.test.tsx.snap (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/reactions}/ReactionsRowButtonTooltip/index.tsx (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/timestamp}/MessageTimestampView/MessageTimestampView.module.css (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/timestamp}/MessageTimestampView/MessageTimestampView.stories.tsx (93%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/timestamp}/MessageTimestampView/MessageTimestampView.test.tsx (97%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/timestamp}/MessageTimestampView/MessageTimestampView.tsx (95%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/timestamp}/MessageTimestampView/__snapshots__/MessageTimestampView.test.tsx.snap (100%) rename packages/shared-components/src/{message-body => room/timeline/event-tile/timestamp}/MessageTimestampView/index.tsx (100%) diff --git a/apps/web/src/components/structures/MessagePanel.tsx b/apps/web/src/components/structures/MessagePanel.tsx index 2b0ebeacf2..629b9d3c7a 100644 --- a/apps/web/src/components/structures/MessagePanel.tsx +++ b/apps/web/src/components/structures/MessagePanel.tsx @@ -56,7 +56,7 @@ import { MainGrouper } from "./grouper/MainGrouper"; import { CreationGrouper } from "./grouper/CreationGrouper"; import { _t } from "../../languageHandler"; import { getLateEventInfo } from "./grouper/LateEventGrouper"; -import { DateSeparatorViewModel } from "../../viewmodels/timeline/DateSeparatorViewModel"; +import { DateSeparatorViewModel } from "../../viewmodels/room/timeline/DateSeparatorViewModel"; const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes const continuedTypes = [EventType.Sticker, EventType.RoomMessage]; diff --git a/apps/web/src/components/structures/RoomView.tsx b/apps/web/src/components/structures/RoomView.tsx index 327e472e8b..251a2bc467 100644 --- a/apps/web/src/components/structures/RoomView.tsx +++ b/apps/web/src/components/structures/RoomView.tsx @@ -140,7 +140,7 @@ import { type FocusMessageSearchPayload } from "../../dispatcher/payloads/FocusM import { isRoomEncrypted } from "../../hooks/useIsEncrypted"; import { type RoomViewStore } from "../../stores/RoomViewStore.tsx"; import { RoomStatusBarViewModel } from "../../viewmodels/room/RoomStatusBar.ts"; -import { EncryptionEventViewModel } from "../../viewmodels/event-tiles/EncryptionEventViewModel.ts"; +import { EncryptionEventViewModel } from "../../viewmodels/room/timeline/event-tile/EncryptionEventViewModel.ts"; import { ModuleApi } from "../../modules/Api.ts"; const DEBUG = false; diff --git a/apps/web/src/components/structures/grouper/CreationGrouper.tsx b/apps/web/src/components/structures/grouper/CreationGrouper.tsx index 9608f18b0f..04dc689b8b 100644 --- a/apps/web/src/components/structures/grouper/CreationGrouper.tsx +++ b/apps/web/src/components/structures/grouper/CreationGrouper.tsx @@ -18,7 +18,7 @@ import DMRoomMap from "../../../utils/DMRoomMap"; import { _t } from "../../../languageHandler"; import NewRoomIntro from "../../views/rooms/NewRoomIntro"; import GenericEventListSummary from "../../views/elements/GenericEventListSummary"; -import { DateSeparatorViewModel } from "../../../viewmodels/timeline/DateSeparatorViewModel"; +import { DateSeparatorViewModel } from "../../../viewmodels/room/timeline/DateSeparatorViewModel"; // Wrap initial room creation events into a GenericEventListSummary // Grouping only events sent by the same user that sent the `m.room.create` and only until diff --git a/apps/web/src/components/structures/grouper/MainGrouper.tsx b/apps/web/src/components/structures/grouper/MainGrouper.tsx index f7a0eb4d94..8245a9e323 100644 --- a/apps/web/src/components/structures/grouper/MainGrouper.tsx +++ b/apps/web/src/components/structures/grouper/MainGrouper.tsx @@ -17,7 +17,7 @@ import { hasText } from "../../../TextForEvent"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; import HistoryTile from "../../views/rooms/HistoryTile"; import EventListSummary from "../../views/elements/EventListSummary"; -import { DateSeparatorViewModel } from "../../../viewmodels/timeline/DateSeparatorViewModel"; +import { DateSeparatorViewModel } from "../../../viewmodels/room/timeline/DateSeparatorViewModel"; const groupedStateEvents = [ EventType.RoomMember, diff --git a/apps/web/src/components/views/dialogs/MessageEditHistoryDialog.tsx b/apps/web/src/components/views/dialogs/MessageEditHistoryDialog.tsx index 950c77c432..d54bc548aa 100644 --- a/apps/web/src/components/views/dialogs/MessageEditHistoryDialog.tsx +++ b/apps/web/src/components/views/dialogs/MessageEditHistoryDialog.tsx @@ -19,7 +19,7 @@ import BaseDialog from "./BaseDialog"; import ScrollPanel from "../../structures/ScrollPanel"; import Spinner from "../elements/Spinner"; import EditHistoryMessage from "../messages/EditHistoryMessage"; -import { DateSeparatorViewModel } from "../../../viewmodels/timeline/DateSeparatorViewModel"; +import { DateSeparatorViewModel } from "../../../viewmodels/room/timeline/DateSeparatorViewModel"; interface IProps { mxEvent: MatrixEvent; diff --git a/apps/web/src/components/views/elements/ImageView.tsx b/apps/web/src/components/views/elements/ImageView.tsx index 6c72c8b276..ee24a87eb1 100644 --- a/apps/web/src/components/views/elements/ImageView.tsx +++ b/apps/web/src/components/views/elements/ImageView.tsx @@ -42,7 +42,7 @@ import { useDownloadMedia } from "../../../hooks/useDownloadMedia.ts"; import { MessageTimestampViewModel, type MessageTimestampViewModelProps, -} from "../../../viewmodels/message-body/MessageTimestampViewModel.ts"; +} from "../../../viewmodels/room/timeline/event-tile/timestamp/MessageTimestampViewModel.ts"; // Max scale to keep gaps around the image const MAX_SCALE = 0.95; diff --git a/apps/web/src/components/views/messages/MAudioBody.tsx b/apps/web/src/components/views/messages/MAudioBody.tsx index ad1a1d2f5f..997d32b75d 100644 --- a/apps/web/src/components/views/messages/MAudioBody.tsx +++ b/apps/web/src/components/views/messages/MAudioBody.tsx @@ -19,7 +19,7 @@ import { type IBodyProps } from "./IBodyProps"; import { PlaybackManager } from "../../../audio/PlaybackManager"; import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext"; import MediaProcessingError from "./shared/MediaProcessingError"; -import { AudioPlayerViewModel } from "../../../viewmodels/audio/AudioPlayerViewModel"; +import { AudioPlayerViewModel } from "../../../viewmodels/room/timeline/event-tile/body/AudioPlayerViewModel"; import { FileBodyFactory, renderMBody } from "./MBodyFactory"; interface IState { diff --git a/apps/web/src/components/views/messages/MBodyFactory.tsx b/apps/web/src/components/views/messages/MBodyFactory.tsx index b033098529..3e79bc6e66 100644 --- a/apps/web/src/components/views/messages/MBodyFactory.tsx +++ b/apps/web/src/components/views/messages/MBodyFactory.tsx @@ -17,7 +17,7 @@ import { import { type IBodyProps } from "./IBodyProps"; import RoomContext from "../../../contexts/RoomContext"; import { LocalDeviceVerificationStateContext } from "../../../contexts/LocalDeviceVerificationStateContext"; -import { DecryptionFailureBodyViewModel } from "../../../viewmodels/message-body/DecryptionFailureBodyViewModel"; +import { DecryptionFailureBodyViewModel } from "../../../viewmodels/room/timeline/event-tile/body/DecryptionFailureBodyViewModel"; import { FileBodyViewModel } from "../../../viewmodels/message-body/FileBodyViewModel"; import { RedactedBodyViewModel } from "../../../viewmodels/message-body/RedactedBodyViewModel"; diff --git a/apps/web/src/components/views/messages/SenderProfile.tsx b/apps/web/src/components/views/messages/SenderProfile.tsx index a68083009f..f3465d24f8 100644 --- a/apps/web/src/components/views/messages/SenderProfile.tsx +++ b/apps/web/src/components/views/messages/SenderProfile.tsx @@ -11,7 +11,7 @@ import React, { type JSX, useEffect } from "react"; import { type MatrixEvent, MsgType } from "matrix-js-sdk/src/matrix"; import { useCreateAutoDisposedViewModel, DisambiguatedProfileView } from "@element-hq/web-shared-components"; -import { DisambiguatedProfileViewModel } from "../../../viewmodels/profile/DisambiguatedProfileViewModel"; +import { DisambiguatedProfileViewModel } from "../../../viewmodels/room/timeline/event-tile/DisambiguatedProfileViewModel"; import { useRoomMemberProfile } from "../../../hooks/room/useRoomMemberProfile"; interface IProps { diff --git a/apps/web/src/components/views/rooms/EventTile.tsx b/apps/web/src/components/views/rooms/EventTile.tsx index aca72046bd..aa0f9ac0e4 100644 --- a/apps/web/src/components/views/rooms/EventTile.tsx +++ b/apps/web/src/components/views/rooms/EventTile.tsx @@ -108,9 +108,12 @@ import SettingsStore from "../../../settings/SettingsStore"; import { MessageTimestampViewModel, type MessageTimestampViewModelProps, -} from "../../../viewmodels/message-body/MessageTimestampViewModel.ts"; -import { ReactionsRowButtonViewModel } from "../../../viewmodels/message-body/ReactionsRowButtonViewModel"; -import { MAX_ITEMS_WHEN_LIMITED, ReactionsRowViewModel } from "../../../viewmodels/message-body/ReactionsRowViewModel"; +} from "../../../viewmodels/room/timeline/event-tile/timestamp/MessageTimestampViewModel.ts"; +import { ReactionsRowButtonViewModel } from "../../../viewmodels/room/timeline/event-tile/reactions/ReactionsRowButtonViewModel"; +import { + MAX_ITEMS_WHEN_LIMITED, + ReactionsRowViewModel, +} from "../../../viewmodels/room/timeline/event-tile/reactions/ReactionsRowViewModel"; import { useMatrixClientContext } from "../../../contexts/MatrixClientContext"; import { DecryptionFailureBodyFactory, RedactedBodyFactory } from "../messages/MBodyFactory"; diff --git a/apps/web/src/components/views/rooms/MemberList/tiles/RoomMemberTileView.tsx b/apps/web/src/components/views/rooms/MemberList/tiles/RoomMemberTileView.tsx index e298943e3a..a381305088 100644 --- a/apps/web/src/components/views/rooms/MemberList/tiles/RoomMemberTileView.tsx +++ b/apps/web/src/components/views/rooms/MemberList/tiles/RoomMemberTileView.tsx @@ -17,7 +17,7 @@ import { _t } from "../../../../../languageHandler"; import { MemberTileView } from "./common/MemberTileView"; import { InvitedIconView } from "./common/InvitedIconView"; import { type MemberWithSeparator } from "../../../../viewmodels/memberlist/MemberListViewModel"; -import { DisambiguatedProfileViewModel } from "../../../../../viewmodels/profile/DisambiguatedProfileViewModel"; +import { DisambiguatedProfileViewModel } from "../../../../../viewmodels/room/timeline/event-tile/DisambiguatedProfileViewModel"; interface IProps { /** diff --git a/apps/web/src/components/views/rooms/SearchResultTile.tsx b/apps/web/src/components/views/rooms/SearchResultTile.tsx index 8e4e7e4f3e..59cc1f7fb7 100644 --- a/apps/web/src/components/views/rooms/SearchResultTile.tsx +++ b/apps/web/src/components/views/rooms/SearchResultTile.tsx @@ -21,7 +21,7 @@ import type LegacyCallEventGrouper from "../../structures/LegacyCallEventGrouper import { buildLegacyCallEventGroupers } from "../../structures/LegacyCallEventGrouper"; import { haveRendererForEvent } from "../../../events/EventTileFactory"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; -import { DateSeparatorViewModel } from "../../../viewmodels/timeline/DateSeparatorViewModel"; +import { DateSeparatorViewModel } from "../../../viewmodels/room/timeline/DateSeparatorViewModel"; interface IProps { // a list of strings to be highlighted in the results diff --git a/apps/web/src/events/EventTileFactory.tsx b/apps/web/src/events/EventTileFactory.tsx index fb637fec30..56faffc26c 100644 --- a/apps/web/src/events/EventTileFactory.tsx +++ b/apps/web/src/events/EventTileFactory.tsx @@ -46,8 +46,8 @@ import ViewSourceEvent from "../components/views/messages/ViewSourceEvent"; import { shouldDisplayAsBeaconTile } from "../utils/beacon/timeline"; import { type IBodyProps } from "../components/views/messages/IBodyProps"; import { ModuleApi } from "../modules/Api"; -import { EncryptionEventViewModel } from "../viewmodels/event-tiles/EncryptionEventViewModel"; -import { TextualEventViewModel } from "../viewmodels/event-tiles/TextualEventViewModel"; +import { EncryptionEventViewModel } from "../viewmodels/room/timeline/event-tile/EncryptionEventViewModel"; +import { TextualEventViewModel } from "../viewmodels/room/timeline/event-tile/TextualEventViewModel"; import { ElementCallEventType } from "../call-types"; // Subset of EventTile's IProps plus some mixins diff --git a/apps/web/src/utils/exportUtils/HtmlExport.tsx b/apps/web/src/utils/exportUtils/HtmlExport.tsx index 888fc28b54..903125bf8a 100644 --- a/apps/web/src/utils/exportUtils/HtmlExport.tsx +++ b/apps/web/src/utils/exportUtils/HtmlExport.tsx @@ -31,7 +31,7 @@ import getExportCSS from "./exportCSS"; import { textForEvent } from "../../TextForEvent"; import { haveRendererForEvent } from "../../events/EventTileFactory"; import { SDKContext, SdkContextClass } from "../../contexts/SDKContext.ts"; -import { DateSeparatorViewModel } from "../../viewmodels/timeline/DateSeparatorViewModel"; +import { DateSeparatorViewModel } from "../../viewmodels/room/timeline/DateSeparatorViewModel"; import exportJS from "!!raw-loader!./exportJS"; diff --git a/apps/web/src/viewmodels/timeline/DateSeparatorViewModel.tsx b/apps/web/src/viewmodels/room/timeline/DateSeparatorViewModel.tsx similarity index 93% rename from apps/web/src/viewmodels/timeline/DateSeparatorViewModel.tsx rename to apps/web/src/viewmodels/room/timeline/DateSeparatorViewModel.tsx index 320e79e48f..2f3f4bf1ba 100644 --- a/apps/web/src/viewmodels/timeline/DateSeparatorViewModel.tsx +++ b/apps/web/src/viewmodels/room/timeline/DateSeparatorViewModel.tsx @@ -15,19 +15,19 @@ import React from "react"; import { Direction, ConnectionError, HTTPError, MatrixError } from "matrix-js-sdk/src/matrix"; import { logger } from "matrix-js-sdk/src/logger"; -import { formatFullDateNoDay, formatFullDateNoTime, getDaysArray } from "../../DateUtils"; -import { MatrixClientPeg } from "../../MatrixClientPeg"; -import dispatcher from "../../dispatcher/dispatcher"; -import { Action } from "../../dispatcher/actions"; -import { type ViewRoomPayload } from "../../dispatcher/payloads/ViewRoomPayload"; -import { _t, getUserLanguage } from "../../languageHandler"; -import Modal from "../../Modal"; -import SettingsStore from "../../settings/SettingsStore"; -import { UIFeature } from "../../settings/UIFeature"; -import ErrorDialog from "../../components/views/dialogs/ErrorDialog"; -import BugReportDialog from "../../components/views/dialogs/BugReportDialog"; -import AccessibleButton from "../../components/views/elements/AccessibleButton"; -import { SdkContextClass } from "../../contexts/SDKContext"; +import { formatFullDateNoDay, formatFullDateNoTime, getDaysArray } from "../../../DateUtils"; +import { MatrixClientPeg } from "../../../MatrixClientPeg"; +import dispatcher from "../../../dispatcher/dispatcher"; +import { Action } from "../../../dispatcher/actions"; +import { type ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload"; +import { _t, getUserLanguage } from "../../../languageHandler"; +import Modal from "../../../Modal"; +import SettingsStore from "../../../settings/SettingsStore"; +import { UIFeature } from "../../../settings/UIFeature"; +import ErrorDialog from "../../../components/views/dialogs/ErrorDialog"; +import BugReportDialog from "../../../components/views/dialogs/BugReportDialog"; +import AccessibleButton from "../../../components/views/elements/AccessibleButton"; +import { SdkContextClass } from "../../../contexts/SDKContext"; export interface DateSeparatorViewModelProps { /** diff --git a/apps/web/src/viewmodels/profile/DisambiguatedProfileViewModel.ts b/apps/web/src/viewmodels/room/timeline/event-tile/DisambiguatedProfileViewModel.ts similarity index 95% rename from apps/web/src/viewmodels/profile/DisambiguatedProfileViewModel.ts rename to apps/web/src/viewmodels/room/timeline/event-tile/DisambiguatedProfileViewModel.ts index 0617370038..c3b97087b3 100644 --- a/apps/web/src/viewmodels/profile/DisambiguatedProfileViewModel.ts +++ b/apps/web/src/viewmodels/room/timeline/event-tile/DisambiguatedProfileViewModel.ts @@ -12,9 +12,9 @@ import { } from "@element-hq/web-shared-components"; import { type MouseEvent } from "react"; -import { _t } from "../../languageHandler"; -import { getUserNameColorClass } from "../../utils/FormattingUtils"; -import UserIdentifier from "../../customisations/UserIdentifier"; +import { _t } from "../../../../languageHandler"; +import { getUserNameColorClass } from "../../../../utils/FormattingUtils"; +import UserIdentifier from "../../../../customisations/UserIdentifier"; /** * Information about a member for disambiguation purposes. diff --git a/apps/web/src/viewmodels/event-tiles/EncryptionEventViewModel.ts b/apps/web/src/viewmodels/room/timeline/event-tile/EncryptionEventViewModel.ts similarity index 93% rename from apps/web/src/viewmodels/event-tiles/EncryptionEventViewModel.ts rename to apps/web/src/viewmodels/room/timeline/event-tile/EncryptionEventViewModel.ts index 6084aef56b..94ec20ab79 100644 --- a/apps/web/src/viewmodels/event-tiles/EncryptionEventViewModel.ts +++ b/apps/web/src/viewmodels/room/timeline/event-tile/EncryptionEventViewModel.ts @@ -15,11 +15,11 @@ import { } from "@element-hq/web-shared-components"; import type { RoomEncryptionEventContent } from "matrix-js-sdk/src/types"; -import DMRoomMap from "../../utils/DMRoomMap"; -import { MEGOLM_ENCRYPTION_ALGORITHM } from "../../utils/crypto"; -import { isLocalRoom } from "../../utils/localRoom/isLocalRoom"; -import { isRoomEncrypted } from "../../hooks/useIsEncrypted"; -import { objectHasDiff } from "../../utils/objects"; +import DMRoomMap from "../../../../utils/DMRoomMap"; +import { MEGOLM_ENCRYPTION_ALGORITHM } from "../../../../utils/crypto"; +import { isLocalRoom } from "../../../../utils/localRoom/isLocalRoom"; +import { isRoomEncrypted } from "../../../../hooks/useIsEncrypted"; +import { objectHasDiff } from "../../../../utils/objects"; export interface EncryptionEventViewModelProps { /** Caller-provided client. */ diff --git a/apps/web/src/viewmodels/event-tiles/TextualEventViewModel.ts b/apps/web/src/viewmodels/room/timeline/event-tile/TextualEventViewModel.ts similarity index 82% rename from apps/web/src/viewmodels/event-tiles/TextualEventViewModel.ts rename to apps/web/src/viewmodels/room/timeline/event-tile/TextualEventViewModel.ts index 46322c4590..fce936f05a 100644 --- a/apps/web/src/viewmodels/event-tiles/TextualEventViewModel.ts +++ b/apps/web/src/viewmodels/room/timeline/event-tile/TextualEventViewModel.ts @@ -8,9 +8,9 @@ Please see LICENSE files in the repository root for full details. import { MatrixEventEvent } from "matrix-js-sdk/src/matrix"; import { type TextualEventViewSnapshot, BaseViewModel } from "@element-hq/web-shared-components"; -import { type EventTileTypeProps } from "../../events/EventTileFactory"; -import { MatrixClientPeg } from "../../MatrixClientPeg"; -import { textForEvent } from "../../TextForEvent"; +import { type EventTileTypeProps } from "../../../../events/EventTileFactory"; +import { MatrixClientPeg } from "../../../../MatrixClientPeg"; +import { textForEvent } from "../../../../TextForEvent"; export class TextualEventViewModel extends BaseViewModel { public constructor(props: EventTileTypeProps) { diff --git a/apps/web/src/viewmodels/audio/AudioPlayerViewModel.ts b/apps/web/src/viewmodels/room/timeline/event-tile/body/AudioPlayerViewModel.ts similarity index 94% rename from apps/web/src/viewmodels/audio/AudioPlayerViewModel.ts rename to apps/web/src/viewmodels/room/timeline/event-tile/body/AudioPlayerViewModel.ts index 37588c5afd..e114cf8ee6 100644 --- a/apps/web/src/viewmodels/audio/AudioPlayerViewModel.ts +++ b/apps/web/src/viewmodels/room/timeline/event-tile/body/AudioPlayerViewModel.ts @@ -14,10 +14,10 @@ import { type AudioPlayerViewModel as AudioPlayerViewModelInterface, } from "@element-hq/web-shared-components"; -import { type Playback } from "../../audio/Playback"; -import { UPDATE_EVENT } from "../../stores/AsyncStore"; -import { getKeyBindingsManager } from "../../KeyBindingsManager"; -import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts"; +import { type Playback } from "../../../../../audio/Playback"; +import { UPDATE_EVENT } from "../../../../../stores/AsyncStore"; +import { getKeyBindingsManager } from "../../../../../KeyBindingsManager"; +import { KeyBindingAction } from "../../../../../accessibility/KeyboardShortcuts"; /** * The number of seconds to skip when the user presses the left or right arrow keys. diff --git a/apps/web/src/viewmodels/message-body/DecryptionFailureBodyViewModel.ts b/apps/web/src/viewmodels/room/timeline/event-tile/body/DecryptionFailureBodyViewModel.ts similarity index 100% rename from apps/web/src/viewmodels/message-body/DecryptionFailureBodyViewModel.ts rename to apps/web/src/viewmodels/room/timeline/event-tile/body/DecryptionFailureBodyViewModel.ts diff --git a/apps/web/src/viewmodels/message-body/ReactionsRowButtonTooltipViewModel.ts b/apps/web/src/viewmodels/room/timeline/event-tile/reactions/ReactionsRowButtonTooltipViewModel.ts similarity index 95% rename from apps/web/src/viewmodels/message-body/ReactionsRowButtonTooltipViewModel.ts rename to apps/web/src/viewmodels/room/timeline/event-tile/reactions/ReactionsRowButtonTooltipViewModel.ts index ab3ce8204d..5f60389b2a 100644 --- a/apps/web/src/viewmodels/message-body/ReactionsRowButtonTooltipViewModel.ts +++ b/apps/web/src/viewmodels/room/timeline/event-tile/reactions/ReactionsRowButtonTooltipViewModel.ts @@ -12,9 +12,9 @@ import { type ReactionsRowButtonTooltipViewModel as ReactionsRowButtonTooltipViewModelInterface, } from "@element-hq/web-shared-components"; -import { _t } from "../../languageHandler"; -import { formatList } from "../../utils/FormattingUtils"; -import { unicodeToShortcode } from "../../HtmlUtils"; +import { _t } from "../../../../../languageHandler"; +import { formatList } from "../../../../../utils/FormattingUtils"; +import { unicodeToShortcode } from "../../../../../HtmlUtils"; import { REACTION_SHORTCODE_KEY } from "./reactionShortcode"; export interface ReactionsRowButtonTooltipViewModelProps { diff --git a/apps/web/src/viewmodels/message-body/ReactionsRowButtonViewModel.ts b/apps/web/src/viewmodels/room/timeline/event-tile/reactions/ReactionsRowButtonViewModel.ts similarity index 96% rename from apps/web/src/viewmodels/message-body/ReactionsRowButtonViewModel.ts rename to apps/web/src/viewmodels/room/timeline/event-tile/reactions/ReactionsRowButtonViewModel.ts index 6f86c71104..591a9073c7 100644 --- a/apps/web/src/viewmodels/message-body/ReactionsRowButtonViewModel.ts +++ b/apps/web/src/viewmodels/room/timeline/event-tile/reactions/ReactionsRowButtonViewModel.ts @@ -12,10 +12,10 @@ import { type ReactionsRowButtonViewModel as ReactionsRowButtonViewModelInterface, } from "@element-hq/web-shared-components"; -import { mediaFromMxc } from "../../customisations/Media"; -import { _t } from "../../languageHandler"; -import { formatList } from "../../utils/FormattingUtils"; -import dis from "../../dispatcher/dispatcher"; +import { mediaFromMxc } from "../../../../../customisations/Media"; +import { _t } from "../../../../../languageHandler"; +import { formatList } from "../../../../../utils/FormattingUtils"; +import dis from "../../../../../dispatcher/dispatcher"; import { ReactionsRowButtonTooltipViewModel } from "./ReactionsRowButtonTooltipViewModel"; import { REACTION_SHORTCODE_KEY } from "./reactionShortcode"; diff --git a/apps/web/src/viewmodels/message-body/ReactionsRowViewModel.ts b/apps/web/src/viewmodels/room/timeline/event-tile/reactions/ReactionsRowViewModel.ts similarity index 98% rename from apps/web/src/viewmodels/message-body/ReactionsRowViewModel.ts rename to apps/web/src/viewmodels/room/timeline/event-tile/reactions/ReactionsRowViewModel.ts index 240ba85231..8df8b2ab43 100644 --- a/apps/web/src/viewmodels/message-body/ReactionsRowViewModel.ts +++ b/apps/web/src/viewmodels/room/timeline/event-tile/reactions/ReactionsRowViewModel.ts @@ -12,7 +12,7 @@ import { type ReactionsRowViewModel as ReactionsRowViewModelInterface, } from "@element-hq/web-shared-components"; -import { _t } from "../../languageHandler"; +import { _t } from "../../../../../languageHandler"; export const MAX_ITEMS_WHEN_LIMITED = 8; diff --git a/apps/web/src/viewmodels/message-body/reactionShortcode.ts b/apps/web/src/viewmodels/room/timeline/event-tile/reactions/reactionShortcode.ts similarity index 100% rename from apps/web/src/viewmodels/message-body/reactionShortcode.ts rename to apps/web/src/viewmodels/room/timeline/event-tile/reactions/reactionShortcode.ts diff --git a/apps/web/src/viewmodels/message-body/MessageTimestampViewModel.ts b/apps/web/src/viewmodels/room/timeline/event-tile/timestamp/MessageTimestampViewModel.ts similarity index 98% rename from apps/web/src/viewmodels/message-body/MessageTimestampViewModel.ts rename to apps/web/src/viewmodels/room/timeline/event-tile/timestamp/MessageTimestampViewModel.ts index da4295176c..394404ca4b 100644 --- a/apps/web/src/viewmodels/message-body/MessageTimestampViewModel.ts +++ b/apps/web/src/viewmodels/room/timeline/event-tile/timestamp/MessageTimestampViewModel.ts @@ -12,8 +12,8 @@ import { type MessageTimestampViewModel as MessageTimestampViewModelInterface, } from "@element-hq/web-shared-components"; -import { formatFullDate, formatTime, formatFullTime, formatRelativeTime } from "../../DateUtils"; -import { objectHasDiff } from "../../utils/objects"; +import { formatFullDate, formatTime, formatFullTime, formatRelativeTime } from "../../../../../DateUtils"; +import { objectHasDiff } from "../../../../../utils/objects"; export interface MessageTimestampViewModelProps { /** diff --git a/apps/web/test/viewmodels/audio/AudioPlayerViewModel-test.tsx b/apps/web/test/viewmodels/audio/AudioPlayerViewModel-test.tsx index 4fc10fe596..4e4f6c6c91 100644 --- a/apps/web/test/viewmodels/audio/AudioPlayerViewModel-test.tsx +++ b/apps/web/test/viewmodels/audio/AudioPlayerViewModel-test.tsx @@ -9,7 +9,7 @@ import { type ChangeEvent, type KeyboardEvent as ReactKeyboardEvent } from "reac import { waitFor } from "@testing-library/dom"; import { type Playback, PlaybackState } from "../../../src/audio/Playback"; -import { AudioPlayerViewModel } from "../../../src/viewmodels/audio/AudioPlayerViewModel"; +import { AudioPlayerViewModel } from "../../../src/viewmodels/room/timeline/event-tile/body/AudioPlayerViewModel"; import { MockedPlayback } from "../../unit-tests/audio/MockedPlayback"; describe("AudioPlayerViewModel", () => { diff --git a/apps/web/test/viewmodels/event-tiles/EncryptionEventViewModel-test.ts b/apps/web/test/viewmodels/event-tiles/EncryptionEventViewModel-test.ts index 58fa4c7647..6ffbb093b6 100644 --- a/apps/web/test/viewmodels/event-tiles/EncryptionEventViewModel-test.ts +++ b/apps/web/test/viewmodels/event-tiles/EncryptionEventViewModel-test.ts @@ -11,7 +11,7 @@ import { RoomStateEvent, type MatrixClient, type MatrixEvent, type Room } from " import { EncryptionEventState } from "@element-hq/web-shared-components"; import type { RoomEncryptionEventContent } from "matrix-js-sdk/src/types"; -import { EncryptionEventViewModel } from "../../../src/viewmodels/event-tiles/EncryptionEventViewModel"; +import { EncryptionEventViewModel } from "../../../src/viewmodels/room/timeline/event-tile/EncryptionEventViewModel"; import { LocalRoom } from "../../../src/models/LocalRoom"; import DMRoomMap from "../../../src/utils/DMRoomMap"; import { mkEvent, stubClient } from "../../test-utils"; diff --git a/apps/web/test/viewmodels/event-tiles/TextualEventViewModel-test.ts b/apps/web/test/viewmodels/event-tiles/TextualEventViewModel-test.ts index 735ecd2542..c53dac955a 100644 --- a/apps/web/test/viewmodels/event-tiles/TextualEventViewModel-test.ts +++ b/apps/web/test/viewmodels/event-tiles/TextualEventViewModel-test.ts @@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details. import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/matrix"; -import { TextualEventViewModel } from "../../../src/viewmodels/event-tiles/TextualEventViewModel"; +import { TextualEventViewModel } from "../../../src/viewmodels/room/timeline/event-tile/TextualEventViewModel"; import { stubClient } from "../../test-utils"; jest.mock("../../../src/TextForEvent.tsx", () => ({ diff --git a/apps/web/test/viewmodels/message-body/DecryptionFailureBodyViewModel-test.tsx b/apps/web/test/viewmodels/message-body/DecryptionFailureBodyViewModel-test.tsx index fe5f93f9ac..3597e25fb1 100644 --- a/apps/web/test/viewmodels/message-body/DecryptionFailureBodyViewModel-test.tsx +++ b/apps/web/test/viewmodels/message-body/DecryptionFailureBodyViewModel-test.tsx @@ -8,7 +8,7 @@ import { DecryptionFailureCode } from "matrix-js-sdk/src/crypto-api"; import { DecryptionFailureReason } from "@element-hq/web-shared-components"; -import { DecryptionFailureBodyViewModel } from "../../../src/viewmodels/message-body/DecryptionFailureBodyViewModel"; +import { DecryptionFailureBodyViewModel } from "../../../src/viewmodels/room/timeline/event-tile/body/DecryptionFailureBodyViewModel"; describe("DecryptionFailureBodyViewModel", () => { it("should return the snapshot", () => { diff --git a/apps/web/test/viewmodels/message-body/MessageTimestampViewModel-test.tsx b/apps/web/test/viewmodels/message-body/MessageTimestampViewModel-test.tsx index 08039003d0..de8aaa1643 100644 --- a/apps/web/test/viewmodels/message-body/MessageTimestampViewModel-test.tsx +++ b/apps/web/test/viewmodels/message-body/MessageTimestampViewModel-test.tsx @@ -6,7 +6,7 @@ */ import * as DateUtils from "../../../src/DateUtils"; -import { MessageTimestampViewModel } from "../../../src/viewmodels/message-body/MessageTimestampViewModel"; +import { MessageTimestampViewModel } from "../../../src/viewmodels/room/timeline/event-tile/timestamp/MessageTimestampViewModel"; jest.mock("../../../src/settings/SettingsStore"); diff --git a/apps/web/test/viewmodels/message-body/ReactionsRowButtonTooltipViewModel-test.tsx b/apps/web/test/viewmodels/message-body/ReactionsRowButtonTooltipViewModel-test.tsx index a4b742b208..129c4a40fe 100644 --- a/apps/web/test/viewmodels/message-body/ReactionsRowButtonTooltipViewModel-test.tsx +++ b/apps/web/test/viewmodels/message-body/ReactionsRowButtonTooltipViewModel-test.tsx @@ -10,7 +10,7 @@ import { type MatrixClient, type MatrixEvent, type Room, type RoomMember } from import { ReactionsRowButtonTooltipViewModel, type ReactionsRowButtonTooltipViewModelProps, -} from "../../../src/viewmodels/message-body/ReactionsRowButtonTooltipViewModel"; +} from "../../../src/viewmodels/room/timeline/event-tile/reactions/ReactionsRowButtonTooltipViewModel"; import { stubClient, mkStubRoom, mkEvent } from "../../test-utils"; import { unicodeToShortcode } from "../../../src/HtmlUtils"; diff --git a/apps/web/test/viewmodels/message-body/ReactionsRowButtonViewModel-test.tsx b/apps/web/test/viewmodels/message-body/ReactionsRowButtonViewModel-test.tsx index 952c657b2c..2c14e003fb 100644 --- a/apps/web/test/viewmodels/message-body/ReactionsRowButtonViewModel-test.tsx +++ b/apps/web/test/viewmodels/message-body/ReactionsRowButtonViewModel-test.tsx @@ -10,8 +10,8 @@ import { EventType, type MatrixClient, type MatrixEvent, RelationType, type Room import { ReactionsRowButtonViewModel, type ReactionsRowButtonViewModelProps, -} from "../../../src/viewmodels/message-body/ReactionsRowButtonViewModel"; -import { type ReactionsRowButtonTooltipViewModel } from "../../../src/viewmodels/message-body/ReactionsRowButtonTooltipViewModel"; +} from "../../../src/viewmodels/room/timeline/event-tile/reactions/ReactionsRowButtonViewModel"; +import { type ReactionsRowButtonTooltipViewModel } from "../../../src/viewmodels/room/timeline/event-tile/reactions/ReactionsRowButtonTooltipViewModel"; import { createTestClient, mkEvent, mkStubRoom } from "../../test-utils"; import dis from "../../../src/dispatcher/dispatcher"; diff --git a/apps/web/test/viewmodels/message-body/ReactionsRowViewModel-test.tsx b/apps/web/test/viewmodels/message-body/ReactionsRowViewModel-test.tsx index 03f7746035..6e74504ac1 100644 --- a/apps/web/test/viewmodels/message-body/ReactionsRowViewModel-test.tsx +++ b/apps/web/test/viewmodels/message-body/ReactionsRowViewModel-test.tsx @@ -7,7 +7,7 @@ import { type MouseEvent } from "react"; -import { ReactionsRowViewModel } from "../../../src/viewmodels/message-body/ReactionsRowViewModel"; +import { ReactionsRowViewModel } from "../../../src/viewmodels/room/timeline/event-tile/reactions/ReactionsRowViewModel"; describe("ReactionsRowViewModel", () => { const createVm = ( diff --git a/apps/web/test/viewmodels/profile/DisambiguatedProfileViewModel-test.tsx b/apps/web/test/viewmodels/profile/DisambiguatedProfileViewModel-test.tsx index d92837e120..5b8c2070e7 100644 --- a/apps/web/test/viewmodels/profile/DisambiguatedProfileViewModel-test.tsx +++ b/apps/web/test/viewmodels/profile/DisambiguatedProfileViewModel-test.tsx @@ -5,7 +5,7 @@ * Please see LICENSE files in the repository root for full details. */ -import { DisambiguatedProfileViewModel } from "../../../src/viewmodels/profile/DisambiguatedProfileViewModel"; +import { DisambiguatedProfileViewModel } from "../../../src/viewmodels/room/timeline/event-tile/DisambiguatedProfileViewModel"; describe("DisambiguatedProfileViewModel", () => { const member = { diff --git a/apps/web/test/viewmodels/timeline/DateSeparatorViewModel-test.tsx b/apps/web/test/viewmodels/timeline/DateSeparatorViewModel-test.tsx index e3fad0c578..b5875a5551 100644 --- a/apps/web/test/viewmodels/timeline/DateSeparatorViewModel-test.tsx +++ b/apps/web/test/viewmodels/timeline/DateSeparatorViewModel-test.tsx @@ -17,7 +17,7 @@ import { MatrixClientPeg } from "../../../src/MatrixClientPeg"; import SettingsStore from "../../../src/settings/SettingsStore"; import { UIFeature } from "../../../src/settings/UIFeature"; import { SdkContextClass } from "../../../src/contexts/SDKContext"; -import { DateSeparatorViewModel } from "../../../src/viewmodels/timeline/DateSeparatorViewModel"; +import { DateSeparatorViewModel } from "../../../src/viewmodels/room/timeline/DateSeparatorViewModel"; import { flushPromisesWithFakeTimers } from "../../test-utils"; jest.mock("../../../src/settings/SettingsStore"); diff --git a/packages/shared-components/__vis__/linux/__baselines__/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/has-extra-class-names-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/has-extra-class-names-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/has-extra-class-names-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/has-extra-class-names-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/long-localized-label-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/long-localized-label-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/long-localized-label-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/long-localized-label-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/with-jump-to-date-picker-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/with-jump-to-date-picker-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/with-jump-to-date-picker-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/with-jump-to-date-picker-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/with-jump-to-tooltip-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/with-jump-to-tooltip-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/with-jump-to-tooltip-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/DateSeparatorView/DateSeparatorView.stories.tsx/with-jump-to-tooltip-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/TimelineSeparator/TimelineSeparator.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/TimelineSeparator/TimelineSeparator.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/TimelineSeparator/TimelineSeparator.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/TimelineSeparator/TimelineSeparator.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/TimelineSeparator/TimelineSeparator.stories.tsx/with-date-event-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/TimelineSeparator/TimelineSeparator.stories.tsx/with-date-event-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/TimelineSeparator/TimelineSeparator.stories.tsx/with-date-event-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/TimelineSeparator/TimelineSeparator.stories.tsx/with-date-event-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/TimelineSeparator/TimelineSeparator.stories.tsx/with-html-child-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/TimelineSeparator/TimelineSeparator.stories.tsx/with-html-child-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/TimelineSeparator/TimelineSeparator.stories.tsx/with-html-child-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/TimelineSeparator/TimelineSeparator.stories.tsx/with-html-child-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/TimelineSeparator/TimelineSeparator.stories.tsx/with-late-event-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/TimelineSeparator/TimelineSeparator.stories.tsx/with-late-event-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/TimelineSeparator/TimelineSeparator.stories.tsx/with-late-event-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/TimelineSeparator/TimelineSeparator.stories.tsx/with-late-event-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/TimelineSeparator/TimelineSeparator.stories.tsx/without-children-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/TimelineSeparator/TimelineSeparator.stories.tsx/without-children-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/TimelineSeparator/TimelineSeparator.stories.tsx/without-children-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/TimelineSeparator/TimelineSeparator.stories.tsx/without-children-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/emphasized-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/emphasized-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/emphasized-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/emphasized-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/full-example-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/full-example-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/full-example-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/full-example-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-color-class-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-color-class-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-color-class-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-color-class-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-mxid-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-mxid-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-mxid-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-mxid-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-tooltip-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-tooltip-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-tooltip-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx/with-tooltip-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/disable-attempt-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/disable-attempt-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/disable-attempt-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/disable-attempt-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/enabled-direct-message-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/enabled-direct-message-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/enabled-direct-message-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/enabled-direct-message-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/enabled-local-room-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/enabled-local-room-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/enabled-local-room-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/enabled-local-room-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/parameters-changed-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/parameters-changed-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/parameters-changed-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/parameters-changed-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/state-encryption-enabled-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/state-encryption-enabled-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/state-encryption-enabled-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/state-encryption-enabled-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/unsupported-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/unsupported-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/unsupported-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/unsupported-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/with-timestamp-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/with-timestamp-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx/with-timestamp-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx/with-timestamp-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/event-tiles/EventTileBubble/EventTileBubble.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/event-tiles/EventTileBubble/EventTileBubble.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/event-tiles/EventTileBubble/EventTileBubble.stories.tsx/has-children-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.stories.tsx/has-children-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/event-tiles/EventTileBubble/EventTileBubble.stories.tsx/has-children-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.stories.tsx/has-children-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/event-tiles/EventTileBubble/EventTileBubble.stories.tsx/has-lock-solid-icon-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.stories.tsx/has-lock-solid-icon-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/event-tiles/EventTileBubble/EventTileBubble.stories.tsx/has-lock-solid-icon-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.stories.tsx/has-lock-solid-icon-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/event-tiles/EventTileBubble/EventTileBubble.stories.tsx/is-crypto-event-bubble-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.stories.tsx/is-crypto-event-bubble-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/event-tiles/EventTileBubble/EventTileBubble.stories.tsx/is-crypto-event-bubble-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.stories.tsx/is-crypto-event-bubble-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/PinnedMessageBadge/PinnedMessageBadge.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/PinnedMessageBadge/PinnedMessageBadge.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/PinnedMessageBadge/PinnedMessageBadge.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/PinnedMessageBadge/PinnedMessageBadge.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/event-tiles/TextualEventView/TextualEventView.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/TextualEventView/TextualEventView.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/event-tiles/TextualEventView/TextualEventView.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/EventTileView/TextualEventView/TextualEventView.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/audio/AudioPlayerView/AudioPlayerView.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/audio/AudioPlayerView/AudioPlayerView.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/audio/AudioPlayerView/AudioPlayerView.stories.tsx/has-error-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/has-error-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/audio/AudioPlayerView/AudioPlayerView.stories.tsx/has-error-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/has-error-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/audio/AudioPlayerView/AudioPlayerView.stories.tsx/no-media-name-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/no-media-name-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/audio/AudioPlayerView/AudioPlayerView.stories.tsx/no-media-name-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/no-media-name-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/audio/AudioPlayerView/AudioPlayerView.stories.tsx/no-size-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/no-size-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/audio/AudioPlayerView/AudioPlayerView.stories.tsx/no-size-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/no-size-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-backup-configured-verified-false-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-backup-configured-verified-false-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-backup-configured-verified-false-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-backup-configured-verified-false-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-backup-configured-verified-true-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-backup-configured-verified-true-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-backup-configured-verified-true-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-backup-configured-verified-true-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-error-block-icon-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-error-block-icon-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-error-block-icon-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-error-block-icon-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-error-class-name-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-error-class-name-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-error-class-name-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx/has-error-class-name-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/MediaBody/MediaBody.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MediaBody/MediaBody.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/MediaBody/MediaBody.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MediaBody/MediaBody.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRow/ReactionsRow.stories.tsx/add-reaction-button-active-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.stories.tsx/add-reaction-button-active-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRow/ReactionsRow.stories.tsx/add-reaction-button-active-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.stories.tsx/add-reaction-button-active-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRow/ReactionsRow.stories.tsx/add-reaction-button-hidden-until-hover-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.stories.tsx/add-reaction-button-hidden-until-hover-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRow/ReactionsRow.stories.tsx/add-reaction-button-hidden-until-hover-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.stories.tsx/add-reaction-button-hidden-until-hover-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRow/ReactionsRow.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRow/ReactionsRow.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRow/ReactionsRow.stories.tsx/hidden-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.stories.tsx/hidden-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRow/ReactionsRow.stories.tsx/hidden-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.stories.tsx/hidden-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRow/ReactionsRow.stories.tsx/with-show-all-button-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.stories.tsx/with-show-all-button-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRow/ReactionsRow.stories.tsx/with-show-all-button-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.stories.tsx/with-show-all-button-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButton/ReactionsRowButton.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButton.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButton/ReactionsRowButton.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButton.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButton/ReactionsRowButton.stories.tsx/selected-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButton.stories.tsx/selected-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButton/ReactionsRowButton.stories.tsx/selected-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButton.stories.tsx/selected-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButton/ReactionsRowButton.stories.tsx/with-tooltip-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButton.stories.tsx/with-tooltip-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButton/ReactionsRowButton.stories.tsx/with-tooltip-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButton.stories.tsx/with-tooltip-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/many-senders-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/many-senders-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/many-senders-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/many-senders-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/no-tooltip-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/no-tooltip-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/no-tooltip-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/no-tooltip-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/without-caption-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/without-caption-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/without-caption-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx/without-caption-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/MessageTimestampView/MessageTimestampView.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.stories.tsx/default-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/MessageTimestampView/MessageTimestampView.stories.tsx/default-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.stories.tsx/default-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/MessageTimestampView/MessageTimestampView.stories.tsx/has-actions-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.stories.tsx/has-actions-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/MessageTimestampView/MessageTimestampView.stories.tsx/has-actions-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.stories.tsx/has-actions-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/MessageTimestampView/MessageTimestampView.stories.tsx/has-href-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.stories.tsx/has-href-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/MessageTimestampView/MessageTimestampView.stories.tsx/has-href-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.stories.tsx/has-href-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/MessageTimestampView/MessageTimestampView.stories.tsx/has-inhibit-tooltip-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.stories.tsx/has-inhibit-tooltip-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/MessageTimestampView/MessageTimestampView.stories.tsx/has-inhibit-tooltip-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.stories.tsx/has-inhibit-tooltip-auto.png diff --git a/packages/shared-components/__vis__/linux/__baselines__/message-body/MessageTimestampView/MessageTimestampView.stories.tsx/has-ts-received-at-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.stories.tsx/has-ts-received-at-auto.png similarity index 100% rename from packages/shared-components/__vis__/linux/__baselines__/message-body/MessageTimestampView/MessageTimestampView.stories.tsx/has-ts-received-at-auto.png rename to packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.stories.tsx/has-ts-received-at-auto.png diff --git a/packages/shared-components/src/index.ts b/packages/shared-components/src/index.ts index a638de3a3c..24ce2f9813 100644 --- a/packages/shared-components/src/index.ts +++ b/packages/shared-components/src/index.ts @@ -6,34 +6,35 @@ */ // Components -export * from "./audio/AudioPlayerView"; export * from "./audio/Clock"; export * from "./audio/PlayPauseButton"; export * from "./audio/SeekBar"; export * from "./core/avatar/AvatarWithDetails"; export * from "./composer/Banner"; export * from "./crypto/SasEmoji"; -export * from "./event-tiles/EncryptionEventView"; -export * from "./event-tiles/EventTileBubble"; -export * from "./event-tiles/TextualEventView"; export * from "./event-tiles/UrlPreviewGroupView"; export * from "./message-body/EventContentBody"; -export * from "./message-body/MediaBody"; -export * from "./message-body/MessageTimestampView"; -export * from "./message-body/DecryptionFailureBodyView"; export * from "./message-body/RedactedBodyView"; export * from "./message-body/FileBodyView"; -export * from "./message-body/PinnedMessageBadge"; -export * from "./message-body/ReactionsRowButtonTooltip"; -export * from "./message-body/ReactionsRowButton"; -export * from "./message-body/ReactionsRow"; -export * from "./message-body/TimelineSeparator/"; export * from "./core/pill-input/Pill"; export * from "./core/pill-input/PillInput"; export * from "./room/RoomStatusBar"; export * from "./room/WidgetPip"; -export * from "./profile/DisambiguatedProfile"; export * from "./room/HistoryVisibilityBadge"; +export * from "./room/timeline/DateSeparatorView"; +export * from "./room/timeline/TimelineSeparator"; +export * from "./room/timeline/event-tile/EventTileView/DisambiguatedProfile"; +export * from "./room/timeline/event-tile/EventTileView/EncryptionEventView"; +export * from "./room/timeline/event-tile/EventTileView/EventTileBubble"; +export * from "./room/timeline/event-tile/EventTileView/PinnedMessageBadge"; +export * from "./room/timeline/event-tile/EventTileView/TextualEventView"; +export * from "./room/timeline/event-tile/body/AudioPlayerView"; +export * from "./room/timeline/event-tile/body/DecryptionFailureBodyView"; +export * from "./room/timeline/event-tile/body/MediaBody"; +export * from "./room/timeline/event-tile/reactions/ReactionsRow"; +export * from "./room/timeline/event-tile/reactions/ReactionsRowButton"; +export * from "./room/timeline/event-tile/reactions/ReactionsRowButtonTooltip"; +export * from "./room/timeline/event-tile/timestamp/MessageTimestampView"; export * from "./core/rich-list/RichItem"; export * from "./core/rich-list/RichList"; export * from "./room-list/RoomListHeaderView"; @@ -44,7 +45,6 @@ export * from "./room-list/RoomListItemView"; export * from "./room-list/RoomListItemAccessibilityWrapper"; export * from "./room-list/RoomListPrimaryFilters"; export * from "./room-list/VirtualizedRoomListView"; -export * from "./timeline/DateSeparatorView/"; export * from "./core/utils/Box"; export * from "./core/utils/Flex"; export * from "./core/utils/LinkedText"; diff --git a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.tsx b/packages/shared-components/src/message-body/FileBodyView/FileBodyView.tsx index 2f325a45e5..ca514512ea 100644 --- a/packages/shared-components/src/message-body/FileBodyView/FileBodyView.tsx +++ b/packages/shared-components/src/message-body/FileBodyView/FileBodyView.tsx @@ -19,7 +19,7 @@ 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 "../MediaBody"; +import { MediaBody } from "../../room/timeline/event-tile/body/MediaBody"; /** * Which visual state to render for the component. diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorButton.tsx b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorButton.tsx similarity index 95% rename from packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorButton.tsx rename to packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorButton.tsx index 6ee1951358..7696d92fe8 100644 --- a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorButton.tsx +++ b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorButton.tsx @@ -9,8 +9,8 @@ import React from "react"; import { Tooltip } from "@vector-im/compound-web"; import ChevronDownIcon from "@vector-im/compound-design-tokens/assets/web/icons/chevron-down"; -import { Flex } from "../../core/utils/Flex"; -import { useI18n } from "../../core/i18n/i18nContext"; +import { Flex } from "../../../core/utils/Flex"; +import { useI18n } from "../../../core/i18n/i18nContext"; /** Props for DateSeparatorButton. */ export interface DateSeparatorButtonProps { diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorContextMenuView.module.css b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorContextMenuView.module.css similarity index 100% rename from packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorContextMenuView.module.css rename to packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorContextMenuView.module.css diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorContextMenuView.test.tsx b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorContextMenuView.test.tsx similarity index 100% rename from packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorContextMenuView.test.tsx rename to packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorContextMenuView.test.tsx diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorContextMenuView.tsx b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorContextMenuView.tsx similarity index 96% rename from packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorContextMenuView.tsx rename to packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorContextMenuView.tsx index 1f51f6c412..6137ddf327 100644 --- a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorContextMenuView.tsx +++ b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorContextMenuView.tsx @@ -9,8 +9,8 @@ import React, { type JSX, type PropsWithChildren, useRef } from "react"; import { Menu, MenuItem, Separator } from "@vector-im/compound-web"; import { capitalize } from "lodash"; -import { useI18n } from "../../core/i18n/i18nContext"; -import { humanizeRelativeTime } from "../../core/utils/humanize"; +import { useI18n } from "../../../core/i18n/i18nContext"; +import { humanizeRelativeTime } from "../../../core/utils/humanize"; import { type DateSeparatorViewModel } from "./DateSeparatorView"; import { DateSeparatorDatePickerView } from "./DateSeparatorDatePickerView"; import styles from "./DateSeparatorContextMenuView.module.css"; diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorDatePickerView.module.css b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorDatePickerView.module.css similarity index 100% rename from packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorDatePickerView.module.css rename to packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorDatePickerView.module.css diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorDatePickerView.tsx b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorDatePickerView.tsx similarity index 96% rename from packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorDatePickerView.tsx rename to packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorDatePickerView.tsx index 1c033a5659..9a35259ead 100644 --- a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorDatePickerView.tsx +++ b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorDatePickerView.tsx @@ -8,9 +8,9 @@ import React, { type JSX, useId, useRef, useState } from "react"; import { Root, Submit, Field, TextControl, MenuItem } from "@vector-im/compound-web"; -import { formatDateForInput } from "../../core/utils/DateUtils"; -import { useI18n } from "../../core/i18n/i18nContext"; -import { useViewModel } from "../../core/viewmodel"; +import { formatDateForInput } from "../../../core/utils/DateUtils"; +import { useI18n } from "../../../core/i18n/i18nContext"; +import { useViewModel } from "../../../core/viewmodel"; import { type DateSeparatorViewModel } from "./DateSeparatorView"; import styles from "./DateSeparatorDatePickerView.module.css"; diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.module.css b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorView.module.css similarity index 100% rename from packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.module.css rename to packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorView.module.css diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.stories.tsx b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorView.stories.tsx similarity index 95% rename from packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.stories.tsx rename to packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorView.stories.tsx index da21a98315..0bc4dccffd 100644 --- a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.stories.tsx +++ b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorView.stories.tsx @@ -10,8 +10,8 @@ import { expect, userEvent, within } from "storybook/test"; import type { Meta, StoryObj } from "@storybook/react-vite"; import { DateSeparatorView, type DateSeparatorViewSnapshot, type DateSeparatorViewActions } from "./DateSeparatorView"; -import { useMockedViewModel } from "../../core/viewmodel/useMockedViewModel"; -import { withViewDocs } from "../../../.storybook/withViewDocs"; +import { useMockedViewModel } from "../../../core/viewmodel/useMockedViewModel"; +import { withViewDocs } from "../../../../.storybook/withViewDocs"; type DateSeparatorProps = DateSeparatorViewSnapshot & DateSeparatorViewActions; diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.test.tsx b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorView.test.tsx similarity index 97% rename from packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.test.tsx rename to packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorView.test.tsx index 7b901ef633..703b0cd195 100644 --- a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.test.tsx +++ b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorView.test.tsx @@ -12,7 +12,7 @@ import { describe, it, expect } from "vitest"; import { waitFor } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; -import { BaseViewModel } from "../../core/viewmodel/BaseViewModel"; +import { BaseViewModel } from "../../../core/viewmodel/BaseViewModel"; import { DateSeparatorView, type DateSeparatorViewModel, type DateSeparatorViewSnapshot } from "./DateSeparatorView"; import * as stories from "./DateSeparatorView.stories"; diff --git a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.tsx b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorView.tsx similarity index 93% rename from packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.tsx rename to packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorView.tsx index 0c9ba864ca..1a32ba3806 100644 --- a/packages/shared-components/src/timeline/DateSeparatorView/DateSeparatorView.tsx +++ b/packages/shared-components/src/room/timeline/DateSeparatorView/DateSeparatorView.tsx @@ -8,11 +8,11 @@ import classNames from "classnames"; import React, { type JSX, useState } from "react"; -import { type ViewModel } from "../../core/viewmodel/ViewModel"; -import { useViewModel } from "../../core/viewmodel/useViewModel"; +import { type ViewModel } from "../../../core/viewmodel/ViewModel"; +import { useViewModel } from "../../../core/viewmodel/useViewModel"; import styles from "./DateSeparatorView.module.css"; -import { Flex } from "../../core/utils/Flex"; -import { TimelineSeparator } from "../../message-body/TimelineSeparator"; +import { Flex } from "../../../core/utils/Flex"; +import { TimelineSeparator } from "../TimelineSeparator"; import { DateSeparatorContextMenuView } from "./DateSeparatorContextMenuView"; import { DateSeparatorButton } from "./DateSeparatorButton"; diff --git a/packages/shared-components/src/timeline/DateSeparatorView/__snapshots__/DateSeparatorView.test.tsx.snap b/packages/shared-components/src/room/timeline/DateSeparatorView/__snapshots__/DateSeparatorView.test.tsx.snap similarity index 100% rename from packages/shared-components/src/timeline/DateSeparatorView/__snapshots__/DateSeparatorView.test.tsx.snap rename to packages/shared-components/src/room/timeline/DateSeparatorView/__snapshots__/DateSeparatorView.test.tsx.snap diff --git a/packages/shared-components/src/timeline/DateSeparatorView/index.ts b/packages/shared-components/src/room/timeline/DateSeparatorView/index.ts similarity index 100% rename from packages/shared-components/src/timeline/DateSeparatorView/index.ts rename to packages/shared-components/src/room/timeline/DateSeparatorView/index.ts diff --git a/packages/shared-components/src/room/timeline/ReadMarkerView/.gitkeep b/packages/shared-components/src/room/timeline/ReadMarkerView/.gitkeep new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/packages/shared-components/src/room/timeline/ReadMarkerView/.gitkeep @@ -0,0 +1 @@ + diff --git a/packages/shared-components/src/message-body/TimelineSeparator/TimelineSeparator.module.css b/packages/shared-components/src/room/timeline/TimelineSeparator/TimelineSeparator.module.css similarity index 100% rename from packages/shared-components/src/message-body/TimelineSeparator/TimelineSeparator.module.css rename to packages/shared-components/src/room/timeline/TimelineSeparator/TimelineSeparator.module.css diff --git a/packages/shared-components/src/message-body/TimelineSeparator/TimelineSeparator.stories.tsx b/packages/shared-components/src/room/timeline/TimelineSeparator/TimelineSeparator.stories.tsx similarity index 100% rename from packages/shared-components/src/message-body/TimelineSeparator/TimelineSeparator.stories.tsx rename to packages/shared-components/src/room/timeline/TimelineSeparator/TimelineSeparator.stories.tsx diff --git a/packages/shared-components/src/message-body/TimelineSeparator/TimelineSeparator.test.tsx b/packages/shared-components/src/room/timeline/TimelineSeparator/TimelineSeparator.test.tsx similarity index 100% rename from packages/shared-components/src/message-body/TimelineSeparator/TimelineSeparator.test.tsx rename to packages/shared-components/src/room/timeline/TimelineSeparator/TimelineSeparator.test.tsx diff --git a/packages/shared-components/src/message-body/TimelineSeparator/TimelineSeparator.tsx b/packages/shared-components/src/room/timeline/TimelineSeparator/TimelineSeparator.tsx similarity index 97% rename from packages/shared-components/src/message-body/TimelineSeparator/TimelineSeparator.tsx rename to packages/shared-components/src/room/timeline/TimelineSeparator/TimelineSeparator.tsx index 3097f09afe..898ef3163e 100644 --- a/packages/shared-components/src/message-body/TimelineSeparator/TimelineSeparator.tsx +++ b/packages/shared-components/src/room/timeline/TimelineSeparator/TimelineSeparator.tsx @@ -9,7 +9,7 @@ import React, { type PropsWithChildren } from "react"; import classNames from "classnames"; import styles from "./TimelineSeparator.module.css"; -import { Flex } from "../.."; +import { Flex } from "../../../core/utils/Flex"; /** * Timeline separator props diff --git a/packages/shared-components/src/message-body/TimelineSeparator/__snapshots__/TimelineSeparator.test.tsx.snap b/packages/shared-components/src/room/timeline/TimelineSeparator/__snapshots__/TimelineSeparator.test.tsx.snap similarity index 100% rename from packages/shared-components/src/message-body/TimelineSeparator/__snapshots__/TimelineSeparator.test.tsx.snap rename to packages/shared-components/src/room/timeline/TimelineSeparator/__snapshots__/TimelineSeparator.test.tsx.snap diff --git a/packages/shared-components/src/message-body/TimelineSeparator/index.ts b/packages/shared-components/src/room/timeline/TimelineSeparator/index.ts similarity index 100% rename from packages/shared-components/src/message-body/TimelineSeparator/index.ts rename to packages/shared-components/src/room/timeline/TimelineSeparator/index.ts diff --git a/packages/shared-components/src/room/timeline/TimelineView/.gitkeep b/packages/shared-components/src/room/timeline/TimelineView/.gitkeep new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/packages/shared-components/src/room/timeline/TimelineView/.gitkeep @@ -0,0 +1 @@ + diff --git a/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.module.css b/packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.module.css similarity index 100% rename from packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.module.css rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.module.css diff --git a/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx similarity index 94% rename from packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx index 16d8dc1fc1..7a871b0ed5 100644 --- a/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.stories.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.stories.tsx @@ -14,8 +14,8 @@ import { type DisambiguatedProfileViewSnapshot, type DisambiguatedProfileViewActions, } from "./DisambiguatedProfileView"; -import { useMockedViewModel } from "../../core/viewmodel"; -import { withViewDocs } from "../../../.storybook/withViewDocs"; +import { useMockedViewModel } from "../../../../../core/viewmodel"; +import { withViewDocs } from "../../../../../../.storybook/withViewDocs"; type DisambiguatedProfileProps = DisambiguatedProfileViewSnapshot & DisambiguatedProfileViewActions; diff --git a/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.test.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.test.tsx similarity index 99% rename from packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.test.tsx index d9f7a9bbf6..15a831b97b 100644 --- a/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfile.test.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfile.test.tsx @@ -18,7 +18,7 @@ import { type DisambiguatedProfileViewActions, type DisambiguatedProfileViewSnapshot, } from "./DisambiguatedProfileView"; -import { MockViewModel } from "../../core/viewmodel/MockViewModel"; +import { MockViewModel } from "../../../../../core/viewmodel/MockViewModel"; const { Default, WithMxid, WithColorClass, Emphasized, WithTooltip, FullExample } = composeStories(stories); diff --git a/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfileView.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfileView.tsx similarity index 98% rename from packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfileView.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfileView.tsx index b356020e76..fa1102b81d 100644 --- a/packages/shared-components/src/profile/DisambiguatedProfile/DisambiguatedProfileView.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/DisambiguatedProfileView.tsx @@ -8,7 +8,7 @@ import React, { type JSX, type KeyboardEventHandler, type MouseEventHandler } from "react"; import classNames from "classnames"; -import { type ViewModel, useViewModel } from "../../core/viewmodel"; +import { type ViewModel, useViewModel } from "../../../../../core/viewmodel"; import styles from "./DisambiguatedProfile.module.css"; /** diff --git a/packages/shared-components/src/profile/DisambiguatedProfile/__snapshots__/DisambiguatedProfile.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/__snapshots__/DisambiguatedProfile.test.tsx.snap similarity index 100% rename from packages/shared-components/src/profile/DisambiguatedProfile/__snapshots__/DisambiguatedProfile.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/__snapshots__/DisambiguatedProfile.test.tsx.snap diff --git a/packages/shared-components/src/profile/DisambiguatedProfile/index.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/index.tsx similarity index 100% rename from packages/shared-components/src/profile/DisambiguatedProfile/index.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/DisambiguatedProfile/index.tsx diff --git a/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.module.css b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.module.css similarity index 100% rename from packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.module.css rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.module.css diff --git a/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx similarity index 93% rename from packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx index db08c1387d..35f012fb69 100644 --- a/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.stories.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.stories.tsx @@ -9,8 +9,8 @@ import React, { type JSX } from "react"; import type { Meta, StoryObj } from "@storybook/react-vite"; import { EncryptionEventView, EncryptionEventState, type EncryptionEventViewSnapshot } from "./EncryptionEventView"; -import { useMockedViewModel } from "../../core/viewmodel/useMockedViewModel"; -import { withViewDocs } from "../../../.storybook/withViewDocs"; +import { useMockedViewModel } from "../../../../../core/viewmodel/useMockedViewModel"; +import { withViewDocs } from "../../../../../../.storybook/withViewDocs"; type EncryptionEventProps = EncryptionEventViewSnapshot; diff --git a/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.test.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.test.tsx similarity index 98% rename from packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.test.tsx index d867b306e1..00e67136fc 100644 --- a/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.test.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.test.tsx @@ -12,7 +12,7 @@ import React from "react"; import { EncryptionEventState, EncryptionEventView } from "./EncryptionEventView"; import * as stories from "./EncryptionEventView.stories"; -import { MockViewModel } from "../../core/viewmodel"; +import { MockViewModel } from "../../../../../core/viewmodel"; const { Default, diff --git a/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.tsx similarity index 96% rename from packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.tsx index 07e92b6b28..69a5efb940 100644 --- a/packages/shared-components/src/event-tiles/EncryptionEventView/EncryptionEventView.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/EncryptionEventView.tsx @@ -9,9 +9,9 @@ import React, { type JSX } from "react"; import { LockSolidIcon, ErrorSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons"; import classNames from "classnames"; -import { type ViewModel, useViewModel } from "../../core/viewmodel"; +import { type ViewModel, useViewModel } from "../../../../../core/viewmodel"; import styles from "./EncryptionEventView.module.css"; -import { useI18n } from "../../core/i18n/i18nContext"; +import { useI18n } from "../../../../../core/i18n/i18nContext"; import { EventTileBubble } from "../EventTileBubble"; export enum EncryptionEventState { diff --git a/packages/shared-components/src/event-tiles/EncryptionEventView/__snapshots__/EncryptionEventView.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/__snapshots__/EncryptionEventView.test.tsx.snap similarity index 100% rename from packages/shared-components/src/event-tiles/EncryptionEventView/__snapshots__/EncryptionEventView.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/__snapshots__/EncryptionEventView.test.tsx.snap diff --git a/packages/shared-components/src/event-tiles/EncryptionEventView/index.ts b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/index.ts similarity index 100% rename from packages/shared-components/src/event-tiles/EncryptionEventView/index.ts rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/EncryptionEventView/index.ts diff --git a/packages/shared-components/src/event-tiles/EventTileBubble/EventTileBubble.module.css b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.module.css similarity index 100% rename from packages/shared-components/src/event-tiles/EventTileBubble/EventTileBubble.module.css rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.module.css diff --git a/packages/shared-components/src/event-tiles/EventTileBubble/EventTileBubble.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.stories.tsx similarity index 100% rename from packages/shared-components/src/event-tiles/EventTileBubble/EventTileBubble.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.stories.tsx diff --git a/packages/shared-components/src/event-tiles/EventTileBubble/EventTileBubble.test.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.test.tsx similarity index 100% rename from packages/shared-components/src/event-tiles/EventTileBubble/EventTileBubble.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.test.tsx diff --git a/packages/shared-components/src/event-tiles/EventTileBubble/EventTileBubble.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.tsx similarity index 100% rename from packages/shared-components/src/event-tiles/EventTileBubble/EventTileBubble.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/EventTileBubble/EventTileBubble.tsx diff --git a/packages/shared-components/src/event-tiles/EventTileBubble/__snapshots__/EventTileBubble.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EventTileBubble/__snapshots__/EventTileBubble.test.tsx.snap similarity index 100% rename from packages/shared-components/src/event-tiles/EventTileBubble/__snapshots__/EventTileBubble.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/EventTileBubble/__snapshots__/EventTileBubble.test.tsx.snap diff --git a/packages/shared-components/src/event-tiles/EventTileBubble/index.ts b/packages/shared-components/src/room/timeline/event-tile/EventTileView/EventTileBubble/index.ts similarity index 100% rename from packages/shared-components/src/event-tiles/EventTileBubble/index.ts rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/EventTileBubble/index.ts diff --git a/packages/shared-components/src/message-body/PinnedMessageBadge/PinnedMessageBadge.module.css b/packages/shared-components/src/room/timeline/event-tile/EventTileView/PinnedMessageBadge/PinnedMessageBadge.module.css similarity index 100% rename from packages/shared-components/src/message-body/PinnedMessageBadge/PinnedMessageBadge.module.css rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/PinnedMessageBadge/PinnedMessageBadge.module.css diff --git a/packages/shared-components/src/message-body/PinnedMessageBadge/PinnedMessageBadge.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/PinnedMessageBadge/PinnedMessageBadge.stories.tsx similarity index 100% rename from packages/shared-components/src/message-body/PinnedMessageBadge/PinnedMessageBadge.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/PinnedMessageBadge/PinnedMessageBadge.stories.tsx diff --git a/packages/shared-components/src/message-body/PinnedMessageBadge/PinnedMessageBadge.test.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/PinnedMessageBadge/PinnedMessageBadge.test.tsx similarity index 100% rename from packages/shared-components/src/message-body/PinnedMessageBadge/PinnedMessageBadge.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/PinnedMessageBadge/PinnedMessageBadge.test.tsx diff --git a/packages/shared-components/src/message-body/PinnedMessageBadge/PinnedMessageBadge.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/PinnedMessageBadge/PinnedMessageBadge.tsx similarity index 94% rename from packages/shared-components/src/message-body/PinnedMessageBadge/PinnedMessageBadge.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/PinnedMessageBadge/PinnedMessageBadge.tsx index 31d7af4264..9d87aecf27 100644 --- a/packages/shared-components/src/message-body/PinnedMessageBadge/PinnedMessageBadge.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/EventTileView/PinnedMessageBadge/PinnedMessageBadge.tsx @@ -10,7 +10,7 @@ import classNames from "classnames"; import PinIcon from "@vector-im/compound-design-tokens/assets/web/icons/pin-solid"; import styles from "./PinnedMessageBadge.module.css"; -import { _t } from "../../core/i18n/i18n"; +import { _t } from "../../../../../core/i18n/i18n"; export type PinnedMessageBadgeProps = HTMLAttributes; diff --git a/packages/shared-components/src/message-body/PinnedMessageBadge/__snapshots__/PinnedMessageBadge.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/EventTileView/PinnedMessageBadge/__snapshots__/PinnedMessageBadge.test.tsx.snap similarity index 100% rename from packages/shared-components/src/message-body/PinnedMessageBadge/__snapshots__/PinnedMessageBadge.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/PinnedMessageBadge/__snapshots__/PinnedMessageBadge.test.tsx.snap diff --git a/packages/shared-components/src/message-body/PinnedMessageBadge/index.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/PinnedMessageBadge/index.tsx similarity index 100% rename from packages/shared-components/src/message-body/PinnedMessageBadge/index.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/PinnedMessageBadge/index.tsx diff --git a/packages/shared-components/src/room/timeline/event-tile/EventTileView/SenderProfileView/.gitkeep b/packages/shared-components/src/room/timeline/event-tile/EventTileView/SenderProfileView/.gitkeep new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/packages/shared-components/src/room/timeline/event-tile/EventTileView/SenderProfileView/.gitkeep @@ -0,0 +1 @@ + diff --git a/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/TextualEventView/TextualEventView.stories.tsx similarity index 89% rename from packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/TextualEventView/TextualEventView.stories.tsx index ba4cd01693..1ae5c3211e 100644 --- a/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.stories.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/EventTileView/TextualEventView/TextualEventView.stories.tsx @@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details. import { type Meta, type StoryObj } from "@storybook/react-vite"; import { TextualEventView as TextualEventComponent } from "./TextualEventView"; -import { MockViewModel } from "../../core/viewmodel/MockViewModel"; +import { MockViewModel } from "../../../../../core/viewmodel/MockViewModel"; const meta = { title: "Event/TextualEvent", diff --git a/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.test.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/TextualEventView/TextualEventView.test.tsx similarity index 100% rename from packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/TextualEventView/TextualEventView.test.tsx diff --git a/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/TextualEventView/TextualEventView.tsx similarity index 88% rename from packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.tsx rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/TextualEventView/TextualEventView.tsx index 63c7a602fc..7984d70ab9 100644 --- a/packages/shared-components/src/event-tiles/TextualEventView/TextualEventView.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/EventTileView/TextualEventView/TextualEventView.tsx @@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details. import React, { type ReactNode, type JSX } from "react"; -import { type ViewModel, useViewModel } from "../../core/viewmodel"; +import { type ViewModel, useViewModel } from "../../../../../core/viewmodel"; export type TextualEventViewSnapshot = { content: string | ReactNode; diff --git a/packages/shared-components/src/event-tiles/TextualEventView/__snapshots__/TextualEventView.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/EventTileView/TextualEventView/__snapshots__/TextualEventView.test.tsx.snap similarity index 100% rename from packages/shared-components/src/event-tiles/TextualEventView/__snapshots__/TextualEventView.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/TextualEventView/__snapshots__/TextualEventView.test.tsx.snap diff --git a/packages/shared-components/src/event-tiles/TextualEventView/index.ts b/packages/shared-components/src/room/timeline/event-tile/EventTileView/TextualEventView/index.ts similarity index 100% rename from packages/shared-components/src/event-tiles/TextualEventView/index.ts rename to packages/shared-components/src/room/timeline/event-tile/EventTileView/TextualEventView/index.ts diff --git a/packages/shared-components/src/room/timeline/event-tile/EventTileView/TileErrorBoundary/.gitkeep b/packages/shared-components/src/room/timeline/event-tile/EventTileView/TileErrorBoundary/.gitkeep new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/packages/shared-components/src/room/timeline/event-tile/EventTileView/TileErrorBoundary/.gitkeep @@ -0,0 +1 @@ + diff --git a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.module.css b/packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.module.css similarity index 100% rename from packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.module.css rename to packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.module.css diff --git a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx similarity index 93% rename from packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx index b7f3dd2e5b..d979181bef 100644 --- a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.stories.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx @@ -10,8 +10,8 @@ import { fn } from "storybook/test"; import type { Meta, StoryObj } from "@storybook/react-vite"; import { AudioPlayerView, type AudioPlayerViewActions, type AudioPlayerViewSnapshot } from "./AudioPlayerView"; -import { useMockedViewModel } from "../../core/viewmodel"; -import { withViewDocs } from "../../../.storybook/withViewDocs"; +import { useMockedViewModel } from "../../../../../core/viewmodel"; +import { withViewDocs } from "../../../../../../.storybook/withViewDocs"; type AudioPlayerProps = AudioPlayerViewSnapshot & AudioPlayerViewActions; const AudioPlayerViewWrapperImpl = ({ diff --git a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.test.tsx b/packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.test.tsx similarity index 93% rename from packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.test.tsx index 693623a03e..9fadbc76ba 100644 --- a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.test.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.test.tsx @@ -14,9 +14,9 @@ import { describe, it, vi, afterEach, expect } from "vitest"; import * as stories from "./AudioPlayerView.stories.tsx"; import { AudioPlayerView, type AudioPlayerViewActions, type AudioPlayerViewSnapshot } from "./AudioPlayerView"; -import { MockViewModel } from "../../core/viewmodel/MockViewModel.ts"; -import { I18nContext } from "../../core/i18n/i18nContext.ts"; -import { I18nApi } from "../../index.ts"; +import { MockViewModel } from "../../../../../core/viewmodel/MockViewModel.ts"; +import { I18nContext } from "../../../../../core/i18n/i18nContext.ts"; +import { I18nApi } from "../../../../../core/i18n/I18nApi.ts"; const { Default, NoMediaName, NoSize, HasError } = composeStories(stories); diff --git a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.tsx b/packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.tsx similarity index 88% rename from packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.tsx index 63f4055ef2..4311034131 100644 --- a/packages/shared-components/src/audio/AudioPlayerView/AudioPlayerView.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.tsx @@ -7,16 +7,16 @@ import React, { type ChangeEventHandler, type JSX, type KeyboardEventHandler, type MouseEventHandler } from "react"; -import { type ViewModel, useViewModel } from "../../core/viewmodel"; -import { MediaBody } from "../../message-body/MediaBody"; -import { Flex } from "../../core/utils/Flex"; +import { type ViewModel, useViewModel } from "../../../../../core/viewmodel"; +import { MediaBody } from "../MediaBody"; +import { Flex } from "../../../../../core/utils/Flex"; import styles from "./AudioPlayerView.module.css"; -import { PlayPauseButton } from "../PlayPauseButton"; -import { type PlaybackState } from "../playback"; -import { useI18n } from "../../core/i18n/i18nContext"; -import { formatBytes } from "../../core/utils/FormattingUtils"; -import { Clock } from "../Clock"; -import { SeekBar } from "../SeekBar"; +import { PlayPauseButton } from "../../../../../audio/PlayPauseButton"; +import { type PlaybackState } from "../../../../../audio/playback"; +import { useI18n } from "../../../../../core/i18n/i18nContext"; +import { formatBytes } from "../../../../../core/utils/FormattingUtils"; +import { Clock } from "../../../../../audio/Clock"; +import { SeekBar } from "../../../../../audio/SeekBar"; export interface AudioPlayerViewSnapshot { /** diff --git a/packages/shared-components/src/audio/AudioPlayerView/__snapshots__/AudioPlayerView.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/__snapshots__/AudioPlayerView.test.tsx.snap similarity index 100% rename from packages/shared-components/src/audio/AudioPlayerView/__snapshots__/AudioPlayerView.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/__snapshots__/AudioPlayerView.test.tsx.snap diff --git a/packages/shared-components/src/audio/AudioPlayerView/index.ts b/packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/index.ts similarity index 100% rename from packages/shared-components/src/audio/AudioPlayerView/index.ts rename to packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/index.ts diff --git a/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.module.css b/packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.module.css similarity index 100% rename from packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.module.css rename to packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.module.css diff --git a/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx similarity index 93% rename from packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx index f9d9245ad2..59faf5dfb7 100644 --- a/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.stories.tsx @@ -13,8 +13,8 @@ import { DecryptionFailureReason, type DecryptionFailureBodyViewSnapshot, } from "./DecryptionFailureBodyView"; -import { useMockedViewModel } from "../../core/viewmodel/useMockedViewModel"; -import { withViewDocs } from "../../../.storybook/withViewDocs"; +import { useMockedViewModel } from "../../../../../core/viewmodel/useMockedViewModel"; +import { withViewDocs } from "../../../../../../.storybook/withViewDocs"; type DecryptionFailureBodyProps = DecryptionFailureBodyViewSnapshot; diff --git a/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.test.tsx b/packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.test.tsx similarity index 98% rename from packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.test.tsx index 676a3f3079..ad35f9f54a 100644 --- a/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.test.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.test.tsx @@ -10,7 +10,7 @@ import React from "react"; import { describe, it, expect } from "vitest"; import { DecryptionFailureBodyView, DecryptionFailureReason } from "./DecryptionFailureBodyView"; -import { MockViewModel } from "../../core/viewmodel"; +import { MockViewModel } from "../../../../../core/viewmodel"; describe("DecryptionFailureBodyView", () => { function customRender( diff --git a/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.tsx b/packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.tsx similarity index 97% rename from packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.tsx index 9c4370ce1d..0c48401d5a 100644 --- a/packages/shared-components/src/message-body/DecryptionFailureBodyView/DecryptionFailureBodyView.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/DecryptionFailureBodyView.tsx @@ -10,10 +10,10 @@ import React, { type JSX } from "react"; import { BlockIcon } from "@vector-im/compound-design-tokens/assets/web/icons"; import { type I18nApi } from "@element-hq/element-web-module-api"; -import { type ViewModel } from "../../core/viewmodel/ViewModel"; -import { useViewModel } from "../../core/viewmodel/useViewModel"; +import { type ViewModel } from "../../../../../core/viewmodel/ViewModel"; +import { useViewModel } from "../../../../../core/viewmodel/useViewModel"; import styles from "./DecryptionFailureBodyView.module.css"; -import { useI18n } from "../../core/i18n/i18nContext"; +import { useI18n } from "../../../../../core/i18n/i18nContext"; /** * A reason code for a failure to decrypt an event. diff --git a/packages/shared-components/src/message-body/DecryptionFailureBodyView/__snapshots__/DecryptionFailureBodyView.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/__snapshots__/DecryptionFailureBodyView.test.tsx.snap similarity index 100% rename from packages/shared-components/src/message-body/DecryptionFailureBodyView/__snapshots__/DecryptionFailureBodyView.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/__snapshots__/DecryptionFailureBodyView.test.tsx.snap diff --git a/packages/shared-components/src/message-body/DecryptionFailureBodyView/index.tsx b/packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/index.tsx similarity index 100% rename from packages/shared-components/src/message-body/DecryptionFailureBodyView/index.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/DecryptionFailureBodyView/index.tsx 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 new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/packages/shared-components/src/room/timeline/event-tile/body/EventContentBodyView/.gitkeep @@ -0,0 +1 @@ + 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 new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/.gitkeep @@ -0,0 +1 @@ + diff --git a/packages/shared-components/src/room/timeline/event-tile/body/MImageBodyView/.gitkeep b/packages/shared-components/src/room/timeline/event-tile/body/MImageBodyView/.gitkeep new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/packages/shared-components/src/room/timeline/event-tile/body/MImageBodyView/.gitkeep @@ -0,0 +1 @@ + diff --git a/packages/shared-components/src/room/timeline/event-tile/body/MVideoBodyView/.gitkeep b/packages/shared-components/src/room/timeline/event-tile/body/MVideoBodyView/.gitkeep new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/packages/shared-components/src/room/timeline/event-tile/body/MVideoBodyView/.gitkeep @@ -0,0 +1 @@ + diff --git a/packages/shared-components/src/message-body/MediaBody/MediaBody.module.css b/packages/shared-components/src/room/timeline/event-tile/body/MediaBody/MediaBody.module.css similarity index 100% rename from packages/shared-components/src/message-body/MediaBody/MediaBody.module.css rename to packages/shared-components/src/room/timeline/event-tile/body/MediaBody/MediaBody.module.css diff --git a/packages/shared-components/src/message-body/MediaBody/MediaBody.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/body/MediaBody/MediaBody.stories.tsx similarity index 100% rename from packages/shared-components/src/message-body/MediaBody/MediaBody.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/MediaBody/MediaBody.stories.tsx diff --git a/packages/shared-components/src/message-body/MediaBody/MediaBody.test.tsx b/packages/shared-components/src/room/timeline/event-tile/body/MediaBody/MediaBody.test.tsx similarity index 100% rename from packages/shared-components/src/message-body/MediaBody/MediaBody.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/MediaBody/MediaBody.test.tsx diff --git a/packages/shared-components/src/message-body/MediaBody/MediaBody.tsx b/packages/shared-components/src/room/timeline/event-tile/body/MediaBody/MediaBody.tsx similarity index 100% rename from packages/shared-components/src/message-body/MediaBody/MediaBody.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/MediaBody/MediaBody.tsx diff --git a/packages/shared-components/src/message-body/MediaBody/__snapshots__/MediaBody.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/body/MediaBody/__snapshots__/MediaBody.test.tsx.snap similarity index 100% rename from packages/shared-components/src/message-body/MediaBody/__snapshots__/MediaBody.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/body/MediaBody/__snapshots__/MediaBody.test.tsx.snap diff --git a/packages/shared-components/src/message-body/MediaBody/index.tsx b/packages/shared-components/src/room/timeline/event-tile/body/MediaBody/index.tsx similarity index 100% rename from packages/shared-components/src/message-body/MediaBody/index.tsx rename to packages/shared-components/src/room/timeline/event-tile/body/MediaBody/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 new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/packages/shared-components/src/room/timeline/event-tile/body/RedactedBodyView/.gitkeep @@ -0,0 +1 @@ + diff --git a/packages/shared-components/src/room/timeline/event-tile/body/TextualBodyView/.gitkeep b/packages/shared-components/src/room/timeline/event-tile/body/TextualBodyView/.gitkeep new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/packages/shared-components/src/room/timeline/event-tile/body/TextualBodyView/.gitkeep @@ -0,0 +1 @@ + diff --git a/packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.module.css b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.module.css similarity index 100% rename from packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.module.css rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.module.css diff --git a/packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.stories.tsx similarity index 98% rename from packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.stories.tsx index 5dd8b54e19..f7a4c615b7 100644 --- a/packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.stories.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.stories.tsx @@ -10,7 +10,7 @@ import { fn } from "storybook/test"; import type { Meta, StoryObj } from "@storybook/react-vite"; import { ReactionsRowButtonView } from "../ReactionsRowButton"; -import { useMockedViewModel } from "../../core/viewmodel"; +import { useMockedViewModel } from "../../../../../core/viewmodel"; import { ReactionsRowView, type ReactionsRowViewActions, type ReactionsRowViewSnapshot } from "./ReactionsRowView"; interface MockReactionButtonProps { diff --git a/packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.test.tsx b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.test.tsx similarity index 98% rename from packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.test.tsx index 620769b9c6..8332d3268e 100644 --- a/packages/shared-components/src/message-body/ReactionsRow/ReactionsRow.test.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRow.test.tsx @@ -11,7 +11,7 @@ import React, { type MouseEventHandler } from "react"; import userEvent from "@testing-library/user-event"; import { describe, expect, it, vi } from "vitest"; -import { MockViewModel } from "../../core/viewmodel"; +import { MockViewModel } from "../../../../../core/viewmodel"; import { ReactionsRowView, type ReactionsRowViewActions, diff --git a/packages/shared-components/src/message-body/ReactionsRow/ReactionsRowView.tsx b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRowView.tsx similarity index 98% rename from packages/shared-components/src/message-body/ReactionsRow/ReactionsRowView.tsx rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRowView.tsx index f3f83fd186..db7efb8ecd 100644 --- a/packages/shared-components/src/message-body/ReactionsRow/ReactionsRowView.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/ReactionsRowView.tsx @@ -10,7 +10,7 @@ import classNames from "classnames"; import { ReactionAddIcon } from "@vector-im/compound-design-tokens/assets/web/icons"; import { Tooltip } from "@vector-im/compound-web"; -import { type ViewModel, useViewModel } from "../../core/viewmodel"; +import { type ViewModel, useViewModel } from "../../../../../core/viewmodel"; import styles from "./ReactionsRow.module.css"; export interface ReactionsRowViewSnapshot { diff --git a/packages/shared-components/src/message-body/ReactionsRow/__snapshots__/ReactionsRow.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/__snapshots__/ReactionsRow.test.tsx.snap similarity index 100% rename from packages/shared-components/src/message-body/ReactionsRow/__snapshots__/ReactionsRow.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/__snapshots__/ReactionsRow.test.tsx.snap diff --git a/packages/shared-components/src/message-body/ReactionsRow/index.tsx b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/index.tsx similarity index 100% rename from packages/shared-components/src/message-body/ReactionsRow/index.tsx rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRow/index.tsx diff --git a/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButton.module.css b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButton.module.css similarity index 100% rename from packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButton.module.css rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButton.module.css diff --git a/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButton.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButton.stories.tsx similarity index 97% rename from packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButton.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButton.stories.tsx index c180c594b8..907228a173 100644 --- a/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButton.stories.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButton.stories.tsx @@ -9,7 +9,7 @@ import React, { type JSX } from "react"; import { fn } from "storybook/test"; import type { Meta, StoryObj } from "@storybook/react-vite"; -import { useMockedViewModel } from "../../core/viewmodel"; +import { useMockedViewModel } from "../../../../../core/viewmodel"; import { type ReactionsRowButtonTooltipViewSnapshot } from "../ReactionsRowButtonTooltip"; import { ReactionsRowButtonView, diff --git a/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButton.test.tsx b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButton.test.tsx similarity index 100% rename from packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButton.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButton.test.tsx diff --git a/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButtonView.tsx b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButtonView.tsx similarity index 97% rename from packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButtonView.tsx rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButtonView.tsx index 9eaccd7be9..3d57c96d42 100644 --- a/packages/shared-components/src/message-body/ReactionsRowButton/ReactionsRowButtonView.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/ReactionsRowButtonView.tsx @@ -8,7 +8,7 @@ import React, { type HTMLAttributes, type JSX } from "react"; import classNames from "classnames"; -import { type ViewModel, useViewModel } from "../../core/viewmodel"; +import { type ViewModel, useViewModel } from "../../../../../core/viewmodel"; import { ReactionsRowButtonTooltipView, type ReactionsRowButtonTooltipViewModel } from "../ReactionsRowButtonTooltip"; import styles from "./ReactionsRowButton.module.css"; diff --git a/packages/shared-components/src/message-body/ReactionsRowButton/__snapshots__/ReactionsRowButton.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/__snapshots__/ReactionsRowButton.test.tsx.snap similarity index 100% rename from packages/shared-components/src/message-body/ReactionsRowButton/__snapshots__/ReactionsRowButton.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/__snapshots__/ReactionsRowButton.test.tsx.snap diff --git a/packages/shared-components/src/message-body/ReactionsRowButton/index.tsx b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/index.tsx similarity index 100% rename from packages/shared-components/src/message-body/ReactionsRowButton/index.tsx rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButton/index.tsx diff --git a/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx similarity index 93% rename from packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx index 60a3ca3614..2ce06d0c66 100644 --- a/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.stories.tsx @@ -8,8 +8,8 @@ import React, { type JSX, type PropsWithChildren } from "react"; 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 { ReactionsRowButtonTooltipView, type ReactionsRowButtonTooltipViewSnapshot, diff --git a/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.test.tsx b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.test.tsx similarity index 100% rename from packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltip.test.tsx diff --git a/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltipView.tsx b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltipView.tsx similarity index 95% rename from packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltipView.tsx rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltipView.tsx index a2a048fc45..bbdf28f1bf 100644 --- a/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/ReactionsRowButtonTooltipView.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/ReactionsRowButtonTooltipView.tsx @@ -9,7 +9,7 @@ import { type PropsWithChildren, type JSX } from "react"; import React from "react"; import { Tooltip } from "@vector-im/compound-web"; -import { type ViewModel, useViewModel } from "../../core/viewmodel"; +import { type ViewModel, useViewModel } from "../../../../../core/viewmodel"; /** * Snapshot interface for the ReactionsRowButtonTooltip view. diff --git a/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/__snapshots__/ReactionsRowButtonTooltip.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/__snapshots__/ReactionsRowButtonTooltip.test.tsx.snap similarity index 100% rename from packages/shared-components/src/message-body/ReactionsRowButtonTooltip/__snapshots__/ReactionsRowButtonTooltip.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/__snapshots__/ReactionsRowButtonTooltip.test.tsx.snap diff --git a/packages/shared-components/src/message-body/ReactionsRowButtonTooltip/index.tsx b/packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/index.tsx similarity index 100% rename from packages/shared-components/src/message-body/ReactionsRowButtonTooltip/index.tsx rename to packages/shared-components/src/room/timeline/event-tile/reactions/ReactionsRowButtonTooltip/index.tsx diff --git a/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.module.css b/packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.module.css similarity index 100% rename from packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.module.css rename to packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.module.css diff --git a/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.stories.tsx similarity index 93% rename from packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.stories.tsx rename to packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.stories.tsx index 62d1f7f1ae..581aaa21bd 100644 --- a/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.stories.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.stories.tsx @@ -14,8 +14,8 @@ import { type MessageTimestampViewActions, type MessageTimestampViewSnapshot, } from "./MessageTimestampView"; -import { useMockedViewModel } from "../../core/viewmodel/useMockedViewModel"; -import { withViewDocs } from "../../../.storybook/withViewDocs"; +import { useMockedViewModel } from "../../../../../core/viewmodel/useMockedViewModel"; +import { withViewDocs } from "../../../../../../.storybook/withViewDocs"; type MessageTimestampProps = MessageTimestampViewSnapshot & MessageTimestampViewActions; const MessageTimestampWrapperImpl = ({ diff --git a/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.test.tsx b/packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.test.tsx similarity index 97% rename from packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.test.tsx rename to packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.test.tsx index a46fb738e4..5c8b03c93a 100644 --- a/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.test.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.test.tsx @@ -17,9 +17,9 @@ import { type MessageTimestampViewActions, type MessageTimestampViewSnapshot, } from "./MessageTimestampView"; -import { MockViewModel } from "../../core/viewmodel/MockViewModel.ts"; -import { I18nContext } from "../../core/i18n/i18nContext.ts"; -import { I18nApi } from "../../index.ts"; +import { MockViewModel } from "../../../../../core/viewmodel/MockViewModel.ts"; +import { I18nContext } from "../../../../../core/i18n/i18nContext.ts"; +import { I18nApi } from "../../../../../core/i18n/I18nApi.ts"; const { Default, HasHref } = composeStories(stories); diff --git a/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.tsx b/packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.tsx similarity index 95% rename from packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.tsx rename to packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.tsx index d736a7bb42..0d978ca3d8 100644 --- a/packages/shared-components/src/message-body/MessageTimestampView/MessageTimestampView.tsx +++ b/packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/MessageTimestampView.tsx @@ -10,9 +10,9 @@ import classNames from "classnames"; import { Tooltip } from "@vector-im/compound-web"; import styles from "./MessageTimestampView.module.css"; -import { type ViewModel } from "../../core/viewmodel/ViewModel"; -import { useViewModel } from "../../core/viewmodel/useViewModel"; -import { useI18n } from "../../core/i18n/i18nContext"; +import { type ViewModel } from "../../../../../core/viewmodel/ViewModel"; +import { useViewModel } from "../../../../../core/viewmodel/useViewModel"; +import { useI18n } from "../../../../../core/i18n/i18nContext"; export interface MessageTimestampViewSnapshot { /** diff --git a/packages/shared-components/src/message-body/MessageTimestampView/__snapshots__/MessageTimestampView.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/__snapshots__/MessageTimestampView.test.tsx.snap similarity index 100% rename from packages/shared-components/src/message-body/MessageTimestampView/__snapshots__/MessageTimestampView.test.tsx.snap rename to packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/__snapshots__/MessageTimestampView.test.tsx.snap diff --git a/packages/shared-components/src/message-body/MessageTimestampView/index.tsx b/packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/index.tsx similarity index 100% rename from packages/shared-components/src/message-body/MessageTimestampView/index.tsx rename to packages/shared-components/src/room/timeline/event-tile/timestamp/MessageTimestampView/index.tsx