Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.stories.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { ComponentProps } from "svelte";
import Header from "./Header.svelte";

export default {
title: "Fragments/Header",
component: Header,
tags: ["autodocs"],
render: (args: {
Component: Header;
props: ComponentProps<typeof Header>;
}) => ({
Component: Header,
props: args,
}),
};

export const Primary = {
args: {
variant: "primary",
heading: "metagram",
callback: () => alert("clicked"),
},
};

export const PrimaryWithNoFlash = {
args: {
variant: "primary",
heading: "messages",
},
};

export const Secondary = {
args: {
variant: "secondary",
heading: "Account",
},
};

export const SecondaryWithMenu = {
args: {
variant: "secondary",
heading: "Account",
callback: () => alert("menu clicked"),
},
};

export const Tertiary = {
args: {
variant: "tertiary",
callback: () => alert("clicked"),
},
};
108 changes: 108 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.svelte
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
<script lang="ts">
import { cn } from '$lib/utils';
import {
ArrowLeft01Icon,
ArrowLeft02Icon,
MoreVerticalIcon,
ZapIcon
} from '@hugeicons/core-free-icons';
import { HugeiconsIcon } from '@hugeicons/svelte';
import type { HTMLAttributes } from 'svelte/elements';

interface IHeaderProps extends HTMLAttributes<HTMLElement> {
variant: 'primary' | 'secondary' | 'tertiary';
heading?: string;
callback?: () => void;
}

const { variant, callback, heading, ...restProps }: IHeaderProps = $props();

const variantClasses = {
primary: {
text: 'text-transparent bg-clip-text bg-[image:var(--color-brand-gradient)]',
background: ''
},
secondary: {
text: '',
background: ''
},
tertiary: {
text: '',
background: 'bg-white/60'
}
};

const backButton = {
secondary: ArrowLeft01Icon,
tertiary: ArrowLeft02Icon
};

const menuButton = {
primary: ZapIcon,
secondary: MoreVerticalIcon,
tertiary: MoreVerticalIcon
};

const classes = $derived({
common: cn('flex items-center justify-between p-4'),
text: variantClasses[variant].text,
background: variantClasses[variant].background
});

const backButtonCallback = () => {
window.history.back();
};
</script>

<header {...restProps} class={cn([classes.common, restProps.class])}>
<span class="flex items-center gap-2">
{#if variant !== 'primary'}
<button
class={cn([
'cursor-pointer rounded-full p-2 hover:bg-gray-100',
classes.background
])}
onclick={backButtonCallback}
>
<HugeiconsIcon
icon={backButton[variant]}
size={24}
color="var(--color-black-500)"
/>
</button>
{/if}
{#if variant !== 'tertiary'}
<h1 class={cn([classes.text])}>
{heading}
</h1>
{/if}
</span>
{#if callback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIcon icon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
Comment on lines +80 to +87

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Use Svelte event handlers and add accessibility attributes.

Replace onclick with Svelte's on:click directive and add appropriate aria attributes for better accessibility.

 <button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
- onclick={callback}+ on:click={callback}+ aria-label="Menu"
>
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
on:click={callback}
aria-label="Menu"
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}

</header>

<!--
@component
@name Header
@description Header fragment.
@props
- variant: Can be 'primary' for home screen header with a flash, 'secondary' without flash, or 'tertiary'.
- heading: The main heading text.
- callback: A function to be called when the header is clicked.
@usage
<script>
import { Header } from "$lib/fragments";
</script>

<Header variant="primary" heading="metagram" callback={() => alert("clicked")} />
<Header variant="primary" heading="messages" />
<Header variant="secondary" heading="Account" />
<Header variant="secondary" heading="Account" callback={() => alert("clicked")} />
<Header variant="tertiary" callback={() => alert("clicked")} />
-->
1 change: 1 addition & 0 deletions platforms/metagram/src/lib/fragments/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { default as Header } from "./Header/Header.svelte";
export { default as BottomNav } from './BottomNav/BottomNav.svelte';
export { default as SettingsNavigationButton } from './SettingsNavigationButton/SettingsNavigationButton.svelte';
export { default as MessageInput } from './MessageInput/MessageInput.svelte';
Expand Down
38 changes: 9 additions & 29 deletions platforms/metagram/src/lib/ui/Button/Button.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
import type { HTMLButtonAttributes } from 'svelte/elements';

interface IButtonProps extends HTMLButtonAttributes {
variant?: 'primary' | 'secondary';
variant?: 'primary' | 'danger';
isLoading?: boolean;
callback?: () => Promise<void> | void;
blockingClick?: boolean;
Expand DownExpand Up@@ -39,29 +39,13 @@
};

const variantClasses = {
primary: {
background: 'bg-grey',
text: 'text-black-800',
border: 'border border-black-400'
},
secondary: {
background: 'bg-brand-burnt-orange',
text: 'text-white',
border: 'border border-brand-burnt-orange-600'
}
primary: { background: 'bg-grey', text: 'text-black-800' },
danger: { background: 'bg-red-500', text: 'text-white' }
};

const disabledVariantClasses = {
primary: {
background: 'bg-grey/50',
text: 'text-black-800/50',
border: 'border border-black-400/50'
},
secondary: {
background: 'bg-brand-burnt-orange/50',
text: 'text-white/50',
border: 'border border-brand-burnt-orange-600/50'
}
primary: { background: 'bg-grey/50', text: 'text-black-800/50' },
danger: { background: 'bg-red-500/50', text: 'text-white/50' }
};

const sizeVariant = {
Expand All@@ -80,9 +64,6 @@
text: disabled
? disabledVariantClasses[variant].text || variantClasses[variant].text
: variantClasses[variant].text,
border: disabled
? disabledVariantClasses[variant].border || variantClasses[variant].border
: variantClasses[variant].border,
disabled: 'cursor-not-allowed'
});
</script>
Expand All@@ -94,7 +75,6 @@
classes.common,
classes.background,
classes.text,
classes.border,
disabled && classes.disabled,
restProps.class
].join(' ')
Expand All@@ -118,12 +98,12 @@
</div>
</button>

<!--
<!--
@component
export default Button
@description
This component is a button with a loading spinner that can be used to indicate that an action is being performed.

@props
- variant: The variant of the button. Default is `primary`.
- size: The size of the button. Default is `md`.
Expand All@@ -132,13 +112,13 @@
- blockingClick: A boolean to indicate if the button should block the click event while the callback function is being executed.
- icon: A slot for an icon to be displayed inside the button.
- ...restProps: Any other props that can be passed to a button element.

