-
);
@@ -232,7 +189,7 @@ export default class LeftPanel2 extends React.Component
-
-
+
+
+
+
+ {hostingLink}
+
+
+ {OwnProfileStore.instance.displayName}
+
+
+ {MatrixClientPeg.get().getUserId()}
+
+
+
+ ![{_t("Switch]({require("../../../res/img/feather-customised/sun.svg")})
+
+
+
+
+ -
+ {homeButton}
+
-
+
this.onSettingsOpen(e, USER_NOTIFICATIONS_TAB)}> + + {_t("Notification settings")} + +
+ -
+
this.onSettingsOpen(e, USER_SECURITY_TAB)}> + + {_t("Security & privacy")} + +
+ -
+
this.onSettingsOpen(e, null)}> + + {_t("All settings")} + +
+ -
+
+ + {_t("Archived rooms")} + +
+ -
+
+ + {_t("Feedback")} + +
+
+
+ -
+
-
+
+ + {_t("Sign out")} + +
+
+
+
+ {this.renderContextMenu()}
+
-
-
-
- {hostingLink}
-
-
- {OwnProfileStore.instance.displayName}
-
-
- {MatrixClientPeg.get().getUserId()}
-
-
-
-
-
-
-
-
- -
- {homeButton}
-
-
-
this.onSettingsOpen(e, USER_NOTIFICATIONS_TAB)}> - - {_t("Notification settings")} - -
- -
-
this.onSettingsOpen(e, USER_SECURITY_TAB)}> - - {_t("Security & privacy")} - -
- -
-
this.onSettingsOpen(e, null)}> - - {_t("All settings")} - -
- -
-
- - {_t("Archived rooms")} - -
- -
-
- - {_t("Feedback")} - -
-
-
- -
-
-
-
- - {_t("Sign out")} - -
-
@@ -55,8 +44,8 @@ export default class Welcome extends React.PureComponent {
className="mx_WelcomePage"
url={pageUrl}
replaceMap={{
- "$riot:ssoUrl": tmpClient.getSsoLoginUrl(callbackUrl.toString(), "sso"),
- "$riot:casUrl": tmpClient.getSsoLoginUrl(callbackUrl.toString(), "cas"),
+ "$riot:ssoUrl": "#/start_sso",
+ "$riot:casUrl": "#/start_cas",
}}
/>
{
const nVisible = Math.floor(layout.visibleTiles);
const visibleTiles = tiles.slice(0, nVisible);
+ const maxTilesFactored = layout.tilesWithResizerBoxFactor(tiles.length);
+ const showMoreBtnClasses = classNames({
+ 'mx_RoomSublist2_showNButton': true,
+ 'mx_RoomSublist2_isCutting': this.state.isResizing && layout.visibleTiles < maxTilesFactored,
+ });
+
// If we're hiding rooms, show a 'show more' button to the user. This button
// floats above the resize handle, if we have one present. If the user has all
// tiles visible, it becomes 'show less'.
@@ -370,7 +386,7 @@ export default class RoomSublist2 extends React.Component {
);
if (this.props.isMinimized) showMoreText = null;
showNButton = (
-
-
);
if (!this.state.hasPermissionToLoad) {
diff --git a/src/components/views/elements/InlineSpinner.js b/src/components/views/elements/InlineSpinner.js
index ad70471d89..ad88868790 100644
--- a/src/components/views/elements/InlineSpinner.js
+++ b/src/components/views/elements/InlineSpinner.js
@@ -16,6 +16,8 @@ limitations under the License.
import React from "react";
import createReactClass from 'create-react-class';
+import {_t} from "../../../languageHandler";
+import SettingsStore from "../../../settings/SettingsStore";
export default createReactClass({
displayName: 'InlineSpinner',
@@ -25,9 +27,25 @@ export default createReactClass({
const h = this.props.h || 16;
const imgClass = this.props.imgClassName || "";
+ let divClass;
+ let imageSource;
+ if (SettingsStore.isFeatureEnabled('feature_new_spinner')) {
+ divClass = "mx_InlineSpinner mx_Spinner_spin";
+ imageSource = require("../../../../res/img/spinner.svg");
+ } else {
+ divClass = "mx_InlineSpinner";
+ imageSource = require("../../../../res/img/spinner.gif");
+ }
+
return (
-
- ![]({require("../../../../res/img/spinner.gif")})
+ {
else label = _t(label);
if (this.props.useCheckbox) {
- return
+ return
{label}
;
} else {
return (
{
+ value: T;
+ className?: string;
+ disabled?: boolean;
+ label: React.ReactChild;
+ description?: React.ReactChild;
+}
+
+interface IProps {
+ name: string;
+ className?: string;
+ definitions: IDefinition[];
+ value?: T; // if not provided no options will be selected
+ onChange(newValue: T);
+}
+
+function StyledRadioGroup({name, definitions, value, className, onChange}: IProps) {
+ const _onChange = e => {
+ onChange(e.target.value);
+ };
+
+ return
+ {definitions.map(d =>
+
+ {d.label}
+
+ {d.description}
+ )}
+ ;
+}
+
+export default StyledRadioGroup;
diff --git a/src/components/views/messages/MAudioBody.js b/src/components/views/messages/MAudioBody.js
index a642936fec..37f85a108f 100644
--- a/src/components/views/messages/MAudioBody.js
+++ b/src/components/views/messages/MAudioBody.js
@@ -22,6 +22,7 @@ import MFileBody from './MFileBody';
import {MatrixClientPeg} from '../../../MatrixClientPeg';
import { decryptFile } from '../../../utils/DecryptFile';
import { _t } from '../../../languageHandler';
+import InlineSpinner from '../elements/InlineSpinner';
export default class MAudioBody extends React.Component {
constructor(props) {
@@ -94,7 +95,7 @@ export default class MAudioBody extends React.Component {
// Not sure how tall the audio player is so not sure how tall it should actually be.
return (
-
+ {
@@ -82,6 +83,7 @@ export default class RoomSublist2 extends React.Component {
this.state = {
notificationState: new ListNotificationState(this.props.isInvite, this.props.tagId),
menuDisplayed: false,
+ isResizing: false,
};
this.state.notificationState.setRooms(this.props.rooms);
}
@@ -111,13 +113,21 @@ export default class RoomSublist2 extends React.Component {
this.forceUpdate(); // because the layout doesn't trigger a re-render
};
+ private onResizeStart = () => {
+ this.setState({isResizing: true});
+ };
+
+ private onResizeStop = () => {
+ this.setState({isResizing: false});
+ };
+
private onShowAllClick = () => {
this.props.layout.visibleTiles = this.props.layout.tilesWithPadding(this.numTiles, MAX_PADDING_HEIGHT);
this.forceUpdate(); // because the layout doesn't trigger a re-render
};
private onShowLessClick = () => {
- this.props.layout.visibleTiles = this.props.layout.minVisibleTiles;
+ this.props.layout.visibleTiles = this.props.layout.defaultVisibleTiles;
this.forceUpdate(); // because the layout doesn't trigger a re-render
};
@@ -320,8 +330,8 @@ export default class RoomSublist2 extends React.Component {
{this.props.label}
{this.renderMenu()}
- {this.props.isMinimized ? null : addRoomButton}
{this.props.isMinimized ? null : badgeContainer}
+ {this.props.isMinimized ? null : addRoomButton}
{this.props.isMinimized ? badgeContainer : null}
{this.props.isMinimized ? addRoomButton : null}
@@ -356,6 +366,12 @@ export default class RoomSublist2 extends React.Component
+
+ 
);
},
diff --git a/src/components/views/elements/MessageSpinner.js b/src/components/views/elements/MessageSpinner.js
deleted file mode 100644
index 1775fdd4d7..0000000000
--- a/src/components/views/elements/MessageSpinner.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2017 Vector Creations Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import createReactClass from 'create-react-class';
-
-export default createReactClass({
- displayName: 'MessageSpinner',
-
- render: function() {
- const w = this.props.w || 32;
- const h = this.props.h || 32;
- const imgClass = this.props.imgClassName || "";
- const msg = this.props.msg || "Loading...";
- return (
-
-
-
- );
- },
-});
diff --git a/src/components/views/elements/SettingsFlag.tsx b/src/components/views/elements/SettingsFlag.tsx
index 9bdd04d803..4f41db51e2 100644
--- a/src/components/views/elements/SettingsFlag.tsx
+++ b/src/components/views/elements/SettingsFlag.tsx
@@ -30,6 +30,7 @@ interface IProps {
isExplicit?: boolean;
// XXX: once design replaces all toggles make this the default
useCheckbox?: boolean;
+ disabled?: boolean;
onChange?(checked: boolean): void;
}
@@ -78,14 +79,23 @@ export default class SettingsFlag extends React.Component{ msg }
-
-
{label}
-
);
}
diff --git a/src/components/views/elements/Spinner.js b/src/components/views/elements/Spinner.js
index b1fe97d5d2..08ba0cf921 100644
--- a/src/components/views/elements/Spinner.js
+++ b/src/components/views/elements/Spinner.js
@@ -16,19 +16,39 @@ limitations under the License.
*/
import React from "react";
-import createReactClass from 'create-react-class';
+import PropTypes from "prop-types";
+import {_t} from "../../../languageHandler";
+import SettingsStore from "../../../settings/SettingsStore";
-export default createReactClass({
- displayName: 'Spinner',
+const Spinner = ({w = 32, h = 32, imgClassName, message}) => {
+ let divClass;
+ let imageSource;
+ if (SettingsStore.isFeatureEnabled('feature_new_spinner')) {
+ divClass = "mx_Spinner mx_Spinner_spin";
+ imageSource = require("../../../../res/img/spinner.svg");
+ } else {
+ divClass = "mx_Spinner";
+ imageSource = require("../../../../res/img/spinner.gif");
+ }
- render: function() {
- const w = this.props.w || 32;
- const h = this.props.h || 32;
- const imgClass = this.props.imgClassName || "";
- return (
-
-
-
- );
- },
-});
+ return (
+
-
+ { message &&
+ );
+};
+Spinner.propTypes = {
+ w: PropTypes.number,
+ h: PropTypes.number,
+ imgClassName: PropTypes.string,
+ message: PropTypes.node,
+};
+
+export default Spinner;
diff --git a/src/components/views/elements/StyledRadioGroup.tsx b/src/components/views/elements/StyledRadioGroup.tsx
new file mode 100644
index 0000000000..050a8b7adb
--- /dev/null
+++ b/src/components/views/elements/StyledRadioGroup.tsx
@@ -0,0 +1,61 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from "react";
+import classNames from "classnames";
+
+import StyledRadioButton from "./StyledRadioButton";
+
+interface IDefinition{ message}
+ ;
+ placeholder =
-
+
);
diff --git a/src/components/views/rooms/NotificationBadge.tsx b/src/components/views/rooms/NotificationBadge.tsx
index 523b5a55cc..6929341845 100644
--- a/src/components/views/rooms/NotificationBadge.tsx
+++ b/src/components/views/rooms/NotificationBadge.tsx
@@ -141,6 +141,20 @@ export default class NotificationBadge extends React.PureComponent
+
+
{/* set by CSS masking */}
@@ -386,7 +402,7 @@ export default class RoomSublist2 extends React.Component {
);
if (this.props.isMinimized) showLessText = null;
showNButton = (
-
+
{/* set by CSS masking */}
@@ -432,6 +448,8 @@ export default class RoomSublist2 extends React.Component {
resizeHandles={handles}
onResize={this.onResize}
className="mx_RoomSublist2_resizeBox"
+ onResizeStart={this.onResizeStart}
+ onResizeStop={this.onResizeStop}
>
{visibleTiles}
{showNButton}
diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.js b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
index 96e6b3d354..c521e228e0 100644
--- a/src/components/views/settings/tabs/room/NotificationSettingsTab.js
+++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.js
@@ -39,12 +39,11 @@ export default class NotificationsSettingsTab extends React.Component {
// TODO: [REACT-WARNING] Replace component with real class, use constructor for refs
UNSAFE_componentWillMount() { // eslint-disable-line camelcase
- Notifier.getSoundForRoom(this.props.roomId).then((soundData) => {
- if (!soundData) {
- return;
- }
- this.setState({currentSound: soundData.name || soundData.url});
- });
+ const soundData = Notifier.getSoundForRoom(this.props.roomId);
+ if (!soundData) {
+ return;
+ }
+ this.setState({currentSound: soundData.name || soundData.url});
this._soundUpload = createRef();
}
diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
index e935663bbe..f02147608d 100644
--- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
@@ -33,6 +33,7 @@ import StyledCheckbox from '../../../elements/StyledCheckbox';
import SettingsFlag from '../../../elements/SettingsFlag';
import Field from '../../../elements/Field';
import EventTilePreview from '../../../elements/EventTilePreview';
+import StyledRadioGroup from "../../../elements/StyledRadioGroup";
interface IProps {
}
@@ -116,8 +117,7 @@ export default class AppearanceUserSettingsTab extends React.Component): void => {
- const newTheme = e.target.value;
+ private onThemeChange = (newTheme: string): void => {
if (this.state.theme === newTheme) return;
// doing getValue in the .catch will still return the value we failed to set,
@@ -277,19 +277,18 @@ export default class AppearanceUserSettingsTab extends React.Component
{_t("Theme")}
{systemThemeSection}
-
- {orderedThemes.map(theme => {
- return
- {theme.name}
- ;
- })}
+
+ advanced = <>
+
;
+ ;
}
return
+ ({
+ value: t.id,
+ label: t.name,
+ disabled: this.state.useSystemTheme,
+ className: "mx_ThemeSelector_" + t.id,
+ }))}
+ onChange={this.onThemeChange}
+ value={this.state.useSystemTheme ? undefined : this.state.theme}
+ />
{customThemeForm}
{toggle}
diff --git a/src/hooks/useAccountData.ts b/src/hooks/useAccountData.ts
new file mode 100644
index 0000000000..dd0d53f0d3
--- /dev/null
+++ b/src/hooks/useAccountData.ts
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {useCallback, useState} from "react";
+import {MatrixClient} from "matrix-js-sdk/src/client";
+import {MatrixEvent} from "matrix-js-sdk/src/models/event";
+import {Room} from "matrix-js-sdk/src/models/room";
+
+import {useEventEmitter} from "./useEventEmitter";
+
+const tryGetContent = (ev?: MatrixEvent) => ev ? ev.getContent() : undefined;
+
+// Hook to simplify listening to Matrix account data
+export const useAccountData = (cli: MatrixClient, eventType: string) => {
+ const [value, setValue] = useState(() => tryGetContent(cli.getAccountData(eventType)));
+
+ const handler = useCallback((event) => {
+ if (event.getType() !== eventType) return;
+ setValue(event.getContent());
+ }, [cli, eventType]);
+ useEventEmitter(cli, "accountData", handler);
+
+ return value || {} as T;
+};
+
+// Hook to simplify listening to Matrix room account data
+export const useRoomAccountData = (room: Room, eventType: string) => {
+ const [value, setValue] = useState(() => tryGetContent(room.getAccountData(eventType)));
+
+ const handler = useCallback((event) => {
+ if (event.getType() !== eventType) return;
+ setValue(event.getContent());
+ }, [room, eventType]);
+ useEventEmitter(room, "Room.accountData", handler);
+
+ return value || {} as T;
+};
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 86d5f488ff..d721979329 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -479,6 +479,7 @@
"%(senderName)s invited %(targetName)s": "%(senderName)s invited %(targetName)s",
"You changed the room topic": "You changed the room topic",
"%(senderName)s changed the room topic": "%(senderName)s changed the room topic",
+ "New spinner design": "New spinner design",
"Font scaling": "Font scaling",
"Message Pinning": "Message Pinning",
"Custom user status messages": "Custom user status messages",
@@ -493,7 +494,7 @@
"Font size": "Font size",
"Use custom size": "Use custom size",
"Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
- "Use compact timeline layout": "Use compact timeline layout",
+ "Use a more compact ‘Modern’ layout": "Use a more compact ‘Modern’ layout",
"Show a placeholder for removed messages": "Show a placeholder for removed messages",
"Show join/leave messages (invites/kicks/bans unaffected)": "Show join/leave messages (invites/kicks/bans unaffected)",
"Show avatar changes": "Show avatar changes",
diff --git a/src/notifications/ContentRules.js b/src/notifications/ContentRules.ts
similarity index 69%
rename from src/notifications/ContentRules.js
rename to src/notifications/ContentRules.ts
index 8c285220c7..a3ec017e37 100644
--- a/src/notifications/ContentRules.js
+++ b/src/notifications/ContentRules.ts
@@ -1,6 +1,6 @@
/*
Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,9 +15,17 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
+import {PushRuleVectorState, State} from "./PushRuleVectorState";
+import {IExtendedPushRule, IPushRuleSet, IRuleSets} from "./types";
-import {PushRuleVectorState} from "./PushRuleVectorState";
+export interface IContentRules {
+ vectorState: State;
+ rules: IExtendedPushRule[];
+ externalRules: IExtendedPushRule[];
+}
+
+export const SCOPE = "global";
+export const KIND = "content";
export class ContentRules {
/**
@@ -31,7 +39,7 @@ export class ContentRules {
* externalRules: a list of other keyword rules, with states other than
* vectorState
*/
- static parseContentRules(rulesets) {
+ static parseContentRules(rulesets: IRuleSets): IContentRules {
// first categorise the keyword rules in terms of their actions
const contentRules = this._categoriseContentRules(rulesets);
@@ -51,59 +59,72 @@ export class ContentRules {
if (contentRules.loud.length) {
return {
- vectorState: PushRuleVectorState.LOUD,
+ vectorState: State.Loud,
rules: contentRules.loud,
- externalRules: [].concat(contentRules.loud_but_disabled, contentRules.on, contentRules.on_but_disabled, contentRules.other),
+ externalRules: [
+ ...contentRules.loud_but_disabled,
+ ...contentRules.on,
+ ...contentRules.on_but_disabled,
+ ...contentRules.other,
+ ],
};
} else if (contentRules.loud_but_disabled.length) {
return {
- vectorState: PushRuleVectorState.OFF,
+ vectorState: State.Off,
rules: contentRules.loud_but_disabled,
- externalRules: [].concat(contentRules.on, contentRules.on_but_disabled, contentRules.other),
+ externalRules: [...contentRules.on, ...contentRules.on_but_disabled, ...contentRules.other],
};
} else if (contentRules.on.length) {
return {
- vectorState: PushRuleVectorState.ON,
+ vectorState: State.On,
rules: contentRules.on,
- externalRules: [].concat(contentRules.on_but_disabled, contentRules.other),
+ externalRules: [...contentRules.on_but_disabled, ...contentRules.other],
};
} else if (contentRules.on_but_disabled.length) {
return {
- vectorState: PushRuleVectorState.OFF,
+ vectorState: State.Off,
rules: contentRules.on_but_disabled,
externalRules: contentRules.other,
};
} else {
return {
- vectorState: PushRuleVectorState.ON,
+ vectorState: State.On,
rules: [],
externalRules: contentRules.other,
};
}
}
- static _categoriseContentRules(rulesets) {
- const contentRules = {on: [], on_but_disabled: [], loud: [], loud_but_disabled: [], other: []};
+ static _categoriseContentRules(rulesets: IRuleSets) {
+ const contentRules: Record<"on"|"on_but_disabled"|"loud"|"loud_but_disabled"|"other", IExtendedPushRule[]> = {
+ on: [],
+ on_but_disabled: [],
+ loud: [],
+ loud_but_disabled: [],
+ other: [],
+ };
+
for (const kind in rulesets.global) {
for (let i = 0; i < Object.keys(rulesets.global[kind]).length; ++i) {
const r = rulesets.global[kind][i];
// check it's not a default rule
- if (r.rule_id[0] === '.' || kind !== 'content') {
+ if (r.rule_id[0] === '.' || kind !== "content") {
continue;
}
- r.kind = kind; // is this needed? not sure
+ // this is needed as we are flattening an object of arrays into a single array
+ r.kind = kind;
switch (PushRuleVectorState.contentRuleVectorStateKind(r)) {
- case PushRuleVectorState.ON:
+ case State.On:
if (r.enabled) {
contentRules.on.push(r);
} else {
contentRules.on_but_disabled.push(r);
}
break;
- case PushRuleVectorState.LOUD:
+ case State.Loud:
if (r.enabled) {
contentRules.loud.push(r);
} else {
diff --git a/src/notifications/NotificationUtils.js b/src/notifications/NotificationUtils.ts
similarity index 80%
rename from src/notifications/NotificationUtils.js
rename to src/notifications/NotificationUtils.ts
index bf393da060..e3b7f66447 100644
--- a/src/notifications/NotificationUtils.js
+++ b/src/notifications/NotificationUtils.ts
@@ -1,6 +1,6 @@
/*
Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,7 +15,13 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
+import {Action, Actions} from "./types";
+
+interface IEncodedActions {
+ notify: boolean;
+ sound?: string;
+ highlight?: boolean;
+}
export class NotificationUtils {
// Encodes a dictionary of {
@@ -24,12 +30,12 @@ export class NotificationUtils {
// "highlight: true/false,
// }
// to a list of push actions.
- static encodeActions(action) {
+ static encodeActions(action: IEncodedActions) {
const notify = action.notify;
const sound = action.sound;
const highlight = action.highlight;
if (notify) {
- const actions = ["notify"];
+ const actions: Action[] = [Actions.Notify];
if (sound) {
actions.push({"set_tweak": "sound", "value": sound});
}
@@ -40,7 +46,7 @@ export class NotificationUtils {
}
return actions;
} else {
- return ["dont_notify"];
+ return [Actions.DontNotify];
}
}
@@ -50,18 +56,18 @@ export class NotificationUtils {
// "highlight: true/false,
// }
// If the actions couldn't be decoded then returns null.
- static decodeActions(actions) {
+ static decodeActions(actions: Action[]): IEncodedActions {
let notify = false;
let sound = null;
let highlight = false;
for (let i = 0; i < actions.length; ++i) {
const action = actions[i];
- if (action === "notify") {
+ if (action === Actions.Notify) {
notify = true;
- } else if (action === "dont_notify") {
+ } else if (action === Actions.DontNotify) {
notify = false;
- } else if (typeof action === 'object') {
+ } else if (typeof action === "object") {
if (action.set_tweak === "sound") {
sound = action.value;
} else if (action.set_tweak === "highlight") {
@@ -81,7 +87,7 @@ export class NotificationUtils {
highlight = true;
}
- const result = {notify: notify, highlight: highlight};
+ const result: IEncodedActions = { notify, highlight };
if (sound !== null) {
result.sound = sound;
}
diff --git a/src/notifications/PushRuleVectorState.js b/src/notifications/PushRuleVectorState.ts
similarity index 69%
rename from src/notifications/PushRuleVectorState.js
rename to src/notifications/PushRuleVectorState.ts
index 263226ce1c..d33426cfc4 100644
--- a/src/notifications/PushRuleVectorState.js
+++ b/src/notifications/PushRuleVectorState.ts
@@ -1,6 +1,6 @@
/*
Copyright 2016 OpenMarket Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,43 +15,42 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
import {StandardActions} from "./StandardActions";
import {NotificationUtils} from "./NotificationUtils";
+import {IPushRule} from "./types";
+
+export enum State {
+ /** The push rule is disabled */
+ Off = "off",
+ /** The user will receive push notification for this rule */
+ On = "on",
+ /** The user will receive push notification for this rule with sound and
+ highlight if this is legitimate */
+ Loud = "loud",
+}
export class PushRuleVectorState {
- // Backwards compatibility (things should probably be using .states instead)
- static OFF = "off";
- static ON = "on";
- static LOUD = "loud";
+ // Backwards compatibility (things should probably be using the enum above instead)
+ static OFF = State.Off;
+ static ON = State.On;
+ static LOUD = State.Loud;
/**
* Enum for state of a push rule as defined by the Vector UI.
* @readonly
* @enum {string}
*/
- static states = {
- /** The push rule is disabled */
- OFF: PushRuleVectorState.OFF,
-
- /** The user will receive push notification for this rule */
- ON: PushRuleVectorState.ON,
-
- /** The user will receive push notification for this rule with sound and
- highlight if this is legitimate */
- LOUD: PushRuleVectorState.LOUD,
- };
+ static states = State;
/**
* Convert a PushRuleVectorState to a list of actions
*
* @return [object] list of push-rule actions
*/
- static actionsFor(pushRuleVectorState) {
- if (pushRuleVectorState === PushRuleVectorState.ON) {
+ static actionsFor(pushRuleVectorState: State) {
+ if (pushRuleVectorState === State.On) {
return StandardActions.ACTION_NOTIFY;
- } else if (pushRuleVectorState === PushRuleVectorState.LOUD) {
+ } else if (pushRuleVectorState === State.Loud) {
return StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND;
}
}
@@ -63,7 +62,7 @@ export class PushRuleVectorState {
* category or in PushRuleVectorState.LOUD, regardless of its enabled
* state. Returns null if it does not match these categories.
*/
- static contentRuleVectorStateKind(rule) {
+ static contentRuleVectorStateKind(rule: IPushRule): State {
const decoded = NotificationUtils.decodeActions(rule.actions);
if (!decoded) {
@@ -81,10 +80,10 @@ export class PushRuleVectorState {
let stateKind = null;
switch (tweaks) {
case 0:
- stateKind = PushRuleVectorState.ON;
+ stateKind = State.On;
break;
case 2:
- stateKind = PushRuleVectorState.LOUD;
+ stateKind = State.Loud;
break;
}
return stateKind;
diff --git a/src/notifications/StandardActions.js b/src/notifications/StandardActions.ts
similarity index 98%
rename from src/notifications/StandardActions.js
rename to src/notifications/StandardActions.ts
index b54cea332a..c17010af9a 100644
--- a/src/notifications/StandardActions.js
+++ b/src/notifications/StandardActions.ts
@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
import {NotificationUtils} from "./NotificationUtils";
const encodeActions = NotificationUtils.encodeActions;
diff --git a/src/notifications/types.ts b/src/notifications/types.ts
new file mode 100644
index 0000000000..9622193740
--- /dev/null
+++ b/src/notifications/types.ts
@@ -0,0 +1,111 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export enum NotificationSetting {
+ AllMessages = "all_messages", // .m.rule.message = notify
+ DirectMessagesMentionsKeywords = "dm_mentions_keywords", // .m.rule.message = mark_unread. This is the new default.
+ MentionsKeywordsOnly = "mentions_keywords", // .m.rule.message = mark_unread; .m.rule.room_one_to_one = mark_unread
+ Never = "never", // .m.rule.master = enabled (dont_notify)
+}
+
+export interface ISoundTweak {
+ set_tweak: "sound";
+ value: string;
+}
+export interface IHighlightTweak {
+ set_tweak: "highlight";
+ value?: boolean;
+}
+
+export type Tweak = ISoundTweak | IHighlightTweak;
+
+export enum Actions {
+ Notify = "notify",
+ DontNotify = "dont_notify", // no-op
+ Coalesce = "coalesce", // unused
+ MarkUnread = "mark_unread", // new
+}
+
+export type Action = Actions | Tweak;
+
+// Push rule kinds in descending priority order
+export enum Kind {
+ Override = "override",
+ ContentSpecific = "content",
+ RoomSpecific = "room",
+ SenderSpecific = "sender",
+ Underride = "underride",
+}
+
+export interface IEventMatchCondition {
+ kind: "event_match";
+ key: string;
+ pattern: string;
+}
+
+export interface IContainsDisplayNameCondition {
+ kind: "contains_display_name";
+}
+
+export interface IRoomMemberCountCondition {
+ kind: "room_member_count";
+ is: string;
+}
+
+export interface ISenderNotificationPermissionCondition {
+ kind: "sender_notification_permission";
+ key: string;
+}
+
+export type Condition =
+ IEventMatchCondition |
+ IContainsDisplayNameCondition |
+ IRoomMemberCountCondition |
+ ISenderNotificationPermissionCondition;
+
+export enum RuleIds {
+ MasterRule = ".m.rule.master", // The master rule (all notifications disabling)
+ MessageRule = ".m.rule.message",
+ EncryptedMessageRule = ".m.rule.encrypted",
+ RoomOneToOneRule = ".m.rule.room_one_to_one",
+ EncryptedRoomOneToOneRule = ".m.rule.room_one_to_one",
+}
+
+export interface IPushRule {
+ enabled: boolean;
+ rule_id: RuleIds | string;
+ actions: Action[];
+ default: boolean;
+ conditions?: Condition[]; // only applicable to `underride` and `override` rules
+ pattern?: string; // only applicable to `content` rules
+}
+
+// push rule extended with kind, used by ContentRules and js-sdk's pushprocessor
+export interface IExtendedPushRule extends IPushRule {
+ kind: Kind;
+}
+
+export interface IPushRuleSet {
+ override: IPushRule[];
+ content: IPushRule[];
+ room: IPushRule[];
+ sender: IPushRule[];
+ underride: IPushRule[];
+}
+
+export interface IRuleSets {
+ global: IPushRuleSet;
+}
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index eb882b2d18..820329f6c6 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -97,6 +97,12 @@ export const SETTINGS = {
// // not use this for new settings.
// invertedSettingName: "my-negative-setting",
// },
+ "feature_new_spinner": {
+ isFeature: true,
+ displayName: _td("New spinner design"),
+ supportedLevels: LEVELS_FEATURE,
+ default: false,
+ },
"feature_font_scaling": {
isFeature: true,
displayName: _td("Font scaling"),
@@ -192,12 +198,12 @@ export const SETTINGS = {
},
// TODO: Wire up appropriately to UI (FTUE notifications)
"Notifications.alwaysShowBadgeCounts": {
- supportedLevels: ['account'],
+ supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
default: false,
},
"useCompactLayout": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
- displayName: _td('Use compact timeline layout'),
+ displayName: _td('Use a more compact ‘Modern’ layout'),
default: false,
},
"showRedactions": {
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
index ebc7b95854..8ca8ad637b 100644
--- a/src/stores/room-list/ListLayout.ts
+++ b/src/stores/room-list/ListLayout.ts
@@ -18,6 +18,10 @@ import { TagID } from "./models";
const TILE_HEIGHT_PX = 44;
+// the .65 comes from the CSS where the show more button is
+// mathematically 65% of a tile when floating.
+const RESIZER_BOX_FACTOR = 0.65;
+
interface ISerializedListLayout {
numTiles: number;
showPreviews: boolean;
@@ -67,6 +71,7 @@ export class ListLayout {
}
public get visibleTiles(): number {
+ if (this._n === 0) return this.defaultVisibleTiles;
return Math.max(this._n, this.minVisibleTiles);
}
@@ -76,9 +81,13 @@ export class ListLayout {
}
public get minVisibleTiles(): number {
- // the .65 comes from the CSS where the show more button is
- // mathematically 65% of a tile when floating.
- return 4.65;
+ return 1 + RESIZER_BOX_FACTOR;
+ }
+
+ public get defaultVisibleTiles(): number {
+ // TODO: Remove dogfood flag
+ const val = Number(localStorage.getItem("mx_dogfood_rl_defTiles") || 4);
+ return val + RESIZER_BOX_FACTOR;
}
public calculateTilesToPixelsMin(maxTiles: number, n: number, possiblePadding: number): number {
@@ -92,6 +101,10 @@ export class ListLayout {
return this.tilesToPixels(Math.min(maxTiles, n)) + padding;
}
+ public tilesWithResizerBoxFactor(n: number): number {
+ return n + RESIZER_BOX_FACTOR;
+ }
+
public tilesWithPadding(n: number, paddingPx: number): number {
return this.pixelsToTiles(this.tilesToPixelsWithPadding(n, paddingPx));
}
diff --git a/src/toasts/AnalyticsToast.tsx b/src/toasts/AnalyticsToast.tsx
index 7cd59222dd..b186a65d9d 100644
--- a/src/toasts/AnalyticsToast.tsx
+++ b/src/toasts/AnalyticsToast.tsx
@@ -24,14 +24,12 @@ import GenericToast from "../components/views/toasts/GenericToast";
import ToastStore from "../stores/ToastStore";
const onAccept = () => {
- console.log("DEBUG onAccept AnalyticsToast");
dis.dispatch({
action: 'accept_cookies',
});
};
const onReject = () => {
- console.log("DEBUG onReject AnalyticsToast");
dis.dispatch({
action: "reject_cookies",
});