Switch to importing more things from the main js-sdk export (#11394)

src/components/structures/FilePanel.tsx

@@ -25,8 +25,8 @@ import {
     MatrixEventEvent,
     Room,
     RoomEvent,
+    TimelineWindow,
 } from "matrix-js-sdk/src/matrix";
-import { TimelineWindow } from "matrix-js-sdk/src/timeline-window";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { MatrixClientPeg } from "../../MatrixClientPeg";

src/components/structures/RoomSearchView.tsx

@@ -15,8 +15,12 @@ limitations under the License.
 */
 
 import React, { forwardRef, useCallback, useContext, useEffect, useRef, useState } from "react";
-import { ISearchResults, IThreadBundledRelationship, MatrixEvent } from "matrix-js-sdk/src/matrix";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
+import {
+    ISearchResults,
+    IThreadBundledRelationship,
+    MatrixEvent,
+    THREAD_RELATION_TYPE,
+} from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import ScrollPanel from "./ScrollPanel";

src/components/structures/RoomView.tsx

@@ -36,12 +36,12 @@ import {
     ClientEvent,
     MatrixError,
     ISearchResults,
+    THREAD_RELATION_TYPE,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { CallState, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import { throttle } from "lodash";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 
 import shouldHideEvent from "../../shouldHideEvent";
 import { _t } from "../../languageHandler";

src/components/structures/ThreadPanel.tsx

@@ -16,8 +16,7 @@ limitations under the License.
 
 import { Optional } from "matrix-events-sdk";
 import React, { useContext, useEffect, useRef, useState } from "react";
-import { EventTimelineSet, Room } from "matrix-js-sdk/src/matrix";
-import { Thread } from "matrix-js-sdk/src/models/thread";
+import { EventTimelineSet, Room, Thread } from "matrix-js-sdk/src/matrix";
 
 import BaseCard from "../views/right_panel/BaseCard";
 import ResizeNotifier from "../../utils/ResizeNotifier";

src/components/structures/ThreadView.tsx

@@ -15,8 +15,15 @@ limitations under the License.
 */
 
 import React, { createRef, KeyboardEvent } from "react";
-import { Thread, THREAD_RELATION_TYPE, ThreadEvent } from "matrix-js-sdk/src/models/thread";
-import { Room, RoomEvent, IEventRelation, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import {
+    Thread,
+    THREAD_RELATION_TYPE,
+    ThreadEvent,
+    Room,
+    RoomEvent,
+    IEventRelation,
+    MatrixEvent,
+} from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import classNames from "classnames";
 

src/components/structures/TimelinePanel.tsx

@@ -34,11 +34,12 @@ import {
     Relations,
     MatrixError,
     SyncState,
+    TimelineWindow,
+    Thread,
+    ThreadEvent,
 } from "matrix-js-sdk/src/matrix";
-import { TimelineWindow } from "matrix-js-sdk/src/timeline-window";
 import { debounce, findLastIndex, throttle } from "lodash";
 import { logger } from "matrix-js-sdk/src/logger";
-import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread";
 import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 
 import SettingsStore from "../../settings/SettingsStore";