ModalDialog: commit new serialized configuration

riganti · Feb 23, 2024 · efeee05 · efeee05
1 parent 631c8a4
commit efeee05
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/Framework/Framework/Controls/ModalDialog.cs b/src/Framework/Framework/Controls/ModalDialog.cs
@@ -26,13 +26,13 @@ public ModalDialog()
 
         /// <summary> A value indicating whether the dialog is open. The value can either be a boolean or an object (not false or not null -> shown). On close, the value is written back into the Open binding. </summary>
         [MarkupOptions(AllowHardCodedValue = false)]
-        public object Open
+        public object? Open
         {
-            get { return (bool?)GetValue(OpenProperty) ?? false; }
+            get { return GetValue(OpenProperty); }
             set { SetValue(OpenProperty, value); }
         }
         public static readonly DotvvmProperty OpenProperty =
-            DotvvmProperty.Register<object, ModalDialog>(nameof(Open), false);
+            DotvvmProperty.Register<object, ModalDialog>(nameof(Open), null);
 
         /// <summary> Add an event handler which closes the dialog when the backdrop is clicked. </summary>
         public bool CloseOnBackdropClick

diff --git a/src/Tests/Runtime/config-tests/ConfigurationSerializationTests.SerializeDefaultConfig.json b/src/Tests/Runtime/config-tests/ConfigurationSerializationTests.SerializeDefaultConfig.json
@@ -1175,6 +1175,20 @@
         "defaultValue": ""
       }
     },
+    "DotVVM.Framework.Controls.ModalDialog": {
+      "Close": {
+        "type": "DotVVM.Framework.Binding.Expressions.Command, DotVVM.Framework",
+        "isCommand": true
+      },
+      "CloseOnBackdropClick": {
+        "type": "System.Boolean",
+        "defaultValue": false
+      },
+      "Open": {
+        "type": "System.Object",
+        "onlyBindings": true
+      }
+    },
     "DotVVM.Framework.Controls.MultiSelector": {
       "SelectedValues": {
         "type": "System.Object",
@@ -2214,6 +2228,10 @@
       "baseType": "DotVVM.Framework.Controls.HtmlGenericControl, DotVVM.Framework",
       "withoutContent": true
     },
+    "DotVVM.Framework.Controls.ModalDialog": {
+      "assembly": "DotVVM.Framework",
+      "baseType": "DotVVM.Framework.Controls.HtmlGenericControl, DotVVM.Framework"
+    },
     "DotVVM.Framework.Controls.MultiSelect": {
       "assembly": "DotVVM.Framework",
       "baseType": "DotVVM.Framework.Controls.MultiSelectHtmlControlBase, DotVVM.Framework"