flowbite-svelte 0.25.23 → 0.25.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -2,6 +2,19 @@
2
2
 
3
3
  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.
4
4
 
5
+ ### [0.25.24](https://github.com/themesberg/flowbite-svelte/compare/v0.25.23...v0.25.24) (2022-08-28)
6
+
7
+
8
+ ### Features
9
+
10
+ * popper reloaded ([a4b851e](https://github.com/themesberg/flowbite-svelte/commit/a4b851e2409356a90fd6aaae62db327b505bdcb2))
11
+ * popper reloaded part 2 ([2482870](https://github.com/themesberg/flowbite-svelte/commit/2482870842386c8c1e5824869ce7822b8682e8a0))
12
+
13
+
14
+ ### Bug Fixes
15
+
16
+ * tab page timeline ([ab598a5](https://github.com/themesberg/flowbite-svelte/commit/ab598a59a3d373f14740a42bbaec3cb276eed34b))
17
+
5
18
  ### [0.25.23](https://github.com/themesberg/flowbite-svelte/compare/v0.25.22...v0.25.23) (2022-08-28)
6
19
 
7
20
 
@@ -22,17 +22,17 @@ $: avatarClass = classNames(rounded ? 'rounded' : 'rounded-full', border && 'p-1
22
22
 
23
23
  <Dot show={$$props.dot} {rounded} {...dot} {size} class={sizes[size]}>
24
24
  {#if src}
25
- <img class={avatarClass} {alt} {src} />
25
+ <img {alt} {src} {...$$restProps} class={avatarClass} />
26
26
  {:else if $$slots.default}
27
27
  <svelte:element
28
28
  this={href ? 'a' : 'div'}
29
- class="flex justify-center items-center text-xs font-medium {avatarClass}"
30
29
  {href}
31
- >
30
+ {...$$restProps}
31
+ class="flex justify-center items-center text-xs font-medium {avatarClass}">
32
32
  <slot />
33
33
  </svelte:element>
34
34
  {:else}
35
- <svelte:element this={href ? 'a' : 'div'} class={avatarClass}>
35
+ <svelte:element this={href ? 'a' : 'div'} {...$$restProps} class={avatarClass}>
36
36
  <AvatarPlaceholder {rounded} />
37
37
  </svelte:element>
38
38
  {/if}
@@ -6,12 +6,15 @@ import ChevronUp from '../utils/ChevronUp.svelte';
6
6
  import ChevronRight from '../utils/ChevronRight.svelte';
7
7
  import ChevronDown from '../utils/ChevronDown.svelte';
8
8
  import ChevronLeft from '../utils/ChevronLeft.svelte';
9
+ import generateId from '../utils/generateId';
9
10
  export let label = '';
10
11
  export let inline = false;
11
12
  export let arrowIcon = true;
12
13
  export let labelClass = 'flex items-center justify-between w-full py-2 pl-3 pr-4 font-medium text-gray-700 border-b border-gray-100 hover:bg-gray-50 md:hover:bg-transparent md:border-0 md:hover:text-blue-700 md:p-0 md:w-auto dark:text-gray-400 dark:hover:text-white dark:focus:text-white dark:border-gray-700 dark:hover:bg-gray-700 md:dark:hover:bg-transparent';
13
14
  export let placement = 'bottom';
14
15
  export let open = false;
16
+ export let triggeredBy = undefined;
17
+ let id = generateId();
15
18
  setContext('background', true);
16
19
  const icons = {
17
20
  top: ChevronUp,
@@ -25,18 +28,10 @@ let popoverClass;
25
28
  $: popoverClass = classNames('rounded-lg shadow-sm', 'bg-white dark:bg-gray-800', 'text-gray-500 dark:text-gray-400', 'border border-gray-200 dark:border-gray-700', 'outline-none', $$props.class);
26
29
  </script>
27
30
 
28
- <Popper
29
- activeContent={true}
30
- arrow={false}
31
- {placement}
32
- {...$$restProps}
33
- class={popoverClass}
34
- trigger="click"
35
- on:show
36
- bind:open>
37
- <slot name="trigger" slot="trigger">
31
+ {#if label}
32
+ <slot name="trigger">
38
33
  {#if inline}
39
- <button class={labelClass} class:flex-row-reverse={icon == ChevronLeft}>
34
+ <button {id} class={labelClass} class:flex-row-reverse={icon == ChevronLeft}>
40
35
  <slot name="label">{label}</slot>
41
36
  {#if arrowIcon}
42
37
  <svelte:component
@@ -45,7 +40,7 @@ $: popoverClass = classNames('rounded-lg shadow-sm', 'bg-white dark:bg-gray-800'
45
40
  {/if}
46
41
  </button>
47
42
  {:else}
48
- <Button {...$$restProps} class={icon == ChevronLeft && 'flex-row-reverse'}>
43
+ <Button {id} {...$$restProps} class={icon == ChevronLeft && 'flex-row-reverse'}>
49
44
  <slot name="label">{label}</slot>
50
45
  {#if arrowIcon}
51
46
  <svelte:component
@@ -55,6 +50,18 @@ $: popoverClass = classNames('rounded-lg shadow-sm', 'bg-white dark:bg-gray-800'
55
50
  </Button>
56
51
  {/if}
57
52
  </slot>
53
+ {/if}
54
+
55
+ <Popper
56
+ activeContent={true}
57
+ arrow={false}
58
+ {placement}
59
+ {...$$restProps}
60
+ class={popoverClass}
61
+ trigger="click"
62
+ on:show
63
+ bind:open
64
+ triggeredBy={triggeredBy ?? '#' + id}>
58
65
  <slot name="content">
59
66
  <ul class="py-1">
60
67
  <slot />
@@ -9,6 +9,7 @@ declare const __propDef: {
9
9
  labelClass?: string;
10
10
  placement?: 'auto' | Placement;
11
11
  open?: boolean;
12
+ triggeredBy?: string;
12
13
  };
13
14
  events: {
14
15
  show: CustomEvent<any>;
@@ -16,9 +17,7 @@ declare const __propDef: {
16
17
  [evt: string]: CustomEvent<any>;
17
18
  };
18
19
  slots: {
19
- trigger: {
20
- slot: string;
21
- };
20
+ trigger: {};
22
21
  label: {};
23
22
  content: {};
24
23
  default: {};
@@ -18,6 +18,7 @@ const colors = {
18
18
  on:blur
19
19
  on:mouseenter
20
20
  on:mouseleave
21
+ tabindex="0"
21
22
  >
22
23
  <slot />
23
24
  </li>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "flowbite-svelte",
3
- "version": "0.25.23",
3
+ "version": "0.25.24",
4
4
  "description": "Flowbite components for Svelte",
5
5
  "main": "index.js",
6
6
  "author": {
@@ -1,16 +1,16 @@
1
1
  <script>import Popper from '../utils/Popper.svelte';
2
2
  import classNames from 'classnames';
3
3
  export let title = '';
4
+ export let triggeredBy;
4
5
  let popoverClass;
5
6
  $: popoverClass = classNames('rounded-lg shadow-sm', 'bg-white dark:bg-gray-800', 'text-gray-500 dark:text-gray-400', 'border border-gray-200 dark:border-gray-700', $$props.class);
6
7
  </script>
7
8
 
8
- <Popper activeContent={true} {...$$restProps} class={popoverClass} on:show>
9
+ <Popper activeContent={true} {triggeredBy} {...$$restProps} class={popoverClass} on:show>
9
10
  <slot name="trigger" slot="trigger" />
10
11
  {#if $$slots.title || title}
11
12
  <div
12
- class="py-2 px-3 bg-gray-100 rounded-t-lg border-b border-gray-200 dark:border-gray-600 dark:bg-gray-700"
13
- >
13
+ class="py-2 px-3 bg-gray-100 rounded-t-lg border-b border-gray-200 dark:border-gray-600 dark:bg-gray-700">
14
14
  <slot name="title">
15
15
  <h3 class="font-semibold text-gray-900 dark:text-white">{title}</h3>
16
16
  </slot>
@@ -3,6 +3,7 @@ declare const __propDef: {
3
3
  props: {
4
4
  [x: string]: any;
5
5
  title?: string;
6
+ triggeredBy: string;
6
7
  };
7
8
  events: {
8
9
  show: CustomEvent<any>;
@@ -1,9 +1,11 @@
1
1
  <script>import Popper from '../utils/Popper.svelte';
2
2
  import classNames from 'classnames';
3
+ import generateId from '../utils/generateId';
3
4
  export let content = '';
4
5
  export let style = 'dark';
5
6
  export let tipColor = '';
6
7
  export let tipClass = 'py-2 px-3 text-sm font-medium rounded-lg shadow-sm tooltip';
8
+ export let triggeredBy;
7
9
  const tipStyleClasses = {
8
10
  dark: 'border border-gray-800 bg-gray-900 text-white dark:bg-gray-700 dark:border-gray-600',
9
11
  light: 'border border-gray-200 bg-white text-gray-900',
@@ -12,9 +14,17 @@ const tipStyleClasses = {
12
14
  };
13
15
  let toolTipClass;
14
16
  $: toolTipClass = classNames(tipClass, tipStyleClasses[style], $$props.class);
17
+ let id = generateId();
15
18
  </script>
16
19
 
17
- <Popper activeContent={false} {...$$restProps} class={toolTipClass} on:show>
18
- <slot slot="trigger" />
20
+ <div {id}>
21
+ <slot />
22
+ </div>
23
+ <Popper
24
+ activeContent={false}
25
+ triggeredBy={triggeredBy ?? '#' + id}
26
+ {...$$restProps}
27
+ class={toolTipClass}
28
+ on:show>
19
29
  <slot name="content">{content}</slot>
20
30
  </Popper>
@@ -6,6 +6,7 @@ declare const __propDef: {
6
6
  style?: 'dark' | 'light' | 'auto' | 'custom';
7
7
  tipColor?: string;
8
8
  tipClass?: string;
9
+ triggeredBy: string;
9
10
  };
10
11
  events: {
11
12
  show: CustomEvent<any>;
@@ -13,9 +14,7 @@ declare const __propDef: {
13
14
  [evt: string]: CustomEvent<any>;
14
15
  };
15
16
  slots: {
16
- default: {
17
- slot: string;
18
- };
17
+ default: {};
19
18
  content: {};
20
19
  };
21
20
  };
@@ -1,84 +1,112 @@
1
- <script>import { createEventDispatcher } from 'svelte';
1
+ <script>import { createEventDispatcher, onMount } from 'svelte';
2
+ import { fade } from 'svelte/transition';
2
3
  import { createPopper } from '@popperjs/core';
3
4
  import classNames from 'classnames';
4
- const dispatch = createEventDispatcher();
5
- export let open = false;
6
- export let placement = 'top';
5
+ export let activeContent = false;
6
+ export let animation = 100;
7
+ export let arrow = true;
7
8
  export let offset = 8;
9
+ export let placement = 'top';
8
10
  export let trigger = 'hover';
9
- export let arrow = true;
10
- export let animation = 'duration-300';
11
- export let activeContent;
11
+ export let triggeredBy;
12
+ const dispatch = createEventDispatcher();
13
+ let open = false;
12
14
  let clickable;
13
15
  $: clickable = trigger === 'click';
14
- let triggerEl, contentEl, popper;
16
+ $: dispatch('show', open);
17
+ let triggerEl;
18
+ let triggerEls = [];
19
+ let popper;
15
20
  let _blocked = false; // managment of the race condition between focusin and click events
16
- const block = () => ((_blocked = true), setTimeout(() => (_blocked = false), 500));
21
+ const block = () => ((_blocked = true), setTimeout(() => (_blocked = false), 250));
17
22
  const showHandler = (ev) => {
23
+ if (triggerEl === undefined)
24
+ triggerEl = ev.target;
25
+ else if (triggerEls.includes(ev.target) && triggerEl !== ev.target) {
26
+ popper.state.elements.reference = ev.target;
27
+ popper.setOptions({ placement });
28
+ triggerEl = ev.target;
29
+ block();
30
+ }
18
31
  if (clickable && ev.type === 'focusin' && !open)
19
32
  block();
20
- open = ev.type === 'click' && !_blocked ? !open : true;
33
+ open = clickable && ev.type === 'click' && !_blocked ? !open : true;
21
34
  };
35
+ // typescript typeguards - poper.state.element.reference: Element|HTMLElement|VirtualElement
36
+ const hasHover = (el) => el.matches && el.matches(':hover');
37
+ const hasFocus = (el) => el.contains && el.contains(document.activeElement);
22
38
  const hideHandler = (ev) => {
23
- if (activeContent)
24
- setTimeout(() => (!clickable && (triggerEl.matches(':hover') || contentEl.matches(':hover'))) ||
25
- contentEl.contains(document.activeElement) ||
26
- (open = false), 100);
39
+ if (activeContent) {
40
+ setTimeout(() => {
41
+ const elements = Object.values(popper?.state.elements ?? {});
42
+ if (ev.type === 'mouseleave' && elements.some(hasHover))
43
+ return;
44
+ if (ev.type === 'focusout' && elements.some(hasFocus))
45
+ return;
46
+ open = false;
47
+ }, 100);
48
+ }
27
49
  else
28
50
  open = false;
29
51
  };
30
- $: {
31
- if (triggerEl && contentEl) {
32
- popper = createPopper(triggerEl, contentEl, {
33
- placement,
34
- modifiers: [{ name: 'offset', options: { offset: [0, offset] } }]
35
- });
36
- }
37
- }
38
- function enableListeners(modifiers) {
39
- const modifier = modifiers.find((x) => x.name === 'eventListeners');
40
- if (!modifier)
41
- return [...modifiers, { name: 'eventListeners', enabled: open }];
42
- modifier.enabled = open;
43
- return modifiers;
52
+ function init(node, _open) {
53
+ popper = createPopper(triggerEl, node, {
54
+ placement,
55
+ modifiers: [
56
+ { name: 'offset', options: { offset: [0, offset] } },
57
+ { name: 'eventListeners', enabled: open }
58
+ ]
59
+ });
60
+ return {
61
+ destroy() {
62
+ popper.destroy();
63
+ }
64
+ };
44
65
  }
45
- $: {
46
- if (popper) {
47
- // Enable the event listeners
48
- popper.setOptions(({ modifiers, ...options }) => ({
49
- ...options,
50
- modifiers: enableListeners(modifiers)
51
- }));
52
- open && popper.update(); // Update the position
53
- dispatch('show', open);
54
- }
55
- }
56
- let divClass;
57
- $: divClass = classNames('z-10', animation && `transition-opacity ${animation}`, open ? 'visible opacity-100' : 'invisible opacity-0', $$props.class);
66
+ onMount(() => {
67
+ const events = [
68
+ ['focusin', showHandler, true],
69
+ ['focusout', hideHandler, true],
70
+ ['click', showHandler, clickable],
71
+ ['mouseenter', showHandler, !clickable],
72
+ ['mouseleave', hideHandler, !clickable]
73
+ ];
74
+ triggerEls = [...document.querySelectorAll(triggeredBy)];
75
+ if (!triggerEls.length)
76
+ console.error('no triggers given');
77
+ triggerEls.forEach((element) => {
78
+ // trigger must be focusable
79
+ if (element.tabIndex < 0)
80
+ element.tabIndex = 0;
81
+ for (const [name, handler, cond] of events)
82
+ if (cond)
83
+ element.addEventListener(name, handler);
84
+ });
85
+ return () => {
86
+ triggerEl = undefined;
87
+ triggerEls.forEach((element) => {
88
+ if (element) {
89
+ for (const [name, handler, cond] of events)
90
+ element.removeEventListener(name, handler);
91
+ }
92
+ });
93
+ };
94
+ });
58
95
  </script>
59
96
 
60
- <div
61
- bind:this={triggerEl}
62
- on:focusin={showHandler}
63
- on:focusout={hideHandler}
64
- on:click={clickable ? showHandler : undefined}
65
- on:mouseenter={clickable ? undefined : showHandler}
66
- on:mouseleave={clickable ? undefined : hideHandler}
67
- class="inline-block"
68
- >
69
- <slot name="trigger" />
70
- </div>
71
- <div
72
- bind:this={contentEl}
73
- role="tooltip"
74
- tabindex={activeContent ? -1 : undefined}
75
- class={divClass}
76
- on:focusin={activeContent ? showHandler : undefined}
77
- on:focusout={activeContent ? hideHandler : undefined}
78
- on:mouseenter={activeContent && !clickable ? showHandler : undefined}
79
- on:mouseleave={activeContent && !clickable ? hideHandler : undefined}
80
- style="position: absolute;"
81
- >
82
- <slot />
83
- {#if arrow}<div data-popper-arrow />{/if}
84
- </div>
97
+ {#if open}
98
+ <div
99
+ use:init={open}
100
+ transition:fade={{ duration: animation ? animation : 0 }}
101
+ role="tooltip"
102
+ tabIndex={activeContent ? -1 : undefined}
103
+ class={classNames('z-10', $$props.class)}
104
+ on:focusin={activeContent ? showHandler : undefined}
105
+ on:focusout={activeContent ? hideHandler : undefined}
106
+ on:mouseenter={activeContent && !clickable ? showHandler : undefined}
107
+ on:mouseleave={activeContent && !clickable ? hideHandler : undefined}
108
+ style="position: absolute;">
109
+ <slot />
110
+ {#if arrow}<div data-popper-arrow />{/if}
111
+ </div>
112
+ {/if}
@@ -3,13 +3,13 @@ import type { Placement } from '@popperjs/core';
3
3
  declare const __propDef: {
4
4
  props: {
5
5
  [x: string]: any;
6
- open?: boolean;
7
- placement?: Placement;
6
+ activeContent?: boolean;
7
+ animation?: false | number;
8
+ arrow?: boolean;
8
9
  offset?: number;
10
+ placement?: Placement;
9
11
  trigger?: 'hover' | 'click';
10
- arrow?: boolean;
11
- animation?: false | `duration-${number}`;
12
- activeContent: boolean;
12
+ triggeredBy: string;
13
13
  };
14
14
  events: {
15
15
  show: CustomEvent<any>;
@@ -17,7 +17,6 @@ declare const __propDef: {
17
17
  [evt: string]: CustomEvent<any>;
18
18
  };
19
19
  slots: {
20
- trigger: {};
21
20
  default: {};
22
21
  };
23
22
  };