update: ssr detection logic and news filename.

plone · Dec 9, 2024 · 0c34913 · 0c34913
1 parent e698d56
commit 0c34913
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 20 deletions.
diff --git a/packages/volto/news/6523.internal → packages/volto/news/6523.bugfix b/packages/volto/news/6523.internal → packages/volto/news/6523.bugfix
diff --git a/packages/volto/src/helpers/ScrollToTop/ScrollToTop.jsx b/packages/volto/src/helpers/ScrollToTop/ScrollToTop.jsx
@@ -10,12 +10,6 @@ import config from '@plone/volto/registry';
  * @extends {Component}
  */
 class ScrollToTop extends React.Component {
-  constructor(props) {
-    super(props);
-    this.isClientSide = false;
-    this.isFirstClientUpdatePending = true;
-  }
-
   /**
    * Property types.
    * @property {Object} propTypes Property types.
@@ -28,27 +22,18 @@ class ScrollToTop extends React.Component {
     children: PropTypes.node.isRequired,
   };
 
-  /**
-   * Used to indicate client-side rendering
-   * @memberof ScrollToTop
-   */
-  componentDidMount() {
-    this.isClientSide = true;
-  }
-
+  state = {
+    isFirstClientUpdatePending: true,
+  };
   /**
    * @param {*} prevProps Previous Props
    * @returns {null} Null
    * @memberof ScrollToTop
    */
   componentDidUpdate(prevProps) {
-    // avoid scrollToTop during SSR
-    if (!this.isClientSide) {
-      return;
-    }
     // Skip the first client-side update that happens right after hydration
-    if (this.isFirstClientUpdatePending) {
-      this.isFirstClientUpdatePending = false;
+    if (this.state.isFirstClientUpdatePending) {
+      this.setState({ isFirstClientUpdatePending: false });
       return;
     }