@deck.gl/widgets 9.4.0-alpha.1 → 9.4.0-beta.1

package/src/scrollbar-widget.tsx

@@ -1,5 +1,11 @@
-import {Widget} from '@deck.gl/core';
-import type {Position, Viewport, WidgetPlacement, WidgetProps} from '@deck.gl/core';
+import {Widget, _getMaxBoundsRect} from '@deck.gl/core';
+import type {
+  ControllerProps,
+  Position,
+  Viewport,
+  WidgetPlacement,
+  WidgetProps
+} from '@deck.gl/core';
 import {render} from 'preact';
 import {RangeInput, type RangeInputDecoration} from './lib/components/range-input';
 
@@ -31,6 +37,10 @@ export type ScrollbarWidgetProps = WidgetProps & {
    * If not supplied, the scrollbar will always be hidden.
    */
   contentBounds?: ContentBounds | null;
+  /** Padding inside the viewport used to display `contentBounds`.
+   * If not supplied, falls back to the target view controller's `maxBoundsPadding`.
+   */
+  contentBoundsPadding?: ControllerProps['maxBoundsPadding'];
   placement?: WidgetPlacement;
   viewId?: string | null;
   /** Direction of the scrollbar. `'horizontal'` scrolls the camera along the X axis, and `'vertical'` scrolls the camera along the Y axis.
@@ -69,6 +79,7 @@ export class ScrollbarWidget extends Widget<ScrollbarWidgetProps> {
   static override defaultProps: ScrollbarWidgetRequiredProps = {
     ...Widget.defaultProps,
     contentBounds: null,
+    contentBoundsPadding: null,
     placement: 'top-right',
     viewId: null,
     orientation: 'vertical',
@@ -152,6 +163,14 @@ export class ScrollbarWidget extends Widget<ScrollbarWidgetProps> {
     return this.props.contentBounds ?? this.deck?.getView(viewId)?.controller?.maxBounds ?? null;
   }
 
+  private getContentBoundsPadding(viewId: string): ControllerProps['maxBoundsPadding'] {
+    return (
+      this.props.contentBoundsPadding ??
+      this.deck?.getView(viewId)?.controller?.maxBoundsPadding ??
+      null
+    );
+  }
+
   private updateViewport(viewport?: Viewport): void {
     if (!viewport) {
       this.contentSize = 0;
@@ -165,10 +184,17 @@ export class ScrollbarWidget extends Widget<ScrollbarWidgetProps> {
     const projectedBounds = contentBounds
       ? projectBounds(contentBounds, viewport, isVertical)
       : ([0, 0] as [number, number]);
+    const contentRect = _getMaxBoundsRect(
+      viewport.width,
+      viewport.height,
+      this.getContentBoundsPadding(viewport.id)
+    );
+    const contentStart = isVertical ? contentRect.y : contentRect.x;
+    const viewportSize = isVertical ? contentRect.height : contentRect.width;
 
     this.contentSize = projectedBounds[1] - projectedBounds[0];
-    this.scrollOffset = -projectedBounds[0];
-    this.viewportSize = isVertical ? viewport.height : viewport.width;
+    this.scrollOffset = contentStart - projectedBounds[0];
+    this.viewportSize = Math.max(0, viewportSize);
   }
 
   private getDecorations(viewport?: Viewport): RangeInputDecoration[] {

package/src/selector-widget.tsx

@@ -23,6 +23,8 @@ export type SelectorWidgetProps<ValueT = string> = WidgetProps & {
   options: SelectorWidgetOption<ValueT>[];
   /** The initial value. Default to the first option. */
   initialValue?: ValueT;
+  /** Custom tooltip content. Overrides label for tooltip display. */
+  tooltip?: string | HTMLElement | false;
   /** Callback invoked when the value changes */
   onChange?: (value: ValueT) => void;
 };
@@ -43,6 +45,7 @@ export class SelectorWidget<ValueT = string> extends Widget<SelectorWidgetProps<
     viewId: null,
     initialValue: '',
     options: [],
+    tooltip: undefined!,
     onChange: () => {}
   };
 
@@ -72,6 +75,7 @@ export class SelectorWidget<ValueT = string> extends Widget<SelectorWidgetProps<
         <IconButton
           icon={selectedOption.icon}
           label={selectedOption.label}
