浏览代码

remove ui.svg

Falko Schindler 2 年之前
父节点
当前提交
8f738889cf
共有 3 个文件被更改,包括 8 次插入38 次删除
  1. 8 5
      main.py
  2. 0 32
      nicegui/elements/svg.py
  3. 0 1
      nicegui/ui.py

+ 8 - 5
main.py

@@ -116,15 +116,18 @@ with example(ui.image):
     base64 = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAASABIAAD/4QCMRXhpZgAATU0AKgAAAAgABQESAAMAAAABAAEAAAEaAAUAAAABAAAASgEbAAUAAAABAAAAUgEoAAMAAAABAAIAAIdpAAQAAAABAAAAWgAAAAAAAABIAAAAAQAAAEgAAAABAAOgAQADAAAAAQABAACgAgAEAAAAAQAAACKgAwAEAAAAAQAAACMAAAAA/8IAEQgAIwAiAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAMCBAEFAAYHCAkKC//EAMMQAAEDAwIEAwQGBAcGBAgGcwECAAMRBBIhBTETIhAGQVEyFGFxIweBIJFCFaFSM7EkYjAWwXLRQ5I0ggjhU0AlYxc18JNzolBEsoPxJlQ2ZJR0wmDShKMYcOInRTdls1V1pJXDhfLTRnaA40dWZrQJChkaKCkqODk6SElKV1hZWmdoaWp3eHl6hoeIiYqQlpeYmZqgpaanqKmqsLW2t7i5usDExcbHyMnK0NTV1tfY2drg5OXm5+jp6vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAQIAAwQFBgcICQoL/8QAwxEAAgIBAwMDAgMFAgUCBASHAQACEQMQEiEEIDFBEwUwIjJRFEAGMyNhQhVxUjSBUCSRoUOxFgdiNVPw0SVgwUThcvEXgmM2cCZFVJInotIICQoYGRooKSo3ODk6RkdISUpVVldYWVpkZWZnaGlqc3R1dnd4eXqAg4SFhoeIiYqQk5SVlpeYmZqgo6SlpqeoqaqwsrO0tba3uLm6wMLDxMXGx8jJytDT1NXW19jZ2uDi4+Tl5ufo6ery8/T19vf4+fr/2wBDAAwMDAwMDBUMDBUeFRUVHikeHh4eKTQpKSkpKTQ+NDQ0NDQ0Pj4+Pj4+Pj5LS0tLS0tXV1dXV2JiYmJiYmJiYmL/2wBDAQ8QEBkXGSsXFytnRjlGZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2dnZ2f/2gAMAwEAAhEDEQAAAeqBgCIareozvbaK3avBqa52teT6He3z0TqCUZa22r//2gAIAQEAAQUCaVVKTjGnLFqSqqlGuciX+87YgM8ScWhAx5KWUJUdJClKadMye6O//9oACAEDEQE/AUxI86A0ynfb/9oACAECEQE/ASaYZBLxpKNinFh2dv8A/9oACAEBAAY/AmUniHVXxfVx7ZIP9x0GlOJdfa+BeVentkSWR66jsI1HUfF+f4l1UykiqR/CypAorg6n/hvuH5nv/8QAMxABAAMAAgICAgIDAQEAAAILAREAITFBUWFxgZGhscHw0RDh8SAwQFBgcICQoLDA0OD/2gAIAQEAAT8hrchP08Nlp8V+7MHK/wCcEXw8q94vkT4K5DD0fpsJBFkwYvy/8cJBuuX7l82UhL9HmlzVKCOfi+3/ADe6Z2jgePxcMYN/xxYQtAu8UCj/ALXDvn/sBxRB/g3/AL//2gAMAwEAAhEDEQAAEE5gPHEUEAP/xAAzEQEBAQADAAECBQUBAQABAQkBABEhMRBBUWEgcfCRgaGx0cHh8TBAUGBwgJCgsMDQ4P/aAAgBAxEBPxAN4PZaNJuOW/g//9oACAECEQE/EAGt2fwmfzBp3X8P/9oACAEBAAE/ELGubg74j5M+RuAgxMrE4g5c4qAjQh1Oh9GL3/xggJDuHs5H2fY1rQIGDISTZ3KuGYzkk8dSkh4Ah8TJ8c0SsIco+yPRD76/486QSwOdnIpjvmvjAQ8pEx4ixlVcDldAdtawTzP5CSqs1wAPeJDMz0nwvHVlRSYTI1ic6b58RUC4kuSTXmFOJuxknJgsgDQMkjQgj/gCBHee6QjzflUA4/5//9k='
     ui.image(base64).style('width:30px')
 
-with example(ui.svg):
-    svg_content = '''
+svg = '''### SVG
+You can add Scalable Vector Graphics using the `ui.html` element.
+'''
+with example(svg):
+    content = '''
         <svg viewBox="0 0 200 200" width="100" height="100" xmlns="http://www.w3.org/2000/svg">
         <circle cx="100" cy="100" r="78" fill="#ffde34" stroke="black" stroke-width="3" />
         <circle cx="80" cy="85" r="8" />
         <circle cx="120" cy="85" r="8" />
         <path d="m60,120 C75,150 125,150 140,120" style="fill:none; stroke:black; stroke-width:8; stroke-linecap:round" />
         </svg>'''
-    ui.svg(svg_content)
+    ui.html(content)
 
 overlay = '''### Captions and Overlays
 
@@ -138,11 +141,11 @@ with example(overlay):
         ui.label('nice').classes('absolute-bottom text-subtitle2 text-center')
 
     with ui.image('https://cdn.pixabay.com/photo/2020/07/13/12/56/mute-swan-5400675__340.jpg'):
-        svg_content = '''
+        content = '''
             <svg viewBox="0 0 510 340" width="100%" height="100%" xmlns="http://www.w3.org/2000/svg">
             <circle cx="200" cy="200" r="100" fill="none" stroke="red" stroke-width="10" />
             </svg>'''
-        ui.svg(svg_content).style('background:transparent')
+        ui.html(content).style('background:transparent')
 
 with example(ui.interactive_image):
     from nicegui.events import MouseEventArguments

+ 0 - 32
nicegui/elements/svg.py

@@ -1,32 +0,0 @@
-from typing import Any
-
-import justpy as jp
-
-from .element import Element
-
-
-class Svg(Element):
-
-    def __init__(self, content: str = ''):
-        """Svg Element
-
-        Displays an svg.
-
-        :param content: the svg definition
-        """
-        view = jp.Div(style='padding:0;width:100%;height:100%', temp=False)
-        super().__init__(view)
-        self.content = content
-
-    @property
-    def content(self) -> str:
-        return self.view.inner_html()
-
-    @content.setter
-    def content(self, content: str) -> None:
-        self.set_content(content)
-
-    def set_content(self, content: str) -> None:
-        self.view.components = []
-        jp.parse_html(content, a=self.view)
-        self.update()

+ 0 - 1
nicegui/ui.py

@@ -38,7 +38,6 @@ class Ui:
     from .elements.row import Row as row
     from .elements.select import Select as select
     from .elements.slider import Slider as slider
-    from .elements.svg import Svg as svg
     from .elements.switch import Switch as switch
     from .elements.table import Table as table
     from .elements.toggle import Toggle as toggle