@usage
```html
<script lang="ts">
import * as Button from '$lib/ui/Button'
</script>

<Button.Action variant="primary" callback={() => console.log('clicked')}>
Click me
</Button.Action>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.stories.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { ComponentProps } from "svelte";
import Header from "./Header.svelte";

export default {
title: "Fragments/Header",
component: Header,
tags: ["autodocs"],
render: (args: {
Component: Header;
props: ComponentProps<typeof Header>;
}) => ({
Component: Header,
props: args,
}),
};

export const Primary = {
args: {
variant: "primary",
heading: "metagram",
callback: () => alert("clicked"),
},
};

export const PrimaryWithNoFlash = {
args: {
variant: "primary",
heading: "messages",
},
};

export const Secondary = {
args: {
variant: "secondary",
heading: "Account",
},
};

export const SecondaryWithMenu = {
args: {
variant: "secondary",
heading: "Account",
callback: () => alert("menu clicked"),
},
};

export const Tertiary = {
args: {
variant: "tertiary",
callback: () => alert("clicked"),
},
};
108 changes: 108 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.svelte
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
<script lang="ts">
import { cn } from '$lib/utils';
import {
ArrowLeft01Icon,
ArrowLeft02Icon,
MoreVerticalIcon,
ZapIcon
} from '@hugeicons/core-free-icons';
import { HugeiconsIcon } from '@hugeicons/svelte';
import type { HTMLAttributes } from 'svelte/elements';

interface IHeaderProps extends HTMLAttributes<HTMLElement> {
variant: 'primary' | 'secondary' | 'tertiary';
heading?: string;
callback?: () => void;
}

const { variant, callback, heading, ...restProps }: IHeaderProps = $props();

const variantClasses = {
primary: {
text: 'text-transparent bg-clip-text bg-[image:var(--color-brand-gradient)]',
background: ''
},
secondary: {
text: '',
background: ''
},
tertiary: {
text: '',
background: 'bg-white/60'
}
};

const backButton = {
secondary: ArrowLeft01Icon,
tertiary: ArrowLeft02Icon
};

const menuButton = {
primary: ZapIcon,
secondary: MoreVerticalIcon,
tertiary: MoreVerticalIcon
};

const classes = $derived({
common: cn('flex items-center justify-between p-4'),
text: variantClasses[variant].text,
background: variantClasses[variant].background
});

const backButtonCallback = () => {
window.history.back();
};
</script>

<header {...restProps} class={cn([classes.common, restProps.class])}>
<span class="flex items-center gap-2">
{#if variant !== 'primary'}
<button
class={cn([
'cursor-pointer rounded-full p-2 hover:bg-gray-100',
classes.background
])}
onclick={backButtonCallback}
>
<HugeiconsIcon
icon={backButton[variant]}
size={24}
color="var(--color-black-500)"
/>
</button>
{/if}
{#if variant !== 'tertiary'}
<h1 class={cn([classes.text])}>
{heading}
</h1>
{/if}
</span>
{#if callback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIcon icon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
Comment on lines +80 to +87

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Use Svelte event handlers and add accessibility attributes.

Replace onclick with Svelte's on:click directive and add appropriate aria attributes for better accessibility.

 <button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
- onclick={callback}+ on:click={callback}+ aria-label="Menu"
>
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
on:click={callback}
aria-label="Menu"
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}

</header>

<!--
@component
@name Header
@description Header fragment.
@props
- variant: Can be 'primary' for home screen header with a flash, 'secondary' without flash, or 'tertiary'.
- heading: The main heading text.
- callback: A function to be called when the header is clicked.
@usage
<script>
import { Header } from "$lib/fragments";
</script>

<Header variant="primary" heading="metagram" callback={() => alert("clicked")} />
<Header variant="primary" heading="messages" />
<Header variant="secondary" heading="Account" />
<Header variant="secondary" heading="Account" callback={() => alert("clicked")} />
<Header variant="tertiary" callback={() => alert("clicked")} />
-->
1 change: 1 addition & 0 deletions platforms/metagram/src/lib/fragments/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { default as Header } from "./Header/Header.svelte";
export { default as BottomNav } from './BottomNav/BottomNav.svelte';
export { default as SettingsNavigationButton } from './SettingsNavigationButton/SettingsNavigationButton.svelte';
export { default as MessageInput } from './MessageInput/MessageInput.svelte';
Expand Down
38 changes: 9 additions & 29 deletions platforms/metagram/src/lib/ui/Button/Button.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
import type { HTMLButtonAttributes } from 'svelte/elements';

interface IButtonProps extends HTMLButtonAttributes {
variant?: 'primary' | 'secondary';
variant?: 'primary' | 'danger';
isLoading?: boolean;
callback?: () => Promise<void> | void;
blockingClick?: boolean;
Expand DownExpand Up@@ -39,29 +39,13 @@
};

const variantClasses = {
primary: {
background: 'bg-grey',
text: 'text-black-800',
border: 'border border-black-400'
},
secondary: {
background: 'bg-brand-burnt-orange',
text: 'text-white',
border: 'border border-brand-burnt-orange-600'
}
primary: { background: 'bg-grey', text: 'text-black-800' },
danger: { background: 'bg-red-500', text: 'text-white' }
};

const disabledVariantClasses = {
primary: {
background: 'bg-grey/50',
text: 'text-black-800/50',
border: 'border border-black-400/50'
},
secondary: {
background: 'bg-brand-burnt-orange/50',
text: 'text-white/50',
border: 'border border-brand-burnt-orange-600/50'
}
primary: { background: 'bg-grey/50', text: 'text-black-800/50' },
danger: { background: 'bg-red-500/50', text: 'text-white/50' }
};

const sizeVariant = {
Expand All@@ -80,9 +64,6 @@
text: disabled
? disabledVariantClasses[variant].text || variantClasses[variant].text
: variantClasses[variant].text,
border: disabled
? disabledVariantClasses[variant].border || variantClasses[variant].border
: variantClasses[variant].border,
disabled: 'cursor-not-allowed'
});
</script>
Expand All@@ -94,7 +75,6 @@
classes.common,
classes.background,
classes.text,
classes.border,
disabled && classes.disabled,
restProps.class
].join(' ')
Expand All@@ -118,12 +98,12 @@
</div>
</button>

<!--
<!--
@component
export default Button
@description
This component is a button with a loading spinner that can be used to indicate that an action is being performed.

@props
- variant: The variant of the button. Default is `primary`.
- size: The size of the button. Default is `md`.
Expand All@@ -132,13 +112,13 @@
- blockingClick: A boolean to indicate if the button should block the click event while the callback function is being executed.
- icon: A slot for an icon to be displayed inside the button.
- ...restProps: Any other props that can be passed to a button element.

@usage
```html
<script lang="ts">
import * as Button from '$lib/ui/Button'
</script>

<Button.Action variant="primary" callback={() => console.log('clicked')}>
Click me
</Button.Action>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.stories.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { ComponentProps } from "svelte";
import Header from "./Header.svelte";

