From f2d236d429a6272fed848d30b1ae05dc10d89903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Fri, 5 Feb 2021 08:17:30 +0100 Subject: [PATCH] Use LayoutPropType MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- src/components/structures/MessagePanel.js | 4 ++-- src/components/structures/TimelinePanel.js | 4 ++-- src/components/views/elements/ReplyThread.js | 4 ++-- src/components/views/rooms/EventTile.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js index 7b40980714..5e6b94b9f8 100644 --- a/src/components/structures/MessagePanel.js +++ b/src/components/structures/MessagePanel.js @@ -26,7 +26,7 @@ import * as sdk from '../../index'; import {MatrixClientPeg} from '../../MatrixClientPeg'; import SettingsStore from '../../settings/SettingsStore'; -import {Layout} from "../../settings/Layout"; +import {Layout, LayoutPropType} from "../../settings/Layout"; import {_t} from "../../languageHandler"; import {haveTileForEvent} from "../views/rooms/EventTile"; import {textForEvent} from "../../TextForEvent"; @@ -137,7 +137,7 @@ export default class MessagePanel extends React.Component { showReactions: PropTypes.bool, // which layout to use - layout: Layout, + layout: LayoutPropType, // whether or not to show flair at all enableFlair: PropTypes.bool, diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js index 2d322b378d..e8da5c42d0 100644 --- a/src/components/structures/TimelinePanel.js +++ b/src/components/structures/TimelinePanel.js @@ -18,7 +18,7 @@ limitations under the License. */ import SettingsStore from "../../settings/SettingsStore"; -import {Layout} from "../../settings/Layout"; +import {LayoutPropType} from "../../settings/Layout"; import React, {createRef} from 'react'; import ReactDOM from "react-dom"; import PropTypes from 'prop-types'; @@ -113,7 +113,7 @@ class TimelinePanel extends React.Component { showReactions: PropTypes.bool, // which layout to use - layout: Layout, + layout: LayoutPropType, } // a map from room id to read marker event timestamp diff --git a/src/components/views/elements/ReplyThread.js b/src/components/views/elements/ReplyThread.js index 74aa715642..27d773b099 100644 --- a/src/components/views/elements/ReplyThread.js +++ b/src/components/views/elements/ReplyThread.js @@ -24,7 +24,7 @@ import {wantsDateSeparator} from '../../../DateUtils'; import {MatrixEvent} from 'matrix-js-sdk'; import {makeUserPermalink, RoomPermalinkCreator} from "../../../utils/permalinks/Permalinks"; import SettingsStore from "../../../settings/SettingsStore"; -import {Layout} from "../../../settings/Layout"; +import {LayoutPropType} from "../../../settings/Layout"; import escapeHtml from "escape-html"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import {Action} from "../../../dispatcher/actions"; @@ -43,7 +43,7 @@ export default class ReplyThread extends React.Component { onHeightChanged: PropTypes.func.isRequired, permalinkCreator: PropTypes.instanceOf(RoomPermalinkCreator).isRequired, // Specifies which layout to use. - layout: Layout, + layout: LayoutPropType, }; static contextType = MatrixClientContext; diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 17ba61732a..bb10825b6e 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -27,7 +27,7 @@ import * as TextForEvent from "../../../TextForEvent"; import * as sdk from "../../../index"; import dis from '../../../dispatcher/dispatcher'; import SettingsStore from "../../../settings/SettingsStore"; -import {Layout} from "../../../settings/Layout"; +import {Layout, LayoutPropType} from "../../../settings/Layout"; import {EventStatus} from 'matrix-js-sdk'; import {formatTime} from "../../../DateUtils"; import {MatrixClientPeg} from '../../../MatrixClientPeg'; @@ -227,7 +227,7 @@ export default class EventTile extends React.Component { showReactions: PropTypes.bool, // which layout to use - layout: Layout, + layout: LayoutPropType, // whether or not to show flair at all enableFlair: PropTypes.bool,