maidr 0.22.1__tar.gz → 0.23.0__tar.gz

{maidr-0.22.1 → maidr-0.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: maidr
-Version: 0.22.1
+Version: 0.23.0
 Summary: Multimodal Access and Interactive Data Representations
 License: GPL-3.0-or-later
 Keywords: accessibility,visualization,sonification,braille,tactile,multimodal,data representation,blind,low vision,visual impairments

{maidr-0.22.1 → maidr-0.23.0}/maidr/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.22.1"
+__version__ = "0.23.0"
 
 from .api import close, render, save_html, show, stacked
 from .core import Maidr

{maidr-0.22.1 → maidr-0.23.0}/maidr/core/maidr.py

@@ -11,7 +11,6 @@ from typing import Any, Literal
 from htmltools import HTML, HTMLDocument, Tag, tags
 from lxml import etree
 from matplotlib.figure import Figure
-from matplotlib.patches import Rectangle
 
 from maidr.core.context_manager import HighlightContextManager
 from maidr.core.enum.maidr_key import MaidrKey
@@ -272,7 +271,7 @@ class Maidr:
         # Render the plot inside an iframe if in a Jupyter notebook, Google Colab
         # or VSCode notebook. No need for iframe if this is a Quarto document.
         # For TypeScript we will use iframe by default for now
-        if Environment.is_notebook():
+        if Environment.is_notebook() or Environment.is_shiny():
             unique_id = "iframe_" + Maidr._unique_id()
 
             def generate_iframe_script(unique_id: str) -> str:

{maidr-0.22.1 → maidr-0.23.0}/maidr/core/plot/barplot.py

@@ -48,6 +48,8 @@ class BarPlot(MaidrPlot, ContainerExtractorMixin, LevelExtractorMixin, DictMerge
         # Flatten all the `list[BarContainer]` to `list[Patch]`.
         plot = [patch for container in plot for patch in container.patches]
         level = self.extract_level(self.ax)
+        if len(level) == 0:  # type: ignore
+            level = ["" for _ in range(len(plot))]  # type: ignore
 
         if len(plot) != len(level):
             return None

{maidr-0.22.1 → maidr-0.23.0}/maidr/core/plot/maidr_plot.py

@@ -68,9 +68,30 @@ class MaidrPlot(ABC):
         """Return the CSS selector for highlighting elements."""
         return "g[maidr='true'] > path"
 
+    def extract_shared_xlabel(self, ax, y_threshold=0.2):
+        # First, try to get an xlabel from any shared axes.
+        siblings = ax.get_shared_x_axes().get_siblings(ax)
+        for shared_ax in siblings:
+            xlabel = shared_ax.get_xlabel()
+            if xlabel:  # if non-empty
+                return xlabel
+
+        for text in ax.figure.texts:
+            if text.get_position()[1] < y_threshold:
+                label = text.get_text().strip()
+                if label:
+                    return label
+
+        return ""
+
     def _extract_axes_data(self) -> dict:
         """Extract the plot's axes data"""
-        return {MaidrKey.X: self.ax.get_xlabel(), MaidrKey.Y: self.ax.get_ylabel()}
+        x_labels = self.ax.get_xlabel()
+        if not x_labels:
+            x_labels = self.extract_shared_xlabel(self.ax)
+        if not x_labels:
+            x_labels = "X"
+        return {MaidrKey.X: x_labels, MaidrKey.Y: self.ax.get_ylabel()}
 
     @abstractmethod
     def _extract_plot_data(self) -> list | dict:

{maidr-0.22.1 → maidr-0.23.0}/maidr/patch/barplot.py

@@ -64,6 +64,9 @@ def bar(
             align == "edge"
         ):
             plot_type = PlotType.DODGED
+    if "dodge" in kwargs:
+        plot_type = PlotType.DODGED
+
     return common(plot_type, wrapped, instance, args, kwargs)
 
 

{maidr-0.22.1 → maidr-0.23.0}/maidr/util/environment.py

@@ -31,6 +31,16 @@ class Environment:
         except ImportError:
             return False
 
+    @staticmethod
+    def is_shiny() -> bool:
+        """Return True if the environment is a Shiny app."""
+        try:
+            import shiny
+
+            return shiny.__name__ == "shiny"
+        except ImportError:
+            return False
+
     @staticmethod
     def is_vscode_notebook() -> bool:
         """Return True if the environment is a VSCode notebook."""

{maidr-0.22.1 → maidr-0.23.0}/maidr/util/mixin/extractor_mixin.py

@@ -78,8 +78,20 @@ class LevelExtractorMixin:
         elif MaidrKey.FILL == key:
             level = [container.get_label() for container in ax.containers]
 
+        if len(level) == 0:  # type: ignore
+            level = LevelExtractorMixin.extract_shared_xtick_labels(ax)
+
         return level
 
+    @staticmethod
+    def extract_shared_xtick_labels(ax):
+        siblings = ax.get_shared_x_axes().get_siblings(ax)
+        for shared_ax in siblings:
+            labels = [label.get_text() for label in shared_ax.get_xticklabels()]
+            if any(labels):
+                return labels
+        return []
+
 
 class LineExtractorMixin:
     @staticmethod

{maidr-0.22.1 → maidr-0.23.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "maidr"
-version = "0.22.1"
+version = "0.23.0"
 description = "Multimodal Access and Interactive Data Representations"
 authors = [
     "JooYoung Seo <jseo1005@illinois.edu>",