gd-sprest-bs 10.4.7 → 10.4.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._cfg = null;
         this._props = null;
         /** The configuration form. */
@@ -45,23 +46,40 @@ var _SPFxWebPart = /** @class */ (function () {
             }
             catch (_a) { }
         }
-        // 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();
-        }
-        else {
-            // Set the flag
-            isEdit = this._props.spfx.displayMode == gd_sprest_1.SPTypes.FormDisplayMode.Edit;
-        }
-        // Ensure we are in edit mode
-        if (isEdit) {
+        // Set the webpart properties pane to trigger the modal from displaying
+        var propertyPageConfig = this._props.spfx.getPropertyPaneConfiguration;
+        this._props.spfx.getPropertyPaneConfiguration = function () {
+            // Display the modal
+            _this._modal.show();
+            // Call the original event
+            return propertyPageConfig ? propertyPageConfig() : null;
+        };
+        // 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();
         }
         else {
-            // Render the webpart
-            this.render();
+            // 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();
+            }
+            else {
+                // Set the flag
+                isEdit = this._props.spfx.displayMode == gd_sprest_1.SPTypes.FormDisplayMode.Edit;
+            }
+            // Ensure we are in edit mode
+            if (isEdit) {
+                // Render the configuration button
+                this.renderEdit();
+            }
+            else {
+                // Render the webpart
+                this.render();
+            }
         }
     }
     Object.defineProperty(_SPFxWebPart.prototype, "Form", {