gd-sprest-bs 10.5.7 → 10.5.9

package/build/webparts/base/wpSpfx.js

@@ -21,6 +21,7 @@ var _SPFxWebPart = /** @class */ (function () {
     /** The configuration modal. */
     // Constructor
     function _SPFxWebPart(props) {
+        var _this = this;
         this._props = null;
         /** The webpart configuration */
         this._cfg = null;
@@ -28,7 +29,10 @@ var _SPFxWebPart = /** @class */ (function () {
         this._form = null;
         /** The configuration modal. */
         this._modal = null;
-        var isEdit = false;
+        /** Is in display mode */
+        this._isDisplay = null;
+        /** Is in edit mode */
+        this._isEdit = null;
         // Save the properties
         this._props = props;
         // Ensure the spfx object was set
@@ -39,43 +43,55 @@ var _SPFxWebPart = /** @class */ (function () {
         }
         // Set the page context
         gd_sprest_1.ContextInfo.setPageContext(this._props.spfx.context.pageContext);
-        // Try to parse the configuration
-        if (this._props.wpCfg) {
-            try {
-                this._cfg = JSON.parse(this._props.wpCfg);
-            }
-            catch (_a) { }
-        }
+        // Set the configuration
+        this.Configuration = this._props.wpCfg;
         // See if this is the workbench
         if (window.location.pathname.indexOf("workbench.aspx") > 0) {
-            // Render the configuration button
-            this.renderEdit();
-            // Render the solution
-            this.render();
+            // Set both flags to render edit/display
+            this._isDisplay = true;
+            this._isEdit = true;
         }
         else {
             // See if this is a classic page
             if (gd_sprest_1.Helper.SP.Ribbon.exists) {
                 // Set the flag
-                isEdit = gd_sprest_1.Helper.WebPart.isEditMode();
+                this._isEdit = gd_sprest_1.Helper.WebPart.isEditMode();
             }
             else {
                 // Set the flag
-                isEdit = this._props.spfx.displayMode == gd_sprest_1.SPTypes.FormDisplayMode.Edit;
+                this._isEdit = this._props.spfx.displayMode == gd_sprest_1.SPTypes.FormDisplayMode.Edit;
             }
-            // Ensure we are in edit mode
-            if (isEdit) {
+            // Set the flag
+            this._isDisplay = !this._isEdit;
+        }
+        // Run the render method in another thread
+        setTimeout(function () {
+            // See if we are in edit mode
+            if (_this._isEdit) {
                 // Render the configuration button
-                this.renderEdit();
+                _this.renderEdit();
             }
-            else {
+            // See if we are in display mode
+            if (_this.IsDisplay) {
                 // Render the webpart
-                this.render();
+                _this.render();
             }
-        }
+        }, 10);
     }
     Object.defineProperty(_SPFxWebPart.prototype, "Configuration", {
         get: function () { return this._cfg; },
+        set: function (value) {
+            // Clear the value
+            this._cfg = {};
+            // Ensure a value exists
+            if (value) {
+                // Try to parse the value
+                try {
+                    this._cfg = JSON.parse(value);
+                }
+                catch (_a) { }
+            }
+        },
         enumerable: false,
         configurable: true
     });
@@ -90,6 +106,16 @@ var _SPFxWebPart = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(_SPFxWebPart.prototype, "IsDisplay", {
+        get: function () { return this._isDisplay; },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(_SPFxWebPart.prototype, "IsEdit", {
+        get: function () { return this._isEdit; },
+        enumerable: false,
+        configurable: true
+    });
     // Method to render the webpart
     _SPFxWebPart.prototype.render = function () {
         // Get the webpart element
@@ -146,6 +172,8 @@ var _SPFxWebPart = /** @class */ (function () {
                                     onClick: function () {
                                         // Show the modal
                                         _this.showEditModal();
+                                        // Close the properties window
+                                        _this._props.spfx.context.propertyPane.close();
                                     }
                                 }
                             }]
@@ -210,6 +238,12 @@ var _SPFxWebPart = /** @class */ (function () {
                                         _this._props.onConfigSaved ? _this._props.onConfigSaved(cfg) : null;
                                         // Close the modal
                                         _this._modal.hide();
+                                        // See if we are in display mode
+                                        if (_this.IsDisplay) {
+                                            // Render the display webpart
+                                            // Do we need to do this?
+                                            //this.render();
+                                        }
                                     }
                                 }
                             }

package/build/webparts/list/wpSpfx.js

@@ -22,7 +22,7 @@ var SPFxListWebPart = function (wpProps) {
     var _ddl = null;
     var _loadFl = false;
     // Load the lists
-    var loadLists = function () {
+    var loadLists = function (listId) {
         // Disable the dropdown
         _ddl.disable();
         // Get the web url
@@ -42,7 +42,7 @@ var SPFxListWebPart = function (wpProps) {
                     data: list,
                     text: list.Title,
                     value: list.Id,
-                    isSelected: wp.Configuration ? wp.Configuration.ListId == list.Id : false
+                    isSelected: listId == list.Id
                 });
             }
             // Set the dropdown
@@ -87,7 +87,7 @@ var SPFxListWebPart = function (wpProps) {
                 btnProps: {
                     text: "Load Lists",
                     type: gd_bs_1.Components.ButtonTypes.OutlinePrimary,
-                    onClick: loadLists
+                    onClick: function () { loadLists(); }
                 }
             });
             // Return the properties
@@ -98,10 +98,10 @@ var SPFxListWebPart = function (wpProps) {
             // See if the lists haven't been loaded
             if (_loadFl == false) {
                 // Load the lists
-                loadLists();
+                loadLists(wp.Configuration ? wp.Configuration.ListId : null);
             }
         },
-        // 
+        // The configuration saving event
         onConfigSaving: function (cfg) {
             // Get the form values
             var values = wp.Form.getValues();