fix: tres-canvas window-size now support 'true' string

Tresjs · Apr 6, 2023 · a63e33f · a63e33f
1 parent 63a340f
commit a63e33f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/playground/src/components/TheFirstScene.vue b/playground/src/components/TheFirstScene.vue
@@ -9,7 +9,7 @@ watchEffect(() => {
 </script>
 
 <template>
-  <TresCanvas ref="context" clear-color="#82DBC5" window-size="true">
+  <TresCanvas ref="context" clear-color="#82DBC5" window-size>
     <TresPerspectiveCamera />
     <TresMesh>
       <TresTorusGeometry :args="[1, 0.5, 16, 32]" />

diff --git a/playground/src/style.css b/playground/src/style.css
@@ -1,4 +1,4 @@
-/* html,
+html,
 body {
   margin: 0;
   padding: 0;
@@ -9,4 +9,3 @@ body {
   height: 100%;
   width: 100%;
 }
- */
diff --git a/src/composables/useRenderer/index.ts b/src/composables/useRenderer/index.ts
@@ -108,7 +108,7 @@ export interface UseRendererOptions extends WebGLRendererParameters {
    * @default 0x000000
    */
   clearColor?: MaybeComputedRef<TresColor>
-  windowSize?: MaybeComputedRef<boolean>
+  windowSize?: MaybeComputedRef<boolean | string>
   preset?: RendererPresetsType
 }
 
@@ -148,7 +148,10 @@ export function useRenderer(options: UseRendererOptions) {
 
   const { state, setState } = useTres()
 
-  const { width, height } = resolveUnref(windowSize) ? useWindowSize() : useElementSize(state.container)
+  const { width, height } =
+    resolveUnref(windowSize) == true || resolveUnref(windowSize) === '' || resolveUnref(windowSize) === 'true'
+      ? useWindowSize()
+      : useElementSize(state.container)
   const { logError, logWarning } = useLogger()
   const { pixelRatio } = useDevicePixelRatio()
   const { pause, resume } = useRenderLoop()

diff --git a/src/core/nodeOps.ts b/src/core/nodeOps.ts
@@ -1,5 +1,5 @@
 import { BufferAttribute } from 'three'
-import { useCamera, useLogger } from '/@/composables'
+import { useCamera } from '/@/composables'
 import { RendererOptions } from 'vue'
 import { catalogue } from './catalogue'
 import { isFunction } from '@vueuse/core'