Browse Source

update ref usage

Yao Ding 7 years ago
parent
commit
7e51d41c29

+ 3 - 3
src/client/js/app.js

@@ -290,7 +290,7 @@ if (!pageRevisionId && draft != null) {
  */
  */
 const componentMappings = {
 const componentMappings = {
   'search-top': <I18nextProvider i18n={i18n}><HeaderSearchBox crowi={crowi} /></I18nextProvider>,
   'search-top': <I18nextProvider i18n={i18n}><HeaderSearchBox crowi={crowi} /></I18nextProvider>,
-  'search-sidebar': <HeaderSearchBox crowi={crowi} />,
+  'search-sidebar': <I18nextProvider i18n={i18n}><HeaderSearchBox crowi={crowi} /></I18nextProvider>,
   'search-page': <I18nextProvider i18n={i18n}><SearchPage crowi={crowi} crowiRenderer={crowiRenderer} /></I18nextProvider>,
   'search-page': <I18nextProvider i18n={i18n}><SearchPage crowi={crowi} crowiRenderer={crowiRenderer} /></I18nextProvider>,
 
 
   // 'revision-history': <PageHistory pageId={pageId} />,
   // 'revision-history': <PageHistory pageId={pageId} />,
@@ -371,7 +371,7 @@ if (savePageControlsElem) {
         onSubmit={saveWithSubmitButton}
         onSubmit={saveWithSubmitButton}
         ref={(elem) => {
         ref={(elem) => {
             if (savePageControls == null) {
             if (savePageControls == null) {
-              savePageControls = elem.getWrappedInstance();
+              savePageControls = elem;
             }
             }
           }}
           }}
         pageId={pageId}
         pageId={pageId}
@@ -507,7 +507,7 @@ if (pageStatusAlertElem) {
       <PageStatusAlert
       <PageStatusAlert
         ref={(elem) => {
         ref={(elem) => {
             if (pageStatusAlert == null) {
             if (pageStatusAlert == null) {
-              pageStatusAlert = elem.getWrappedInstance();
+              pageStatusAlert = elem;
             }
             }
           }}
           }}
         revisionId={pageRevisionId}
         revisionId={pageRevisionId}

+ 1 - 1
src/client/js/components/PageStatusAlert.jsx

@@ -142,4 +142,4 @@ PageStatusAlert.propTypes = {
 PageStatusAlert.defaultProps = {
 PageStatusAlert.defaultProps = {
 };
 };
 
 
-export default withTranslation()(PageStatusAlert);
+export default withTranslation(null, { withRef: true })(PageStatusAlert);

+ 2 - 2
src/client/js/components/SavePageControls.jsx

@@ -80,7 +80,7 @@ class SavePageControls extends React.PureComponent {
               crowi={this.props.crowi}
               crowi={this.props.crowi}
               ref={(elem) => {
               ref={(elem) => {
                   if (this.grantSelector == null) {
                   if (this.grantSelector == null) {
-                    this.grantSelector = elem.getWrappedInstance();
+                    this.grantSelector = elem;
                   }
                   }
                 }}
                 }}
               grant={this.props.grant}
               grant={this.props.grant}
@@ -124,4 +124,4 @@ SavePageControls.propTypes = {
   grantGroupName: PropTypes.string,
   grantGroupName: PropTypes.string,
 };
 };
 
 
-export default withTranslation()(SavePageControls);
+export default withTranslation(null, { withRef: true })(SavePageControls);

+ 1 - 1
src/client/js/components/SavePageControls/GrantSelector.jsx

@@ -288,4 +288,4 @@ GrantSelector.propTypes = {
   grantGroupName: PropTypes.string,
   grantGroupName: PropTypes.string,
 };
 };
 
 
-export default withTranslation()(GrantSelector);
+export default withTranslation(null, { withRef: true })(GrantSelector);