From 10ba13658f9371877dab0a8b39a1064c19525d6f Mon Sep 17 00:00:00 2001 From: houmland Date: Tue, 19 Dec 2023 08:33:50 -0500 Subject: [PATCH] adding width as string instead --- example/App.tsx | 2 +- src/Stack.tsx | 73 +++++++++++++++++++++++++++++++------------------ 2 files changed, 47 insertions(+), 28 deletions(-) diff --git a/example/App.tsx b/example/App.tsx index f5b6332..1880d33 100644 --- a/example/App.tsx +++ b/example/App.tsx @@ -7,7 +7,7 @@ function App() {

Demo website

diff --git a/src/Stack.tsx b/src/Stack.tsx index 3a933b2..1beefaf 100644 --- a/src/Stack.tsx +++ b/src/Stack.tsx @@ -1,55 +1,75 @@ -import { forwardRef, useEffect, LegacyRef} from 'react'; +import React, { forwardRef, LegacyRef, useEffect } from 'react'; type StackProps = { project: string; innerRef?: LegacyRef | undefined; - width?: number; + width?: string; fixed?: boolean; }; const Stack = forwardRef(function Stack({ project, innerRef, - width = 35, + width = '35rem', fixed = true }: StackProps) { const height = '38.5rem'; - const adjustWidth = (w: number) => { - const minWidth = 15; - - if (w < minWidth) { - console.warn(`Width is too small (${w}rem). Adjusting to minimum width (${minWidth}rem).`); + const adjustWidth = (w: string) => { + const minWidth = 15; + let adjustedWidth = ''; + + if (w.match(/(rem|px|em|%)$/)) { + adjustedWidth = w; + } else { + // If no unit is found, treat the string as a number and append 'rem' + const numericWidth = parseFloat(w); + if (isNaN(numericWidth)) { + throw new Error(`Invalid width: "${w}". Width must be a numeric value followed by a unit (e.g., '35rem', '100px').`); + } + + if (numericWidth < minWidth) { + console.warn(`Width is too small (${numericWidth}rem). Adjusting to minimum width (${minWidth}rem).`); + adjustedWidth = `${minWidth}rem`; + } else { + adjustedWidth = `${numericWidth}rem`; + } } - return { - adjustedWidth: w < minWidth ? `${minWidth}rem` : `${w}rem`, - }; + return { adjustedWidth }; }; useEffect(() => { const iframe = document.getElementById('responsiveIframe'); if (iframe) { - // Adjust width only as height is now constant - const { adjustedWidth } = adjustWidth(width); - iframe.style.width = adjustedWidth; - iframe.style.height = height; + try { + // Adjust width only as height is now constant + const { adjustedWidth } = adjustWidth(width); + iframe.style.width = adjustedWidth; + iframe.style.height = height; + } catch (error) { + console.error(error); + } } const handleMessage = (event: MessageEvent) => { const iframe = document.getElementById('responsiveIframe'); if (iframe && event.data.type === 'chatbotStateChange') { - const isMobile = window.innerWidth < 1000; - if (isMobile) { - // Mobile - iframe.style.width = '100vw'; - iframe.style.height = height; - } else { - // Desktop - const { adjustedWidth } = adjustWidth(width); - iframe.style.width = adjustedWidth; - iframe.style.height = height; + try { + const isMobile = window.innerWidth < 1000; + if (isMobile) { + // Mobile + iframe.style.width = '100vw'; + iframe.style.height = height; + } else { + // Desktop + const { adjustedWidth } = adjustWidth(width); + iframe.style.width = adjustedWidth; + iframe.style.height = height; + } + } catch (error) { + console.error(error); } } }; @@ -59,7 +79,7 @@ const Stack = forwardRef(function Stack({ return () => { window.removeEventListener('message', handleMessage); }; - }, [width]); // Removed height from dependency array + }, [width]); return (