@noxlovette/material 0.1.18 → 0.1.20

package/dist/actions/index.d.ts

@@ -1,4 +1,5 @@
 export * from './clickOutside.js';
 export * from './floating.js';
 export * from './keyboard.js';
+export * from './portal.js';
 export * from './positionFloating.js';

package/dist/actions/index.js

@@ -1,4 +1,5 @@
 export * from './clickOutside.js';
 export * from './floating.js';
 export * from './keyboard.js';
+export * from './portal.js';
 export * from './positionFloating.js';

package/dist/actions/portal.d.ts

@@ -0,0 +1,3 @@
+export declare function portal(node: HTMLElement, target?: HTMLElement): {
+    destroy(): void;
+};

package/dist/actions/portal.js

@@ -0,0 +1,8 @@
+export function portal(node, target = document.body) {
+    target.appendChild(node);
+    return {
+        destroy() {
+            node.remove();
+        }
+    };
+}

package/dist/components/buttons/FAB.svelte

@@ -14,7 +14,6 @@ Floating action buttons (FABs) help people take primary actions.
   import { fab } from './theme.js';
   import type { FABProps } from './types.js';
   import FABMenu from './FABMenu.svelte';
-  import ButtonIcon from './ButtonIcon.svelte';
   import { Layer, Icon } from '../../utils/index.js';
   import { clickOutside } from '../../actions/index.js';
   import { Button, type ButtonRootProps } from 'bits-ui';
@@ -34,9 +33,19 @@ Floating action buttons (FABs) help people take primary actions.
   }: FABProps = $props();
 
   const { base, icon, label: labelClass } = $derived(fab({ size, config, expanded }));
-  const btnCls = $derived(base({ class: clsx(className) }));
 
   let showMenu = $state(false);
+  let wrapperEl = $state<HTMLElement | null>(null);
+
+  const btnCls = $derived(
+    base({
+      class: clsx(
+        className,
+        'transition-[border-radius] duration-300',
+        withMenu && showMenu && '!rounded-full'
+      )
+    })
+  );
 
   function handleClick(e: MouseEvent) {
     if (disabled) {
@@ -45,24 +54,12 @@ Floating action buttons (FABs) help people take primary actions.
     }
     if (withMenu) {
       e.preventDefault();
-      showMenu = true;
+      showMenu = !showMenu;
     }
   }
 </script>
 