export default {
title: "Fragments/Header",
component: Header,
tags: ["autodocs"],
render: (args: {
Component: Header;
props: ComponentProps<typeof Header>;
}) => ({
Component: Header,
props: args,
}),
};

export const Primary = {
args: {
variant: "primary",
heading: "metagram",
callback: () => alert("clicked"),
},
};

export const PrimaryWithNoFlash = {
args: {
variant: "primary",
heading: "messages",
},
};

export const Secondary = {
args: {
variant: "secondary",
heading: "Account",
},
};

export const SecondaryWithMenu = {
args: {
variant: "secondary",
heading: "Account",
callback: () => alert("menu clicked"),
},
};

export const Tertiary = {
args: {
variant: "tertiary",
callback: () => alert("clicked"),
},
};
108 changes: 108 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.svelte
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
<script lang="ts">
import { cn } from '$lib/utils';
import {
ArrowLeft01Icon,
ArrowLeft02Icon,
MoreVerticalIcon,
ZapIcon
} from '@hugeicons/core-free-icons';
import { HugeiconsIcon } from '@hugeicons/svelte';
import type { HTMLAttributes } from 'svelte/elements';

interface IHeaderProps extends HTMLAttributes<HTMLElement> {
variant: 'primary' | 'secondary' | 'tertiary';
heading?: string;
callback?: () => void;
}

const { variant, callback, heading, ...restProps }: IHeaderProps = $props();

const variantClasses = {
primary: {
text: 'text-transparent bg-clip-text bg-[image:var(--color-brand-gradient)]',
background: ''
},
secondary: {
text: '',
background: ''
},
tertiary: {
text: '',
background: 'bg-white/60'
}
};

const backButton = {
secondary: ArrowLeft01Icon,
tertiary: ArrowLeft02Icon
};

const menuButton = {
primary: ZapIcon,
secondary: MoreVerticalIcon,
tertiary: MoreVerticalIcon
};

const classes = $derived({
common: cn('flex items-center justify-between p-4'),
text: variantClasses[variant].text,
background: variantClasses[variant].background
});

const backButtonCallback = () => {
window.history.back();
};
</script>

<header {...restProps} class={cn([classes.common, restProps.class])}>
<span class="flex items-center gap-2">
{#if variant !== 'primary'}
<button
class={cn([
'cursor-pointer rounded-full p-2 hover:bg-gray-100',
classes.background
])}
onclick={backButtonCallback}
>
<HugeiconsIcon
icon={backButton[variant]}
size={24}
color="var(--color-black-500)"
/>
</button>
{/if}
{#if variant !== 'tertiary'}
<h1 class={cn([classes.text])}>
{heading}
</h1>
{/if}
</span>
{#if callback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIcon icon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
Comment on lines +80 to +87

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Use Svelte event handlers and add accessibility attributes.

Replace onclick with Svelte's on:click directive and add appropriate aria attributes for better accessibility.

 <button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
- onclick={callback}+ on:click={callback}+ aria-label="Menu"
>
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
on:click={callback}
aria-label="Menu"
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}

</header>

<!--
@component
@name Header
@description Header fragment.
@props
- variant: Can be 'primary' for home screen header with a flash, 'secondary' without flash, or 'tertiary'.
- heading: The main heading text.
- callback: A function to be called when the header is clicked.
@usage
<script>
import { Header } from "$lib/fragments";
</script>

<Header variant="primary" heading="metagram" callback={() => alert("clicked")} />
<Header variant="primary" heading="messages" />
<Header variant="secondary" heading="Account" />
<Header variant="secondary" heading="Account" callback={() => alert("clicked")} />
<Header variant="tertiary" callback={() => alert("clicked")} />
-->
1 change: 1 addition & 0 deletions platforms/metagram/src/lib/fragments/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { default as Header } from "./Header/Header.svelte";
export { default as BottomNav } from './BottomNav/BottomNav.svelte';
export { default as SettingsNavigationButton } from './SettingsNavigationButton/SettingsNavigationButton.svelte';
export { default as MessageInput } from './MessageInput/MessageInput.svelte';
Expand Down
38 changes: 9 additions & 29 deletions platforms/metagram/src/lib/ui/Button/Button.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
import type { HTMLButtonAttributes } from 'svelte/elements';

interface IButtonProps extends HTMLButtonAttributes {
variant?: 'primary' | 'secondary';
variant?: 'primary' | 'danger';
isLoading?: boolean;
callback?: () => Promise<void> | void;
blockingClick?: boolean;
Expand DownExpand Up@@ -39,29 +39,13 @@
};

const variantClasses = {
primary: {
background: 'bg-grey',
text: 'text-black-800',
border: 'border border-black-400'
},
secondary: {
background: 'bg-brand-burnt-orange',
text: 'text-white',
border: 'border border-brand-burnt-orange-600'
}
primary: { background: 'bg-grey', text: 'text-black-800' },
danger: { background: 'bg-red-500', text: 'text-white' }
};

const disabledVariantClasses = {
primary: {
background: 'bg-grey/50',
text: 'text-black-800/50',
border: 'border border-black-400/50'
},
secondary: {
background: 'bg-brand-burnt-orange/50',
text: 'text-white/50',
border: 'border border-brand-burnt-orange-600/50'
}
primary: { background: 'bg-grey/50', text: 'text-black-800/50' },
danger: { background: 'bg-red-500/50', text: 'text-white/50' }
};

const sizeVariant = {
Expand All@@ -80,9 +64,6 @@
text: disabled
? disabledVariantClasses[variant].text || variantClasses[variant].text
: variantClasses[variant].text,
border: disabled
? disabledVariantClasses[variant].border || variantClasses[variant].border
: variantClasses[variant].border,
disabled: 'cursor-not-allowed'
});
</script>
Expand All@@ -94,7 +75,6 @@
classes.common,
classes.background,
classes.text,
classes.border,
disabled && classes.disabled,
restProps.class
].join(' ')
Expand All@@ -118,12 +98,12 @@
</div>
</button>

<!--
<!--
@component
export default Button
@description
This component is a button with a loading spinner that can be used to indicate that an action is being performed.

@props
- variant: The variant of the button. Default is `primary`.
- size: The size of the button. Default is `md`.
Expand All@@ -132,13 +112,13 @@
- blockingClick: A boolean to indicate if the button should block the click event while the callback function is being executed.
- icon: A slot for an icon to be displayed inside the button.
- ...restProps: Any other props that can be passed to a button element.

@usage
```html
<script lang="ts">
import * as Button from '$lib/ui/Button'
</script>

<Button.Action variant="primary" callback={() => console.log('clicked')}>
Click me
</Button.Action>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.stories.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { ComponentProps } from "svelte";
import Header from "./Header.svelte";

export default {
title: "Fragments/Header",
component: Header,
tags: ["autodocs"],
render: (args: {
Component: Header;
props: ComponentProps<typeof Header>;
}) => ({
Component: Header,
props: args,
}),
};

export const Primary = {
args: {
variant: "primary",
heading: "metagram",
callback: () => alert("clicked"),
},
};

export const PrimaryWithNoFlash = {
args: {
variant: "primary",
heading: "messages",
},
};

export const Secondary = {
args: {
variant: "secondary",
heading: "Account",
},
};

export const SecondaryWithMenu = {
args: {
variant: "secondary",
heading: "Account",
callback: () => alert("menu clicked"),
},
};

export const Tertiary = {
args: {
variant: "tertiary",
callback: () => alert("clicked"),
},
};
108 changes: 108 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.svelte
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
<script lang="ts">
import { cn } from '$lib/utils';
import {
ArrowLeft01Icon,
ArrowLeft02Icon,
MoreVerticalIcon,
ZapIcon
} from '@hugeicons/core-free-icons';
import { HugeiconsIcon } from '@hugeicons/svelte';
import type { HTMLAttributes } from 'svelte/elements';

interface IHeaderProps extends HTMLAttributes<HTMLElement> {
variant: 'primary' | 'secondary' | 'tertiary';
heading?: string;
callback?: () => void;
}

const { variant, callback, heading, ...restProps }: IHeaderProps = $props();

const variantClasses = {
primary: {
text: 'text-transparent bg-clip-text bg-[image:var(--color-brand-gradient)]',
background: ''
},
secondary: {
text: '',
background: ''
},
tertiary: {
text: '',
background: 'bg-white/60'
}
};

const backButton = {
secondary: ArrowLeft01Icon,
tertiary: ArrowLeft02Icon
};

const menuButton = {
primary: ZapIcon,
secondary: MoreVerticalIcon,
tertiary: MoreVerticalIcon
};

const classes = $derived({
common: cn('flex items-center justify-between p-4'),
text: variantClasses[variant].text,
background: variantClasses[variant].background
});

const backButtonCallback = () => {
window.history.back();
};
</script>

<header {...restProps} class={cn([classes.common, restProps.class])}>
<span class="flex items-center gap-2">
{#if variant !== 'primary'}
<button
class={cn([
'cursor-pointer rounded-full p-2 hover:bg-gray-100',
classes.background
])}
onclick={backButtonCallback}
>
<HugeiconsIcon
icon={backButton[variant]}
size={24}
color="var(--color-black-500)"
/>
</button>
{/if}
{#if variant !== 'tertiary'}
<h1 class={cn([classes.text])}>
{heading}
</h1>
{/if}
</span>
{#if callback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIcon icon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
Comment on lines +80 to +87

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Use Svelte event handlers and add accessibility attributes.

Replace onclick with Svelte's on:click directive and add appropriate aria attributes for better accessibility.

 <button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
- onclick={callback}+ on:click={callback}+ aria-label="Menu"
>
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
on:click={callback}
aria-label="Menu"
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}

</header>

<!--
@component
@name Header
@description Header fragment.
@props
- variant: Can be 'primary' for home screen header with a flash, 'secondary' without flash, or 'tertiary'.
- heading: The main heading text.
- callback: A function to be called when the header is clicked.
@usage
<script>
import { Header } from "$lib/fragments";
</script>

<Header variant="primary" heading="metagram" callback={() => alert("clicked")} />
<Header variant="primary" heading="messages" />
<Header variant="secondary" heading="Account" />
<Header variant="secondary" heading="Account" callback={() => alert("clicked")} />
<Header variant="tertiary" callback={() => alert("clicked")} />
-->
1 change: 1 addition & 0 deletions platforms/metagram/src/lib/fragments/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { default as Header } from "./Header/Header.svelte";
export { default as BottomNav } from './BottomNav/BottomNav.svelte';
export { default as SettingsNavigationButton } from './SettingsNavigationButton/SettingsNavigationButton.svelte';
export { default as MessageInput } from './MessageInput/MessageInput.svelte';
Expand Down
38 changes: 9 additions & 29 deletions platforms/metagram/src/lib/ui/Button/Button.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
import type { HTMLButtonAttributes } from 'svelte/elements';

interface IButtonProps extends HTMLButtonAttributes {
variant?: 'primary' | 'secondary';
variant?: 'primary' | 'danger';
isLoading?: boolean;
callback?: () => Promise<void> | void;
blockingClick?: boolean;
Expand DownExpand Up@@ -39,29 +39,13 @@
};

const variantClasses = {
primary: {
background: 'bg-grey',
text: 'text-black-800',
border: 'border border-black-400'
},
secondary: {
background: 'bg-brand-burnt-orange',
text: 'text-white',
border: 'border border-brand-burnt-orange-600'
}
primary: { background: 'bg-grey', text: 'text-black-800' },
danger: { background: 'bg-red-500', text: 'text-white' }
};

const disabledVariantClasses = {
primary: {
background: 'bg-grey/50',
text: 'text-black-800/50',
border: 'border border-black-400/50'
},
secondary: {
background: 'bg-brand-burnt-orange/50',
text: 'text-white/50',
border: 'border border-brand-burnt-orange-600/50'
}
primary: { background: 'bg-grey/50', text: 'text-black-800/50' },
danger: { background: 'bg-red-500/50', text: 'text-white/50' }
};

const sizeVariant = {
Expand All@@ -80,9 +64,6 @@
text: disabled
? disabledVariantClasses[variant].text || variantClasses[variant].text
: variantClasses[variant].text,
border: disabled
? disabledVariantClasses[variant].border || variantClasses[variant].border
: variantClasses[variant].border,
disabled: 'cursor-not-allowed'
});
</script>
Expand All@@ -94,7 +75,6 @@
classes.common,
classes.background,
classes.text,
classes.border,
disabled && classes.disabled,
restProps.class
].join(' ')
Expand All@@ -118,12 +98,12 @@
</div>
</button>

<!--
<!--
@component
export default Button
@description
This component is a button with a loading spinner that can be used to indicate that an action is being performed.

@props
- variant: The variant of the button. Default is `primary`.
- size: The size of the button. Default is `md`.
Expand All@@ -132,13 +112,13 @@
- blockingClick: A boolean to indicate if the button should block the click event while the callback function is being executed.
- icon: A slot for an icon to be displayed inside the button.
- ...restProps: Any other props that can be passed to a button element.

@usage
```html
<script lang="ts">
import * as Button from '$lib/ui/Button'
</script>

<Button.Action variant="primary" callback={() => console.log('clicked')}>
Click me
</Button.Action>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.stories.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { ComponentProps } from "svelte";
import Header from "./Header.svelte";

