@makolabs/ripple 0.0.1-dev.6 → 0.0.1-dev.60

package/dist/elements/dropdown/Dropdown.svelte

@@ -1,17 +1,17 @@
 <script lang="ts">
 	import { cn } from '../../helper/cls.js';
 	import { fly } from 'svelte/transition';
-	import { dropdownMenu, type DropdownMenuProps, type DropdownItem } from './dropdown.js';
+	import type { DropdownMenuProps, DropdownItem } from '../../index.js';
+	import { dropdownMenu } from '../../index.js';
 	import { onMount, onDestroy } from 'svelte';
-	import { Size } from '../../types/variants.js';
+	import { Size } from '../../variants.js';
+	import Portal from '../../utils/Portal.svelte';
 
 	let {
 		sections = [],
 		open: isOpen = $bindable(false),
-		label = 'Options',
+		label = '',
 		icon: Icon,
-		triggerContent,
-		triggerClass = '',
 		containerClass = '',
 		itemClass = '',
 		class: className = '',
@@ -22,9 +22,11 @@
 		header
 	}: DropdownMenuProps = $props();
 
+	// Determine if we're in icon-only mode
+	const iconOnly = $derived(!label && !!Icon);
+
 	let dropdownRef = $state<HTMLDivElement | undefined>();
 	let triggerRef = $state<HTMLDivElement | undefined>();
-	let portalEl = $state<HTMLDivElement | undefined>();
 	let triggerRect = $state<DOMRect | null>(null);
 
 	const {
@@ -41,12 +43,13 @@
 		dropdownMenu({
 			position,
 			size,
-			isOpen
+			isOpen,
+			iconOnly
 		})
 	);
 
 	const baseClass = $derived(cn(base(), className));
-	const triggerClass_ = $derived(cn(trigger(), triggerClass));
+	const triggerClass_ = $derived(cn(trigger(), ''));
 	const containerClass_ = $derived(cn(container(), width, containerClass, 'shadow-lg'));
 	const sectionClass = $derived(cn(section()));
 	const itemClass_ = $derived(cn(item(), itemClass));
