flowbite-svelte 0.22.21 → 0.22.24

package/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.22.24](https://github.com/themesberg/flowbite-svelte/compare/v0.22.23...v0.22.24) (2022-07-29)
+
+
+### Features
+
+* badges new features ([775ecbc](https://github.com/themesberg/flowbite-svelte/commit/775ecbc04df58cd7c2517d103c963e7add92b5f6))
+
+
+### Bug Fixes
+
+* pink color ([e4551b5](https://github.com/themesberg/flowbite-svelte/commit/e4551b54e0b56c07bae45d2bddb1b2930a20fe72))
+
+### [0.22.23](https://github.com/themesberg/flowbite-svelte/compare/v0.22.22...v0.22.23) (2022-07-29)
+
+
+### Bug Fixes
+
+* minor fixes / fine tuning ([57c1cf7](https://github.com/themesberg/flowbite-svelte/commit/57c1cf7f1bd461c417be1fd925766c045d72c015))
+
+### [0.22.22](https://github.com/themesberg/flowbite-svelte/compare/v0.22.21...v0.22.22) (2022-07-28)
+
+
+### Features
+
+* focus trap for modals ([08604ac](https://github.com/themesberg/flowbite-svelte/commit/08604ac3475f28a5a35c037e47ecfc13ee13b877))
+
 ### [0.22.21](https://github.com/themesberg/flowbite-svelte/compare/v0.22.20...v0.22.21) (2022-07-28)
 
 

package/alerts/Alert.svelte

@@ -1,7 +1,9 @@
-<script>import classNames from 'classnames';
+<script>import { setContext } from 'svelte';
+import classNames from 'classnames';
 import { createEventDispatcher } from 'svelte';
 import CloseButton from '../utils/CloseButton.svelte';
 const dispatch = createEventDispatcher();
+setContext('background', true);
 export let color = 'blue';
 export let icon = null;
 export let dismissable = false;
@@ -48,13 +50,11 @@ const textColors = {
     dark: 'text-gray-700  dark:text-gray-300'
 };
 let divClass;
-$: divClass = classNames('flex flex-col p-4 mb-4 gap-2 ', bgClasses[color] ?? bgClasses.blue, accent && (borderAccentClasses[color] ?? borderAccentClasses.blue), rounded && 'rounded-lg ', accent && 'border-t-4 ', $$props.class);
-let textColor;
-$: textColor = textColors[color] ?? textColors.blue;
+$: divClass = classNames('flex flex-col p-4 mb-4 gap-2 ', bgClasses[color] ?? bgClasses.blue, accent && (borderAccentClasses[color] ?? borderAccentClasses.blue), rounded && 'rounded-lg ', accent && 'border-t-4 ', textColors[color], $$props.class);
 </script>
 
 <div id={$$props.id} class:hidden class={divClass} role="alert">
-	<div class="flex items-center {textColor}">
+	<div class="flex items-center">
 		{#if icon}
 			<svelte:component this={icon} class="flex-shrink-0 w-5 h-5 mr-3" />
 		{/if}

package/badges/Badge.svelte

@@ -1,9 +1,12 @@
 <script>import classNames from 'classnames';
+import CloseButton from '../utils/CloseButton.svelte';
 export let color = 'blue';
 export let large = false;
 export let href = undefined;
 export let rounded = false;
-let badgeClass;
+export let index = false;
+export let dismissable = false;
+let hidden = false;
 const colors = {
     blue: 'bg-blue-100 text-blue-800 dark:bg-blue-200 dark:text-blue-800',
     dark: 'bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300',
@@ -12,7 +15,15 @@ const colors = {
     yellow: 'bg-yellow-100 text-yellow-800 dark:bg-yellow-200 dark:text-yellow-900',
     indigo: 'bg-indigo-100 text-indigo-800 dark:bg-indigo-200 dark:text-indigo-900',
     purple: 'bg-purple-100 text-purple-800 dark:bg-purple-200 dark:text-purple-900',
-    pink: 'bg-pink-100 text-pink-800 dark:bg-pink-200 dark:text-pink-900'
+    pink: 'bg-pink-100 text-pink-800 dark:bg-pink-200 dark:text-pink-900',
+    ['!blue']: 'bg-blue-500 text-blue-100',
+    ['!dark']: 'bg-gray-500 text-gray-100',
+    ['!red']: 'bg-red-500 text-white',
+    ['!green']: 'bg-green-500 text-green-100',
+    ['!yellow']: 'bg-yellow-300 text-yellow-800',
+    ['!indigo']: 'bg-indigo-500 text-indigo-100',
+    ['!purple']: 'bg-purple-500 text-purple-100',
+    ['!pink']: 'bg-pink-500 text-pink-100'
 };
 const hovers = {
     blue: 'hover:bg-blue-200 dark:hover:bg-blue-300',
@@ -24,9 +35,16 @@ const hovers = {
     purple: 'hover:bg-purple-200 dark:hover:bg-purple-300',
     pink: 'hover:bg-pink-200 dark:hover:bg-pink-300'
 };
-$: badgeClass = classNames('inline-flex items-center justify-center mr-2', large ? 'text-sm font-medium' : 'text-xs font-semibold', colors[color] ?? colors.blue, href && (hovers[color] ?? hovers.blue), rounded ? 'rounded-full p-1' : 'rounded px-2.5 py-0.5', $$props.class);
+let badgeClass;
+$: badgeClass = classNames('inline-flex items-center justify-center -mb-0.5', large ? 'text-sm font-medium' : 'text-xs font-semibold', colors[color], href && (hovers[color] ?? hovers.blue), rounded ? 'rounded-full p-1' : 'rounded px-2.5 py-0.5', index && 'absolute font-bold border-2 border-white dark:border-gray-900', index && (large ? 'w-7 h-7 -top-3 -right-3' : 'w-6 h-6 -top-2 -right-2'), $$props.class);
+const handleHide = () => {
+    hidden = !hidden;
+};
 </script>
 
-<svelte:element this={href ? 'a' : 'span'} {href} {...$$restProps} class={badgeClass}>
+<svelte:element this={href ? 'a' : 'span'} {href} {...$$restProps} class={badgeClass} class:hidden>
 	<slot />
+	{#if dismissable}
+		<CloseButton {color} on:click={handleHide} size={large ? 'sm' : 'xs'} class="ml-1.5 -mr-1.5" />
+	{/if}
 </svelte:element>

package/badges/Badge.svelte.d.ts

@@ -7,6 +7,8 @@ declare const __propDef: {
         large?: boolean;
         href?: string;
         rounded?: boolean;
+        index?: boolean;
+        dismissable?: boolean;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/forms/Checkbox.svelte

@@ -37,6 +37,7 @@ $: {
 		type="checkbox"
 		bind:checked
 		on:click
+		on:change
 		{value}
 		{...$$restProps}
 		class={inputClass(custom, color, true, background, $$slots.default || $$props.class)}

package/forms/Checkbox.svelte.d.ts

@@ -12,6 +12,7 @@ declare const __propDef: {
     };
     events: {
         click: MouseEvent;
+        change: Event;
     } & {
         [evt: string]: CustomEvent<any>;
     };

package/forms/Toggle.svelte

@@ -26,7 +26,7 @@ let divClass;
 $: divClass = classNames(common, background ? 'dark:bg-gray-600 dark:border-gray-500' : 'dark:bg-gray-700 dark:border-gray-600', colors[$$restProps.color ?? 'blue'], sizes[size], 'relative');
 </script>
 
-<Checkbox custom {...$$restProps} class={$$props.class} {value} bind:checked bind:group on:click>
+<Checkbox custom {...$$restProps} class={$$props.class}	{value}	bind:checked bind:group	on:click on:change>
 	<div class={divClass} />
 	<slot />
 </Checkbox>

package/forms/Toggle.svelte.d.ts

@@ -9,6 +9,7 @@ declare const __propDef: {
     };
     events: {
         click: MouseEvent;
+        change: Event;
     } & {
         [evt: string]: CustomEvent<any>;
     };

package/modals/Modal.svelte

@@ -1,6 +1,7 @@
 <script>import { createEventDispatcher } from 'svelte';
 import { setContext } from 'svelte';
 import CloseButton from '../utils/CloseButton.svelte';
+import focusTrap from '../utils/focusTrap';
 export let open = false;
 export let title = undefined;
 export let size = 'md';
@@ -18,15 +19,14 @@ const allPlacementClasses = [
     'items-end'
 ];
 let backdropEl;
-function init(node, _visible) {
+function init(node, _open) {
     getPlacementClasses().map((c) => node.classList.add(c));
-    if (_visible)
-        createBackdrop(node);
+    _open && createBackdrop(node);
     return {
-        update(_visible) {
+        update(_open) {
             allPlacementClasses.map((c) => node.classList.remove(c));
             getPlacementClasses().map((c) => node.classList.add(c));
-            _visible ? createBackdrop(node) : destroyBackdrop(node);
+            _open ? createBackdrop(node) : destroyBackdrop(node);
         },
         destroy() {
             destroyBackdrop(node);
@@ -44,17 +44,17 @@ function createBackdrop(node) {
         const body = document.querySelector('body');
         body.append(backdropEl);
         body.style.overflow = 'hidden';
-        body.addEventListener('keydown', handleEscape, true);
+        document.addEventListener('keydown', handleEscape, true);
     }
     dispatch('show', node);
 }
 function destroyBackdrop(node) {
     const body = document.querySelector('body');
     body.style.overflow = 'auto';
-    body.removeEventListener('keydown', handleEscape, true);
     if (backdropEl)
         backdropEl.remove();
     backdropEl = undefined;
+    document.removeEventListener('keydown', handleEscape, true);
     dispatch('hide', node);
 }
 function getPlacementClasses() {
@@ -110,6 +110,7 @@ function hide() {
 	aria-modal={open ? 'true' : undefined}
 	role={open ? 'dialog' : undefined}
 	use:init={open}
+	use:focusTrap={open}
 	on:click={onButtonsClick}
 >
 	<div class="relative p-4 w-full {sizes[size]} h-full md:h-auto">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowbite-svelte",
-  "version": "0.22.21",
+  "version": "0.22.24",
   "description": "Flowbite components for Svelte",
   "main": "index.js",
   "author": {
@@ -236,6 +236,7 @@
     "./utils/CloseButton.svelte": "./utils/CloseButton.svelte",
     "./utils/OptsButton.svelte": "./utils/OptsButton.svelte",
     "./utils/clickOutside": "./utils/clickOutside.js",
+    "./utils/focusTrap": "./utils/focusTrap.js",
     "./utils/generateId": "./utils/generateId.js"
   },
   "svelte": "./index.js"

package/utils/CloseButton.svelte

@@ -3,6 +3,7 @@ import classNames from 'classnames';
 const background = getContext('background');
 export let color = 'default';
 export let name = 'Close';
+export let size = 'md';
 const colors = {
     gray: 'focus:ring-gray-400 hover:bg-gray-200 dark:hover:bg-gray-300',
     red: 'focus:ring-red-400 hover:bg-red-200 dark:hover:bg-red-300',
@@ -14,17 +15,32 @@ const colors = {
     blue: 'focus:ring-blue-400 hover:bg-blue-200 dark:hover:bg-blue-300',
     default: 'focus:ring-gray-300 '
 };
+const sizing = {
+    xs: 'm-0.5 rounded focus:ring-1 p-0.5',
+    sm: 'm-0.5 rounded focus:ring-1 p-0.5',
+    md: '-mx-1 -my-1.5 rounded-lg focus:ring-2 p-1.5'
+};
 let buttonClass = '';
-$: buttonClass = classNames('ml-auto -mx-1 -my-1.5 rounded-lg focus:ring-2 p-1.5 focus:outline-none', colors[color], color === 'default' &&
+$: buttonClass = classNames('ml-auto focus:outline-none', sizing[size], colors[color], color === 'default' &&
     (background
         ? 'hover:bg-gray-100 dark:hover:bg-gray-600'
         : 'hover:bg-gray-100 dark:hover:bg-gray-700'), $$props.class);
+const svgSizes = {
+    xs: 'w-3 h-3',
+    sm: 'w-3.5 h-3.5',
+    md: 'w-5 h-5'
+};
 </script>
 
 <button on:click type="button" class={buttonClass} aria-label="Close">
 	<slot>
 		<span class="sr-only">{name}</span>
-		<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+		<svg
+			class={svgSizes[size]}
+			fill="currentColor"
+			viewBox="0 0 20 20"
+			xmlns="http://www.w3.org/2000/svg"
+		>
 			<path
 				fill-rule="evenodd"
 				d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"

package/utils/CloseButton.svelte.d.ts

@@ -4,6 +4,7 @@ declare const __propDef: {
         [x: string]: any;
         color?: string;
         name?: string;
+        size?: 'xs' | 'sm' | 'md';
     };
     events: {
         click: MouseEvent;

package/utils/focusTrap.js

@@ -0,0 +1,61 @@
+//
+// Focus trap copied from https://uxdesign.cc/how-to-trap-focus-inside-modal-to-make-it-ada-compliant-6a50f9a70700
+//
+
+// add all the elements inside modal which you want to make focusable
+const focusableElements =
+	'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])';
+
+function getFocusable(node) {
+	const focusableContent = node.querySelectorAll(focusableElements);
+	return [focusableContent[0], focusableContent[focusableContent.length - 1]];
+}
+
+export default function focusTrap(node, _open) {
+	let firstFocusableElement, lastFocusableElement; // first and last element to be focused inside modal
+
+	function handleFocusTrap(e) {
+		let isTabPressed = e.key === 'Tab' || e.keyCode === 9;
+
+		if (!isTabPressed) {
+			return;
+		}
+
+		if (e.shiftKey) {
+			// if shift key pressed for shift + tab combination
+			if (document.activeElement === firstFocusableElement) {
+				lastFocusableElement.focus(); // add focus for the last focusable element
+				e.preventDefault();
+			}
+		} else {
+			// if tab key is pressed
+			if (document.activeElement === lastFocusableElement) {
+				// if focused has reached to last focusable element then focus first focusable element after pressing tab
+				firstFocusableElement.focus(); // add focus for the first focusable element
+				e.preventDefault();
+			}
+		}
+	}
+
+	if (_open) {
+		[firstFocusableElement, lastFocusableElement] = getFocusable(node);
+		document.addEventListener('keydown', handleFocusTrap, true);
+		firstFocusableElement.focus();
+	}
+
+	return {
+		update(_open) {
+			if (_open) {
+				[firstFocusableElement, lastFocusableElement] = getFocusable(node);
+				document.addEventListener('keydown', handleFocusTrap, true);
+				firstFocusableElement.focus();
+			} else {
+				document.removeEventListener('keydown', handleFocusTrap, true);
+			}
+		},
+
+		destroy() {
+			document.removeEventListener('keydown', handleFocusTrap, true);
+		}
+	};
+}