fix: working autorsize width

dhis2 · May 25, 2023 · 2991045 · 2991045
1 parent dbb6e26
commit 2991045
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 36 deletions.
diff --git a/examples/cra/yarn.lock b/examples/cra/yarn.lock
@@ -1054,32 +1054,32 @@
   integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==
 
 "@dhis2/app-runtime@file:../../runtime":
-  version "3.10.0-alpha.1"
+  version "3.10.0-alpha.2"
   dependencies:
-    "@dhis2/app-service-alerts" "3.10.0-alpha.1"
-    "@dhis2/app-service-config" "3.10.0-alpha.1"
-    "@dhis2/app-service-data" "3.10.0-alpha.1"
-    "@dhis2/app-service-offline" "3.10.0-alpha.1"
-    "@dhis2/app-service-plugin" "3.10.0-alpha.1"
+    "@dhis2/app-service-alerts" "3.10.0-alpha.2"
+    "@dhis2/app-service-config" "3.10.0-alpha.2"
+    "@dhis2/app-service-data" "3.10.0-alpha.2"
+    "@dhis2/app-service-offline" "3.10.0-alpha.2"
+    "@dhis2/app-service-plugin" "3.10.0-alpha.2"
 
-"@dhis2/app-service-alerts@3.10.0-alpha.1", "@dhis2/app-service-alerts@file:../../services/alerts":
-  version "3.10.0-alpha.1"
+"@dhis2/app-service-alerts@3.10.0-alpha.2", "@dhis2/app-service-alerts@file:../../services/alerts":
+  version "3.10.0-alpha.2"
 
-"@dhis2/app-service-config@3.10.0-alpha.1", "@dhis2/app-service-config@file:../../services/config":
-  version "3.10.0-alpha.1"
+"@dhis2/app-service-config@3.10.0-alpha.2", "@dhis2/app-service-config@file:../../services/config":
+  version "3.10.0-alpha.2"
 
-"@dhis2/app-service-data@3.10.0-alpha.1", "@dhis2/app-service-data@file:../../services/data":
-  version "3.10.0-alpha.1"
+"@dhis2/app-service-data@3.10.0-alpha.2", "@dhis2/app-service-data@file:../../services/data":
+  version "3.10.0-alpha.2"
   dependencies:
     react-query "^3.13.11"
 
-"@dhis2/app-service-offline@3.10.0-alpha.1", "@dhis2/app-service-offline@file:../../services/offline":
-  version "3.10.0-alpha.1"
+"@dhis2/app-service-offline@3.10.0-alpha.2", "@dhis2/app-service-offline@file:../../services/offline":
+  version "3.10.0-alpha.2"
   dependencies:
     lodash "^4.17.21"
 
-"@dhis2/app-service-plugin@3.10.0-alpha.1", "@dhis2/app-service-plugin@file:../../services/plugin":
-  version "3.10.0-alpha.1"
+"@dhis2/app-service-plugin@3.10.0-alpha.2", "@dhis2/app-service-plugin@file:../../services/plugin":
+  version "3.10.0-alpha.2"
   dependencies:
     post-robot "^10.0.46"
 

diff --git a/examples/query-playground/yarn.lock b/examples/query-playground/yarn.lock
@@ -1800,32 +1800,32 @@
     "@dhis2/app-service-offline" "3.8.0"
 
 "@dhis2/app-runtime@^2.2.2", "@dhis2/app-runtime@file:../../runtime":
-  version "3.10.0-alpha.1"
+  version "3.10.0-alpha.2"
   dependencies:
-    "@dhis2/app-service-alerts" "3.10.0-alpha.1"
-    "@dhis2/app-service-config" "3.10.0-alpha.1"
-    "@dhis2/app-service-data" "3.10.0-alpha.1"
-    "@dhis2/app-service-offline" "3.10.0-alpha.1"
-    "@dhis2/app-service-plugin" "3.10.0-alpha.1"
+    "@dhis2/app-service-alerts" "3.10.0-alpha.2"
+    "@dhis2/app-service-config" "3.10.0-alpha.2"
+    "@dhis2/app-service-data" "3.10.0-alpha.2"
+    "@dhis2/app-service-offline" "3.10.0-alpha.2"
+    "@dhis2/app-service-plugin" "3.10.0-alpha.2"
 
