Revert "feat: support multilayer plot using maidr-ts"

This reverts commit a697c73.

Author: dakshpokar

example/multilayer/example_mpl_multilayer.py

@@ -20,31 +20,16 @@ def render(plot: Any) -> Tag:
 
 def show(plot: Any, renderer: Literal["auto", "ipython", "browser"] = "auto") -> object:
     ax = FigureManager.get_axes(plot)
-    htmls = []
-    if type(ax) is list:
-        for axes in ax:
-            maidr = FigureManager.get_maidr(axes.get_figure())
-            htmls.append(maidr.render())
-        htmls[-1].show(renderer)
-    else:
-        maidr = FigureManager.get_maidr(ax.get_figure())
-        return maidr.show(renderer)
+    maidr = FigureManager.get_maidr(ax.get_figure())
+    return maidr.show(renderer)
 
 
 def save_html(
     plot: Any, file: str, *, lib_dir: str | None = "lib", include_version: bool = True
 ) -> str:
     ax = FigureManager.get_axes(plot)
-    htmls = []
-    if type(ax) is list:
-        for axes in ax:
-            maidr = FigureManager.get_maidr(axes.get_figure())
-            htmls.append(maidr.render())
-        htmls[-1].save_html(file, libdir=lib_dir, include_version=include_version)
-        return htmls[-1]
-    else:
-        maidr = FigureManager.get_maidr(ax.get_figure())
-        return maidr.save_html(file, lib_dir=lib_dir, include_version=include_version)
+    maidr = FigureManager.get_maidr(ax.get_figure())
+    return maidr.save_html(file, lib_dir=lib_dir, include_version=include_version)
 
 
 def stacked(plot: Axes | BarContainer) -> Maidr:

maidr/api.py

@@ -139,7 +139,7 @@ def _create_html_doc(self) -> HTMLDocument:
 
     def _flatten_maidr(self) -> dict | list[dict]:
         """Return a single plot schema or a list of schemas from the Maidr instance."""
-        if self.plot_type == PlotType.LINE or self.plot_type == PlotType.DODGED:
+        if self.plot_type == PlotType.LINE:
             self._plots = [self._plots[0]]
         maidr = [plot.schema for plot in self._plots]
 
@@ -150,11 +150,7 @@ def _flatten_maidr(self) -> dict | list[dict]:
                     "maidr='true'", f"maidr='{self.selector_id}'"
                 )
 
-        # return maidr if len(maidr) != 1 else maidr[0]
-        return {
-            "id": Maidr._unique_id(),
-            "panels": [[{"id": Maidr._unique_id(), "layers": maidr}]],
-        }
+        return maidr if len(maidr) != 1 else maidr[0]
 
     def _get_svg(self) -> HTML:
         """Extract the chart SVG from ``matplotlib.figure.Figure``."""
@@ -204,7 +200,6 @@ def _inject_plot(plot: HTML, maidr: str, maidr_id) -> Tag:
 
         engine = Environment.get_engine()
 
-        # MAIDR_TS_CDN_URL = "http://localhost:8000/maidr.js" # DEMO URL
         MAIDR_TS_CDN_URL = "https://cdn.jsdelivr.net/npm/maidr-ts/dist/maidr.js"
 
         maidr_js_script = f"""

maidr/core/maidr.py

@@ -41,7 +41,7 @@ def _extract_plot_data(self) -> list:
             combined_data = (
                 zip(levels, data) if plot[0].orientation == "vertical" else zip(levels, data)  # type: ignore
             )
-            if combined_data:  # type: ignore
+            if len(data) == len(plot):  # type: ignore
                 for x, y in combined_data:  # type: ignore
                     formatted_data.append({"x": x, "y": y})
                 return formatted_data

maidr/core/plot/barplot.py

@@ -52,18 +52,16 @@ def bar(
         bottom = kwargs.get("bottom")
         if bottom is not None:
             plot_type = PlotType.STACKED
-    else:
-        if len(args) >= 3:
-            real_width = args[2]
-        else:
-            real_width = kwargs.get("width", 0.8)
-
-        align = kwargs.get("align", "center")
-
-        if (isinstance(real_width, (int, float)) and float(real_width) < 0.8) or (
-            align == "edge"
-        ):
+    elif args:
+        x = args[0]
+        is_numeric = False
+        if isinstance(x, np.ndarray) and np.issubdtype(x.dtype, np.number):
+            is_numeric = True
+        elif isinstance(x, (list, tuple)) and x and isinstance(x[0], Number):
+            is_numeric = True
+        if is_numeric:
             plot_type = PlotType.DODGED
+
     return common(plot_type, wrapped, instance, args, kwargs)
 
 

maidr/patch/barplot.py

@@ -45,36 +45,9 @@ def extract_level(ax: Axes, key: MaidrKey = MaidrKey.X) -> list[str] | None:
 
         level = None
         if MaidrKey.X == key:
-            ticks = ax.get_xticks()
-            labels = [label.get_text() for label in ax.get_xticklabels()]
-
-            if hasattr(ax, "dataLim") and ax.dataLim.width != 0:
-                # Use the actual data limits rather than padded view limits
-                data_x_min, data_x_max = ax.dataLim.x0, ax.dataLim.x0 + ax.dataLim.width
-                # Filter tick labels to only those within the actual data range
-                valid_indices = [
-                    i for i, pos in enumerate(ticks) if data_x_min <= pos <= data_x_max
-                ]
-                labels = [labels[i] for i in valid_indices if i < len(labels)]
-
-            level = labels
+            level = [label.get_text() for label in ax.get_xticklabels()]
         elif MaidrKey.Y == key:
-            ticks = ax.get_yticks()
-            labels = [label.get_text() for label in ax.get_yticklabels()]
-
-            if hasattr(ax, "dataLim") and ax.dataLim.height != 0:
-                # Use the actual data limits rather than padded view limits
-                data_y_min, data_y_max = (
-                    ax.dataLim.y0,
-                    ax.dataLim.y0 + ax.dataLim.height,
-                )
-                # Filter tick labels to only those within the actual data range
-                valid_indices = [
-                    i for i, pos in enumerate(ticks) if data_y_min <= pos <= data_y_max
-                ]
-                labels = [labels[i] for i in valid_indices if i < len(labels)]
-
-            level = labels
+            level = [label.get_text() for label in ax.get_yticklabels()]
         elif MaidrKey.FILL == key:
             level = [container.get_label() for container in ax.containers]