Merge branch 'eh/feat/DHIS2-15475-SwitchToPluginComponent' into eh/fe…

…at/DHIS2-16305-EnrollmentOverviewPlugins # Conflicts: # i18n/en.pot # yarn.lock
dhis2 · Jan 26, 2024 · 82d9cb3 · 82d9cb3
2 parents a27522a + 0d136c4
commit 82d9cb3
Show file tree

Hide file tree

Showing 2 changed files with 2,286 additions and 2,452 deletions.
diff --git a/src/core_modules/capture-core/components/D2Form/FormFieldPlugin/FormFieldPlugin.component.js b/src/core_modules/capture-core/components/D2Form/FormFieldPlugin/FormFieldPlugin.component.js
@@ -10,7 +10,7 @@ export const FormFieldPluginComponent = (props: ComponentProps) => {
 
     useEffect(() => {
         const { current: container } = containerRef;
-        if (!container) return;
+        if (!container) return () => {};
 
         const resizeObserver = new ResizeObserver((entries) => {
             entries.forEach(entry => setPluginWidth(entry.contentRect.width));
@@ -19,7 +19,6 @@ export const FormFieldPluginComponent = (props: ComponentProps) => {
         resizeObserver.observe(container);
 
         // Cleanup function
-        // eslint-disable-next-line consistent-return
         return () => {
             resizeObserver.unobserve(container);
             resizeObserver.disconnect();