+          tooltip={this.props.tooltip}
           onClick={this._toggleMenu}
         />
         {this.isOpen && (

package/src/stylesheet.css

@@ -59,25 +59,25 @@
 
 /* Border radius adjustments for grouped buttons */
 .deck-widget-button-group.vertical > *:not(:last-child),
-.deck-widget-button-group.vertical > *:not(:last-child) > button {
+.deck-widget-button-group.vertical > *:not(:last-child) button {
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
 }
 
 .deck-widget-button-group.vertical > *:not(:first-child),
-.deck-widget-button-group.vertical > *:not(:first-child) > button {
+.deck-widget-button-group.vertical > *:not(:first-child) button {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
 }
 
 .deck-widget-button-group.horizontal > *:not(:last-child),
-.deck-widget-button-group.horizontal > *:not(:last-child) > button {
+.deck-widget-button-group.horizontal > *:not(:last-child) button {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
 
 .deck-widget-button-group.horizontal > *:not(:first-child),
-.deck-widget-button-group.horizontal > *:not(:first-child) > button {
+.deck-widget-button-group.horizontal > *:not(:first-child) button {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
@@ -90,6 +90,9 @@
   display: block;
   height: 100%;
   width: 100%;
+  mask-size: var(--icon-size, 75%);
+  mask-repeat: no-repeat;
+  mask-position: center;
 }
 
 .deck-widget button .deck-widget-icon:hover {
@@ -106,26 +109,14 @@
 }
 
 /* Fullscreen styles */
+/* Icon source: https://fonts.google.com/icons?selected=Material+Symbols+Rounded:fullscreen:FILL@0;wght@400;GRAD@0;opsz@24 */
 .deck-widget.deck-widget-fullscreen button.deck-widget-fullscreen-enter .deck-widget-icon {
-  mask-image: var(
-    --icon-fullscreen-enter,
-    url('data:image/svg+xml,<svg fill="black" height="100%" viewBox="0 0 28 28" width="100%" xmlns="http://www.w3.org/2000/svg"><path d="M7.90474 20.0953H10.6286C10.8984 20.0953 11.1246 20.1868 11.3071 20.37C11.4897 20.5532 11.5809 20.7802 11.5809 21.051C11.5809 21.3218 11.4897 21.5476 11.3071 21.7286C11.1246 21.9095 10.8984 22 10.6286 22H6.95237C6.68254 22 6.45635 21.9087 6.2738 21.7262C6.09127 21.5436 6 21.3175 6 21.0476V17.3714C6 17.1016 6.09159 16.8754 6.27477 16.6929C6.45795 16.5103 6.68493 16.4191 6.95571 16.4191C7.2265 16.4191 7.45236 16.5103 7.63331 16.6929C7.81427 16.8754 7.90474 17.1016 7.90474 17.3714V20.0953ZM7.90474 7.90474V10.6286C7.90474 10.8984 7.81315 11.1246 7.62997 11.3071C7.44679 11.4897 7.21981 11.5809 6.94903 11.5809C6.67825 11.5809 6.45238 11.4897 6.27143 11.3071C6.09048 11.1246 6 10.8984 6 10.6286V6.95237C6 6.68254 6.09127 6.45635 6.2738 6.2738C6.45635 6.09127 6.68254 6 6.95237 6H10.6286C10.8984 6 11.1246 6.09159 11.3071 6.27477C11.4897 6.45795 11.5809 6.68493 11.5809 6.95571C11.5809 7.2265 11.4897 7.45236 11.3071 7.63331C11.1246 7.81427 10.8984 7.90474 10.6286 7.90474H7.90474ZM20.0953 20.0953V17.3714C20.0953 17.1016 20.1868 16.8754 20.37 16.6929C20.5532 16.5103 20.7802 16.4191 21.051 16.4191C21.3218 16.4191 21.5476 16.5103 21.7286 16.6929C21.9095 16.8754 22 17.1016 22 17.3714V21.0476C22 21.3175 21.9087 21.5436 21.7262 21.7262C21.5436 21.9087 21.3175 22 21.0476 22H17.3714C17.1016 22 16.8754 21.9084 16.6929 21.7252C16.5103 21.542 16.4191 21.3151 16.4191 21.0443C16.4191 20.7735 16.5103 20.5476 16.6929 20.3667C16.8754 20.1857 17.1016 20.0953 17.3714 20.0953H20.0953ZM20.0953 7.90474H17.3714C17.1016 7.90474 16.8754 7.81315 16.6929 7.62997C16.5103 7.44679 16.4191 7.21981 16.4191 6.94903C16.4191 6.67825 16.5103 6.45238 16.6929 6.27143C16.8754 6.09048 17.1016 6 17.3714 6H21.0476C21.3175 6 21.5436 6.09127 21.7262 6.2738C21.9087 6.45635 22 6.68254 22 6.95237V10.6286C22 10.8984 21.9084 11.1246 21.7252 11.3071C21.542 11.4897 21.3151 11.5809 21.0443 11.5809C20.7735 11.5809 20.5476 11.4897 20.3667 11.3071C20.1857 11.1246 20.0953 10.8984 20.0953 10.6286V7.90474Z" /></svg>')
-  );
-  -webkit-mask-image: var(
-    --icon-fullscreen-enter,
-    url('data:image/svg+xml,<svg fill="black" height="100%" viewBox="0 0 28 28" width="100%" xmlns="http://www.w3.org/2000/svg"><path d="M7.90474 20.0953H10.6286C10.8984 20.0953 11.1246 20.1868 11.3071 20.37C11.4897 20.5532 11.5809 20.7802 11.5809 21.051C11.5809 21.3218 11.4897 21.5476 11.3071 21.7286C11.1246 21.9095 10.8984 22 10.6286 22H6.95237C6.68254 22 6.45635 21.9087 6.2738 21.7262C6.09127 21.5436 6 21.3175 6 21.0476V17.3714C6 17.1016 6.09159 16.8754 6.27477 16.6929C6.45795 16.5103 6.68493 16.4191 6.95571 16.4191C7.2265 16.4191 7.45236 16.5103 7.63331 16.6929C7.81427 16.8754 7.90474 17.1016 7.90474 17.3714V20.0953ZM7.90474 7.90474V10.6286C7.90474 10.8984 7.81315 11.1246 7.62997 11.3071C7.44679 11.4897 7.21981 11.5809 6.94903 11.5809C6.67825 11.5809 6.45238 11.4897 6.27143 11.3071C6.09048 11.1246 6 10.8984 6 10.6286V6.95237C6 6.68254 6.09127 6.45635 6.2738 6.2738C6.45635 6.09127 6.68254 6 6.95237 6H10.6286C10.8984 6 11.1246 6.09159 11.3071 6.27477C11.4897 6.45795 11.5809 6.68493 11.5809 6.95571C11.5809 7.2265 11.4897 7.45236 11.3071 7.63331C11.1246 7.81427 10.8984 7.90474 10.6286 7.90474H7.90474ZM20.0953 20.0953V17.3714C20.0953 17.1016 20.1868 16.8754 20.37 16.6929C20.5532 16.5103 20.7802 16.4191 21.051 16.4191C21.3218 16.4191 21.5476 16.5103 21.7286 16.6929C21.9095 16.8754 22 17.1016 22 17.3714V21.0476C22 21.3175 21.9087 21.5436 21.7262 21.7262C21.5436 21.9087 21.3175 22 21.0476 22H17.3714C17.1016 22 16.8754 21.9084 16.6929 21.7252C16.5103 21.542 16.4191 21.3151 16.4191 21.0443C16.4191 20.7735 16.5103 20.5476 16.6929 20.3667C16.8754 20.1857 17.1016 20.0953 17.3714 20.0953H20.0953ZM20.0953 7.90474H17.3714C17.1016 7.90474 16.8754 7.81315 16.6929 7.62997C16.5103 7.44679 16.4191 7.21981 16.4191 6.94903C16.4191 6.67825 16.5103 6.45238 16.6929 6.27143C16.8754 6.09048 17.1016 6 17.3714 6H21.0476C21.3175 6 21.5436 6.09127 21.7262 6.2738C21.9087 6.45635 22 6.68254 22 6.95237V10.6286C22 10.8984 21.9084 11.1246 21.7252 11.3071C21.542 11.4897 21.3151 11.5809 21.0443 11.5809C20.7735 11.5809 20.5476 11.4897 20.3667 11.3071C20.1857 11.1246 20.0953 10.8984 20.0953 10.6286V7.90474Z" /></svg>')
-  );
+  mask-image: var(--icon-fullscreen-enter, svg-load("icons/fullscreen.svg"));
 }
 
+/* Icon source: https://fonts.google.com/icons?selected=Material+Symbols+Rounded:fullscreen_exit:FILL@0;wght@400;GRAD@0;opsz@24 */
 .deck-widget.deck-widget-fullscreen button.deck-widget-fullscreen-exit .deck-widget-icon {
-  mask-image: var(
-    --icon-fullscreen-exit,
-    url('data:image/svg+xml,<svg fill="black" height="100%" viewBox="0 0 28 28" width="100%" xmlns="http://www.w3.org/2000/svg"><path d="M9.6762 18.3238H6.95237C6.68254 18.3238 6.45635 18.2322 6.2738 18.049C6.09127 17.8658 6 17.6389 6 17.3681C6 17.0973 6.09127 16.8714 6.2738 16.6905C6.45635 16.5095 6.68254 16.4191 6.95237 16.4191H10.6286C10.8984 16.4191 11.1246 16.5103 11.3071 16.6929C11.4897 16.8754 11.5809 17.1016 11.5809 17.3714V21.0476C11.5809 21.3175 11.4894 21.5436 11.3062 21.7262C11.123 21.9087 10.896 22 10.6252 22C10.3544 22 10.1286 21.9087 9.94763 21.7262C9.76668 21.5436 9.6762 21.3175 9.6762 21.0476V18.3238ZM18.3238 18.3238V21.0476C18.3238 21.3175 18.2322 21.5436 18.049 21.7262C17.8658 21.9087 17.6389 22 17.3681 22C17.0973 22 16.8714 21.9087 16.6905 21.7262C16.5095 21.5436 16.4191 21.3175 16.4191 21.0476V17.3714C16.4191 17.1016 16.5103 16.8754 16.6929 16.6929C16.8754 16.5103 17.1016 16.4191 17.3714 16.4191H21.0476C21.3175 16.4191 21.5436 16.5106 21.7262 16.6938C21.9087 16.877 22 17.104 22 17.3748C22 17.6456 21.9087 17.8714 21.7262 18.0524C21.5436 18.2333 21.3175 18.3238 21.0476 18.3238H18.3238ZM9.6762 9.6762V6.95237C9.6762 6.68254 9.76779 6.45635 9.95097 6.2738C10.1342 6.09127 10.3611 6 10.6319 6C10.9027 6 11.1286 6.09127 11.3095 6.2738C11.4905 6.45635 11.5809 6.68254 11.5809 6.95237V10.6286C11.5809 10.8984 11.4897 11.1246 11.3071 11.3071C11.1246 11.4897 10.8984 11.5809 10.6286 11.5809H6.95237C6.68254 11.5809 6.45635 11.4894 6.2738 11.3062C6.09127 11.123 6 10.896 6 10.6252C6 10.3544 6.09127 10.1286 6.2738 9.94763C6.45635 9.76668 6.68254 9.6762 6.95237 9.6762H9.6762ZM18.3238 9.6762H21.0476C21.3175 9.6762 21.5436 9.76779 21.7262 9.95097C21.9087 10.1342 22 10.3611 22 10.6319C22 10.9027 21.9087 11.1286 21.7262 11.3095C21.5436 11.4905 21.3175 11.5809 21.0476 11.5809H17.3714C17.1016 11.5809 16.8754 11.4897 16.6929 11.3071C16.5103 11.1246 16.4191 10.8984 16.4191 10.6286V6.95237C16.4191 6.68254 16.5106 6.45635 16.6938 6.2738C16.877 6.09127 17.104 6 17.3748 6C17.6456 6 17.8714 6.09127 18.0524 6.2738C18.2333 6.45635 18.3238 6.68254 18.3238 6.95237V9.6762Z" /></svg>')
-  );
-  -webkit-mask-image: var(
-    --icon-fullscreen-exit,
-    url('data:image/svg+xml,<svg fill="black" height="100%" viewBox="0 0 28 28" width="100%" xmlns="http://www.w3.org/2000/svg"><path d="M9.6762 18.3238H6.95237C6.68254 18.3238 6.45635 18.2322 6.2738 18.049C6.09127 17.8658 6 17.6389 6 17.3681C6 17.0973 6.09127 16.8714 6.2738 16.6905C6.45635 16.5095 6.68254 16.4191 6.95237 16.4191H10.6286C10.8984 16.4191 11.1246 16.5103 11.3071 16.6929C11.4897 16.8754 11.5809 17.1016 11.5809 17.3714V21.0476C11.5809 21.3175 11.4894 21.5436 11.3062 21.7262C11.123 21.9087 10.896 22 10.6252 22C10.3544 22 10.1286 21.9087 9.94763 21.7262C9.76668 21.5436 9.6762 21.3175 9.6762 21.0476V18.3238ZM18.3238 18.3238V21.0476C18.3238 21.3175 18.2322 21.5436 18.049 21.7262C17.8658 21.9087 17.6389 22 17.3681 22C17.0973 22 16.8714 21.9087 16.6905 21.7262C16.5095 21.5436 16.4191 21.3175 16.4191 21.0476V17.3714C16.4191 17.1016 16.5103 16.8754 16.6929 16.6929C16.8754 16.5103 17.1016 16.4191 17.3714 16.4191H21.0476C21.3175 16.4191 21.5436 16.5106 21.7262 16.6938C21.9087 16.877 22 17.104 22 17.3748C22 17.6456 21.9087 17.8714 21.7262 18.0524C21.5436 18.2333 21.3175 18.3238 21.0476 18.3238H18.3238ZM9.6762 9.6762V6.95237C9.6762 6.68254 9.76779 6.45635 9.95097 6.2738C10.1342 6.09127 10.3611 6 10.6319 6C10.9027 6 11.1286 6.09127 11.3095 6.2738C11.4905 6.45635 11.5809 6.68254 11.5809 6.95237V10.6286C11.5809 10.8984 11.4897 11.1246 11.3071 11.3071C11.1246 11.4897 10.8984 11.5809 10.6286 11.5809H6.95237C6.68254 11.5809 6.45635 11.4894 6.2738 11.3062C6.09127 11.123 6 10.896 6 10.6252C6 10.3544 6.09127 10.1286 6.2738 9.94763C6.45635 9.76668 6.68254 9.6762 6.95237 9.6762H9.6762ZM18.3238 9.6762H21.0476C21.3175 9.6762 21.5436 9.76779 21.7262 9.95097C21.9087 10.1342 22 10.3611 22 10.6319C22 10.9027 21.9087 11.1286 21.7262 11.3095C21.5436 11.4905 21.3175 11.5809 21.0476 11.5809H17.3714C17.1016 11.5809 16.8754 11.4897 16.6929 11.3071C16.5103 11.1246 16.4191 10.8984 16.4191 10.6286V6.95237C16.4191 6.68254 16.5106 6.45635 16.6938 6.2738C16.877 6.09127 17.104 6 17.3748 6C17.6456 6 17.8714 6.09127 18.0524 6.2738C18.2333 6.45635 18.3238 6.68254 18.3238 6.95237V9.6762Z" /></svg>')
-  );
+  mask-image: var(--icon-fullscreen-exit, svg-load("icons/fullscreen-exit.svg"));
 }
 
 .deck-pseudo-fullscreen {
@@ -138,69 +129,37 @@
 }
 
 /* Zoom styles */
+/* Icon source: https://fonts.google.com/icons?selected=Material+Symbols+Rounded:add:FILL@0;wght@400;GRAD@0;opsz@24 */
 .deck-widget.deck-widget-zoom button.deck-widget-zoom-in .deck-widget-icon {
-  mask-image: var(
-    --icon-zoom-in,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 26 26" fill="black"><path d="M12.1029 13.8971H7.89332C7.64334 13.8971 7.43196 13.8105 7.25918 13.6373C7.08639 13.4641 7 13.2521 7 13.0014C7 12.7508 7.08639 12.5396 7.25918 12.368C7.43196 12.1963 7.64334 12.1105 7.89332 12.1105H12.1029V7.90097C12.1029 7.65161 12.1895 7.43912 12.3627 7.26348C12.5359 7.08783 12.7479 7 12.9986 7C13.2492 7 13.4604 7.08783 13.632 7.26348C13.8037 7.43912 13.8895 7.65161 13.8895 7.90097V12.1105H18.099C18.3484 12.1105 18.5609 12.1971 18.7365 12.3703C18.9122 12.5436 19 12.7555 19 13.0062C19 13.2569 18.9122 13.468 18.7365 13.6397C18.5609 13.8113 18.3484 13.8971 18.099 13.8971H13.8895V18.1067C13.8895 18.3567 13.8029 18.568 13.6297 18.7408C13.4564 18.9136 13.2445 19 12.9938 19C12.7431 19 12.532 18.9136 12.3603 18.7408C12.1887 18.568 12.1029 18.3567 12.1029 18.1067V13.8971Z"/></svg>')
-  );
-  -webkit-mask-image: var(
-    --icon-zoom-in,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 26 26" fill="black"><path d="M12.1029 13.8971H7.89332C7.64334 13.8971 7.43196 13.8105 7.25918 13.6373C7.08639 13.4641 7 13.2521 7 13.0014C7 12.7508 7.08639 12.5396 7.25918 12.368C7.43196 12.1963 7.64334 12.1105 7.89332 12.1105H12.1029V7.90097C12.1029 7.65161 12.1895 7.43912 12.3627 7.26348C12.5359 7.08783 12.7479 7 12.9986 7C13.2492 7 13.4604 7.08783 13.632 7.26348C13.8037 7.43912 13.8895 7.65161 13.8895 7.90097V12.1105H18.099C18.3484 12.1105 18.5609 12.1971 18.7365 12.3703C18.9122 12.5436 19 12.7555 19 13.0062C19 13.2569 18.9122 13.468 18.7365 13.6397C18.5609 13.8113 18.3484 13.8971 18.099 13.8971H13.8895V18.1067C13.8895 18.3567 13.8029 18.568 13.6297 18.7408C13.4564 18.9136 13.2445 19 12.9938 19C12.7431 19 12.532 18.9136 12.3603 18.7408C12.1887 18.568 12.1029 18.3567 12.1029 18.1067V13.8971Z"/></svg>')
-  );
+  mask-image: var(--icon-zoom-in, svg-load("icons/add.svg"));
 }
 
+/* Icon source: https://fonts.google.com/icons?selected=Material+Symbols+Rounded:remove:FILL@0;wght@400;GRAD@0;opsz@24 */
 .deck-widget.deck-widget-zoom button.deck-widget-zoom-out .deck-widget-icon {
-  mask-image: var(
-    --icon-zoom-out,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 26 26" fill="black"> wBox="0 0 26 26" fill="none"><path d="M7.89332 13.8866C7.64334 13.8866 7.43196 13.8 7.25918 13.6268C7.08639 13.4535 7 13.2416 7 12.9909C7 12.7403 7.08639 12.5291 7.25918 12.3575C7.43196 12.1858 7.64334 12.1 7.89332 12.1H18.099C18.349 12.1 18.5617 12.1866 18.737 12.3598C18.9123 12.5331 19 12.745 19 12.9957C19 13.2463 18.9123 13.4575 18.737 13.6291C18.5617 13.8008 18.349 13.8866 18.099 13.8866H7.89332Z"/></svg>')
-  );
-  -webkit-mask-image: var(
-    --icon-zoom-out,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 26 26" fill="black"> wBox="0 0 26 26" fill="none"><path d="M7.89332 13.8866C7.64334 13.8866 7.43196 13.8 7.25918 13.6268C7.08639 13.4535 7 13.2416 7 12.9909C7 12.7403 7.08639 12.5291 7.25918 12.3575C7.43196 12.1858 7.64334 12.1 7.89332 12.1H18.099C18.349 12.1 18.5617 12.1866 18.737 12.3598C18.9123 12.5331 19 12.745 19 12.9957C19 13.2463 18.9123 13.4575 18.737 13.6291C18.5617 13.8008 18.349 13.8866 18.099 13.8866H7.89332Z"/></svg>')
-  );
+  mask-image: var(--icon-zoom-out, svg-load("icons/remove.svg"));
 }
 
 /* Screenshot styles */
+/* Icon source: https://fonts.google.com/icons?selected=Material+Symbols+Rounded:photo_camera:FILL@0;wght@400;GRAD@0;opsz@24 */
 .deck-widget.deck-widget-screenshot button.deck-widget-camera .deck-widget-icon {
-  mask-image: var(
-    --icon-camera,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 -960 960 960" fill="black"><path d="M480-260q75 0 127.5-52.5T660-440q0-75-52.5-127.5T480-620q-75 0-127.5 52.5T300-440q0 75 52.5 127.5T480-260Zm0-80q-42 0-71-29t-29-71q0-42 29-71t71-29q42 0 71 29t29 71q0 42-29 71t-71 29ZM160-120q-33 0-56.5-23.5T80-200v-480q0-33 23.5-56.5T160-760h126l74-80h240l74 80h126q33 0 56.5 23.5T880-680v480q0 33-23.5 56.5T800-120H160Zm0-80h640v-480H638l-73-80H395l-73 80H160v480Zm320-240Z"/></svg>')
-  );
-  -webkit-mask-image: var(
-    --icon-camera,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 -960 960 960" fill="black"><path d="M480-260q75 0 127.5-52.5T660-440q0-75-52.5-127.5T480-620q-75 0-127.5 52.5T300-440q0 75 52.5 127.5T480-260Zm0-80q-42 0-71-29t-29-71q0-42 29-71t71-29q42 0 71 29t29 71q0 42-29 71t-71 29ZM160-120q-33 0-56.5-23.5T80-200v-480q0-33 23.5-56.5T160-760h126l74-80h240l74 80h126q33 0 56.5 23.5T880-680v480q0 33-23.5 56.5T800-120H160Zm0-80h640v-480H638l-73-80H395l-73 80H160v480Zm320-240Z"/></svg>')
-  );
+  mask-image: var(--icon-camera, svg-load("icons/photo-camera.svg"));
 }
 
 /* Theme widget styles */
+/* Icon source: https://fonts.google.com/icons?selected=Material+Symbols+Rounded:light_mode:FILL@0;wght@400;GRAD@0;opsz@24 */
 .deck-widget.deck-widget-theme button.deck-widget-sun .deck-widget-icon {
-  mask-image: var(
-    --icon-sun,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24 24" fill="black" stroke="black"><g ><circle cx="12" cy="12" r="6" /><line x1="12" y1="1" x2="12" y2="3" /><line x1="12" y1="21" x2="12" y2="23" /><line x1="4.22" y1="4.22" x2="5.64" y2="5.64" /><line x1="18.36" y1="18.36" x2="19.78" y2="19.78" /><line x1="1" y1="12" x2="3" y2="12" /><line x1="21" y1="12" x2="23" y2="12" /><line x1="4.22" y1="19.78" x2="5.64" y2="18.36" /><line x1="18.36" y1="5.64" x2="19.78" y2="4.22" /></g></svg>')
-  );
+  mask-image: var(--icon-sun, svg-load("icons/light-mode.svg"));
 }
 
+/* Icon source: https://fonts.google.com/icons?selected=Material+Symbols+Rounded:dark_mode:FILL@0;wght@400;GRAD@0;opsz@24 */
 .deck-widget.deck-widget-theme button.deck-widget-moon .deck-widget-icon {
-  mask-image: var(
-    --icon-moon,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24 24" ><circle cx="12" cy="12" r="6" fill="black" mask="url(%23moon-mask)" /><mask id="moon-mask" viewBox="0 0 24 24" ><rect x="0" y="0" width="24" height="24" fill="white" /><circle cx="24" cy="10" r="12" fill="black"/></mask></svg>')
-  );
-  -webbit-mask-image: var(
-    --icon-moon,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24 24"><circle x="12" cy="12" r="6" /></svg>')
-  );
+  mask-image: var(--icon-moon, svg-load("icons/dark-mode.svg"));
 }
 
 /* Reset view styles */
+/* Icon source: https://fonts.google.com/icons?selected=Material+Symbols+Rounded:reset_focus:FILL@1;wght@400;GRAD@0;opsz@24 */
 .deck-widget.deck-widget-reset-view button.deck-widget-reset-focus .deck-widget-icon {
-  mask-image: var(
-    --icon-camera,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" fill="black"><path d="M480-320v-100q0-25 17.5-42.5T540-480h100v60H540v100h-60Zm60 240q-25 0-42.5-17.5T480-140v-100h60v100h100v60H540Zm280-240v-100H720v-60h100q25 0 42.5 17.5T880-420v100h-60ZM720-80v-60h100v-100h60v100q0 25-17.5 42.5T820-80H720Zm111-480h-83q-26-88-99-144t-169-56q-117 0-198.5 81.5T200-480q0 72 32.5 132t87.5 98v-110h80v240H160v-80h94q-62-50-98-122.5T120-480q0-75 28.5-140.5t77-114q48.5-48.5 114-77T480-840q129 0 226.5 79.5T831-560Z"/></svg>')
-  );
-  -webkit-mask-image: var(
-    --icon-camera,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" fill="black"><path d="M480-320v-100q0-25 17.5-42.5T540-480h100v60H540v100h-60Zm60 240q-25 0-42.5-17.5T480-140v-100h60v100h100v60H540Zm280-240v-100H720v-60h100q25 0 42.5 17.5T880-420v100h-60ZM720-80v-60h100v-100h60v100q0 25-17.5 42.5T820-80H720Zm111-480h-83q-26-88-99-144t-169-56q-117 0-198.5 81.5T200-480q0 72 32.5 132t87.5 98v-110h80v240H160v-80h94q-62-50-98-122.5T120-480q0-75 28.5-140.5t77-114q48.5-48.5 114-77T480-840q129 0 226.5 79.5T831-560Z"/></svg>')
-  );
+  mask-image: var(--icon-reset-view, svg-load("icons/reset-focus.svg"));
 }
 
 /* Timeline widget styles */
@@ -211,10 +170,10 @@
   right: 0;
   pointer-events: all;
 }
-.deck-widget.deck-widget-timeline[data-placement^=top-] {
+.deck-widget.deck-widget-timeline[data-placement^='top-'] {
   top: 0;
 }
-.deck-widget.deck-widget-timeline[data-placement^=bottom-] {
+.deck-widget.deck-widget-timeline[data-placement^='bottom-'] {
   bottom: 0;
 }
 .deck-widget.deck-widget-timeline .deck-widget-button-group {
@@ -223,24 +182,10 @@
   padding: var(--widget-margin, 12px);
 }
 .deck-widget-timeline button.deck-widget-timeline-pause .deck-widget-icon {
-  mask-image: var(
-    --icon-pause,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" fill="black"><path d="M560-200v-560h160v560H560Zm-320 0v-560h160v560H240Z"/></svg>')
-  );
-  -webkit-mask-image: var(
-    --icon-pause,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" fill="black"><path d="M560-200v-560h160v560H560Zm-320 0v-560h160v560H240Z"/></svg>')
-  );
+  mask-image: var(--icon-pause, svg-load("icons/pause.svg"));
 }
 .deck-widget-timeline button.deck-widget-timeline-play .deck-widget-icon {
-  mask-image: var(
-    --icon-play,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" fill="black"><path d="M320-200v-560l440 280-440 280Z"/></svg>')
-  );
-  -webkit-mask-image: var(
-    --icon-play,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960" fill="black"><path d="M320-200v-560l440 280-440 280Z"/></svg>')
-  );
+  mask-image: var(--icon-play, svg-load("icons/play-arrow.svg"));
 }
 .deck-widget-timeline-label {
   position: relative;
@@ -269,14 +214,7 @@
 }
 
 .deck-widget.deck-widget-loading button.deck-widget-spinner .deck-widget-icon {
-  mask-image: var(
-    --loading-icon,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="black" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" ><path d="M21 12a9 9 0 1 1-6.219-8.56" /></svg>')
-  );
-  -webkit-mask-image: var(
-    --loading-icon,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="black" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" ><path d="M21 12a9 9 0 1 1-6.219-8.56" /></svg>')
-  );
+  mask-image: var(--loading-icon, svg-load("icons/loading.svg"));
 }
 
 /* Scale styles */
@@ -315,7 +253,8 @@
   border-radius: calc(var(--button-corner-radius, 8px) - 1px);
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
+    sans-serif;
   font-size: 13px;
 }
 
@@ -339,7 +278,8 @@
   border-radius: var(--button-corner-radius, 8px);
   box-shadow: var(--button-shadow, 0px 0px 8px 0px rgba(0, 0, 0, 0.25));
   color: rgb(220, 80, 80);
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
+    sans-serif;
   font-size: 12px;
   text-align: center;
 }
@@ -377,10 +317,8 @@
   width: 12px;
   height: 12px;
   background-color: var(--button-icon-idle, rgba(97, 97, 102, 1));
-  mask-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="black"><path d="M7.41 8.59L12 13.17l4.59-4.58L18 10l-6 6-6-6 1.41-1.41z"/></svg>');
-  -webkit-mask-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="black"><path d="M7.41 8.59L12 13.17l4.59-4.58L18 10l-6 6-6-6 1.41-1.41z"/></svg>');
+  mask-image: svg-load("icons/dropdown.svg");
   mask-size: contain;
-  -webkit-mask-size: contain;
   transition: transform 0.2s ease;
 }
 
@@ -405,7 +343,8 @@
   border: var(--menu-border, unset);
   border-radius: var(--button-corner-radius, 8px);
   box-shadow: var(--menu-shadow, 0px 0px 8px 0px rgba(0, 0, 0, 0.25));
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
+    sans-serif;
   font-size: 13px;
 }
 
@@ -432,9 +371,7 @@
   vertical-align: text-bottom;
   background-color: var(--menu-text, rgb(24, 24, 26));
   mask-size: contain;
-  -webkit-mask-size: contain;
   mask-repeat: no-repeat;
-  -webkit-mask-repeat: no-repeat;
 }
 
 /* Stats styles */
@@ -505,14 +442,7 @@
   box-shadow: none;
 }
 .deck-widget-popup-content button.deck-widget-popup-close-button .deck-widget-icon {
-  mask-image: var(
-    --icon-close,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 -120 120 120" fill="black"><path d="m32-25-7-7 28-28-28-28 7-7 28 28 28-28 7 7-28 28 28 28-7 7-28-28-28 28Z"/></svg>')
-  );
-  -webkit-mask-image: var(
-    --icon-close,
-    url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 -120 120 120" fill="black"><path d="m32-25-7-7 28-28-28-28 7-7 28 28 28-28 7 7-28 28 28 28-7 7-28-28-28 28Z"/></svg>')
-  );
+  mask-image: var(--icon-close, svg-load("icons/close.svg"));
 }
 
 /** Range input */
@@ -599,10 +529,10 @@
   right: 0;
 }
 .deck-widget-range--vertical .deck-widget-range__button--start .deck-widget-icon {
-  mask-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 -960 960 960" fill="black"><path d="M480-528 296-344l-56-56 240-240 240 240-56 56-184-184Z"/></svg>');
+  mask-image: svg-load("icons/chevron-up.svg");
 }
 .deck-widget-range--vertical .deck-widget-range__button--end .deck-widget-icon {
-  mask-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 -960 960 960" fill="black"><path d="M480-344 240-584l56-56 184 184 184-184 56 56-240 240Z"/></svg>');
+  mask-image: svg-load("icons/chevron-down.svg");
 }
 .deck-widget-range--horizontal .deck-widget-range__track {
   height: var(--range-track-size, 16px);
@@ -623,10 +553,10 @@
   bottom: 0;
 }
 .deck-widget-range--horizontal .deck-widget-range__button--start .deck-widget-icon {
-  mask-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 -960 960 960" fill="black"><path d="M560-240 320-480l240-240 56 56-184 184 184 184-56 56Z"/></svg>');
+  mask-image: svg-load("icons/chevron-left.svg");
 }
 .deck-widget-range--horizontal .deck-widget-range__button--end .deck-widget-icon {
-  mask-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 -960 960 960" fill="black"><path d="M504-480 320-664l56-56 240 240-240 240-56-56 184-184Z"/></svg>');
+  mask-image: svg-load("icons/chevron-right.svg");
 }
 
 /** Scrollbar */
@@ -637,20 +567,20 @@
   top: var(--range-step-button-size, 24px);
   height: calc(100% - var(--range-step-button-size, 24px) * 2);
 }
