From e4b73d7bc95b40333cb1a9f0a9c6e70f612b3495 Mon Sep 17 00:00:00 2001
From: Thomas Zemp <tom@dhis2.org>
Date: Tue, 4 Jun 2024 15:46:00 +0200
Subject: [PATCH 1/3] fix: clean up plugin css

---
 shell/src/PluginLoader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/src/PluginLoader.js b/shell/src/PluginLoader.js
index ee7c900e..b75cb0e9 100644
--- a/shell/src/PluginLoader.js
+++ b/shell/src/PluginLoader.js
@@ -50,7 +50,7 @@ const PluginInner = ({
     // inner div disables margin collapsing which would prevent computing correct height
     return (
         <div ref={divRef}>
-            <div style={{ display: 'flex', width: 'fitContent' }}>
+            <div>
                 <div id="innerDiv" ref={innerDivRef}>
                     <D2App
                         config={config}

From 6af10641e5953f3e0aab7b749273ba2d3dfbc60e Mon Sep 17 00:00:00 2001
From: Thomas Zemp <tom@dhis2.org>
Date: Tue, 4 Jun 2024 15:49:12 +0200
Subject: [PATCH 2/3] fix: prop types cleanup

---
 adapter/src/index.js      | 2 +-
 shell/src/PluginLoader.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/adapter/src/index.js b/adapter/src/index.js
index 1b80cf2d..5f8e0092 100644
--- a/adapter/src/index.js
+++ b/adapter/src/index.js
@@ -92,7 +92,7 @@ AppAdapter.propTypes = {
     parentAlertsAdd: PropTypes.func,
     plugin: PropTypes.bool,
     pwaEnabled: PropTypes.bool,
-    showAlertsInPlugin: PropTypes.func,
+    showAlertsInPlugin: PropTypes.bool,
     url: PropTypes.string,
     onPluginError: PropTypes.func,
 }
diff --git a/shell/src/PluginLoader.js b/shell/src/PluginLoader.js
index b75cb0e9..3e22444c 100644
--- a/shell/src/PluginLoader.js
+++ b/shell/src/PluginLoader.js
@@ -66,7 +66,7 @@ const PluginInner = ({
 PluginInner.propTypes = {
     D2App: PropTypes.object,
     config: PropTypes.object,
-    propsFromParent: PropTypes.array,
+    propsFromParent: PropTypes.object,
     resizePluginHeight: PropTypes.func,
     resizePluginWidth: PropTypes.func,
 }

From 997254f68a30461c460b3fc4a0dbdd6ccb6b88ee Mon Sep 17 00:00:00 2001
From: Thomas Zemp <tom@dhis2.org>
Date: Wed, 5 Jun 2024 13:43:30 +0200
Subject: [PATCH 3/3] fix: remove translucent layer from plugin loader

---
 shell/src/PluginLoader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/src/PluginLoader.js b/shell/src/PluginLoader.js
index 3e22444c..426fca57 100644
--- a/shell/src/PluginLoader.js
+++ b/shell/src/PluginLoader.js
@@ -196,7 +196,7 @@ export const PluginLoader = ({ config, requiredProps, D2App }) => {
         >
             <React.Suspense
                 fallback={
-                    <Layer translucent level={layers.alert}>
+                    <Layer level={layers.alert}>
                         <CenteredContent>
                             <CircularLoader />
                         </CenteredContent>