fix: clean up for autoresize

dhis2 · Aug 15, 2023 · 6c705ec · 6c705ec
1 parent 1191a7c
commit 6c705ec
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/adapter/src/components/AppWrapper.js b/adapter/src/components/AppWrapper.js
@@ -8,7 +8,13 @@ import { ErrorBoundary } from './ErrorBoundary.js'
 import { LoadingMask } from './LoadingMask.js'
 import { styles } from './styles/AppWrapper.style.js'
 
-const AppWrapper = ({ children, plugin, onPluginError, clearPluginError }) => {
+const AppWrapper = ({
+    children,
+    plugin,
+    autoResizePlugin,
+    onPluginError,
+    clearPluginError,
+}) => {
     const { loading: localeLoading } = useCurrentUserLocale()
     const { loading: latestUserLoading } = useVerifyLatestUser()
 
@@ -20,7 +26,11 @@ const AppWrapper = ({ children, plugin, onPluginError, clearPluginError }) => {
         return (
             <div className="app-shell-adapter">
                 <style jsx>{styles}</style>
-                <div className="app-shell-app">
+                <div
+                    className={
+                        autoResizePlugin ? 'app-shell-plugin' : 'app-shell-app'
+                    }
+                >
                     <ErrorBoundary
                         plugin={true}
                         onPluginError={onPluginError}
@@ -52,6 +62,7 @@ const AppWrapper = ({ children, plugin, onPluginError, clearPluginError }) => {
 }
 
 AppWrapper.propTypes = {
+    autoResizePlugin: PropTypes.bool,
     children: PropTypes.node,
     clearPluginError: PropTypes.func,
     plugin: PropTypes.bool,

diff --git a/adapter/src/components/styles/AppWrapper.style.js b/adapter/src/components/styles/AppWrapper.style.js
@@ -13,4 +13,9 @@ export const styles = css`
         overflow: auto;
         height: 100%;
     }
+    div.app-shell-plugin {
+        flex: 1 1 auto;
+        overflow: hidden;
+        height: 100%;
+    }
 `
diff --git a/adapter/src/index.js b/adapter/src/index.js
@@ -10,6 +10,7 @@ import { ServerVersionProvider } from './components/ServerVersionProvider.js'
 const AppAdapter = ({
     appName,
     appVersion,
+    autoResizePlugin,
     url,
     apiVersion,
     pwaEnabled,
@@ -39,6 +40,7 @@ const AppAdapter = ({
                 >
                     <AppWrapper
                         plugin={plugin}
+                        autoResizePlugin={autoResizePlugin}
                         onPluginError={onPluginError}
                         clearPluginError={clearPluginError}
                     >
@@ -54,6 +56,7 @@ AppAdapter.propTypes = {
     appName: PropTypes.string.isRequired,
     appVersion: PropTypes.string.isRequired,
     apiVersion: PropTypes.number,
+    autoResizePlugin: PropTypes.bool,
     children: PropTypes.element,
     clearPluginError: PropTypes.func,
     parentAlertsAdd: PropTypes.func,

diff --git a/shell/src/PluginLoader.js b/shell/src/PluginLoader.js
@@ -20,14 +20,6 @@ const PluginInner = ({
             (resizePluginHeight || resizePluginWidth)
         ) {
             const resizeObserver = new ResizeObserver(() => {
-                console.log(
-                    'height,scrollHeight,offsetWidth,scrollWidth',
-                    divRef.current.offsetHeight,
-                    divRef.current.scrollHeight,
-                    divRef.current.offsetWidth,
-                    divRef.current.scrollWidth
-                )
-                // the additional pixels currently account for possible horizontal scroll bar
                 if (resizePluginHeight) {
                     resizePluginHeight(divRef.current.offsetHeight + 20)
                 }
@@ -198,6 +190,7 @@ export const PluginLoader = ({ config, requiredProps, D2App }) => {
             showAlertsInPlugin={showAlertsInPlugin}
             onPluginError={onPluginError}
             clearPluginError={clearPluginError}
+            autoResizePlugin={resizePluginHeight || resizePluginWidth}
             {...config}
         >
             <React.Suspense