@mhmo91/schmancy 0.10.34 → 0.10.36

package/src/boat/boat.ts

@@ -1,15 +1,14 @@
 import { SchmancyElement } from '@mixins/index'
-import { css, html, nothing, type PropertyValues } from 'lit'
+import { html, type PropertyValues } from 'lit'
 import { customElement, property, queryAssignedElements, state } from 'lit/decorators.js'
 import { classMap } from 'lit/directives/class-map.js'
 import { createRef, ref } from 'lit/directives/ref.js'
 import { styleMap } from 'lit/directives/style-map.js'
-import { when } from 'lit/directives/when.js'
-import { filter, finalize, fromEvent, map, merge, type Subscription, switchMap, takeUntil, tap } from 'rxjs'
-import { SPRING_SMOOTH } from '../utils/animation.js'
+import { exhaustMap, filter, finalize, fromEvent, merge, type Subscription, takeUntil, tap } from 'rxjs'
 import { reducedMotion$ } from '../directives/reduced-motion'
 import { show } from '../overlay/overlay.service'
 import { theme } from '../theme/theme.service.js'
+import { SPRING_SMOOTH } from '../utils/animation.js'
 
 const DRAG_THRESHOLD = 5
 const POSITION_STORAGE_KEY_PREFIX = 'schmancy-boat-'
