Merge branch 'main' into feature/per_session_data

Alyxion · Apr 7, 2024 · bb6f44b · bb6f44b
2 parents 06d6393 + 815c88c
commit bb6f44b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/nicegui/elements/echart.js b/nicegui/elements/echart.js
@@ -64,7 +64,7 @@ export default {
     run_chart_method(name, ...args) {
       if (name.startsWith(":")) {
         name = name.slice(1);
-        args = args.map((arg) => new Function("return " + arg)());
+        args = args.map((arg) => new Function(`return (${arg})`)());
       }
       return runMethod(this.chart, name, args);
     },

diff --git a/nicegui/elements/json_editor.js b/nicegui/elements/json_editor.js
@@ -35,7 +35,7 @@ export default {
       if (this.editor) {
         if (name.startsWith(":")) {
           name = name.slice(1);
-          args = args.map((arg) => new Function("return " + arg)());
+          args = args.map((arg) => new Function(`return (${arg})`)());
         }
         return runMethod(this.editor, name, args);
       }

diff --git a/nicegui/elements/leaflet.js b/nicegui/elements/leaflet.js
@@ -125,7 +125,7 @@ export default {
     run_map_method(name, ...args) {
       if (name.startsWith(":")) {
         name = name.slice(1);
-        args = args.map((arg) => new Function("return " + arg)());
+        args = args.map((arg) => new Function(`return (${arg})`)());
       }
       return runMethod(this.map, name, args);
     },
@@ -135,7 +135,7 @@ export default {
         if (layer.id !== id) return;
         if (name.startsWith(":")) {
           name = name.slice(1);
-          args = args.map((arg) => new Function("return " + arg)());
+          args = args.map((arg) => new Function(`return (${arg})`)());
         }
         result = runMethod(layer, name, args);
       });

diff --git a/nicegui/native/native.py b/nicegui/native/native.py
@@ -70,6 +70,9 @@ def set_window_size(self, width: int, height: int) -> None:
         def resize(self, width: int, height: int, fix_point: FixPoint = FixPoint.NORTH | FixPoint.WEST) -> None:
             self._send(width, height, fix_point)
 
+        def maximize(self) -> None:
+            self._send()
+
         def minimize(self) -> None:
             self._send()
 

diff --git a/nicegui/static/utils/dynamic_properties.js b/nicegui/static/utils/dynamic_properties.js
@@ -11,7 +11,7 @@ export function convertDynamicProperties(obj, recursive) {
   for (const [attr, value] of Object.entries(obj)) {
     if (attr.startsWith(":")) {
       try {
-        obj[attr.slice(1)] = new Function("return " + value)();
+        obj[attr.slice(1)] = new Function(`return (${value})`)();
         delete obj[attr];
       } catch (e) {
         console.error(`Error while converting ${attr} attribute to function:`, e);