Skip to content

refactor: removed uneeded import 'isBrowser' #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: removed uneeded import 'isBrowser' #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
116 changes: 61 additions & 55 deletions src/lib/carbon/Carbon.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,76 @@
<script lang="ts">
import { onMount } from "svelte";
import { isBrowser } from "$lib/utils";
import { beforeNavigate } from "$app/navigation";
import { dev } from "$app/environment";
import { onMount } from "svelte";

const src =
"//cdn.carbonads.com/carbon.js?serve=CW7ICKJI&placement=animation-sveltevercelapp&format=cover";
const localId = crypto.randomUUID();
import { beforeNavigate } from "$app/navigation";
import { browser, dev } from "$app/environment";

let container: HTMLElement | null = null;
const src =
"//cdn.carbonads.com/carbon.js?serve=CW7ICKJI&placement=animation-sveltevercelapp&format=cover";
const localId = crypto.randomUUID();

onMount(() => {
if (!dev) {
refreshCarbonAds();
let container: HTMLElement | null = null;

return () => {
const scriptNode = container?.querySelector(`[data-id="${localId}"]`);
const carbonNode = container?.querySelector(`#carbonads`);
scriptNode?.remove();
carbonNode?.remove();
};
}
});
onMount(() => {
if (!dev) {
refreshCarbonAds();

beforeNavigate((navigation) => {
let fromparam = navigation.from?.params.compID || "";
let toparam = navigation.to?.params.compID || "";
if(fromparam === '' || toparam==='') {
return;
}
let pathname = navigation.from?.url.pathname.split("/")[1] || "magic";
const isDocIndex = navigation.from?.route.id === `/${pathname}/${fromparam}`;
if (isDocIndex) return;
const goingToDocIndex = navigation.to?.route.id === `/${pathname}/${toparam}`;
if (goingToDocIndex) return;
refreshCarbonAds();
});
return () => {
const scriptNode = container?.querySelector(
`[data-id="${localId}"]`
);
const carbonNode = container?.querySelector(`#carbonads`);
scriptNode?.remove();
carbonNode?.remove();
};
}
});

function createCarbonScript() {
const script = document.createElement("script");
script.async = true;
script.id = "_carbonads_js";
script.src = src;
script.type = "text/javascript";
script.dataset.id = localId;
return script;
}
beforeNavigate((navigation) => {
let fromparam = navigation.from?.params.compID || "";
let toparam = navigation.to?.params.compID || "";
if (fromparam === "" || toparam === "") {
return;
}
let pathname = navigation.from?.url.pathname.split("/")[1] || "magic";
const isDocIndex =
navigation.from?.route.id === `/${pathname}/${fromparam}`;
if (isDocIndex) return;
const goingToDocIndex =
navigation.to?.route.id === `/${pathname}/${toparam}`;
if (goingToDocIndex) return;
refreshCarbonAds();
});

