registration: redesign email verification page (#8554)

src/components/structures/InteractiveAuth.tsx

@@ -269,6 +269,7 @@ export default class InteractiveAuthComponent extends React.Component<IProps, IS
                 setEmailSid={this.setEmailSid}
                 showContinue={!this.props.continueIsManaged}
                 onPhaseChange={this.onPhaseChange}
+                requestEmailToken={this.authLogic.requestEmailToken}
                 continueText={this.props.continueText}
                 continueKind={this.props.continueKind}
                 onCancel={this.onStageCancel}

src/components/structures/auth/Registration.tsx

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import { createClient } from 'matrix-js-sdk/src/matrix';
-import React, { ReactNode } from 'react';
+import React, { Fragment, ReactNode } from 'react';
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import classNames from "classnames";
 import { logger } from "matrix-js-sdk/src/logger";
@@ -36,6 +36,8 @@ import AuthBody from "../../views/auth/AuthBody";
 import AuthHeader from "../../views/auth/AuthHeader";
 import InteractiveAuth from "../InteractiveAuth";
 import Spinner from "../../views/elements/Spinner";
+import { AuthHeaderDisplay } from './header/AuthHeaderDisplay';
+import { AuthHeaderProvider } from './header/AuthHeaderProvider';
 
 interface IProps {
     serverConfig: ValidatedServerConfig;
@@ -619,28 +621,37 @@ export default class Registration extends React.Component<IProps, IState> {
                 { regDoneText }
             </div>;
         } else {
-            body = <div>
-                <h2>{ _t('Create account') }</h2>
-                { errorText }
-                { serverDeadSection }
-                <ServerPicker
-                    title={_t("Host account on")}
-                    dialogTitle={_t("Decide where your account is hosted")}
-                    serverConfig={this.props.serverConfig}
-                    onServerConfigChange={this.state.doingUIAuth ? undefined : this.props.onServerConfigChange}
-                />
-                { this.renderRegisterComponent() }
-                { goBack }
-                { signIn }
-            </div>;
+            body = <Fragment>
+                <div className="mx_Register_mainContent">
+                    <AuthHeaderDisplay
+                        title={_t('Create account')}
+                        serverPicker={<ServerPicker
+                            title={_t("Host account on")}
+                            dialogTitle={_t("Decide where your account is hosted")}
+                            serverConfig={this.props.serverConfig}
+                            onServerConfigChange={this.state.doingUIAuth ? undefined : this.props.onServerConfigChange}
+                        />}
+                    >
+                        { errorText }
+                        { serverDeadSection }
+                    </AuthHeaderDisplay>
+                    { this.renderRegisterComponent() }
+                </div>
+                <div className="mx_Register_footerActions">
+                    { goBack }
+                    { signIn }
+                </div>
+            </Fragment>;
         }
 
         return (
             <AuthPage>
                 <AuthHeader />
-                <AuthBody>
-                    { body }
-                </AuthBody>
+                <AuthHeaderProvider>
+                    <AuthBody flex>
+                        { body }
+                    </AuthBody>
+                </AuthHeaderProvider>
             </AuthPage>
         );
     }

src/components/structures/auth/header/AuthHeaderContext.tsx

@@ -0,0 +1,26 @@
+/*
+Copyright 2022 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 { createContext, Dispatch, ReducerAction, ReducerState } from "react";
+
+import type { AuthHeaderReducer } from "./AuthHeaderProvider";
+
+interface AuthHeaderContextType {
+    state: ReducerState<AuthHeaderReducer>;
+    dispatch: Dispatch<ReducerAction<AuthHeaderReducer>>;
+}
+
+export const AuthHeaderContext = createContext<AuthHeaderContextType>(undefined);

src/components/structures/auth/header/AuthHeaderDisplay.tsx

@@ -0,0 +1,41 @@
+/*
+Copyright 2022 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, { Fragment, PropsWithChildren, ReactNode, useContext } from "react";
+
+import { AuthHeaderContext } from "./AuthHeaderContext";
+
+interface Props {
+    title: ReactNode;
+    icon?: ReactNode;
+    serverPicker: ReactNode;
+}
+
+export function AuthHeaderDisplay({ title, icon, serverPicker, children }: PropsWithChildren<Props>) {
+    const context = useContext(AuthHeaderContext);
+    if (!context) {
+        return null;
+    }
+    const current = context.state.length ? context.state[0] : null;
+    return (
+        <Fragment>
+            { current?.icon ?? icon }
+            <h2>{ current?.title ?? title }</h2>
+            { children }
+            { current?.hideServerPicker !== true && serverPicker }
+        </Fragment>
+    );
+}

src/components/structures/auth/header/AuthHeaderModifier.tsx

@@ -0,0 +1,39 @@
+/*
+Copyright 2022 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 { ReactNode, useContext, useEffect } from "react";
+
+import { AuthHeaderContext } from "./AuthHeaderContext";
+import { AuthHeaderActionType } from "./AuthHeaderProvider";
+
+interface Props {
+    title: ReactNode;
+    icon?: ReactNode;
+    hideServerPicker?: boolean;
+}
+
+export function AuthHeaderModifier(props: Props) {
+    const context = useContext(AuthHeaderContext);
+    const dispatch = context ? context.dispatch : null;
+    useEffect(() => {
+        if (!dispatch) {
+            return;
+        }
+        dispatch({ type: AuthHeaderActionType.Add, value: props });
+        return () => dispatch({ type: AuthHeaderActionType.Remove, value: props });
+    }, [props, dispatch]);
+    return null;
+}

src/components/structures/auth/header/AuthHeaderProvider.tsx

@@ -0,0 +1,52 @@
+/*
+Copyright 2022 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 { isEqual } from "lodash";
+import React, { ComponentProps, PropsWithChildren, Reducer, useReducer } from "react";
+
+import { AuthHeaderContext } from "./AuthHeaderContext";
+import { AuthHeaderModifier } from "./AuthHeaderModifier";
+
+export enum AuthHeaderActionType {
+    Add,
+    Remove
+}
+
+interface AuthHeaderAction {
+    type: AuthHeaderActionType;
+    value: ComponentProps<typeof AuthHeaderModifier>;
+}
+
+export type AuthHeaderReducer = Reducer<ComponentProps<typeof AuthHeaderModifier>[], AuthHeaderAction>;
+
+export function AuthHeaderProvider({ children }: PropsWithChildren<{}>) {
+    const [state, dispatch] = useReducer<AuthHeaderReducer>(
+        (state: ComponentProps<typeof AuthHeaderModifier>[], action: AuthHeaderAction) => {
+            switch (action.type) {
+                case AuthHeaderActionType.Add:
+                    return [action.value, ...state];
+                case AuthHeaderActionType.Remove:
+                    return (state.length && isEqual(state[0], action.value)) ? state.slice(1) : state;
+            }
+        },
+        [] as ComponentProps<typeof AuthHeaderModifier>[],
+    );
+    return (
+        <AuthHeaderContext.Provider value={{ state, dispatch }}>
+            { children }
+        </AuthHeaderContext.Provider>
+    );
+}