From ddf2e1cb4334667a9c61ddce22edb3f44a76ba0a Mon Sep 17 00:00:00 2001 From: Rene Haas Date: Sat, 12 Nov 2022 10:19:13 +0100 Subject: [PATCH] improve svelte version --- .../src/OverlayScrollbarsComponent.svelte | 10 +++++----- .../src/OverlayScrollbarsComponent.types.ts | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/overlayscrollbars-svelte/src/OverlayScrollbarsComponent.svelte b/packages/overlayscrollbars-svelte/src/OverlayScrollbarsComponent.svelte index cd063fb..6a9e5ab 100644 --- a/packages/overlayscrollbars-svelte/src/OverlayScrollbarsComponent.svelte +++ b/packages/overlayscrollbars-svelte/src/OverlayScrollbarsComponent.svelte @@ -2,20 +2,20 @@ import { onMount, afterUpdate, createEventDispatcher } from 'svelte'; import { OverlayScrollbars } from 'overlayscrollbars'; import type { EventListeners, EventListenerArgs } from 'overlayscrollbars'; - import type { OverlayScrollbarsComponentProps, OverlayScrollbarsComponentRef } from './OverlayScrollbarsComponent.types'; + import type { OverlayScrollbarsComponentProps$, OverlayScrollbarsComponentRef } from './OverlayScrollbarsComponent.types'; type EmitEventsMap = { [N in keyof EventListenerArgs]: `os${Capitalize}`; }; - export let element: OverlayScrollbarsComponentProps["element"] = 'div'; - export let options: OverlayScrollbarsComponentProps["options"] = undefined; - export let events: OverlayScrollbarsComponentProps["events"] = undefined; + export let element: OverlayScrollbarsComponentProps$["element"] = 'div'; + export let options: OverlayScrollbarsComponentProps$["options"] = undefined; + export let events: OverlayScrollbarsComponentProps$["events"] = undefined; let instance: OverlayScrollbars | null = null; let elementRef: HTMLElement | null = null; let slotRef: HTMLElement | null = null; - let combinedEvents: OverlayScrollbarsComponentProps["events"] = undefined; + let combinedEvents: OverlayScrollbarsComponentProps$["events"] = undefined; let prevElement: string | undefined; const initialize = () => { diff --git a/packages/overlayscrollbars-svelte/src/OverlayScrollbarsComponent.types.ts b/packages/overlayscrollbars-svelte/src/OverlayScrollbarsComponent.types.ts index e4f14fd..7a36338 100644 --- a/packages/overlayscrollbars-svelte/src/OverlayScrollbarsComponent.types.ts +++ b/packages/overlayscrollbars-svelte/src/OverlayScrollbarsComponent.types.ts @@ -1,6 +1,7 @@ import type { OverlayScrollbars, PartialOptions, EventListeners } from 'overlayscrollbars'; -export interface OverlayScrollbarsComponentProps { +// Use "$" at the end so the type doesn't collide with generated type by svelte +export interface OverlayScrollbarsComponentProps$ { element?: string; options?: PartialOptions | false | null; events?: EventListeners | false | null;