@furystack/shades-common-components 3.6.0 → 3.6.1

package/dist/components/paper.js.map

@@ -1 +1 @@
-{"version":3,"file":"paper.js","sourceRoot":"","sources":["../../src/components/paper.tsx"],"names":[],"mappings":";;;AACA,8CAA0D;AAC1D,+EAAyE;AAE5D,QAAA,KAAK,GAAG,IAAA,cAAK,EAA6D;IACrF,aAAa,EAAE,aAAa;IAC5B,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;QACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,CAAC,6CAAoB,CAAC,CAAA;QAChE,OAAO;YACL,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACzC,CAAC;gBAAC,OAAO,CAAC,UAA6B,CAAC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,CACnF;gBAAC,OAAO,CAAC,UAA6B,CAAC,KAAK,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,SAAS,CAAA;YACrG,CAAC,CAAC;SACH,CAAA;IACH,CAAC;IACD,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QACxC,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,CAAC,6CAAoB,CAAC,CAAA;QAChE,OAAO,CACL,0CACM,KAAK,EACT,KAAK,EAAE;gBACL,YAAY,EAAE,KAAK;gBACnB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,SAAS,MAAM,KAAK,CAAC,SAAS,oBAAoB,CAAC,CAAC,CAAC,EAAE;gBACjG,eAAe,EAAE,aAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,KAAK;gBAChE,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,SAAS;gBACpD,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,UAAU;gBACnB,GAAG,KAAK,EAAE,KAAK;aAChB,IAEA,QAAQ,CACL,CACP,CAAA;IACH,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"paper.js","sourceRoot":"","sources":["../../src/components/paper.tsx"],"names":[],"mappings":";;;AACA,8CAA0D;AAC1D,+EAAyE;AAE5D,QAAA,KAAK,GAAG,IAAA,cAAK,EAA6D;IACrF,aAAa,EAAE,aAAa;IAE5B,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QACxC,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,CAAC,6CAAoB,CAAC,CAAA;QAChE,OAAO,CACL,0CACM,KAAK,EACT,KAAK,EAAE;gBACL,YAAY,EAAE,KAAK;gBACnB,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,SAAS,MAAM,KAAK,CAAC,SAAS,oBAAoB,CAAC,CAAC,CAAC,EAAE;gBACjG,eAAe,EAAE,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK;gBACrD,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS;gBACzC,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,UAAU;gBACnB,GAAG,KAAK,EAAE,KAAK;aAChB,IAEA,QAAQ,CACL,CACP,CAAA;IACH,CAAC;CACF,CAAC,CAAA"}

package/dist/components/tabs.js

@@ -7,7 +7,7 @@ const promisify_animation_1 = require("../utils/promisify-animation");
 exports.Tabs = (0, shades_1.Shade)({
     shadowDomName: 'shade-tabs',
     getInitialState: ({ props }) => ({ activeIndex: props.activeTab || 0 }),
-    constructed: ({ injector, updateState, element }) => {
+    constructed: ({ injector, updateState }) => {
         const subscriptions = [
             injector.getInstance(shades_1.LocationService).onLocationChanged.subscribe(() => {
                 const { hash } = location;
@@ -16,20 +16,12 @@ exports.Tabs = (0, shades_1.Shade)({
                     page && updateState({ activeIndex: page });
                 }
             }, true),
-            injector.getInstance(services_1.ThemeProviderService).theme.subscribe((t) => {
-                const headers = element.querySelectorAll('.shade-tabs-headers');
-                headers.forEach((header) => {
-                    const isActive = header.classList.contains('active');
-                    header.style.backgroundColor = isActive ? t.background.paper : t.background.default;
-                    header.style.color = isActive ? t.text.primary : t.text.secondary;
-                });
-            }),
         ];
         return () => subscriptions.forEach((s) => s.dispose());
     },
     render: ({ props, getState, updateState, injector }) => {
         const themeProvider = injector.getInstance(services_1.ThemeProviderService);
-        const theme = themeProvider.theme.getValue();
+        const { theme } = themeProvider;
         return ((0, shades_1.createComponent)("div", { style: { width: '100%', height: '100%', display: 'flex', flexDirection: 'column', ...props.containerStyle } },
             (0, shades_1.createComponent)("div", { className: "shade-tabs-header-container", style: { display: 'inline-flex', borderRadius: '5px 5px 0 0', overflow: 'hidden', flexShrink: '0' } }, props.tabs.map((tab, index) => {
                 const isActive = index === getState().activeIndex;

package/dist/components/tabs.js.map

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

package/dist/services/default-variable-theme.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useThemeCssVariables = exports.getCssVariable = exports.setCssVariable = exports.defaultVariableTheme = void 0;
+exports.defaultVariableTheme = {
+    text: {
+        primary: 'var(--shades-theme-text-primary)',
+        secondary: 'var(--shades-theme-text-secondary)',
+        disabled: 'var(--shades-theme-text-disabled)',
+    },
+    button: {
+        active: 'var(--shades-theme-button-active)',
+        hover: 'var(--shades-theme-button-hover)',
+        selected: 'var(--shades-theme-button-selected)',
+        disabled: 'var(--shades-theme-button-disabled)',
+        disabledBackground: 'var(--shades-theme-button-disabled-background)',
+    },
+    background: {
+        default: 'var(--shades-theme-background-default)',
+        paper: 'var(--shades-theme-background-paper)',
+    },
+    palette: {
+        primary: {
+            light: 'var(--shades-theme-palette-primary-light)',
+            main: 'var(--shades-theme-palette-primary-main)',
+            dark: 'var(--shades-theme-palette-primary-dark)',
+        },
+        secondary: {
+            light: 'var(--shades-theme-palette-secondary-light)',
+            main: 'var(--shades-theme-palette-secondary-main)',
+            dark: 'var(--shades-theme-palette-secondary-dark)',
+        },
+        error: {
+            light: 'var(--shades-theme-palette-error-light)',
+            main: 'var(--shades-theme-palette-error-main)',
+            dark: 'var(--shades-theme-palette-error-dark)',
+        },
+        warning: {
+            light: 'var(--shades-theme-palette-warning-light)',
+            main: 'var(--shades-theme-palette-warning-main)',
+            dark: 'var(--shades-theme-palette-warning-dark)',
+        },
+        info: {
+            light: 'var(--shades-theme-palette-info-light)',
+            main: 'var(--shades-theme-palette-info-main)',
+            dark: 'var(--shades-theme-palette-info-dark)',
+        },
+        success: {
+            light: 'var(--shades-theme-palette-success-light)',
+            main: 'var(--shades-theme-palette-success-main)',
+            dark: 'var(--shades-theme-palette-success-dark)',
+        },
+    },
+    divider: 'var(--shades-theme-divider)',
+};
+const setCssVariable = (key, value, root) => {
+    root.style.setProperty(key.replace('var(', '').replace(')', ''), value);
+};
+exports.setCssVariable = setCssVariable;
+const getCssVariable = (key, root = document.querySelector(':root')) => {
+    return getComputedStyle(root).getPropertyValue(key.replace('var(', '').replace(')', ''));
+};
+exports.getCssVariable = getCssVariable;
+const assignValue = (target, source, root, assignFn = exports.setCssVariable) => {
+    const keys = Object.keys(target);
+    keys.forEach((key) => {
+        if (typeof source[key] === 'object' && typeof target[key] === 'object') {
+            assignValue(target[key], source[key], root);
+            return;
+        }
+        else {
+            assignFn(target[key], source[key], root);
+        }
+    });
+};
+const useThemeCssVariables = (theme) => {
+    const root = document.querySelector(':root');
+    assignValue(exports.defaultVariableTheme, theme, root);
+};
+exports.useThemeCssVariables = useThemeCssVariables;
+//# sourceMappingURL=default-variable-theme.js.map

package/dist/services/default-variable-theme.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"default-variable-theme.js","sourceRoot":"","sources":["../../src/services/default-variable-theme.ts"],"names":[],"mappings":"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"}

package/dist/services/index.js

@@ -21,4 +21,5 @@ __exportStar(require("./default-dark-theme"), exports);
 __exportStar(require("./default-light-theme"), exports);
 __exportStar(require("./default-palette"), exports);
 __exportStar(require("./noty-service"), exports);
+__exportStar(require("./default-variable-theme"), exports);
 //# sourceMappingURL=index.js.map

package/dist/services/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAoC;AACpC,uDAAoC;AACpC,2DAAwC;AACxC,uDAAoC;AACpC,wDAAqC;AACrC,oDAAiC;AACjC,iDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAoC;AACpC,uDAAoC;AACpC,2DAAwC;AACxC,uDAAoC;AACpC,wDAAqC;AACrC,oDAAiC;AACjC,iDAA8B;AAC9B,2DAAwC"}

package/dist/services/theme-provider-service.js

@@ -8,8 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ThemeProviderService = exports.RgbColor = void 0;
 const inject_1 = require("@furystack/inject");
-const utils_1 = require("@furystack/utils");
-const default_dark_theme_1 = require("./default-dark-theme");
+const default_variable_theme_1 = require("./default-variable-theme");
 class RgbColor {
     constructor(r, g, b, a = 1) {
         this.r = r;
@@ -31,10 +30,10 @@ exports.RgbColor = RgbColor;
  */
 let ThemeProviderService = class ThemeProviderService {
     constructor() {
-        this.theme = new utils_1.ObservableValue(default_dark_theme_1.defaultDarkTheme);
+        this.theme = default_variable_theme_1.defaultVariableTheme;
     }
     /**
-     *
+     * @deprecated does not respect CSS vars
      * @param color The background color
      * @param bright The Bright color
      * @param dark The Dark color
@@ -51,6 +50,9 @@ let ThemeProviderService = class ThemeProviderService {
      * @returns The parsed R,G,B, A values
      */
     getRgbFromColorString(color) {
+        if (color.startsWith('var(--')) {
+            return this.getRgbFromColorString((0, default_variable_theme_1.getCssVariable)(color));
+        }
         if (color.startsWith('#')) {
             if (color.length === 7) {
                 const r = parseInt(color.substr(1, 2), 16);
@@ -71,13 +73,13 @@ let ThemeProviderService = class ThemeProviderService {
                 return new RgbColor(parseInt(result.groups.red, 10), parseInt(result.groups.green, 10), parseInt(result.groups.blue, 10), parseInt(result.groups.alpha, 10));
             }
         }
-        throw Error(`Color format '${color} is not supported.'`);
+        throw Error(`Color format '${color}' is not supported.'`);
     }
     set(change) {
-        this.theme.setValue((0, utils_1.deepMerge)(this.theme.getValue(), change));
+        (0, default_variable_theme_1.useThemeCssVariables)(change);
     }
     dispose() {
-        this.theme.dispose();
+        /** */
     }
 };
 ThemeProviderService = __decorate([

package/dist/services/theme-provider-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"theme-provider-service.js","sourceRoot":"","sources":["../../src/services/theme-provider-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"theme-provider-service.js","sourceRoot":"","sources":["../../src/services/theme-provider-service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@furystack/shades-common-components",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "",
   "keywords": [
     "FuryStack",
@@ -23,7 +23,7 @@
   "dependencies": {
     "@furystack/core": "^11.2.2",
     "@furystack/inject": "^7.1.4",
-    "@furystack/shades": "^6.1.4",
+    "@furystack/shades": "^6.1.5",
     "@furystack/utils": "^3.1.4",
     "path-to-regexp": "^6.2.1",
     "semaphore-async-await": "^1.5.1"

package/src/components/app-bar-link.tsx

@@ -3,24 +3,20 @@ import { createComponent, LocationService, RouteLink, Shade } from '@furystack/s
 import { match } from 'path-to-regexp'
 import { ThemeProviderService } from '../services'
 
-export const AppBarLink = Shade<RouteLinkProps, { isActive: boolean }>({
-  getInitialState: () => ({ isActive: false }),
-  resources: ({ injector, props, updateState, element, getState }) => {
-    const updateColor = () => {
-      const { isActive } = getState()
+export const AppBarLink = Shade<RouteLinkProps>({
+  resources: ({ injector, props, element }) => {
+    const updateColor = (isActive: boolean) => {
       const themeProviderService = injector.getInstance(ThemeProviderService)
-      const theme = themeProviderService.theme.getValue()
+      const { theme } = themeProviderService
       const el = element.querySelector('a') as HTMLElement
-      const backgroundColor = isActive ? theme.button.active : 'rgba(128, 128, 128, 0.05)'
-
-      el.style.backgroundColor = backgroundColor
-      el.style.color = themeProviderService.getTextColor(backgroundColor)
+      el.style.color = isActive ? theme.text.primary : theme.text.secondary
+      el.style.opacity = isActive ? '1' : '0.8'
+      el.style.transform = isActive ? 'scale(1)' : 'scale(0.9)'
     }
     return [
       injector.getInstance(LocationService).onLocationChanged.subscribe(async (currentUrl) => {
         const isActive = !!match(props.href as string)(currentUrl)
-        updateState({ isActive }, false)
-        updateColor()
+        updateColor(isActive)
       }, true),
     ]
   },
@@ -34,6 +30,7 @@ export const AppBarLink = Shade<RouteLinkProps, { isActive: boolean }>({
           textDecoration: 'none',
           alignItems: 'center',
           padding: '0 8px',
+          transition: 'color .2s ease-in-out, transform .2s ease-in-out',
           ...props.style,
         }}
         {...props}

package/src/components/app-bar.tsx

@@ -3,11 +3,6 @@ import { ThemeProviderService } from '../services/theme-provider-service'
 
 export const AppBar = Shade({
   shadowDomName: 'shade-app-bar',
-  resources: ({ element, injector }) => [
-    injector.getInstance(ThemeProviderService).theme.subscribe((t) => {
-      ;(element.children[0] as HTMLElement).style.color = t.text.secondary
-    }, true), // TODO: Check TRUE
-  ],
   constructed: ({ element }) => {
     const container = element.children[0] as HTMLElement
     requestAnimationFrame(() => {
@@ -15,7 +10,8 @@ export const AppBar = Shade({
       container.style.opacity = '1'
     })
   },
-  render: ({ children }) => {
+  render: ({ children, injector }) => {
+    const { theme } = injector.getInstance(ThemeProviderService)
     return (
       <div
         style={{
@@ -31,6 +27,7 @@ export const AppBar = Shade({
           opacity: '0',
           position: 'fixed',
           zIndex: '1',
+          color: theme.text.secondary,
         }}
       >
         {children}

package/src/components/button.tsx

@@ -3,6 +3,7 @@ import { Shade, createComponent } from '@furystack/shades'
 import { promisifyAnimation } from '../utils/promisify-animation'
 import type { Palette, Theme } from '../services/theme-provider-service'
 import { ThemeProviderService } from '../services/theme-provider-service'
+import { Trace } from '@furystack/utils'
 
 export type ButtonProps = PartialElement<HTMLButtonElement> & {
   variant?: 'contained' | 'outlined'
@@ -65,13 +66,7 @@ const getHoveredTextColor = (buttonProps: ButtonProps, theme: Theme, fallback: (
       : theme.text.primary
     : fallback()
 
-export const Button = Shade<ButtonProps, { theme: Theme }>({
-  getInitialState: ({ injector }) => ({
-    theme: injector.getInstance(ThemeProviderService).theme.getValue(),
-  }),
-  resources: ({ injector, updateState }) => [
-    injector.getInstance(ThemeProviderService).theme.subscribe((theme) => updateState({ theme })),
-  ],
+export const Button = Shade<ButtonProps>({
   constructed: ({ element }) => {
     /**
      * @param this The Document instance
@@ -99,11 +94,30 @@ export const Button = Shade<ButtonProps, { theme: Theme }>({
     }
   },
   shadowDomName: 'shade-button',
-  render: ({ props, children, getState, injector, element }) => {
+  resources: ({ injector, element, props }) => {
+    const tp = injector.getInstance(ThemeProviderService)
+    return [
+      ...(props.variant === 'contained'
+        ? [
+            Trace.method({
+              object: tp,
+              method: tp.set,
+              onFinished: () => {
+                const el = element.firstElementChild as HTMLButtonElement
+                el.style.color = getTextColor(props, tp.theme, () =>
+                  tp.getTextColor(el.style.background || el.style.backgroundColor),
+                )
+              },
+            }),
+          ]
+        : []),
+    ]
+  },
+  render: ({ props, children, injector, element }) => {
     const mouseDownHandler = props.onmousedown
     const mouseUpHandler = props.onmouseup
-    const { theme } = getState()
     const themeProvider = injector.getInstance(ThemeProviderService)
+    const { theme } = themeProvider
     const background = getBackground(props, theme)
 
     const hoveredBackground = getHoveredBackground(props, theme, () => {
@@ -114,8 +128,9 @@ export const Button = Shade<ButtonProps, { theme: Theme }>({
     })
     const boxShadow = getBoxShadow(props, theme)
     const hoveredBoxShadow = getHoveredBoxShadow(props, theme)
-    const textColor = getTextColor(props, theme, () => themeProvider.getTextColor(background))
-    const hoveredTextColor = getHoveredTextColor(props, theme, () => themeProvider.getTextColor(background))
+    const getTextColorInner = () => getTextColor(props, theme, () => themeProvider.getTextColor(background))
+    const getHoveredTextColorInner = () =>
+      getHoveredTextColor(props, theme, () => themeProvider.getTextColor(background))
 
     const tryAnimate = async (
       keyframes: PropertyIndexedKeyframes | Keyframe[] | null,
@@ -143,29 +158,27 @@ export const Button = Shade<ButtonProps, { theme: Theme }>({
           mouseUpHandler?.call(this, ev)
         }}
         onmouseenter={() => {
-          {
-            tryAnimate(
-              [
-                {
-                  background,
-                  boxShadow,
-                  color: textColor,
-                },
-                {
-                  background: hoveredBackground,
-                  boxShadow: hoveredBoxShadow,
-                  color: hoveredTextColor,
-                },
-              ],
-              { duration: 500, fill: 'forwards', easing: 'cubic-bezier(0.215, 0.610, 0.355, 1.000)' },
-            )
-          }
+          tryAnimate(
+            [
+              {
+                background,
+                boxShadow,
+                color: getTextColorInner(),
+              },
+              {
+                background: hoveredBackground,
+                boxShadow: hoveredBoxShadow,
+                color: getHoveredTextColorInner(),
+              },
+            ],
+            { duration: 500, fill: 'forwards', easing: 'cubic-bezier(0.215, 0.610, 0.355, 1.000)' },
+          )
         }}
         onmouseout={() => {
           tryAnimate(
             [
-              { background: hoveredBackground, boxShadow: hoveredBoxShadow, color: hoveredTextColor },
-              { background, boxShadow, color: textColor },
+              { background: hoveredBackground, boxShadow: hoveredBoxShadow, color: getHoveredTextColorInner() },
+              { background, boxShadow, color: getTextColorInner() },
             ],
             {
               duration: 500,
@@ -184,7 +197,7 @@ export const Button = Shade<ButtonProps, { theme: Theme }>({
           border: 'none',
           borderRadius: '4px',
           textTransform: 'uppercase',
-          color: textColor,
+          color: getTextColorInner(),
           filter: 'drop-shadow(1px 1px 10px rgba(0,0,0,.5))',
           backdropFilter: props.variant === 'outlined' ? 'blur(35px)' : undefined,
           userSelect: 'none',

package/src/components/command-palette/command-palette-suggestion-list.tsx

@@ -75,7 +75,7 @@ export const CommandPaletteSuggestionList = Shade<
           maxHeight: `${window.innerHeight * 0.8}px`,
           zIndex: '1',
           left: 'auto',
-          backgroundColor: injector.getInstance(ThemeProviderService).theme.getValue().background.paper,
+          backgroundColor: injector.getInstance(ThemeProviderService).theme.background.paper,
           boxShadow: '3px 3px 5px rgba(0,0,0,0.3)',
           width: `calc(${Math.round(element.parentElement?.getBoundingClientRect().width || 200)}px - 3em)`,
           ...(props.fullScreenSuggestions ? { left: '0', width: 'calc(100% - 42px)' } : {}),

package/src/components/data-grid/data-grid.tsx

@@ -72,17 +72,8 @@ export const DataGrid: <T>(props: DataGridProps<T>, children: ChildrenList) => J
   DataGridProps<any>
 >({
   shadowDomName: 'shade-data-grid',
-  resources: ({ injector, element, props }) => {
-    const tp = injector.getInstance(ThemeProviderService)
+  resources: ({ element, props }) => {
     return [
-      tp.theme.subscribe((t) => {
-        const headers = element.querySelectorAll('th')
-        const { r, g, b } = tp.getRgbFromColorString(t.background.paper)
-        headers.forEach((header) => {
-          header.style.color = t.text.secondary
-          header.style.backgroundColor = `rgba(${r}, ${g}, ${b}, 0.3)`
-        })
-      }),
       new ClickAwayService(element, () => {
         props.service.hasFocus.setValue(false)
       }),
@@ -95,12 +86,10 @@ export const DataGrid: <T>(props: DataGridProps<T>, children: ChildrenList) => J
   },
   render: ({ props, injector }) => {
     const tp = injector.getInstance(ThemeProviderService)
-    const theme = tp.theme.getValue()
+    const { theme } = tp
 
-    const { r, g, b } = tp.getRgbFromColorString(theme.background.paper)
     const headerStyle: Partial<CSSStyleDeclaration> = {
-      backgroundColor: `rgba(${r}, ${g}, ${b}, 0.3)`,
-      backdropFilter: 'blur(10px)',
+      backdropFilter: 'blur(12px)',
       padding: '12px 0',
       color: theme.text.secondary,
       alignItems: 'center',

package/src/components/data-grid/footer.tsx

@@ -9,16 +9,8 @@ export const DataGridFooter = Shade<{ service: CollectionService<any> }, { data:
   getInitialState: ({ props }) => ({
     data: props.service.data.getValue(),
   }),
-  constructed: ({ props, updateState, injector, element }) => {
-    const disposables = [
-      props.service.data.subscribe((data) => updateState({ data })),
-
-      injector.getInstance(ThemeProviderService).theme.subscribe((t) => {
-        const el = element.querySelector('div') as HTMLDivElement
-        el.style.color = t.text.secondary
-        el.style.background = t.background.paper
-      }),
-    ]
+  constructed: ({ props, updateState }) => {
+    const disposables = [props.service.data.subscribe((data) => updateState({ data }))]
 
     return () => disposables.forEach((d) => d.dispose())
   },
@@ -27,7 +19,7 @@ export const DataGridFooter = Shade<{ service: CollectionService<any> }, { data:
     const currentQuerySettings = props.service.querySettings.getValue()
     const currentPage = Math.ceil(currentQuerySettings.skip || 0) / (currentQuerySettings.top || 1)
     const currentEntriesPerPage = currentQuerySettings.top || Infinity
-    const theme = injector.getInstance(ThemeProviderService).theme.getValue()
+    const { theme } = injector.getInstance(ThemeProviderService)
 
     return (
       <div

package/src/components/grid.tsx

@@ -25,17 +25,8 @@ export type RowCells<T> = {
 
 export const Grid: <T>(props: GridProps<T>, children: ChildrenList) => JSX.Element<any, any> = Shade({
   shadowDomName: 'shade-grid',
-  resources: ({ injector, element }) => [
-    injector.getInstance(ThemeProviderService).theme.subscribe((t) => {
-      const headers = element.querySelectorAll('th')
-      headers.forEach((header) => {
-        header.style.color = t.text.secondary
-        header.style.background = t.background.paper
-      })
-    }),
-  ],
   render: ({ props, injector }) => {
-    const theme = injector.getInstance(ThemeProviderService).theme.getValue()
+    const { theme } = injector.getInstance(ThemeProviderService)
     const headerStyle: Partial<CSSStyleDeclaration> = {
       padding: '0 0.51em',
       backgroundColor: theme.background.paper,

package/src/components/inputs/input.tsx

@@ -1,7 +1,7 @@
 import type { PartialElement } from '@furystack/shades'
 import { Shade, createComponent, attachStyles } from '@furystack/shades'
 import { ThemeProviderService } from '../..'
-import type { Palette, Theme } from '../../services'
+import type { Palette } from '../../services'
 
 export interface TextInputProps extends PartialElement<HTMLInputElement> {
   /**
@@ -47,7 +47,6 @@ export interface TextInputProps extends PartialElement<HTMLInputElement> {
 }
 
 export type TextInputState = {
-  theme: Theme
   value: string
   focused: boolean
   validity: ValidityState
@@ -69,12 +68,12 @@ const getLabelStyle = ({
     justifyContent: 'space-between',
     fontSize: '10px',
     color: props.disabled
-      ? state.theme.text.disabled
+      ? themeProvider.theme.text.disabled
       : state.validity?.valid === false
-      ? state.theme.palette.error.main
+      ? themeProvider.theme.palette.error.main
       : state.focused
-      ? state.theme.text.primary
-      : state.theme.text.secondary,
+      ? themeProvider.theme.text.primary
+      : themeProvider.theme.text.secondary,
     marginBottom: '1em',
     padding: '1em',
     borderRadius: '5px',
@@ -83,8 +82,8 @@ const getLabelStyle = ({
         ? themeProvider
             .getRgbFromColorString(
               state.validity?.valid === false
-                ? state.theme.palette.error.main
-                : state.theme.palette[props.defaultColor || 'primary'].main,
+                ? themeProvider.theme.palette.error.main
+                : themeProvider.theme.palette[props.defaultColor || 'primary'].main,
             )
             .update('a', state.focused ? 0.1 : 0.2)
             .toString()
@@ -93,10 +92,10 @@ const getLabelStyle = ({
       props.variant === 'outlined' || props.variant === 'contained'
         ? `0 0 0 1px ${
             state.validity?.valid === false
-              ? state.theme.palette.error.main
+              ? themeProvider.theme.palette.error.main
               : state.focused
-              ? state.theme.palette[props.defaultColor || 'primary'].main
-              : state.theme.text.primary
+              ? themeProvider.theme.palette[props.defaultColor || 'primary'].main
+              : themeProvider.theme.text.primary
           }`
         : 'none',
     filter: props.disabled ? 'grayscale(100%)' : 'none',
@@ -109,15 +108,11 @@ const getLabelStyle = ({
 
 export const Input = Shade<TextInputProps, TextInputState>({
   shadowDomName: 'shade-input',
-  getInitialState: ({ injector, props }) => ({
-    theme: injector.getInstance(ThemeProviderService).theme.getValue(),
+  getInitialState: ({ props }) => ({
     value: props.value || '',
     focused: props.autofocus || false,
     validity: { valid: true } as ValidityState,
   }),
-  resources: ({ injector, updateState }) => [
-    injector.getInstance(ThemeProviderService).theme.subscribe((theme) => updateState({ theme })),
-  ],
   compareState: ({ newState, element, props, injector }) => {
     const themeProvider = injector.getInstance(ThemeProviderService)
     const label = element.querySelector('label') as HTMLLabelElement

package/src/components/inputs/text-area.tsx

@@ -1,6 +1,5 @@
 import type { PartialElement } from '@furystack/shades'
 import { createComponent, Shade } from '@furystack/shades'
-import type { Theme } from '../../services'
 import { ThemeProviderService } from '../../services'
 import { promisifyAnimation } from '../../utils'
 
@@ -12,23 +11,18 @@ export interface TextAreaProps extends PartialElement<HTMLTextAreaElement> {
 }
 
 export type TextAreaInputState = {
-  theme: Theme
   value?: string
 }
 
 export const TextArea = Shade<TextAreaProps, TextAreaInputState>({
   shadowDomName: 'shade-text-area',
-  getInitialState: ({ injector, props }) => ({
-    theme: injector.getInstance(ThemeProviderService).theme.getValue(),
+  getInitialState: ({ props }) => ({
     value: props.value,
   }),
-  resources: ({ injector, updateState }) => {
-    const themeProvider = injector.getInstance(ThemeProviderService)
-    return [themeProvider.theme.subscribe((theme) => updateState({ theme }))]
-  },
   render: ({ props, element, injector, getState }) => {
     const themeProvider = injector.getInstance(ThemeProviderService)
-    const { theme, value } = getState()
+    const { theme } = themeProvider
+    const { value } = getState()
     const { palette } = theme
 
     return (