move Spacer to UI

This commit is contained in:
Pavel Laptev 2024-10-25 15:21:33 +02:00
parent ed84a25334
commit 2ed3957ab3
9 changed files with 39 additions and 11 deletions

View File

@ -7,11 +7,11 @@
import derectionDoubtSvg from '$lib/assets/illustrations/direction-doubt.svg?raw'; import derectionDoubtSvg from '$lib/assets/illustrations/direction-doubt.svg?raw';
import { ProjectsService, Project } from '$lib/backend/projects'; import { ProjectsService, Project } from '$lib/backend/projects';
import { showError } from '$lib/notifications/toasts'; import { showError } from '$lib/notifications/toasts';
import Spacer from '$lib/shared/Spacer.svelte';
import * as toasts from '$lib/utils/toasts'; import * as toasts from '$lib/utils/toasts';
import { BranchController } from '$lib/vbranches/branchController'; import { BranchController } from '$lib/vbranches/branchController';
import { getContext } from '@gitbutler/shared/context'; import { getContext } from '@gitbutler/shared/context';
import Button from '@gitbutler/ui/Button.svelte'; import Button from '@gitbutler/ui/Button.svelte';
import Spacer from '@gitbutler/ui/Spacer.svelte';
import type { BaseBranch } from '$lib/baseBranch/baseBranch'; import type { BaseBranch } from '$lib/baseBranch/baseBranch';
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';

View File

@ -6,10 +6,10 @@
import { ProjectsService, Project } from '$lib/backend/projects'; import { ProjectsService, Project } from '$lib/backend/projects';
import { showError } from '$lib/notifications/toasts'; import { showError } from '$lib/notifications/toasts';
import ProjectNameLabel from '$lib/shared/ProjectNameLabel.svelte'; import ProjectNameLabel from '$lib/shared/ProjectNameLabel.svelte';
import Spacer from '$lib/shared/Spacer.svelte';
import * as toasts from '$lib/utils/toasts'; import * as toasts from '$lib/utils/toasts';
import { getContext } from '@gitbutler/shared/context'; import { getContext } from '@gitbutler/shared/context';
import Icon from '@gitbutler/ui/Icon.svelte'; import Icon from '@gitbutler/ui/Icon.svelte';
import Spacer from '@gitbutler/ui/Spacer.svelte';
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';
export let error: any = undefined; export let error: any = undefined;

View File

@ -5,9 +5,9 @@
import notFoundSvg from '$lib/assets/illustrations/not-found.svg?raw'; import notFoundSvg from '$lib/assets/illustrations/not-found.svg?raw';
import { ProjectsService } from '$lib/backend/projects'; import { ProjectsService } from '$lib/backend/projects';
import InfoMessage, { type MessageStyle } from '$lib/shared/InfoMessage.svelte'; import InfoMessage, { type MessageStyle } from '$lib/shared/InfoMessage.svelte';
import Spacer from '$lib/shared/Spacer.svelte';
import { getContext } from '@gitbutler/shared/context'; import { getContext } from '@gitbutler/shared/context';
import Button from '@gitbutler/ui/Button.svelte'; import Button from '@gitbutler/ui/Button.svelte';
import Spacer from '@gitbutler/ui/Spacer.svelte';
const projectsService = getContext(ProjectsService); const projectsService = getContext(ProjectsService);
const id = projectsService.getLastOpenedProject(); const id = projectsService.getLastOpenedProject();

View File

@ -3,11 +3,11 @@
import { ProjectsService } from '$lib/backend/projects'; import { ProjectsService } from '$lib/backend/projects';
import Section from '$lib/settings/Section.svelte'; import Section from '$lib/settings/Section.svelte';
import InfoMessage, { type MessageStyle } from '$lib/shared/InfoMessage.svelte'; import InfoMessage, { type MessageStyle } from '$lib/shared/InfoMessage.svelte';
import Spacer from '$lib/shared/Spacer.svelte';
import { parseRemoteUrl } from '$lib/url/gitUrl'; import { parseRemoteUrl } from '$lib/url/gitUrl';
import { getContext } from '@gitbutler/shared/context'; import { getContext } from '@gitbutler/shared/context';
import { persisted } from '@gitbutler/shared/persisted'; import { persisted } from '@gitbutler/shared/persisted';
import Button from '@gitbutler/ui/Button.svelte'; import Button from '@gitbutler/ui/Button.svelte';
import Spacer from '@gitbutler/ui/Spacer.svelte';
import Textbox from '@gitbutler/ui/Textbox.svelte'; import Textbox from '@gitbutler/ui/Textbox.svelte';
import * as Sentry from '@sentry/sveltekit'; import * as Sentry from '@sentry/sveltekit';
import { open } from '@tauri-apps/api/dialog'; import { open } from '@tauri-apps/api/dialog';

View File

@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import Spacer from '$lib/shared/Spacer.svelte'; import Spacer from '@gitbutler/ui/Spacer.svelte';
import { pxToRem } from '@gitbutler/ui/utils/pxToRem'; import { pxToRem } from '@gitbutler/ui/utils/pxToRem';
export let spacer = false; export let spacer = false;

View File

@ -12,7 +12,6 @@
import ScrollableContainer from '$lib/scroll/ScrollableContainer.svelte'; import ScrollableContainer from '$lib/scroll/ScrollableContainer.svelte';
import { SETTINGS, type Settings } from '$lib/settings/userSettings'; import { SETTINGS, type Settings } from '$lib/settings/userSettings';
import Resizer from '$lib/shared/Resizer.svelte'; import Resizer from '$lib/shared/Resizer.svelte';
import Spacer from '$lib/shared/Spacer.svelte';
import { intersectionObserver } from '$lib/utils/intersectionObserver'; import { intersectionObserver } from '$lib/utils/intersectionObserver';
import { BranchController } from '$lib/vbranches/branchController'; import { BranchController } from '$lib/vbranches/branchController';
import { FileIdSelection } from '$lib/vbranches/fileIdSelection'; import { FileIdSelection } from '$lib/vbranches/fileIdSelection';
@ -21,6 +20,7 @@
import { persisted } from '@gitbutler/shared/persisted'; import { persisted } from '@gitbutler/shared/persisted';
import Button from '@gitbutler/ui/Button.svelte'; import Button from '@gitbutler/ui/Button.svelte';
import EmptyStatePlaceholder from '@gitbutler/ui/EmptyStatePlaceholder.svelte'; import EmptyStatePlaceholder from '@gitbutler/ui/EmptyStatePlaceholder.svelte';
import Spacer from '@gitbutler/ui/Spacer.svelte';
import lscache from 'lscache'; import lscache from 'lscache';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import type { Writable } from 'svelte/store'; import type { Writable } from 'svelte/store';

View File

@ -1,13 +1,15 @@
<script lang="ts"> <script lang="ts" module>
import { pxToRem } from '@gitbutler/ui/utils/pxToRem'; export interface Props {
interface SpacerProps {
margin?: number; margin?: number;
noLine?: boolean; noLine?: boolean;
dotted?: boolean; dotted?: boolean;
} }
</script>
const { margin = 12, noLine = false, dotted = false }: SpacerProps = $props(); <script lang="ts">
import { pxToRem } from '$lib/utils/pxToRem';
const { margin = 12, noLine = false, dotted = false }: Props = $props();
function getMargins() { function getMargins() {
if (margin === undefined) { if (margin === undefined) {

View File

@ -0,0 +1,19 @@
import SpacerDemo from './SpacerDemo.svelte';
import type { Meta, StoryObj } from '@storybook/svelte';
const meta = {
title: 'Elements / Spacer',
component: SpacerDemo
} satisfies Meta<SpacerDemo>;
export default meta;
type Story = StoryObj<typeof meta>;
export const SpacerStory: Story = {
name: 'Spacer',
args: {
margin: 12,
noLine: false,
dotted: false
}
};

View File

@ -0,0 +1,7 @@
<script lang="ts">
import Spacer, { type Props } from '$lib/Spacer.svelte';
const props: Props = $props();
</script>
<Spacer {...props} />