Merge pull request #457 from vector-im/dbkr/yarn_upgrade_20220708
yarn upgrade
This commit is contained in:
commit
8bbce188ef
4 changed files with 3166 additions and 3564 deletions
|
|
@ -42,7 +42,7 @@
|
||||||
"mermaid": "^8.13.8",
|
"mermaid": "^8.13.8",
|
||||||
"normalize.css": "^8.0.1",
|
"normalize.css": "^8.0.1",
|
||||||
"pako": "^2.0.4",
|
"pako": "^2.0.4",
|
||||||
"postcss-preset-env": "^6.7.0",
|
"postcss-preset-env": "^7",
|
||||||
"re-resizable": "^6.9.0",
|
"re-resizable": "^6.9.0",
|
||||||
"react": "^17.0.0",
|
"react": "^17.0.0",
|
||||||
"react-dom": "^17.0.0",
|
"react-dom": "^17.0.0",
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,11 @@ type ClientProviderState = Omit<
|
||||||
"changePassword" | "logout" | "setClient"
|
"changePassword" | "logout" | "setClient"
|
||||||
> & { error?: Error };
|
> & { error?: Error };
|
||||||
|
|
||||||
export const ClientProvider: FC = ({ children }) => {
|
interface Props {
|
||||||
|
children: JSX.Element;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const ClientProvider: FC<Props> = ({ children }) => {
|
||||||
const history = useHistory();
|
const history = useHistory();
|
||||||
const [
|
const [
|
||||||
{ loading, isAuthenticated, isPasswordlessUser, client, userName, error },
|
{ loading, isAuthenticated, isPasswordlessUser, client, userName, error },
|
||||||
|
|
|
||||||
|
|
@ -121,8 +121,10 @@ export const Button = forwardRef<HTMLButtonElement, Props>(
|
||||||
{...mergeProps(rest, filteredButtonProps)}
|
{...mergeProps(rest, filteredButtonProps)}
|
||||||
ref={buttonRef}
|
ref={buttonRef}
|
||||||
>
|
>
|
||||||
{children}
|
<>
|
||||||
{variant === "dropdown" && <ArrowDownIcon />}
|
{children}
|
||||||
|
{variant === "dropdown" && <ArrowDownIcon />}
|
||||||
|
</>
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue