@furystack/shades-common-components 3.6.0 → 4.0.0

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": "4.0.0",
   "description": "",
   "keywords": [
     "FuryStack",
@@ -17,14 +17,14 @@
   "author": "gallay.lajos@gmail.com",
   "license": "GPL-2.0",
   "devDependencies": {
-    "@types/jest": "^29.2.5",
+    "@types/jest": "^29.2.6",
     "typescript": "4.9.4"
   },
   "dependencies": {
-    "@furystack/core": "^11.2.2",
-    "@furystack/inject": "^7.1.4",
-    "@furystack/shades": "^6.1.4",
-    "@furystack/utils": "^3.1.4",
+    "@furystack/core": "^11.2.3",
+    "@furystack/inject": "^7.1.5",
+    "@furystack/shades": "^7.0.0",
+    "@furystack/utils": "^3.1.5",
     "path-to-regexp": "^6.2.1",
     "semaphore-async-await": "^1.5.1"
   },

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

@@ -1,45 +1,39 @@
 import type { RouteLinkProps } from '@furystack/shades'
+import { attachProps } from '@furystack/shades'
 import { createComponent, LocationService, RouteLink, Shade } from '@furystack/shades'
 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>({
+  shadowDomName: 'shade-app-bar-link',
+  render: ({ children, props, useObservable, injector, element }) => {
+    const getAnchorStyle = (currentUrl: string) => {
+      const isActive = !!match(props.href as string)(currentUrl)
       const themeProviderService = injector.getInstance(ThemeProviderService)
-      const theme = themeProviderService.theme.getValue()
-      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)
+      const { theme } = themeProviderService
+      return {
+        display: 'flex',
+        height: '100%',
+        textDecoration: 'none',
+        alignItems: 'center',
+        padding: '0 8px',
+        transition: 'color .2s ease-in-out, transform .2s ease-in-out',
+        color: isActive ? theme.text.primary : theme.text.secondary,
+        opacity: isActive ? '1' : '0.8',
+        transform: isActive ? 'scale(1)' : 'scale(0.9)',
+        cursor: 'pointer',
+      }
     }
-    return [
-      injector.getInstance(LocationService).onLocationChanged.subscribe(async (currentUrl) => {
-        const isActive = !!match(props.href as string)(currentUrl)
-        updateState({ isActive }, false)
-        updateColor()
-      }, true),
-    ]
-  },
-  shadowDomName: 'shade-app-bar-link',
-  render: ({ children, props }) => {
-    return (
-      <RouteLink
-        style={{
-          display: 'flex',
-          height: '100%',
-          textDecoration: 'none',
-          alignItems: 'center',
-          padding: '0 8px',
-          ...props.style,
-        }}
-        {...props}
-      >
-        {children}
-      </RouteLink>
+
+    const [currentUrl] = useObservable(
+      'locationChange',
+      injector.getInstance(LocationService).onLocationPathChanged /*, (newUrl) => {
+      attachProps(element as HTMLElement, { style: getAnchorStyle(newUrl) })
+    }*/,
     )
+
+    attachProps(element as HTMLElement, { style: getAnchorStyle(currentUrl) })
+
+    return <RouteLink {...props}>{children}</RouteLink>
   },
 })

package/src/components/app-bar.tsx

@@ -1,40 +1,32 @@
-import { Shade, createComponent } from '@furystack/shades'
+import { Shade, createComponent, attachProps } from '@furystack/shades'
 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(() => {
-      // container.style.padding = '8px 8px'
-      container.style.opacity = '1'
+      element.style.opacity = '1'
     })
   },
