tkinterweb 4.17.5__tar.gz → 4.18.0__tar.gz

{tkinterweb-4.17.5/tkinterweb.egg-info → tkinterweb-4.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkinterweb
-Version: 4.17.5
+Version: 4.18.0
 Summary: HTML/CSS viewer, editor, and app builder for Tkinter
 Home-page: https://github.com/Andereoo/TkinterWeb
 License: MIT

{tkinterweb-4.17.5 → tkinterweb-4.18.0}/setup.py

@@ -6,7 +6,7 @@ README = (HERE / "README.md").read_text()
 
 setup(
     name="tkinterweb",
-    version="4.17.5",
+    version="4.18.0",
     python_requires=">=3.2",
     description="HTML/CSS viewer, editor, and app builder for Tkinter",
     long_description=README,
@@ -27,13 +27,13 @@ setup(
     include_package_data=True,
     install_requires=["tkinterweb-tkhtml>=2.1.0"],
     extras_require = {
-          "html": ["tkinterweb-tkhtml-extras>=1.2.0"],
+          "html": ["tkinterweb-tkhtml-extras>=1.3.0"],
           "images": ["pillow"],
-          "svg": ["tkinterweb-tkhtml-extras>=1.2.0", "pillow", "cairosvg"],
+          "svg": ["tkinterweb-tkhtml-extras>=1.3.0", "pillow", "cairosvg"],
           "javascript": ["pythonmonkey"],
           "requests": ["brotli"],
 
-          "recommended": ["tkinterweb-tkhtml-extras>=1.2.0", "pillow"],
-          "full": ["tkinterweb-tkhtml-extras>=1.2.0", "pillow", "cairosvg", "pythonmonkey", "brotli"],
+          "recommended": ["tkinterweb-tkhtml-extras>=1.3.0", "pillow"],
+          "full": ["tkinterweb-tkhtml-extras>=1.3.0", "pillow", "cairosvg", "pythonmonkey", "brotli"],
     },
 )

{tkinterweb-4.17.5 → tkinterweb-4.18.0}/tkinterweb/bindings.py

@@ -201,7 +201,7 @@ If you benefited from using this package, please consider supporting its develop
 
         self.fragment = ""
         self.active_threads = []
-        self.downloads_have_occured = False
+        self.pending_threads = []
         self.current_active_node = None
         self.clicked_node = None
         self.current_hovered_node = None
@@ -276,6 +276,10 @@ If you benefited from using this package, please consider supporting its develop
         self.register_lazy_handler("node", "a", "node_manager")
         self.register_lazy_handler("node", "base", "node_manager")
         self.register_lazy_handler("attribute", "a", "node_manager")
+
+        if not self.using_tkhtml30:
+            #self.register_lazy_handler("node", "details", "node_manager")
+            self.register_lazy_handler("attribute", "details", "node_manager")
         
         self.register_lazy_handler("node", "form", "form_manager")
         self.register_lazy_handler("node", "table", "form_manager")
@@ -587,7 +591,6 @@ It is likely that not all dependencies are installed. Make sure Cairo is install
         "Parse HTML code. Call :meth:`TkinterWeb.reset` before calling this method for the first time."
         # NOTE: when thread_safe=True, this method is thread-safe
 
-        self.downloads_have_occured = False
         html = self._crash_prevention(html)
         html = self._dark_mode(html)
 
@@ -605,12 +608,14 @@ It is likely that not all dependencies are installed. Make sure Cairo is install
     def _parse(self, html):
         "Parse HTML code."
         # NOTE: this must run in the main thread
-
+        self.parsing = True
         self.tk.call(self._w, "parse", html)
+        self.parsing = False
+
         self.post_event(utilities.DOM_CONTENT_LOADED_EVENT)
 
-        # We assume that if no downloads have been made by now the document has finished loading, so we send the done loading signal
-        if not self.downloads_have_occured:
+        # If any threads are active, they'll send the done loading signal when they finish
+        if not self.active_threads:
             self._handle_load_finish()
         else:
             # Scroll to the fragment if given but do not issue a done loading event
@@ -619,6 +624,9 @@ It is likely that not all dependencies are installed. Make sure Cairo is install
         self.script_manager._submit_deferred_scripts()
         self.event_manager.send_onload()
 
+        #if self.using_tkhtml30: # Handle unsupported tags
+        self.node_manager._handle_load_finish()
+
     def _handle_load_finish(self, post_event=True):
         if self.fragment:
             try:
@@ -707,6 +715,7 @@ It is likely that not all dependencies are installed. Make sure Cairo is install
         "Stop loading resources."
         for thread in self.active_threads:
             thread.stop()
+        self.pending_threads.clear()
     
     def resolve_url(self, url, base=None):
         "Generate a full url from the specified url."
@@ -725,33 +734,38 @@ It is likely that not all dependencies are installed. Make sure Cairo is install
             return utilities.cache_download(url, *args, insecure=self.insecure_https, cafile=self.ssl_cafile, headers=tuple(self.headers.items()), timeout=self.request_timeout)
     
     def _thread_check(self, callback, url, *args, **kwargs):
-        if not self.downloads_have_occured:
-            self.downloads_have_occured = True
-            
         if not self.threading_enabled or url.startswith("file://"):
             callback(url, *args, **kwargs)
-        elif len(self.active_threads) >= self.maximum_thread_count:
-            self.after(500, lambda callback=callback, url=url, args=args: self._thread_check(callback, url, *args, **kwargs))
         else:
             thread = utilities.StoppableThread(target=callback, args=(url, *args,), kwargs=kwargs)
-            thread.start()
+
+            if len(self.active_threads) >= 100:
+                self.pending_threads.append(thread)
+            else:
+                thread.start()
 
     def _begin_download(self):
-        # NOTE: this runs in a thread
+        # NOTE: this may run in a thread
 
         thread = utilities.get_current_thread()
         self.active_threads.append(thread)
-        self.post_event(utilities.DOWNLOADING_RESOURCE_EVENT, True)
+        self.post_event(utilities.DOWNLOADING_RESOURCE_EVENT, thread.is_subthread)
         return thread
 
     def _finish_download(self, thread):
-        # NOTE: this runs in a thread
+        # NOTE: this may run in a thread
 
         self.active_threads.remove(thread)
-        if len(self.active_threads) == 0:
-            self.post_to_queue(self._handle_load_finish, thread.is_subthread)
-        else:
-            self.post_to_queue(lambda: self._handle_load_finish(False), thread.is_subthread)
+
+        if thread.isrunning():
+            if thread.is_subthread and self.pending_threads:
+                self.pending_threads.pop(0).start()
+
+            elif not self.parsing:
+                if len(self.active_threads) == 0:
+                    self.post_to_queue(self._handle_load_finish, thread.is_subthread)
+                else:
+                    self.post_to_queue(lambda: self._handle_load_finish(False), thread.is_subthread)
 
     def _finish_resource_load(self, message, url, resource, success):
         # NOTE: this must run in the main thread
@@ -829,12 +843,11 @@ It is likely that not all dependencies are installed. Make sure Cairo is install
         A document fragment isn't part of the active document but is comprised of nodes like the active document.
         Changes made to the fragment don't affect the document.
         Returns a root node."""
-        self.downloads_have_occured = False
         html = self._crash_prevention(html)
         html = self._dark_mode(html)
         fragment = self.tk.call(self._w, "fragment", html)
-        # We assume that if no downloads have been made by now the document has finished loading, so we send the done loading signal
-        if not self.downloads_have_occured:
+        # If any threads are active, they'll send the done loading signal when they finish
+        if not self.active_threads:
             self.post_event(utilities.DONE_LOADING_EVENT)
         self.script_manager._submit_deferred_scripts()
         return fragment
@@ -1549,7 +1562,8 @@ It is likely that not all dependencies are installed. Make sure Cairo is install
         href = self.get_node_attribute(node_handle, "href")
         url = self.resolve_url(href)
         self.post_message(f"A link to '{utilities.shorten(url)}' was clicked")
-        self.visited_links.append(url)
+        if url not in self.visited_links:
+            self.visited_links.append(url)
         self.on_link_click(url)
 
     def _on_click_release(self, event):
@@ -1602,6 +1616,10 @@ It is likely that not all dependencies are installed. Make sure Cairo is install
                         if node_type == "submit":
                             self.form_manager._handle_form_submission(node)
                             break
+                    elif node_tag == "summary":
+                        self.node_manager._handle_summary_click(node)
+                        break
+                        
         except tk.TclError:
             pass
 

{tkinterweb-4.17.5 → tkinterweb-4.18.0}/tkinterweb/dom.py

@@ -52,11 +52,6 @@ def camel_case_to_property(string):
             new_string += i
     return new_string
 
-    # This also works:
-    # from re import finditer
-    # matches = finditer('.+?(?:(?<=[a-z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])|$)', string)
-    # return "-".join([m.group(0).lower() for m in matches])
-
 
 class HTMLDocument:
     """Access this class via the :attr:`~tkinterweb.HtmlFrame.document` property of the :class:`~tkinterweb.HtmlFrame` and :class:`~tkinterweb.HtmlLabel` widgets.

{tkinterweb-4.17.5 → tkinterweb-4.18.0}/tkinterweb/extensions.py

@@ -147,10 +147,11 @@ class SelectionManager(utilities.BaseManager):
             return
         
         if self.selection_type == 1:
-            text = self.html.get_node_text(self.selection_start_node)
-            self.selection_start_offset = 0
-            self.selection_end_node = self.selection_start_node
-            self.selection_end_offset = len(text)
+            # Tkhtml seems to wrap the output of text("text") with \n, so this works
+            text = self.html.text("text")
+            index = self.html.text("offset", self.selection_start_node, self.selection_start_offset)
+            self.selection_start_node, self.selection_start_offset = self.html.text("index", text[:index].rfind("\n") + 1)
+            self.selection_end_node, self.selection_end_offset = self.html.text("index", text.find("\n", index))
             self.update_selection()
             self.selection_type = 2
 
@@ -183,16 +184,16 @@ class SelectionManager(utilities.BaseManager):
                 self.selection_end_offset = end_offset2
 
         elif self.selection_type == 2:
+            text = self.html.text("text")
             start_index = self.html.text("offset", self.selection_start_node, self.selection_start_offset)
             end_index = self.html.text("offset", self.selection_end_node, self.selection_end_offset)
+            
             if start_index > end_index:
-                text = self.html.get_node_text(self.selection_start_node)
-                self.selection_start_offset = len(text)
-                self.selection_end_offset = 0
+                self.selection_start_node, self.selection_start_offset = self.html.text("index", text.find("\n", start_index))
+                self.selection_end_node, self.selection_end_offset = self.html.text("index", text[:end_index].rfind("\n") + 1)
             else:
-                text = self.html.get_node_text(self.selection_end_node)
-                self.selection_start_offset = 0
-                self.selection_end_offset = len(text)
+                self.selection_start_node, self.selection_start_offset = self.html.text("index", text[:start_index].rfind("\n") + 1)
+                self.selection_end_node, self.selection_end_offset = self.html.text("index", text.find("\n", end_index))
             
         self.update_selection()
 

{tkinterweb-4.17.5 → tkinterweb-4.18.0}/tkinterweb/handlers.py

@@ -8,15 +8,20 @@ import tkinter as tk
 
 from urllib.parse import urlencode, urlparse
 
-from . import subwidgets, utilities, imageutils
+from . import subwidgets, utilities, imageutils, dom
 
 class NodeManager(utilities.BaseManager):
-    "Handle hyperlinks, body/html elements, and title/meta/base elements."
+    "Handle body, html, title, meta, base, details, and hyperlink elements."
     def __init__(self, html):
         super().__init__(html)
 
+        self._node_texts = {}
+
     def __repr__(self):
         return f"{self.html._w}::{self.__class__.__name__.lower()}"
+    
+    def reset(self):
+        self._node_texts.clear()
 
     # --- Handle title, base, and meta elements -------------------------------
 
@@ -110,6 +115,81 @@ class NodeManager(utilities.BaseManager):
             self.html.motion_frame_bg = background
             self.html.motion_frame.config(bg=background)
 
+    
+    # --- Handle <details> elements -------------------------------------------
+
+    # Technically <details> elements should be visible whenever the open attribute is present
+    # But Tkhtml can't remove attributes (or at lease I can't figure out how to do it)
+    # So for now we hide the content if open="false"
+    # I could cut out most of this code if we could remove attributes though
+
+    def _is_open(self, node):
+        return self.html.get_node_attribute(node, "open", "false") != "false"
+
+    def _update_details(self, node, display):
+        for child in self.html.get_node_children(node):
+            if self.html.get_node_tag(child) == "summary":
+                continue
+
+            try:
+                self.html.override_node_properties(child, "display", "" if display else "none")
+            except tk.TclError:
+                # We need a better solution here
+                if display and child in self._node_texts:
+                    self.html.set_node_text(child, self._node_texts[child])
+                else:
+                    self._node_texts[child] = self.html.get_node_text(child)
+                    self.html.set_node_text(child, "")
+
+    def _set_open(self, node, display):
+        self.html.set_node_attribute(node, "open", "" if display else "false")
+        if self.html.using_tkhtml30:
+            # In Tkhtml 3.1+ we add an attribute handler, which does this for us
+            self._update_details(node, display)
+
+    def _close_other_details(self, node):
+        node = dom.extract_nested(node)
+        name = self.html.get_node_attribute(node, "name")
+        if not name:
+            return
+        
+        for details in self.html.search(f"DETAILS[name={name}]"):
+            if dom.extract_nested(details) != node:
+                self._set_open(details, False)
+
+    def _on_details(self, node):
+        "Handle <details> elements."
+        if self._is_open(node):
+            self._close_other_details(node)
+        else:
+            self._update_details(node, False)
+
+    def _on_details_value_change(self, node, attribute, value):
+        if attribute != "open":
+            return
+        
+        open = value != "false"
+        self._update_details(node, open)
+        if open:
+            self._close_other_details(node)
+
+    def _handle_load_finish(self):
+        "Collapse <details> elements. Only needed for Tkhtml 3.0, which doesn't support HTML5 elements."
+        "It turns out if groups are used this preserves the first box while handling _on_details preserves the last."
+        "I think there's value in preserving behaviour between Tkhtml versions, so for now I guess we'll keep this."
+        for details in self.html.search("DETAILS"):
+            self._on_details(details)
+    
+    def _handle_summary_click(self, node):
+        "Handle clicks on <summary> elements"
+        details = self.html.get_node_parent(node)
+        if self.html.get_node_tag(details).lower() != "details":
+            return
+        
+        open = not self._is_open(details)
+        self._set_open(details, open)
+        if open and self.html.using_tkhtml30:
+            self._close_other_details(details)
 
 class FormManager(utilities.BaseManager):
     "Handle forms and form elements."
@@ -479,7 +559,7 @@ class ScriptManager(utilities.BaseManager):
     
     def fetch_scripts(self, attributes, url=None, data=None):
         "Fetch and run scripts"
-        # NOTE: this runs in a thread
+        # NOTE: this may run in a thread
 
         thread = self.html._begin_download()
 
@@ -563,7 +643,7 @@ class StyleManager(utilities.BaseManager):
     
     def fetch_styles(self, url=None, node=None):
         "Fetch stylesheets and parse the CSS code they contain"
-        # NOTE: this runs in a thread
+        # NOTE: this may run in a thread
 
         thread = self.html._begin_download()
         if url and thread.isrunning():
@@ -692,7 +772,7 @@ class ImageManager(utilities.BaseManager):
 
     def fetch_images(self, url, name):
         "Fetch images and display them in the document."
-        # NOTE: this runs in a thread
+        # NOTE: this may run in a thread
 
         thread = self.html._begin_download()
         if thread.isrunning():
@@ -717,7 +797,7 @@ class ImageManager(utilities.BaseManager):
 
     def check_images(self, data, name, url, filetype, thread_safe):
         "Invert images if needed and convert SVG images to PNGs."
-        # NOTE: this runs in a thread
+        # NOTE: this may run in a thread
 
         data_is_image = False
         if "svg" in filetype:
@@ -899,7 +979,7 @@ class ObjectManager(utilities.BaseManager):
                 self.html.widget_manager.map_node(node, True)
 
     def fetch_objects(self, url, node):
-        # NOTE: this runs in a thread
+        # NOTE: this may run in a thread
 
         thread = self.html._begin_download()
 

{tkinterweb-4.17.5 → tkinterweb-4.18.0}/tkinterweb/htmlwidgets.py

@@ -397,6 +397,8 @@ class HtmlFrame(Frame):
         :type base_url: str, optional
         :param fragment: The url fragment to scroll to after the document loads.
         :type fragment: str, optional"""
+        if self._thread_in_progress:
+            self._thread_in_progress.stop()
         self._html.reset(_thread_safe)
 
         if fragment: fragment = "".join(char for char in fragment if char.isalnum() or char in ("-", "_", ".")).replace(".", r"\.")
@@ -593,9 +595,8 @@ class HtmlFrame(Frame):
         """Stop loading this page and abandon all pending requests."""
         if self._thread_in_progress:
             self._thread_in_progress.stop()
-        self._html.stop()
-        if self._thread_in_progress:
             self._current_url = self._previous_url
+        self._html.stop()
         self._html.post_event(utilities.URL_CHANGED_EVENT)
         self._html.post_event(utilities.DONE_LOADING_EVENT)
 
@@ -1190,7 +1191,7 @@ class HtmlFrame(Frame):
 
     def _continue_loading(self, url, data="", method="GET", decode=None, force=False, thread_safe=False):
         "Finish loading urls and handle URI fragments."
-        # NOTE: this runs in a thread
+        # NOTE: this may run in a thread
 
         code = 404
         self._current_url = url

{tkinterweb-4.17.5 → tkinterweb-4.18.0}/tkinterweb/utilities.py

@@ -31,7 +31,7 @@ __title__ = "TkinterWeb"
 __author__ = "Andrew Clarke"
 __copyright__ = "(c) 2021-2025 Andrew Clarke"
 __license__ = "MIT"
-__version__ = "4.17.5"
+__version__ = "4.18.0"
 
 
 ROOT_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), "resources")
@@ -91,7 +91,7 @@ DEFAULT_STYLE = r"""
 /* This is a modified version of the stylesheet that comes bundled with Tkhtml. */
 /* Display types for non-table items. */
   ADDRESS, BLOCKQUOTE, BODY, DD, DIV, DL, DT, FIELDSET, 
-  FRAME, H1, H2, H3, H4, H5, H6, NOFRAMES, 
+  FRAME, H1, H2, H3, H4, H5, H6, NOFRAMES, DETAILS, SUMMARY,
   OL, P, UL, APPLET, CENTER, DIR, HR, MENU, PRE, FORM
                 { display: block }
 HEAD, SCRIPT, TITLE { display: none }
@@ -188,6 +188,7 @@ TD, TH          { display: table-cell }
 CAPTION         { display: table-caption }
 TH              { font-weight: bolder; text-align: center }
 CAPTION         { text-align: center }
+/* General formatting */
 H1              { font-size: 2em; margin: .67em 0 }
 H2              { font-size: 1.5em; margin: .83em 0 }
 H3              { font-size: 1.17em; margin: 1em 0 }
@@ -223,9 +224,17 @@ PRE, PLAINTEXT, XMP {
   margin: 1em 0;
   font-family: monospace;
 }
-/* Formatting for <mark> */
-MARK {
-    background: yellow;
+/* Rules for recently-added elements*/
+MARK { background: yellow }
+Q:before { content: "“" }
+Q:after { content: "”" }
+DETAILS[open] SUMMARY:before {
+    content: "▾";
+    margin-right: 5px;
+}
+DETAILS SUMMARY:before, DETAILS[open="false"] SUMMARY:before {
+    content: "▸";
+    margin-right: 5px;
 }
 /* Display properties for hyperlinks */
 :link    { color: darkblue; text-decoration: underline ; cursor: pointer }
@@ -455,14 +464,15 @@ class BuiltinPageGenerator():
     def __init__(self):
         self._html = None
         self._pages = {
-    "about:blank": "<html><head><style>html,body{{background-color:{bg};color:{fg};cursor:gobbler;width:100%;height:100%;margin:0}}</style><title>about:blank</title></head><body></body></html>{i1}{i2}",
+    "about:blank": "<html><head><style>html,body{{width:100%;height:100%;margin:0}}</style><title>about:blank</title></head><body></body></html>{bg}{fg}{i1}{i2}",
     "about:tkinterweb": "<html tkinterweb-overflow-x=auto><head>\
         <style>html,body{{{{background-color:{bg};color:{fg}}}}}\
             code{{{{display:block}}}}\
-            span{{{{margin-right:10px;border:1px solid black;width:20px;padding-left:45px}}}}\
-            .header{{{{display:block;text-decoration:underline;margin-top:25px}}}}\
-            .closeheader{{{{display:block;text-decoration:underline}}}}\
-            .section{{{{margin-left:10px;border-left:2px solid lightgrey;padding-left:10px}}}}\
+            span{{{{cursor:gobbler;margin-right:10px;border:1px solid black;width:20px;padding-left:45px}}}}\
+            summary{{{{font-weight:bold;cursor:pointer;font-family:monospace;display:inline}}}}\
+            details[open]{{{{margin-bottom:25px;}}}}\
+            details[open='false'],details[open].bottom{{{{margin-bottom:0px;}}}}\
+            .section{{{{margin-left:10px;border-left:1px solid;padding-left:10px}}}}\
             .indented{{{{margin-left:20px}}}}\
             .colourbox{{{{margin-right:75px;display:inline}}}}</style>\
         <title>about:tkinterweb</title></head><body>\
@@ -470,40 +480,39 @@ class BuiltinPageGenerator():
         <code>✉ <a href=https://github.com/Andereoo/TkinterWeb>github.com/Andereoo/TkinterWeb</a></code>\
         <code>✨ <a href=https://tkinterweb.readthedocs.io>tkinterweb.readthedocs.io</a></code>\
         <code>☕ <a href=https://buymeacoffee.com/andereoo>buymeacoffee.com/andereoo</a></code>\
-        <code class='header'>Debugging information</code><code class='section'>\
-            <code class='closeheader'>Versioning</code>\
+        <details open style='margin-top:25px'><summary>Debugging information</summary><code class='section'>\
+            <details open><summary>Versioning</summary>\
             <code>Version: {__version__}</code><code>Tkhtml version: {tkhtml_version}</code><code>TkinterWeb-Tkhtml version: {tkw_tkhtml_version}</code>\
-            <code>Python version: {python_version}</code><code>Tcl version: {tcl_version}</code><code>Tk version: {tk_version}</code>\
-            <code class='header'>Resource loading</code>\
+            <code>Python version: {python_version}</code><code>Tcl version: {tcl_version}</code><code>Tk version: {tk_version}</code></details>\
+            <details open><summary>Resource loading</summary>\
             <code>Use prebuilt Tkhtml: {use_prebuilt_tkhtml}</code>\
             <code>Available Tkhtml binaries: {tkhtml_binaries}</code>\
             <code>Resource directories: {root}{tkhtml_root}{tkhtml_extras_root}</code><code>Working directory: {working_dir}</code>\
             <code>Tcl paths: {tcl_path}</code>\
-            <code>System dependency paths: {path}</code>\
-            <code class='header'>System specs</code>\
+            <code>System dependency paths: {path}</code></details>\
+            <details open class='bottom'><summary>System specs</summary>\
             <code>Platform: {platform}</code><code>Machine: {machine}</code><code>Processor: {processor}</code>\
-        </code>\
-         <iframe src=\"about:tkinterweb\" height=\"200\" width=\"300\" title=\"Iframe Example\"></iframe> \
-        <code class='header'>Preferences</code><code class='section'>\
-            <code class='closeheader'>Renderer settings</code>\
+        </code></details>\
+        <details open><summary>Preferences</summary><code class='section'>\
+            <details open><summary>Renderer settings</summary>\
             <code>Parse mode: {parse_mode}</code>\
             <code>Rendering engine mode: {rendering_mode}</code>\
             <code>Zoom: {zoom}</code>\
-            <code>Font scale: {font_scale}</code>\
-            <code class='header'>HTTP settings</code>\
+            <code>Font scale: {font_scale}</code></details>\
+            <details open><summary>HTTP settings</summary>\
             <code>Headers: {headers}</code>\
             <code>Insecure HTTPS: {insecure_https}</code>\
             <code>CA file path: {ssl_cafile}</code>\
-            <code>Request timeout: {request_timeout}s</code>\
-            <code class='header'>Threading settings</code>\
+            <code>Request timeout: {request_timeout}s</code></details>\
+            <details open><summary>Threading settings</summary>\
             <code>Threading enabled: {threading_enabled}</code>\
             <code>Tcl allows threading: {allow_threading}</code>\
-            <code>Maximum thread count: {maximum_thread_count}</code>\
-            <code class='header'>Image settings</code>\
+            <code>Maximum thread count: {maximum_thread_count}</code></details>\
+            <details open><summary>Image settings</summary>\
             <code>Images enabled: {images_enabled}</code>\
             <code>Ignore invalid images: {ignore_invalid_images}</code>\
-            <code>Image alt text: {image_alternate_text_enabled}</code>\
-            <code class='header'>Flags</code>\
+            <code>Image alt text: {image_alternate_text_enabled}</code></details>\
+            <details open><summary>Flags</summary>\
             <code>Experimental mode: {experimental}</code>\
             <code>Caret browsing mode: {caret_mode}</code>\
             <code>Stylesheets enabled: {stylesheets_enabled}</code>\
@@ -514,37 +523,37 @@ class BuiltinPageGenerator():
             <code>Crash prevention enabled: {crash_prevention_enabled}</code>\
             <code>Debug messages enabled: {messages_enabled}</code>\
             <code>Events enabled: {events_enabled}</code>\
-            <code>Selection enabled: {selection_enabled}</code>\
-            <code class='header'>Colours</code>\
-            <span style='background-color:{find_match_highlight_color}'>&nbsp;</span><code class='colourbox'>Found text highlight colour: {find_match_highlight_color}</code><code></code>\
+            <code>Selection enabled: {selection_enabled}</code></details>\
+            <details open><summary>Colours</summary>\
+            <div><span style='background-color:{find_match_highlight_color}'>&nbsp;</span><code class='colourbox'>Found text highlight colour: {find_match_highlight_color}</code><code></code>\
             <span style='background-color:{find_match_text_color}'>&nbsp;</span><code class='colourbox'>Found text colour: {find_match_text_color}</code><code></code>\
             <span style='background-color:{find_current_highlight_color}'>&nbsp;</span><code class='colourbox'>Current found match highlight colour: {find_current_highlight_color}</code><code></code>\
             <span style='background-color:{find_current_text_color}'>&nbsp;</span><code class='colourbox'>Current found match text colour: {find_current_text_color}</code><code></code>\
             <span style='background-color:{selected_text_highlight_color}'>&nbsp;</span><code class='colourbox'>Selected text highlight colour: {selected_text_highlight_color}</code><code></code>\
             <span style='background-color:{selected_text_color}'>&nbsp;</span><code class='colourbox'>Selected text colour: {selected_text_color}</code><code></code>\
             <span style='background-color:{bg}'>&nbsp;</span><code class='colourbox'>About page background colour: {bg}</code><code></code>\
-            <span style='background-color:{fg}'>&nbsp;</span><code class='colourbox'>About page foreground colour: {fg}</code><code></code>\
-            <code class='header'>Dark mode settings</code>\
+            <span style='background-color:{fg}'>&nbsp;</span><code class='colourbox'>About page foreground colour: {fg}</code><code></code></div></details>\
+            <details open class='bottom'><summary>Dark mode settings</summary>\
             <code>Dark mode: {dark_theme_enabled}</code>\
             <code>Image inversion: {image_inversion_enabled}</code>\
             <code>Dark theme general regexes: {general_dark_theme_regexes}</code>\
             <code>Dark theme inline regexes: {inline_dark_theme_regexes}</code>\
             <code>Dark theme style regex: {style_dark_theme_regex}</code>\
-            <code>Colour threshold: {dark_theme_limit}</code>\
-        </code>\
-        <code class='header'>Site memory</code>\
-        <code>Visited hyperlinks: {visited_links}</code>\
-            </body></html>{i1}{i2}",
+            <code>Colour threshold: {dark_theme_limit}</code></details>\
+        </code></details>\
+        <details open class='bottom'><summary>Site memory</summary>\
+            <code class='section'><code>Visited hyperlinks: {visited_links}</code></code></details>\
+        </body></html>{i1}{i2}",
     "about:error": "<html><head><style>html,body,table,tr,td{{background-color:{bg};color:{fg};width:100%;height:100%;margin:0}}</style><title>Error {i1}</title></head>\
         <body><table><tr><td tkinterweb-full-page style='text-align:center;vertical-align:middle'>\
         <h2 style='margin:0;padding:0;font-weight:normal'>Oops</h2>\
         <h3 style='margin-top:10px;margin-bottom:25px;font-weight:normal'>The page you've requested could not be found :(</h3>\
         <object handleremoval allowscrolling style='cursor:pointer' data='{i2}'></object>\
         </td></tr></table></body></html>",
-    "about:loading": "<html><head><style>html,body,table,tr,td{{background-color:{bg};color:{fg};width:100%;height:100%;margin:0}}</style></head>\
+    "about:loading": "<html><head><style>html,body,table,tr,td{{width:100%;height:100%;margin:0}}</style></head>\
         <body><table><tr><td tkinterweb-full-page style='text-align:center;vertical-align:middle'>\
         <p>Loading...</p>\
-        </td></tr></table></body></html>{i1}{i2}",
+        </td></tr></table></body></html>{bg}{fg}{i1}{i2}",
     "about:image": "<html><head><style>html,body,table,tr {{background-color:{bg};color:{fg};width:100%;height:100%;margin:0}}</style></head><body>\
         <table><tr><td tkinterweb-full-page style='text-align:center;vertical-align:middle;padding:4px 4px 0px 4px'><img style='max-width:100%;max-height:100%' src='{i1}'><h3 style='margin:0;padding:0;font-weight:normal'></td></tr></table></body></html>{i2}",
     "about:view-source": "<html tkinterweb-overflow-x=auto><head><style>\
@@ -566,7 +575,7 @@ class BuiltinPageGenerator():
                 general_dark_theme_regexes=("".join(f"<code class='indented'>{i.replace('{', '{{').replace('}', '}}')}</code>" for i in self._html.general_dark_theme_regexes)), 
                 inline_dark_theme_regexes=("".join(f"<br><code class='indented'>{i.replace('{', '{{').replace('}', '}}')}</code>" for i in self._html.inline_dark_theme_regexes)),
                 style_dark_theme_regex=f"<code class='indented'>{self._html.style_dark_theme_regex.replace('{', '{{').replace('}', '}}')}</code>", 
-                visited_links=(("".join(f"<code class='indented'>{i}</code>" for i in self._html.visited_links)) if self._html.visited_links else None),
+                visited_links=(("".join(f"<code class='indented'><a href='{i}'>{i}</a></code>" for i in self._html.visited_links)) if self._html.visited_links else None),
                 tkhtml_binaries=("".join(f"<code class='indented'>{os.path.join(i, e)}</code>" for i, e in tkinterweb_tkhtml.TKHTML_BINARIES)),
                 root=f"<code class='indented'>{ROOT_DIR}</code>", 
                 tkhtml_root=f"<code class='indented'>{tkinterweb_tkhtml.TKHTML_ROOT_DIR}</code>", 

{tkinterweb-4.17.5 → tkinterweb-4.18.0/tkinterweb.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkinterweb
-Version: 4.17.5
+Version: 4.18.0
 Summary: HTML/CSS viewer, editor, and app builder for Tkinter
 Home-page: https://github.com/Andereoo/TkinterWeb
 License: MIT

{tkinterweb-4.17.5 → tkinterweb-4.18.0}/tkinterweb.egg-info/requires.txt

@@ -5,10 +5,10 @@ brotli
 cairosvg
 pillow
 pythonmonkey
-tkinterweb-tkhtml-extras>=1.2.0
+tkinterweb-tkhtml-extras>=1.3.0
 
 [html]
-tkinterweb-tkhtml-extras>=1.2.0
+tkinterweb-tkhtml-extras>=1.3.0
 
 [images]
 pillow
@@ -18,7 +18,7 @@ pythonmonkey
 
 [recommended]
 pillow
-tkinterweb-tkhtml-extras>=1.2.0
+tkinterweb-tkhtml-extras>=1.3.0
 
 [requests]
 brotli
@@ -26,4 +26,4 @@ brotli
 [svg]
 cairosvg
 pillow
-tkinterweb-tkhtml-extras>=1.2.0
+tkinterweb-tkhtml-extras>=1.3.0