storybook 9.1.0-alpha.2 → 9.1.0-alpha.3

package/dist/manager-api/index.cjs

@@ -4403,7 +4403,7 @@ U(wr, {
 var kt = require("@storybook/global"), on = L(rr(), 1), $ = L(require("semver"), 1);
 
 // src/manager-api/version.ts
-var tn = "9.1.0-alpha.2";
+var tn = "9.1.0-alpha.3";
 
 // src/manager-api/modules/versions.ts
 var { VERSIONCHECK: Qs } = kt.global, rn = (0, on.default)(1)(() => {

package/dist/manager-api/index.js

@@ -3217,7 +3217,7 @@ import { global as Sr } from "@storybook/global";
 import $ from "semver";
 
 // src/manager-api/version.ts
-var No = "9.1.0-alpha.2";
+var No = "9.1.0-alpha.3";
 
 // src/manager-api/modules/versions.ts
 var { VERSIONCHECK: ca } = Sr, ko = (0, jo.default)(1)(() => {

package/dist/measure/index.cjs

@@ -1,26 +1,26 @@
 "use strict";
 var v = Object.defineProperty;
 var ut = Object.getOwnPropertyDescriptor;
-var dt = Object.getOwnPropertyNames;
-var ht = Object.prototype.hasOwnProperty;
+var pt = Object.getOwnPropertyNames;
+var dt = Object.prototype.hasOwnProperty;
 var l = (e, t) => v(e, "name", { value: t, configurable: !0 });
 var W = (e, t) => {
   for (var o in t)
     v(e, o, { get: t[o], enumerable: !0 });
-}, pt = (e, t, o, i) => {
+}, ht = (e, t, o, i) => {
   if (t && typeof t == "object" || typeof t == "function")
-    for (let n of dt(t))
-      !ht.call(e, n) && n !== o && v(e, n, { get: () => t[n], enumerable: !(i = ut(t, n)) || i.enumerable });
+    for (let n of pt(t))
+      !dt.call(e, n) && n !== o && v(e, n, { get: () => t[n], enumerable: !(i = ut(t, n)) || i.enumerable });
   return e;
 };
-var bt = (e) => pt(v({}, "__esModule", { value: !0 }), e);
+var gt = (e) => ht(v({}, "__esModule", { value: !0 }), e);
 
 // src/measure/index.ts
 var Wt = {};
 W(Wt, {
   default: () => Ft
 });
-module.exports = bt(Wt);
+module.exports = gt(Wt);
 var nt = require("storybook/preview-api");
 
 // src/measure/preview.ts
@@ -43,13 +43,13 @@ var R = "storybook/measure-addon", Bt = `${R}/tool`, Y = "measureEnabled", zt =
 var A = require("storybook/preview-api");
 
 // src/measure/box-model/canvas.ts
-var y = require("@storybook/global");
+var E = require("@storybook/global");
 
 // ../node_modules/tiny-invariant/dist/esm/tiny-invariant.js
-var gt = process.env.NODE_ENV === "production", D = "Invariant failed";
+var bt = process.env.NODE_ENV === "production", D = "Invariant failed";
 function M(e, t) {
   if (!e) {
-    if (gt)
+    if (bt)
       throw new Error(D);
     var o = typeof t == "function" ? t() : t, i = o ? "".concat(D, ": ").concat(o) : D;
     throw new Error(i);
@@ -59,23 +59,23 @@ l(M, "invariant");
 
 // src/measure/box-model/canvas.ts
 function B() {
-  let e = y.global.document.documentElement, t = Math.max(e.scrollHeight, e.offsetHeight);
+  let e = E.global.document.documentElement, t = Math.max(e.scrollHeight, e.offsetHeight);
   return { width: Math.max(e.scrollWidth, e.offsetWidth), height: t };
 }
 l(B, "getDocumentWidthAndHeight");
 function wt() {
-  let e = y.global.document.createElement("canvas");
+  let e = E.global.document.createElement("canvas");
   e.id = "storybook-addon-measure";
   let t = e.getContext("2d");
   M(t != null);
   let { width: o, height: i } = B();
   return k(e, t, { width: o, height: i }), e.style.position = "absolute", e.style.left = "0", e.style.top = "0", e.style.zIndex = "214748364\
-7", e.style.pointerEvents = "none", y.global.document.body.appendChild(e), { canvas: e, context: t, width: o, height: i };
+7", e.style.pointerEvents = "none", E.global.document.body.appendChild(e), { canvas: e, context: t, width: o, height: i };
 }
 l(wt, "createCanvas");
 function k(e, t, { width: o, height: i }) {
   e.style.width = `${o}px`, e.style.height = `${i}px`;
-  let n = y.global.window.devicePixelRatio;
+  let n = E.global.window.devicePixelRatio;
   e.width = Math.floor(o * n), e.height = Math.floor(i * n), t.scale(n, n);
 }
 l(k, "setCanvasWidthAndHeight");
@@ -104,7 +104,7 @@ function O() {
 l(O, "destroy");
 
 // src/measure/box-model/visualizer.ts
-var b = require("@storybook/global");
+var g = require("@storybook/global");
 
 // src/measure/box-model/labels.ts
 var w = {
@@ -113,7 +113,7 @@ var w = {
   padding: "#93c47d",
   content: "#6fa8dc",
   text: "#232020"
-}, g = 6;
+}, b = 6;
 function I(e, { x: t, y: o, w: i, h: n, r }) {
   t = t - i / 2, o = o - n / 2, i < 2 * r && (r = i / 2), n < 2 * r && (r = n / 2), e.beginPath(), e.moveTo(t + r, o), e.arcTo(t + i, o, t +
   i, o + n, r), e.arcTo(t + i, o + n, t, o + n, r), e.arcTo(t, o + n, t, o, r), e.arcTo(t, o, t + i, o, r), e.closePath();
@@ -125,20 +125,20 @@ function Lt(e, { padding: t, border: o, width: i, height: n, top: r, left: a })
   e === "center" && (c += s / 2, u += f / 2), { x: c, y: u };
 }
 l(Lt, "positionCoordinate");
-function Et(e, t, { margin: o, border: i, padding: n }, r, a) {
-  let s = /* @__PURE__ */ l((d) => 0, "shift"), f = 0, c = 0, u = a ? 1 : 0.5, h = a ? r * 2 : 0;
-  return e === "padding" ? s = /* @__PURE__ */ l((d) => n[d] * u + h, "shift") : e === "border" ? s = /* @__PURE__ */ l((d) => n[d] + i[d] *
-  u + h, "shift") : e === "margin" && (s = /* @__PURE__ */ l((d) => n[d] + i[d] + o[d] * u + h, "shift")), t === "top" ? c = -s("top") : t ===
+function yt(e, t, { margin: o, border: i, padding: n }, r, a) {
+  let s = /* @__PURE__ */ l((p) => 0, "shift"), f = 0, c = 0, u = a ? 1 : 0.5, d = a ? r * 2 : 0;
+  return e === "padding" ? s = /* @__PURE__ */ l((p) => n[p] * u + d, "shift") : e === "border" ? s = /* @__PURE__ */ l((p) => n[p] + i[p] *
+  u + d, "shift") : e === "margin" && (s = /* @__PURE__ */ l((p) => n[p] + i[p] + o[p] * u + d, "shift")), t === "top" ? c = -s("top") : t ===
   "right" ? f = s("right") : t === "bottom" ? c = s("bottom") : t === "left" && (f = -s("left")), { offsetX: f, offsetY: c };
 }
-l(Et, "offset");
-function yt(e, t) {
+l(yt, "offset");
+function Et(e, t) {
   return Math.abs(e.x - t.x) < Math.abs(e.w + t.w) / 2 && Math.abs(e.y - t.y) < Math.abs(e.h + t.h) / 2;
 }
-l(yt, "collide");
+l(Et, "collide");
 function St(e, t, o) {
-  return e === "top" ? t.y = o.y - o.h - g : e === "right" ? t.x = o.x + o.w / 2 + g + t.w / 2 : e === "bottom" ? t.y = o.y + o.h + g : e ===
-  "left" && (t.x = o.x - o.w / 2 - g - t.w / 2), { x: t.x, y: t.y };
+  return e === "top" ? t.y = o.y - o.h - b : e === "right" ? t.x = o.x + o.w / 2 + b + t.w / 2 : e === "bottom" ? t.y = o.y + o.h + b : e ===
+  "left" && (t.x = o.x - o.w / 2 - b - t.w / 2), { x: t.x, y: t.y };
 }
 l(St, "overlapAdjustment");
 function _(e, t, { x: o, y: i, w: n, h: r }, a) {
@@ -149,23 +149,23 @@ function _(e, t, { x: o, y: i, w: n, h: r }, a) {
 l(_, "textWithRect");
 function q(e, t) {
   e.font = "600 12px monospace", e.textBaseline = "middle", e.textAlign = "center";
-  let o = e.measureText(t), i = o.actualBoundingBoxAscent + o.actualBoundingBoxDescent, n = o.width + g * 2, r = i + g * 2;
+  let o = e.measureText(t), i = o.actualBoundingBoxAscent + o.actualBoundingBoxDescent, n = o.width + b * 2, r = i + b * 2;
   return { w: n, h: r };
 }
 l(q, "configureText");
 function Ct(e, t, { type: o, position: i = "center", text: n }, r, a = !1) {
-  let { x: s, y: f } = Lt(i, t), { offsetX: c, offsetY: u } = Et(o, i, t, g + 1, a);
+  let { x: s, y: f } = Lt(i, t), { offsetX: c, offsetY: u } = yt(o, i, t, b + 1, a);
   s += c, f += u;
-  let { w: h, h: d } = q(e, n);
-  if (r && yt({ x: s, y: f, w: h, h: d }, r)) {
-    let C = St(i, { x: s, y: f, w: h, h: d }, r);
+  let { w: d, h: p } = q(e, n);
+  if (r && Et({ x: s, y: f, w: d, h: p }, r)) {
+    let C = St(i, { x: s, y: f, w: d, h: p }, r);
     s = C.x, f = C.y;
   }
-  return _(e, o, { x: s, y: f, w: h, h: d }, n);
+  return _(e, o, { x: s, y: f, w: d, h: p }, n);
 }
 l(Ct, "drawLabel");
 function vt(e, { w: t, h: o }) {
-  let i = t * 0.5 + g, n = o * 0.5 + g;
+  let i = t * 0.5 + b, n = o * 0.5 + b;
   return {
     offsetX: (e.x === "left" ? -1 : 1) * i,
     offsetY: (e.y === "top" ? -1 : 1) * n
@@ -173,11 +173,11 @@ function vt(e, { w: t, h: o }) {
 }
 l(vt, "floatingOffset");
 function Rt(e, t, { type: o, text: i }) {
-  let { floatingAlignment: n, extremities: r } = t, a = r[n.x], s = r[n.y], { w: f, h: c } = q(e, i), { offsetX: u, offsetY: h } = vt(n, {
+  let { floatingAlignment: n, extremities: r } = t, a = r[n.x], s = r[n.y], { w: f, h: c } = q(e, i), { offsetX: u, offsetY: d } = vt(n, {
     w: f,
     h: c
   });
-  return a += u, s += h, _(e, o, { x: a, y: s, w: f, h: c }, i);
+  return a += u, s += d, _(e, o, { x: a, y: s, w: f, h: c }, i);
 }
 l(Rt, "drawFloatingLabel");
 function S(e, t, o, i) {
@@ -202,10 +202,10 @@ var x = {
   padding: "#93c47d8c",
   content: "#6fa8dca8"
 }, G = 30;
-function p(e) {
+function h(e) {
   return parseInt(e.replace("px", ""), 10);
 }
-l(p, "pxToNumber");
+l(h, "pxToNumber");
 function L(e) {
   return Number.isInteger(e) ? e : e.toFixed(2);
 }
@@ -216,10 +216,10 @@ function P(e) {
 l(P, "filterZeroValues");
 function Mt(e) {
   let t = {
-    top: b.global.window.scrollY,
-    bottom: b.global.window.scrollY + b.global.window.innerHeight,
-    left: b.global.window.scrollX,
-    right: b.global.window.scrollX + b.global.window.innerWidth
+    top: g.global.window.scrollY,
+    bottom: g.global.window.scrollY + g.global.window.innerHeight,
+    left: g.global.window.scrollX,
+    right: g.global.window.scrollX + g.global.window.innerWidth
   }, o = {
     top: Math.abs(t.top - e.top),
     bottom: Math.abs(t.bottom - e.bottom),
@@ -233,12 +233,12 @@ function Mt(e) {
 }
 l(Mt, "floatingAlignment");
 function xt(e) {
-  let t = b.global.getComputedStyle(e), { top: o, left: i, right: n, bottom: r, width: a, height: s } = e.getBoundingClientRect(), {
+  let t = g.global.getComputedStyle(e), { top: o, left: i, right: n, bottom: r, width: a, height: s } = e.getBoundingClientRect(), {
     marginTop: f,
     marginBottom: c,
     marginLeft: u,
-    marginRight: h,
-    paddingTop: d,
+    marginRight: d,
+    paddingTop: p,
     paddingBottom: C,
     paddingLeft: it,
     paddingRight: rt,
@@ -247,30 +247,30 @@ function xt(e) {
     borderLeftWidth: st,
     borderRightWidth: ft
   } = t;
-  o = o + b.global.window.scrollY, i = i + b.global.window.scrollX, r = r + b.global.window.scrollY, n = n + b.global.window.scrollX;
-  let E = {
-    top: p(f),
-    bottom: p(c),
-    left: p(u),
-    right: p(h)
+  o = o + g.global.window.scrollY, i = i + g.global.window.scrollX, r = r + g.global.window.scrollY, n = n + g.global.window.scrollX;
+  let y = {
+    top: h(f),
+    bottom: h(c),
+    left: h(u),
+    right: h(d)
   }, ct = {
-    top: p(d),
-    bottom: p(C),
-    left: p(it),
-    right: p(rt)
+    top: h(p),
+    bottom: h(C),
+    left: h(it),
+    right: h(rt)
   }, mt = {
-    top: p(at),
-    bottom: p(lt),
-    left: p(st),
-    right: p(ft)
+    top: h(at),
+    bottom: h(lt),
+    left: h(st),
+    right: h(ft)
   }, F = {
-    top: o - E.top,
-    bottom: r + E.bottom,
-    left: i - E.left,
-    right: n + E.right
+    top: o - y.top,
+    bottom: r + y.bottom,
+    left: i - y.left,
+    right: n + y.right
   };
   return {
-    margin: E,
+    margin: y,
     padding: ct,
     border: mt,
     top: o,
@@ -326,7 +326,7 @@ function Dt(e, { padding: t, border: o, width: i, height: n, top: r, left: a, bo
     c,
     t.bottom
   ), e.fillRect(a + o.left, r + t.top + o.top, t.left, u);
-  let h = [
+  let d = [
     {
       type: "padding",
       text: t.top,
@@ -348,7 +348,7 @@ function Dt(e, { padding: t, border: o, width: i, height: n, top: r, left: a, bo
       position: "left"
     }
   ];
-  return P(h);
+  return P(d);
 }
 l(Dt, "drawPadding");
 function kt(e, { border: t, width: o, height: i, top: n, left: r, bottom: a, right: s }) {

package/dist/measure/index.js

@@ -89,7 +89,7 @@ function $() {
 l($, "destroy");
 
 // src/measure/box-model/visualizer.ts
-import { global as b } from "@storybook/global";
+import { global as g } from "@storybook/global";
 
 // src/measure/box-model/labels.ts
 var w = {
@@ -98,7 +98,7 @@ var w = {
   padding: "#93c47d",
   content: "#6fa8dc",
   text: "#232020"
-}, g = 6;
+}, b = 6;
 function N(e, { x: t, y: o, w: i, h: n, r }) {
   t = t - i / 2, o = o - n / 2, i < 2 * r && (r = i / 2), n < 2 * r && (r = n / 2), e.beginPath(), e.moveTo(t + r, o), e.arcTo(t + i, o, t +
   i, o + n, r), e.arcTo(t + i, o + n, t, o + n, r), e.arcTo(t, o + n, t, o, r), e.arcTo(t, o, t + i, o, r), e.closePath();
@@ -111,21 +111,21 @@ function mt(e, { padding: t, border: o, width: i, height: n, top: r, left: a })
 }
 l(mt, "positionCoordinate");
 function ut(e, t, { margin: o, border: i, padding: n }, r, a) {
-  let s = /* @__PURE__ */ l((d) => 0, "shift"), f = 0, c = 0, u = a ? 1 : 0.5, h = a ? r * 2 : 0;
-  return e === "padding" ? s = /* @__PURE__ */ l((d) => n[d] * u + h, "shift") : e === "border" ? s = /* @__PURE__ */ l((d) => n[d] + i[d] *
-  u + h, "shift") : e === "margin" && (s = /* @__PURE__ */ l((d) => n[d] + i[d] + o[d] * u + h, "shift")), t === "top" ? c = -s("top") : t ===
+  let s = /* @__PURE__ */ l((p) => 0, "shift"), f = 0, c = 0, u = a ? 1 : 0.5, d = a ? r * 2 : 0;
+  return e === "padding" ? s = /* @__PURE__ */ l((p) => n[p] * u + d, "shift") : e === "border" ? s = /* @__PURE__ */ l((p) => n[p] + i[p] *
+  u + d, "shift") : e === "margin" && (s = /* @__PURE__ */ l((p) => n[p] + i[p] + o[p] * u + d, "shift")), t === "top" ? c = -s("top") : t ===
   "right" ? f = s("right") : t === "bottom" ? c = s("bottom") : t === "left" && (f = -s("left")), { offsetX: f, offsetY: c };
 }
 l(ut, "offset");
-function dt(e, t) {
+function pt(e, t) {
   return Math.abs(e.x - t.x) < Math.abs(e.w + t.w) / 2 && Math.abs(e.y - t.y) < Math.abs(e.h + t.h) / 2;
 }
-l(dt, "collide");
-function ht(e, t, o) {
-  return e === "top" ? t.y = o.y - o.h - g : e === "right" ? t.x = o.x + o.w / 2 + g + t.w / 2 : e === "bottom" ? t.y = o.y + o.h + g : e ===
-  "left" && (t.x = o.x - o.w / 2 - g - t.w / 2), { x: t.x, y: t.y };
+l(pt, "collide");
+function dt(e, t, o) {
+  return e === "top" ? t.y = o.y - o.h - b : e === "right" ? t.x = o.x + o.w / 2 + b + t.w / 2 : e === "bottom" ? t.y = o.y + o.h + b : e ===
+  "left" && (t.x = o.x - o.w / 2 - b - t.w / 2), { x: t.x, y: t.y };
 }
-l(ht, "overlapAdjustment");
+l(dt, "overlapAdjustment");
 function O(e, t, { x: o, y: i, w: n, h: r }, a) {
   return N(e, { x: o, y: i, w: n, h: r, r: 3 }), e.fillStyle = `${w[t]}dd`, e.fill(), e.strokeStyle = w[t], e.stroke(), e.fillStyle = w.text,
   e.fillText(a, o, i), N(e, { x: o, y: i, w: n, h: r, r: 3 }), e.fillStyle = `${w[t]}dd`, e.fill(), e.strokeStyle = w[t], e.stroke(), e.fillStyle =
@@ -134,48 +134,48 @@ function O(e, t, { x: o, y: i, w: n, h: r }, a) {
 l(O, "textWithRect");
 function I(e, t) {
   e.font = "600 12px monospace", e.textBaseline = "middle", e.textAlign = "center";
-  let o = e.measureText(t), i = o.actualBoundingBoxAscent + o.actualBoundingBoxDescent, n = o.width + g * 2, r = i + g * 2;
+  let o = e.measureText(t), i = o.actualBoundingBoxAscent + o.actualBoundingBoxDescent, n = o.width + b * 2, r = i + b * 2;
   return { w: n, h: r };
 }
 l(I, "configureText");
-function pt(e, t, { type: o, position: i = "center", text: n }, r, a = !1) {
-  let { x: s, y: f } = mt(i, t), { offsetX: c, offsetY: u } = ut(o, i, t, g + 1, a);
+function ht(e, t, { type: o, position: i = "center", text: n }, r, a = !1) {
+  let { x: s, y: f } = mt(i, t), { offsetX: c, offsetY: u } = ut(o, i, t, b + 1, a);
   s += c, f += u;
-  let { w: h, h: d } = I(e, n);
-  if (r && dt({ x: s, y: f, w: h, h: d }, r)) {
-    let S = ht(i, { x: s, y: f, w: h, h: d }, r);
+  let { w: d, h: p } = I(e, n);
+  if (r && pt({ x: s, y: f, w: d, h: p }, r)) {
+    let S = dt(i, { x: s, y: f, w: d, h: p }, r);
     s = S.x, f = S.y;
   }
-  return O(e, o, { x: s, y: f, w: h, h: d }, n);
+  return O(e, o, { x: s, y: f, w: d, h: p }, n);
 }
-l(pt, "drawLabel");
-function bt(e, { w: t, h: o }) {
-  let i = t * 0.5 + g, n = o * 0.5 + g;
+l(ht, "drawLabel");
+function gt(e, { w: t, h: o }) {
+  let i = t * 0.5 + b, n = o * 0.5 + b;
   return {
     offsetX: (e.x === "left" ? -1 : 1) * i,
     offsetY: (e.y === "top" ? -1 : 1) * n
   };
 }
-l(bt, "floatingOffset");
-function gt(e, t, { type: o, text: i }) {
-  let { floatingAlignment: n, extremities: r } = t, a = r[n.x], s = r[n.y], { w: f, h: c } = I(e, i), { offsetX: u, offsetY: h } = bt(n, {
+l(gt, "floatingOffset");
+function bt(e, t, { type: o, text: i }) {
+  let { floatingAlignment: n, extremities: r } = t, a = r[n.x], s = r[n.y], { w: f, h: c } = I(e, i), { offsetX: u, offsetY: d } = gt(n, {
     w: f,
     h: c
   });
-  return a += u, s += h, O(e, o, { x: a, y: s, w: f, h: c }, i);
+  return a += u, s += d, O(e, o, { x: a, y: s, w: f, h: c }, i);
 }
-l(gt, "drawFloatingLabel");
-function y(e, t, o, i) {
+l(bt, "drawFloatingLabel");
+function E(e, t, o, i) {
   let n = [];
   o.forEach((r, a) => {
-    let s = i && r.position === "center" ? gt(e, t, r) : pt(e, t, r, n[a - 1], i);
+    let s = i && r.position === "center" ? bt(e, t, r) : ht(e, t, r, n[a - 1], i);
     n[a] = s;
   });
 }
-l(y, "drawStack");
+l(E, "drawStack");
 function _(e, t, o, i) {
   let n = o.reduce((r, a) => (Object.prototype.hasOwnProperty.call(r, a.position) || (r[a.position] = []), r[a.position]?.push(a), r), {});
-  n.top && y(e, t, n.top, i), n.right && y(e, t, n.right, i), n.bottom && y(e, t, n.bottom, i), n.left && y(e, t, n.left, i), n.center && y(
+  n.top && E(e, t, n.top, i), n.right && E(e, t, n.right, i), n.bottom && E(e, t, n.bottom, i), n.left && E(e, t, n.left, i), n.center && E(
   e, t, n.center, i);
 }
 l(_, "labelStacks");
@@ -187,10 +187,10 @@ var M = {
   padding: "#93c47d8c",
   content: "#6fa8dca8"
 }, q = 30;
-function p(e) {
+function h(e) {
   return parseInt(e.replace("px", ""), 10);
 }
-l(p, "pxToNumber");
+l(h, "pxToNumber");
 function L(e) {
   return Number.isInteger(e) ? e : e.toFixed(2);
 }
@@ -201,10 +201,10 @@ function k(e) {
 l(k, "filterZeroValues");
 function wt(e) {
   let t = {
-    top: b.window.scrollY,
-    bottom: b.window.scrollY + b.window.innerHeight,
-    left: b.window.scrollX,
-    right: b.window.scrollX + b.window.innerWidth
+    top: g.window.scrollY,
+    bottom: g.window.scrollY + g.window.innerHeight,
+    left: g.window.scrollX,
+    right: g.window.scrollX + g.window.innerWidth
   }, o = {
     top: Math.abs(t.top - e.top),
     bottom: Math.abs(t.bottom - e.bottom),
@@ -218,12 +218,12 @@ function wt(e) {
 }
 l(wt, "floatingAlignment");
 function Lt(e) {
-  let t = b.getComputedStyle(e), { top: o, left: i, right: n, bottom: r, width: a, height: s } = e.getBoundingClientRect(), {
+  let t = g.getComputedStyle(e), { top: o, left: i, right: n, bottom: r, width: a, height: s } = e.getBoundingClientRect(), {
     marginTop: f,
     marginBottom: c,
     marginLeft: u,
-    marginRight: h,
-    paddingTop: d,
+    marginRight: d,
+    paddingTop: p,
     paddingBottom: S,
     paddingLeft: tt,
     paddingRight: et,
@@ -232,30 +232,30 @@ function Lt(e) {
     borderLeftWidth: it,
     borderRightWidth: rt
   } = t;
-  o = o + b.window.scrollY, i = i + b.window.scrollX, r = r + b.window.scrollY, n = n + b.window.scrollX;
-  let E = {
-    top: p(f),
-    bottom: p(c),
-    left: p(u),
-    right: p(h)
+  o = o + g.window.scrollY, i = i + g.window.scrollX, r = r + g.window.scrollY, n = n + g.window.scrollX;
+  let y = {
+    top: h(f),
+    bottom: h(c),
+    left: h(u),
+    right: h(d)
   }, lt = {
-    top: p(d),
-    bottom: p(S),
-    left: p(tt),
-    right: p(et)
+    top: h(p),
+    bottom: h(S),
+    left: h(tt),
+    right: h(et)
   }, at = {
-    top: p(nt),
-    bottom: p(ot),
-    left: p(it),
-    right: p(rt)
+    top: h(nt),
+    bottom: h(ot),
+    left: h(it),
+    right: h(rt)
   }, A = {
-    top: o - E.top,
-    bottom: r + E.bottom,
-    left: i - E.left,
-    right: n + E.right
+    top: o - y.top,
+    bottom: r + y.bottom,
+    left: i - y.left,
+    right: n + y.right
   };
   return {
-    margin: E,
+    margin: y,
     padding: lt,
     border: at,
     top: o,
@@ -269,7 +269,7 @@ function Lt(e) {
   };
 }
 l(Lt, "measureElement");
-function Et(e, { margin: t, width: o, height: i, top: n, left: r, bottom: a, right: s }) {
+function yt(e, { margin: t, width: o, height: i, top: n, left: r, bottom: a, right: s }) {
   let f = i + t.bottom + t.top;
   e.fillStyle = M.margin, e.fillRect(r, n - t.top, o, t.top), e.fillRect(s, n - t.top, t.right, f), e.fillRect(r, a, o, t.bottom), e.fillRect(
   r - t.left, n - t.top, t.left, f);
@@ -297,8 +297,8 @@ function Et(e, { margin: t, width: o, height: i, top: n, left: r, bottom: a, rig
   ];
   return k(c);
 }
-l(Et, "drawMargin");
-function yt(e, { padding: t, border: o, width: i, height: n, top: r, left: a, bottom: s, right: f }) {
+l(yt, "drawMargin");
+function Et(e, { padding: t, border: o, width: i, height: n, top: r, left: a, bottom: s, right: f }) {
   let c = i - o.left - o.right, u = n - t.top - t.bottom - o.top - o.bottom;
   e.fillStyle = M.padding, e.fillRect(a + o.left, r + o.top, c, t.top), e.fillRect(
     f - t.right - o.right,
@@ -311,7 +311,7 @@ function yt(e, { padding: t, border: o, width: i, height: n, top: r, left: a, bo
     c,
     t.bottom
   ), e.fillRect(a + o.left, r + t.top + o.top, t.left, u);
-  let h = [
+  let d = [
     {
       type: "padding",
       text: t.top,
@@ -333,9 +333,9 @@ function yt(e, { padding: t, border: o, width: i, height: n, top: r, left: a, bo
       position: "left"
     }
   ];
-  return k(h);
+  return k(d);
 }
-l(yt, "drawPadding");
+l(Et, "drawPadding");
 function St(e, { border: t, width: o, height: i, top: n, left: r, bottom: a, right: s }) {
   let f = i - t.top - t.bottom;
   e.fillStyle = M.border, e.fillRect(r, n, o, t.top), e.fillRect(r, a - t.bottom, o, t.bottom), e.fillRect(r, n + t.top, t.left, f), e.fillRect(
@@ -384,7 +384,7 @@ l(Ct, "drawContent");
 function vt(e) {
   return (t) => {
     if (e && t) {
-      let o = Lt(e), i = Et(t, o), n = yt(t, o), r = St(t, o), a = Ct(t, o), s = o.width <= q * 3 || o.height <= q;
+      let o = Lt(e), i = yt(t, o), n = Et(t, o), r = St(t, o), a = Ct(t, o), s = o.width <= q * 3 || o.height <= q;
       _(
         t,
         o,