-  render: ({ children }) => {
-    return (
-      <div
-        style={{
-          width: '100%',
-          background: 'rgba(128,128,128,0.2)',
-          backdropFilter: 'blur(15px)',
-          display: 'flex',
-          justifyContent: 'flex-start',
-          alignItems: 'center',
-          boxShadow: '0 0 12px rgba(0,0,0,0.6)',
-          transition:
-            'opacity .35s cubic-bezier(0.550, 0.085, 0.680, 0.530), padding .2s cubic-bezier(0.550, 0.085, 0.680, 0.530)',
-          opacity: '0',
-          position: 'fixed',
-          zIndex: '1',
-        }}
-      >
-        {children}
-      </div>
-    )
+  render: ({ children, injector, element }) => {
+    const { theme } = injector.getInstance(ThemeProviderService)
+    attachProps(element, {
+      style: {
+        width: '100%',
+        background: 'rgba(128,128,128,0.2)',
+        backdropFilter: 'blur(15px)',
+        display: 'flex',
+        justifyContent: 'flex-start',
+        alignItems: 'center',
+        boxShadow: '0 0 12px rgba(0,0,0,0.6)',
+        transition:
+          'opacity .35s cubic-bezier(0.550, 0.085, 0.680, 0.530), padding .2s cubic-bezier(0.550, 0.085, 0.680, 0.530)',
+        opacity: '0',
+        position: 'fixed',
+        zIndex: '1',
+        color: theme.text.secondary,
+      },
+    })
+    return <>{children}</>
   },
 })

package/src/components/avatar.tsx

@@ -1,46 +1,50 @@
 import type { PartialElement } from '@furystack/shades'
-import { Shade, createComponent } from '@furystack/shades'
+import { Shade, createComponent, attachProps } from '@furystack/shades'
 
