dashlab 0.3.6__tar.gz → 0.3.7__tar.gz

{dashlab-0.3.6 → dashlab-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dashlab
-Version: 0.3.6
+Version: 0.3.7
 Summary: A Python package for dashboard and data visualization tools.
 Author-email: Abdul Saboor <asaboor.my@outlook.com>
 License-Expression: MIT

{dashlab-0.3.6 → dashlab-0.3.7}/dashlab/_version.py

@@ -1,4 +1,4 @@
 # This  is automatically updated at build time, do not edit manually.
 # Double qoites are checked here
 
-__version__ = "0.3.6" 
+__version__ = "0.3.7" 

{dashlab-0.3.6 → dashlab-0.3.7}/dashlab/utils.py

@@ -2,6 +2,7 @@ import inspect, re, sys, textwrap
 import ipywidgets as ipw
 
 from contextlib import contextmanager
+from pathlib import Path
 from IPython.core.ultratb import AutoFormattedTB
 from ipywidgets import DOMWidget
 
@@ -94,6 +95,19 @@ def _validate_key(key):
             key = key.replace(f'{match}',match.replace(',','$'),1)  # Make safe from splitting with comma
     return key
 
+def _handle_raw_css(value):
+    "Handle raw CSS from string or Path object."
+    if not isinstance(value, (str, Path)):
+        raise TypeError("Raw CSS value for empty key must be string or file path!")
+    
+    if isinstance(value, Path):
+        value = value.read_text()
+    elif Path(value).is_file():
+        value = Path(value).read_text()
+    
+    value = '\n'.join(line.strip() for line in value.splitlines()) # Clean extra spaces
+    return value
+
 def _build_css(selector, props):
     """
     CSS is formatted using a `props` nested dictionary to simplify the process. 
@@ -103,8 +117,8 @@ def _build_css(selector, props):
     - All nested selectors are joined with space, so code`'.A': {'.B': ... }` becomes code['css']`.A .B {...}` in CSS.
     - A '^' in start of a selector joins to parent selector without space, so code`'.A': {'^:hover': ...}` becomes code['css']`.A:hover {...}` in CSS. You can also use code`'.A:hover'` directly but it will restrict other nested keys to hover only.
     - A list/tuple of values for a key in dict generates CSS fallback, so code`'.A': {'font-size': ('20px','2em')}` becomes code['css']`.A {font-size: 20px; font-size: 2em;}` in CSS.
-    - An empty key with a string value injects direct CSS wrapped in code['css']`@scope`, so code`'.A': {'': 'raw css here'}` becomes code['css']`@scope (.A) { raw css here }` in CSS. 
-      This can be used to inject complex CSS like `@import`, `@font-face`, `@layer` etc. `:root` is replaced with `:scope` to make variables local to the selector.
+    - An empty key with a string/path value injects raw CSS wrapped in nested code['css']`&`, so code`'.A': {'': 'raw css here'}` becomes code['css']`& { .A { raw css here } }` in CSS. 
+      This, however, can NOT be used to inject complex CSS like `@import`, `@layer` etc.  `:root` is replaced with `&` to make variables local to the selector at given nesting level.
 
     Read about specificity of CSS selectors [here](https://developer.mozilla.org/en-US/docs/Web/CSS/Specificity).
     """
@@ -115,11 +129,12 @@ def _build_css(selector, props):
     
     for key, value in props.items():
         key = _validate_key(key) # Just validate key
-        if not key.strip() and isinstance(value, str): # Empty key with string value is direct CSS
-            value = '\n'.join(line.strip() for line in value.splitlines()) # Clean extra spaces
-            value = value.replace(':root',':scope') # Take external root to scope
-            content += ("@scope (" + " ".join(selector) + ") {\n")
-            content += (textwrap.indent(value, '\t')+ "\n}\n") 
+        if not key.strip(): # Empty key with string value is direct CSS
+            # We can't handle complex @import, @charset here since that neede to be at root level, and we have scattered styles everywhere
+            value = _handle_raw_css(value)
+            value = value.replace(':root','&') # Take external root to this scope only
+            content += (" ".join(selector) + " {\n\t & {\n") # nested scope with added spcificity
+            content += (textwrap.indent(value, '\t\t') + "\n\t}\n}\n") 
             continue
         
         if isinstance(value, dict):

{dashlab-0.3.6 → dashlab-0.3.7}/dashlab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dashlab
-Version: 0.3.6
+Version: 0.3.7
 Summary: A Python package for dashboard and data visualization tools.
 Author-email: Abdul Saboor <asaboor.my@outlook.com>
 License-Expression: MIT