Move isNuxtRendering to utils

learningequality · Feb 23, 2024 · 871df7b · 871df7b
1 parent 5c6c05d
commit 871df7b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 27 deletions.
diff --git a/lib/composables/_useKWindowDimensions/index.js b/lib/composables/_useKWindowDimensions/index.js
@@ -1,6 +1,7 @@
 import '../composition-api'; //Due to @vue/composition-api shortcomings, add plugin prior to use in kolibri, studio and tests
 import { onMounted, onUnmounted, ref } from '@vue/composition-api';
 import { throttle } from 'frame-throttle';
+import { isNuxtServerSideRendering } from '../../utils';
 
 /** Global variables */
 export const windowWidth = ref(null);
@@ -30,14 +31,6 @@ function windowMetrics() {
   };
 }
 
-/**
- * Check if Nuxt is server side rendering
- * @returns {Boolean}
- */
-function isNuxtServerSideRendering() {
-  return process && process.server;
-}
-
 /**
  * @param {CallableFunction} eventHandler - The event callback function
  */

diff --git a/lib/composables/useKResponsiveWindow/MediaQuery.js b/lib/composables/useKResponsiveWindow/MediaQuery.js
@@ -1,3 +1,5 @@
+import { isNuxtServerSideRendering } from '../../utils';
+
 /**
  * Class representing a MediaQuery
  */
@@ -23,21 +25,13 @@ export default class MediaQuery {
     return this._mediaQueryList;
   }
 
-  /**
-   * Check if Nuxt is server side rendering
-   * @returns {Boolean}
-   */
-  isNuxtServerSideRendering() {
-    return process && process.server;
-  }
-
   /**
    * Start listening for media query events
    * @returns {Object} Containing mediaQueryList, eventHandler, and stopListening
    */
   startListening() {
     // Prevent function execution if Nuxt is server side rendering
-    if (this.isNuxtServerSideRendering() || !window.matchMedia) {
+    if (isNuxtServerSideRendering() || !window.matchMedia) {
       return;
     }
 
@@ -53,7 +47,7 @@ export default class MediaQuery {
    */
   stopListening() {
     // Prevent function execution if Nuxt is server side rendering
-    if (this.isNuxtServerSideRendering() || !window.matchMedia) {
+    if (isNuxtServerSideRendering() || !window.matchMedia) {
       return;
     }
     if (this.mediaQueryList.removeEventListener) {

diff --git a/lib/composables/useKResponsiveWindow/index.js b/lib/composables/useKResponsiveWindow/index.js
@@ -1,5 +1,6 @@
 import { computed, onBeforeUnmount, onMounted, ref, watch } from '@vue/composition-api';
 import useKWindowDimensions, { windowWidth, windowHeight } from '../_useKWindowDimensions';
+import { isNuxtServerSideRendering } from '../../utils';
 import MediaQuery from './MediaQuery';
 
 /** Global variables */
@@ -28,19 +29,11 @@ const heightQuery = new MediaQuery('screen and (max-height: 600px)', event => {
   windowIsShort.value = event.matches;
 });
 
-/**
- * Check if Nuxt is server side rendering
- * @returns {Boolean}
- */
-function isNuxtServerSideRendering() {
-  return process && process.server;
-}
-
 /**
  * Initialize media query window properties
  */
 function initProps() {
-  if (isNuxtServerSideRendering) {
+  if (isNuxtServerSideRendering()) {
     return;
   }
   if (window.matchMedia) {

diff --git a/lib/utils/index.js b/lib/utils/index.js
@@ -0,0 +1,7 @@
+/**
+ * Check if Nuxt is server side rendering
+ * @returns {Boolean}
+ */
+export function isNuxtServerSideRendering() {
+  return process && process.server;
+}