maidr 0.22.1__py3-none-any.whl → 0.23.0__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → maidr-0.23.0.dist-info}/METADATA

@@ -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.dist-info → maidr-0.23.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-maidr/__init__.py,sha256=ABDD1_FOfLPWDA5gMifMwKyoWCkWv9pistkI4dAedOw,357
+maidr/__init__.py,sha256=Ljve4SYKQEgmUc2B-UKQtoN9Z376J0sElayLOlEgHuY,357
 maidr/api.py,sha256=GNyYSF8jEOsqCY4ZWLw3hh6RmRDewkWh6DJbzWfEwOA,1721
 maidr/core/__init__.py,sha256=WgxLpSEYMc4k3OyEOf1shOxfEq0ASzppEIZYmE91ThQ,25
 maidr/core/context_manager.py,sha256=6cT7ZGOApSpC-SLD2XZWWU_H08i-nfv-JUlzXOtvWYw,3374
@@ -7,21 +7,21 @@ maidr/core/enum/library.py,sha256=e8ujT_L-McJWfoVJd1ty9K_2bwITnf1j0GPLsnAcHes,10
 maidr/core/enum/maidr_key.py,sha256=WLLn2kSkUp4KzhMIiV6U6H5JCYuS1QjbXmR5EiyGy2E,759
 maidr/core/enum/plot_type.py,sha256=pyfyIwlq3taqe2Z1sVUSbMsTp5QTvYBlZXsMMMclEVM,293
 maidr/core/figure_manager.py,sha256=e6nI5pGqH0NM3yzt2jeiae4lrBlIOhkDN92GZJ3MNmk,3988
-maidr/core/maidr.py,sha256=eQHe4UGBu0l5C8Jdd9UGVt0qdrU37niwVgV-2n2_p6g,12575
+maidr/core/maidr.py,sha256=w27bsjX42uGZofaCDtMlZGNPYVMvg0mKU7r0xQFDeTY,12560
 maidr/core/plot/__init__.py,sha256=xDIpRGM-4DfaSSL3nKcXrjdMecCHJ6en4K4nA_fPefQ,83
-maidr/core/plot/barplot.py,sha256=a5dOAaWqfbllLBN4U8JjPWSbONGqM8QUTTmUSccMd6U,1981
+maidr/core/plot/barplot.py,sha256=1HfoqyDGKIXkYQnCHN83Ye_faKpNQ3R4wjlbjD5jUyk,2092
 maidr/core/plot/boxplot.py,sha256=WuHrUy6CFZRBfVDjl9MU262mfLFR6DWF_2h4zN3wcMI,5881
 maidr/core/plot/grouped_barplot.py,sha256=6D7KT1pjf7XP4XRERmRHYpXY83VikyGcGp-37qQZPEU,2101
 maidr/core/plot/heatmap.py,sha256=yMS-31tS2GW4peds9LtZesMxmmTV_YfqYO5M_t5KasQ,2521
 maidr/core/plot/histogram.py,sha256=QV5W-6ZJQQcZsrM91JJBX-ONktJzH7yg_et5_bBPfQQ,1525
 maidr/core/plot/lineplot.py,sha256=NEsnreoJ2Qe7fcY7iPHbrJ7UgL1DnGyMmL_4fNcMaQI,3309
-maidr/core/plot/maidr_plot.py,sha256=D-LVQEZEVR6JNcv9FrnYYVIKniSWJjvD8UczbgTeGhE,2974
+maidr/core/plot/maidr_plot.py,sha256=B6hjsu-jSWlevEqJawgwjMOJr51nBBNh7yqJdSTkNhw,3681
 maidr/core/plot/maidr_plot_factory.py,sha256=QGcHK_oquY_M2_KJVEtc5-rBAD-gm7KI1kSD7cduHzg,1691
 maidr/core/plot/scatterplot.py,sha256=o0i0uS-wXK9ZrENxneoHbh3-u-2goRONp19Yu9QLsaY,1257
 maidr/exception/__init__.py,sha256=PzaXoYBhyZxMDcJkuxJugDx7jZeseI0El6LpxIwXyG4,46
 maidr/exception/extraction_error.py,sha256=rd37Oxa9gn2OWFWt9AOH5fv0hNd3sAWGvpDMFBuJY2I,607
 maidr/patch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maidr/patch/barplot.py,sha256=iCoYaqlHou6_rSnbjfZwpRU8ENnYcfQ9JCdUxhrSgCA,2416
+maidr/patch/barplot.py,sha256=nxgBWBMUyf3eAW56CN5EKYYy3vsTgEPRlcvNYS3-WiU,2479
 maidr/patch/boxplot.py,sha256=Mcz94pSf7PT3SyRsI8TDrIKVdEmiiUQouXvd05mtnfw,2846
 maidr/patch/clear.py,sha256=2Sc4CIt5jRGkew3TxFsBZm-uowC9yDSxtraEcXZjmGw,396
 maidr/patch/common.py,sha256=bRe4jruUvCIwp1t1E8Q3OuQ0eEyHgpMjXVpsPBZj4C8,843
@@ -31,13 +31,13 @@ maidr/patch/histogram.py,sha256=tnyKkTMuzDXdyQBywhpHZgH3i2mXzOCSyfUSRM0tfUg,1315
 maidr/patch/lineplot.py,sha256=_EyqOp8BcO-kGq9sn8PyNQ8-Bz0FsnHAufXRkTGQzBw,1025
 maidr/patch/scatterplot.py,sha256=kln6zZwjVsdQzICalo-RnBOJrx1BnIB2xYUwItHvSNY,525
 maidr/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maidr/util/environment.py,sha256=pa6NOoZLQQDmQvWitSTtB9nI2A7xETHLeJRNqWHybik,4220
+maidr/util/environment.py,sha256=NJzbcFUCIk7OF29eIae8jyHax9p8fQgFLmxM6Af0fUY,4465
 maidr/util/mixin/__init__.py,sha256=aGJZNhtWh77yIVPc7ipIZm1OajigjMtCWYKPuDWTC-c,217
-maidr/util/mixin/extractor_mixin.py,sha256=AjpgCo_dgASdTwFumfgDOoVCVioxDDoqFWphaBj5gz4,4764
+maidr/util/mixin/extractor_mixin.py,sha256=oHtwpmS5kARvaLrSO3DKTPQxyFUw9nOcKN7rzTj1q4g,5192
 maidr/util/mixin/merger_mixin.py,sha256=V0qLw_6DUB7X6CQ3BCMpsCQX_ZuwAhoSTm_E4xAJFKM,712
 maidr/widget/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maidr/widget/shiny.py,sha256=wrrw2KAIpE_A6CNQGBtNHauR1DjenA_n47qlFXX9_rk,745
-maidr-0.22.1.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-maidr-0.22.1.dist-info/METADATA,sha256=joyaX_YNioraA-OG3yiArVGVlsnsePZgZav0nYrLtbM,2688
-maidr-0.22.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-maidr-0.22.1.dist-info/RECORD,,
+maidr-0.23.0.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+maidr-0.23.0.dist-info/METADATA,sha256=wpNic98dvQs53YS3btM7WPNvNEXgnwYEnYcljNTNvN4,2688
+maidr-0.23.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+maidr-0.23.0.dist-info/RECORD,,