* Prevent Cypress typechecking react-sdk components without strict mode This prevented us from switching to `forwardRef` in a bunch of places due to it behaving different with & without strict mode. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update global.d.ts * Switch AccessibleButton and derivatives to using `forwardRef` Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Add missing ref={ref} Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Ensure RefObjects are used consistently Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Re-add WysiwygAutocomplete displayname Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix forwardRef types Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Add comments Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Remove unused export Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Readd comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate types & comments Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Apply suggestions from code review Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Add comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Improve comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
56 lines
1.8 KiB
TypeScript
56 lines
1.8 KiB
TypeScript
/*
|
|
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, { ComponentProps } from "react";
|
|
|
|
import AccessibleButton from "../../components/views/elements/AccessibleButton";
|
|
import { useRovingTabIndex } from "../RovingTabIndex";
|
|
import { Ref } from "./types";
|
|
|
|
type Props<T extends keyof JSX.IntrinsicElements> = Omit<
|
|
ComponentProps<typeof AccessibleButton<T>>,
|
|
"inputRef" | "tabIndex"
|
|
> & {
|
|
inputRef?: Ref;
|
|
focusOnMouseOver?: boolean;
|
|
};
|
|
|
|
// Wrapper to allow use of useRovingTabIndex for simple AccessibleButtons outside of React Functional Components.
|
|
export const RovingAccessibleButton = <T extends keyof JSX.IntrinsicElements>({
|
|
inputRef,
|
|
onFocus,
|
|
onMouseOver,
|
|
focusOnMouseOver,
|
|
...props
|
|
}: Props<T>): JSX.Element => {
|
|
const [onFocusInternal, isActive, ref] = useRovingTabIndex(inputRef);
|
|
return (
|
|
<AccessibleButton
|
|
{...props}
|
|
onFocus={(event: React.FocusEvent) => {
|
|
onFocusInternal();
|
|
onFocus?.(event);
|
|
}}
|
|
onMouseOver={(event: React.MouseEvent) => {
|
|
if (focusOnMouseOver) onFocusInternal();
|
|
onMouseOver?.(event);
|
|
}}
|
|
ref={ref}
|
|
tabIndex={isActive ? 0 : -1}
|
|
/>
|
|
);
|
|
};
|