diff --git a/imports/ui/components/Navigation/Navigation.js b/imports/ui/components/Navigation/Navigation.js
index 7a6e42c..15b1c11 100644
--- a/imports/ui/components/Navigation/Navigation.js
+++ b/imports/ui/components/Navigation/Navigation.js
@@ -15,7 +15,7 @@ import './Navigation.scss';
// removed class: fixed-top
// md instead of lg: no menu in medium
-const Navigation = props => (
+const Navigation = ({ name = '', ...props }) => (
);
-Navigation.defaultProps = {
- name: ''
-};
-
Navigation.propTypes = {
t: PropTypes.func.isRequired,
authenticated: PropTypes.bool.isRequired
diff --git a/imports/ui/components/OAuthLoginButton/OAuthLoginButton.js b/imports/ui/components/OAuthLoginButton/OAuthLoginButton.js
index 7692507..81abfb2 100644
--- a/imports/ui/components/OAuthLoginButton/OAuthLoginButton.js
+++ b/imports/ui/components/OAuthLoginButton/OAuthLoginButton.js
@@ -38,7 +38,12 @@ const serviceLabel = {
google: Iniciar sesión con Google,
};
-const OAuthLoginButton = ({ service, callback }) => (
+const defaultCallback = (error) => {
+ if (error) Bert.alert(T9n.get(`error.accounts.${error.message}`), 'danger');
+ // Bert.alert(error.message, 'danger');
+};
+
+const OAuthLoginButton = ({ service, callback = defaultCallback }) => (
);
-OAuthLoginButton.defaultProps = {
- callback: (error) => {
- if (error) Bert.alert(T9n.get(`error.accounts.${error.message}`), 'danger');
- // Bert.alert(error.message, 'danger');
- },
-};
-
OAuthLoginButton.propTypes = {
service: PropTypes.string.isRequired,
callback: PropTypes.func,
diff --git a/imports/ui/components/PageHeader/PageHeader.js b/imports/ui/components/PageHeader/PageHeader.js
index 93b5c61..f5f80b4 100644
--- a/imports/ui/components/PageHeader/PageHeader.js
+++ b/imports/ui/components/PageHeader/PageHeader.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import './PageHeader.scss';
-const PageHeader = ({ title, subtitle }) => (
+const PageHeader = ({ title, subtitle = '' }) => (
{title}
@@ -12,10 +12,6 @@ const PageHeader = ({ title, subtitle }) => (
);
-PageHeader.defaultProps = {
- subtitle: '',
-};
-
PageHeader.propTypes = {
title: PropTypes.string.isRequired,
subtitle: PropTypes.string,
diff --git a/imports/ui/components/ReSendEmail/ReSendEmail.js b/imports/ui/components/ReSendEmail/ReSendEmail.js
index 11b0052..756bbec 100644
--- a/imports/ui/components/ReSendEmail/ReSendEmail.js
+++ b/imports/ui/components/ReSendEmail/ReSendEmail.js
@@ -14,17 +14,12 @@ const handleResendVerificationEmail = (emailAddress, t) => {
});
};
-const ReSendEmail = props => (
+const ReSendEmail = ({ userId = '', emailAddress = '', emailVerified, t }) => (
- {props.userId && !props.emailVerified ?
: ''}
+ {userId && !emailVerified ?
: ''}
);
-ReSendEmail.defaultProps = {
- userId: '',
- emailAddress: '',
-};
-
ReSendEmail.propTypes = {
loading: PropTypes.bool.isRequired,
userId: PropTypes.string,
diff --git a/imports/ui/components/Reconnect/Reconnect.js b/imports/ui/components/Reconnect/Reconnect.js
index f74f4f6..b2e8aac 100644
--- a/imports/ui/components/Reconnect/Reconnect.js
+++ b/imports/ui/components/Reconnect/Reconnect.js
@@ -25,9 +25,6 @@ Reconnect.propTypes = {
authenticated: PropTypes.bool.isRequired
};
-Reconnect.defaultProps = {
-};
-
export default withTranslation()(Reconnect);
/*
diff --git a/imports/ui/layouts/App/App.js b/imports/ui/layouts/App/App.js
index f39847f..e9d21af 100644
--- a/imports/ui/layouts/App/App.js
+++ b/imports/ui/layouts/App/App.js
@@ -165,11 +165,6 @@ const App = props => (
);
-App.defaultProps = {
- userId: '',
- emailAddress: ''
-};
-
App.propTypes = {
loading: PropTypes.bool.isRequired,
i18nReady: PropTypes.object.isRequired,
@@ -197,8 +192,9 @@ export default withTracker(() => {
authenticated: !loggingIn && !!userId,
name: name || emailAddress,
roles: (user && user.roles) || [],
- userId,
- emailAddress,
+ // default to '' here (was App.defaultProps, unsupported on fn components in React 19)
+ userId: userId || '',
+ emailAddress: emailAddress || '',
emailVerified: user && user.emails ? user && user.emails && user.emails[0].verified : true
};
})(App);
diff --git a/imports/ui/pages/EditDocument/EditDocument.js b/imports/ui/pages/EditDocument/EditDocument.js
index 62a7942..04eb7aa 100644
--- a/imports/ui/pages/EditDocument/EditDocument.js
+++ b/imports/ui/pages/EditDocument/EditDocument.js
@@ -6,17 +6,13 @@ import Documents from '../../../api/Documents/Documents';
import DocumentEditor from '../../components/DocumentEditor/DocumentEditor';
import NotFound from '../NotFound/NotFound';
-const EditDocument = ({ doc, history }) => (doc ? (
+const EditDocument = ({ doc = null, history }) => (doc ? (
{`Editing "${doc.title}"`}
) : );
-EditDocument.defaultProps = {
- doc: null
-};
-
EditDocument.propTypes = {
doc: PropTypes.object,
history: PropTypes.object.isRequired
diff --git a/imports/ui/pages/EditSubscription/EditSubscription.js b/imports/ui/pages/EditSubscription/EditSubscription.js
index 8d98c84..34dd031 100644
--- a/imports/ui/pages/EditSubscription/EditSubscription.js
+++ b/imports/ui/pages/EditSubscription/EditSubscription.js
@@ -6,17 +6,13 @@ import Subscriptions from '../../../api/Subscriptions/Subscriptions';
import SubscriptionEditor from '../../components/SubscriptionEditor/SubscriptionEditor';
import NotFound from '../NotFound/NotFound';
-const EditSubscription = ({ doc, history }) => (doc ? (
+const EditSubscription = ({ doc = null, history }) => (doc ? (
{`Editing "${doc.title}"`}
) : );
-EditSubscription.defaultProps = {
- doc: null
-};
-
EditSubscription.propTypes = {
doc: PropTypes.object,
history: PropTypes.object.isRequired
diff --git a/imports/ui/pages/Page/Page.js b/imports/ui/pages/Page/Page.js
index 0123ab2..7e7be03 100644
--- a/imports/ui/pages/Page/Page.js
+++ b/imports/ui/pages/Page/Page.js
@@ -10,7 +10,7 @@ import { Helmet } from 'react-helmet-async';
import './Page.scss';
-const Page = ({ title, subtitle, content }) => (
+const Page = ({ title, subtitle = '', content }) => (
@@ -21,10 +21,6 @@ const Page = ({ title, subtitle, content }) => (
);
-Page.defaultProps = {
- subtitle: ''
-};
-
Page.propTypes = {
title: PropTypes.string.isRequired,
subtitle: PropTypes.string,