@deck.gl/widgets 9.3.0 → 9.3.2

package/dist/dist.dev.js

@@ -723,14 +723,12 @@ var __exports__ = (() => {
       this.setViewState(viewId, nextViewState);
     }
     handleZoomIn() {
-      const viewIds = this.viewId ? [this.viewId] : this.deck?.getViews().map((v3) => v3.id) ?? [];
-      for (const viewId of viewIds) {
+      for (const viewId of this.viewIds) {
         this.handleZoom(viewId, 1);
       }
     }
     handleZoomOut() {
-      const viewIds = this.viewId ? [this.viewId] : this.deck?.getViews().map((v3) => v3.id) ?? [];
-      for (const viewId of viewIds) {
+      for (const viewId of this.viewIds) {
         this.handleZoom(viewId, -1);
       }
     }
@@ -799,8 +797,7 @@ var __exports__ = (() => {
       this.resetViewState(initialViewState);
     }
     resetViewState(viewState) {
-      const viewIds = this.viewId ? [this.viewId] : this.deck?.getViews().map((v3) => v3.id) ?? [];
-      for (const viewId of viewIds) {
+      for (const viewId of this.viewIds) {
         const nextViewState = {
           ...viewState?.[viewId] ?? viewState
           // only works for geospatial?
@@ -1435,9 +1432,13 @@ var __exports__ = (() => {
     const second = parseCoordinatePart(parts[1]);
     if (first === null || second === null)
       return null;
-    if (Math.abs(first) > 90 && Math.abs(second) <= 90) {
+    if (Math.abs(first) > 90 && Math.abs(second) > 90) {
+      return null;
+    }
+    if (Math.abs(first) > 90) {
       return { longitude: first, latitude: second };
-    } else if (Math.abs(second) > 90 && Math.abs(first) <= 90) {
+    }
+    if (Math.abs(second) > 90) {
       return { longitude: second, latitude: first };
     }
     return { latitude: first, longitude: second };
@@ -1456,7 +1457,7 @@ var __exports__ = (() => {
     return isNaN(value) ? null : sign * value;
   }
   function dmsToDecimal(s3) {
-    const regex = /(\d+)[°d]\s*(\d+)?['′m]?\s*(\d+(?:\.\d+)?)?[\"″s]?\s*([NSEW])?/i;
+    const regex = /(-?\d+)[°d]\s*(\d+)?['′m]?\s*(\d+(?:\.\d+)?)?[\"″s]?\s*([NSEW])?/i;
     const match = s3.match(regex);
     if (!match)
       return NaN;
@@ -1575,8 +1576,7 @@ var __exports__ = (() => {
       );
     }
     flyTo(viewState) {
-      const viewIds = this.viewId ? [this.viewId] : this.deck?.getViews().map((v3) => v3.id) ?? [];
-      for (const viewId of viewIds) {
+      for (const viewId of this.viewIds) {
         if ("longitude" in viewState && "latitude" in viewState) {
           this.props.onGeocode?.({
             viewId,
@@ -3646,13 +3646,7 @@ var __exports__ = (() => {
       const { marker, content, style } = this.props;
       const [x2, y3] = this.viewport.project(this.props.position);
       const ui = /* @__PURE__ */ u2("div", { children: [
-        marker && /* @__PURE__ */ u2(
-          "div",
-          {
-            style: { position: "absolute", left: x2, top: y3, pointerEvents: "all", cursor: "pointer" },
-            children: /* @__PURE__ */ u2(UserContent, { ...marker, onClick: () => this._setIsOpen(true) })
-          }
-        ),
+        marker && /* @__PURE__ */ u2("div", { className: "deck-widget-popup-marker", style: { left: x2, top: y3 }, children: /* @__PURE__ */ u2(UserContent, { ...marker, onClick: () => this._setIsOpen(true) }) }),
         this.isOpen && /* @__PURE__ */ u2(
           Popover,
           {
@@ -4209,6 +4203,9 @@ var __exports__ = (() => {
       }
       super.onRemove();
     }
+    getContentBounds(viewId) {
+      return this.props.contentBounds ?? this.deck?.getView(viewId)?.controller?.maxBounds ?? null;
+    }
     updateViewport(viewport) {
       if (!viewport) {
         this.contentSize = 0;
@@ -4216,7 +4213,7 @@ var __exports__ = (() => {
         this.viewportSize = 0;
         return;
       }
-      const { contentBounds } = this.props;
+      const contentBounds = this.getContentBounds(viewport.id);
       const isVertical = this.isVertical();
       const projectedBounds = contentBounds ? projectBounds(contentBounds, viewport, isVertical) : [0, 0];
       this.contentSize = projectedBounds[1] - projectedBounds[0];
@@ -4224,8 +4221,12 @@ var __exports__ = (() => {
       this.viewportSize = isVertical ? viewport.height : viewport.width;
     }
     getDecorations(viewport) {
-      const { decorations = [], contentBounds } = this.props;
-      if (!viewport || !contentBounds || decorations.length === 0) {
+      const { decorations = [] } = this.props;
+      if (!viewport || decorations.length === 0) {
+        return [];
+      }
+      const contentBounds = this.getContentBounds(viewport.id);
+      if (!contentBounds) {
         return [];
       }
       const isVertical = this.isVertical();
@@ -4907,38 +4908,20 @@ var __exports__ = (() => {
       this.className = "deck-widget-theme";
       this.placement = "top-left";
       this.themeMode = "dark";
+      this.appliedTheme = {};
       this.themeMode = this._getInitialThemeMode();
       this.setProps(this.props);
     }
     // eslint-disable-next-line complexity
     setProps(props) {
-      const { lightModeTheme, darkModeTheme, themeMode: prevThemeMode } = this.props;
       this.placement = props.placement ?? this.placement;
       this.viewId = props.viewId ?? this.viewId;
       super.setProps(props);
-      const currentMode = this.getThemeMode();
-      if (props.themeMode !== void 0 && props.themeMode !== prevThemeMode) {
-        this._applyTheme(props.themeMode);
-        return;
-      }
-      switch (currentMode) {
-        case "light":
-          if (props.lightModeTheme && !(0, import_core21._deepEqual)(props.lightModeTheme, lightModeTheme, 1)) {
-            this._applyTheme("light");
-          }
-          break;
-        case "dark":
-          if (props.darkModeTheme && !(0, import_core21._deepEqual)(props.darkModeTheme, darkModeTheme, 1)) {
-            this._applyTheme("dark");
-          }
-          break;
-        default:
-          import_core21.log.warn(`Invalid theme mode ${currentMode}`)();
-      }
     }
     onRenderHTML(rootElement) {
       const { lightModeLabel, darkModeLabel } = this.props;
       const currentMode = this.getThemeMode();
+      this._applyTheme(currentMode, rootElement);
       B(
         /* @__PURE__ */ u2(
           IconButton,
@@ -4951,9 +4934,6 @@ var __exports__ = (() => {
         rootElement
       );
     }
-    onAdd() {
-      this._applyTheme(this.getThemeMode());
-    }
     /**
      * Returns the current theme mode.
      * In controlled mode, returns the themeMode prop.
@@ -4968,19 +4948,22 @@ var __exports__ = (() => {
       this.props.onThemeModeChange?.(nextMode);
       if (this.props.themeMode === void 0) {
         this.themeMode = nextMode;
-        this._applyTheme(nextMode);
+        this.updateHTML();
       }
     }
     /** Apply theme styling without changing internal state */
-    _applyTheme(themeMode) {
-      const container = this.rootElement?.closest(".deck-widget-container");
-      if (container) {
-        const themeStyle = themeMode === "dark" ? this.props.darkModeTheme : this.props.lightModeTheme;
-        (0, import_core21._applyStyles)(container, themeStyle);
-        const label = themeMode === "dark" ? this.props.darkModeLabel : this.props.lightModeLabel;
-        import_core21.log.log(1, `Switched theme to ${label}`, themeStyle)();
-        this.updateHTML();
+    _applyTheme(themeMode, rootElement) {
+      const themeStyle = themeMode === "dark" ? this.props.darkModeTheme : this.props.lightModeTheme;
+      if ((0, import_core21._deepEqual)(themeStyle, this.appliedTheme, 1)) {
+        return;
       }
+      const container = rootElement.closest(".deck-widget-container");
+      if (!container)
+        return;
+      (0, import_core21._applyStyles)(container, themeStyle);
+      this.appliedTheme = themeStyle;
+      const label = themeMode === "dark" ? this.props.darkModeLabel : this.props.lightModeLabel;
+      import_core21.log.log(1, `Switched theme to ${label}`, themeStyle)();
     }
     /** Read browser preference */
     _getInitialThemeMode() {

package/dist/geocoder-widget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geocoder-widget.d.ts","sourceRoot":"","sources":["../src/geocoder-widget.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,KAAK,EAAC,eAAe,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAIhE,OAAO,EAAC,KAAK,QAAQ,EAAC,kCAA+B;AACrD,OAAO,EAAC,eAAe,EAAC,0CAAuC;AAS/D,yCAAyC;AACzC,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAazC,wCAAwC;AACxC,MAAM,MAAM,mBAAmB,GAAG,WAAW,GAAG;IAC9C,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,8DAA8D;IAC9D,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,sBAAsB;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,wDAAwD;IACxD,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,aAAa,GAAG,QAAQ,CAAC;IACvE,+DAA+D;IAC/D,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1B,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mDAAmD;IACnD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE;QACnB,6BAA6B;QAC7B,MAAM,EAAE,MAAM,CAAC;QACf,+BAA+B;QAC/B,WAAW,EAAE;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAC,CAAC;KACnE,KAAK,IAAI,CAAC;CACZ,CAAC;AAEF;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,MAAM,CAAC,mBAAmB,CAAC;IAC7D,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAYhD;IAEF,SAAS,SAA0B;IACnC,SAAS,EAAE,eAAe,CAAc;IAExC,cAAc,kBAA2B;IACzC,WAAW,EAAE,MAAM,CAAM;IACzB,QAAQ,EAAE,QAAQ,CAAuB;IACzC,iBAAiB,EAAE,OAAO,CAAS;gBAEvB,KAAK,GAAE,mBAAwB;IAK3C,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,mBAAmB,CAAC,GAAG,IAAI;IAUnD,YAAY,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IA4B5C,QAAQ,SAAU,MAAM,UAEtB;IAEF,cAAc,mBAIZ;IAEF,YAAY,UAAW,MAAM,UAS3B;IAEF,uCAAuC;IACvC,YAAY,aAGV;IAEF,uDAAuD;IACvD,kBAAkB,sBAmBhB;IAEF,wBAAwB;IACxB,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAazC;IAEF,KAAK,CAAC,SAAS,EAAE,SAAS;CA4B3B"}
+{"version":3,"file":"geocoder-widget.d.ts","sourceRoot":"","sources":["../src/geocoder-widget.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,KAAK,EAAC,eAAe,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAIhE,OAAO,EAAC,KAAK,QAAQ,EAAC,kCAA+B;AACrD,OAAO,EAAC,eAAe,EAAC,0CAAuC;AAS/D,yCAAyC;AACzC,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAazC,wCAAwC;AACxC,MAAM,MAAM,mBAAmB,GAAG,WAAW,GAAG;IAC9C,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,8DAA8D;IAC9D,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,sBAAsB;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,wDAAwD;IACxD,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,aAAa,GAAG,QAAQ,CAAC;IACvE,+DAA+D;IAC/D,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1B,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mDAAmD;IACnD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE;QACnB,6BAA6B;QAC7B,MAAM,EAAE,MAAM,CAAC;QACf,+BAA+B;QAC/B,WAAW,EAAE;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAC,CAAC;KACnE,KAAK,IAAI,CAAC;CACZ,CAAC;AAEF;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,MAAM,CAAC,mBAAmB,CAAC;IAC7D,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAYhD;IAEF,SAAS,SAA0B;IACnC,SAAS,EAAE,eAAe,CAAc;IAExC,cAAc,kBAA2B;IACzC,WAAW,EAAE,MAAM,CAAM;IACzB,QAAQ,EAAE,QAAQ,CAAuB;IACzC,iBAAiB,EAAE,OAAO,CAAS;gBAEvB,KAAK,GAAE,mBAAwB;IAK3C,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,mBAAmB,CAAC,GAAG,IAAI;IAUnD,YAAY,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IA4B5C,QAAQ,SAAU,MAAM,UAEtB;IAEF,cAAc,mBAIZ;IAEF,YAAY,UAAW,MAAM,UAS3B;IAEF,uCAAuC;IACvC,YAAY,aAGV;IAEF,uDAAuD;IACvD,kBAAkB,sBAmBhB;IAEF,wBAAwB;IACxB,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAazC;IAEF,KAAK,CAAC,SAAS,EAAE,SAAS;CA2B3B"}

package/dist/geocoder-widget.js

@@ -109,8 +109,7 @@ export class GeocoderWidget extends Widget {
                     onInput: e => this.setInput(e.target?.value || ''), onKeyPress: this.handleKeyPress }), _jsx(DropdownMenu, { menuItems: menuItems, onSelect: this.handleSelect }), this.geocodeHistory.errorText && (_jsx("div", { className: "deck-widget-geocoder-error", children: this.geocodeHistory.errorText }))] }), rootElement);
     }
     flyTo(viewState) {
-        const viewIds = this.viewId ? [this.viewId] : (this.deck?.getViews().map(v => v.id) ?? []);
-        for (const viewId of viewIds) {
+        for (const viewId of this.viewIds) {
             // Call callback with geocoded coordinates
             if ('longitude' in viewState && 'latitude' in viewState) {
                 this.props.onGeocode?.({

package/dist/geocoder-widget.js.map

@@ -1 +1 @@
-{"version":3,"file":"geocoder-widget.js","sourceRoot":"","sources":["../src/geocoder-widget.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"geocoder-widget.js","sourceRoot":"","sources":["../src/geocoder-widget.tsx"],"names":[],"mappings":"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"}

package/dist/index.cjs

@@ -169,16 +169,12 @@ var ZoomWidget = class extends import_core.Widget {
     this.setViewState(viewId, nextViewState);
   }
   handleZoomIn() {
-    var _a;
-    const viewIds = this.viewId ? [this.viewId] : ((_a = this.deck) == null ? void 0 : _a.getViews().map((v) => v.id)) ?? [];
-    for (const viewId of viewIds) {
+    for (const viewId of this.viewIds) {
       this.handleZoom(viewId, 1);
     }
   }
   handleZoomOut() {
-    var _a;
-    const viewIds = this.viewId ? [this.viewId] : ((_a = this.deck) == null ? void 0 : _a.getViews().map((v) => v.id)) ?? [];
-    for (const viewId of viewIds) {
+    for (const viewId of this.viewIds) {
       this.handleZoom(viewId, -1);
     }
   }
@@ -230,16 +226,15 @@ var ResetViewWidget = class extends import_core2.Widget {
     this.resetViewState(initialViewState);
   }
   resetViewState(viewState) {
-    var _a, _b, _c;
-    const viewIds = this.viewId ? [this.viewId] : ((_a = this.deck) == null ? void 0 : _a.getViews().map((v) => v.id)) ?? [];
-    for (const viewId of viewIds) {
+    var _a, _b;
+    for (const viewId of this.viewIds) {
       const nextViewState = {
         ...(viewState == null ? void 0 : viewState[viewId]) ?? viewState
         // only works for geospatial?
         // transitionDuration: this.props.transitionDuration,
         // transitionInterpolator: new FlyToInterpolator()
       };
-      (_c = (_b = this.props).onReset) == null ? void 0 : _c.call(_b, { viewId, viewState: nextViewState });
+      (_b = (_a = this.props).onReset) == null ? void 0 : _b.call(_a, { viewId, viewState: nextViewState });
       this.setViewState(viewId, nextViewState);
     }
   }
@@ -722,9 +717,13 @@ function parseCoordinates(input) {
   const second = parseCoordinatePart(parts[1]);
   if (first === null || second === null)
     return null;
-  if (Math.abs(first) > 90 && Math.abs(second) <= 90) {
+  if (Math.abs(first) > 90 && Math.abs(second) > 90) {
+    return null;
+  }
+  if (Math.abs(first) > 90) {
     return { longitude: first, latitude: second };
-  } else if (Math.abs(second) > 90 && Math.abs(first) <= 90) {
+  }
+  if (Math.abs(second) > 90) {
     return { longitude: second, latitude: first };
   }
   return { latitude: first, longitude: second };
@@ -743,7 +742,7 @@ function parseCoordinatePart(s) {
   return isNaN(value) ? null : sign * value;
 }
 function dmsToDecimal(s) {
-  const regex = /(\d+)[°d]\s*(\d+)?['′m]?\s*(\d+(?:\.\d+)?)?[\"″s]?\s*([NSEW])?/i;
+  const regex = /(-?\d+)[°d]\s*(\d+)?['′m]?\s*(\d+(?:\.\d+)?)?[\"″s]?\s*([NSEW])?/i;
   const match = s.match(regex);
   if (!match)
     return NaN;
@@ -849,11 +848,10 @@ var GeocoderWidget = class extends import_core6.Widget {
     }), (0, import_jsx_runtime9.jsx)(DropdownMenu, { menuItems, onSelect: this.handleSelect }), this.geocodeHistory.errorText && (0, import_jsx_runtime9.jsx)("div", { className: "deck-widget-geocoder-error", children: this.geocodeHistory.errorText })] }), rootElement);
   }
   flyTo(viewState) {
-    var _a, _b, _c;
-    const viewIds = this.viewId ? [this.viewId] : ((_a = this.deck) == null ? void 0 : _a.getViews().map((v) => v.id)) ?? [];
-    for (const viewId of viewIds) {
+    var _a, _b;
+    for (const viewId of this.viewIds) {
       if ("longitude" in viewState && "latitude" in viewState) {
-        (_c = (_b = this.props).onGeocode) == null ? void 0 : _c.call(_b, {
+        (_b = (_a = this.props).onGeocode) == null ? void 0 : _b.call(_a, {
           viewId,
           coordinates: {
             longitude: viewState.longitude,
@@ -1440,7 +1438,7 @@ var PopupWidget = class extends import_core11.Widget {
     }
     const { marker, content, style } = this.props;
     const [x, y] = this.viewport.project(this.props.position);
-    const ui = (0, import_jsx_runtime15.jsxs)("div", { children: [marker && (0, import_jsx_runtime15.jsx)("div", { style: { position: "absolute", left: x, top: y, pointerEvents: "all", cursor: "pointer" }, children: (0, import_jsx_runtime15.jsx)(UserContent, { ...marker, onClick: () => this._setIsOpen(true) }) }), this.isOpen && (0, import_jsx_runtime15.jsx)(Popover, { x, y, placement: this.props.placement, arrow: this.props.arrow, arrowColor: "var(--menu-background, #fff)", offset: this.props.offset, children: (0, import_jsx_runtime15.jsxs)("div", { className: `deck-widget-popup-content ${this.props.className}`, style, children: [this.props.closeButton && (0, import_jsx_runtime15.jsx)("div", { className: "deck-widget-popup-controls", style: { width: "100%", display: "flex", justifyContent: "end" }, children: (0, import_jsx_runtime15.jsx)(IconButton, { className: "deck-widget-popup-close-button", onClick: () => this._setIsOpen(false) }) }), (0, import_jsx_runtime15.jsx)(UserContent, { ...typeof content === "string" ? { text: content } : content })] }) })] });
+    const ui = (0, import_jsx_runtime15.jsxs)("div", { children: [marker && (0, import_jsx_runtime15.jsx)("div", { className: "deck-widget-popup-marker", style: { left: x, top: y }, children: (0, import_jsx_runtime15.jsx)(UserContent, { ...marker, onClick: () => this._setIsOpen(true) }) }), this.isOpen && (0, import_jsx_runtime15.jsx)(Popover, { x, y, placement: this.props.placement, arrow: this.props.arrow, arrowColor: "var(--menu-background, #fff)", offset: this.props.offset, children: (0, import_jsx_runtime15.jsxs)("div", { className: `deck-widget-popup-content ${this.props.className}`, style, children: [this.props.closeButton && (0, import_jsx_runtime15.jsx)("div", { className: "deck-widget-popup-controls", style: { width: "100%", display: "flex", justifyContent: "end" }, children: (0, import_jsx_runtime15.jsx)(IconButton, { className: "deck-widget-popup-close-button", onClick: () => this._setIsOpen(false) }) }), (0, import_jsx_runtime15.jsx)(UserContent, { ...typeof content === "string" ? { text: content } : content })] }) })] });
     (0, import_preact10.render)(ui, rootElement);
   }
 };
@@ -1847,6 +1845,10 @@ var ScrollbarWidget = class extends import_core13.Widget {
     }
     super.onRemove();
   }
+  getContentBounds(viewId) {
+    var _a, _b, _c;
+    return this.props.contentBounds ?? ((_c = (_b = (_a = this.deck) == null ? void 0 : _a.getView(viewId)) == null ? void 0 : _b.controller) == null ? void 0 : _c.maxBounds) ?? null;
+  }
   updateViewport(viewport) {
     if (!viewport) {
       this.contentSize = 0;
@@ -1854,7 +1856,7 @@ var ScrollbarWidget = class extends import_core13.Widget {
       this.viewportSize = 0;
       return;
     }
-    const { contentBounds } = this.props;
+    const contentBounds = this.getContentBounds(viewport.id);
     const isVertical = this.isVertical();
     const projectedBounds = contentBounds ? projectBounds(contentBounds, viewport, isVertical) : [0, 0];
     this.contentSize = projectedBounds[1] - projectedBounds[0];
@@ -1862,8 +1864,12 @@ var ScrollbarWidget = class extends import_core13.Widget {
     this.viewportSize = isVertical ? viewport.height : viewport.width;
   }
   getDecorations(viewport) {
-    const { decorations = [], contentBounds } = this.props;
-    if (!viewport || !contentBounds || decorations.length === 0) {
+    const { decorations = [] } = this.props;
+    if (!viewport || decorations.length === 0) {
+      return [];
+    }
+    const contentBounds = this.getContentBounds(viewport.id);
+    if (!contentBounds) {
       return [];
     }
     const isVertical = this.isVertical();
@@ -2453,43 +2459,22 @@ var ThemeWidget = class extends import_core20.Widget {
     this.className = "deck-widget-theme";
     this.placement = "top-left";
     this.themeMode = "dark";
+    this.appliedTheme = {};
     this.themeMode = this._getInitialThemeMode();
     this.setProps(this.props);
   }
   // eslint-disable-next-line complexity
   setProps(props) {
-    const { lightModeTheme, darkModeTheme, themeMode: prevThemeMode } = this.props;
     this.placement = props.placement ?? this.placement;
     this.viewId = props.viewId ?? this.viewId;
     super.setProps(props);
-    const currentMode = this.getThemeMode();
-    if (props.themeMode !== void 0 && props.themeMode !== prevThemeMode) {
-      this._applyTheme(props.themeMode);
-      return;
-    }
-    switch (currentMode) {
-      case "light":
-        if (props.lightModeTheme && !(0, import_core19._deepEqual)(props.lightModeTheme, lightModeTheme, 1)) {
-          this._applyTheme("light");
-        }
-        break;
-      case "dark":
-        if (props.darkModeTheme && !(0, import_core19._deepEqual)(props.darkModeTheme, darkModeTheme, 1)) {
-          this._applyTheme("dark");
-        }
-        break;
-      default:
-        import_core19.log.warn(`Invalid theme mode ${currentMode}`)();
-    }
   }
   onRenderHTML(rootElement) {
     const { lightModeLabel, darkModeLabel } = this.props;
     const currentMode = this.getThemeMode();
+    this._applyTheme(currentMode, rootElement);
     (0, import_preact18.render)((0, import_jsx_runtime24.jsx)(IconButton, { onClick: this._handleClick.bind(this), label: currentMode === "dark" ? darkModeLabel : lightModeLabel, className: currentMode === "dark" ? "deck-widget-moon" : "deck-widget-sun" }), rootElement);
   }
-  onAdd() {
-    this._applyTheme(this.getThemeMode());
-  }
   /**
    * Returns the current theme mode.
    * In controlled mode, returns the themeMode prop.
@@ -2505,20 +2490,22 @@ var ThemeWidget = class extends import_core20.Widget {
     (_b = (_a = this.props).onThemeModeChange) == null ? void 0 : _b.call(_a, nextMode);
     if (this.props.themeMode === void 0) {
       this.themeMode = nextMode;
-      this._applyTheme(nextMode);
+      this.updateHTML();
     }
   }
   /** Apply theme styling without changing internal state */
-  _applyTheme(themeMode) {
-    var _a;
-    const container = (_a = this.rootElement) == null ? void 0 : _a.closest(".deck-widget-container");
-    if (container) {
-      const themeStyle = themeMode === "dark" ? this.props.darkModeTheme : this.props.lightModeTheme;
-      (0, import_core19._applyStyles)(container, themeStyle);
-      const label = themeMode === "dark" ? this.props.darkModeLabel : this.props.lightModeLabel;
-      import_core19.log.log(1, `Switched theme to ${label}`, themeStyle)();
-      this.updateHTML();
+  _applyTheme(themeMode, rootElement) {
+    const themeStyle = themeMode === "dark" ? this.props.darkModeTheme : this.props.lightModeTheme;
+    if ((0, import_core19._deepEqual)(themeStyle, this.appliedTheme, 1)) {
+      return;
     }
+    const container = rootElement.closest(".deck-widget-container");
+    if (!container)
+      return;
+    (0, import_core19._applyStyles)(container, themeStyle);
+    this.appliedTheme = themeStyle;
+    const label = themeMode === "dark" ? this.props.darkModeLabel : this.props.lightModeLabel;
+    import_core19.log.log(1, `Switched theme to ${label}`, themeStyle)();
   }
   /** Read browser preference */
   _getInitialThemeMode() {