@@ -21,42 +20,51 @@ interface Position {
 }
 
 /**
- * Material-3 extended FAB that delegates its expanded panel to the `show()`
- * overlay service. Collapsed: a draggable, corner-anchored pill (icon + label,
- * circular when no label). Activated: the default-slot content blooms from the
- * FAB as an overlay (backdrop / Esc / back-button / sheet-on-narrow handled by
- * the overlay primitive).
+ * Corner-anchored launcher that delegates its expanded panel to the `show()`
+ * overlay service.
+ *
+ * Three slots, three non-overlapping intents — no element-type sniffing,
+ * ever:
+ *
+ *   - `trigger`  — pure consumer content. A native click anywhere on it
+ *     opens the panel; interactive children (buttons, FABs, inputs) work
+ *     with zero special-casing because the boat never calls
+ *     `preventDefault` / `stopPropagation` / `setPointerCapture` here.
+ *   - `drag-handle` — opt-in. Pointer-drag is wired ONLY to this slot's
+ *     boat-owned wrapper. Slot it to make the boat draggable; omit it and
+ *     the boat is static at its corner. (A no-move tap on the handle also
+ *     opens, so the grip doubles as a launcher.)
+ *   - _(default)_ — the panel body; parked hidden while collapsed,
+ *     relocated into the `show()` overlay on open.
+ *
+ * The boat owns drag, corner-snapping, position persistence and the glass
+ * surface — never the collapsed shape.
  */
 @customElement('schmancy-boat')
 export default class SchmancyBoat extends SchmancyElement {
-	static styles = [css`
-		:host {
-			display: contents;
-		}
-		:host([hidden]) {
-			display: none !important;
-		}
-	`]
 
+
+	/** Identity for localStorage drag-position persistence. */
 	@property({ type: String }) id: string = 'default'
-	@property({ type: String }) icon?: string
-	@property({ type: String }) label?: string
-	/** When true, uses a lower elevation shadow on the FAB. */
-	@property({ type: Boolean, reflect: true }) lowered: boolean = false
-	/** Corner the FAB is anchored to. */
+	/** Corner the launcher is anchored to. */
 	@property({ type: String }) corner: Corner = 'bottom-right'
 	/** Open state. Bind `?open=${…}` to drive the overlay; reflected to the attribute. */
 	@property({ type: Boolean, reflect: true }) open: boolean = false
 
 	@state() private isDragging = false
-	@state() private _currentCorner: Corner = 'bottom-right'
+	@state() private currentCorner: Corner = 'bottom-right'
+	@state() private hasHandle = false
 
-	@queryAssignedElements() private _slotted!: Element[]
+	/** Default-slot nodes — the overlay body. */
+	@queryAssignedElements() private slotted!: Element[]
+	/** Slotted drag-handle nodes — presence toggles draggability. */
+	@queryAssignedElements({ slot: 'drag-handle' }) private handleNodes!: Element[]
 
-	private _position: Position = { x: 16, y: 16 }
-	private _containerRef = createRef<HTMLElement>()
-	private _headerRef = createRef<HTMLElement>()
-	private _currentAnimation?: Animation
+	private position: Position = { x: 16, y: 16 }
+	private containerRef = createRef<HTMLElement>()
+	private triggerRef = createRef<HTMLElement>()
+	private handleRef = createRef<HTMLElement>()
+	private currentAnimation?: Animation
 
 	#ready = false
 	#sub?: Subscription
@@ -66,76 +74,76 @@ export default class SchmancyBoat extends SchmancyElement {
 	// POSITION MANAGEMENT
 	// ============================================
 
-	private _applyContainerPosition() {
-		const container = this._containerRef.value
+	private applyContainerPosition() {
+		const container = this.containerRef.value
 		if (!container) return
 		container.style.removeProperty('left')
 		container.style.removeProperty('right')
 		container.style.removeProperty('top')
 		container.style.removeProperty('bottom')
-		const { x, y } = this._position
-		if (this._currentCorner.includes('right')) {
+		const { x, y } = this.position
+		if (this.currentCorner.includes('right')) {
 			container.style.right = `${x}px`
 		} else {
 			container.style.left = `${x}px`
 		}
-		if (this._currentCorner.includes('bottom')) {
+		if (this.currentCorner.includes('bottom')) {
 			container.style.bottom = `${y + theme.bottomOffset}px`
 		} else {
 			container.style.top = `${y}px`
 		}
 	}
 
-	private _loadPosition() {
+	private loadPosition() {
 		try {
 			const saved = localStorage.getItem(POSITION_STORAGE_KEY_PREFIX + this.id)
 			if (saved) {
 				const parsed = JSON.parse(saved) as { x: number; y: number; anchor: Corner }
-				this._position = { x: parsed.x, y: parsed.y }
-				this._currentCorner = parsed.anchor
+				this.position = { x: parsed.x, y: parsed.y }
+				this.currentCorner = parsed.anchor
 			}
 		} catch {
 			// ignore localStorage errors
 		}
 	}
 
-	private _savePosition() {
+	private savePosition() {
 		try {
 			localStorage.setItem(
 				POSITION_STORAGE_KEY_PREFIX + this.id,
-				JSON.stringify({ ...this._position, anchor: this._currentCorner }),
+				JSON.stringify({ ...this.position, anchor: this.currentCorner }),
 			)
 		} catch {
 			// ignore localStorage errors
 		}
 	}
 
-	private _validateBounds() {
-		const container = this._containerRef.value
+	private validateBounds() {
+		const container = this.containerRef.value
 		if (!container) return
 		const rect = container.getBoundingClientRect()
 		if (rect.width === 0) return
 		const vw = window.innerWidth
 		const vh = window.innerHeight
-		const isRight = this._currentCorner.includes('right')
-		const isBottom = this._currentCorner.includes('bottom')
-		const actualLeft = isRight ? vw - this._position.x - rect.width : this._position.x
-		const actualTop = isBottom ? vh - this._position.y - rect.height : this._position.y
+		const isRight = this.currentCorner.includes('right')
+		const isBottom = this.currentCorner.includes('bottom')
+		const actualLeft = isRight ? vw - this.position.x - rect.width : this.position.x
+		const actualTop = isBottom ? vh - this.position.y - rect.height : this.position.y
 		const newLeft = Math.max(0, Math.min(actualLeft, vw - rect.width))
 		const newTop = Math.max(0, Math.min(actualTop, vh - rect.height))
-		this._position = {
+		this.position = {
 			x: isRight ? vw - newLeft - rect.width : newLeft,
 			y: isBottom ? vh - newTop - rect.height : newTop,
 		}
-		this._applyContainerPosition()
+		this.applyContainerPosition()
 	}
 
 	// ============================================
 	// CORNER SNAPPING (FLIP)
 	// ============================================
 
-	private _reorientToNearestCorner(): void {
-		const container = this._containerRef.value
+	private reorientToNearestCorner(): void {
+		const container = this.containerRef.value
 		if (!container) return
 
 		const rect = container.getBoundingClientRect()
@@ -143,12 +151,12 @@ export default class SchmancyBoat extends SchmancyElement {
 		const fabCenterY = rect.top + rect.height / 2
 		const side = fabCenterX > window.innerWidth / 2 ? 'right' : 'left'
 		const vert = fabCenterY > window.innerHeight / 2 ? 'bottom' : 'top'
-		this._currentCorner = `${vert}-${side}` as Corner
-		this._position = { x: 16, y: 16 }
-		this._applyContainerPosition()
+		this.currentCorner = `${vert}-${side}` as Corner
+		this.position = { x: 16, y: 16 }
+		this.applyContainerPosition()
 
 		if (reducedMotion$.value) {
-			this._savePosition()
+			this.savePosition()
 			return
 		}
 
@@ -157,7 +165,7 @@ export default class SchmancyBoat extends SchmancyElement {
 		const dy = rect.top - newRect.top
 		container.style.transform = `translate(${dx}px, ${dy}px)`
 
-		this._currentAnimation?.cancel()
+		this.currentAnimation?.cancel()
 		const anim = container.animate(
 			[{ transform: container.style.transform }, { transform: 'translate(0,0)' }],
 			{
@@ -166,103 +174,25 @@ export default class SchmancyBoat extends SchmancyElement {
 				fill: 'forwards',
 			},
 		)
-		this._currentAnimation = anim
+		this.currentAnimation = anim
 		anim.finished.then(() => {
 			if (container.isConnected) container.style.transform = ''
 			return
 		})
 
-		this._savePosition()
-	}
-
-	// ============================================
-	// DRAG PIPELINE
-	// ============================================
-
-	private _setupDrag() {
-		const header = this._headerRef.value
-		const container = this._containerRef.value
-		if (!header || !container) return
-
-		let didDrag = false
-
-		fromEvent<PointerEvent>(header, 'pointerdown')
-			.pipe(
-				filter(e => e.button === 0),
-				tap(e => {
-					e.preventDefault()
-					e.stopPropagation()
-					header.setPointerCapture(e.pointerId)
-				}),
-				map(e => {
-					const rect = container.getBoundingClientRect()
-					didDrag = false
-					return {
-						pointerId: e.pointerId,
-						startX: e.clientX,
-						startY: e.clientY,
-						offsetX: e.clientX - rect.left,
-						offsetY: e.clientY - rect.top,
-						rect,
-					}
-				}),
-				switchMap(({ pointerId, startX, startY, offsetX, offsetY, rect }) => {
-					const sameId = (e: PointerEvent) => e.pointerId === pointerId
-					const move$ = fromEvent<PointerEvent>(window, 'pointermove').pipe(filter(sameId))
-					const end$ = merge(
-						fromEvent<PointerEvent>(window, 'pointerup'),
-						fromEvent<PointerEvent>(window, 'pointercancel'),
-					).pipe(filter(sameId))
-
-					return move$.pipe(
-						tap(({ clientX, clientY }) => {
-							const dx = clientX - startX
-							const dy = clientY - startY
-							if (Math.sqrt(dx * dx + dy * dy) > DRAG_THRESHOLD && !didDrag) {
-								didDrag = true
-								this.isDragging = true
-							}
-							if (!didDrag) return
-
-							const vw = window.innerWidth
-							const vh = window.innerHeight
-							const left = Math.max(0, Math.min(clientX - offsetX, vw - rect.width))
-							const top = Math.max(0, Math.min(clientY - offsetY, vh - rect.height))
-							this._position = {
-								x: this._currentCorner.includes('right') ? vw - left - rect.width : left,
-								y: this._currentCorner.includes('bottom') ? vh - top - rect.height : top,
-							}
-							this._applyContainerPosition()
-						}),
-						takeUntil(end$),
-						finalize(() => {
-							if (didDrag) {
-								this._reorientToNearestCorner()
-								this.isDragging = false
-								didDrag = false
-							} else {
-								this.isDragging = false
-								didDrag = false
-								this.toggle()
-							}
-						}),
-					)
-				}),
-				takeUntil(this.disconnecting),
-			)
-			.subscribe()
+		this.savePosition()
 	}
 
 	// ============================================
 	// OVERLAY DELEGATION
 	// ============================================
 
-	private _openOverlay() {
+	private openOverlay() {
 		if (this.#sub) return
-		const anchor = this._containerRef.value
+		const anchor = this.containerRef.value
 		const wrapper = document.createElement('div')
 		wrapper.className = 'flex flex-col'
-		this.#captured = [...this._slotted]
+		this.#captured = [...this.slotted]
 		this.#captured.forEach(node => wrapper.appendChild(node))
 
 		this.#sub = show(wrapper, {
@@ -271,7 +201,7 @@ export default class SchmancyBoat extends SchmancyElement {
 			historyStrategy: 'silent',
 		})
 			.pipe(
-				finalize(() => this._restoreSlotted()),
+				finalize(() => this.restoreSlotted()),
 				takeUntil(this.disconnecting),
 			)
 			.subscribe()
@@ -279,7 +209,7 @@ export default class SchmancyBoat extends SchmancyElement {
 		this.dispatchScopedEvent('toggle', 'open')
 	}
 
-	private _restoreSlotted() {
+	private restoreSlotted() {
 		this.#captured.forEach(node => this.appendChild(node))
 		this.#captured = []
 		this.#sub = undefined
@@ -294,35 +224,115 @@ export default class SchmancyBoat extends SchmancyElement {
 	connectedCallback() {
 		super.connectedCallback()
 
-		fromEvent(window, 'resize')
+		// One concern: keep the container in place when the environment
+		// shifts. Viewport resize re-validates bounds; a theme bottom-offset
+		// change (e.g. a snackbar pushing the safe area) re-applies position.
+		merge(
+			fromEvent(window, 'resize').pipe(tap(() => this.validateBounds())),
+			theme.bottomOffset$.pipe(tap(() => this.applyContainerPosition())),
+		)
 			.pipe(takeUntil(this.disconnecting))
-			.subscribe(() => this._validateBounds())
-
-		theme.bottomOffset$.pipe(
-			tap(() => this._applyContainerPosition()),
-			takeUntil(this.disconnecting),
-		).subscribe()
+			.subscribe()
 	}
 
 	firstUpdated() {
-		this._currentCorner = this.corner
-		this._loadPosition()
-		if (!this._containerRef.value) return
-		this._applyContainerPosition()
-		this._setupDrag()
+		this.currentCorner = this.corner
+		this.hasHandle = this.handleNodes.length > 0
+		this.loadPosition()
+		const container = this.containerRef.value
+		const trigger = this.triggerRef.value
+		const handle = this.handleRef.value
+		if (!container || !trigger || !handle) return
+		this.applyContainerPosition()
+
+		// Three intents, three sources, one pipeline, one subscribe.
+		//
+		// open$  — a plain click/Enter/Space on the trigger region. No
+		//          preventDefault/stopPropagation: a slotted button's own
+		//          click still fires; it merely also bubbles to "open".
+		// drag$  — pointerdown on the boat-owned drag-handle wrapper. A
+		//          dedicated region, so every pointerdown there is a drag
+		//          intent — no element-type sniffing. A session ends on
+		//          pointerup/cancel; settle = move past threshold ? snap to
+		//          the nearest corner : treat as a tap and open.
+		merge(
+			fromEvent<MouseEvent>(trigger, 'click').pipe(tap(() => this.toggle())),
+			fromEvent<KeyboardEvent>(trigger, 'keydown').pipe(
+				filter(e => e.key === 'Enter' || e.key === ' '),
+				tap(e => {
+					e.preventDefault()
+					this.toggle()
+				}),
+			),
+			fromEvent<PointerEvent>(handle, 'pointerdown').pipe(
+				filter(e => e.button === 0),
+				tap(e => {
+					e.preventDefault()
+					// Capture can throw InvalidStateError if the pointer is
+					// already released (fast tap) — drag still works without it.
+					try {
+						handle.setPointerCapture(e.pointerId)
+					} catch {
+						// no active pointer to capture; ignore
+					}
+				}),
+				exhaustMap(down => {
+					const rect = container.getBoundingClientRect()
+					const offsetX = down.clientX - rect.left
+					const offsetY = down.clientY - rect.top
+					let moved = false
+					const sameId = (e: PointerEvent) => e.pointerId === down.pointerId
+					const end$ = merge(
+						fromEvent<PointerEvent>(window, 'pointerup'),
+						fromEvent<PointerEvent>(window, 'pointercancel'),
+					).pipe(filter(sameId))
+
+					return fromEvent<PointerEvent>(window, 'pointermove').pipe(
+						filter(sameId),
+						tap(e => {
+							const dx = e.clientX - down.clientX
+							const dy = e.clientY - down.clientY
+							if (!moved && Math.sqrt(dx * dx + dy * dy) > DRAG_THRESHOLD) {
+								moved = true
+								this.isDragging = true
+							}
+							if (!moved) return
+							const vw = window.innerWidth
+							const vh = window.innerHeight
+							const left = Math.max(0, Math.min(e.clientX - offsetX, vw - rect.width))
+							const top = Math.max(0, Math.min(e.clientY - offsetY, vh - rect.height))
+							this.position = {
+								x: this.currentCorner.includes('right') ? vw - left - rect.width : left,
+								y: this.currentCorner.includes('bottom') ? vh - top - rect.height : top,
+							}
+							this.applyContainerPosition()
+						}),
+						takeUntil(end$),
+						finalize(() => {
+							if (moved) this.reorientToNearestCorner()
+							else this.toggle()
+							this.isDragging = false
+						}),
+					)
+				}),
+			),
+		)
+			.pipe(takeUntil(this.disconnecting))
+			.subscribe()
+
 		this.#ready = true
-		if (this.open) this._openOverlay()
+		if (this.open) this.openOverlay()
 	}
 
 	protected willUpdate(changed: PropertyValues<this>) {
 		if (!this.#ready || !changed.has('open')) return
-		if (this.open && !this.#sub) this._openOverlay()
+		if (this.open && !this.#sub) this.openOverlay()
 		else if (!this.open && this.#sub) this.#sub.unsubscribe()
 	}
 
 	disconnectedCallback() {
 		super.disconnectedCallback()
-		this._currentAnimation?.cancel()
+		this.currentAnimation?.cancel()
 		this.#sub?.unsubscribe()
 	}
 
@@ -339,11 +349,13 @@ export default class SchmancyBoat extends SchmancyElement {
 	// RENDER
 	// ============================================
 
+	private onHandleSlotChange = () => {
+		this.hasHandle = this.handleNodes.length > 0
+	}
+
 	protected render(): unknown {
 		const containerClasses = classMap({
 			'inline-flex': true,
-			'rounded-full': true,
-			'overflow-hidden': true,
 			'transition-opacity': true,
 			'duration-200': true,
 			'opacity-85': this.isDragging,
@@ -355,53 +367,47 @@ export default class SchmancyBoat extends SchmancyElement {
 			'pointer-events': 'auto',
 		})
 
-		const fabClasses = classMap({
-			'h-14': true,
-			'rounded-full': true,
+		// Boat-owned drag region — wraps ONLY the drag-handle slot, so every
+		// pointerdown inside it is unambiguously a drag intent. Hidden (and
+		// out of layout) when the consumer slots no handle: the boat is then
+		// simply not draggable.
+		const handleClasses = classMap({
 			flex: true,
 			'items-center': true,
-			'gap-3': true,
-			'select-none': true,
 			'touch-none': true,
+			'select-none': true,
+			hidden: !this.hasHandle,
 			'cursor-grabbing': this.isDragging,
-			'cursor-pointer': !this.isDragging,
-			'px-5': !!this.label,
-			'w-14': !this.label,
-			'justify-center': !this.label,
+			'cursor-grab': !this.isDragging,
 		})
 
 		return html`
 			<schmancy-surface
-				${ref(this._containerRef)}
+				${ref(this.containerRef)}
 				type="glass"
-				.elevation=${this.lowered ? 1 : 3}
-				class=${containerClasses}
+				rounded="all"
+				.elevation=${3}
+				class="${containerClasses} overflow-hidden rounded-2xl"
 				style=${containerStyles}
 				aria-expanded=${this.open}
 			>
 				<div
-					${ref(this._headerRef)}
-					class=${fabClasses}
+					${ref(this.handleRef)}
+					class=${handleClasses}
+					aria-label="Drag to move"
+				>
+					<slot name="drag-handle" @slotchange=${this.onHandleSlotChange}></slot>
+				</div>
+
+				<div
+					${ref(this.triggerRef)}
+					class="flex items-center cursor-pointer"
 					role="button"
 					tabindex="0"
-					aria-label=${this.label ?? 'Open panel'}
-					title="Drag to move · click to open"
+					aria-label="Open panel"
+					title="Click to open"
 				>
-					<slot name="header">
-						${when(
-							!!this.icon,
-							() => html`<schmancy-icon>${this.icon}</schmancy-icon>`,
-							() => nothing,
-						)}
-					</slot>
-					${when(
-						!!this.label,
-						() => html`<schmancy-typography type="label" token="lg" class="whitespace-nowrap">
-							${this.label}
-						</schmancy-typography>`,
-						() => nothing,
-					)}
-					<slot name="summary"></slot>
+					<slot name="trigger"></slot>
 				</div>
 
 				<!-- Default-slot content parks here (hidden) while collapsed;

package/src/button/icon-button.ts

@@ -116,44 +116,32 @@ export class SchmnacyIconButton extends SchmancyElement {
 	@property({ type: String })
 	public icon?: string
 
-	// Reactively captured icon name from slot content (translation-proof)
+	// Reactively captured icon name from slot content (translation-proof).
+	// Mirrors <schmancy-icon>: a MutationObserver on the light DOM keeps this
+	// in sync no matter how the consumer passes the name — a plain text node,
+	// a dynamic ${...} binding (Lit mutates the text node's data in place, so
+	// no slotchange ever fires), or a nested <schmancy-icon> element.
+	// `textContent` flattens through all three.
 	@state()
 	private _capturedIcon?: string
 
+	private _observer?: MutationObserver
+
 	connectedCallback(): void {
 		super.connectedCallback()
-		// Pre-capture icon from children to avoid double render flash
-		this._captureIconFromChildren()
+		this._captureIcon()
+		this._observer = new MutationObserver(() => this._captureIcon())
+		this._observer.observe(this, { childList: true, characterData: true, subtree: true })
 	}
 
-	// Capture icon from direct children (for initial render)
-	private _captureIconFromChildren(): void {
-		if (this.icon || this.text) return
-		for (const node of this.childNodes) {
-			if (node.nodeType === Node.TEXT_NODE) {
-				const text = node.textContent?.trim()
-				if (text) {
-					this._capturedIcon = text
-					return
-				}
-			}
-		}
+	disconnectedCallback(): void {
+		super.disconnectedCallback()
+		this._observer?.disconnect()
 	}
 
-	// Handle slot content changes reactively (for dynamic updates)
-	private _handleSlotChange(e: Event): void {
+	private _captureIcon(): void {
 		if (this.icon || this.text) return
-		const slot = e.target as HTMLSlotElement
-		const nodes = slot.assignedNodes({ flatten: true })
-		for (const node of nodes) {
-			if (node.nodeType === Node.TEXT_NODE) {
-				const text = node.textContent?.trim()
-				if (text) {
-					this._capturedIcon = text
-					return
-				}
-			}
-		}
+		this._capturedIcon = this.textContent?.trim() || undefined
 	}
 
 	// Manage aria-label manually so that we can always use our internal property.
@@ -254,7 +242,7 @@ export class SchmnacyIconButton extends SchmancyElement {
 					${this.text
 						? html`<slot></slot>`
 						: html`
-							<slot style="display:none" @slotchange=${this._handleSlotChange}></slot>
+							<slot style="display:none"></slot>
 							<schmancy-icon class=${iconSizeClass}>${this.icon || this._capturedIcon}</schmancy-icon>
 						`
 					}
@@ -277,7 +265,7 @@ export class SchmnacyIconButton extends SchmancyElement {
 				${this.text
 					? html`<slot></slot>`
 					: html`
-						<slot style="display:none" @slotchange=${this._handleSlotChange}></slot>
+						<slot style="display:none"></slot>
 						<schmancy-icon class=${iconSizeClass}>${this.icon || this._capturedIcon}</schmancy-icon>
 					`
 				}