function refreshCarbonAds() {
if (!dev) {
if (!isBrowser) return;
const scriptNode = container?.querySelector("[data-id='_carbonads_js']");
const carbonAdsNode = container?.querySelector("#carbonads");
function createCarbonScript() {
const script = document.createElement("script");
script.async = true;
script.id = "_carbonads_js";
script.src = src;
script.type = "text/javascript";
script.dataset.id = localId;
return script;
}

carbonAdsNode?.remove();
scriptNode?.remove();
function refreshCarbonAds() {
if (!dev) {
if (!browser) return;
const scriptNode = container?.querySelector(
"[data-id='_carbonads_js']"
);
const carbonAdsNode = container?.querySelector("#carbonads");

const script = createCarbonScript();
container = document.getElementById(localId);
if (container) {
container.appendChild(script);
}
carbonAdsNode?.remove();
scriptNode?.remove();

const script = createCarbonScript();
container = document.getElementById(localId);
if (container) {
container.appendChild(script);
}
}
}
}
</script>

{#if !dev}
<div id={localId} class=""></div>
<div id={localId} class=""></div>
{/if}
105 changes: 54 additions & 51 deletions src/lib/carbon/CarbonLuxe.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,66 +1,69 @@
<script lang="ts">
import { onMount } from "svelte";
import { isBrowser } from "$lib/utils";
import { beforeNavigate } from "$app/navigation";
import { dev } from "$app/environment";
import { onMount } from "svelte";
import { beforeNavigate } from "$app/navigation";
import { browser, dev } from "$app/environment";

const src =
"//cdn.carbonads.com/carbon.js?serve=CW7ICKJI&placement=animation-sveltevercelapp&format=cover";
const localId = crypto.randomUUID();
const src =
"//cdn.carbonads.com/carbon.js?serve=CW7ICKJI&placement=animation-sveltevercelapp&format=cover";
const localId = crypto.randomUUID();

let container: HTMLElement | null = null;
let container: HTMLElement | null = null;

onMount(() => {
if (!dev) {
refreshCarbonAds();
onMount(() => {
if (!dev) {
refreshCarbonAds();

return () => {
const scriptNode = container?.querySelector(`[data-id="${localId}"]`);
const carbonNode = container?.querySelector(`#carbonads`);
scriptNode?.remove();
carbonNode?.remove();
};
}
});
return () => {
const scriptNode = container?.querySelector(
`[data-id="${localId}"]`
);
const carbonNode = container?.querySelector(`#carbonads`);
scriptNode?.remove();
carbonNode?.remove();
};
}
});

beforeNavigate((navigation) => {
let fromparam = navigation.from?.params.compID;
let toparam = navigation.to?.params.compID;
const isDocIndex = navigation.from?.route.id === `/luxe/${fromparam}`;
if (isDocIndex) return;
const goingToDocIndex = navigation.to?.route.id === `/luxe/${toparam}`;
if (goingToDocIndex) return;
refreshCarbonAds();
});
beforeNavigate((navigation) => {
let fromparam = navigation.from?.params.compID;
let toparam = navigation.to?.params.compID;
const isDocIndex = navigation.from?.route.id === `/luxe/${fromparam}`;
if (isDocIndex) return;
const goingToDocIndex = navigation.to?.route.id === `/luxe/${toparam}`;
if (goingToDocIndex) return;
refreshCarbonAds();
});

function createCarbonScript() {
const script = document.createElement("script");
script.async = true;
script.id = "_carbonads_js";
script.src = src;
script.type = "text/javascript";
script.dataset.id = localId;
return script;
}
function createCarbonScript() {
const script = document.createElement("script");
script.async = true;
script.id = "_carbonads_js";
script.src = src;
script.type = "text/javascript";
script.dataset.id = localId;
return script;
}

function refreshCarbonAds() {
if (!dev) {
if (!isBrowser) return;
const scriptNode = container?.querySelector("[data-id='_carbonads_js']");
const carbonAdsNode = container?.querySelector("#carbonads");
function refreshCarbonAds() {
if (!dev) {
if (!browser) return;
const scriptNode = container?.querySelector(
"[data-id='_carbonads_js']"
);
const carbonAdsNode = container?.querySelector("#carbonads");

carbonAdsNode?.remove();
scriptNode?.remove();
carbonAdsNode?.remove();
scriptNode?.remove();

const script = createCarbonScript();
container = document.getElementById(localId);
if (container) {
container.appendChild(script);
}
const script = createCarbonScript();
container = document.getElementById(localId);
if (container) {
container.appendChild(script);
}
}
}
}
</script>

{#if !dev}
<div id={localId} class=""></div>
<div id={localId} class=""></div>
{/if}
100 changes: 49 additions & 51 deletions src/lib/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,61 +4,59 @@ import { cubicOut } from "svelte/easing";
import type { TransitionConfig } from "svelte/transition";

export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs));
return twMerge(clsx(inputs));
}

export const isBrowser = typeof document !== "undefined";

type FlyAndScaleParams = {
y?: number;
x?: number;
start?: number;
duration?: number;
y?: number;
x?: number;
start?: number;
duration?: number;
};

export const flyAndScale = (
node: Element,
params: FlyAndScaleParams = { y: -8, x: 0, start: 0.95, duration: 150 }
node: Element,
params: FlyAndScaleParams = { y: -8, x: 0, start: 0.95, duration: 150 }
): TransitionConfig => {
const style = getComputedStyle(node);
const transform = style.transform === "none" ? "" : style.transform;

const scaleConversion = (
valueA: number,
scaleA: [number, number],
scaleB: [number, number]
) => {
const [minA, maxA] = scaleA;
const [minB, maxB] = scaleB;

const percentage = (valueA - minA) / (maxA - minA);
const valueB = percentage * (maxB - minB) + minB;

return valueB;
};

const styleToString = (
style: Record<string, number | string | undefined>
): string => {
return Object.keys(style).reduce((str, key) => {
if (style[key] === undefined) return str;
return str + `${key}:${style[key]};`;
}, "");
};

return {
duration: params.duration ?? 200,
delay: 0,
css: (t) => {
const y = scaleConversion(t, [0, 1], [params.y ?? 5, 0]);
const x = scaleConversion(t, [0, 1], [params.x ?? 0, 0]);
const scale = scaleConversion(t, [0, 1], [params.start ?? 0.95, 1]);

return styleToString({
transform: `${transform} translate3d(${x}px, ${y}px, 0) scale(${scale})`,
opacity: t
});
},
easing: cubicOut
};
};
const style = getComputedStyle(node);
const transform = style.transform === "none" ? "" : style.transform;

const scaleConversion = (
valueA: number,
scaleA: [number, number],
scaleB: [number, number]
) => {
const [minA, maxA] = scaleA;
const [minB, maxB] = scaleB;

const percentage = (valueA - minA) / (maxA - minA);
const valueB = percentage * (maxB - minB) + minB;

return valueB;
};

const styleToString = (
style: Record<string, number | string | undefined>
): string => {
return Object.keys(style).reduce((str, key) => {
if (style[key] === undefined) return str;
return str + `${key}:${style[key]};`;
}, "");
};

return {
duration: params.duration ?? 200,
delay: 0,
css: (t) => {
const y = scaleConversion(t, [0, 1], [params.y ?? 5, 0]);
const x = scaleConversion(t, [0, 1], [params.x ?? 0, 0]);
const scale = scaleConversion(t, [0, 1], [params.start ?? 0.95, 1]);

return styleToString({
transform: `${transform} translate3d(${x}px, ${y}px, 0) scale(${scale})`,
opacity: t,
});
},
easing: cubicOut,
};
};