-{#if withMenu && showMenu}
-  <div class="relative z-50" use:clickOutside={() => (showMenu = false)}>
-    <FABMenu>
-      {@render children?.()}
-    </FABMenu>
-    <ButtonIcon
-      variant="filled"
-      class="shadow-elevation-3"
-      iconProps={{ name: 'close' }}
-      onclick={() => (showMenu = !showMenu)}
-    />
-  </div>
-{:else}
+<div class="contents" bind:this={wrapperEl} use:clickOutside={() => (showMenu = false)}>
   <Button.Root
     {disabled}
     {formaction}
@@ -71,12 +68,18 @@ Floating action buttons (FABs) help people take primary actions.
     data-cy="m3-fab"
     {...restProps as ButtonRootProps}
   >
-    <Icon {...iconProps} class={icon()} />
+    <Icon {...withMenu && showMenu ? { name: 'close' } : iconProps} class={icon()} />
     <Layer />
-    {#if expanded}
+    {#if expanded && !(withMenu && showMenu)}
       <p class={labelClass()}>
         {label}
       </p>
     {/if}
   </Button.Root>
-{/if}
+
+  {#if withMenu && showMenu && wrapperEl?.firstElementChild}
+    <FABMenu anchorEl={wrapperEl.firstElementChild as HTMLElement}>
+      {@render children?.()}
+    </FABMenu>
+  {/if}
+</div>

package/dist/components/buttons/FABMenu.svelte

@@ -5,76 +5,31 @@ Should be used with `FABMenuItem` as children.
 -->
 <script lang="ts">
   import clsx from 'clsx';
+  import { flip } from '@floating-ui/dom';
   import { fabMenu } from './theme.js';
   import type { FABMenuProps } from './types.js';
   import { enterExit } from '../../animation/enterExit.js';
-  import { easeEmphasizedDecel } from '../../animation/easing.js';
+  import { easeEmphasizedAccel, easeEmphasizedDecel } from '../../animation/easing.js';
+  import { floating, portal } from '../../actions/index.js';
 
-  let { children, class: className, position = 'top', ...restProps }: FABMenuProps = $props();
+  let { children, class: className, anchorEl, ...restProps }: FABMenuProps = $props();
 
-  const { base } = $derived(fabMenu({ position }));
-
-  const margin = 8;
-  const gap = 8;
-  let coords = $state({
-    x: 0,
-    y: 0,
-    originX: 'left',
-    originY: 'top',
-    maxHeight: 0
-  });
-
-  // TODO: out:enterExit={{ duration: 200, easing: easeEmphasizedAccel, mode: 'scale' }} – if you can solve how to eliminate another button from appearing here, use this too
+  const { base } = fabMenu();
 </script>
 
 <ul
   data-cy="m3-fab-menu"
   {...restProps}
-  class={base({
-    class: clsx(className, 'fab-menu overflow-y-auto')
-  })}
+  class={base({ class: clsx(className, 'fab-menu overflow-y-auto') })}
   in:enterExit={{ duration: 300, easing: easeEmphasizedDecel, mode: 'scale' }}
-  style:translate={`${coords.x}px ${coords.y}px`}
-  style:max-height={coords.maxHeight ? `${coords.maxHeight}px` : undefined}
-  style:--enter-exit-origin={`${coords.originY} ${coords.originX}`}
-  {@attach (menu) => {
-    const rect = menu.getBoundingClientRect();
-    const anchorRect = menu.parentElement?.getBoundingClientRect();
-    if (!anchorRect) return;
-
-    const spaceAbove = anchorRect.top - gap - margin;
-    const spaceBelow = window.innerHeight - margin - (anchorRect.bottom + gap);
-    const placeAbove = spaceAbove >= rect.height || spaceAbove >= Math.max(0, spaceBelow);
-
-    let maxHeight = placeAbove ? spaceAbove : spaceBelow;
-    maxHeight = Math.max(0, Math.min(rect.height, maxHeight));
-
-    const targetTop = placeAbove ? anchorRect.top - gap - maxHeight : anchorRect.bottom + gap;
-
-    let targetLeft = anchorRect.right - rect.width;
-
-    if (targetLeft + rect.width > window.innerWidth - margin) {
-      targetLeft = window.innerWidth - margin - rect.width;
-    }
-    if (targetLeft < margin) {
-      targetLeft = margin;
-    }
-
-    let clampedTop = targetTop;
-    if (clampedTop < margin) {
-      clampedTop = margin;
-    }
-    if (clampedTop + maxHeight > window.innerHeight - margin) {
-      clampedTop = window.innerHeight - margin - maxHeight;
-    }
-
-    const x = targetLeft - rect.left;
-    const y = clampedTop - rect.top;
-    const originY = placeAbove ? 'bottom' : 'top';
-    const originX =
-      anchorRect.left + anchorRect.width / 2 < targetLeft + rect.width / 2 ? 'left' : 'right';
-
-    coords = { x, y, originX, originY, maxHeight };
+  out:enterExit={{ duration: 200, easing: easeEmphasizedAccel, mode: 'scale' }}
+  use:portal
+  use:floating={{
+    reference: anchorEl,
+    strategy: 'fixed',
+    placement: 'top-end',
+    offsetPx: 8,
+    middleware: [flip()]
   }}
 >
   {@render children()}
@@ -82,6 +37,6 @@ Should be used with `FABMenuItem` as children.
 
 <style>
   .fab-menu {
-    transform-origin: var(--enter-exit-origin, bottom right);
+    transform-origin: bottom right;
   }
 </style>

package/dist/components/buttons/Toggle.svelte

@@ -27,8 +27,6 @@ Uses Material 3 selection button styling.
 
   const { base, icon } = $derived(
     button({
-      variant: 'filled',
-      color: 'default',
       usage: 'selection',
       shape,
       size,

package/dist/components/buttons/theme.d.ts

@@ -491,22 +491,28 @@ export declare const fab: import("tailwind-variants").TVReturnType<{
     label: string;
 }, undefined, unknown, unknown, undefined>>;
 export declare const fabMenu: import("tailwind-variants").TVReturnType<{
-    position: {
-        top: string;
+    [key: string]: {
+        [key: string]: import("tailwind-merge").ClassNameValue | {
+            base?: import("tailwind-merge").ClassNameValue;
+        };
     };
-}, {
+} | {
+    [x: string]: {
+        [x: string]: import("tailwind-merge").ClassNameValue | {
+            base?: import("tailwind-merge").ClassNameValue;
+        };
+    };
+} | {}, {
     base: string;
 }, undefined, {
-    position: {
-        top: string;
+    [key: string]: {
+        [key: string]: import("tailwind-merge").ClassNameValue | {
+            base?: import("tailwind-merge").ClassNameValue;
+        };
     };
-}, {
+} | {}, {
     base: string;
-}, import("tailwind-variants").TVReturnType<{
-    position: {
-        top: string;
-    };
-}, {
+}, import("tailwind-variants").TVReturnType<unknown, {
     base: string;
 }, undefined, unknown, unknown, undefined>>;
 export declare const fabMenuItem: import("tailwind-variants").TVReturnType<{

package/dist/components/buttons/theme.js

@@ -66,7 +66,7 @@ export const button = tv({
         {
             usage: 'selection',
             selected: false,
-            class: { base: 'bg-md-sys-color-surface-container' }
+            class: { base: 'bg-md-sys-color-surface-container-high text-md-sys-color-on-surface-variant' }
         },
         {
             variant: 'text',
@@ -275,7 +275,7 @@ export const buttonIcon = tv({
         {
             variation: 'toggle',
             selected: false,
-            class: { base: 'bg-md-sys-color-surface-container' }
+            class: { base: 'bg-md-sys-color-surface-container-high text-md-sys-color-on-surface-variant' }
         },
         {
             variant: 'text',
@@ -474,10 +474,7 @@ export const fab = tv({
 });
 export const fabMenu = tv({
     slots: {
-        base: 'gap-2 pb-2 flex flex-col absolute z-[100] overflow-visible p-1'
-    },
-    variants: {
-        position: { top: 'top-16' }
+        base: 'gap-2 pb-2 flex flex-col z-[9999] overflow-visible p-1'
     }
 });
 export const fabMenuItem = tv({

package/dist/components/buttons/types.d.ts

@@ -1,7 +1,7 @@
 import type { AnchorButtonAttributes, IconProps } from '../../utils/index.js';
 import type { Snippet } from 'svelte';
 import type { HTMLAnchorAttributes, HTMLAttributes, HTMLButtonAttributes } from 'svelte/elements';
-import type { ButtonGroupVariants, ButtonIconVariants, ButtonMDVariants, FABMenuItemVariants, FABMenuVariants, FABVariants } from './theme.js';
+import type { ButtonGroupVariants, ButtonIconVariants, ButtonMDVariants, FABMenuItemVariants, FABVariants } from './theme.js';
 export interface ButtonGroupProps extends ButtonGroupVariants, HTMLAttributes<HTMLDivElement> {
     /**
      * The content of the button group.
@@ -157,11 +157,9 @@ export type FABProps = FABVariants & AnchorButtonAttributes & {
      */
     children?: Snippet;
 };
-export type FABMenuProps = FABMenuVariants & HTMLAttributes<HTMLUListElement> & {
-    /**
-     * The vertical position of the menu relative to the anchor.
-     */
-    position?: FABMenuVariants['position'];
+export type FABMenuProps = HTMLAttributes<HTMLUListElement> & {
+    /** The FAB button element to position the menu relative to. */
+    anchorEl: HTMLElement;
     /**
      * The menu items. Use `FABMenuItem` components.
      */

package/dist/components/containers/context-menu/ContextMenu.svelte

@@ -26,7 +26,6 @@ Context menus appear on right-click and provide actions related to the clicked e
   import Divider from '../divider/Divider.svelte';
   import { enterExit } from '../../../animation/enterExit.js';
   import { easeEmphasizedDecel } from '../../../animation/easing.js';
-  import clsx from 'clsx';
 
   let {
     items = [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noxlovette/material",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "type": "module",
   "license": "MIT",
   "repository": {