-export type AvatarProps = { avatarUrl: string } & PartialElement<HTMLDivElement>
+export type AvatarProps = { avatarUrl: string; fallback?: JSX.Element } & PartialElement<HTMLDivElement>
 
 export const Avatar = Shade<AvatarProps>({
   shadowDomName: 'shade-avatar',
-  render: ({ props }) => {
-    const { ...divProps } = props
+  render: ({ props, element }) => {
+    const { avatarUrl, ...containerProps } = props
+
+    attachProps(element, {
+      ...containerProps,
+      style: {
+        width: '128px',
+        height: '128px',
+        overflow: 'hidden',
+        borderRadius: '50%',
+        boxShadow: '0px 0px 8px 3px rgba(128,128,128,0.2)',
+        backgroundColor: 'rgba(128,128,128,0.3)',
+        display: 'flex',
+        ...containerProps?.style,
+      },
+    })
+
     return (
-      <div
-        {...divProps}
-        style={{
-          width: '100%',
-          height: '100%',
-          overflow: 'hidden',
-          borderRadius: '50%',
-          boxShadow: '0px 0px 8px 3px rgba(128,128,128,0.2)',
-          backgroundColor: 'rgba(128,128,128,0.3)',
-          ...(props.style || {}),
+      <img
+        style={{ width: '100%', height: '100%', objectFit: 'cover', backgroundPosition: 'center' }}
+        alt={'avatar image'}
+        src={props.avatarUrl}
+        onerror={(ev) => {
+          ;((ev as Event).target as HTMLImageElement).replaceWith(
+            <div
+              style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', height: '100%', width: '100%' }}
+            >
+              <div
+                style={{
+                  textAlign: 'center',
+                  userSelect: 'none',
+                  fontSize: '32px',
+                }}
+              >
+                {props.fallback || '🛑'}
+              </div>
+            </div>,
+          )
         }}
-      >
-        <img
-          style={{ width: '100%', height: '100%' }}
-          alt={'avatar image'}
-          src={props.avatarUrl}
-          onerror={(ev) => {
-            ;((ev as Event).target as HTMLImageElement).replaceWith(
-              <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', height: '100%' }}>
-                <div
-                  style={{
-                    fontVariant: 'all-petite-caps',
-                    fontSize: '2em',
-                    height: 'calc(100% + 7px)',
-                    cursor: 'default',
-                    userSelect: 'none',
-                  }}
-                />
-              </div>,
-            )
-          }}
-        />
-      </div>
+      />
     )
   },
 })

package/src/components/button.tsx

@@ -1,8 +1,10 @@
 import type { PartialElement } from '@furystack/shades'
+import { attachProps } from '@furystack/shades'
 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,22 +67,16 @@ 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
      * @param ev The Mouse event
      */
     function mouseUp(this: Document, ev: MouseEvent) {
-      if (ev.target === element.firstElementChild) {
+      if (ev.target === element) {
         promisifyAnimation(
-          element.firstChild as Element,
+          element,
           [
             {
               filter: 'drop-shadow(1px 1px 10px rgba(0,0,0,.5))brightness(1)',
@@ -99,13 +95,28 @@ export const Button = Shade<ButtonProps, { theme: Theme }>({
     }
   },
   shadowDomName: 'shade-button',
-  render: ({ props, children, getState, injector, element }) => {
+  render: ({ props, children, injector, element, useDisposable }) => {
     const mouseDownHandler = props.onmousedown
     const mouseUpHandler = props.onmouseup
-    const { theme } = getState()
     const themeProvider = injector.getInstance(ThemeProviderService)
+    const { theme } = themeProvider
     const background = getBackground(props, theme)
 
+    if (props.variant === 'contained') {
+      useDisposable('themeChanged', () =>
+        Trace.method({
+          object: themeProvider,
+          method: themeProvider.set,
+          onFinished: () => {
+            const el = element
+            el.style.color = getTextColor(props, themeProvider.theme, () =>
+              themeProvider.getTextColor(el.style.background || el.style.backgroundColor),
+            )
+          },
+        }),
+      )
+    }
+
     const hoveredBackground = getHoveredBackground(props, theme, () => {
       const { r, g, b } = themeProvider.getRgbFromColorString(
         (props.color && theme.palette[props.color].main) || theme.text.primary,
@@ -114,85 +125,84 @@ 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,
       options?: number | KeyframeAnimationOptions | undefined,
     ) => {
-      const el = element.firstElementChild
+      const el = element
       el && promisifyAnimation(el, keyframes, options)
     }
 
-    return (
-      <button
-        onmousedown={function (ev) {
-          mouseDownHandler?.call(this, ev)
-          tryAnimate(
-            [
-              {
-                filter: 'drop-shadow(-1px -1px 3px black)brightness(0.5)',
-                transform: 'scale(0.98)',
-              },
-            ],
-            { duration: 150, fill: 'forwards', easing: 'cubic-bezier(0.230, 1.000, 0.320, 1.000)' },
-          )
-        }}
-        onmouseup={function (ev) {
-          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)' },
-            )
-          }
-        }}
-        onmouseout={() => {
-          tryAnimate(
-            [
-              { background: hoveredBackground, boxShadow: hoveredBoxShadow, color: hoveredTextColor },
-              { background, boxShadow, color: textColor },
-            ],
+    attachProps(element, {
+      ...props,
+      onmousedown(this: HTMLElement, ev: MouseEvent) {
+        mouseDownHandler?.call(this, ev)
+        tryAnimate(
+          [
+            {
+              filter: 'drop-shadow(-1px -1px 3px black)brightness(0.5)',
+              transform: 'scale(0.98)',
+            },
+          ],
+          { duration: 150, fill: 'forwards', easing: 'cubic-bezier(0.230, 1.000, 0.320, 1.000)' },
+        )
+      },
+      onmouseup(this: HTMLElement, ev: MouseEvent) {
+        mouseUpHandler?.call(this, ev)
+      },
+      onmouseenter: () => {
+        tryAnimate(
+          [
+            {
+              background,
+              boxShadow,
+              color: getTextColorInner(),
+            },
             {
-              duration: 500,
-              fill: 'forwards',
-              easing: 'cubic-bezier(0.215, 0.610, 0.355, 1.000)',
+              background: hoveredBackground,
+              boxShadow: hoveredBoxShadow,
+              color: getHoveredTextColorInner(),
             },
-          )
-        }}
-        {...props}
-        style={{
-          cursor: props.disabled ? 'not-allowed' : 'pointer',
-          background,
-          boxShadow,
-          margin: '8px',
-          padding: '6px 16px',
-          border: 'none',
-          borderRadius: '4px',
-          textTransform: 'uppercase',
-          color: textColor,
-          filter: 'drop-shadow(1px 1px 10px rgba(0,0,0,.5))',
-          backdropFilter: props.variant === 'outlined' ? 'blur(35px)' : undefined,
-          userSelect: 'none',
-          ...props.style,
-        }}
-      >
-        {children}
-      </button>
-    )
+          ],
+          { duration: 500, fill: 'forwards', easing: 'cubic-bezier(0.215, 0.610, 0.355, 1.000)' },
+        )
+      },
+      onmouseout: () => {
+        tryAnimate(
+          [
+            { background: hoveredBackground, boxShadow: hoveredBoxShadow, color: getHoveredTextColorInner() },
+            { background, boxShadow, color: getTextColorInner() },
+          ],
+          {
+            duration: 500,
+            fill: 'forwards',
+            easing: 'cubic-bezier(0.215, 0.610, 0.355, 1.000)',
+          },
+        )
+      },
+      ...props,
+      style: {
+        display: 'inline-flex',
+        cursor: props.disabled ? 'not-allowed' : 'pointer',
+        background,
+        boxShadow,
+        margin: '8px',
+        padding: '6px 16px',
+        border: 'none',
+        borderRadius: '4px',
+        textTransform: 'uppercase',
+        color: getTextColorInner(),
+        filter: 'drop-shadow(1px 1px 10px rgba(0,0,0,.5))',
+        backdropFilter: props.variant === 'outlined' ? 'blur(35px)' : undefined,
+        userSelect: 'none',
+        ...props.style,
+      },
+    })
+
+    return <>{children}</>
   },
 })

package/src/components/command-palette/command-palette-input.tsx

@@ -1,13 +1,18 @@
 import { Shade, createComponent } from '@furystack/shades'
+import { ThemeProviderService } from '../../services'
 import { promisifyAnimation } from '../../utils/promisify-animation'
 import type { CommandPaletteManager } from './command-palette-manager'
 
-export const CommandPaletteInput = Shade<{ manager: CommandPaletteManager }, { isOpened: boolean }>({
-  getInitialState: ({ props }) => ({ isOpened: props.manager.isOpened.getValue() }),
-  constructed: ({ element, props }) => {
+export const CommandPaletteInput = Shade<{ manager: CommandPaletteManager }>({
+  shadowDomName: 'shades-command-palette-input',
+  render: ({ element, props, injector, useObservable }) => {
+    const { theme } = injector.getInstance(ThemeProviderService)
     const { manager } = props
-    const subscriptions = [
-      manager.isOpened.subscribe(async (isOpened) => {
+
+    useObservable(
+      'isOpened',
+      manager.isOpened,
+      async (isOpened) => {
         const input = element.firstChild as HTMLInputElement
         if (isOpened) {
           input.value = ''
@@ -25,20 +30,17 @@ export const CommandPaletteInput = Shade<{ manager: CommandPaletteManager }, { i
           })
           input.value = ''
         }
-      }),
-    ]
-    return () => subscriptions.map((s) => s.dispose())
-  },
-  shadowDomName: 'shades-command-palette-input',
-  render: ({ element, props }) => {
-    const { manager } = props
+      },
+      true,
+    )
+
     element.style.width = manager.isOpened.getValue() ? '100%' : '0%'
     element.style.overflow = 'hidden'
     return (
       <input
         autofocus
         style={{
-          color: 'white',
+          color: theme.text.primary,
           outline: 'none',
           padding: '1em',
           background: 'transparent',