export default {
title: "Fragments/Header",
component: Header,
tags: ["autodocs"],
render: (args: {
Component: Header;
props: ComponentProps<typeof Header>;
}) => ({
Component: Header,
props: args,
}),
};

export const Primary = {
args: {
variant: "primary",
heading: "metagram",
callback: () => alert("clicked"),
},
};

export const PrimaryWithNoFlash = {
args: {
variant: "primary",
heading: "messages",
},
};

export const Secondary = {
args: {
variant: "secondary",
heading: "Account",
},
};

export const SecondaryWithMenu = {
args: {
variant: "secondary",
heading: "Account",
callback: () => alert("menu clicked"),
},
};

export const Tertiary = {
args: {
variant: "tertiary",
callback: () => alert("clicked"),
},
};
108 changes: 108 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.svelte
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
<script lang="ts">
import { cn } from '$lib/utils';
import {
ArrowLeft01Icon,
ArrowLeft02Icon,
MoreVerticalIcon,
ZapIcon
} from '@hugeicons/core-free-icons';
import { HugeiconsIcon } from '@hugeicons/svelte';
import type { HTMLAttributes } from 'svelte/elements';

interface IHeaderProps extends HTMLAttributes<HTMLElement> {
variant: 'primary' | 'secondary' | 'tertiary';
heading?: string;
callback?: () => void;
}

const { variant, callback, heading, ...restProps }: IHeaderProps = $props();

const variantClasses = {
primary: {
text: 'text-transparent bg-clip-text bg-[image:var(--color-brand-gradient)]',
background: ''
},
secondary: {
text: '',
background: ''
},
tertiary: {
text: '',
background: 'bg-white/60'
}
};

const backButton = {
secondary: ArrowLeft01Icon,
tertiary: ArrowLeft02Icon
};

const menuButton = {
primary: ZapIcon,
secondary: MoreVerticalIcon,
tertiary: MoreVerticalIcon
};

const classes = $derived({
common: cn('flex items-center justify-between p-4'),
text: variantClasses[variant].text,
background: variantClasses[variant].background
});

const backButtonCallback = () => {
window.history.back();
};
</script>

<header {...restProps} class={cn([classes.common, restProps.class])}>
<span class="flex items-center gap-2">
{#if variant !== 'primary'}
<button
class={cn([
'cursor-pointer rounded-full p-2 hover:bg-gray-100',
classes.background
])}
onclick={backButtonCallback}
>
<HugeiconsIcon
icon={backButton[variant]}
size={24}
color="var(--color-black-500)"
/>
</button>
{/if}
{#if variant !== 'tertiary'}
<h1 class={cn([classes.text])}>
{heading}
</h1>
{/if}
</span>
{#if callback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIcon icon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
Comment on lines +80 to +87

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Use Svelte event handlers and add accessibility attributes.

Replace onclick with Svelte's on:click directive and add appropriate aria attributes for better accessibility.

 <button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
- onclick={callback}+ on:click={callback}+ aria-label="Menu"
>
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
on:click={callback}
aria-label="Menu"
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}

</header>

<!--
@component
@name Header
@description Header fragment.
@props
- variant: Can be 'primary' for home screen header with a flash, 'secondary' without flash, or 'tertiary'.
- heading: The main heading text.
- callback: A function to be called when the header is clicked.
@usage
<script>
import { Header } from "$lib/fragments";
</script>

<Header variant="primary" heading="metagram" callback={() => alert("clicked")} />
<Header variant="primary" heading="messages" />
<Header variant="secondary" heading="Account" />
<Header variant="secondary" heading="Account" callback={() => alert("clicked")} />
<Header variant="tertiary" callback={() => alert("clicked")} />
-->
1 change: 1 addition & 0 deletions platforms/metagram/src/lib/fragments/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { default as Header } from "./Header/Header.svelte";
export { default as BottomNav } from './BottomNav/BottomNav.svelte';
export { default as SettingsNavigationButton } from './SettingsNavigationButton/SettingsNavigationButton.svelte';
export { default as MessageInput } from './MessageInput/MessageInput.svelte';
Expand Down
38 changes: 9 additions & 29 deletions platforms/metagram/src/lib/ui/Button/Button.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
import type { HTMLButtonAttributes } from 'svelte/elements';

interface IButtonProps extends HTMLButtonAttributes {
variant?: 'primary' | 'secondary';
variant?: 'primary' | 'danger';
isLoading?: boolean;
callback?: () => Promise<void> | void;
blockingClick?: boolean;
Expand DownExpand Up@@ -39,29 +39,13 @@
};

const variantClasses = {
primary: {
background: 'bg-grey',
text: 'text-black-800',
border: 'border border-black-400'
},
secondary: {
background: 'bg-brand-burnt-orange',
text: 'text-white',
border: 'border border-brand-burnt-orange-600'
}
primary: { background: 'bg-grey', text: 'text-black-800' },
danger: { background: 'bg-red-500', text: 'text-white' }
};

const disabledVariantClasses = {
primary: {
background: 'bg-grey/50',
text: 'text-black-800/50',
border: 'border border-black-400/50'
},
secondary: {
background: 'bg-brand-burnt-orange/50',
text: 'text-white/50',
border: 'border border-brand-burnt-orange-600/50'
}
primary: { background: 'bg-grey/50', text: 'text-black-800/50' },
danger: { background: 'bg-red-500/50', text: 'text-white/50' }
};

const sizeVariant = {
Expand All@@ -80,9 +64,6 @@
text: disabled
? disabledVariantClasses[variant].text || variantClasses[variant].text
: variantClasses[variant].text,
border: disabled
? disabledVariantClasses[variant].border || variantClasses[variant].border
: variantClasses[variant].border,
disabled: 'cursor-not-allowed'
});
</script>
Expand All@@ -94,7 +75,6 @@
classes.common,
classes.background,
classes.text,
classes.border,
disabled && classes.disabled,
restProps.class
].join(' ')
Expand All@@ -118,12 +98,12 @@
</div>
</button>

<!--
<!--
@component
export default Button
@description
This component is a button with a loading spinner that can be used to indicate that an action is being performed.

@props
- variant: The variant of the button. Default is `primary`.
- size: The size of the button. Default is `md`.
Expand All@@ -132,13 +112,13 @@
- blockingClick: A boolean to indicate if the button should block the click event while the callback function is being executed.
- icon: A slot for an icon to be displayed inside the button.
- ...restProps: Any other props that can be passed to a button element.