-"@dhis2/app-service-alerts@3.10.0-alpha.1", "@dhis2/app-service-alerts@3.8.0", "@dhis2/app-service-alerts@file:../../services/alerts":
-  version "3.10.0-alpha.1"
+"@dhis2/app-service-alerts@3.10.0-alpha.2", "@dhis2/app-service-alerts@3.8.0", "@dhis2/app-service-alerts@file:../../services/alerts":
+  version "3.10.0-alpha.2"
 
-"@dhis2/app-service-config@3.10.0-alpha.1", "@dhis2/app-service-config@3.8.0", "@dhis2/app-service-config@file:../../services/config":
-  version "3.10.0-alpha.1"
+"@dhis2/app-service-config@3.10.0-alpha.2", "@dhis2/app-service-config@3.8.0", "@dhis2/app-service-config@file:../../services/config":
+  version "3.10.0-alpha.2"
 
-"@dhis2/app-service-data@3.10.0-alpha.1", "@dhis2/app-service-data@3.8.0", "@dhis2/app-service-data@file:../../services/data":
-  version "3.10.0-alpha.1"
+"@dhis2/app-service-data@3.10.0-alpha.2", "@dhis2/app-service-data@3.8.0", "@dhis2/app-service-data@file:../../services/data":
+  version "3.10.0-alpha.2"
   dependencies:
     react-query "^3.13.11"
 
-"@dhis2/app-service-offline@3.10.0-alpha.1", "@dhis2/app-service-offline@3.8.0", "@dhis2/app-service-offline@file:../../services/offline":
-  version "3.10.0-alpha.1"
+"@dhis2/app-service-offline@3.10.0-alpha.2", "@dhis2/app-service-offline@3.8.0", "@dhis2/app-service-offline@file:../../services/offline":
+  version "3.10.0-alpha.2"
   dependencies:
     lodash "^4.17.21"
 
-"@dhis2/app-service-plugin@3.10.0-alpha.1", "@dhis2/app-service-plugin@file:../../services/plugin":
-  version "3.10.0-alpha.1"
+"@dhis2/app-service-plugin@3.10.0-alpha.2", "@dhis2/app-service-plugin@file:../../services/plugin":
+  version "3.10.0-alpha.2"
   dependencies:
     post-robot "^10.0.46"
 

diff --git a/services/plugin/src/Plugin.tsx b/services/plugin/src/Plugin.tsx
@@ -37,12 +37,12 @@ export const Plugin = ({
 
     // we do not know what is being sent in passed props, so for stable reference, memoize using JSON representation
     const propsToPassNonMemoizedJSON = JSON.stringify(propsToPassNonMemoized)
-    const propsToPass = useMemo(
+    const propsToPass: any = useMemo(
         () => ({ ...propsToPassNonMemoized }),
         // eslint-disable-next-line react-hooks/exhaustive-deps
         [propsToPassNonMemoizedJSON]
     )
-    const { height } = propsToPass
+    const { height, width } = propsToPass
 
     const { add: alertsAdd } = useContext(AlertsManagerContext)
 
@@ -59,19 +59,24 @@ export const Plugin = ({
 
     const [inErrorState, setInErrorState] = useState<boolean>(false)
     const [pluginHeight, setPluginHeight] = useState<number>(150)
+    const [pluginWidth, setPluginWidth] = useState<number>(500)
 
     useEffect(() => {
         if (height) {
             setPluginHeight(height)
         }
-    }, [height])
+        if (width) {
+            setPluginWidth(width)
+        }
+    }, [height, width])
 
     useEffect(() => {
         if (iframeRef?.current) {
             const iframeProps = {
                 ...propsToPass,
                 alertsAdd,
                 setPluginHeight,
+                setPluginWidth,
                 setInErrorState,
                 setCommunicationReceived,
             }
@@ -121,14 +126,20 @@ export const Plugin = ({
 
     if (pluginEntryPoint) {
         return (
-            <div style={{ height: `${pluginHeight}px` }}>
+            <div
+                style={{
+                    height: `${pluginHeight}px`,
+                    width: `${pluginWidth}px`,
+                }}
+            >
                 <iframe
                     ref={iframeRef}
                     src={pluginSource}
                     style={{
                         width: '100%',
                         height: '100%',
                         border: 'none',
+                        overflowX: 'hidden',
                     }}
                 ></iframe>
             </div>