-.deck-widget-scrollbar[data-placement$=-left] .deck-widget-range--vertical {
+.deck-widget-scrollbar[data-placement$='-left'] .deck-widget-range--vertical {
   left: 0;
 }
-.deck-widget-scrollbar[data-placement$=-right] .deck-widget-range--vertical {
+.deck-widget-scrollbar[data-placement$='-right'] .deck-widget-range--vertical {
   right: 0;
 }
 .deck-widget-scrollbar .deck-widget-range--horizontal {
   left: var(--range-step-button-size, 24px);
   width: calc(100% - var(--range-step-button-size, 24px) * 2);
 }
-.deck-widget-scrollbar[data-placement^=top-] .deck-widget-range--horizontal {
+.deck-widget-scrollbar[data-placement^='top-'] .deck-widget-range--horizontal {
   top: 0;
 }
-.deck-widget-scrollbar[data-placement^=bottom-] .deck-widget-range--horizontal {
+.deck-widget-scrollbar[data-placement^='bottom-'] .deck-widget-range--horizontal {
   bottom: 0;
 }
 
@@ -697,3 +627,26 @@
   margin-top: -1px;
   cursor: row-resize;
 }
+
+/* Tooltip */
+.deck-widget-tooltip-trigger {
+  display: contents;
+}
+
+.deck-widget-tooltip {
+  z-index: var(--tooltip-z-index, 1000);
+  pointer-events: none;
+  width: max-content;
+  max-width: var(--tooltip-max-width, 240px);
+  padding: 4px 8px;
+  border-radius: calc(var(--button-corner-radius, 8px) - 2px);
+  box-shadow: var(--menu-shadow, 0px 0px 8px 0px rgba(0, 0, 0, 0.25));
+  background: var(--menu-background, #fff);
+  backdrop-filter: var(--menu-backdrop-filter, unset);
+  color: var(--menu-text, rgb(24, 24, 26));
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+  font-size: 12px;
+  line-height: 1.4;
+  overflow-wrap: anywhere;
+  white-space: normal;
+}

package/src/theme-widget.tsx

@@ -17,10 +17,14 @@ export type ThemeWidgetProps = WidgetProps & {
   viewId?: string | null;
   /** Tooltip message when dark mode is selected. */
   lightModeLabel?: string;
+  /** Custom tooltip content when dark mode is selected. Overrides lightModeLabel for tooltip display. */
+  lightModeTooltip?: string | HTMLElement | false;
   /** Styles for light mode theme */
   lightModeTheme?: DeckWidgetTheme;
   /** Tooltip message when light mode is selected. */
   darkModeLabel?: string;
+  /** Custom tooltip content when light mode is selected. Overrides darkModeLabel for tooltip display. */
+  darkModeTooltip?: string | HTMLElement | false;
   /** Styles for dark mode theme */
   darkModeTheme?: DeckWidgetTheme;
   /** Initial theme mode for uncontrolled usage. 'auto' reads the browser default setting */
@@ -45,8 +49,10 @@ export class ThemeWidget extends Widget<ThemeWidgetProps> {
     placement: 'top-left',
     viewId: null,
     lightModeLabel: 'Light Mode',
+    lightModeTooltip: undefined!,
     lightModeTheme: LightGlassTheme,
     darkModeLabel: 'Dark Mode',
+    darkModeTooltip: undefined!,
     darkModeTheme: DarkGlassTheme,
     initialThemeMode: 'auto',
     themeMode: undefined!,
@@ -72,7 +78,7 @@ export class ThemeWidget extends Widget<ThemeWidgetProps> {
   }
 
   onRenderHTML(rootElement: HTMLElement): void {
-    const {lightModeLabel, darkModeLabel} = this.props;
+    const {lightModeLabel, darkModeLabel, lightModeTooltip, darkModeTooltip} = this.props;
     const currentMode = this.getThemeMode();
     this._applyTheme(currentMode, rootElement);
 
@@ -80,6 +86,7 @@ export class ThemeWidget extends Widget<ThemeWidgetProps> {
       <IconButton
         onClick={this._handleClick.bind(this)}
         label={currentMode === 'dark' ? darkModeLabel : lightModeLabel}
+        tooltip={currentMode === 'dark' ? darkModeTooltip : lightModeTooltip}
         className={currentMode === 'dark' ? 'deck-widget-moon' : 'deck-widget-sun'}
       />,
       rootElement

package/src/themes.ts

@@ -10,6 +10,7 @@ export type DeckWidgetTheme = {
   '--widget-margin'?: string;
   // button and button group
   '--button-size'?: string;
+  '--icon-size'?: string;
   '--button-corner-radius'?: string;
   '--button-background'?: string;
   '--button-stroke'?: string;
@@ -42,6 +43,7 @@ export type DeckWidgetTheme = {
 export const LightTheme = {
   '--widget-margin': '12px',
   '--button-size': '28px',
+  '--icon-size': '75%',
   '--button-corner-radius': '8px',
   '--button-background': '#fff',
   '--button-stroke': 'rgba(255, 255, 255, 0.3)',
@@ -71,6 +73,7 @@ export const LightTheme = {
 export const DarkTheme = {
   '--widget-margin': '12px',
   '--button-size': '28px',
+  '--icon-size': '75%',
   '--button-corner-radius': '8px',
   '--button-background': 'rgba(18, 18, 20, 1)',
   '--button-stroke': 'rgba(18, 18, 20, 0.30)',
@@ -100,6 +103,7 @@ export const DarkTheme = {
 export const LightGlassTheme = {
   '--widget-margin': '12px',
   '--button-size': '28px',
+  '--icon-size': '75%',
   '--button-corner-radius': '8px',
   '--button-background': 'rgba(255, 255, 255, 0.6)',
   '--button-stroke': 'rgba(255, 255, 255, 0.3)',
@@ -130,6 +134,7 @@ export const LightGlassTheme = {
 export const DarkGlassTheme = {
   '--widget-margin': '12px',
   '--button-size': '28px',
+  '--icon-size': '75%',
   '--button-corner-radius': '8px',
   '--button-background': 'rgba(18, 18, 20, 0.75)',
   '--button-stroke': 'rgba(18, 18, 20, 0.30)',

package/src/timeline-widget.tsx

@@ -56,6 +56,10 @@ export type TimelineWidgetProps = WidgetProps & {
   onPlayingChange?: (playing: boolean) => void;
   /** Callback to get label from time value */
   formatLabel?: (value: number) => string;
+  /** Custom tooltip content. Overrides label for tooltip display. */
+  playTooltip?: string | HTMLElement | false;
+  /** Custom tooltip content. Overrides label for tooltip display. */
+  pauseTooltip?: string | HTMLElement | false;
 };
 
 export class TimelineWidget extends Widget<TimelineWidgetProps> {
@@ -101,7 +105,9 @@ export class TimelineWidget extends Widget<TimelineWidgetProps> {
     playInterval: 1000,
     playing: undefined!,
     onPlayingChange: () => {},
-    formatLabel: String
+    formatLabel: String,
+    playTooltip: undefined!,
+    pauseTooltip: undefined!
   };
 
   constructor(props: TimelineWidgetProps = {}) {
@@ -151,7 +157,7 @@ export class TimelineWidget extends Widget<TimelineWidgetProps> {
   }
 
   onRenderHTML(rootElement: HTMLElement): void {
-    const {timeRange, step, formatLabel} = this.props;
+    const {timeRange, step, formatLabel, playTooltip, pauseTooltip} = this.props;
     const isPlaying = this.getPlaying();
     const currentTime = this.getTime();
 
@@ -162,12 +168,14 @@ export class TimelineWidget extends Widget<TimelineWidgetProps> {
         {isPlaying ? (
           <IconButton
             label="Pause"
+            tooltip={pauseTooltip}
             className="deck-widget-timeline-pause"
             onClick={this.handlePlayPause}
           />
         ) : (
           <IconButton
             label="Play"
+            tooltip={playTooltip}
             className="deck-widget-timeline-play"
             onClick={this.handlePlayPause}
           />

package/src/toggle-widget.tsx

@@ -20,8 +20,12 @@ export type ToggleWidgetProps = WidgetProps & {
   onIcon?: string;
   /** Tooltip label */
   label?: string;
+  /** Custom tooltip content. Overrides label for tooltip display. */
+  tooltip?: string | HTMLElement | false;
   /** Tooltip label when it is checked */
   onLabel?: string;
+  /** Custom tooltip content when checked. Overrides onLabel for tooltip display. */
+  onTooltip?: string | HTMLElement | false;
   /** Icon color, a CSS Color string */
   color?: string;
   /** Icon color when it is checked, a CSS Color string */
@@ -43,7 +47,9 @@ export class ToggleWidget extends Widget<ToggleWidgetProps> {
     icon: '',
     onIcon: undefined!,
     label: '',
+    tooltip: undefined!,
     onLabel: undefined!,
+    onTooltip: undefined!,
     color: '',
     onColor: undefined!,
     onChange: undefined!
@@ -71,9 +77,11 @@ export class ToggleWidget extends Widget<ToggleWidgetProps> {
       style,
       icon,
       label,
+      tooltip,
       color,
       onIcon = icon,
       onLabel = label,
+      onTooltip,
       onColor = color
     } = this.props;
     const on = this.checked;
@@ -86,6 +94,7 @@ export class ToggleWidget extends Widget<ToggleWidgetProps> {
         style={style as JSX.CSSProperties}
         icon={on ? onIcon : icon}
         label={on ? onLabel : label}
+        tooltip={on ? onTooltip : tooltip}
         color={on ? onColor : color}
         onClick={this._toggle}
       />,