@usage
```html
<script lang="ts">
import * as Button from '$lib/ui/Button'
</script>

<Button.Action variant="primary" callback={() => console.log('clicked')}>
Click me
</Button.Action>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.stories.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { ComponentProps } from "svelte";
import Header from "./Header.svelte";

export default {
title: "Fragments/Header",
component: Header,
tags: ["autodocs"],
render: (args: {
Component: Header;
props: ComponentProps<typeof Header>;
}) => ({
Component: Header,
props: args,
}),
};

export const Primary = {
args: {
variant: "primary",
heading: "metagram",
callback: () => alert("clicked"),
},
};

export const PrimaryWithNoFlash = {
args: {
variant: "primary",
heading: "messages",
},
};

export const Secondary = {
args: {
variant: "secondary",
heading: "Account",
},
};

export const SecondaryWithMenu = {
args: {
variant: "secondary",
heading: "Account",
callback: () => alert("menu clicked"),
},
};

export const Tertiary = {
args: {
variant: "tertiary",
callback: () => alert("clicked"),
},
};
108 changes: 108 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.svelte
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
<script lang="ts">
import { cn } from '$lib/utils';
import {
ArrowLeft01Icon,
ArrowLeft02Icon,
MoreVerticalIcon,
ZapIcon
} from '@hugeicons/core-free-icons';
import { HugeiconsIcon } from '@hugeicons/svelte';
import type { HTMLAttributes } from 'svelte/elements';

interface IHeaderProps extends HTMLAttributes<HTMLElement> {
variant: 'primary' | 'secondary' | 'tertiary';
heading?: string;
callback?: () => void;
}

const { variant, callback, heading, ...restProps }: IHeaderProps = $props();

const variantClasses = {
primary: {
text: 'text-transparent bg-clip-text bg-[image:var(--color-brand-gradient)]',
background: ''
},
secondary: {
text: '',
background: ''
},
tertiary: {
text: '',
background: 'bg-white/60'
}
};

const backButton = {
secondary: ArrowLeft01Icon,
tertiary: ArrowLeft02Icon
};

const menuButton = {
primary: ZapIcon,
secondary: MoreVerticalIcon,
tertiary: MoreVerticalIcon
};

const classes = $derived({
common: cn('flex items-center justify-between p-4'),
text: variantClasses[variant].text,
background: variantClasses[variant].background
});

const backButtonCallback = () => {
window.history.back();
};
</script>

<header {...restProps} class={cn([classes.common, restProps.class])}>
<span class="flex items-center gap-2">
{#if variant !== 'primary'}
<button
class={cn([
'cursor-pointer rounded-full p-2 hover:bg-gray-100',
classes.background
])}
onclick={backButtonCallback}
>
<HugeiconsIcon
icon={backButton[variant]}
size={24}
color="var(--color-black-500)"
/>
</button>
{/if}
{#if variant !== 'tertiary'}
<h1 class={cn([classes.text])}>
{heading}
</h1>
{/if}
</span>
{#if callback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIcon icon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
Comment on lines +80 to +87

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Use Svelte event handlers and add accessibility attributes.

Replace onclick with Svelte's on:click directive and add appropriate aria attributes for better accessibility.

 <button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
- onclick={callback}+ on:click={callback}+ aria-label="Menu"
>
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
on:click={callback}
aria-label="Menu"
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}

</header>

<!--
@component
@name Header
@description Header fragment.
@props
- variant: Can be 'primary' for home screen header with a flash, 'secondary' without flash, or 'tertiary'.
- heading: The main heading text.
- callback: A function to be called when the header is clicked.
@usage
<script>
import { Header } from "$lib/fragments";
</script>

<Header variant="primary" heading="metagram" callback={() => alert("clicked")} />
<Header variant="primary" heading="messages" />
<Header variant="secondary" heading="Account" />
<Header variant="secondary" heading="Account" callback={() => alert("clicked")} />
<Header variant="tertiary" callback={() => alert("clicked")} />
-->
1 change: 1 addition & 0 deletions platforms/metagram/src/lib/fragments/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { default as Header } from "./Header/Header.svelte";
export { default as BottomNav } from './BottomNav/BottomNav.svelte';
export { default as SettingsNavigationButton } from './SettingsNavigationButton/SettingsNavigationButton.svelte';
export { default as MessageInput } from './MessageInput/MessageInput.svelte';
Expand Down
38 changes: 9 additions & 29 deletions platforms/metagram/src/lib/ui/Button/Button.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
import type { HTMLButtonAttributes } from 'svelte/elements';

interface IButtonProps extends HTMLButtonAttributes {
variant?: 'primary' | 'secondary';
variant?: 'primary' | 'danger';
isLoading?: boolean;
callback?: () => Promise<void> | void;
blockingClick?: boolean;
Expand DownExpand Up@@ -39,29 +39,13 @@
};

const variantClasses = {
primary: {
background: 'bg-grey',
text: 'text-black-800',
border: 'border border-black-400'
},
secondary: {
background: 'bg-brand-burnt-orange',
text: 'text-white',
border: 'border border-brand-burnt-orange-600'
}
primary: { background: 'bg-grey', text: 'text-black-800' },
danger: { background: 'bg-red-500', text: 'text-white' }
};

const disabledVariantClasses = {
primary: {
background: 'bg-grey/50',
text: 'text-black-800/50',
border: 'border border-black-400/50'
},
secondary: {
background: 'bg-brand-burnt-orange/50',
text: 'text-white/50',
border: 'border border-brand-burnt-orange-600/50'
}
primary: { background: 'bg-grey/50', text: 'text-black-800/50' },
danger: { background: 'bg-red-500/50', text: 'text-white/50' }
};

const sizeVariant = {
Expand All@@ -80,9 +64,6 @@
text: disabled
? disabledVariantClasses[variant].text || variantClasses[variant].text
: variantClasses[variant].text,
border: disabled
? disabledVariantClasses[variant].border || variantClasses[variant].border
: variantClasses[variant].border,
disabled: 'cursor-not-allowed'
});
</script>
Expand All@@ -94,7 +75,6 @@
classes.common,
classes.background,
classes.text,
classes.border,
disabled && classes.disabled,
restProps.class
].join(' ')
Expand All@@ -118,12 +98,12 @@
</div>
</button>

<!--
<!--
@component
export default Button
@description
This component is a button with a loading spinner that can be used to indicate that an action is being performed.

@props
- variant: The variant of the button. Default is `primary`.
- size: The size of the button. Default is `md`.
Expand All@@ -132,13 +112,13 @@
- blockingClick: A boolean to indicate if the button should block the click event while the callback function is being executed.
- icon: A slot for an icon to be displayed inside the button.
- ...restProps: Any other props that can be passed to a button element.

@usage
```html
<script lang="ts">
import * as Button from '$lib/ui/Button'
</script>

<Button.Action variant="primary" callback={() => console.log('clicked')}>
Click me
</Button.Action>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.stories.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { ComponentProps } from "svelte";
import Header from "./Header.svelte";

export default {
title: "Fragments/Header",
component: Header,
tags: ["autodocs"],
render: (args: {
Component: Header;
props: ComponentProps<typeof Header>;
}) => ({
Component: Header,
props: args,
}),
};

