feat: isSSR, fromSSR, onSSR for Platform

angelomedeiros · Jun 10, 2018 · ed56ea1 · ed56ea1
1 parent 45926a0
commit ed56ea1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/dev/components/new-layout/pages/default.vue b/dev/components/new-layout/pages/default.vue
@@ -1,5 +1,5 @@
 <template>
-  <q-page padding class="bg-yellow page-default-padding">
+  <q-page padding class="page-default-padding">
     <q-toggle v-model="extra" label="Extra content" />
     <div v-if="extra">
       <div v-for="n in 50">

diff --git a/src/components/layout/QLayout.js b/src/components/layout/QLayout.js
@@ -1,5 +1,5 @@
 import { QScrollObservable, QResizeObservable, QWindowResizeObservable } from '../observables'
-import { isSSR } from '../../plugins/platform'
+import { onSSR } from '../../plugins/platform'
 
 export default {
   name: 'QLayout',
@@ -17,8 +17,8 @@ export default {
   },
   data () {
     return {
-      height: isSSR || this.$q.platform.is.fromSSR ? 0 : window.innerHeight,
-      width: isSSR || this.$q.platform.is.fromSSR ? 0 : window.innerWidth,
+      height: onSSR ? 0 : window.innerHeight,
+      width: onSSR ? 0 : window.innerWidth,
 
       header: {
         size: 0,

diff --git a/src/components/observables/QWindowResizeObservable.js b/src/components/observables/QWindowResizeObservable.js
@@ -1,5 +1,5 @@
 import { listenOpts } from '../../utils/event'
-import { isSSR } from '../../plugins/platform'
+import { onSSR, fromSSR } from '../../plugins/platform'
 
 export default {
   name: 'QWindowResizeObservable',
@@ -28,10 +28,10 @@ export default {
     }
   },
   created () {
-    this.emit(isSSR || this.$q.platform.is.fromSSR)
+    this.emit(onSSR)
   },
   mounted () {
-    this.$q.platform.is.fromSSR && this.emit()
+    fromSSR && this.emit()
     window.addEventListener('resize', this.trigger, listenOpts.passive)
   },
   beforeDestroy () {

diff --git a/src/mixins/can-render.js b/src/mixins/can-render.js
@@ -1,10 +1,10 @@
 // using it to manage SSR rendering with best performance
-import { isSSR } from '../plugins/platform'
+import { onSSR } from '../plugins/platform'
 
 export default {
   data () {
     return {
-      canRender: !isSSR && !this.$q.platform.is.fromSSR
+      canRender: !onSSR
     }
   },
   mounted () {

diff --git a/src/plugins/platform.js b/src/plugins/platform.js
@@ -3,6 +3,8 @@
 /* eslint-disable no-mixed-operators */
 
 export const isSSR = typeof window === 'undefined'
+export let fromSSR = false
+export let onSSR = isSSR
 
 function getMatch (userAgent, platformMatch) {
   const match = /(edge)\/([\w.]+)/.exec(userAgent) ||
@@ -157,11 +159,15 @@ function getPlatform (userAgent) {
       browser.cordova = true
     }
 
-    browser.fromSSR = browser.cordova === void 0 &&
+    browser.fromSSR = fromSSR = browser.cordova === void 0 &&
       browser.electron === void 0 &&
       !!document.querySelector('[data-server-rendered]')
+
+    fromSSR && (onSSR = true)
   }
 
+  browser.onSSR = onSSR
+
   return browser
 }