@@ -87,10 +90,10 @@
 				posStyles += `left: ${right - triggerWidth}px;`;
 			}
 		} else {
-			const centeredLeft = left + (triggerWidth / 2);
-			if (centeredLeft + (dropdownWidthPx / 2) > viewportWidth - 20) {
+			const centeredLeft = left + triggerWidth / 2;
+			if (centeredLeft + dropdownWidthPx / 2 > viewportWidth - 20) {
 				posStyles += `right: 20px; left: auto;`;
-			} else if (centeredLeft - (dropdownWidthPx / 2) < 20) {
+			} else if (centeredLeft - dropdownWidthPx / 2 < 20) {
 				posStyles += `left: 20px; right: auto;`;
 			} else {
 				posStyles += `left: ${centeredLeft}px; transform: translateX(-50%);`;
@@ -108,159 +111,118 @@
 	function handleToggle() {
 		if (disabled) return;
 		isOpen = !isOpen;
-
-		if (isOpen) {
-			setTimeout(updatePosition, 0); // Use setTimeout to ensure DOM is updated
-		}
 	}
 
 	function handleClickOutside(event: MouseEvent) {
-		if (isOpen &&
+		if (
+			isOpen &&
 			dropdownRef &&
 			!dropdownRef.contains(event.target as Node) &&
 			triggerRef &&
-			!triggerRef.contains(event.target as Node)) {
+			!triggerRef.contains(event.target as Node)
+		) {
 			isOpen = false;
 		}
 	}
 
 	function handleItemClick(item: DropdownItem) {
-		if (item.disabled) return;
 		if (item.onclick) item.onclick();
 		isOpen = false;
 	}
-
-	function updatePosition() {
-		if (triggerRef) {
-			triggerRect = triggerRef.getBoundingClientRect();
-		}
-	}
-
-	function renderPortalDropdown() {
-		if (!portalEl || !document.body.contains(portalEl)) {
-			portalEl = document.createElement('div');
-			portalEl.id = 'dropdown-portal';
-			portalEl.style.position = 'fixed';
-			portalEl.style.top = '0';
-			portalEl.style.left = '0';
-			portalEl.style.width = '100%';
-			portalEl.style.height = '100%';
-			portalEl.style.pointerEvents = 'none';
-			portalEl.style.zIndex = '9999';
-			document.body.appendChild(portalEl);
-		}
-	}
-
-	onMount(() => {
-		renderPortalDropdown();
-		window.addEventListener('scroll', updatePosition, true);
-		window.addEventListener('resize', updatePosition);
-	});
-
-	onDestroy(() => {
-		if (!triggerRef) return;
-		window.removeEventListener('scroll', updatePosition, true);
-		window.removeEventListener('resize', updatePosition);
-		if (portalEl && document.body.contains(portalEl)) {
-			document.body.removeChild(portalEl);
-		}
-	});
-
-	$effect(() => {
-		if (isOpen) {
-			renderPortalDropdown();
-			updatePosition();
-		}
-	});
 </script>
 
 <svelte:window onclick={handleClickOutside} />
 
 <div class={baseClass}>
 	<div bind:this={triggerRef}>
-		{#if triggerContent}
-			{@render triggerContent()}
-		{:else}
-			<button
-				type="button"
-				id="menu-button"
-				aria-expanded={isOpen}
-				aria-haspopup="true"
-				class={triggerClass_}
-				onclick={handleToggle}
-				{disabled}
-			>
+		<button
+			type="button"
+			id="menu-button"
+			aria-expanded={isOpen}
+			aria-haspopup="true"
+			class={triggerClass_}
+			onclick={handleToggle}
+			{disabled}
+		>
+			{#if label}
 				{label}
-				{#if Icon}
-					<Icon class="-mr-1 size-5 text-default-400" />
-				{:else}
-					<svg
-						class="-mr-1 size-5 text-default-400"
-						viewBox="0 0 16 16"
+			{/if}
+
+			{#if Icon}
+				<Icon class="text-default-400 size-5" />
+			{:else if label}
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					width="28"
+					height="28"
+					viewBox="0 0 28 28"
+					class="size-5"
+				>
+					<path
 						fill="currentColor"
-						aria-hidden="true"
-					>
-						<path
-							d="M6.62 12.7c.31.27.77.27 1.08 0l5-4.5A.76.76 0 0 0 12.16 7c0-.2-.08-.38-.21-.52a.76.76 0 0 0-1.09.02L7 10l-3.85-3.5a.76.76 0 0 0-1.07-.02.74.74 0 0 0-.02 1.07l4.56 5.15Z"
-						/>
-					</svg>
-				{/if}
-			</button>
-		{/if}
+						d="M4.22 9.47a.75.75 0 0 1 1.06 0L14 18.19l8.72-8.72a.75.75 0 1 1 1.06 1.06l-9.25 9.25a.75.75 0 0 1-1.06 0l-9.25-9.25a.75.75 0 0 1 0-1.06"
+					/>
+				</svg>
+			{/if}
+		</button>
 	</div>
 </div>
 
-{#if isOpen && portalEl}
-	<div
-		bind:this={dropdownRef}
-		class={containerClass_}
-		role="menu"
-		aria-orientation="vertical"
-		aria-labelledby="menu-button"
-		style={dropdownStyles}
-		transition:fly={{ duration: 150, y: 5, opacity: 0 }}
-	>
-		{#if header}
-			<button class={headerClass_} onclick={header.onclick} aria-label="Header Actions">
-				{#if header.content}
-					{@render header.content()}
-				{:else}
-					{#if header.title}
-						<span class={headerTitleClass}>{header.title}</span>
-					{/if}
-					{#if header.subtitle}
-						<span class={headerSubtitleClass}>{header.subtitle}</span>
-					{/if}
-				{/if}
-			</button>
-		{/if}
-
-		{#each sections as section_, sectionIndex (sectionIndex)}
-			<div class={sectionClass}>
-				{#each section_.items as menuItem, itemIndex (itemIndex)}
-					{@const itemProps = {
-						class: itemClass_,
-						role: 'menuitem',
-						tabindex: -1,
-						id: `menu-item-${sectionIndex}-${itemIndex}`,
-						'data-active': menuItem.active
-					}}
-					{#if menuItem.href}
-						<a href={menuItem.href} {...itemProps}>
-							{@render DropItemContent(menuItem)}
-						</a>
+{#if isOpen}
+	<Portal target={triggerRef}>
+		<div
+			bind:this={dropdownRef}
+			class={containerClass_}
+			role="menu"
+			aria-orientation="vertical"
+			aria-labelledby="menu-button"
+			style={dropdownStyles}
+			transition:fly={{ duration: 150, y: 5, opacity: 0 }}
+		>
+			{#if header}
+				<button class={headerClass_} onclick={header.onclick} aria-label="Header Actions">
+					{#if header.content}
+						{@render header.content()}
 					{:else}
-						<button
-							type="button"
-							onclick={() => handleItemClick(menuItem)}
-							disabled={menuItem.disabled} {...itemProps}>
-							{@render DropItemContent(menuItem)}
-						</button>
+						{#if header.title}
+							<span class={headerTitleClass}>{header.title}</span>
+						{/if}
+						{#if header.subtitle}
+							<span class={headerSubtitleClass}>{header.subtitle}</span>
+						{/if}
 					{/if}
-				{/each}
-			</div>
-		{/each}
-	</div>
+				</button>
+			{/if}
+
+			{#each sections as section_, sectionIndex (sectionIndex)}
+				<div class={sectionClass}>
+					{#each section_.items as menuItem, itemIndex (itemIndex)}
+						{@const itemProps = {
+							class: itemClass_,
+							role: 'menuitem',
+							tabindex: -1,
+							id: `menu-item-${sectionIndex}-${itemIndex}`,
+							'data-active': menuItem.active
+						}}
+						{#if menuItem.href}
+							<a href={menuItem.href} {...itemProps}>
+								{@render DropItemContent(menuItem)}
+							</a>
+						{:else}
+							<button
+								type="button"
+								onclick={() => handleItemClick(menuItem)}
+								disabled={!menuItem.onclick}
+								{...itemProps}
+							>
+								{@render DropItemContent(menuItem)}
+							</button>
+						{/if}
+					{/each}
+				</div>
+			{/each}
+		</div>
+	</Portal>
 {/if}
 
 {#snippet DropItemContent(menuItem: DropdownItem)}
@@ -269,4 +231,4 @@
 		<ItemIcon class={iconClass} />
 	{/if}
 	<span class="truncate">{menuItem.label}</span>
-{/snippet}
+{/snippet}

package/dist/elements/dropdown/Dropdown.svelte.d.ts

@@ -1,4 +1,4 @@
-import { type DropdownMenuProps } from './dropdown.js';
+import type { DropdownMenuProps } from '../../index.js';
 declare const Dropdown: import("svelte").Component<DropdownMenuProps, {}, "open">;
 type Dropdown = ReturnType<typeof Dropdown>;
 export default Dropdown;

package/dist/elements/dropdown/Select.svelte

@@ -1,24 +1,28 @@
 <script lang="ts">
 	import { tick } from 'svelte';
 	import { cn } from '../../helper/cls.js';
-	import { selectTV, type SelectItem, type SelectProps } from './select.js';
+	import { selectTV } from './select.js';
+	import type { SelectItem, SelectProps } from '../../index.js';
+	import Badge from '../badge/Badge.svelte';
+	import { Size } from '../../variants.js';
+	import Portal from '../../utils/Portal.svelte';
 
 	let {
 		items = [],
 		value = $bindable(''),
+		multiple = false,
 		placeholder = 'Select an option',
 		searchable = false,
 		disabled = false,
-		size = 'sm',
+		size = Size.BASE,
 		class: className = '',
-		triggerClass = '',
 		containerClass = '',
 		listClass = '',
 		itemClass = '',
 		searchInputClass = '',
 		icon: Icon,
 		iconClass = '',
-		triggerContent,
+		triggerClass = '', // recently, just now
 		onselect = () => {},
 		onopen = () => {},
 		onclose = () => {}
@@ -26,19 +30,28 @@
 
 	let open = $state(false);
 	let searchQuery = $state('');
-	let selectRef = $state<HTMLDivElement | null>(null);
+	let labelRef = $state<HTMLLabelElement | null>(null);
 	let searchInputRef = $state<HTMLInputElement | null>(null);
 	let highlightedIndex = $state(-1);
 
+	// Convert value to array for internal processing if multiple is true
+	const valueArray = $derived.by(() => {
+		if (multiple) {
+			return Array.isArray(value) ? value : value ? [value] : [];
+		}
+		return typeof value === 'string' ? [value] : [];
+	});
+
 	const { base, trigger, triggerIcon, container, searchInput, list, item, emptyMessage } = $derived(
 		selectTV({
 			size,
-			disabled
+			disabled,
+			multiple
 		})
 	);
 
 	const baseClass = $derived(cn(base(), className));
-	const triggerClass_ = $derived(cn(trigger(), triggerClass));
+	const triggerClass_ = $derived(cn(trigger(), triggerClass, baseClass));
 	const triggerIconClass = $derived(cn(triggerIcon(), iconClass));
 	const containerClass_ = $derived(cn(container(), containerClass));
 	const searchInputClass_ = $derived(cn(searchInput(), searchInputClass));
@@ -47,6 +60,7 @@
 	const emptyMessageClass = $derived(cn(emptyMessage()));
 
 	const selectedItem = $derived(items.find((item) => item.value === value));
+	const selectedItems = $derived(items.filter((item) => valueArray.includes(item.value)));
 
 	const filteredItems = $derived(
 		searchable && searchQuery
@@ -59,7 +73,7 @@
 		open = !open;
 
 		if (open) {
-			highlightedIndex = filteredItems.findIndex((item) => item.value === value);
+			highlightedIndex = !multiple ? filteredItems.findIndex((item) => item.value === value) : -1;
 
 			onopen();
 
@@ -76,21 +90,59 @@
 
 	function handleSelect(item: SelectItem) {
 		if (item.disabled) return;
-		value = item.value;
-		onselect({ value: item.value });
-		open = false;
+
+		if (multiple) {
+			const isSelected = valueArray.includes(item.value);
+
+			if (isSelected) {
+				// Remove from selection
+				value = Array.isArray(value) ? value.filter((v) => v !== item.value) : [];
+			} else {
+				// Add to selection
+				value = Array.isArray(value) ? [...value, item.value] : [item.value];
+			}
+
+			// Keep dropdown open when multiple selection is enabled
+			if (searchable && searchInputRef) {
+				searchInputRef.focus();
+			}
+		} else {
+			// Single selection
+			value = item.value;
+			open = false;
+		}
+
+		onselect({ value });
+	}
+
+	function removeItem(itemValue: string) {
+		if (multiple && Array.isArray(value)) {
+			value = value.filter((v) => v !== itemValue);
+			onselect({ value });
+		}
 	}
 
 	function handleClickOutside(event: MouseEvent) {
-		if (selectRef && !selectRef.contains(event.target as Node) && open) {
-			open = false;
-			onclose();
+		// Check if the click is inside the portal content
+		const portalContent = document.querySelector('.ripple-portal .portal-content');
+
+		// If the click is inside either the label (trigger) or the portal content, don't close
+		if (
+			(labelRef && labelRef.contains(event.target as Node)) ||
+			(portalContent && portalContent.contains(event.target as Node)) ||
+			!open
+		) {
+			return;
 		}
+
+		// Otherwise close the dropdown
+		open = false;
+		onclose();
 	}
 
 	function handleKeydown(event: KeyboardEvent) {
 		// check if the event is fired from the select
-		if (!selectRef || !selectRef.contains(event.target as Node)) return;
+		if (!labelRef || !labelRef.contains(event.target as Node)) return;
 
 		if (!open) {
 			if (event.key === 'Enter' || event.key === ' ' || event.key === 'ArrowDown') {
@@ -142,56 +194,85 @@
 
 <svelte:window onclick={handleClickOutside} onkeydown={handleKeydown} />
 
-<div bind:this={selectRef} class={baseClass} data-state={open ? 'open' : 'closed'}>
+<label
+	bind:this={labelRef}
+	class={triggerClass_}
+	aria-disabled={disabled}
+	aria-haspopup="listbox"
+	aria-labelledby="select-label"
+	data-state={open ? 'open' : 'closed'}
+>
 	<button
 		type="button"
-		onclick={handleToggle}
+		aria-label="Toggle dropdown"
 		{disabled}
-		class={triggerClass_}
-		aria-haspopup="listbox"
 		aria-expanded={open}
-		aria-labelledby="select-label"
-	>
-		{#if triggerContent}
-			{@render triggerContent({ selectedItem, open })}
-		{:else}
+		onclick={handleToggle}
+	></button>
+	<span class="flex min-h-[1.5rem] flex-1 flex-wrap items-center gap-1 overflow-hidden">
+		{#if multiple && selectedItems.length > 0}
+			{#each selectedItems as item (item.value)}
+				<Badge {size} color="info" onclose={() => removeItem(item.value)}>
+					{item.value}
+				</Badge>
+			{/each}
+		{:else if !multiple && selectedItem}
 			<span id="select-label" class="flex-1 truncate text-left">
-				{selectedItem?.label || placeholder}
+				{selectedItem.label}
+			</span>
+		{:else}
+			<span id="select-label" class="text-default-500 px-1">
+				{placeholder}
 			</span>
+		{/if}
+	</span>
+
+	<span class="ml-auto flex flex-shrink-0 items-center pl-2">
+		{#if Icon}
+			<Icon class={triggerIconClass} />
+		{:else}
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				viewBox="0 0 20 20"
+				fill="currentColor"
+				class={cn(triggerIconClass, open && 'rotate-180 transform')}
+			>
+				<path
+					fill-rule="evenodd"
+					d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
+					clip-rule="evenodd"
+				/>
+			</svg>
+		{/if}
+	</span>
+</label>
 
-			<span class="flex items-center gap-2">
-				{#if Icon}
-					<Icon class={triggerIconClass} />
-				{:else}
+{#if open}
+	<Portal target={labelRef}>
+		<div class={containerClass_} role="listbox" aria-labelledby="select-label">
+			{#if searchable}
+				<div class={searchInputClass_}>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
-						viewBox="0 0 20 20"
-						fill="currentColor"
-						class={cn(triggerIconClass, open && 'rotate-180 transform')}
+						width="12"
+						height="12"
+						viewBox="0 0 12 12"
+						class="size-4"
 					>
 						<path
-							fill-rule="evenodd"
-							d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
-							clip-rule="evenodd"
+							fill="currentColor"
+							d="M5 1a4 4 0 1 0 2.452 7.16l2.694 2.693a.5.5 0 1 0 .707-.707L8.16 7.453A4 4 0 0 0 5 1M2 5a3 3 0 1 1 6 0a3 3 0 0 1-6 0"
 						/>
 					</svg>
-				{/if}
-			</span>
-		{/if}
-	</button>
-
-	<!-- Select Menu -->
-	{#if open}
-		<div class={containerClass_} role="listbox" aria-labelledby="select-label">
-			{#if searchable}
-				<input
-					bind:this={searchInputRef}
-					bind:value={searchQuery}
-					type="text"
-					placeholder="Search..."
-					class={searchInputClass_}
-					aria-label="Search select options"
-				/>
+					<input
+						bind:this={searchInputRef}
+						bind:value={searchQuery}
+						type="text"
+						class="ring-0 outline-0"
+						placeholder="Search..."
+						aria-label="Search select options"
+					/>
+				</div>
 			{/if}
 
 			{#if filteredItems.length === 0}
@@ -202,29 +283,49 @@
 						<li>
 							<button
 								type="button"
-								onclick={() => handleSelect(item)}
+								onclick={(event) => {
+									handleSelect(item);
+									event.preventDefault();
+								}}
 								disabled={item.disabled}
 								class={itemClass_}
 								role="option"
-								aria-selected={value === item.value}
-								data-selected={value === item.value}
+								aria-selected={valueArray.includes(item.value)}
+								data-selected={valueArray.includes(item.value)}
 								data-highlighted={index === highlightedIndex}
 								data-index={index}
 							>
-								{#if item.icon}
-									{@const Icon = item.icon}
-									<div class="flex items-center gap-2">
-										<Icon class="h-4 w-4 flex-shrink-0" />
-										<span>{item.label}</span>
-									</div>
-								{:else}
-									{item.label}
-								{/if}
+								<span class="flex w-full items-center justify-between">
+									<span class="flex items-center gap-2 overflow-hidden">
+										{#if item.icon}
+											{@const Icon = item.icon}
+											<Icon class="h-4 w-4 flex-shrink-0" />
+										{/if}
+										<span class="truncate">{item.label}</span>
+									</span>
+
+									{#if valueArray.includes(item.value)}
+										<svg
+											xmlns="http://www.w3.org/2000/svg"
+											width="16"
+											height="16"
+											viewBox="0 0 24 24"
+											fill="none"
+											stroke="currentColor"
+											stroke-width="2"
+											stroke-linecap="round"
+											stroke-linejoin="round"
+											class="text-info-500"
+										>
+											<polyline points="20 6 9 17 4 12" />
+										</svg>
+									{/if}
+								</span>
 							</button>
 						</li>
 					{/each}
 				</ul>
 			{/if}
 		</div>
-	{/if}
-</div>
+	</Portal>
+{/if}

package/dist/elements/dropdown/Select.svelte.d.ts

@@ -1,4 +1,4 @@
-import { type SelectProps } from './select.js';
+import type { SelectProps } from '../../index.js';
 declare const Select: import("svelte").Component<SelectProps, {}, "value">;
 type Select = ReturnType<typeof Select>;
 export default Select;