export const Primary = {
args: {
variant: "primary",
heading: "metagram",
callback: () => alert("clicked"),
},
};

export const PrimaryWithNoFlash = {
args: {
variant: "primary",
heading: "messages",
},
};

export const Secondary = {
args: {
variant: "secondary",
heading: "Account",
},
};

export const SecondaryWithMenu = {
args: {
variant: "secondary",
heading: "Account",
callback: () => alert("menu clicked"),
},
};

export const Tertiary = {
args: {
variant: "tertiary",
callback: () => alert("clicked"),
},
};
108 changes: 108 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.svelte
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
<script lang="ts">
import { cn } from '$lib/utils';
import {
ArrowLeft01Icon,
ArrowLeft02Icon,
MoreVerticalIcon,
ZapIcon
} from '@hugeicons/core-free-icons';
import { HugeiconsIcon } from '@hugeicons/svelte';
import type { HTMLAttributes } from 'svelte/elements';

interface IHeaderProps extends HTMLAttributes<HTMLElement> {
variant: 'primary' | 'secondary' | 'tertiary';
heading?: string;
callback?: () => void;
}

const { variant, callback, heading, ...restProps }: IHeaderProps = $props();

const variantClasses = {
primary: {
text: 'text-transparent bg-clip-text bg-[image:var(--color-brand-gradient)]',
background: ''
},
secondary: {
text: '',
background: ''
},
tertiary: {
text: '',
background: 'bg-white/60'
}
};

const backButton = {
secondary: ArrowLeft01Icon,
tertiary: ArrowLeft02Icon
};

const menuButton = {
primary: ZapIcon,
secondary: MoreVerticalIcon,
tertiary: MoreVerticalIcon
};

const classes = $derived({
common: cn('flex items-center justify-between p-4'),
text: variantClasses[variant].text,
background: variantClasses[variant].background
});

const backButtonCallback = () => {
window.history.back();
};
</script>

<header {...restProps} class={cn([classes.common, restProps.class])}>
<span class="flex items-center gap-2">
{#if variant !== 'primary'}
<button
class={cn([
'cursor-pointer rounded-full p-2 hover:bg-gray-100',
classes.background
])}
onclick={backButtonCallback}
>
<HugeiconsIcon
icon={backButton[variant]}
size={24}
color="var(--color-black-500)"
/>
</button>
{/if}
{#if variant !== 'tertiary'}
<h1 class={cn([classes.text])}>
{heading}
</h1>
{/if}
</span>
{#if callback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIcon icon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
Comment on lines +80 to +87

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Use Svelte event handlers and add accessibility attributes.

Replace onclick with Svelte's on:click directive and add appropriate aria attributes for better accessibility.

 <button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
- onclick={callback}+ on:click={callback}+ aria-label="Menu"
>
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
on:click={callback}
aria-label="Menu"
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}

</header>

<!--
@component
@name Header
@description Header fragment.
@props
- variant: Can be 'primary' for home screen header with a flash, 'secondary' without flash, or 'tertiary'.
- heading: The main heading text.
- callback: A function to be called when the header is clicked.
@usage
<script>
import { Header } from "$lib/fragments";
</script>

<Header variant="primary" heading="metagram" callback={() => alert("clicked")} />
<Header variant="primary" heading="messages" />
<Header variant="secondary" heading="Account" />
<Header variant="secondary" heading="Account" callback={() => alert("clicked")} />
<Header variant="tertiary" callback={() => alert("clicked")} />
-->
1 change: 1 addition & 0 deletions platforms/metagram/src/lib/fragments/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { default as Header } from "./Header/Header.svelte";
export { default as BottomNav } from './BottomNav/BottomNav.svelte';
export { default as SettingsNavigationButton } from './SettingsNavigationButton/SettingsNavigationButton.svelte';
export { default as MessageInput } from './MessageInput/MessageInput.svelte';
Expand Down
38 changes: 9 additions & 29 deletions platforms/metagram/src/lib/ui/Button/Button.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
import type { HTMLButtonAttributes } from 'svelte/elements';

interface IButtonProps extends HTMLButtonAttributes {
variant?: 'primary' | 'secondary';
variant?: 'primary' | 'danger';
isLoading?: boolean;
callback?: () => Promise<void> | void;
blockingClick?: boolean;
Expand DownExpand Up@@ -39,29 +39,13 @@
};

const variantClasses = {
primary: {
background: 'bg-grey',
text: 'text-black-800',
border: 'border border-black-400'
},
secondary: {
background: 'bg-brand-burnt-orange',
text: 'text-white',
border: 'border border-brand-burnt-orange-600'
}
primary: { background: 'bg-grey', text: 'text-black-800' },
danger: { background: 'bg-red-500', text: 'text-white' }
};

const disabledVariantClasses = {
primary: {
background: 'bg-grey/50',
text: 'text-black-800/50',
border: 'border border-black-400/50'
},
secondary: {
background: 'bg-brand-burnt-orange/50',
text: 'text-white/50',
border: 'border border-brand-burnt-orange-600/50'
}
primary: { background: 'bg-grey/50', text: 'text-black-800/50' },
danger: { background: 'bg-red-500/50', text: 'text-white/50' }
};

const sizeVariant = {
Expand All@@ -80,9 +64,6 @@
text: disabled
? disabledVariantClasses[variant].text || variantClasses[variant].text
: variantClasses[variant].text,
border: disabled
? disabledVariantClasses[variant].border || variantClasses[variant].border
: variantClasses[variant].border,
disabled: 'cursor-not-allowed'
});
</script>
Expand All@@ -94,7 +75,6 @@
classes.common,
classes.background,
classes.text,
classes.border,
disabled && classes.disabled,
restProps.class
].join(' ')
Expand All@@ -118,12 +98,12 @@
</div>
</button>

<!--
<!--
@component
export default Button
@description
This component is a button with a loading spinner that can be used to indicate that an action is being performed.

@props
- variant: The variant of the button. Default is `primary`.
- size: The size of the button. Default is `md`.
Expand All@@ -132,13 +112,13 @@
- blockingClick: A boolean to indicate if the button should block the click event while the callback function is being executed.
- icon: A slot for an icon to be displayed inside the button.
- ...restProps: Any other props that can be passed to a button element.

