Studio Performance[WM-17843]: Update properties panel for a widget on…

…ly after it is selected in canvas Change-Id: I44abe18e893bd5cb385f6dbebfb25b04df275059
wavemaker · Sep 18, 2019 · f1c7a7a · f1c7a7a
1 parent f7dd1e3
commit f1c7a7a
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/webapp/scripts/modules/widgets/base/Base.js b/src/main/webapp/scripts/modules/widgets/base/Base.js
@@ -3824,10 +3824,14 @@ WM.module('wm.widgets.base', [])
                     if (CONSTANTS.isRunMode) {
                         return;
                     }
-                    var property = 'bind' + (attrs.listenProperty || 'dataset');
-
-                    $is.$on('$destroy', $is.$watch(property, function () {
-                        WidgetUtilService.updatePropertyPanelOptions($is);
+                    var property = 'bind' + (attrs.listenProperty || 'dataset'),
+                        isActive;
+                    $is.$on('$destroy', $is.$watchGroup([property, 'active'], function (arr_Expr_Active) {
+                        isActive = arr_Expr_Active[1];
+                        // update property panel options only if the widget is selected in canvas.
+                        if (isActive) {
+                            WidgetUtilService.updatePropertyPanelOptions($is);
+                        }
                     }));
                 }
             };