Open platform to collect and prioritize feedback
Changes for react 18
Matt Roberts37bb47d34a45
diff --git a/public/components/common/Button.tsx b/public/components/common/Button.tsxindex dc2796d43..d23419764 100644--- a/public/components/common/Button.tsx+++ b/public/components/common/Button.tsx@@ -26,7 +26,7 @@ export class ButtonClickEvent {}}-export const Button: React.FC<ButtonProps> = (props) => {+export const Button: React.FC<ButtonProps> = ({ size = "default", variant = "secondary", type = "button", ...props }) => {const [clicked, setClicked] = useState(false)const unmountedContainer = useRef(false)@@ -38,12 +38,12 @@ export const Button: React.FC<ButtonProps> = (props) => {const className = classSet({"c-button": true,- [`c-button--${props.size}`]: props.size,- [`c-button--${props.variant}`]: props.variant,+ [`c-button--${size}`]: size,+ [`c-button--${variant}`]: variant,"c-button--loading": clicked,"c-button--disabled": clicked || props.disabled,[props.className || ""]: props.className,- "shadow-sm": props.variant !== "tertiary",+ "shadow-sm": variant !== "tertiary",})let buttonContent: JSX.Element@@ -77,13 +77,13 @@ export const Button: React.FC<ButtonProps> = (props) => {}buttonContent = (- <button type={props.type} className={className} onClick={onClick}>+ <button type={type} className={className} onClick={onClick}>{props.children}</button>)} else {buttonContent = (- <button type={props.type} className={className}>+ <button type={type} className={className}>{props.children}</button>)@@ -91,9 +91,3 @@ export const Button: React.FC<ButtonProps> = (props) => {return buttonContent}--Button.defaultProps = {- size: "default",- variant: "secondary",- type: "button",-}diff --git a/public/components/common/Logo.tsx b/public/components/common/Logo.tsxindex 95a360de3..16b666a85 100644--- a/public/components/common/Logo.tsx+++ b/public/components/common/Logo.tsx@@ -17,22 +17,18 @@ export const TenantLogoURL = (tenant: Tenant, size: Size): string | undefined =>return undefined}-export const TenantLogo = (props: TenantLogoProps) => {+export const TenantLogo = ({ size, useFiderIfEmpty = false }: TenantLogoProps) => {const fider = useFider()const tenant = fider.session.tenantif (tenant && tenant.logoBlobKey) {- return <img src={TenantLogoURL(fider.session.tenant, props.size)} alt={tenant.name} />- } else if (props.useFiderIfEmpty) {+ return <img src={TenantLogoURL(fider.session.tenant, size)} alt={tenant.name} />+ } else if (useFiderIfEmpty) {return <img src="https://fider.io/images/logo-100x100.png" alt="Fider" />}return null}-TenantLogo.defaultProps = {- useFiderIfEmpty: false,-}-interface OAuthProviderLogoProps {option: {provider?: stringdiff --git a/public/components/common/Modal.tsx b/public/components/common/Modal.tsxindex e0f90b8a6..972c95d8f 100644--- a/public/components/common/Modal.tsx+++ b/public/components/common/Modal.tsx@@ -19,7 +19,7 @@ interface ModalFooterProps {children?: React.ReactNode}-const ModalWindow: React.FunctionComponent<ModalWindowProps> = (props) => {+const ModalWindow: React.FunctionComponent<ModalWindowProps> = ({ size = "small", canClose = true, center = true, ...props }) => {const root = useRef<HTMLElement>(document.getElementById("root-modal"))useEffect(() => {@@ -44,7 +44,7 @@ const ModalWindow: React.FunctionComponent<ModalWindowProps> = (props) => {}const close = () => {- if (props.canClose) {+ if (canClose) {props.onClose()}}@@ -56,8 +56,8 @@ const ModalWindow: React.FunctionComponent<ModalWindowProps> = (props) => {const className = classSet({"c-modal-window": true,[`${props.className}`]: !!props.className,- "c-modal-window--center": props.center,- [`c-modal-window--${props.size}`]: true,+ "c-modal-window--center": center,+ [`c-modal-window--${size}`]: true,})return ReactDOM.createPortal(@@ -71,13 +71,6 @@ const ModalWindow: React.FunctionComponent<ModalWindowProps> = (props) => {root.current)}--ModalWindow.defaultProps = {- size: "small",- canClose: true,- center: true,-}-const Header = (props: { children: React.ReactNode }) => <div className="c-modal-header">{props.children}</div>const Content = (props: { children: React.ReactNode }) => <div className="c-modal-content">{props.children}</div>const Footer = (props: ModalFooterProps) => {