@furystack/shades-common-components 3.6.1 → 4.0.1

package/src/components/app-bar.tsx

@@ -1,37 +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',
   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, injector }) => {
+  render: ({ children, injector, element }) => {
     const { theme } = injector.getInstance(ThemeProviderService)
-    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',
-          color: theme.text.secondary,
-        }}
-      >
-        {children}
-      </div>
-    )
+    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,4 +1,5 @@
 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'
@@ -73,9 +74,9 @@ export const Button = Shade<ButtonProps>({
      * @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)',
@@ -94,32 +95,28 @@ export const Button = Shade<ButtonProps>({
     }
   },
   shadowDomName: 'shade-button',
-  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 }) => {
+  render: ({ props, children, injector, element, useDisposable }) => {
     const mouseDownHandler = props.onmousedown
     const mouseUpHandler = props.onmouseup
     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,
@@ -136,76 +133,76 @@ export const Button = Shade<ButtonProps>({
       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: 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: getHoveredTextColorInner() },
-              { background, boxShadow, color: getTextColorInner() },
-            ],
+    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(
+          [
             {
-              duration: 500,
-              fill: 'forwards',
-              easing: 'cubic-bezier(0.215, 0.610, 0.355, 1.000)',
+              background,
+              boxShadow,
+              color: getTextColorInner(),
             },
-          )
-        }}
-        {...props}
-        style={{
-          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,
-        }}
-      >
-        {children}
-      </button>
-    )
+            {
+              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: 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',

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

@@ -1,66 +1,57 @@
 import { Shade, createComponent } from '@furystack/shades'
 import { promisifyAnimation } from '../../utils/promisify-animation'
-import type { CommandPaletteSuggestionResult } from './command-provider'
 import type { CommandPaletteManager } from './command-palette-manager'
 import { ThemeProviderService } from '../../services/theme-provider-service'
 
-export const CommandPaletteSuggestionList = Shade<
-  { manager: CommandPaletteManager; fullScreenSuggestions?: boolean },
-  { suggestions: CommandPaletteSuggestionResult[] }
->({
+export const CommandPaletteSuggestionList = Shade<{ manager: CommandPaletteManager; fullScreenSuggestions?: boolean }>({
   shadowDomName: 'shade-command-palette-suggestion-list',
-  getInitialState: ({ props }) => ({
-    suggestions: props.manager.currentSuggestions.getValue(),
-  }),
-  constructed: ({ updateState, element, props }) => {
+  render: ({ element, injector, props, useObservable }) => {
     const { manager } = props
-    const subscriptions = [
-      manager.currentSuggestions.subscribe((suggestions) => {
-        updateState({ suggestions })
-      }),
-      manager.isOpened.subscribe(async (isOpened) => {
-        const container = element.firstElementChild as HTMLDivElement
-        if (isOpened) {
-          container.style.display = 'initial'
-          container.style.zIndex = '1'
-          container.style.width = `calc(${Math.round(
-            element.parentElement?.getBoundingClientRect().width || 200,
-          )}px - 3em)`
-          await promisifyAnimation(
-            container,
-            [
-              { opacity: 0, transform: 'translate(0, -50px)' },
-              { opacity: 1, transform: 'translate(0, 0)' },
-            ],
-            { fill: 'forwards', duration: 500 },
-          )
+    const { theme } = injector.getInstance(ThemeProviderService)
+
+    const [suggestions] = useObservable('suggestions', props.manager.currentSuggestions)
+    const [selectedIndex] = useObservable('selectedIndex', props.manager.selectedIndex, (idx) => {
+      ;([...element.querySelectorAll('.suggestion-item')] as HTMLDivElement[]).map((s, i) => {
+        if (i === idx) {
+          s.style.background = theme.background.paper
+          s.style.fontWeight = 'bolder'
         } else {
-          await promisifyAnimation(
-            container,
-            [
-              { opacity: 1, transform: 'translate(0, 0)' },
-              { opacity: 0, transform: 'translate(0, -50px)' },
-            ],
-            { fill: 'forwards', duration: 200 },
-          )
-          container.style.zIndex = '-1'
-          container.style.display = 'none'
+          s.style.background = theme.background.default
+          s.style.fontWeight = 'normal'
         }
-      }),
-      manager.selectedIndex.subscribe((idx) => {
-        ;[...element.querySelectorAll('.suggestion-item')].map((s, i) => {
-          if (i === idx) {
-            ;(s as HTMLDivElement).style.background = 'rgba(128,128,128,0.2)'
-          } else {
-            ;(s as HTMLDivElement).style.background = 'rgba(96,96,96,0.2)'
-          }
-        })
-      }),
-    ]
-    return () => subscriptions.map((s) => s.dispose())
-  },
-  render: ({ element, injector, getState, props }) => {
-    const { manager } = props
+      })
+    })
+
+    const [isOpenedAtRender] = useObservable('isOpenedAtRender', props.manager.isOpened, async (isOpened) => {
+      const container = element.firstElementChild as HTMLDivElement
+      if (isOpened) {
+        container.style.display = 'initial'
+        container.style.zIndex = '1'
+        container.style.width = `calc(${Math.round(
+          element.parentElement?.getBoundingClientRect().width || 200,
+        )}px - 3em)`
+        await promisifyAnimation(
+          container,
+          [
+            { opacity: 0, transform: 'translate(0, -50px)' },
+            { opacity: 1, transform: 'translate(0, 0)' },
+          ],
+          { fill: 'forwards', duration: 500 },
+        )
+      } else {
+        await promisifyAnimation(
+          container,
+          [
+            { opacity: 1, transform: 'translate(0, 0)' },
+            { opacity: 0, transform: 'translate(0, -50px)' },
+          ],
+          { fill: 'forwards', duration: 200 },
+        )
+        container.style.zIndex = '-1'
+        container.style.display = 'none'
+      }
+    })
+
     return (
       <div
         className="suggestion-items-container"
@@ -75,22 +66,23 @@ export const CommandPaletteSuggestionList = Shade<
           maxHeight: `${window.innerHeight * 0.8}px`,
           zIndex: '1',
           left: 'auto',
-          backgroundColor: injector.getInstance(ThemeProviderService).theme.background.paper,
+          backgroundColor: 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)' } : {}),
         }}
       >
-        {getState().suggestions.map((s, i) => (
+        {suggestions.map((s, i) => (
           <div
             className="suggestion-item"
             onclick={() => {
-              manager.isOpened.getValue() && manager.selectSuggestion(injector, i)
+              isOpenedAtRender && manager.selectSuggestion(injector, i)
             }}
             style={{
               padding: '1em',
               cursor: 'default',
-              background: i === manager.selectedIndex.getValue() ? 'rgba(128,128,128,0.2)' : 'transparent',
+              background: i === selectedIndex ? theme.background.paper : theme.background.default,
+              fontWeight: i === selectedIndex ? 'bolder' : 'normal',
             }}
           >
             {s.element}