@usage
```html
<script lang="ts">
import * as Button from '$lib/ui/Button'
</script>

<Button.Action variant="primary" callback={() => console.log('clicked')}>
Click me
</Button.Action>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.stories.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { ComponentProps } from "svelte";
import Header from "./Header.svelte";

export default {
title: "Fragments/Header",
component: Header,
tags: ["autodocs"],
render: (args: {
Component: Header;
props: ComponentProps<typeof Header>;
}) => ({
Component: Header,
props: args,
}),
};

export const Primary = {
args: {
variant: "primary",
heading: "metagram",
callback: () => alert("clicked"),
},
};

export const PrimaryWithNoFlash = {
args: {
variant: "primary",
heading: "messages",
},
};

export const Secondary = {
args: {
variant: "secondary",
heading: "Account",
},
};

export const SecondaryWithMenu = {
args: {
variant: "secondary",
heading: "Account",
callback: () => alert("menu clicked"),
},
};

export const Tertiary = {
args: {
variant: "tertiary",
callback: () => alert("clicked"),
},
};
108 changes: 108 additions & 0 deletions platforms/metagram/src/lib/fragments/Header/Header.svelte
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
<script lang="ts">
import { cn } from '$lib/utils';
import {
ArrowLeft01Icon,
ArrowLeft02Icon,
MoreVerticalIcon,
ZapIcon
} from '@hugeicons/core-free-icons';
import { HugeiconsIcon } from '@hugeicons/svelte';
import type { HTMLAttributes } from 'svelte/elements';

interface IHeaderProps extends HTMLAttributes<HTMLElement> {
variant: 'primary' | 'secondary' | 'tertiary';
heading?: string;
callback?: () => void;
}

const { variant, callback, heading, ...restProps }: IHeaderProps = $props();

const variantClasses = {
primary: {
text: 'text-transparent bg-clip-text bg-[image:var(--color-brand-gradient)]',
background: ''
},
secondary: {
text: '',
background: ''
},
tertiary: {
text: '',
background: 'bg-white/60'
}
};

const backButton = {
secondary: ArrowLeft01Icon,
tertiary: ArrowLeft02Icon
};

const menuButton = {
primary: ZapIcon,
secondary: MoreVerticalIcon,
tertiary: MoreVerticalIcon
};

const classes = $derived({
common: cn('flex items-center justify-between p-4'),
text: variantClasses[variant].text,
background: variantClasses[variant].background
});

const backButtonCallback = () => {
window.history.back();
};
</script>

<header {...restProps} class={cn([classes.common, restProps.class])}>
<span class="flex items-center gap-2">
{#if variant !== 'primary'}
<button
class={cn([
'cursor-pointer rounded-full p-2 hover:bg-gray-100',
classes.background
])}
onclick={backButtonCallback}
>
<HugeiconsIcon
icon={backButton[variant]}
size={24}
color="var(--color-black-500)"
/>
</button>
{/if}
{#if variant !== 'tertiary'}
<h1 class={cn([classes.text])}>
{heading}
</h1>
{/if}
</span>
{#if callback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIcon icon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
Comment on lines +80 to +87

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Use Svelte event handlers and add accessibility attributes.

Replace onclick with Svelte's on:click directive and add appropriate aria attributes for better accessibility.

 <button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
- onclick={callback}+ on:click={callback}+ aria-label="Menu"
>
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
onclick={callback}
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}
{#ifcallback}
<button
class={cn(['cursor-pointer rounded-full p-2 hover:bg-gray-100', classes.background])}
on:click={callback}
aria-label="Menu"
>
<HugeiconsIconicon={menuButton[variant]} size={24} color="var(--color-black-500)" />
</button>
{/if}

</header>

<!--
@component
@name Header
@description Header fragment.
@props
- variant: Can be 'primary' for home screen header with a flash, 'secondary' without flash, or 'tertiary'.
- heading: The main heading text.
- callback: A function to be called when the header is clicked.
@usage
<script>
import { Header } from "$lib/fragments";
</script>

<Header variant="primary" heading="metagram" callback={() => alert("clicked")} />
<Header variant="primary" heading="messages" />
<Header variant="secondary" heading="Account" />
<Header variant="secondary" heading="Account" callback={() => alert("clicked")} />
<Header variant="tertiary" callback={() => alert("clicked")} />
-->
1 change: 1 addition & 0 deletions platforms/metagram/src/lib/fragments/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export { default as Header } from "./Header/Header.svelte";
export { default as BottomNav } from './BottomNav/BottomNav.svelte';
export { default as SettingsNavigationButton } from './SettingsNavigationButton/SettingsNavigationButton.svelte';
export { default as MessageInput } from './MessageInput/MessageInput.svelte';
Expand Down
38 changes: 9 additions & 29 deletions platforms/metagram/src/lib/ui/Button/Button.svelte
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
import type { HTMLButtonAttributes } from 'svelte/elements';

interface IButtonProps extends HTMLButtonAttributes {
variant?: 'primary' | 'secondary';
variant?: 'primary' | 'danger';
isLoading?: boolean;
callback?: () => Promise<void> | void;
blockingClick?: boolean;
Expand DownExpand Up@@ -39,29 +39,13 @@
};

const variantClasses = {
primary: {
background: 'bg-grey',
text: 'text-black-800',
border: 'border border-black-400'
},
secondary: {
background: 'bg-brand-burnt-orange',
text: 'text-white',
border: 'border border-brand-burnt-orange-600'
}
primary: { background: 'bg-grey', text: 'text-black-800' },
danger: { background: 'bg-red-500', text: 'text-white' }
};

const disabledVariantClasses = {
primary: {
background: 'bg-grey/50',
text: 'text-black-800/50',
border: 'border border-black-400/50'
},
secondary: {
background: 'bg-brand-burnt-orange/50',
text: 'text-white/50',
border: 'border border-brand-burnt-orange-600/50'
}
primary: { background: 'bg-grey/50', text: 'text-black-800/50' },
danger: { background: 'bg-red-500/50', text: 'text-white/50' }
};

const sizeVariant = {
Expand All@@ -80,9 +64,6 @@
text: disabled
? disabledVariantClasses[variant].text || variantClasses[variant].text
: variantClasses[variant].text,
border: disabled
? disabledVariantClasses[variant].border || variantClasses[variant].border
: variantClasses[variant].border,
disabled: 'cursor-not-allowed'
});
</script>
Expand All@@ -94,7 +75,6 @@
classes.common,
classes.background,
classes.text,
classes.border,
disabled && classes.disabled,
restProps.class
].join(' ')
Expand All@@ -118,12 +98,12 @@
</div>
</button>

<!--
<!--
@component
export default Button
@description
This component is a button with a loading spinner that can be used to indicate that an action is being performed.

@props
- variant: The variant of the button. Default is `primary`.
- size: The size of the button. Default is `md`.
Expand All@@ -132,13 +112,13 @@
- blockingClick: A boolean to indicate if the button should block the click event while the callback function is being executed.
- icon: A slot for an icon to be displayed inside the button.
- ...restProps: Any other props that can be passed to a button element.

@usage
```html
<script lang="ts">
import * as Button from '$lib/ui/Button'
</script>

<Button.Action variant="primary" callback={() => console.log('clicked')}>
Click me
</Button.Action>
Expand Down